sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:df659d2e: htable: implemented starts with matching for remove functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: df659d2ee44eca688507aab48eb22260ef3577bd URL: https://github.com/kamailio/kamailio/commit/df659d2ee44eca688507aab48eb2226… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-23T02:33:19+02:00 htable: implemented starts with matching for remove functions --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/df659d2ee44eca688507aab48eb2226… Patch: https://github.com/kamailio/kamailio/commit/df659d2ee44eca688507aab48eb2226… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 7d31e4cc0f..6cb19907ad 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -788,6 +788,12 @@ sht_rm_value_re("ha=>.*"); expression. </para> </listitem> + <listitem> + <para> + <emphasis>sw</emphasis> - match the val parameter as 'starts + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -822,6 +828,12 @@ sht_rm_name("ha", "re", ".*"); expression. </para> </listitem> + <listitem> + <para> + <emphasis>sw</emphasis> - match the val parameter as 'starts + with'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -830,7 +842,7 @@ sht_rm_name("ha", "re", ".*"); This function can be used from ANY_ROUTE. </para> <example> - <title><function>sht_rm_value_re</function> usage</title> + <title><function>sht_rm_value</function> usage</title> <programlisting format="linespecific"> ... sht_rm_value("ha", "re", ".*"); diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 4c4ba5315b..1bbd079b30 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1270,6 +1270,61 @@ int ht_rm_cell_re(str *sre, ht_t *ht, int mode) return 0; } +int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) +{ + ht_cell_t *it; + ht_cell_t *it0; + int match; + int i; + + if(sre==NULL || sre->len<=0 || ht==NULL) + return -1; + + for(i=0; i<ht->htsize; i++) + { + /* free entries */ + ht_slot_lock(ht, i); + it = ht->entries[i].first; + while(it) + { + it0 = it->next; + match = 0; + if(mode==0) + { + if(op==HT_RM_OP_SW) { + if(sre->len<=it->name.len + && strncmp(it->name.s, sre->s, sre->len)==0) { + match = 1; + } + } + } else { + if(op==HT_RM_OP_SW) { + if(it->flags&AVP_VAL_STR) { + if(sre->len<=it->value.s.len + && strncmp(it->value.s.s, sre->s, sre->len)==0) { + match = 1; + } + } + } + } + if(match==1) + { + if(it->prev==NULL) + ht->entries[i].first = it->next; + else + it->prev->next = it->next; + if(it->next) + it->next->prev = it->prev; + ht->entries[i].esize--; + ht_cell_free(it); + } + it = it0; + } + ht_slot_unlock(ht, i); + } + return 0; +} + int ht_reset_content(ht_t *ht) { ht_cell_t *it; diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 8dea56d5ab..d64b68ac95 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -115,6 +115,9 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode); ht_t *ht_get_root(void); int ht_reset_content(ht_t *ht); +#define HT_RM_OP_SW 1 +int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); + void ht_iterator_init(void); int ht_iterator_start(str *iname, str *hname); int ht_iterator_next(str *iname); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index aaa4a5c5eb..40d1a558d1 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -437,6 +437,10 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, return -1; } return 1; + } else if(strncmp(op->s, "sw", 2)==0) { + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_SW)<0) { + return -1; + } } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

7 years, 6 months

git:master:b1361e89: modules: readme files regenerated - htable ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b1361e897f6708d7f9ed5267836cc3b8f4789613 URL: https://github.com/kamailio/kamailio/commit/b1361e897f6708d7f9ed5267836cc3b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-22T13:16:58+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/b1361e897f6708d7f9ed5267836cc3b… Patch: https://github.com/kamailio/kamailio/commit/b1361e897f6708d7f9ed5267836cc3b…

7 years, 6 months

[kamailio/kamailio] htable: add new functions sht_rm_name_re_pv and sht_rm_value_pv to support variables (#1121)

by Emmanuel Schmidbauer

- cleanup existing sht_rm_name_re and sht_rm_value_re functions - update documention You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1121 -- Commit Summary -- * htable: add new functions sht_rm_name_re_pv and sht_rm_value_pv to -- File Changes -- M src/modules/htable/doc/htable.xml (11) M src/modules/htable/doc/htable_admin.xml (22) M src/modules/htable/htable.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1121.patch https://github.com/kamailio/kamailio/pull/1121.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1121

7 years, 6 months

git:master:0c69e7bc: htable: added functions to remove items using variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0c69e7bc4486ff6b10da6502b72c1805ac6e5f83 URL: https://github.com/kamailio/kamailio/commit/0c69e7bc4486ff6b10da6502b72c180… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-22T13:04:15+02:00 htable: added functions to remove items using variables --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/0c69e7bc4486ff6b10da6502b72c180… Patch: https://github.com/kamailio/kamailio/commit/0c69e7bc4486ff6b10da6502b72c180…

7 years, 6 months

git:master:76c59cb5: modules: readme files regenerated - db_sqlite ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 76c59cb5bde2dae0455165f23a3c732762654de2 URL: https://github.com/kamailio/kamailio/commit/76c59cb5bde2dae0455165f23a3c732… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-21T12:16:33+02:00 modules: readme files regenerated - db_sqlite ... [skip ci] --- Modified: src/modules/db_sqlite/README --- Diff: https://github.com/kamailio/kamailio/commit/76c59cb5bde2dae0455165f23a3c732… Patch: https://github.com/kamailio/kamailio/commit/76c59cb5bde2dae0455165f23a3c732… --- diff --git a/src/modules/db_sqlite/README b/src/modules/db_sqlite/README index 139597f9cb..41ba51772e 100644 --- a/src/modules/db_sqlite/README +++ b/src/modules/db_sqlite/README @@ -1,2 +1,135 @@ +SQlite Module +Timo Teräs +Edited by + +Timo Teräs + +Edited by + +Julien Chavanton + + flowroute.com + <jchavanton(a)gmail.com> + + Copyright © 2011 Timo Teräs + + Copyright © 2017 + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + + 3.1. db_set_readonly (string) + + 4. Functions + 5. Usage + + List of Examples + + 1.1. Set db_set_readonly parameter + 1.2. loading the module usage + 1.3. db_url module parameter usage + 1.4. DBURL define usage + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Parameters + + 3.1. db_set_readonly (string) + + 4. Functions + 5. Usage + +1. Overview + + The module is an implementation of the internal DB API v1 connector for + SQlite 3 file. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * No dependencies on other Kamailio modules. + +2.2. External Libraries or Applications + + The following libraries or applications must be installed before + running Kamailio with this module loaded: + * SQlite 3 library - e.g., libsqlite3-0 + * SQlite 3 devel library - to compile the module e.g. libsqlite3-dev + * SQlite 3 utilities - for kamdbctl e.g. sqlite3 + +3. Parameters + + 3.1. db_set_readonly (string) + +3.1. db_set_readonly (string) + + This will set the db connection to "SQLITE_OPEN_READONLY", useful if + another program is writing to the DB. The value is the full path to the + sqlite file used for example in any db_url or sqlops/sqlcon This + parameter may be set multiple times to set many DB connections to + readonly in the same configuration file. + + By default all the db connection are using "SQLITE_OPEN_READWRITE | + SQLITE_OPEN_CREATE" + + Example 1.1. Set db_set_readonly parameter +... +modparam("db_sqlite","db_set_readonly","/var/mydb.sqlite") +modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using + the sqlops module +... + +4. Functions + + NONE + +5. Usage + + To use the module, first you have to load it in the Kamailio + configuration file. + + Example 1.2. loading the module usage +... +loadmodule "db_sqlite.so" +... + + Then set the db_url (or similar) parameter of modules that have to use + the SQLite database to driver part 'sqlite://', followed by the path to + database file. For example: + + Example 1.3. db_url module parameter usage +... +modparam("auth_db", "db_url", "sqlite:///etc/kamailio/kamailio.db") +... + + In the default config file, defined token DBURL can be updated like: + + Example 1.4. DBURL define usage +... +#!define DBURL "sqlite:///etc/kamailio/kamailio.db" +...

7 years, 6 months

git:master:d65679f7: core: updated log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d65679f76ddb5d844dab0e89b69f678d8297293b URL: https://github.com/kamailio/kamailio/commit/d65679f76ddb5d844dab0e89b69f678… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-21T12:06:44+02:00 core: updated log macros --- Modified: src/core/counters.c Modified: src/core/lvalue.c Modified: src/core/lvalue.h Modified: src/core/rvalue.c Modified: src/core/rvalue.h --- Diff: https://github.com/kamailio/kamailio/commit/d65679f76ddb5d844dab0e89b69f678… Patch: https://github.com/kamailio/kamailio/commit/d65679f76ddb5d844dab0e89b69f678…

7 years, 6 months

git:master:572acbca: core: rand - removed history from files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 572acbca5c9e1d04efd687a88ff272c00d956425 URL: https://github.com/kamailio/kamailio/commit/572acbca5c9e1d04efd687a88ff272c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-21T12:06:44+02:00 core: rand - removed history from files --- Modified: src/core/rand/fastrand.c Modified: src/core/rand/fastrand.h Modified: src/core/rand/isaac/rand.c --- Diff: https://github.com/kamailio/kamailio/commit/572acbca5c9e1d04efd687a88ff272c… Patch: https://github.com/kamailio/kamailio/commit/572acbca5c9e1d04efd687a88ff272c… --- diff --git a/src/core/rand/fastrand.c b/src/core/rand/fastrand.c index 757e08dcae..3af12f3229 100644 --- a/src/core/rand/fastrand.c +++ b/src/core/rand/fastrand.c @@ -1,5 +1,5 @@ /* - * fast pseudo random generation + * fast pseudo random generation * * Copyright (C) 2007 iptelorg GmbH * @@ -16,10 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* - *History: - *-------- - * 2007-06-15 wrapper around isaac (see - * http://www.burtleburtle.net/bob/rand/isaacafa.html) (andrei) + * wrapper around isaac + * http://www.burtleburtle.net/bob/rand/isaacafa.html */ #include "fastrand.h" @@ -36,7 +34,7 @@ static randctx is_ctx; void fastrand_seed(unsigned int seed) { int i; - + srandom(seed); for (i=0; i<RANDSIZ; i++) is_ctx.randrsl[i]=random(); diff --git a/src/core/rand/fastrand.h b/src/core/rand/fastrand.h index c97232ebff..38bb99e9fd 100644 --- a/src/core/rand/fastrand.h +++ b/src/core/rand/fastrand.h @@ -1,5 +1,5 @@ /* - * fast pseudo random generation + * fast pseudo random generation * * Copyright (C) 2007 iptelorg GmbH * @@ -14,9 +14,9 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * 2007-06-15 wrapper around isaac (see - * http://www.burtleburtle.net/bob/rand/isaacafa.html) (andrei) + */ +/* wrapper around isaac + * http://www.burtleburtle.net/bob/rand/isaacafa.html */ #ifndef _fastrand_h diff --git a/src/core/rand/isaac/rand.c b/src/core/rand/isaac/rand.c index 63babc7218..4665b38df9 100644 --- a/src/core/rand/isaac/rand.c +++ b/src/core/rand/isaac/rand.c @@ -79,7 +79,7 @@ word flag; mix(a,b,c,d,e,f,g,h); } - if (flag) + if (flag) { /* initialize using the contents of r[] as the seed */ for (i=0; i<RANDSIZ; i+=8)

7 years, 6 months

git:master:ae664527: Merge pull request #1134 from jchavanton/db_sqlite_doc_fix

by GitHub

Module: kamailio Branch: master Commit: ae664527e18f5269bce80fa2669b905913098784 URL: https://github.com/kamailio/kamailio/commit/ae664527e18f5269bce80fa2669b905… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-21T12:06:12+02:00 Merge pull request #1134 from jchavanton/db_sqlite_doc_fix db_sqlite: fix xml doc --- Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae664527e18f5269bce80fa2669b905… Patch: https://github.com/kamailio/kamailio/commit/ae664527e18f5269bce80fa2669b905… --- diff --git a/src/modules/db_sqlite/doc/db_sqlite_admin.xml b/src/modules/db_sqlite/doc/db_sqlite_admin.xml index 695e0d4004..9dd8418563 100644 --- a/src/modules/db_sqlite/doc/db_sqlite_admin.xml +++ b/src/modules/db_sqlite/doc/db_sqlite_admin.xml @@ -62,10 +62,10 @@ </section> <section> - <title>Parameters</title> - <section id="db_sqlite.p.db_set_readonly"> + <title>Parameters</title> + <section id="db_sqlite.p.db_set_readonly"> <title><varname>db_set_readonly</varname> (string)</title> - + <para> This will set the db connection to "SQLITE_OPEN_READONLY", useful if another program is writing to the DB. The value is the full path to the sqlite file used for example in any db_url or sqlops/sqlcon @@ -85,7 +85,7 @@ modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using ... </programlisting> </example> - </section> + </section> </section> <section>

7 years, 6 months

git:master:f6dde6f2: db_sqlite: fix xml doc

by Julien Chavanton

Module: kamailio Branch: master Commit: f6dde6f261891dff5b041a0e545e7bd210baf24b URL: https://github.com/kamailio/kamailio/commit/f6dde6f261891dff5b041a0e545e7bd… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-05-20T13:06:55-07:00 db_sqlite: fix xml doc --- Modified: src/modules/db_sqlite/doc/db_sqlite_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6dde6f261891dff5b041a0e545e7bd… Patch: https://github.com/kamailio/kamailio/commit/f6dde6f261891dff5b041a0e545e7bd… --- diff --git a/src/modules/db_sqlite/doc/db_sqlite_admin.xml b/src/modules/db_sqlite/doc/db_sqlite_admin.xml index 695e0d4004..9dd8418563 100644 --- a/src/modules/db_sqlite/doc/db_sqlite_admin.xml +++ b/src/modules/db_sqlite/doc/db_sqlite_admin.xml @@ -62,10 +62,10 @@ </section> <section> - <title>Parameters</title> - <section id="db_sqlite.p.db_set_readonly"> + <title>Parameters</title> + <section id="db_sqlite.p.db_set_readonly"> <title><varname>db_set_readonly</varname> (string)</title> - + <para> This will set the db connection to "SQLITE_OPEN_READONLY", useful if another program is writing to the DB. The value is the full path to the sqlite file used for example in any db_url or sqlops/sqlcon @@ -85,7 +85,7 @@ modparam("sqlops","sqlcon","lrn=>sqlite:////var/mydb.sqlite") # Example if using ... </programlisting> </example> - </section> + </section> </section> <section>

7 years, 6 months

[kamailio/kamailio] db_sqlite: fix xml doc (#1134)

by Julien Chavanton

I screw up the xml file again, I found out how to test it using `make modules-readme modules=modules/db_sqlite` seems fine now You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1134 -- Commit Summary -- * db_sqlite: fix xml doc -- File Changes -- M src/modules/db_sqlite/doc/db_sqlite_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1134.patch https://github.com/kamailio/kamailio/pull/1134.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1134

7 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017