sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:1632bb7c: pv: xavp related functions exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1632bb7ced8aab774cc3c77abba1246c1a848a5b URL: https://github.com/kamailio/kamailio/commit/1632bb7ced8aab774cc3c77abba1246… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T14:05:47+02:00 pv: xavp related functions exported to kemi framework --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1632bb7ced8aab774cc3c77abba1246… Patch: https://github.com/kamailio/kamailio/commit/1632bb7ced8aab774cc3c77abba1246… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index ad33d3b899..8dccdb3a0b 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -26,6 +26,7 @@ #include "../../core/pvar.h" #include "../../core/lvalue.h" #include "../../core/mod_fix.h" +#include "../../core/xavp.h" #include "../../core/kemi.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -741,6 +742,11 @@ static int w_var_to_xavp(sip_msg_t *msg, char *s1, char *s2) return pv_var_to_xavp(&varname, &xname); } +static int ki_var_to_xavp(sip_msg_t *msg, str *varname, str *xname) +{ + return pv_var_to_xavp(varname, xname); +} + /** * xavp to script variable */ @@ -756,6 +762,17 @@ static int w_xavp_to_var(sip_msg_t *msg, char *s1) return pv_xavp_to_var(&xname); } +static int ki_xavp_to_var(sip_msg_t *msg, str *xname) +{ + return pv_xavp_to_var(xname); +} + +static int ki_xavp_print(sip_msg_t* msg) +{ + xavp_print_list(NULL); + return 1; +} + /** * */ @@ -782,6 +799,17 @@ static int w_xavp_params_explode(sip_msg_t *msg, char *pparams, char *pxname) /** * */ +static int ki_xavp_params_explode(sip_msg_t *msg, str *sparams, str *sxname) +{ + if(xavp_params_explode(sparams, sxname)<0) + return -1; + + return 1; +} + +/** + * + */ static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2) { if(sbranch_set_ruri(msg)<0) @@ -962,6 +990,26 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("pv_var_to_xavp"), + SR_KEMIP_INT, ki_var_to_xavp, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("pv_xavp_to_var"), + SR_KEMIP_INT, ki_xavp_to_var, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("pv_xavp_print"), + SR_KEMIP_INT, ki_xavp_print, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_params_explode"), + SR_KEMIP_INT, ki_xavp_params_explode, + { 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 } } }; @@ -979,4 +1027,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; } return register_trans_mod(path, mod_trans); -} +} \ No newline at end of file diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index d556dda99f..c36a6c6f1f 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -555,7 +555,7 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) return -1; } -int pv_xavp_print(struct sip_msg* msg, char* s1, char *s2) +int pv_xavp_print(sip_msg_t* msg, char* s1, char *s2) { xavp_print_list(NULL); return 1;

7 years

git:master:8db85222: modules: readme files regenerated - pv ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 8db85222c3f82e8af1fbeb38eaabb9aec99ecab2 URL: https://github.com/kamailio/kamailio/commit/8db85222c3f82e8af1fbeb38eaabb9a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-25T14:01:22+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/8db85222c3f82e8af1fbeb38eaabb9a… Patch: https://github.com/kamailio/kamailio/commit/8db85222c3f82e8af1fbeb38eaabb9a… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index d30fea9c67..428a27c958 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -371,12 +371,14 @@ pv_xavp_print(); 4.11. pv_var_to_xavp(varname, xname) - Copy script variables values to a xavp. + Copy the script variable value into an xavp. First parameter can be '*' in order to copy all script variables. Second parameter is the name of the destination xavp. If xavp already exists it will be reset first. + Both parameters can contain variables that are evaluated at runtime. + Function can be used from ANY_ROUTE. Example 1.14. pv_var_to_xavp() usage @@ -395,7 +397,9 @@ $xavp("ok[0]=>foo") now is "foo indeed" 4.12. pv_xavp_to_var(xname) - Copy xavp values to vars. Reverse of pv_var_to_xavp(). + Copy xavp values into vars. Reverse of pv_var_to_xavp(). + + Both parameters can contain variables that are evaluated at runtime. Function can be used from ANY_ROUTE.

7 years

git:master:e9a132af: pv: notes about dynamic parameters for xavp to var funtions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e9a132afc0fa4b02a7030c2c20ade65a1d693006 URL: https://github.com/kamailio/kamailio/commit/e9a132afc0fa4b02a7030c2c20ade65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T13:49:05+02:00 pv: notes about dynamic parameters for xavp to var funtions --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e9a132afc0fa4b02a7030c2c20ade65… Patch: https://github.com/kamailio/kamailio/commit/e9a132afc0fa4b02a7030c2c20ade65… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 31929efa7f..bd5a7ab6f4 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -400,10 +400,16 @@ pv_xavp_print(); <function moreinfo="none">pv_var_to_xavp(varname, xname)</function> </title> <para> - Copy script variables values to a xavp. + Copy the script variable value into an xavp. </para> <para> - First parameter can be '*' in order to copy all script variables. Second parameter is the name of the destination xavp. If xavp already exists it will be reset first. + First parameter can be '*' in order to copy all script variables. + Second parameter is the name of the destination xavp. + If xavp already exists it will be reset first. + </para> + <para> + Both parameters can contain variables that are evaluated at + runtime. </para> <para> Function can be used from ANY_ROUTE. @@ -431,7 +437,11 @@ $xavp("ok[0]=>foo") now is "foo indeed" <function moreinfo="none">pv_xavp_to_var(xname)</function> </title> <para> - Copy xavp values to vars. Reverse of pv_var_to_xavp(). + Copy xavp values into vars. Reverse of pv_var_to_xavp(). + </para> + <para> + Both parameters can contain variables that are evaluated at + runtime. </para> <para> Function can be used from ANY_ROUTE.

7 years

git:master:45506c43: pv: support for dynamic params for var to xavp functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 45506c4343ae03450e33a04b9f2e9a3196d57306 URL: https://github.com/kamailio/kamailio/commit/45506c4343ae03450e33a04b9f2e9a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T13:45:28+02:00 pv: support for dynamic params for var to xavp functions --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/45506c4343ae03450e33a04b9f2e9a3… Patch: https://github.com/kamailio/kamailio/commit/45506c4343ae03450e33a04b9f2e9a3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c85d2015eb..ad33d3b899 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -538,10 +538,10 @@ static cmd_export_t cmds[]={ #ifdef WITH_XAVP {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE }, - {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, 0, 0, - ANY_ROUTE }, - {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, 0, 0, - ANY_ROUTE }, + {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, fixup_spve_spve, + fixup_free_spve_spve, ANY_ROUTE }, + {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE }, #endif {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, @@ -721,30 +721,38 @@ static int is_int(struct sip_msg* msg, char* pvar, char* s2) return -1; } +/** + * script variable to xavp + */ static int w_var_to_xavp(sip_msg_t *msg, char *s1, char *s2) { - str xname, varname; + str xname = STR_NULL; + str varname = STR_NULL; - if(s1 == NULL || s2 == NULL) { - LM_ERR("wrong parameters\n"); + if(fixup_get_svalue(msg, (gparam_t*)s1, &varname)<0) { + LM_ERR("failed to get the var name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)s2, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); return -1; } - varname.len = strlen(s1); varname.s = s1; - xname.s = s2; xname.len = strlen(s2); return pv_var_to_xavp(&varname, &xname); } +/** + * xavp to script variable + */ static int w_xavp_to_var(sip_msg_t *msg, char *s1) { - str xname; + str xname = STR_NULL; - if(s1 == NULL) { - LM_ERR("wrong parameters\n"); + if(fixup_get_svalue(msg, (gparam_t*)s1, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); return -1; } - xname.s = s1; xname.len = strlen(s1); return pv_xavp_to_var(&xname); }

7 years

git:master:78722ff2: dialplan: catch error case from macro used inside dp_trans_fixup()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 78722ff2f1e290dc6ae41a4d718e9c4cea20926b URL: https://github.com/kamailio/kamailio/commit/78722ff2f1e290dc6ae41a4d718e9c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T10:54:20+02:00 dialplan: catch error case from macro used inside dp_trans_fixup() --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/78722ff2f1e290dc6ae41a4d718e9c4… Patch: https://github.com/kamailio/kamailio/commit/78722ff2f1e290dc6ae41a4d718e9c4… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index e5710fd828..7fd6245a31 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -332,7 +332,7 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) } -#define verify_par_type(_par_no, _spec)\ +#define verify_par_type(_par_no, _spec, _ret) \ do{\ if( ((_par_no == 1) \ && (_spec->type != PVT_AVP) && (_spec->type != PVT_XAVP) && \ @@ -343,7 +343,8 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) && (_spec->type!=PVT_RURI) && (_spec->type!=PVT_RURI_USERNAME))){\ \ LM_ERR("Unsupported Parameter TYPE[%d]\n", _spec->type);\ - return E_UNSPEC;\ + _ret = E_UNSPEC; \ + goto error; \ }\ }while(0); @@ -359,6 +360,7 @@ static int dp_trans_fixup(void ** param, int param_no){ dp_param_p dp_par= NULL; char *p, *s=NULL; str lstr; + int ret = E_INVALID_PARAMS; if(param_no!=1 && param_no!=2) return 0; @@ -384,8 +386,8 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = *param; lstr.len = strlen(*param); if(str2sint(&lstr, &dpid) != 0) { LM_ERR("bad number <%s>\n",(char *)(*param)); - pkg_free(dp_par); - return E_CFG; + ret = E_CFG; + goto error; } dp_par->type = DP_VAL_INT; @@ -394,11 +396,10 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); if (dp_par->v.sp[0]==NULL) { - pkg_free(dp_par); goto error; } - verify_par_type(param_no, dp_par->v.sp[0]); + verify_par_type(param_no, dp_par->v.sp[0], ret); dp_par->type = DP_VAL_SPEC; } } else { @@ -413,7 +414,6 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); if(dp_par->v.sp[0]==NULL) { - pkg_free(dp_par); goto error; } @@ -421,10 +421,9 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = s; lstr.len = strlen(s); dp_par->v.sp[1] = pv_cache_get(&lstr); if (dp_par->v.sp[1]==NULL) { - pkg_free(dp_par); goto error; } - verify_par_type(param_no, dp_par->v.sp[1]); + verify_par_type(param_no, dp_par->v.sp[1], ret); } dp_par->type = DP_VAL_SPEC; @@ -437,7 +436,9 @@ static int dp_trans_fixup(void ** param, int param_no){ error: LM_ERR("failed to parse param %i\n", param_no); - return E_INVALID_PARAMS; + if(dp_par) pkg_free(dp_par); + + return ret; } /**

7 years

git:4.4:4d49b33b: tsilo: coherent locking in ts_append

by Federico Cabiddu

Module: kamailio Branch: 4.4 Commit: 4d49b33b6f2418329b4ede1e166239bb0d93af9e URL: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:19:32+02:00 tsilo: coherent locking in ts_append (cherry picked from commit 34265457e7c09b56dec295b753fd8250ef8b0c41) --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… Patch: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index b0c605a0ee..b5c51393e5 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -46,32 +46,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -79,7 +78,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }

7 years

git:4.4:1765576b: tsilo: check return code for parse_uri()

by Federico Cabiddu

Module: kamailio Branch: 4.4 Commit: 1765576b013524e73131b9adb4d4ccb78de43658 URL: https://github.com/kamailio/kamailio/commit/1765576b013524e73131b9adb4d4ccb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:19:03+02:00 tsilo: check return code for parse_uri() (cherry picked from commit a19a06f6c302a7fbac9b137cc1558d47730ead2f) --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/1765576b013524e73131b9adb4d4ccb… Patch: https://github.com/kamailio/kamailio/commit/1765576b013524e73131b9adb4d4ccb… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index db47fdfad7..b0c605a0ee 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -51,9 +51,12 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { if (use_domain) { t_uri = ruri; - } - else { - parse_uri(ruri->s, ruri->len, &p_uri); + } else { + if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { + LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); + unlock_entry_by_ruri(ruri); + return -1; + } t_uri = &p_uri.user; }

7 years

git:5.0:41392baa: tsilo: coherent locking in ts_append

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 41392baa1b9d40e2d5cff5e532b2fe3b6c132bb6 URL: https://github.com/kamailio/kamailio/commit/41392baa1b9d40e2d5cff5e532b2fe3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:18:35+02:00 tsilo: coherent locking in ts_append (cherry picked from commit 34265457e7c09b56dec295b753fd8250ef8b0c41) --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/41392baa1b9d40e2d5cff5e532b2fe3… Patch: https://github.com/kamailio/kamailio/commit/41392baa1b9d40e2d5cff5e532b2fe3… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index e6e27e40cc..7d951865f0 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -45,32 +45,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -78,7 +77,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }

7 years

git:5.0:3bfc9d49: tsilo: check return code for parse_uri()

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 3bfc9d4955cf3edd64fe29aa3e88d23609360209 URL: https://github.com/kamailio/kamailio/commit/3bfc9d4955cf3edd64fe29aa3e88d23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:18:29+02:00 tsilo: check return code for parse_uri() (cherry picked from commit a19a06f6c302a7fbac9b137cc1558d47730ead2f) --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/3bfc9d4955cf3edd64fe29aa3e88d23… Patch: https://github.com/kamailio/kamailio/commit/3bfc9d4955cf3edd64fe29aa3e88d23… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 0076634109..e6e27e40cc 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -50,9 +50,12 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { if (use_domain) { t_uri = ruri; - } - else { - parse_uri(ruri->s, ruri->len, &p_uri); + } else { + if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { + LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); + unlock_entry_by_ruri(ruri); + return -1; + } t_uri = &p_uri.user; }

7 years

git:master:34265457: tsilo: coherent locking in ts_append

by Federico Cabiddu

Module: kamailio Branch: master Commit: 34265457e7c09b56dec295b753fd8250ef8b0c41 URL: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:16:21+02:00 tsilo: coherent locking in ts_append --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… Patch: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index e6e27e40cc..7d951865f0 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -45,32 +45,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -78,7 +77,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }

7 years

← Newer
1
...
15
16
17
18
19
20
21
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017