sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:b8e9d269: lib/srdb1: make (setid, url) unique key instead of primary
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: b8e9d2697a13c2cdb367aabf4966d6fa09a1319f URL: https://github.com/kamailio/kamailio/commit/b8e9d2697a13c2cdb367aabf4966d6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T12:35:27+02:00 lib/srdb1: make (setid,url) unique key instead of primary - conflicts with autoincrement in mysql --- Modified: src/lib/srdb1/schema/rtpengine.xml --- Diff: https://github.com/kamailio/kamailio/commit/b8e9d2697a13c2cdb367aabf4966d6f… Patch: https://github.com/kamailio/kamailio/commit/b8e9d2697a13c2cdb367aabf4966d6f… --- diff --git a/src/lib/srdb1/schema/rtpengine.xml b/src/lib/srdb1/schema/rtpengine.xml index 02ba2afcac..64444606aa 100644 --- a/src/lib/srdb1/schema/rtpengine.xml +++ b/src/lib/srdb1/schema/rtpengine.xml @@ -37,7 +37,7 @@ <column id="setid"> <name>setid</name> <type>unsigned int</type> - <size>10</size> + <size>10</size> <description>RTPEngine instance set ID</description> <default>0</default> <natural/> @@ -80,7 +80,7 @@ <name>rtpengine_nodes</name> <colref linkend="setid"/> <colref linkend="url"/> - <primary/> + <unique/> </index> </table>

1 0

git:master:50e79b69: kamctl: regenerated db creation scripts
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 50e79b69418967cdb4598a2b69f064885520ec2a URL: https://github.com/kamailio/kamailio/commit/50e79b69418967cdb4598a2b69f0648… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T12:28:32+02:00 kamctl: regenerated db creation scripts --- Modified: utils/kamctl/db_berkeley/kamailio/rtpengine Modified: utils/kamctl/db_sqlite/rtpengine-create.sql Modified: utils/kamctl/dbtext/kamailio/rtpengine Modified: utils/kamctl/mongodb/kamailio/rtpengine.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/rtpengine-create.sql Modified: utils/kamctl/oracle/rtpengine-create.sql Modified: utils/kamctl/postgres/rtpengine-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpengine-table --- Diff: https://github.com/kamailio/kamailio/commit/50e79b69418967cdb4598a2b69f0648… Patch: https://github.com/kamailio/kamailio/commit/50e79b69418967cdb4598a2b69f0648…

1 0

git:master:9c74b35b: lib/srdb1: added autoincrement id column for rtpengine
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 9c74b35b06465c9dde23971e342846491fa41c2c URL: https://github.com/kamailio/kamailio/commit/9c74b35b06465c9dde23971e3428464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T12:28:03+02:00 lib/srdb1: added autoincrement id column for rtpengine --- Modified: src/lib/srdb1/schema/rtpengine.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c74b35b06465c9dde23971e3428464… Patch: https://github.com/kamailio/kamailio/commit/9c74b35b06465c9dde23971e3428464… --- diff --git a/src/lib/srdb1/schema/rtpengine.xml b/src/lib/srdb1/schema/rtpengine.xml index 7b8f295057..02ba2afcac 100644 --- a/src/lib/srdb1/schema/rtpengine.xml +++ b/src/lib/srdb1/schema/rtpengine.xml @@ -24,6 +24,16 @@ </db:para> </description> + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + <column id="setid"> <name>setid</name> <type>unsigned int</type>

1 0

git:master:09ce8050: textops: remove hf with regex functions exported to kemi framework
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 09ce80506410b8ef648adb8919492de6f6dad7f5 URL: https://github.com/kamailio/kamailio/commit/09ce80506410b8ef648adb8919492de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T09:04:39+02:00 textops: remove hf with regex functions exported to kemi framework --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/09ce80506410b8ef648adb8919492de… Patch: https://github.com/kamailio/kamailio/commit/09ce80506410b8ef648adb8919492de… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cd32f0074a..5048fbae5d 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1098,7 +1098,25 @@ static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) return remove_hf_re(msg, (regex_t*)key); } -static int remove_hf_exp_re(sip_msg_t* msg, regex_t *mre, regex_t *sre) +static int ki_remove_hf_re(sip_msg_t *msg, str *ematch) +{ + regex_t mre; + int ret; + + memset(&mre, 0, sizeof(regex_t)); + if (regcomp(&mre, ematch->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", ematch->len, ematch->s); + return -1; + } + + ret = remove_hf_re(msg, &mre); + + regfree(&mre); + + return ret; +} + +static int remove_hf_exp(sip_msg_t* msg, regex_t *mre, regex_t *sre) { struct hdr_field *hf; struct lump* l; @@ -1143,7 +1161,33 @@ static int remove_hf_exp_re(sip_msg_t* msg, regex_t *mre, regex_t *sre) static int remove_hf_exp_f(struct sip_msg* msg, char* ematch, char* eskip) { - return remove_hf_exp_re(msg, (regex_t*)ematch, (regex_t*)eskip); + return remove_hf_exp(msg, (regex_t*)ematch, (regex_t*)eskip); +} + +static int ki_remove_hf_exp(sip_msg_t *msg, str *ematch, str *eskip) +{ + regex_t mre; + regex_t sre; + int ret; + + memset(&mre, 0, sizeof(regex_t)); + memset(&sre, 0, sizeof(regex_t)); + if (regcomp(&mre, ematch->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", ematch->len, ematch->s); + return -1; + } + if (regcomp(&sre, eskip->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", eskip->len, eskip->s); + regfree(&mre); + return -1; + } + + ret = remove_hf_exp(msg, &mre, &sre); + + regfree(&mre); + regfree(&sre); + + return ret; } static int is_present_hf_helper_f(struct sip_msg* msg, gparam_t* gp) @@ -3490,6 +3534,16 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("remove_hf_re"), + SR_KEMIP_INT, ki_remove_hf_re, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textops"), str_init("remove_hf_exp"), + SR_KEMIP_INT, ki_remove_hf_exp, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:507533e3: modules: readme files regenerated - cfg_rpc ... [skip ci]
by Kamailio Dev 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 507533e3c332a225248c8a23a5bf509946709c1b URL: https://github.com/kamailio/kamailio/commit/507533e3c332a225248c8a23a5bf509… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-10T19:31:21+02:00 modules: readme files regenerated - cfg_rpc ... [skip ci] --- Modified: src/modules/cfg_rpc/README --- Diff: https://github.com/kamailio/kamailio/commit/507533e3c332a225248c8a23a5bf509… Patch: https://github.com/kamailio/kamailio/commit/507533e3c332a225248c8a23a5bf509…

1 0

git:master:ac30274f: Merge pull request #1181 from hdikme/master
by GitHub 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: ac30274feaccd0a1715aee13daafc364cf73de7c URL: https://github.com/kamailio/kamailio/commit/ac30274feaccd0a1715aee13daafc36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-10T19:23:56+02:00 Merge pull request #1181 from hdikme/master configuration reset function (cfg.reset) --- Modified: src/core/cfg/cfg_ctx.c Modified: src/core/cfg/cfg_ctx.h Modified: src/modules/cfg_rpc/cfg_rpc.c Modified: src/modules/cfg_rpc/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/ac30274feaccd0a1715aee13daafc36… Patch: https://github.com/kamailio/kamailio/commit/ac30274feaccd0a1715aee13daafc36…

1 0

git:master:245a28b6: cfg_rpc: configuration reset function has been implemented
by Huseyin Dikme 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 245a28b666c027f3d697c92863fd54a837ff4d62 URL: https://github.com/kamailio/kamailio/commit/245a28b666c027f3d697c92863fd54a… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2017-07-04T14:41:37+02:00 cfg_rpc: configuration reset function has been implemented - rpc_reset function enables to reset all the variables of a certain group to their initial values. e.g.: kamcmd cfg.reset core. Above given example will reset all variables of the configuration group "core". --- Modified: src/modules/cfg_rpc/cfg_rpc.c Modified: src/modules/cfg_rpc/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/245a28b666c027f3d697c92863fd54a… Patch: https://github.com/kamailio/kamailio/commit/245a28b666c027f3d697c92863fd54a… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index b694d06088..06e775c5c1 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -355,6 +355,61 @@ static void rpc_get(rpc_t* rpc, void* c) } } +static const char* rpc_reset_doc[2] = { + "Reset all the values of a configuration group and commit the change immediately", + 0 +}; + +static void rpc_reset(rpc_t* rpc, void* c) +{ + void *h; + str gname, var; + cfg_def_t *def; + void *val; + int i, ret; + str group; + char *ch; + unsigned int *group_id; + unsigned int val_type; + unsigned int input_type; + + if (rpc->scan(c, "S", &group) < 1) + return; + + if (get_group_id(&group, &group_id)) { + rpc->fault(c, 400, "Wrong group syntax. Use either \"group\", or \"group[id]\""); + return; + } + + cfg_get_group_init(&h); + while(cfg_get_group_next(&h, &gname, &def)) + if (((gname.len == group.len) && (memcmp(gname.s, group.s, group.len) == 0))) + { + for (i=0; def[i].name; i++){ + + var.s = def[i].name; + var.len = (int)strlen(def[i].name); + ret = cfg_get_default_value_by_name(ctx, &gname, group_id, &var, + &val, &val_type); + + if (ret != 0) + continue; + + if (cfg_help(ctx, &group, &var, + &ch, &input_type) + ) { + rpc->fault(c, 400, "Failed to get the variable description"); + return; + } + + if (input_type == CFG_INPUT_INT) + cfg_set_now_int(ctx, &gname, group_id, &var, val); + else if (input_type == CFG_INPUT_STRING) + cfg_set_now_string(ctx, &gname, group_id, &var, val); + } + } +} + static const char* rpc_help_doc[2] = { "Print the description of a configuration variable", @@ -546,6 +601,7 @@ static rpc_export_t rpc_calls[] = { {"cfg.commit", rpc_commit, rpc_commit_doc, 0}, {"cfg.rollback", rpc_rollback, rpc_rollback_doc, 0}, {"cfg.get", rpc_get, rpc_get_doc, 0}, + {"cfg.reset", rpc_reset, rpc_reset_doc, 0}, {"cfg.help", rpc_help, rpc_help_doc, 0}, {"cfg.list", rpc_list, rpc_list_doc, 0}, {"cfg.diff", rpc_diff, rpc_diff_doc, 0}, diff --git a/src/modules/cfg_rpc/doc/rpc.xml b/src/modules/cfg_rpc/doc/rpc.xml index 9810762c50..9298247d83 100644 --- a/src/modules/cfg_rpc/doc/rpc.xml +++ b/src/modules/cfg_rpc/doc/rpc.xml @@ -88,6 +88,22 @@ # &kamcmd; cfg.sets voicemail srv_ip "1.2.3.4" ... </programlisting> + </example> + </section> + <section id="cfg_rpc.rpc.reset"> + <title>cfg.reset</title> + <para> + <emphasis>cfg.reset</emphasis> - Reset the variable values of + a configuration group. The function accepts only one parameter: + group name. + </para> + <example> + <title>Use <varname>cfg.reset</varname> RPC command</title> + <programlisting format="linespecific"> +... +# &sercmd; cfg.reset core +... +</programlisting> </example> </section> <section id="cfg_rpc.rpc.set_now_string">

1 0

git:master:89334293: core: cfg_get_default_value_by_name function has been implemented
by Huseyin Dikme 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 89334293299f817d4ac2774ae60611839a031c73 URL: https://github.com/kamailio/kamailio/commit/89334293299f817d4ac2774ae606118… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2017-07-04T14:40:12+02:00 core: cfg_get_default_value_by_name function has been implemented - As cfg_get_by_name function uses handle to reach variable values, this function will use instead orig_handle in order to reach the initial values when the config group was registered. Read-only variables will not be returned since cfg_reset function uses this function in order to set back the default values, and this cannot be implemented on read-only variables. --- Modified: src/core/cfg/cfg_ctx.c Modified: src/core/cfg/cfg_ctx.h --- Diff: https://github.com/kamailio/kamailio/commit/89334293299f817d4ac2774ae606118… Patch: https://github.com/kamailio/kamailio/commit/89334293299f817d4ac2774ae606118… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 87ccda81c4..4c07996950 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -1359,6 +1359,74 @@ int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str return 0; } +/* retrieves the default value of a variable + * Return value: + * 0 - success + * -1 - error + * 1 - variable exists, but it is not readable + */ +int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, + void **val, unsigned int *val_type) +{ + cfg_group_t *group; + cfg_mapping_t *var; + void *p; + static str s; /* we need the value even + after the function returns */ + cfg_group_inst_t *group_inst; + + /* verify the context even if we do not need it now + to make sure that a cfg driver has called the function + (very very weak security) */ + if (!ctx) { + LOG(L_ERR, "ERROR: cfg_get_by_name(): context is undefined\n"); + return -1; + } + + /* look-up the group and the variable */ + if (cfg_lookup_var(group_name, var_name, &group, &var)) + return -1; + else + { + if(var->def->type & CFG_READONLY) /* if variables exist then prevents resetting the read-only ones */ + return -1; + } + + if (var->def->on_change_cb) { + /* The variable cannot be retrieved, because the fixup + function may have changed it, and it is better to return + an error than an incorrect value */ + return 1; + } + + /* use the module's orig_handle to access the default registered value of the variable for any group*/ + p = (group->orig_handle) + var->offset; + + switch (CFG_VAR_TYPE(var)) { + case CFG_VAR_INT: + *val = (void *)(long)*(int *)p; + break; + + case CFG_VAR_STRING: + *val = (void *)*(char **)p; + break; + + case CFG_VAR_STR: + memcpy(&s, p, sizeof(str)); + *val = (void *)&s; + break; + + case CFG_VAR_POINTER: + *val = *(void **)p; + break; + + } + *val_type = CFG_VAR_TYPE(var); + + return 0; +} + + /* returns the description of a variable */ int cfg_help(cfg_ctx_t *ctx, str *group_name, str *var_name, char **ch, unsigned int *input_type) diff --git a/src/core/cfg/cfg_ctx.h b/src/core/cfg/cfg_ctx.h index 9401daed77..2ecae7deaf 100644 --- a/src/core/cfg/cfg_ctx.h +++ b/src/core/cfg/cfg_ctx.h @@ -119,6 +119,9 @@ int cfg_rollback(cfg_ctx_t *ctx); int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, void **val, unsigned int *val_type); +int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, + void **val, unsigned int *val_type); + /*! \brief returns the description of a variable */ int cfg_help(cfg_ctx_t *ctx, str *group_name, str *var_name, char **ch, unsigned int *input_type);

1 0

[kamailio/kamailio] configuration reset function (cfg.reset) (#1181)
by hdikme 10 Jul '17

10 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  kamcmd cfg.reset "group_name", cfg.reset has been created in order to reset all the variables of the referred group to be set to their initial values (default). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1181 -- Commit Summary -- * core: cfg_get_default_value_by_name function has been implemented * cfg_rpc: configuration reset function has been implemented -- File Changes -- M src/core/cfg/cfg_ctx.c (68) M src/core/cfg/cfg_ctx.h (3) M src/modules/cfg_rpc/cfg_rpc.c (56) M src/modules/cfg_rpc/doc/rpc.xml (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1181.patch https://github.com/kamailio/kamailio/pull/1181.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/1181

2 2

subst() textops bug?
by Cléviton Mendes de Araújo 10 Jul '17

10 Jul '17

I try replace info PAI header by using subst() function in route block as below: route[3] { ... $var(fromU) = 22227777; ... subst('/^P-Asserted-Identity:(.*)sip:[^@]*@([a-zA-Z0-9.:]+)( .*)$/P-Asserted-Identity:\1sip:$var(fromU)@\2\3/ig'); ... ... forward(); exit; } but when I read ngrep command output I catch P-Asserted-Identity header as below: +++++++++++++++++++++++++++++++++++++++++++++++ before route[3] processing: INVITE sip:99992222@15.113.132.21:5060 SIP/2.0. ... P-Asserted-Identity: "Display Name 7777" <sip:7777@101.14.101.245>. ... +++++++++++++++++++++++++++++++++++++++++++++++ after route[3] processing: INVITE sip:99992222@15.113.132.21:5060 SIP/2.0. ... P-Asserted-Identity: "Display Name 7777" <sip:22227777@101.14.101.245>.P-Asserted-Identity: "Display Name 7777" <sip:7777@101.14.101.245>. ... +++++++++++++++++++++++++++++++++++++++++++++++ Is it normal or bug behaviors? Regards CMA

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017