sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:master:99896b1f: kex: use snprintf() for rpc memory mod stats

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 99896b1f05830777decaa70384982c14f45a8a60 URL: https://github.com/kamailio/kamailio/commit/99896b1f05830777decaa70384982c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T14:29:51+02:00 kex: use snprintf() for rpc memory mod stats - safer to ensure it doesn't overflow the target buffer --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/99896b1f05830777decaa70384982c1… Patch: https://github.com/kamailio/kamailio/commit/99896b1f05830777decaa70384982c1… --- diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index 5f8f0555cf..4dd5fb1095 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -105,7 +105,7 @@ static int rpc_mod_print(rpc_t *rpc, void *ctx, const char *mname, while (iter) { if (strcmp(mname, iter->mname) == 0) { - sprintf(buff, "%s(%ld)", iter->func, iter->line); + snprintf(buff, 128, "%s(%ld)", iter->func, iter->line); if (rpc->struct_add(stats_th, "d", buff, iter->size) < 0) { rpc->fault(ctx, 500, "Internal error adding to struct rpc"); return -1;

5 years, 7 months

git:master:7e871382: modules: readme files regenerated - pv ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7e87138293589189101cef7f9dcb82f54794e5c7 URL: https://github.com/kamailio/kamailio/commit/7e87138293589189101cef7f9dcb82f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-16T09:32:36+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/7e87138293589189101cef7f9dcb82f… Patch: https://github.com/kamailio/kamailio/commit/7e87138293589189101cef7f9dcb82f…

5 years, 7 months

git:5.2:a829305a: uac: bug fix for uac module uac_replace* functions, register callbacks after start

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: a829305aa207ddcda3936a0ffab082cb93359efc URL: https://github.com/kamailio/kamailio/commit/a829305aa207ddcda3936a0ffab082c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:27+02:00 uac: bug fix for uac module uac_replace* functions, register callbacks after start - bug fix for uac module uac_replace* functions, register callbacks after restart - only applies to the dialog tracking mode of the module - the uac module was not using the available dialog callbacks for a proxy (re-)start - because of this the uac module was not able to properly re-write in-dialog messages like BYEs after a proxy restart - As we don't have access to the uac_flag at the dialog on load callback, we just install a callback for both from and to rewriting cases. If only one of the functions is used in the cfg hen the uac module will obviously not find database variables for the other case, and will log an error. This is of course also a bit inefficient, but as it only applies to this (re-)start case it does not matter. (cherry picked from commit aa7dee1ab874aaac807c2166f38ec9da0fa0ccf6) --- Modified: src/modules/uac/replace.c Modified: src/modules/uac/replace.h Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/a829305aa207ddcda3936a0ffab082c… Patch: https://github.com/kamailio/kamailio/commit/a829305aa207ddcda3936a0ffab082c…

5 years, 7 months

git:5.2:26fbc04b: uac: log an error if uac module should use the dialog module and it can't bind the API

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 26fbc04bcf925396ad928583d0d38b99ed296f57 URL: https://github.com/kamailio/kamailio/commit/26fbc04bcf925396ad928583d0d38b9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:22+02:00 uac: log an error if uac module should use the dialog module and it can't bind the API (cherry picked from commit e2de33b01efdd2c9799a1d5cf9d0e7d127a36416) --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/26fbc04bcf925396ad928583d0d38b9… Patch: https://github.com/kamailio/kamailio/commit/26fbc04bcf925396ad928583d0d38b9… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index d74c1cf47f..8528027f7e 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -295,14 +295,17 @@ static int mod_init(void) /* we need the append_fromtag on in RR */ memset(&dlg_api, 0, sizeof(struct dlg_binds)); - if (uac_restore_dlg==0 || load_dlg_api(&dlg_api)!=0) { + if (uac_restore_dlg==0) { if (!uac_rrb.append_fromtag) { LM_ERR("'append_fromtag' RR param is not enabled!" " - required by AUTO restore mode\n"); goto error; } - if (uac_restore_dlg!=0) - LM_DBG("failed to find dialog API - is dialog module loaded?\n"); + } else { + if (load_dlg_api(&dlg_api)!=0) { + LM_ERR("failed to find dialog API - is dialog module loaded?\n"); + goto error; + } } /* get all requests doing loose route */

5 years, 7 months

git:5.1:35e98c53: uac: bug fix for uac module uac_replace* functions, register callbacks after start

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 35e98c53e708c5acd23476adb54855d405a08f25 URL: https://github.com/kamailio/kamailio/commit/35e98c53e708c5acd23476adb54855d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:38+02:00 uac: bug fix for uac module uac_replace* functions, register callbacks after start - bug fix for uac module uac_replace* functions, register callbacks after restart - only applies to the dialog tracking mode of the module - the uac module was not using the available dialog callbacks for a proxy (re-)start - because of this the uac module was not able to properly re-write in-dialog messages like BYEs after a proxy restart - As we don't have access to the uac_flag at the dialog on load callback, we just install a callback for both from and to rewriting cases. If only one of the functions is used in the cfg hen the uac module will obviously not find database variables for the other case, and will log an error. This is of course also a bit inefficient, but as it only applies to this (re-)start case it does not matter. (cherry picked from commit aa7dee1ab874aaac807c2166f38ec9da0fa0ccf6) --- Modified: src/modules/uac/replace.c Modified: src/modules/uac/replace.h Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/35e98c53e708c5acd23476adb54855d… Patch: https://github.com/kamailio/kamailio/commit/35e98c53e708c5acd23476adb54855d…

5 years, 7 months

git:5.1:194dd20c: uac: log an error if uac module should use the dialog module and it can't bind the API

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 194dd20c78a71c65d6692df4553792e9039e5dcd URL: https://github.com/kamailio/kamailio/commit/194dd20c78a71c65d6692df4553792e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-16T09:30:32+02:00 uac: log an error if uac module should use the dialog module and it can't bind the API (cherry picked from commit e2de33b01efdd2c9799a1d5cf9d0e7d127a36416) --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/194dd20c78a71c65d6692df4553792e… Patch: https://github.com/kamailio/kamailio/commit/194dd20c78a71c65d6692df4553792e… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 844b6025ff..05b7f2144d 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -286,14 +286,17 @@ static int mod_init(void) /* we need the append_fromtag on in RR */ memset(&dlg_api, 0, sizeof(struct dlg_binds)); - if (uac_restore_dlg==0 || load_dlg_api(&dlg_api)!=0) { + if (uac_restore_dlg==0) { if (!uac_rrb.append_fromtag) { LM_ERR("'append_fromtag' RR param is not enabled!" " - required by AUTO restore mode\n"); goto error; } - if (uac_restore_dlg!=0) - LM_DBG("failed to find dialog API - is dialog module loaded?\n"); + } else { + if (load_dlg_api(&dlg_api)!=0) { + LM_ERR("failed to find dialog API - is dialog module loaded?\n"); + goto error; + } } /* get all requests doing loose route */

5 years, 7 months

git:master:a690d0a4: pv: docs for xavp_set_child_ival() and xavp_set_child_sval()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a690d0a44f62acb8c5b02c017f11c510747f9c13 URL: https://github.com/kamailio/kamailio/commit/a690d0a44f62acb8c5b02c017f11c51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T09:16:08+02:00 pv: docs for xavp_set_child_ival() and xavp_set_child_sval() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a690d0a44f62acb8c5b02c017f11c51… Patch: https://github.com/kamailio/kamailio/commit/a690d0a44f62acb8c5b02c017f11c51… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index f5faa0ab11..98aded0063 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -323,6 +323,58 @@ $xavp(x[0]=>c) = "d"; $xavp(x[0]=>a) = "b"; xavp_params_implode("x", "$var(out)"); # results in: $var(out) is "a=b;c=d;e=f;" +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_set_child_ival"> + <title> + <function moreinfo="none">xavp_set_child_ival(rname, cname, ival)</function> + </title> + <para> + Set the value of $xavp(rname=>cname) to integer value ival. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter name of child XAVP. The third parameter + can be an integer number or a variable holding an integer. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_set_child_ival</function> usage</title> + <programlisting format="linespecific"> +... +$var(n) = 10; +xavp_set_child_ival("x", "y", "$var(n)"); +# results in: $xavp(x=>y) is 10 +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_set_child_sval"> + <title> + <function moreinfo="none">xavp_set_child_sval(rname, cname, sval)</function> + </title> + <para> + Set the value of $xavp(rname=>cname) to string value sval. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + The second parameter name of child XAVP. The third parameter + can be a static or dynamic (with variables) string. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_set_child_sval</function> usage</title> + <programlisting format="linespecific"> +... +$var(n) = 10; +xavp_set_child_sval("x", "y", "Count: $var(n)"); +# results in: $xavp(x=>y) is "Count: 10" ... </programlisting> </example>

5 years, 7 months

git:master:db9bf755: pv: exported functions to set the value for first xavp with child

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: db9bf755b8557979934a42a678ded08509e25635 URL: https://github.com/kamailio/kamailio/commit/db9bf755b8557979934a42a678ded08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T09:04:17+02:00 pv: exported functions to set the value for first xavp with child - xavp_set_child_ival(rname, cname, ival) - xavp_set_child_sval(rname, cname, sval) - exported to native config and kemi framework --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/db9bf755b8557979934a42a678ded08… Patch: https://github.com/kamailio/kamailio/commit/db9bf755b8557979934a42a678ded08…

5 years, 7 months

git:master:f60f116f: core: xavp - added functions to set first xavp with first child to int or str

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f60f116ff54e7199f392bace3d3571d5abc2663a URL: https://github.com/kamailio/kamailio/commit/f60f116ff54e7199f392bace3d3571d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T09:00:37+02:00 core: xavp - added functions to set first xavp with first child to int or str - similar to $xavp(x=>y) = v; - if that xavp doesn not exist, or $xavp(x[0]=>y[0]) = v; - if that xavp exists --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/f60f116ff54e7199f392bace3d3571d… Patch: https://github.com/kamailio/kamailio/commit/f60f116ff54e7199f392bace3d3571d… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 2fd5aaec49..1e25862650 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -896,6 +896,77 @@ sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname) return vavp; } +/** + * Set the value of the first xavp rname with first child xavp cname + * - replace if it exits; add if it doesn't exist + * - config operations: + * $xavp(rxname=>cname) = xval; + * or: + * $xavp(rxname[0]=>cname[0]) = xval; + */ +int xavp_set_child_xval(str *rname, str *cname, sr_xval_t *xval) +{ + sr_xavp_t *ravp=NULL; + sr_xavp_t *cavp=NULL; + + ravp = xavp_get(rname, NULL); + if(ravp) { + if(ravp->val.type != SR_XTYPE_XAVP) { + /* first root xavp does not have xavp list value - remove it */ + xavp_rm(ravp, NULL); + /* add a new xavp in the root list with a child */ + if(xavp_add_xavp_value(rname, cname, xval, NULL)==NULL) { + return -1; + } + } else { + /* first root xavp has an xavp list value */ + cavp = xavp_get(cname, ravp->val.v.xavp); + if(cavp) { + /* child xavp with same name - remove it */ + /* todo: update in place for int or if allocated size fits */ + xavp_rm(cavp, &ravp->val.v.xavp); + } + if(xavp_add_value(cname, xval, &ravp->val.v.xavp)==NULL) { + return -1; + } + } + } else { + /* no xavp with rname in root list found */ + if(xavp_add_xavp_value(rname, cname, xval, NULL)==NULL) { + return -1; + } + } + + return 0; +} + +/** + * + */ +int xavp_set_child_ival(str *rname, str *cname, int ival) +{ + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_INT; + xval.v.i = ival; + + return xavp_set_child_xval(rname, cname, &xval); +} + +/** + * + */ +int xavp_set_child_sval(str *rname, str *cname, str *sval) +{ + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = *sval; + + return xavp_set_child_xval(rname, cname, &xval); +} /** * serialize the values in subfields of an xavp in name=value; format diff --git a/src/core/xavp.h b/src/core/xavp.h index 83f4f09b15..c97123e190 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -108,6 +108,8 @@ sr_xavp_t* xavp_get_child_with_ival(str *rname, str *cname); sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname); int xavp_serialize_fields(str *rname, char *obuf, int olen); +int xavp_set_child_ival(str *rname, str *cname, int ival); +int xavp_set_child_sval(str *rname, str *cname, str *sval); #endif #endif

5 years, 7 months

git:master:77e356f8: core: mod fix - added fixup_free_igp_all() helper function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 77e356f8b5e865df6804315fb5943404d3aa8175 URL: https://github.com/kamailio/kamailio/commit/77e356f8b5e865df6804315fb594340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-16T08:59:48+02:00 core: mod fix - added fixup_free_igp_all() helper function --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/77e356f8b5e865df6804315fb594340… Patch: https://github.com/kamailio/kamailio/commit/77e356f8b5e865df6804315fb594340… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index f90237b915..27cdac471c 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -617,6 +617,14 @@ int fixup_igp_all(void** param, int param_no) return fixup_igp_null(param, 1); } +/** + * + */ +int fixup_free_igp_all(void** param, int param_no) +{ + return fixup_free_igp_null(param, 1); +} + /** * */ @@ -707,4 +715,4 @@ int fixup_free_none_spve(void** param, int param_no) if(param_no==2) return fixup_free_spve_null(param, 1); return 0; -} \ No newline at end of file +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index b3ab9b91ae..f040fc1b3c 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -140,6 +140,7 @@ int fixup_free_spve_str(void** param, int param_no); int fixup_spve_all(void** param, int param_no); int fixup_free_spve_all(void** param, int param_no); int fixup_igp_all(void** param, int param_no); +int fixup_free_igp_all(void** param, int param_no); int fixup_spve_igp(void** param, int param_no); int fixup_free_spve_igp(void** param, int param_no);

5 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019