- sr-dev - kamailio.org

git:master:99896b1f: kex: use snprintf() for rpc memory mod stats
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

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;

1 0

git:master:9cc1c638: kex: new rpc command mod.mem_statsx
by Daniel-Constantin Mierla 17 Apr '19

17 Apr '19

Module: kamailio Branch: master Commit: 9cc1c63888d6d1811819157aa57f12c4df9e08fb URL: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-17T09:56:34+02:00 kex: new rpc command mod.mem_statsx - print also the count of allocated chunks in summary - aliased old rpc mod.stats to mod.mem_stats to reflect better the purpose of printing memory usage stats --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c… Patch: https://github.com/kamailio/kamailio/commit/9cc1c63888d6d1811819157aa57f12c…

1 0

git:master:7e871382: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 16 Apr '19

16 Apr '19

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…

1 0

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 16 Apr '19

16 Apr '19

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 */

1 0

git:5.2:a829305a: uac: bug fix for uac module uac_replace* functions, register callbacks after start
by Henning Westerholt 16 Apr '19

16 Apr '19

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…

1 0

git:5.1:35e98c53: uac: bug fix for uac module uac_replace* functions, register callbacks after start
by Henning Westerholt 16 Apr '19

16 Apr '19

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…

1 0

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 16 Apr '19

16 Apr '19

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 */

1 0

git:master:a690d0a4: pv: docs for xavp_set_child_ival() and xavp_set_child_sval()
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

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>

1 0

git:master:db9bf755: pv: exported functions to set the value for first xavp with child
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

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…

1 0

git:master:77e356f8: core: mod fix - added fixup_free_igp_all() helper function
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

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);

1 0

git:master:f60f116f: core: xavp - added functions to set first xavp with first child to int or str
by Daniel-Constantin Mierla 16 Apr '19

16 Apr '19

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

1 0

git:master:f847fcd7: tls: fix shell syntax for preloaded .so usage
by Richard Fuchs 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: f847fcd720ccc62744c5cbea6c7db9f94b25a14a URL: https://github.com/kamailio/kamailio/commit/f847fcd720ccc62744c5cbea6c7db9f… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-04-15T07:26:40-04:00 tls: fix shell syntax for preloaded .so usage --- Modified: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/f847fcd720ccc62744c5cbea6c7db9f… Patch: https://github.com/kamailio/kamailio/commit/f847fcd720ccc62744c5cbea6c7db9f… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md index e446d66f72..26f5de84b4 100644 --- a/src/modules/tls/utils/openssl_mutex_shared/README.md +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -47,7 +47,7 @@ Kamailio. Example, when Kamailio was installed from sources: ``` -LD_PRELOAD=/usr/local/lib64/kamailio/openssl_mutex_shared/openssl_mutex_shared.so; \ +LD_PRELOAD=/usr/local/lib64/kamailio/openssl_mutex_shared/openssl_mutex_shared.so \ /usr/local/sbin/kamailio -f /usr/local/etc/kamailio/kamailio.cfg ```

1 0

[kamailio/kamailio] Preloaded library for openssl v1.1 process shared locking (#1927)
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Preloaded library to make libssl 1.1 use pthread locks with process shared option. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1927 -- Commit Summary -- * tls: add preloaded library to force process-shared locks * tls: added a readme for openssl_mutex_shared * tls: docs - short note about libssl 1.1.x and openssl_mutex_shared -- File Changes -- M src/modules/tls/Makefile (2) M src/modules/tls/doc/tls.xml (5) A src/modules/tls/utils/openssl_mutex_shared/Makefile (26) A src/modules/tls/utils/openssl_mutex_shared/README.md (53) A src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1927.patch https://github.com/kamailio/kamailio/pull/1927.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/1927

2 2

git:master:770c3972: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 770c39726dc36e4f278cd662e538c85015e5440c URL: https://github.com/kamailio/kamailio/commit/770c39726dc36e4f278cd662e538c85… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-15T11:31:48+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/770c39726dc36e4f278cd662e538c85… Patch: https://github.com/kamailio/kamailio/commit/770c39726dc36e4f278cd662e538c85…

1 0

git:master:01834fb2: registrar: docs for lookup_filter_mode parameter
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 01834fb2ddfb993a8680eabd42e0715309abf0ba URL: https://github.com/kamailio/kamailio/commit/01834fb2ddfb993a8680eabd42e0715… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-15T11:24:31+02:00 registrar: docs for lookup_filter_mode parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01834fb2ddfb993a8680eabd42e0715… Patch: https://github.com/kamailio/kamailio/commit/01834fb2ddfb993a8680eabd42e0715… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index a3c974203a..4ce4a6b995 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -999,6 +999,44 @@ end </programlisting> </example> </section> + <section id="registrar.p.lookup_filter_mode"> + <title><varname>lookup_filter_mode</varname> (int)</title> + <para> + Control what filters should be applied to lookup(...) operations. + It can be a combination (sum) of the next values: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>1</emphasis> - apply the branch flags filter - return + only contact records with branch flags matching at least one set + inside xavp specified by xavp_cfg parameter with inner name + rlf_bflags - e.g., $xavp(reg=>rlf_bflags). + </para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is NULL (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>xavp_cfg</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "xavp_cfg", "reg") +modparam("registrar", "lookup_filter_mode", 1) +... +request_route { + ... + $xavp(reg=>rlf_bflags) = 8; + if(lookup("location")) { ... } + ... +} +... + </programlisting> + </example> + </section> </section>

1 0

git:master:97f7d248: registrar: new parameter lookup_filter_mode
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 97f7d248f7ce1456c1b86e07c0389d376d547520 URL: https://github.com/kamailio/kamailio/commit/97f7d248f7ce1456c1b86e07c0389d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-15T11:22:45+02:00 registrar: new parameter lookup_filter_mode - control what filters should be applied for lookup(...) operations - filter values are specified via filed of xavp_cfg - implemented filter for branch flags matching --- Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/97f7d248f7ce1456c1b86e07c0389d3… Patch: https://github.com/kamailio/kamailio/commit/97f7d248f7ce1456c1b86e07c0389d3… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index f012d690ab..89a0b7f600 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -45,6 +45,54 @@ #include "lookup.h" #include "config.h" + +extern int reg_lookup_filter_mode; + +typedef struct reg_lookup_filter { + uint32_t factive; + uint32_t bflags; +} reg_lookup_filter_t; + +static reg_lookup_filter_t _reg_lookup_filter; + +static void reg_lookup_filter_init(void) +{ + str filter_bflags = str_init("rlf_bflags"); + sr_xavp_t *vavp = NULL; + + if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { + return; + } + memset(&_reg_lookup_filter, 0, sizeof(reg_lookup_filter_t)); + + if((reg_lookup_filter_mode & 1) + && (vavp = xavp_get_child_with_ival(&reg_xavp_cfg, + &filter_bflags)) != NULL) { + if(vavp->val.v.i != 0) { + _reg_lookup_filter.bflags = (uint32_t)vavp->val.v.i; + _reg_lookup_filter.factive = 1; + } + } + return; +} + +static int reg_lookup_filter_match(ucontact_t* ptr) +{ + if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { + return 1; + } + if(_reg_lookup_filter.factive==0) { + return 1; + } + if(_reg_lookup_filter.bflags!=0) { + if((_reg_lookup_filter.bflags & ptr->cflags)==0) { + return 0; + } + } + return 1; + +} + static int has_to_tag(struct sip_msg* msg) { if (parse_to_header(msg) < 0) return 0; @@ -223,6 +271,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) } get_act_time(); + reg_lookup_filter_init(); if(puri.gr.s==NULL || puri.gr_val.len>0) { @@ -251,10 +300,12 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) break; } } else { - /* no-gruu - found by address */ - LM_DBG("contact for [%.*s] found by address\n", - aor.len, ZSW(aor.s)); - break; + if(reg_lookup_filter_match(ptr)) { + /* no-gruu - found by address */ + LM_DBG("contact for [%.*s] found by address\n", + aor.len, ZSW(aor.s)); + break; + } } } else { LM_DBG("contact for [%.*s] cannot handle the SIP method\n", @@ -417,7 +468,8 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { - if (VALID_CONTACT(ptr, act_time) && allowed_method(_m, ptr)) { + if (VALID_CONTACT(ptr, act_time) && allowed_method(_m, ptr) + && reg_lookup_filter_match(ptr)) { path_dst.len = 0; if(ptr->path.s && ptr->path.len) { path_str = ptr->path; diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 5ea2a5f99c..4a9d6f5332 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -135,6 +135,8 @@ str sock_hdr_name = {0,0}; int reg_expire_event_rt = -1; /* default disabled */ str reg_event_callback = STR_NULL; +int reg_lookup_filter_mode = 0; + sr_kemi_eng_t *keng = NULL; #define RCV_NAME "received" @@ -239,6 +241,7 @@ static param_export_t params[] = { {"flow_timer", INT_PARAM, &reg_flow_timer }, {"contact_max_size", INT_PARAM, &contact_max_size }, {"event_callback", PARAM_STR, &reg_event_callback }, + {"lookup_filter_mode", INT_PARAM, &reg_lookup_filter_mode }, {0, 0, 0} };

1 0

git:master:96421ea0: registrar: detailed example for xavp_cfg parameter
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 96421ea051ff799943ae1c7b66251f97211aa125 URL: https://github.com/kamailio/kamailio/commit/96421ea051ff799943ae1c7b66251f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-15T11:09:26+02:00 registrar: detailed example for xavp_cfg parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/96421ea051ff799943ae1c7b66251f9… Patch: https://github.com/kamailio/kamailio/commit/96421ea051ff799943ae1c7b66251f9… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 7c4226ad3c..a3c974203a 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -730,6 +730,13 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <programlisting format="linespecific"> ... modparam("registrar", "xavp_cfg", "reg") +... +request_route { + ... + $xavp(reg=>max_contacts) = 4; + save("location"); + ... +} ... </programlisting> </example>

1 0

Re: [sr-dev] [SR-Users] Kamailio stop to process incoming SIP traffic via TCP.
by Richard Fuchs 15 Apr '19

15 Apr '19

Hi, (X-posted to sr-dev as this is getting into the nitty gritty) As a short-term workaround for this, I've been playing with the preloaded library approach to hijack the pthread mutex calls and force them to provide process-shared mutexes. AFAICT this seems to be working and only has the minuscule performance impact of using slower process-shared mutexes in all instances, even when they aren't required. The code for the preloaded library itself is very short and simple: https://gist.github.com/rfuchs/1bb7348b6acbe37e557d94c2f69a1498 As a more complete patch that integrates it into the build system (probably badly): https://gist.github.com/rfuchs/b240ffe87938a45e6f2a4cf53fe29f17 Finally it requires adding it to the startup script, for example in a systemd service file as: Environment='LD_PRELOAD=/usr/lib/x86_64-linux-gnu/kamailio/openssl_mutex_shared/openssl_mutex_shared.so' (that's with a hard coded path which isn't optimal of course). I don't consider this a proper fix, but only a hacky workaround, but it might be a solution for the very near future. Throwing it out there in case other people have been working on similar approaches, and/or maybe have some comments about this. Cheers On 01/04/2019 04.52, Daniel-Constantin Mierla wrote: > Hello, > > an update on this issue -- I spent a bit of time looking at > libssl/libcrypto library and the problem can be the type of mutexes they > use now internally starting with v1.1, respectively the pthread mutex. > They are not process shared and kamailio is a multi-process application, > working with the same tls connection from multiple processes. > > Today I wrote to openssl mailing list, waiting now to see if I get any > hints from there. > > Cheers, > Daniel > > On 01.04.19 10:33, Kristijan Vrban wrote: >> Hi Andrew, >> >> yes, with openssl 1.0.2 Kamailio is now up and running since five >> days. Looks good so far. >> >> Kristijan >> >> Am Do., 28. März 2019 um 11:09 Uhr schrieb Andrew Pogrebennyk >> <apogrebennyk(a)sipwise.com>: >>> On 3/26/19 3:52 PM, Kristijan Vrban wrote: >>>>> Just curious, did you get to compile with OpenSSL 1.0 and test? >>>> Just compiled with OpenSSL 1.0 . Gone test now. >>> Kristijan, >>> any new occurrences since you have recompiled kamailio with openssl 1.0? >>> >>> Regards, >>> Andrew >> _______________________________________________ >> Kamailio (SER) - Users Mailing List >> sr-users(a)lists.kamailio.org >> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users

2 4

git:master:387533b0: tls: openssl_mutex_shared - note about ability to be used independent of Kamailio
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 387533b04f7bf6d8b1e4e90d38f462639ba03ee2 URL: https://github.com/kamailio/kamailio/commit/387533b04f7bf6d8b1e4e90d38f4626… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-15T08:52:24+02:00 tls: openssl_mutex_shared - note about ability to be used independent of Kamailio --- Modified: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/387533b04f7bf6d8b1e4e90d38f4626… Patch: https://github.com/kamailio/kamailio/commit/387533b04f7bf6d8b1e4e90d38f4626… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md index 9f2e9c57e3..e446d66f72 100644 --- a/src/modules/tls/utils/openssl_mutex_shared/README.md +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -34,6 +34,11 @@ For Debian packing, the location is like: /usr/lib/x86_64-linux-gnu/kamailio/openssl_mutex_shared/openssl_mutex_shared.so ``` +Note: there is no dependency on Kamailio source code, this shared object can +be compiled and used ouside of Kamailio source tree. It uses only Kamailio's +Makefile system to install in the same directory like the other shared objects +installed by Kamailio. + ## Usage ## Use LD_PRELOAD to tell the linker to preload this shared object before starting

1 0

git:master:84002ae9: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 84002ae99524bdb2aba4c724a86074f88bea1ffe URL: https://github.com/kamailio/kamailio/commit/84002ae99524bdb2aba4c724a86074f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-15T08:46:56+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/84002ae99524bdb2aba4c724a86074f… Patch: https://github.com/kamailio/kamailio/commit/84002ae99524bdb2aba4c724a86074f… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index a94c179dac..4b724210cb 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -273,6 +273,10 @@ request_route { options, run kamailio -V and look for USE_TLS and TLS_HOOKS among the flags. + For OpenSSL (libssl) v1.1.x, it is required to preload + 'openssl_mutex_shared' library shipped by Kamailio. For more details + see 'src/modules/tls/openssl_mutex_shared/README.md'. + This module includes several workarounds for various Openssl bugs (like compression and Kerberos using the wrong memory allocations functions, low memory problems a.s.o). On startup it will try to enable the needed

1 0

git:master:ef09ff97: Merge pull request #1927 from kamailio/rfuchs/openssl-locking-fix
by GitHub 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: ef09ff976bb06185d9b50abe0f1564d8fc3e1a7c URL: https://github.com/kamailio/kamailio/commit/ef09ff976bb06185d9b50abe0f1564d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-15T08:38:33+02:00 Merge pull request #1927 from kamailio/rfuchs/openssl-locking-fix Preloaded library for openssl v1.1 process shared locking --- Added: src/modules/tls/utils/openssl_mutex_shared/Makefile Added: src/modules/tls/utils/openssl_mutex_shared/README.md Added: src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c Modified: src/modules/tls/Makefile Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef09ff976bb06185d9b50abe0f1564d… Patch: https://github.com/kamailio/kamailio/commit/ef09ff976bb06185d9b50abe0f1564d…

1 0

git:master:ee32a6ee: tls: docs - short note about libssl 1.1.x and openssl_mutex_shared
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: ee32a6ee4cb6201c834e3c39a0ae24d9dfa966d9 URL: https://github.com/kamailio/kamailio/commit/ee32a6ee4cb6201c834e3c39a0ae24d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-12T09:09:38+02:00 tls: docs - short note about libssl 1.1.x and openssl_mutex_shared --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/ee32a6ee4cb6201c834e3c39a0ae24d… Patch: https://github.com/kamailio/kamailio/commit/ee32a6ee4cb6201c834e3c39a0ae24d… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index fe10eec08a..b5ea415ae7 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -121,6 +121,11 @@ request_route { To quickly check if your Kamailio version was compiled with these options, run kamailio -V and look for USE_TLS and TLS_HOOKS among the flags. </para> + <para> + For OpenSSL (libssl) v1.1.x, it is required to preload + 'openssl_mutex_shared' library shipped by &kamailio;. For more details + see 'src/modules/tls/openssl_mutex_shared/README.md'. + </para> <para> This module includes several workarounds for various Openssl bugs (like compression and Kerberos using the wrong memory allocations

1 0

git:master:efdc141e: tls: add preloaded library to force process-shared locks
by Richard Fuchs 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: efdc141ecb5ff72e3224e47deaaa79fe02576dd2 URL: https://github.com/kamailio/kamailio/commit/efdc141ecb5ff72e3224e47deaaa79f… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-04-11T14:29:48-04:00 tls: add preloaded library to force process-shared locks This is a hacky workaround for OpenSSL >= 1.1 which uses internal locking and doesn't support locks in memory shared across multiple processes. --- Added: src/modules/tls/utils/openssl_mutex_shared/Makefile Added: src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/efdc141ecb5ff72e3224e47deaaa79f… Patch: https://github.com/kamailio/kamailio/commit/efdc141ecb5ff72e3224e47deaaa79f… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index b17a305073..1505bc64ea 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -33,6 +33,8 @@ LIBS+= $(TLS_EXTRA_LIBS) # dcm: tls.cfg installed via local 'install-cfg' to update paths #MOD_INSTALL_CFGS=tls.cfg +MOD_INSTALL_UTILS=utils/openssl_mutex_shared + include ../../Makefile.modules install-tls-cert: $(cfg_prefix)/$(cfg_dir) diff --git a/src/modules/tls/utils/openssl_mutex_shared/Makefile b/src/modules/tls/utils/openssl_mutex_shared/Makefile new file mode 100644 index 0000000000..8edfe13a60 --- /dev/null +++ b/src/modules/tls/utils/openssl_mutex_shared/Makefile @@ -0,0 +1,26 @@ +COREPATH=../../../../../src +include $(COREPATH)/Makefile.defs +include $(COREPATH)/Makefile.targets + + +.PHONY: all +all: openssl_mutex_shared.so + +.PHONY: install-if-newer +install-if-newer: install + +.PHONY: install +install: install-modules + +.PHONY: install-modules +install-modules: openssl_mutex_shared.so + mkdir -p $(modules_prefix)/$(lib_dir)/openssl_mutex_shared + $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/openssl_mutex_shared/openssl_mutex_shared.so + $(INSTALL_BIN) openssl_mutex_shared.so $(modules_prefix)/$(lib_dir)/openssl_mutex_shared + +openssl_mutex_shared.so: openssl_mutex_shared.c + $(CC) -g -D_GNU_SOURCE -std=c99 -fvisibility=hidden -pthread -o $@ -O3 -Wall -shared -fPIC -ldl $< + +.PHONY: clean +clean: + rm -f openssl_mutex_shared.so diff --git a/src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c b/src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c new file mode 100644 index 0000000000..00c9c8056e --- /dev/null +++ b/src/modules/tls/utils/openssl_mutex_shared/openssl_mutex_shared.c @@ -0,0 +1,46 @@ +#include <pthread.h> +#include <dlfcn.h> + +#define SYMBOL_EXPORT __attribute__((visibility("default"))) + +int SYMBOL_EXPORT pthread_mutex_init (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) +{ + static int (*real_pthread_mutex_init)(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr); + if (!real_pthread_mutex_init) + real_pthread_mutex_init = dlsym(RTLD_NEXT, "pthread_mutex_init"); + + if (__mutexattr) { + pthread_mutexattr_t attr = *__mutexattr; + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + return real_pthread_mutex_init(__mutex, &attr); + } + + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + int ret = real_pthread_mutex_init(__mutex, &attr); + pthread_mutexattr_destroy(&attr); + return ret; +} + +int SYMBOL_EXPORT pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock, + const pthread_rwlockattr_t *__restrict __attr) +{ + static int (*real_pthread_rwlock_init)(pthread_rwlock_t *__restrict __rwlock, + const pthread_rwlockattr_t *__restrict __attr); + if (!real_pthread_rwlock_init) + real_pthread_rwlock_init = dlsym(RTLD_NEXT, "pthread_rwlock_init"); + + if (__attr) { + pthread_rwlockattr_t attr = *__attr; + pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + return real_pthread_rwlock_init(__rwlock, &attr); + } + + pthread_rwlockattr_t attr; + pthread_rwlockattr_init(&attr); + pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED); + int ret = real_pthread_rwlock_init(__rwlock, &attr); + pthread_rwlockattr_destroy(&attr); + return ret; +}

1 0

git:master:4c0aa78b: tls: added a readme for openssl_mutex_shared
by Daniel-Constantin Mierla 15 Apr '19

15 Apr '19

Module: kamailio Branch: master Commit: 4c0aa78b057b155c2f2b224457790169f5bf8eda URL: https://github.com/kamailio/kamailio/commit/4c0aa78b057b155c2f2b22445779016… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-12T09:03:58+02:00 tls: added a readme for openssl_mutex_shared --- Added: src/modules/tls/utils/openssl_mutex_shared/README.md --- Diff: https://github.com/kamailio/kamailio/commit/4c0aa78b057b155c2f2b22445779016… Patch: https://github.com/kamailio/kamailio/commit/4c0aa78b057b155c2f2b22445779016… --- diff --git a/src/modules/tls/utils/openssl_mutex_shared/README.md b/src/modules/tls/utils/openssl_mutex_shared/README.md new file mode 100644 index 0000000000..9f2e9c57e3 --- /dev/null +++ b/src/modules/tls/utils/openssl_mutex_shared/README.md @@ -0,0 +1,53 @@ +# OpenSSL Shared Mutex # + +This is a shared library required as a short term workaround for using Kamailio +with OpenSSL (libssl) v1.1. It has to be pre-loaded before starting Kamailio. + +In v1.1, libssl does not allow setting custom locking functions, using internally +pthread mutexes and rwlocks, but they are not initialized with process shared +option (PTHREAD_PROCESS_SHARED), which can result in blocking Kamailio worker +processes. + +## Installation ## + +By default, it is installed when the tls module is installed. + +It can be installed manually, in this folder execute: + +``` +make +make install +``` + +It is installed at the same place where Kamailio deploys the directory with +modules. + +For example, when installing from sources on a 64b system, the location is: + +``` +/usr/local/lib64/kamailio/openssl_mutex_shared/openssl_mutex_shared.so +``` + +For Debian packing, the location is like: + +``` +/usr/lib/x86_64-linux-gnu/kamailio/openssl_mutex_shared/openssl_mutex_shared.so +``` + +## Usage ## + +Use LD_PRELOAD to tell the linker to preload this shared object before starting +Kamailio. + +Example, when Kamailio was installed from sources: + +``` +LD_PRELOAD=/usr/local/lib64/kamailio/openssl_mutex_shared/openssl_mutex_shared.so; \ + /usr/local/sbin/kamailio -f /usr/local/etc/kamailio/kamailio.cfg +``` + +If using systemd, add to service file: + +``` +Environment='LD_PRELOAD=/usr/local/lib64/kamailio/openssl_mutex_shared/openssl_mutex_shared.so' +```

1 0

git:master:5590c62e: acc: several log messages fixes related to dialog callback
by Henning Westerholt 13 Apr '19

13 Apr '19

Module: kamailio Branch: master Commit: 5590c62e4a98d59d542db2bab8f176e07f874d65 URL: https://github.com/kamailio/kamailio/commit/5590c62e4a98d59d542db2bab8f176e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-13T20:00:13+02:00 acc: several log messages fixes related to dialog callback --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/5590c62e4a98d59d542db2bab8f176e… Patch: https://github.com/kamailio/kamailio/commit/5590c62e4a98d59d542db2bab8f176e… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index 09dcaedac0..8a0cdfa2a4 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -809,7 +809,7 @@ static void cdr_on_create( struct dlg_cell* dialog, } } -/* callback for loading a dialog frm database */ +/* callback for loading a dialog from database */ static void cdr_on_load( struct dlg_cell* dialog, int type, struct dlg_cb_params* params) @@ -863,7 +863,7 @@ static void cdr_on_load( struct dlg_cell* dialog, return; } - LM_DBG("dialog '%p' loaded!", dialog); + LM_DBG("dialog '%p' loaded and callbacks registered\n", dialog); } @@ -933,7 +933,7 @@ int init_cdr_generation( void) if( dlgb.register_dlgcb( 0, DLGCB_LOADED, cdr_on_load, 0, 0) != 0) { - LM_ERR("can't register on load callback\n"); + LM_ERR("can't register create callback\n"); return -1; }

1 0

git:master:aa7dee1a: uac: bug fix for uac module uac_replace* functions, register callbacks after start
by Henning Westerholt 13 Apr '19

13 Apr '19

Module: kamailio Branch: master Commit: aa7dee1ab874aaac807c2166f38ec9da0fa0ccf6 URL: https://github.com/kamailio/kamailio/commit/aa7dee1ab874aaac807c2166f38ec9d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-13T19:52:03+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. --- 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/aa7dee1ab874aaac807c2166f38ec9d… Patch: https://github.com/kamailio/kamailio/commit/aa7dee1ab874aaac807c2166f38ec9d…

1 0

git:master:e2de33b0: uac: log an error if uac module should use the dialog module and it can't bind the API
by Henning Westerholt 13 Apr '19

13 Apr '19

Module: kamailio Branch: master Commit: e2de33b01efdd2c9799a1d5cf9d0e7d127a36416 URL: https://github.com/kamailio/kamailio/commit/e2de33b01efdd2c9799a1d5cf9d0e7d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-13T13:23:08+02:00 uac: log an error if uac module should use the dialog module and it can't bind the API --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/e2de33b01efdd2c9799a1d5cf9d0e7d… Patch: https://github.com/kamailio/kamailio/commit/e2de33b01efdd2c9799a1d5cf9d0e7d… --- 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 */

1 0

git:master:6a8bdbac: acc: fix spelling error in log message related to dialog callbacks
by Henning Westerholt 13 Apr '19

13 Apr '19

Module: kamailio Branch: master Commit: 6a8bdbaca313287080072b9eb518c403bef94113 URL: https://github.com/kamailio/kamailio/commit/6a8bdbaca313287080072b9eb518c40… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-13T13:21:25+02:00 acc: fix spelling error in log message related to dialog callbacks --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/6a8bdbaca313287080072b9eb518c40… Patch: https://github.com/kamailio/kamailio/commit/6a8bdbaca313287080072b9eb518c40… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index 6a7862dd74..09dcaedac0 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -933,7 +933,7 @@ int init_cdr_generation( void) if( dlgb.register_dlgcb( 0, DLGCB_LOADED, cdr_on_load, 0, 0) != 0) { - LM_ERR("can't register create callback\n"); + LM_ERR("can't register on load callback\n"); return -1; }

1 0

git:master:6ed93bc8: pkg/kamailio/deb: bionic can't use libssl1.0-dev due conflicts with libcurl4-openssl-dev dependencies
by Victor Seva 12 Apr '19

12 Apr '19

Module: kamailio Branch: master Commit: 6ed93bc8b3fdaa0919ad4aa427cb99891eadbdd2 URL: https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb998… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-12T14:52:55+02:00 pkg/kamailio/deb: bionic can't use libssl1.0-dev due conflicts with libcurl4-openssl-dev dependencies > The following packages have unmet dependencies: > libcurl4-openssl-dev : Conflicts: libssl1.0-dev but 1.0.2n-1ubuntu5 is to be installed > libssl-dev : Conflicts: libssl1.0-dev but 1.0.2n-1ubuntu5 is to be installed > libssl1.0-dev : Conflicts: libssl-dev but 1.1.0g-2ubuntu4 is to be installed > Unable to resolve dependencies! Giving up... --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/control --- Diff: https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb998… Patch: https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb998… --- diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control index b38ce443c7..338568ab73 100644 --- a/pkg/kamailio/deb/bionic/control +++ b/pkg/kamailio/deb/bionic/control @@ -42,7 +42,7 @@ Build-Depends: libsctp-dev, libsnmp-dev, libsqlite3-dev, - libssl1.0-dev, + libssl-dev, libsystemd-dev, libunistring-dev, libxml2-dev, diff --git a/pkg/kamailio/deb/debian/backports/bionic b/pkg/kamailio/deb/debian/backports/bionic index d0848153b3..8512ae421f 100755 --- a/pkg/kamailio/deb/debian/backports/bionic +++ b/pkg/kamailio/deb/debian/backports/bionic @@ -25,8 +25,8 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules -# use libssl1.0-dev -sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control +# libssl1.0-dev conflicts with libcurl4-openssl-dev dependencies +sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control wrap-and-sort -sat -d ${DIST} diff --git a/pkg/kamailio/deb/debian/backports/buster b/pkg/kamailio/deb/debian/backports/buster index 969909e4d9..a4c4473827 100755 --- a/pkg/kamailio/deb/debian/backports/buster +++ b/pkg/kamailio/deb/debian/backports/buster @@ -26,7 +26,7 @@ sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules # no libssl-dev 1.0 -sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control +sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control wrap-and-sort -sat -d ${DIST} diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index 9e7d792173..6b1c5d4eac 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -26,7 +26,7 @@ sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules # no libssl-dev 1.0 -sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control +sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control wrap-and-sort -sat -d ${DIST} diff --git a/pkg/kamailio/deb/debian/backports/stretch b/pkg/kamailio/deb/debian/backports/stretch index 05a4705f87..0f9780acf0 100755 --- a/pkg/kamailio/deb/debian/backports/stretch +++ b/pkg/kamailio/deb/debian/backports/stretch @@ -23,7 +23,7 @@ sed -i 's/libmongoc-dev/libbson-dev,\n libmongoc-dev/' \ ${DIST}/control # use libssl1.0-dev -sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control +sed -i -e 's/libssl-dev (<<1.1)/libssl1.0-dev/' ${DIST}/control wrap-and-sort -sat -d ${DIST} diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 7581509dca..ffe8437181 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -43,7 +43,7 @@ Build-Depends: libsctp-dev, libsnmp-dev, libsqlite3-dev, - libssl-dev (<1.1), + libssl-dev (<<1.1), libsystemd-dev, libunistring-dev, libval-dev,

1 0

git:master:0ac9dba4: pkg/kamailio/deb: switch to libssl version 1.0 where available
by Victor Seva 12 Apr '19

12 Apr '19

Module: kamailio Branch: master Commit: 0ac9dba4cfbab0e13f3819166849d13d28ff522f URL: https://github.com/kamailio/kamailio/commit/0ac9dba4cfbab0e13f3819166849d13… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-12T09:46:59+02:00 pkg/kamailio/deb: switch to libssl version 1.0 where available --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/stretch/control --- Diff: https://github.com/kamailio/kamailio/commit/0ac9dba4cfbab0e13f3819166849d13… Patch: https://github.com/kamailio/kamailio/commit/0ac9dba4cfbab0e13f3819166849d13… --- diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control index 338568ab73..b38ce443c7 100644 --- a/pkg/kamailio/deb/bionic/control +++ b/pkg/kamailio/deb/bionic/control @@ -42,7 +42,7 @@ Build-Depends: libsctp-dev, libsnmp-dev, libsqlite3-dev, - libssl-dev, + libssl1.0-dev, libsystemd-dev, libunistring-dev, libxml2-dev, diff --git a/pkg/kamailio/deb/debian/backports/bionic b/pkg/kamailio/deb/debian/backports/bionic index dbbe2fc694..d0848153b3 100755 --- a/pkg/kamailio/deb/debian/backports/bionic +++ b/pkg/kamailio/deb/debian/backports/bionic @@ -25,6 +25,9 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules +# use libssl1.0-dev +sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/debian/backports/buster b/pkg/kamailio/deb/debian/backports/buster index 82a41a8d4f..969909e4d9 100755 --- a/pkg/kamailio/deb/debian/backports/buster +++ b/pkg/kamailio/deb/debian/backports/buster @@ -25,6 +25,9 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules +# no libssl-dev 1.0 +sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index 8161de7269..9e7d792173 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -25,6 +25,9 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules +# no libssl-dev 1.0 +sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/debian/backports/stretch b/pkg/kamailio/deb/debian/backports/stretch index cf528bdeba..05a4705f87 100755 --- a/pkg/kamailio/deb/debian/backports/stretch +++ b/pkg/kamailio/deb/debian/backports/stretch @@ -22,6 +22,9 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules sed -i 's/libmongoc-dev/libbson-dev,\n libmongoc-dev/' \ ${DIST}/control +# use libssl1.0-dev +sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index e8077280ae..7581509dca 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -43,7 +43,7 @@ Build-Depends: libsctp-dev, libsnmp-dev, libsqlite3-dev, - libssl-dev, + libssl-dev (<1.1), libsystemd-dev, libunistring-dev, libval-dev, diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index 7e87c253f0..2fbd439dde 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -44,7 +44,7 @@ Build-Depends: libsctp-dev, libsnmp-dev, libsqlite3-dev, - libssl-dev, + libssl1.0-dev, libsystemd-dev, libunistring-dev, libxml2-dev,

1 0

Audio missing during call
by Gaurav Bmotra 12 Apr '19

12 Apr '19

HI i have install Kamailio 5.1.2 on Ubuntu 18.4 there is a audio issue , when we call call from one extension to another ,, in bigning call goes good , after 9-10 sec it miss audio for one side (one side can hear other side can't hear ) plz help -- *Regards:* Gaurav Kumar

2 1

git:5.2:3226ccb4: core: parse - validity check for contact uri size and more verbose log message
by Henning Westerholt 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.2 Commit: 3226ccb44ba6becfffe8ba36464a7756ceb03342 URL: https://github.com/kamailio/kamailio/commit/3226ccb44ba6becfffe8ba36464a775… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T21:54:52+02:00 core: parse - validity check for contact uri size and more verbose log message (cherry picked from commit 69f9b0a4d5261ec5b6d8d7163b3809a9bb24916d) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/3226ccb44ba6becfffe8ba36464a775… Patch: https://github.com/kamailio/kamailio/commit/3226ccb44ba6becfffe8ba36464a775… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 4c534ece77..c87e329864 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -182,6 +182,9 @@ int parse_contacts(str* _s, contact_t** _c) { contact_t* c; param_hooks_t hooks; + str sv; + + sv = *_s; while(1) { /* Allocate and clear contact structure */ @@ -220,6 +223,10 @@ int parse_contacts(str* _s, contact_t** _c) } trim(&c->uri); + if((c->uri.len <= 0) || (c->uri.s + c->uri.len > sv.s + sv.len)) { + LM_ERR("invlid contact uri\n"); + goto error; + } if (_s->len == 0) goto ok; @@ -264,6 +271,8 @@ int parse_contacts(str* _s, contact_t** _c) } error: + LM_ERR("failure parsing '%.*s' (%d) [%p/%p/%d]\n", sv.len, sv.s, sv.len, + sv.s, _s->s, (int)(_s->s - sv.s)); if (c) pkg_free(c); free_contacts(_c); /* Free any contacts created so far */ return -1;

1 0

git:5.1:45ac770d: core: parse - validity check for contact uri size and more verbose log message
by Henning Westerholt 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.1 Commit: 45ac770d7e261b4d6d282725de1a5401df8639b6 URL: https://github.com/kamailio/kamailio/commit/45ac770d7e261b4d6d282725de1a540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T21:54:45+02:00 core: parse - validity check for contact uri size and more verbose log message (cherry picked from commit 69f9b0a4d5261ec5b6d8d7163b3809a9bb24916d) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/45ac770d7e261b4d6d282725de1a540… Patch: https://github.com/kamailio/kamailio/commit/45ac770d7e261b4d6d282725de1a540… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 4c534ece77..c87e329864 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -182,6 +182,9 @@ int parse_contacts(str* _s, contact_t** _c) { contact_t* c; param_hooks_t hooks; + str sv; + + sv = *_s; while(1) { /* Allocate and clear contact structure */ @@ -220,6 +223,10 @@ int parse_contacts(str* _s, contact_t** _c) } trim(&c->uri); + if((c->uri.len <= 0) || (c->uri.s + c->uri.len > sv.s + sv.len)) { + LM_ERR("invlid contact uri\n"); + goto error; + } if (_s->len == 0) goto ok; @@ -264,6 +271,8 @@ int parse_contacts(str* _s, contact_t** _c) } error: + LM_ERR("failure parsing '%.*s' (%d) [%p/%p/%d]\n", sv.len, sv.s, sv.len, + sv.s, _s->s, (int)(_s->s - sv.s)); if (c) pkg_free(c); free_contacts(_c); /* Free any contacts created so far */ return -1;

1 0

[kamailio/kamailio] KSR.drop() from python script does not take effect for TOPOS module (#1924)
by Kirill Usov 11 Apr '19

11 Apr '19

### Description I am using kamailio with Python scripting and TOPOS module to hide topology. The issue is that I cannot skip topology hiding for internal network. Documentation says: ``` It is executed before doing topology stripping processing for an outgoing SIP message. If 'drop' is executed inside the event route, then the module skips doing the topology hiding. event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { drop; } } ``` My code is: ``` def ksr_topos_event(self, msg, evname): if evname == "topos:msg-outgoing": to_ip = KSR.pv.get("$sndto(ip)") node = self.__configuration.freeswitch_nodes.get(to_ip) if node: KSR.drop() return 1 ``` I see in the log file that KSR.drop() method is called. But with no effect, headers of INVITE message to internal infrastructure were modified by TOPOS module. #### Configuration file ``` #!KAMAILIO debug=4 #log_stderror=yes memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes */ children=8 /* uncomment the next line to disable TCP (default on) */ disable_tcp=yes /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ auto_aliases=no /* uncomment and configure the following line if you want Kamailio to * bind on a specific interface/port/proto (default bind on all available) */ listen=udp:10.164.0.10:5060 advertise 35.204.224.219:5060 port=5060 ####### Modules Section ######## /* set paths to location of modules */ # mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" loadmodule "ctl.so" loadmodule "tm.so" loadmodule "corex.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "auth.so" loadmodule "dispatcher.so" loadmodule "db_sqlite.so" loadmodule "app_python.so" loadmodule "htable.so" loadmodule "rr.so" loadmodule "dialog.so" #loadmodule "rtpengine.so" loadmodule "topos.so" # ----------------- setting module-specific parameters --------------- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 3000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) modparam("tm", "contacts_avp", "tm_contacts") modparam("tm", "contact_flows_avp", "tm_contact_flows") modparam("tm", "remap_503_500", 0) modparam("dispatcher", "list_file", "/opt/balancer/dispatcher.conf") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") modparam("dispatcher", "grp_avp", "$avp(AVP_GRP)") modparam("dispatcher", "cnt_avp", "$avp(AVP_CNT)") #set next two parameters if you want to enable balance alg. no. 10 #modparam("dispatcher", "dstid_avp", "$avp(dsdstid)") #modparam("dispatcher", "ds_hash_size", 8) modparam("dispatcher", "ds_ping_interval", 120) modparam("dispatcher", "ds_ping_from", "sip:kamailio@simberry.com") #modparam("dispatcher", "ds_ping_method", "INFO") modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_probing_threshold", 1) #configure codes or classes of SIP replies to list only allowed replies (i.e. when temporarily unavailable=480) modparam("dispatcher", "ds_ping_reply_codes", "class=2;code=480;code=404") modparam("htable", "htable", "a=>size=12;autoexpire=3600;dbmode=1;dbtable=htable") modparam("htable", "db_url", "sqlite:///opt/balancer/kamailio.sqlite") modparam("htable", "db_expires", 1) modparam("htable", "fetch_rows", 1000) modparam("htable", "timer_interval", 5) modparam("htable", "timer_procs", 1) modparam("dialog", "dlg_flag", 5) modparam("dialog", "db_url", "sqlite:///opt/balancer/kamailio.sqlite") modparam("dialog", "db_mode", 1) #modparam("dialog", "db_update_period", 30) modparam("dialog", "db_fetch_rows", 1000) modparam("dialog", "default_timeout", 7500) modparam("dialog", "early_timeout", 400) modparam("dialog", "end_timeout", 60) modparam("topos", "db_url", "sqlite:///opt/balancer/kamailio.sqlite") modparam("topos", "clean_interval", 300) modparam("topos", "event_callback", "ksr_topos_event") #modparam("rtpengine", "rtpengine_sock", "udp:localhost:2223") # ####### Routing Logic ######## modparam("app_python", "script_name", "/opt/balancer/load_balancer.py") cfgengine "python" ``` #### Log Messages ``` Apr 8 09:38:40 vp-balancer-dev-01 /usr/sbin/kamailio[26752]: {1 1 INVITE 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE} DEBUG: topos [topos_mod.c:477]: tps_execute_event_route(): executing event_route[topos:...] (-1) Apr 8 09:38:40 vp-balancer-dev-01 /usr/sbin/kamailio[26752]: {1 1 INVITE 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE} DEBUG: app_python [apy_kemi.c:776]: sr_apy_kemi_f_pv_get_mode(): pv get: $sndto(ip) Apr 8 09:38:40 vp-balancer-dev-01 /usr/sbin/kamailio[26752]: {1 1 INVITE 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE} DEBUG: <core> [core/pvapi.c:395]: pv_cache_lookup(): pvar [$sndto(ip)] found in cache Apr 8 09:38:40 vp-balancer-dev-01 /usr/sbin/kamailio[26752]: {1 1 INVITE 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE} DEBUG: app_python [apy_kemi.c:213]: sr_apy_kemi_exec_func(): execution of method: .drop Apr 8 09:38:40 vp-balancer-dev-01 /usr/sbin/kamailio[26752]: {1 1 INVITE 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE} DEBUG: app_python [apy_kemi.c:122]: sr_kemi_config_engine_python(): execution of route type 513 with name [ksr_topos_event] returned 1 ``` #### SIP Traffic 10.x.x.x - internal network IP addresses 95.79.44.x - external network IP addresses 95.79.44.125 - SIP Phone 10.164.0.10 - Kamailio (external IP 35.204.224.219) 10.166.0.2 - Freeswitch 95.79.44.126 - Gateway ``` *** 95.79.44.125 -> 10.164.0.10 INVITE sip:79200204544@35.204.224.219 SIP/2.0 Via: SIP/2.0/UDP 95.79.44.125:5060;branch=z9hG4bK-524287-1---fc4d9360f0b3d218;rport Max-Forwards: 70 Contact: <sip:testin2@95.79.44.125:5060> To: <sip:79200204544@35.204.224.219> From: <sip:testin2@35.204.224.219>;tag=8035856a Call-ID: 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE CSeq: 1 INVITE Allow: OPTIONS, SUBSCRIBE, NOTIFY, INVITE, ACK, CANCEL, BYE, REFER, INFO Content-Type: application/sdp Supported: replaces User-Agent: X-Lite release 5.4.0 stamp 94385 Content-Length: 210 v=0 o=- 1554716320712461 1 IN IP4 95.79.44.125 s=X-Lite release 5.4.0 stamp 94385 c=IN IP4 95.79.44.125 t=0 0 m=audio 55414 RTP/AVP 8 0 101 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 a=sendrecv *** 10.164.0.10 -> 95.79.44.125 SIP/2.0 100 trying -- your call is important to us Via: SIP/2.0/UDP 95.79.44.125:5060;branch=z9hG4bK-524287-1---fc4d9360f0b3d218;rport=5060;received=95.79.44.125 To: <sip:79200204544@35.204.224.219> From: <sip:testin2@35.204.224.219>;tag=8035856a Call-ID: 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE CSeq: 1 INVITE Server: kamailio (5.1.7 (x86_64/linux)) Content-Length: 0 *** 10.164.0.10 -> 10.166.0.2 INVITE sip:79200204544@10.166.0.2:5060 SIP/2.0 Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK9e01.c28fe550f8dd384f5b591612c5abf080.0 Max-Forwards: 70 To: <sip:79200204544@35.204.224.219> From: <sip:testin2@35.204.224.219>;tag=8035856a Call-ID: 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE CSeq: 1 INVITE Allow: OPTIONS, SUBSCRIBE, NOTIFY, INVITE, ACK, CANCEL, BYE, REFER, INFO Content-Type: application/sdp Supported: replaces User-Agent: X-Lite release 5.4.0 stamp 94385 Content-Length: 210 X-Equipment-ID: 6741 X-Equipment-IP: 95.79.44.125 X-Equipment-Port: 5060 Contact: <sip:btpsh-5cab164e-6880-1@35.204.224.219> v=0 o=- 1554716320712461 1 IN IP4 95.79.44.125 s=X-Lite release 5.4.0 stamp 94385 c=IN IP4 95.79.44.125 t=0 0 m=audio 55414 RTP/AVP 8 0 101 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 a=sendrecv *** 10.166.0.2 -> 10.164.0.10 SIP/2.0 100 Trying Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK9e01.c28fe550f8dd384f5b591612c5abf080.0;received=10.164.0.10 From: <sip:testin2@35.204.224.219>;tag=8035856a To: <sip:79200204544@35.204.224.219> Call-ID: 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE CSeq: 1 INVITE User-Agent: FreeSWITCH-mod_sofia/1.8.5+git-20190227T164909Z~cb1f3ab6f2~64bit Content-Length: 0 *** 10.166.0.2 -> 10.164.0.10 SIP/2.0 183 Session Progress Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK9e01.c28fe550f8dd384f5b591612c5abf080.0;received=10.164.0.10 From: <sip:testin2@35.204.224.219>;tag=8035856a To: <sip:79200204544@35.204.224.219>;tag=pDr153DcQr0tB Call-ID: 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE CSeq: 1 INVITE Contact: <sip:79200204544@10.166.0.2:5060;transport=udp> User-Agent: FreeSWITCH-mod_sofia/1.8.5+git-20190227T164909Z~cb1f3ab6f2~64bit Accept: application/sdp Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY Supported: timer, path, replaces Allow-Events: talk, hold, conference, refer Content-Type: application/sdp Content-Disposition: session Content-Length: 216 Remote-Party-ID: "79200204544" <sip:79200204544@35.204.224.219>;party=calling;privacy=off;screen=no v=0 o=FreeSWITCH 1554690954 1554690955 IN IP4 10.166.0.2 s=FreeSWITCH c=IN IP4 10.166.0.2 t=0 0 m=audio 25366 RTP/AVP 8 101 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 *** 10.166.0.2 -> 10.164.0.10 INVITE sip:79200204544@10.164.0.10:5060 SIP/2.0 Via: SIP/2.0/UDP 10.166.0.2;rport;branch=z9hG4bKt1B9UyKUa3vgD Max-Forwards: 70 From: "" <sip:testin2@10.166.0.2>;tag=QpHt7yyFm1pDQ To: <sip:79200204544@10.164.0.10:5060> Call-ID: ef3258bd-d484-1237-cfbc-42010aa60002 CSeq: 2804368 INVITE Contact: <sip:gw+kamailio@10.166.0.2:5060;transport=udp;gw=kamailio> User-Agent: FreeSWITCH-mod_sofia/1.8.5+git-20190227T164909Z~cb1f3ab6f2~64bit Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY Supported: timer, path, replaces Allow-Events: talk, hold, conference, refer Content-Type: application/sdp Content-Disposition: session Content-Length: 346 X-Equipment-ID: 6742 X-FS-Support: update_display,send_info Remote-Party-ID: <sip:"testin2"@10.166.0.2>;party=calling;screen=yes;privacy=off v=0 o=FreeSWITCH 1554694904 1554694905 IN IP4 10.166.0.2 s=FreeSWITCH c=IN IP4 10.166.0.2 t=0 0 m=audio 21416 RTP/AVP 18 0 8 102 103 4 101 a=rtpmap:18 G729/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:102 SPEEX/8000 a=rtpmap:103 L16/8000 a=rtpmap:4 G723/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 *** 10.164.0.10 -> 10.166.0.2 SIP/2.0 100 trying -- your call is important to us Via: SIP/2.0/UDP 10.166.0.2;rport=5060;branch=z9hG4bKt1B9UyKUa3vgD;received=10.166.0.2 From: "" <sip:testin2@10.166.0.2>;tag=QpHt7yyFm1pDQ To: <sip:79200204544@10.164.0.10:5060> Call-ID: ef3258bd-d484-1237-cfbc-42010aa60002 CSeq: 2804368 INVITE Server: kamailio (5.1.7 (x86_64/linux)) Content-Length: 0 *** 10.164.0.10 -> 95.79.44.125 SIP/2.0 183 Session Progress From: <sip:testin2@35.204.224.219>;tag=8035856a To: <sip:79200204544@35.204.224.219>;tag=pDr153DcQr0tB Call-ID: 94385YjUxNjIwNzgxNmQ3N2NkNjdhYTNmZDc0OGUxOTQ0NGE CSeq: 1 INVITE User-Agent: FreeSWITCH-mod_sofia/1.8.5+git-20190227T164909Z~cb1f3ab6f2~64bit Accept: application/sdp Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY Supported: timer, path, replaces Allow-Events: talk, hold, conference, refer Content-Type: application/sdp Content-Disposition: session Content-Length: 216 Remote-Party-ID: "79200204544" <sip:79200204544@35.204.224.219>;party=calling;privacy=off;screen=no Via: SIP/2.0/UDP 95.79.44.125:5060;received=95.79.44.125;branch=z9hG4bK-524287-1---fc4d9360f0b3d218;rport=5060 Contact: <sip:atpsh-5cab164e-6880-1@35.204.224.219> v=0 o=FreeSWITCH 1554690954 1554690955 IN IP4 10.166.0.2 s=FreeSWITCH c=IN IP4 10.166.0.2 t=0 0 m=audio 25366 RTP/AVP 8 101 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 *** 10.164.0.10 -> 95.79.44.126 INVITE sip:79200204544@95.79.44.126:5060 SIP/2.0 Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK03b2.9008b440cc6f02db12a9949bd46ba9ff.0 Max-Forwards: 70 From: "" <sip:testin2@10.166.0.2>;tag=QpHt7yyFm1pDQ To: <sip:79200204544@10.164.0.10:5060> Call-ID: ef3258bd-d484-1237-cfbc-42010aa60002 CSeq: 2804368 INVITE User-Agent: FreeSWITCH-mod_sofia/1.8.5+git-20190227T164909Z~cb1f3ab6f2~64bit Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY Supported: timer, path, replaces Allow-Events: talk, hold, conference, refer Content-Type: application/sdp Content-Disposition: session Content-Length: 346 X-FS-Support: update_display,send_info Remote-Party-ID: <sip:"testin2"@10.166.0.2>;party=calling;screen=yes;privacy=off Contact: <sip:btpsh-5cab164e-6884-1@35.204.224.219> v=0 o=FreeSWITCH 1554694904 1554694905 IN IP4 10.166.0.2 s=FreeSWITCH c=IN IP4 10.166.0.2 t=0 0 m=audio 21416 RTP/AVP 18 0 8 102 103 4 101 a=rtpmap:18 G729/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:102 SPEEX/8000 a=rtpmap:103 L16/8000 a=rtpmap:4 G723/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=ptime:20 *** 95.79.44.126 -> 10.164.0.10 SIP/2.0 100 Trying Via: SIP/2.0/UDP 35.204.224.219:5060;branch=z9hG4bK03b2.9008b440cc6f02db12a9949bd46ba9ff.0 From: "" <sip:testin2@10.166.0.2>;tag=QpHt7yyFm1pDQ To: <sip:79200204544@10.164.0.10:5060> Call-ID: ef3258bd-d484-1237-cfbc-42010aa60002 CSeq: 2804368 INVITE Allow: INVITE,ACK,CANCEL,BYE,UPDATE,REGISTER,PRACK,INFO,NOTIFY,REFER,SUBSCRIBE Cisco-Guid: 32268-2874933264-2348313813-1719855771 User-Agent: TELES CELLX Plus 20.5.36.1 58216060749209 Content-Length: 0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.1.7 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 * **Operating System**: Linux vp-balancer-dev-01 4.9.0-8-amd64 #1 SMP Debian 4.9.144-3 (2019-02-02) x86_64 GNU/Linux -- 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/issues/1924

2 4

git:master:45d42958: lcr: fix rpc output of lcr.dump_gws
by Ovidiu Sas 11 Apr '19

11 Apr '19

Module: kamailio Branch: master Commit: 45d4295829a436248419cfce3fd534b39efd0dcd URL: https://github.com/kamailio/kamailio/commit/45d4295829a436248419cfce3fd534b… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-11T09:57:35-05:00 lcr: fix rpc output of lcr.dump_gws --- Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/45d4295829a436248419cfce3fd534b… Patch: https://github.com/kamailio/kamailio/commit/45d4295829a436248419cfce3fd534b… --- diff --git a/src/modules/lcr/lcr_rpc.c b/src/modules/lcr/lcr_rpc.c index ef5b351e6c..8aeb80c98f 100644 --- a/src/modules/lcr/lcr_rpc.c +++ b/src/modules/lcr/lcr_rpc.c @@ -51,6 +51,8 @@ static const char *dump_gws_doc[2] = {"Dump the contents of lcr_gws table.", 0}; static void dump_gws(rpc_t *rpc, void *c) { void *st; + void *rec = NULL; + void *srec = NULL; unsigned int i, j; str scheme, gw_name, hostname, params, transport; str prefix, tag; @@ -63,7 +65,14 @@ static void dump_gws(rpc_t *rpc, void *c) gws = gw_pt[j]; for(i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { - if(rpc->add(c, "{", &st) < 0) + if (srec==NULL) { + /* We create one array per lcr_id */ + if(rpc->add(c, "{", &rec) < 0) + return; + if(rpc->struct_add(rec, "[", "gw", &srec) < 0) + return; + } + if(rpc->array_add(srec, "{", &st) < 0) return; rpc->struct_add(st, "d", "lcr_id", j); rpc->struct_add(st, "d", "gw_id", gws[i].gw_id);

1 0

Kamailio v5.1.8 Released
by Daniel-Constantin Mierla 11 Apr '19

11 Apr '19

Hello, Kamailio SIP Server v5.1.8 stable release is out. This is a maintenance release of the previous stable branch, 5.1, that includes fixes since the release of v5.1.7. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.8 or to v5.2.x series. For more details about version 5.1.8 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/04/kamailio-v5-1-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the branch 5.1 is the previous stable branch. The latest stable branch is 5.2, at this time with v5.2.2 being released out of it. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com

1 0

Kamailio v5.1.8 Released
by Daniel-Constantin Mierla 11 Apr '19

11 Apr '19

Hello, Kamailio SIP Server v5.1.8 stable release is out. This is a maintenance release of the previous stable branch, 5.1, that includes fixes since the release of v5.1.7. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.8 or to v5.2.x series. For more details about version 5.1.8 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/04/kamailio-v5-1-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the branch 5.1 is the previous stable branch. The latest stable branch is 5.2, at this time with v5.2.2 being released out of it. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com

1 0

git:5.1:d037773f: Makefile.defs: version set to 5.1.8
by Daniel-Constantin Mierla 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.1 Commit: d037773fb85b196f02cfc67eb993687e288c8de0 URL: https://github.com/kamailio/kamailio/commit/d037773fb85b196f02cfc67eb993687… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-11T10:43:41+02:00 Makefile.defs: version set to 5.1.8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d037773fb85b196f02cfc67eb993687… Patch: https://github.com/kamailio/kamailio/commit/d037773fb85b196f02cfc67eb993687… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 35b6b0233b..770ca1e795 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:c7a172cd: ChangeLog: content updated for v5.1.8
by Daniel-Constantin Mierla 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.1 Commit: c7a172cdcd2cdb41cd34fde372a4ebb30d75b70f URL: https://github.com/kamailio/kamailio/commit/c7a172cdcd2cdb41cd34fde372a4ebb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-11T10:52:53+02:00 ChangeLog: content updated for v5.1.8 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c7a172cdcd2cdb41cd34fde372a4ebb… Patch: https://github.com/kamailio/kamailio/commit/c7a172cdcd2cdb41cd34fde372a4ebb…

1 0

git:5.1:9c1c9b56: pkg: rpm - specs updated for v5.1.8
by Daniel-Constantin Mierla 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.1 Commit: 9c1c9b56ce438780b16693cb37b2a2a9b947226b URL: https://github.com/kamailio/kamailio/commit/9c1c9b56ce438780b16693cb37b2a2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-11T10:40:21+02:00 pkg: rpm - specs updated for v5.1.8 --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/freebsd/Makefile Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE Modified: pkg/kamailio/solaris/pkginfo --- Diff: https://github.com/kamailio/kamailio/commit/9c1c9b56ce438780b16693cb37b2a2a… Patch: https://github.com/kamailio/kamailio/commit/9c1c9b56ce438780b16693cb37b2a2a…

1 0

git:5.1:6fcd28bd: pkg/kamailio/deb: version set to 5.1.8
by Victor Seva 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.1 Commit: 6fcd28bddfba628fa49a621cd1c20919a5755085 URL: https://github.com/kamailio/kamailio/commit/6fcd28bddfba628fa49a621cd1c2091… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-11T09:53:51+02:00 pkg/kamailio/deb: version set to 5.1.8 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/6fcd28bddfba628fa49a621cd1c2091… Patch: https://github.com/kamailio/kamailio/commit/6fcd28bddfba628fa49a621cd1c2091… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7

1 0

git:master:69f9b0a4: core: parse - validity check for contact uri size and more verbose log message
by Daniel-Constantin Mierla 11 Apr '19

11 Apr '19

Module: kamailio Branch: master Commit: 69f9b0a4d5261ec5b6d8d7163b3809a9bb24916d URL: https://github.com/kamailio/kamailio/commit/69f9b0a4d5261ec5b6d8d7163b3809a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-11T09:38:49+02:00 core: parse - validity check for contact uri size and more verbose log message --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/69f9b0a4d5261ec5b6d8d7163b3809a… Patch: https://github.com/kamailio/kamailio/commit/69f9b0a4d5261ec5b6d8d7163b3809a… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 61a40e3bd8..650740b1a1 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -182,6 +182,9 @@ int parse_contacts(str* _s, contact_t** _c) { contact_t* c; param_hooks_t hooks; + str sv; + + sv = *_s; while(1) { /* Allocate and clear contact structure */ @@ -220,6 +223,10 @@ int parse_contacts(str* _s, contact_t** _c) } trim(&c->uri); + if((c->uri.len <= 0) || (c->uri.s + c->uri.len > sv.s + sv.len)) { + LM_ERR("invlid contact uri\n"); + goto error; + } if (_s->len == 0) goto ok; @@ -265,6 +272,8 @@ int parse_contacts(str* _s, contact_t** _c) } error: + LM_ERR("failure parsing '%.*s' (%d) [%p/%p/%d]\n", sv.len, sv.s, sv.len, + sv.s, _s->s, (int)(_s->s - sv.s)); if (c) pkg_free(c); free_contacts(_c); /* Free any contacts created so far */ return -1;

1 0

git:5.2:50296edb: core: don't abort() Kamailio in case of invalid lump parameters, return an error
by Henning Westerholt 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.2 Commit: 50296edbd3a546a00bf3f0b14850bc003b22a360 URL: https://github.com/kamailio/kamailio/commit/50296edbd3a546a00bf3f0b14850bc0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T09:23:26+02:00 core: don't abort() Kamailio in case of invalid lump parameters, return an error (cherry picked from commit 853f65454d1a77b0145e80b006699fa1048045ac) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/50296edbd3a546a00bf3f0b14850bc0… Patch: https://github.com/kamailio/kamailio/commit/50296edbd3a546a00bf3f0b14850bc0… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index e033b4e794..bb181ef2d9 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -288,14 +288,14 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (offset+len>msg->len){ LM_CRIT("offset + len exceeds message size (%d + %d > %d)\n", offset, len, msg->len); - abort(); + return 0; } if (len==0){ LM_WARN("0 len (offset=%d)\n", offset); @@ -344,9 +344,9 @@ struct lump* anchor_lump(struct sip_msg* msg, int offset, int len, enum _hdr_typ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len); @@ -404,9 +404,9 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len);

1 0

git:5.1:e723cc97: core: don't abort() Kamailio in case of invalid lump parameters, return an error
by Henning Westerholt 11 Apr '19

11 Apr '19

Module: kamailio Branch: 5.1 Commit: e723cc9730a039a24f6fdb969c3259b2d4935be4 URL: https://github.com/kamailio/kamailio/commit/e723cc9730a039a24f6fdb969c3259b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T09:23:36+02:00 core: don't abort() Kamailio in case of invalid lump parameters, return an error (cherry picked from commit 853f65454d1a77b0145e80b006699fa1048045ac) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/e723cc9730a039a24f6fdb969c3259b… Patch: https://github.com/kamailio/kamailio/commit/e723cc9730a039a24f6fdb969c3259b… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index e033b4e794..bb181ef2d9 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -288,14 +288,14 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (offset+len>msg->len){ LM_CRIT("offset + len exceeds message size (%d + %d > %d)\n", offset, len, msg->len); - abort(); + return 0; } if (len==0){ LM_WARN("0 len (offset=%d)\n", offset); @@ -344,9 +344,9 @@ struct lump* anchor_lump(struct sip_msg* msg, int offset, int len, enum _hdr_typ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len); @@ -404,9 +404,9 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len);

1 0

git:master:853f6545: core: don't abort() Kamailio in case of invalid lump parameters, return an error
by Henning Westerholt 11 Apr '19

11 Apr '19

Module: kamailio Branch: master Commit: 853f65454d1a77b0145e80b006699fa1048045ac URL: https://github.com/kamailio/kamailio/commit/853f65454d1a77b0145e80b006699fa… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-11T09:21:44+02:00 core: don't abort() Kamailio in case of invalid lump parameters, return an error --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/853f65454d1a77b0145e80b006699fa… Patch: https://github.com/kamailio/kamailio/commit/853f65454d1a77b0145e80b006699fa… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 007c5de2cc..a15f3e30e6 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -291,14 +291,14 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (offset+len>msg->len){ LM_CRIT("offset + len exceeds message size (%d + %d > %d)\n", offset, len, msg->len); - abort(); + return 0; } if (len==0){ LM_WARN("0 len (offset=%d)\n", offset); @@ -348,9 +348,9 @@ struct lump* anchor_lump(struct sip_msg* msg, int offset, int len, enum _hdr_typ /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len); @@ -408,9 +408,9 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, enum _hdr_ty /* extra checks */ if (offset>msg->len){ - LM_CRIT("offset exceeds message size (%d > %d) aborting...\n", + LM_CRIT("offset exceeds message size (%d > %d)\n", offset, msg->len); - abort(); + return 0; } if (len){ LM_WARN("len !=0 (%d)\n", len);

1 0

Releasing Kamailio v5.1.8
by Daniel-Constantin Mierla 11 Apr '19

11 Apr '19

Hello, I am considering to release v5.1.8, an minor version to be built from branch 5.1, on Thursday, this week (April 11, 2019). As usual, check that at least the patches for issues you reported were backported in order to be sure they were not missed during the typical backporting done by developers so far. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com

1 1

git:5.1:25987949: topos: set context when executing event route
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.1 Commit: 259879497ae9557256c4599811ffa142b088b101 URL: https://github.com/kamailio/kamailio/commit/259879497ae9557256c4599811ffa14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:32:10+02:00 topos: set context when executing event route - manual backporting for: 403da8e8dcc2e4986595f183f0ac37a6bb41ab86 d82a6cd45c1486f767b7fec2a02161f7314c9071 --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/259879497ae9557256c4599811ffa14… Patch: https://github.com/kamailio/kamailio/commit/259879497ae9557256c4599811ffa14… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 9dff909fee..2a13d51a49 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -495,10 +495,10 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); if(_tps_eventrt_outgoing>=0) { - run_top_route(event_rt.rlist[_tps_eventrt_outgoing], fmsg, &ctx); + run_top_route(event_rt.rlist[_tps_eventrt_outgoing], (msg)?msg:fmsg, &ctx); } else { if(keng!=NULL) { - if(keng->froute(fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, &_tps_eventrt_name)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL; @@ -533,4 +533,4 @@ int bind_topos(topos_api_t *api) api->get_branch_expire = tps_get_branch_expire; return 0; -} \ No newline at end of file +}

1 0

git:5.1:a09a57cd: topoh: execute the kemi event route callbacks with context
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.1 Commit: a09a57cd6fca6790c496435794fab02695782596 URL: https://github.com/kamailio/kamailio/commit/a09a57cd6fca6790c496435794fab02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:34:52+02:00 topoh: execute the kemi event route callbacks with context - manual backport for: 121282ac4986d6389a6dd64c35b77337a4ca256b --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a09a57cd6fca6790c496435794fab02… Patch: https://github.com/kamailio/kamailio/commit/a09a57cd6fca6790c496435794fab02… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 1362f4cd7a..853140ff21 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -556,7 +556,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) run_top_route(event_rt.rlist[_th_eventrt_outgoing], fmsg, &ctx); } else { if(keng!=NULL) { - if(keng->froute(fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &_th_eventrt_callback, &_th_eventrt_name)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

1 0

git:5.1:30e2399d: core: kemi - backpup and restore old context inside sr_kemi_ctx_route()
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.1 Commit: 30e2399d7bbad05b1d4967056d869d8e46b33165 URL: https://github.com/kamailio/kamailio/commit/30e2399d7bbad05b1d4967056d869d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:07:32+02:00 core: kemi - backpup and restore old context inside sr_kemi_ctx_route() (cherry picked from commit 0689ac5976121d5a8edf815c0cee51da1098530f) (cherry picked from commit cb1b346f6b815ed0fdd9644e5c208f7c2a0d9f14) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/30e2399d7bbad05b1d4967056d869d8… Patch: https://github.com/kamailio/kamailio/commit/30e2399d7bbad05b1d4967056d869d8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f42005061b..e7a74f77d3 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1685,6 +1685,12 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, int rtype, str *ename, str *edata) { + run_act_ctx_t *bctx; + int ret; + + bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(ctx); - return sr_kemi_route(keng, msg, rtype, ename, edata); + ret = sr_kemi_route(keng, msg, rtype, ename, edata); + sr_kemi_act_ctx_set(bctx); + return ret; }

1 0

git:5.1:381926e9: core: kemi - wrapper function to run callbacks with context
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.1 Commit: 381926e96f9ab9f38e920b5a0e9c29afdd7480f0 URL: https://github.com/kamailio/kamailio/commit/381926e96f9ab9f38e920b5a0e9c29a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T11:07:02+02:00 core: kemi - wrapper function to run callbacks with context (cherry picked from commit 395cae83da4d83920dd038d299c30ffa97b6c272) (cherry picked from commit d63b21f1b52861a31555f63b2d8d88c0c2a672ba) --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/381926e96f9ab9f38e920b5a0e9c29a… Patch: https://github.com/kamailio/kamailio/commit/381926e96f9ab9f38e920b5a0e9c29a… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 37b8ee795a..f42005061b 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1678,3 +1678,13 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, setsflagsval(sfbk); return ret; } + +/** + * + */ +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata) +{ + sr_kemi_act_ctx_set(ctx); + return sr_kemi_route(keng, msg, rtype, ename, edata); +} diff --git a/src/core/kemi.h b/src/core/kemi.h index d5fe64d451..9358dd1262 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -142,5 +142,7 @@ int sr_kemi_core_drop(sip_msg_t *msg); int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, str *ename, str *edata); +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata); #endif

1 0

[kamailio/kamailio] [5.1] Fixed packaging in opensuse/tumbleweed (#1925)
by sergey-safarov 10 Apr '19

10 Apr '19

two commits backported from master You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1925 -- Commit Summary -- * db_postgres: try to use pkg-config for lib paths * db_postgres: Makefile - fixed name of variable used to detect pkg-config -- File Changes -- M src/modules/db_postgres/Makefile (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1925.patch https://github.com/kamailio/kamailio/pull/1925.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/1925

2 2

git:5.1:547f3dfa: Merge pull request #1925 from sergey-safarov/pg_make
by GitHub 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.1 Commit: 547f3dfaa6536f0e768b89844aa287d8de478b77 URL: https://github.com/kamailio/kamailio/commit/547f3dfaa6536f0e768b89844aa287d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-10T10:54:40+02:00 Merge pull request #1925 from sergey-safarov/pg_make [5.1] Fixed packaging in opensuse/tumbleweed --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/547f3dfaa6536f0e768b89844aa287d… Patch: https://github.com/kamailio/kamailio/commit/547f3dfaa6536f0e768b89844aa287d… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index d780467f27..26a76d8ebc 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -9,6 +9,19 @@ NAME=db_postgres.so # the autodetection # CROSS_COMPILE=true +ifeq ($(CROSS_COMPILE),) +LIBPQ_BUILDER = $(shell \ + if pkg-config --exists libpq; then \ + echo 'pkg-config libpq'; \ + fi) +ifneq ($(LIBPQ_BUILDER),) + DEFS += $(shell $(LIBPQ_BUILDER) --cflags) + LIBS += $(shell $(LIBPQ_BUILDER) --libs) +endif +endif + +ifeq ($(LIBPQ_BUILDER),) + ifeq ($(CROSS_COMPILE),) PGCFG=$(shell which pg_config) endif @@ -27,6 +40,8 @@ else -L$(LOCALBASE)/lib/pgsql -lpq endif +endif + #DEFS += -DPG_TEST DEFS += -DSER_MOD_INTERFACE

1 0

git:5.1:2664b6ed: db_postgres: try to use pkg-config for lib paths
by Sergey Safarov 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.1 Commit: 2664b6ed8001f356ce2076433e858f807d237962 URL: https://github.com/kamailio/kamailio/commit/2664b6ed8001f356ce2076433e858f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-04-09T10:41:09+03:00 db_postgres: try to use pkg-config for lib paths - GH #1915 (cherry picked from commit b23e8e47474d9c25c6de0f6c3da07ae43b85ad8a) --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2664b6ed8001f356ce2076433e858f8… Patch: https://github.com/kamailio/kamailio/commit/2664b6ed8001f356ce2076433e858f8… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index d780467f27..ca99b66b7b 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -9,6 +9,19 @@ NAME=db_postgres.so # the autodetection # CROSS_COMPILE=true +ifeq ($(CROSS_COMPILE),) +LIBPQL_BUILDER = $(shell \ + if pkg-config --exists libpq; then \ + echo 'pkg-config libpq'; \ + fi) +ifneq ($(LIBPQ_BUILDER),) + DEFS += $(shell $(LIBPQL_BUILDER) --cflags) + LIBS += $(shell $(LIBPQL_BUILDER) --libs) +endif +endif + +ifeq ($(LIBPQ_BUILDER),) + ifeq ($(CROSS_COMPILE),) PGCFG=$(shell which pg_config) endif @@ -27,6 +40,8 @@ else -L$(LOCALBASE)/lib/pgsql -lpq endif +endif + #DEFS += -DPG_TEST DEFS += -DSER_MOD_INTERFACE

1 0

git:5.1:631ea0b8: db_postgres: Makefile - fixed name of variable used to detect pkg-config
by Sergey Safarov 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.1 Commit: 631ea0b80ee1c95b0362668a67ba0001c8070a2c URL: https://github.com/kamailio/kamailio/commit/631ea0b80ee1c95b0362668a67ba000… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-04-09T10:44:46+03:00 db_postgres: Makefile - fixed name of variable used to detect pkg-config (cherry picked from commit 49a34c863335e6b0b09e397d7962395306506c00) --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/631ea0b80ee1c95b0362668a67ba000… Patch: https://github.com/kamailio/kamailio/commit/631ea0b80ee1c95b0362668a67ba000… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index ca99b66b7b..26a76d8ebc 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -10,13 +10,13 @@ NAME=db_postgres.so # CROSS_COMPILE=true ifeq ($(CROSS_COMPILE),) -LIBPQL_BUILDER = $(shell \ +LIBPQ_BUILDER = $(shell \ if pkg-config --exists libpq; then \ echo 'pkg-config libpq'; \ fi) ifneq ($(LIBPQ_BUILDER),) - DEFS += $(shell $(LIBPQL_BUILDER) --cflags) - LIBS += $(shell $(LIBPQL_BUILDER) --libs) + DEFS += $(shell $(LIBPQ_BUILDER) --cflags) + LIBS += $(shell $(LIBPQ_BUILDER) --libs) endif endif

1 0

git:5.2:0c78f5d0: msrp: set the context to kemi callback function execution
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: 0c78f5d026202031d2d2cdd21049805559b5e1f2 URL: https://github.com/kamailio/kamailio/commit/0c78f5d026202031d2d2cdd21049805… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:40+02:00 msrp: set the context to kemi callback function execution (cherry picked from commit 501c2b88e8e0bf16f2be0b0255d35d449467a60d) --- Modified: src/modules/msrp/msrp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0c78f5d026202031d2d2cdd21049805… Patch: https://github.com/kamailio/kamailio/commit/0c78f5d026202031d2d2cdd21049805… --- diff --git a/src/modules/msrp/msrp_mod.c b/src/modules/msrp/msrp_mod.c index d69beea133..dfe7056f39 100644 --- a/src/modules/msrp/msrp_mod.c +++ b/src/modules/msrp/msrp_mod.c @@ -531,16 +531,13 @@ static int msrp_frame_received(sr_event_param_t *evp) fmsg->rcv = *tev->rcv; rtb = get_route_type(); set_route_type(EVENT_ROUTE); + init_run_actions_ctx(&ctx); if(msrp_event_callback.s == NULL || msrp_event_callback.len <= 0) { /* native cfg script execution */ rt = route_get(&event_rt, evname.s); LM_DBG("executing event_route[msrp:frame-in] (%d)\n", rt); if(rt >= 0 && event_rt.rlist[rt] != NULL) { - init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], fmsg, &ctx); - if(ctx.run_flags & DROP_R_F) { - LM_DBG("exit due to 'drop' in event route\n"); - } } else { LM_ERR("empty event route block for msrp handling\n"); } @@ -551,12 +548,15 @@ static int msrp_frame_received(sr_event_param_t *evp) LM_ERR("event callback (%s) set, but no cfg engine\n", msrp_event_callback.s); } else { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &msrp_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); } } } + if(ctx.run_flags & DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + } set_route_type(rtb); if(fmsg != NULL) free_sip_msg(fmsg);

1 0

git:5.2:ccedfaba: tls: set execution context for kemi callbacks
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: ccedfabab2d5fb9888842f36f45c8505597ea74e URL: https://github.com/kamailio/kamailio/commit/ccedfabab2d5fb9888842f36f45c850… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:51+02:00 tls: set execution context for kemi callbacks (cherry picked from commit 7f20200c9e0bca5c4ed16c55b9db162922a51e76) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ccedfabab2d5fb9888842f36f45c850… Patch: https://github.com/kamailio/kamailio/commit/ccedfabab2d5fb9888842f36f45c850… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 812015f622..5d3bc94522 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1477,7 +1477,7 @@ int tls_run_event_routes(struct tcp_connection *c) } else { keng = sr_kemi_eng_get(); if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &sr_tls_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

1 0

git:5.2:121282ac: topos: execute the kemi event route callbacks with context
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: 121282ac4986d6389a6dd64c35b77337a4ca256b URL: https://github.com/kamailio/kamailio/commit/121282ac4986d6389a6dd64c35b7733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:19+02:00 topos: execute the kemi event route callbacks with context (cherry picked from commit d2cb91dffc262060337f553b178dbeb5dedb3dfb) --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/121282ac4986d6389a6dd64c35b7733… Patch: https://github.com/kamailio/kamailio/commit/121282ac4986d6389a6dd64c35b7733… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 06f1bd9c41..c1a597eb1e 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -554,7 +554,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) run_top_route(event_rt.rlist[_th_eventrt_outgoing], fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &_th_eventrt_callback, &_th_eventrt_name)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

1 0

git:5.2:3300632c: htable: execute the kemi event route callbacks with context
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: 3300632cb397d49725fcd702b56a56229ed21719 URL: https://github.com/kamailio/kamailio/commit/3300632cb397d49725fcd702b56a562… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:30+02:00 htable: execute the kemi event route callbacks with context (cherry picked from commit 9eafd82c3e29ec4480bc5be3e6aa1e9d66243dc5) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/3300632cb397d49725fcd702b56a562… Patch: https://github.com/kamailio/kamailio/commit/3300632cb397d49725fcd702b56a562… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 264d04a593..8c4cdea09b 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -288,7 +288,7 @@ static int child_init(int rank) run_top_route(event_rt.rlist[rt], fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &ht_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

1 0

git:5.2:d82a6cd4: topos: set context when executing event route
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: d82a6cd45c1486f767b7fec2a02161f7314c9071 URL: https://github.com/kamailio/kamailio/commit/d82a6cd45c1486f767b7fec2a02161f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:49:39+02:00 topos: set context when executing event route - should fix detection of using KSR.drop() - reported by GH #1924 (cherry picked from commit a383027eae25e63a779ecf9377facefdd2e05ef6) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d82a6cd45c1486f767b7fec2a02161f… Patch: https://github.com/kamailio/kamailio/commit/d82a6cd45c1486f767b7fec2a02161f… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index e13029db54..f6b6a3a2f5 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -521,7 +521,7 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, run_top_route(event_rt.rlist[evidx], (msg)?msg:fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, (msg)?msg:fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, evname)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

1 0

git:5.2:cb1b346f: core: kemi - backpup and restore old context inside sr_kemi_ctx_route()
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: cb1b346f6b815ed0fdd9644e5c208f7c2a0d9f14 URL: https://github.com/kamailio/kamailio/commit/cb1b346f6b815ed0fdd9644e5c208f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:50:09+02:00 core: kemi - backpup and restore old context inside sr_kemi_ctx_route() (cherry picked from commit 0689ac5976121d5a8edf815c0cee51da1098530f) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/cb1b346f6b815ed0fdd9644e5c208f7… Patch: https://github.com/kamailio/kamailio/commit/cb1b346f6b815ed0fdd9644e5c208f7… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 456733b5e1..f638174947 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2429,6 +2429,12 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, int rtype, str *ename, str *edata) { + run_act_ctx_t *bctx; + int ret; + + bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(ctx); - return sr_kemi_route(keng, msg, rtype, ename, edata); + ret = sr_kemi_route(keng, msg, rtype, ename, edata); + sr_kemi_act_ctx_set(bctx); + return ret; }

1 0

git:5.2:56f87246: app_jsdt: use system time to compute execution duration
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: 56f87246f7bd1571b030ef230d78beed408dbdec URL: https://github.com/kamailio/kamailio/commit/56f87246f7bd1571b030ef230d78bee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:48:40+02:00 app_jsdt: use system time to compute execution duration (cherry picked from commit 626a8bf3e6cbc6dbdf11de0e6f8737f08c79a0bb) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/56f87246f7bd1571b030ef230d78bee… Patch: https://github.com/kamailio/kamailio/commit/56f87246f7bd1571b030ef230d78bee… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 7d55804623..f938448ac8 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1337,29 +1337,34 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; int sline = 0; ket = sr_kemi_jsdt_export_get(eidx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_kemi_jsdt_exec_func_ex(J, ket); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { duk_inspect_callstack_entry(J, -1); duk_get_prop_string(J, -1, "lineNumber"); sline = (int)duk_to_int(J, -1); duk_pop_2(J); LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (line: %d)\n", + " took too long [%u us] (line: %d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, sline); + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, sline); } }

1 0

git:5.2:d63b21f1: core: kemi - wrapper function to run callbacks with context
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: d63b21f1b52861a31555f63b2d8d88c0c2a672ba URL: https://github.com/kamailio/kamailio/commit/d63b21f1b52861a31555f63b2d8d88c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:49:13+02:00 core: kemi - wrapper function to run callbacks with context (cherry picked from commit 395cae83da4d83920dd038d299c30ffa97b6c272) --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/d63b21f1b52861a31555f63b2d8d88c… Patch: https://github.com/kamailio/kamailio/commit/d63b21f1b52861a31555f63b2d8d88c… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 3c6bba057f..456733b5e1 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2422,3 +2422,13 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, setsflagsval(sfbk); return ret; } + +/** + * + */ +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata) +{ + sr_kemi_act_ctx_set(ctx); + return sr_kemi_route(keng, msg, rtype, ename, edata); +} diff --git a/src/core/kemi.h b/src/core/kemi.h index 473189ed0f..96ecf98cd2 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -146,5 +146,7 @@ int sr_kemi_core_set_drop(sip_msg_t *msg); int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, str *ename, str *edata); +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata); #endif

1 0

git:5.2:1becba8e: app_sqlang: execution log message based on core latency_limit_action
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: 5.2 Commit: 1becba8ef4b901f3fd67842711b079e8011beb2e URL: https://github.com/kamailio/kamailio/commit/1becba8ef4b901f3fd67842711b079e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:48:28+02:00 app_sqlang: execution log message based on core latency_limit_action (cherry picked from commit 639db054d0d2e8b0bb50c9109750419654dedbe1) --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/1becba8ef4b901f3fd67842711b079e… Patch: https://github.com/kamailio/kamailio/commit/1becba8ef4b901f3fd67842711b079e… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 302e78a3b3..b23f8dad61 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1448,9 +1448,36 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; + int ret; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_kemi_sqlang_export_get(eidx); - return sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } + + ret = sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u us]\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); + } + } + + return ret; } /**

1 0

git:master:501c2b88: msrp: set the context to kemi callback function execution
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: master Commit: 501c2b88e8e0bf16f2be0b0255d35d449467a60d URL: https://github.com/kamailio/kamailio/commit/501c2b88e8e0bf16f2be0b0255d35d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:36:17+02:00 msrp: set the context to kemi callback function execution --- Modified: src/modules/msrp/msrp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/501c2b88e8e0bf16f2be0b0255d35d4… Patch: https://github.com/kamailio/kamailio/commit/501c2b88e8e0bf16f2be0b0255d35d4… --- diff --git a/src/modules/msrp/msrp_mod.c b/src/modules/msrp/msrp_mod.c index d69beea133..dfe7056f39 100644 --- a/src/modules/msrp/msrp_mod.c +++ b/src/modules/msrp/msrp_mod.c @@ -531,16 +531,13 @@ static int msrp_frame_received(sr_event_param_t *evp) fmsg->rcv = *tev->rcv; rtb = get_route_type(); set_route_type(EVENT_ROUTE); + init_run_actions_ctx(&ctx); if(msrp_event_callback.s == NULL || msrp_event_callback.len <= 0) { /* native cfg script execution */ rt = route_get(&event_rt, evname.s); LM_DBG("executing event_route[msrp:frame-in] (%d)\n", rt); if(rt >= 0 && event_rt.rlist[rt] != NULL) { - init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], fmsg, &ctx); - if(ctx.run_flags & DROP_R_F) { - LM_DBG("exit due to 'drop' in event route\n"); - } } else { LM_ERR("empty event route block for msrp handling\n"); } @@ -551,12 +548,15 @@ static int msrp_frame_received(sr_event_param_t *evp) LM_ERR("event callback (%s) set, but no cfg engine\n", msrp_event_callback.s); } else { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &msrp_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); } } } + if(ctx.run_flags & DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + } set_route_type(rtb); if(fmsg != NULL) free_sip_msg(fmsg);

1 0

git:master:7f20200c: tls: set execution context for kemi callbacks
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: master Commit: 7f20200c9e0bca5c4ed16c55b9db162922a51e76 URL: https://github.com/kamailio/kamailio/commit/7f20200c9e0bca5c4ed16c55b9db162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:40:14+02:00 tls: set execution context for kemi callbacks --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/7f20200c9e0bca5c4ed16c55b9db162… Patch: https://github.com/kamailio/kamailio/commit/7f20200c9e0bca5c4ed16c55b9db162… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 812015f622..5d3bc94522 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1477,7 +1477,7 @@ int tls_run_event_routes(struct tcp_connection *c) } else { keng = sr_kemi_eng_get(); if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &sr_tls_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

1 0

git:master:d2cb91df: topos: execute the kemi event route callbacks with context
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: master Commit: d2cb91dffc262060337f553b178dbeb5dedb3dfb URL: https://github.com/kamailio/kamailio/commit/d2cb91dffc262060337f553b178dbeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:00:00+02:00 topos: execute the kemi event route callbacks with context --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2cb91dffc262060337f553b178dbeb… Patch: https://github.com/kamailio/kamailio/commit/d2cb91dffc262060337f553b178dbeb… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 06f1bd9c41..c1a597eb1e 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -554,7 +554,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) run_top_route(event_rt.rlist[_th_eventrt_outgoing], fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &_th_eventrt_callback, &_th_eventrt_name)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

1 0

git:master:9eafd82c: htable: execute the kemi event route callbacks with context
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: master Commit: 9eafd82c3e29ec4480bc5be3e6aa1e9d66243dc5 URL: https://github.com/kamailio/kamailio/commit/9eafd82c3e29ec4480bc5be3e6aa1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:15:09+02:00 htable: execute the kemi event route callbacks with context --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9eafd82c3e29ec4480bc5be3e6aa1e9… Patch: https://github.com/kamailio/kamailio/commit/9eafd82c3e29ec4480bc5be3e6aa1e9… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 268241cf3c..4d70d6e317 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -288,7 +288,7 @@ static int child_init(int rank) run_top_route(event_rt.rlist[rt], fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &ht_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

1 0

git:master:0689ac59: core: kemi - backpup and restore old context inside sr_kemi_ctx_route()
by Daniel-Constantin Mierla 10 Apr '19

10 Apr '19

Module: kamailio Branch: master Commit: 0689ac5976121d5a8edf815c0cee51da1098530f URL: https://github.com/kamailio/kamailio/commit/0689ac5976121d5a8edf815c0cee51d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T09:56:20+02:00 core: kemi - backpup and restore old context inside sr_kemi_ctx_route() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0689ac5976121d5a8edf815c0cee51d… Patch: https://github.com/kamailio/kamailio/commit/0689ac5976121d5a8edf815c0cee51d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index deb9285b9d..039ba1557f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2429,6 +2429,12 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, int rtype, str *ename, str *edata) { + run_act_ctx_t *bctx; + int ret; + + bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(ctx); - return sr_kemi_route(keng, msg, rtype, ename, edata); + ret = sr_kemi_route(keng, msg, rtype, ename, edata); + sr_kemi_act_ctx_set(bctx); + return ret; }

1 0

git:master:b89637ca: siptrace: regenerate deleted README
by Kamailio Dev 10 Apr '19

10 Apr '19

Module: kamailio Branch: master Commit: b89637caa8601741d8a698b215a88caef54f6dd7 URL: https://github.com/kamailio/kamailio/commit/b89637caa8601741d8a698b215a88ca… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-09T21:55:16+02:00 siptrace: regenerate deleted README --- Added: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/b89637caa8601741d8a698b215a88ca… Patch: https://github.com/kamailio/kamailio/commit/b89637caa8601741d8a698b215a88ca…

2 1

git:master:3e1c9b6b: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 3e1c9b6b76e89ad2b253769685e24ae252f91f5a URL: https://github.com/kamailio/kamailio/commit/3e1c9b6b76e89ad2b253769685e24ae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-09T22:49:32+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/3e1c9b6b76e89ad2b253769685e24ae… Patch: https://github.com/kamailio/kamailio/commit/3e1c9b6b76e89ad2b253769685e24ae…

1 0

git:master:4e17a9c5: modules: readme files regenerated - ims_isc ... [skip ci]
by Kamailio Dev 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 4e17a9c5329afec6e4fa5161c949f25fc00de050 URL: https://github.com/kamailio/kamailio/commit/4e17a9c5329afec6e4fa5161c949f25… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-09T21:46:46+02:00 modules: readme files regenerated - ims_isc ... [skip ci] --- Modified: src/modules/ims_isc/README --- Diff: https://github.com/kamailio/kamailio/commit/4e17a9c5329afec6e4fa5161c949f25… Patch: https://github.com/kamailio/kamailio/commit/4e17a9c5329afec6e4fa5161c949f25… --- diff --git a/src/modules/ims_isc/README b/src/modules/ims_isc/README index 91eecf7a6e..f3f5dba7de 100644 --- a/src/modules/ims_isc/README +++ b/src/modules/ims_isc/README @@ -186,6 +186,14 @@ modparam("ims_isc", "add_p_served_user", 1) A positive return code (1) means that the REGISTER message has matched to Initial Filter Criteria and is armed for routing. + This function handles also the Service Info (if sent by the HSS), the + InsertRegisterRequest flag (if sent by the HSS) or the + InsertRegisterResponse flag (if sent by the HSS). Either the Service + Info OR the original REGISTER request OR the original REGISTER response + is added to the body of the REGISTER message, before it is forwarded to + the relevant Application Server. Multipart body is not supported in + this case. + Meaning of the parameters is as follows: * reg_state if the user was previously registered 0 - for initial registration, 1 for re/de-registration.

1 0

[kamailio/kamailio] ims_isc: add-on for third-party registration (#1923)
by Christoph Valentin 09 Apr '19

09 Apr '19

Change in ims_isc/checker.c and ims_isc/checker.h: add to isc_match two new flags include_register_request and include_register_response in addition to service_info Both info are retrieved from HSS during SAR/SAA Change in ims_isc/third_party_reg.c/.h: Add REGISTER Request or REGISTER Response or Service Info to the body of the REGISTER message that is sent to the AS, if it is requested by content of HSS (SAR/SAA) Change in ims_registrar_scscf/userdata_parser.c and ims_usrloc_scscf/usrloc.h: Parse the additional flags, when they are received from HSS and store in the subscription. Conflicts: src/modules/ims_isc/third_party_reg.c src/modules/ims_rdn/userdata_parser.c   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) ---> apologies, we did this commit long ago, when we did not know the rules of the project main changes are in ims_isc, two small changes in ims_registrar_scscf and ims_usrloc_scscf - [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 based on a local branch derived from 5.1.0 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The feature is a small add-on to third party registration in S-CSCF The feature assumes two new flags in HSS database, where additional to the "Service Info XML" an "insertRegisterRequest" flag or an "insertRegisterRepsonse" flag can be set. These flags are sent with the SAR/SAA exchange to the S-CSCF, where the new feature does a prioritization: If Service Info present -> add service info to body of 3rd Party REGISTER Request else if insertRegisterRequest -> add original REGISTER request to body of 3rd Party REGISTER request else if insertRegisterResponse -> add original REGISTER response to body of 3rd Party REGISTER request else -> add no body to 3rd Party REGISTER request. Multipart Body is not supported. More info about the insertRegisterRequest and insertRegisterResponse flags can be found in applicable 3GPP standards. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1923 -- Commit Summary -- * ims_isc: add-on for third-party registration -- File Changes -- M src/modules/ims_isc/checker.c (2) M src/modules/ims_isc/checker.h (2) M src/modules/ims_isc/third_party_reg.c (106) M src/modules/ims_isc/third_party_reg.h (18) M src/modules/ims_registrar_scscf/userdata_parser.c (35) M src/modules/ims_usrloc_scscf/usrloc.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1923.patch https://github.com/kamailio/kamailio/pull/1923.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/1923

2 10

git:master:3feab77f: ims_usrloc_scscf: add-on for third-party registration
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 3feab77f597284ddc8b6b87d0da0f47a0979e54d URL: https://github.com/kamailio/kamailio/commit/3feab77f597284ddc8b6b87d0da0f47… Author: Christoph Valentin <Christoph.Valentin(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-09T21:35:41+02:00 ims_usrloc_scscf: add-on for third-party registration - The feature is a add-on to third party registration in S-CSCF - related to the the change in ims_isc module --- Modified: src/modules/ims_usrloc_scscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/3feab77f597284ddc8b6b87d0da0f47… Patch: https://github.com/kamailio/kamailio/commit/3feab77f597284ddc8b6b87d0da0f47… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc.h b/src/modules/ims_usrloc_scscf/usrloc.h index 4f124fdf7c..0db0f02063 100644 --- a/src/modules/ims_usrloc_scscf/usrloc.h +++ b/src/modules/ims_usrloc_scscf/usrloc.h @@ -201,6 +201,8 @@ typedef struct _ims_application_server { str server_name; /**< SIP URL of the app server */ char default_handling; /**< enum SESSION_CONTINUED SESSION_TERMINATED 0..1 */ str service_info; /**< optional info to be sent to AS 0..1 */ + int include_register_request; + int include_register_response; } ims_application_server; /** Public Identity Structure */

1 0

git:master:99b2cfaf: ims_isc: add-on for third-party registration
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 99b2cfaf4151968a62099880928563a64ccdeddc URL: https://github.com/kamailio/kamailio/commit/99b2cfaf4151968a62099880928563a… Author: Christoph Valentin <Christoph.Valentin(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-09T21:31:19+02:00 ims_isc: add-on for third-party registration - The feature is a add-on to third party registration in S-CSCF - The feature assumes two new flags in HSS database, where additional to the "Service Info XML" an "insertRegisterRequest" flag or an "insertRegisterRepsonse" flag can be set. These flags are sent with the SAR/SAA exchange to the S-CSCF, where the new feature does a prioritization: If Service Info present -> add service info to body of 3rd Party REGISTER Request else if insertRegisterRequest -> add original REGISTER request to body of 3rd Party REGISTER request else if insertRegisterResponse -> add original REGISTER response to body of 3rd Party REGISTER request else -> add no body to 3rd Party REGISTER request. - Multipart Body is not supported. - More info about the insertRegisterRequest and insertRegisterResponse flags can be found in applicable 3GPP standards. --- Modified: src/modules/ims_isc/checker.c Modified: src/modules/ims_isc/checker.h Modified: src/modules/ims_isc/doc/ims_isc_admin.xml Modified: src/modules/ims_isc/third_party_reg.c Modified: src/modules/ims_isc/third_party_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/99b2cfaf4151968a62099880928563a… Patch: https://github.com/kamailio/kamailio/commit/99b2cfaf4151968a62099880928563a…

1 0

git:master:2585002a: ims_registrar_scscf: add-on for third-party registration
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 2585002aea41d2629bf8607f199c6ef0e4146394 URL: https://github.com/kamailio/kamailio/commit/2585002aea41d2629bf8607f199c6ef… Author: Christoph Valentin <Christoph.Valentin(a)kapsch.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-09T21:34:23+02:00 ims_registrar_scscf: add-on for third-party registration - The feature is a add-on to third party registration in S-CSCF - related to the the change in ims_isc module --- Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/2585002aea41d2629bf8607f199c6ef… Patch: https://github.com/kamailio/kamailio/commit/2585002aea41d2629bf8607f199c6ef… --- diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index f8992ee761..4880f0289c 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -202,6 +202,35 @@ static inline void space_trim_dup(str *dest, char *src) memcpy(dest->s,src+i,dest->len); } +/** + * Parse a Application Server Extension. + * @param doc - the XML document + * @param node - the current node + * @param as - structure to fill + * @returns 1 on success, 0 on failure + */ +static int parse_application_server_extension(xmlDocPtr doc,xmlNodePtr node,ims_application_server *as) +{ + xmlNodePtr child; + + for(child=node->children ; child ; child=child->next) + if (child->type==XML_ELEMENT_NODE) + switch (child->name[0]) { + case 'I':case 'i': {//IncludeRegisterRequest / IncludeRegisterResponse + switch (child->name[17]) { + case 'Q':case 'q': //IncludeRegisterRequest + as->include_register_request = 1; + break; + case 'S':case 's': //IncludeRegisterResponse + as->include_register_response = 1; + break; + } + break; + } + } + return 1; +} + /** * Parse a Application Server. * @param doc - the XML document @@ -216,6 +245,8 @@ static int parse_application_server(xmlDocPtr doc,xmlNodePtr node,ims_applicatio as->server_name.s=NULL;as->server_name.len=0; as->default_handling=IFC_NO_DEFAULT_HANDLING; as->service_info.s=NULL;as->service_info.len=0; + as->include_register_request = 0; + as->include_register_response = 0; for(child=node->children ; child ; child=child->next) if (child->type==XML_ELEMENT_NODE) @@ -240,11 +271,13 @@ static int parse_application_server(xmlDocPtr doc,xmlNodePtr node,ims_applicatio as->default_handling=ifc_tDefaultHandling2char(x); xmlFree(x); break; + case 'E':case 'e': //Extension + parse_application_server_extension(doc,child,as); + break; } return 1; } - /** * Parse SPT for SIP Header. * @param doc - the XML document

1 0

git:master:7a977615: siptrace: remove bogus comments
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 7a9776151fd246a7d98a7cebe85ac2babb2da9b3 URL: https://github.com/kamailio/kamailio/commit/7a9776151fd246a7d98a7cebe85ac2b… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: remove bogus comments --- Modified: src/modules/siptrace/doc/siptrace_admin.xml Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/7a9776151fd246a7d98a7cebe85ac2b… Patch: https://github.com/kamailio/kamailio/commit/7a9776151fd246a7d98a7cebe85ac2b… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 83449ee31f..288824ba93 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -19,7 +19,7 @@ The SIPtrace module offer a possibility to store incoming and outgoing SIP messages in a database and/or duplicate to the capturing server (using <acronym>HEP</acronym>, the Homer encapsulation protocol, or plain SIP mode). Since version 5.4 new levels of tracing - are available. Transactions and dialogs can be traced. Trace flag is now useless. + are available. Transactions and dialogs can be traced. </para> <para> There are multiple ways of storing information: diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fae818ec43..7bfa5a60ee 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -750,6 +750,10 @@ static int fixup_siptrace(void **param, int param_no) } *param = pkg_malloc(sizeof(trace_type)); + if (*param == NULL) { + LM_ERR("no more pkg memory!\n"); + return -1; + } memcpy(*param, &trace_type, sizeof(trace_type)); } @@ -758,12 +762,10 @@ static int fixup_siptrace(void **param, int param_no) /** - * TODO TODO TODO: * * parse_siptrace_uri (to replace siptrace_fixup and ki_sip_trace_dst_cid beginning) * parse_siptrace_type * - * */ static int parse_siptrace_uri(str* duri, dest_info_t* dst) @@ -1535,7 +1537,6 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if (info->uriState == STRACE_RAW_URI) { LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n"); - abort(); return; } diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index c8b2051385..aeaef830ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -268,14 +268,13 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) /* either modparam dup_uri or siptrace param dst2 */ if((dup_uri_str.s == 0 || dup_uri == NULL) && (dst2 == NULL)) { - LM_INFO("XXX: here s where we've got problems!\n"); + LM_WARN("Neither dup_uri modparam or siptrace destination uri param used!\n"); return 0; } init_dest_info(&dst); if(!dst2) { - LM_INFO("XXX: using default dup uri!\n"); /* create a temporary proxy from dst param */ dst.proto = PROTO_UDP; p = mk_proxy(&dup_uri->host,

1 0

git:master:d692cfa4: siptrace: remove useless code from siptrace_send
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: d692cfa43b200e9dd10b29e2b42d4092d7caba7b URL: https://github.com/kamailio/kamailio/commit/d692cfa43b200e9dd10b29e2b42d409… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: remove useless code from siptrace_send This piece of code was preventing usage of siptrace parameter uri if dup_uri was not set. --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/d692cfa43b200e9dd10b29e2b42d409… Patch: https://github.com/kamailio/kamailio/commit/d692cfa43b200e9dd10b29e2b42d409… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 6e7718b933..c8b2051385 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -266,12 +266,16 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) if(buf == NULL || len <= 0) return -1; - if(dup_uri_str.s == 0 || dup_uri == NULL) + /* either modparam dup_uri or siptrace param dst2 */ + if((dup_uri_str.s == 0 || dup_uri == NULL) && (dst2 == NULL)) { + LM_INFO("XXX: here s where we've got problems!\n"); return 0; + } init_dest_info(&dst); if(!dst2) { + LM_INFO("XXX: using default dup uri!\n"); /* create a temporary proxy from dst param */ dst.proto = PROTO_UDP; p = mk_proxy(&dup_uri->host, @@ -290,15 +294,6 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) dst.to.s.sa_family, dst.proto); goto error; } - } else { - /* create a temporary proxy to dup uri */ - dst.proto = PROTO_UDP; - p = mk_proxy(&dup_uri->host, - (dup_uri->port_no) ? dup_uri->port_no : SIP_PORT, dst.proto); - if(p == 0) { - LM_ERR("bad host name in uri\n"); - return -1; - } } if(msg_send((dst2) ? dst2 : &dst, buf, len) < 0) {

1 0

git:master:66d17d5e: siptrace: when saving into dialog use local stored uri instead of global one
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 66d17d5e55bf25f4cd57c6a957e8db89ba889c41 URL: https://github.com/kamailio/kamailio/commit/66d17d5e55bf25f4cd57c6a957e8db8… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: when saving into dialog use local stored uri instead of global one The local one is either the parameter if set or the global one if not. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/66d17d5e55bf25f4cd57c6a957e8db8… Patch: https://github.com/kamailio/kamailio/commit/66d17d5e55bf25f4cd57c6a957e8db8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 94167c32e0..fae818ec43 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -969,7 +969,7 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * info->correlation_id = correlation_id_str; if (dest) { info->uriState = STRACE_RAW_URI; - info->u.dup_uri = dup_uri_str; + info->u.dup_uri = dup_uri_param_str; } else { info->uriState = STRACE_UNUSED_URI; }

1 0

[kamailio/kamailio] Siptrace (#1912)
by Ionut Ionita 09 Apr '19

09 Apr '19

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Siptrace module has two different tracing concepts which do mostly the same thing. It has sip_trace function and it has trace_flag parameter which traces messages in a transaction. This pull request aims to have a single point of trace activation, that is when the user calls sip_trace() function from the script. Moreover, it adds 3 levels of tracing: message, transaction and dialog level tracing. This option is added as a parameter to sip_trace(), therefore the user can now summon sip_trace(duri, correlation_id, "m/t/d") where "m" stands for message, "t" for transaction and "d" for dialog. The patch has been tested both locally and in our company's test system. Locally I've tested it using a few scenarios generated using sipp: successful call, negative reply(491 answer - hop-by-hop ACK), UAC CANCEL and dual bye scenario generated by Kamailio(dialog timeout). The only issue with current patch is it doesn't trace internally generated BYEs that is because they are only a buffer in Kamailio, not a parsed SIP message, therefore, after a few days of searching for solutions I didn't find any valid one. Parsing a SIP message for tracing didn't seem worth the processing time to me, but of course it can be added in the future. Looking forward to your opinion or suggestions regarding the current patch. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1912 -- Commit Summary -- * siptrace: add basic transaction and dialog level tracing * siptrace: trace negative ACKs * siptrace: check if a request is set to avoid local transaction crash * siptrace: Add code to trace incoming CANCEL transcations * siptrace: Minor code fixes; remove useless error logs * siptrace: store sip_trace destination parameter for the entire dialog * siptrace: remove unused trace flag * siptrace: update README -- File Changes -- M src/core/parser/msg_parser.h (1) M src/modules/siptrace/README (562) M src/modules/siptrace/doc/siptrace_admin.xml (33) M src/modules/siptrace/siptrace.c (864) M src/modules/siptrace/siptrace_data.h (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1912.patch https://github.com/kamailio/kamailio/pull/1912.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/1912

6 28

git:master:65778f9e: siptrace: use global duri if null provided to siptrace
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 65778f9e256e90c84a49eac033a18f617674459c URL: https://github.com/kamailio/kamailio/commit/65778f9e256e90c84a49eac033a18f6… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: use global duri if null provided to siptrace --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/65778f9e256e90c84a49eac033a18f6… Patch: https://github.com/kamailio/kamailio/commit/65778f9e256e90c84a49eac033a18f6… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 86318b8860..94167c32e0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -67,6 +67,9 @@ MODULE_VERSION ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ || ((_msg->flags & trace_flag) == 0)) +#define is_null_pv(_str) \ + (!str_strcmp(&_str, &null_pv_value_str)) + struct tm_binds tmb; struct dlg_binds dlgb; @@ -133,6 +136,8 @@ static str totag_column = str_init("totag"); /* 11 */ static str siptrace_info_dlgkey = str_init("__siptrace_info_dlg_key__"); static str siptrace_info_avp_str = str_init("$avp(__siptrace_info_avp__)"); +static str null_pv_value_str = str_init("<null>"); + #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4 @@ -732,7 +737,7 @@ static int fixup_siptrace(void **param, int param_no) if (param_no == 1 || param_no == 2) { /* correlation id */ - return fixup_spve_spve(param, param_no); + return fixup_spve_all(param, param_no); } else if (param_no == 3) { /* tracing type; string only */ sflags.s = (char *)*param; @@ -884,21 +889,30 @@ static int w_sip_trace2(sip_msg_t *msg, char *dest, char *correlation_id) static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char *trace_type_p) { - str dup_uri_str = {0, 0}; + str dup_uri_param_str = {0, 0}; str correlation_id_str = {0, 0}; dest_info_t dest_info; enum siptrace_type_t trace_type; siptrace_info_t* info; if (dest) { - if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_str) != 0) { + if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { LM_ERR("unable to parse the dest URI string\n"); return -1; } } - /* if arg dest uri is null dup_uri_str will have length 0 and global dup_uri will be used */ - if (parse_siptrace_uri(&dup_uri_str, &dest_info) < 0) { + if (dup_uri_param_str.s == 0 || (is_null_pv(dup_uri_param_str))) { + if (dup_uri_str.s == 0 || dup_uri_str.len == 0) { + LM_ERR("no duplicate_uri modparam nor duplicate uri sip_trace() argument provided!\n"); + return -1; + } + + dup_uri_param_str = dup_uri_str; + } + + /* if arg dest uri is null dup_uri_param_str will have length 0 and global dup_uri will be used */ + if (parse_siptrace_uri(&dup_uri_param_str, &dest_info) < 0) { LM_ERR("failed to parse uri!\n"); return -1; }

1 0

git:master:83758719: siptrace: add trace_flag after it was removed
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 8375871957ce931b87cc03442915fa319b5b3ef6 URL: https://github.com/kamailio/kamailio/commit/8375871957ce931b87cc03442915fa3… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: add trace_flag after it was removed As requested trace_flag is added back to siptrace module. Kamailio users requested ways to be able to stop tracing at any moment during the script. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8375871957ce931b87cc03442915fa3… Patch: https://github.com/kamailio/kamailio/commit/8375871957ce931b87cc03442915fa3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 2f8f32a11f..9af3b522bf 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -132,6 +132,8 @@ static str siptrace_info_avp_str = str_init("$avp(__siptrace_info_avp__)"); #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4 +int trace_flag = 0; + int trace_on = 0; int trace_sl_acks = 1; @@ -213,6 +215,7 @@ static param_export_t params[] = { {"fromtag_column", PARAM_STR, &fromtag_column}, {"totag_column", PARAM_STR, &totag_column}, {"direction_column", PARAM_STR, &direction_column}, + {"trace_flag", INT_PARAM, &trace_flag}, {"trace_on", INT_PARAM, &trace_on}, {"traced_user_avp", PARAM_STR, &traced_user_avp_str}, {"trace_table_avp", PARAM_STR, &trace_table_avp_str}, @@ -274,6 +277,12 @@ static int mod_init(void) return -1; } + if(trace_flag < 0 || trace_flag > (int)MAX_FLAG) { + LM_ERR("invalid trace flag %d\n", trace_flag); + return -1; + } + trace_flag = 1 << trace_flag; + trace_to_database_flag = (int *)shm_malloc(sizeof(int)); if(trace_to_database_flag == NULL) { LM_ERR("no more shm memory left\n"); @@ -1122,7 +1131,8 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, } #define trace_is_off(_msg) \ - (((_msg)->msg_flags & FL_SIPTRACE) == 0) + ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ + || ((_msg->flags & trace_flag) == 0)) static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) { @@ -1529,6 +1539,11 @@ static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps return; } + if(trace_is_off(ps->req)) { + LM_DBG("trace off...\n"); + return; + } + sip_trace(ps->req, info->uriState == STRACE_PARSED_URI ? &info->u.dest_info : NULL , NULL, NULL); }

1 0

git:master:608145da: siptrace: check trace flag for current traced message
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 608145da87cbb38e37e8a5d3e901d266cfc9f2ae URL: https://github.com/kamailio/kamailio/commit/608145da87cbb38e37e8a5d3e901d26… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: check trace flag for current traced message --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/608145da87cbb38e37e8a5d3e901d26… Patch: https://github.com/kamailio/kamailio/commit/608145da87cbb38e37e8a5d3e901d26… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 9af3b522bf..86318b8860 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -63,6 +63,10 @@ MODULE_VERSION #define SIPTRACE_ANYADDR "any:255.255.255.255:5060" #define SIPTRACE_ANYADDR_LEN (sizeof(SIPTRACE_ANYADDR) - 1) +#define trace_is_off(_msg) \ + ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ + || ((_msg->flags & trace_flag) == 0)) + struct tm_binds tmb; struct dlg_binds dlgb; @@ -984,6 +988,11 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } } + if(trace_is_off(msg)) { + LM_DBG("trace off...\n"); + return 1; + } + trace_current: return sip_trace(msg, &dest_info, &correlation_id_str, NULL); } @@ -1130,10 +1139,6 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, return sip_trace_store(&sto, dst, correlation_id_str); } -#define trace_is_off(_msg) \ - ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \ - || ((_msg->flags & trace_flag) == 0)) - static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) { siptrace_data_t sto;

1 0

git:master:84a358d1: siptrace: remove unused trace flag
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 84a358d143612544136bf34e9d6a369eb7547d4c URL: https://github.com/kamailio/kamailio/commit/84a358d143612544136bf34e9d6a369… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: remove unused trace flag --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/84a358d143612544136bf34e9d6a369… Patch: https://github.com/kamailio/kamailio/commit/84a358d143612544136bf34e9d6a369… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fb6d4180e8..2f8f32a11f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -132,7 +132,6 @@ static str siptrace_info_avp_str = str_init("$avp(__siptrace_info_avp__)"); #define NR_KEYS 12 #define SIP_TRACE_TABLE_VERSION 4 -int trace_flag = 0; int trace_on = 0; int trace_sl_acks = 1; @@ -214,7 +213,6 @@ static param_export_t params[] = { {"fromtag_column", PARAM_STR, &fromtag_column}, {"totag_column", PARAM_STR, &totag_column}, {"direction_column", PARAM_STR, &direction_column}, - {"trace_flag", INT_PARAM, &trace_flag}, {"trace_on", INT_PARAM, &trace_on}, {"traced_user_avp", PARAM_STR, &traced_user_avp_str}, {"trace_table_avp", PARAM_STR, &trace_table_avp_str}, @@ -276,12 +274,6 @@ static int mod_init(void) return -1; } - if(trace_flag < 0 || trace_flag > (int)MAX_FLAG) { - LM_ERR("invalid trace flag %d\n", trace_flag); - return -1; - } - trace_flag = 1 << trace_flag; - trace_to_database_flag = (int *)shm_malloc(sizeof(int)); if(trace_to_database_flag == NULL) { LM_ERR("no more shm memory left\n");

1 0

git:master:b40cf0bf: siptrace: update README
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: b40cf0bfd072e733bcde58b4584abb4653d67f1e URL: https://github.com/kamailio/kamailio/commit/b40cf0bfd072e733bcde58b4584abb4… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: update README --- Modified: src/modules/siptrace/README Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b40cf0bfd072e733bcde58b4584abb4… Patch: https://github.com/kamailio/kamailio/commit/b40cf0bfd072e733bcde58b4584abb4…

1 0

git:master:13378d72: siptrace: store sip_trace destination parameter for the entire dialog
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 13378d726acd90db294691bfbf2f67b89041cb6b URL: https://github.com/kamailio/kamailio/commit/13378d726acd90db294691bfbf2f67b… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: store sip_trace destination parameter for the entire dialog * value given as argument to sip_trace for destination was lost after the first request; this value is now included in siptrace_info parameter and carried via an AVP to DLGCB_CREATED callback and then stored in a dlg var; * fixed mem leak when calling serialize_siptrace_info; --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/13378d726acd90db294691bfbf2f67b… Patch: https://github.com/kamailio/kamailio/commit/13378d726acd90db294691bfbf2f67b…

1 0

git:master:d00be11b: siptrace: Add code to trace incoming CANCEL transcations
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: d00be11be0e5fceec5274bf3bfd02951c3752c90 URL: https://github.com/kamailio/kamailio/commit/d00be11be0e5fceec5274bf3bfd0295… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: Add code to trace incoming CANCEL transcations --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/d00be11be0e5fceec5274bf3bfd0295… Patch: https://github.com/kamailio/kamailio/commit/d00be11be0e5fceec5274bf3bfd0295… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index ae1f53d7f3..48fa9b97b4 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1166,11 +1166,23 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) return; } } + + /* for incoming cancel this is the only play(i've found) where I have the CANCEL transaction + * and can register a callback for the reply */ memset(&sto, 0, sizeof(siptrace_data_t)); - if(traced_user_avp.n != 0) - sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, - &sto.avp_value, &sto.state); + if (unlikely(type == TMCB_E2ECANCEL_IN)) { + msg->msg_flags |= FL_SIPTRACE; + if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_READY, trace_onreply_out, *ps->param, 0) + <= 0) { + LM_ERR("can't register trace_onreply_out\n"); + return; + } + } else { + if(traced_user_avp.n != 0) + sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, + &sto.avp_value, &sto.state); + } if((sto.avp == NULL) && trace_is_off(msg)) { LM_DBG("trace off...\n"); @@ -1180,11 +1192,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) if(sip_trace_prepare(msg) < 0) return; - if(ps->send_buf.len > 0) { - sto.body = ps->send_buf; + if (unlikely(type == TMCB_E2ECANCEL_IN)) { + sto.body.s = msg->buf; + sto.body.len = msg->len; } else { - sto.body.s = "No request buffer"; - sto.body.len = sizeof("No request buffer") - 1; + if(ps->send_buf.len > 0) { + sto.body = ps->send_buf; + } else { + sto.body.s = "No request buffer"; + sto.body.len = sizeof("No request buffer") - 1; + } } sto.callid = msg->callid->body; @@ -1245,7 +1262,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } } - sto.dir = "out"; + /* FIXME the callback is designed for outgoing requests but this along with + * the callback registration at the begining of the function it's for a special + * case - incoming CANCEL transactions; they were not traced before; TMCB_E2ECANCEL_IN + * will throw the incoming request through this function and the callback in the beginning + * will make sure the reply for this cancel is caught */ + if (unlikely(type == TMCB_E2ECANCEL_IN)) { + sto.dir = "in"; + } else { + sto.dir = "out"; + } sto.fromtag = get_from(msg)->tag_value; sto.totag = get_to(msg)->tag_value; @@ -1361,13 +1387,18 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) return; } memset(&sto, 0, sizeof(siptrace_data_t)); - if(traced_user_avp.n != 0) - sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, - &sto.avp_value, &sto.state); - if((sto.avp == NULL) && trace_is_off(t->uas.request)) { - LM_DBG("trace off...\n"); - return; + /* can't(don't know) set FL_SIPTRACE flag from trace_onreq_out because + * there no access to CANCEL transaction there */ + if (likely(type != TMCB_RESPONSE_READY)) { + if(traced_user_avp.n != 0) + sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, + &sto.avp_value, &sto.state); + + if((sto.avp == NULL) && trace_is_off(t->uas.request)) { + LM_DBG("trace off...\n"); + return; + } } req = ps->req; @@ -1463,7 +1494,6 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps) { LM_DBG("storing negative ack...\n"); - /* this condition should not exist but there seems to be a BUG in kamailio * letting requests other than the ACK inside */ if (ps->req->first_line.u.request.method_value != METHOD_ACK) { @@ -1623,6 +1653,11 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe LM_ERR("can't register trace_onreply_in\n"); return; } + + if(tmb.register_tmcb(msg, 0, TMCB_E2ECANCEL_IN, trace_onreq_out, info, 0) <= 0) { + LM_ERR("can't register trace_onreply_in\n"); + return; + } } //static void trace_dialog(sip_msg_t* msg, siptrace_info_t* info)

1 0

git:master:157892f3: siptrace: Minor code fixes; remove useless error logs
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 157892f358ed0cf62c59d884dde171b2aaaf791e URL: https://github.com/kamailio/kamailio/commit/157892f358ed0cf62c59d884dde171b… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: Minor code fixes; remove useless error logs --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/157892f358ed0cf62c59d884dde171b… Patch: https://github.com/kamailio/kamailio/commit/157892f358ed0cf62c59d884dde171b… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 48fa9b97b4..f4cca2c1c8 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -352,14 +352,6 @@ static int mod_init(void) } } -#if 0 - else if(tmb.register_tmcb(0, 0, TMCB_REQUEST_IN, trace_onreq_in, 0, 0) - <= 0) { - LM_ERR("can't register trace_onreq_in\n"); - return -1; - } -#endif - /* bind the SL API */ if(sl_load_api(&slb) != 0) { LM_WARN("cannot bind to SL API. Will not install sl callbacks.\n"); @@ -712,9 +704,8 @@ enum siptrace_type_t parse_siptrace_flag(str* sflags) case '\t': break; default: - LM_ERR("idx %d %d\n", idx, sflags->len); - LM_ERR("Invalid character <%c> in <%.*s>!\n", sflags->s[idx], - sflags->len, sflags->s); + LM_ERR("Invalid character <%c> in <%.*s> at position <%d>!\n", sflags->s[idx], + sflags->len, sflags->s, idx); return SIPTRACE_NONE; } } @@ -727,7 +718,6 @@ static int fixup_siptrace(void **param, int param_no) str sflags; enum siptrace_type_t trace_type; - LM_ERR("fixup function aaa\n"); if(param_no < 1 || param_no > 3) { LM_DBG("params:%s\n", (char *)*param); return 0; @@ -738,8 +728,8 @@ static int fixup_siptrace(void **param, int param_no) return fixup_spve_spve(param, param_no); } else if (param_no == 3) { /* tracing type; string only */ - sflags.s = *param; - sflags.len = strlen(*param); + sflags.s = (char *)*param; + sflags.len = strlen(sflags.s); trace_type = parse_siptrace_flag(&sflags); if (trace_type == SIPTRACE_NONE) { @@ -960,7 +950,8 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } else if (trace_type == SIPTRACE_DIALOG) { trace_transaction(msg, info, 1); if (unlikely(dlgb.set_dlg_var == NULL)) { - LM_ERR("Dialog api not loaded! will trace only current transaction!\n"); + /* FIXME should we abort tracing here? */ + LM_WARN("Dialog api not loaded! will trace only current transaction!\n"); } else { /* serialize what's in info */ /* save correlation id in siptrace_info avp @@ -1626,7 +1617,6 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe /* trace current message on out */ msg->msg_flags |= FL_SIPTRACE; - LM_ERR("trace request out registration\n"); if(tmb.register_tmcb(msg, 0, TMCB_REQUEST_SENT, trace_onreq_out, info, 0) <= 0) { LM_ERR("can't register trace_onreq_out\n"); return; @@ -1639,7 +1629,6 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe } /* trace reply on out */ - LM_CRIT("trace resp sent!\n"); if(tmb.register_tmcb(msg, 0, TMCB_RESPONSE_SENT, trace_onreply_out, info, register_free_func ? free_trace_info : 0) <= 0) { LM_ERR("can't register trace_onreply_out\n"); @@ -1666,8 +1655,6 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p int_str avp_value; struct usr_avp* avp = NULL; - LM_ERR("TRACING THIS DIALOGHES!\n"); - if (!dlgb.get_dlg) { LM_ERR("Dialog API not loaded! Trace off...\n"); return; @@ -1709,11 +1696,6 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p return; } - /* flag for stateless replies?? */ - - /* trace negative ACKS? */ - /* trace 180? */ - /* trace CANCEL and BYE transactions */ return; }

1 0

git:master:1b319682: siptrace: trace negative ACKs
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 1b3196823c5004ee9f1402ff3a50227a66b14365 URL: https://github.com/kamailio/kamailio/commit/1b3196823c5004ee9f1402ff3a50227… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: trace negative ACKs --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/1b3196823c5004ee9f1402ff3a50227… Patch: https://github.com/kamailio/kamailio/commit/1b3196823c5004ee9f1402ff3a50227… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 7c4a4ff810..242c4ab92b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -92,6 +92,7 @@ static int sip_trace_store_db(siptrace_data_t *sto); static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps); static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps); static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps); +static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps); static void trace_sl_onreply_out(sl_cbp_t *slcb); static void trace_sl_ack_in(sl_cbp_t *slcb); @@ -1271,7 +1272,7 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) req = ps->req; msg = ps->rpl; - if(msg == NULL || req == NULL) { + if((type != TMCB_ACK_NEG_IN) && (msg == NULL || req == NULL)) { LM_DBG("no reply\n"); return; } @@ -1281,8 +1282,8 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) sto.avp = search_first_avp(traced_user_avp_type, traced_user_avp, &sto.avp_value, &sto.state); - if((sto.avp == NULL) && trace_is_off(req)) { - LM_DBG("trace off...\n"); + if((type != TMCB_ACK_NEG_IN) && ((sto.avp == NULL) && trace_is_off(req))) { + LM_DBG("trace off... %d %d\n", sto.avp == NULL, trace_is_off(req)); return; } @@ -1459,6 +1460,19 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) return; } +static void trace_tm_neg_ack_in(struct cell *t, int type, struct tmcb_params *ps) +{ + LM_DBG("storing negative ack...\n"); + + /* this condition should not exist but there seems to be a BUG in kamailio + * letting requests other than the ACK inside */ + if (ps->req->first_line.u.request.method_value != METHOD_ACK) { + return; + } + + sip_trace(ps->req, 0, NULL, NULL); +} + static int serialize_siptrace_info(siptrace_info_t* info, str* serial_data) { if (info == NULL || info->correlation_id == NULL) { @@ -1604,6 +1618,11 @@ static void trace_transaction(sip_msg_t* msg, siptrace_info_t* info, int registe /* TODO */ /* check the following callbacks: TMCB_REQUEST_PENDING, TMCB_RESPONSE_READY, TMCB_ACK_NEG_IN */ + /* trace reply on in */ + if(tmb.register_tmcb(msg, 0, TMCB_ACK_NEG_IN, trace_tm_neg_ack_in, info, 0) <= 0) { + LM_ERR("can't register trace_onreply_in\n"); + return; + } } //static void trace_dialog(sip_msg_t* msg, siptrace_info_t* info)

1 0

git:master:fd17c99e: siptrace: check if a request is set to avoid local transaction crash
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: fd17c99eea3e41c087b8c73467608fd90ae37420 URL: https://github.com/kamailio/kamailio/commit/fd17c99eea3e41c087b8c73467608fd… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: check if a request is set to avoid local transaction crash --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/fd17c99eea3e41c087b8c73467608fd… Patch: https://github.com/kamailio/kamailio/commit/fd17c99eea3e41c087b8c73467608fd… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 242c4ab92b..ae1f53d7f3 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1690,6 +1690,17 @@ static void trace_dialog_transaction(struct dlg_cell* dlg, int type, struct dlg_ memset(&info, 0, sizeof(siptrace_info_t)); info.correlation_id = dlgb.get_dlg_var(dlg, &siptrace_info_dlgkey); + /** + * DUAL BYE - internally generated BYE from kamailio + * set flag to signal request_in callback which will register + * transaction callbacks to catch caller and callee BYEs and their + * responses + */ + if (params->req == NULL && params->rpl == NULL) { + LM_DBG("dual bye!\n"); + return; + } + trace_transaction(params->req, &info, 0); sip_trace(params->req, NULL, info.correlation_id, NULL);

1 0

git:master:fa7eb2ab: siptrace: add basic transaction and dialog level tracing
by Henning Westerholt 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: fa7eb2ab595665f1ff95caf819d260b86bb8ca2b URL: https://github.com/kamailio/kamailio/commit/fa7eb2ab595665f1ff95caf819d260b… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-09T21:25:53+02:00 siptrace: add basic transaction and dialog level tracing Added a new parameter to sip_trace() function which is the tracing type. This can be m(message)/t(transaction)/d(dialog). Transaction level tracing is done by registering REQUEST_SENT, REPLY_RECIEVED and REPLY_SENT callbacks when sip_trace() is called. Transaction module has to be loaded and the function call has to be made from a request route. Dialog level tracing is a little more complicated. INVITE transaction is traced the same level as a transaction traced with 't' flag. For the other transactions DLGCB_CREATED callback is used to know when dialog is created and callbacks for the rest of the dialog can be created. Correlation_id has to be carried all the way to this callback which is called after all the routes are called. In order to pass the correlation_id from sip_trace() to DLGCB_CREATED correlation_id has been saved into an avp. Also, since DLGCB_CREATED is called for all dialogs and some users may opt out not to trace some dialogs, FL_SIPTRACE message flag has been added to signal from sip_trace() to the callback whether this dialog should be traced or not. Moreover FL_SIPTRACE flag is used to signal whether stateless replies shall be traced, such as the 200 OK generated after a successful registration. The implementation is not complete, some messages such as the 180 and negative acks will be missing. Moreover internally generated BYE transacitons at timeout might be missing but these shall be fixed in future commits. --- Modified: src/core/parser/msg_parser.h Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/fa7eb2ab595665f1ff95caf819d260b… Patch: https://github.com/kamailio/kamailio/commit/fa7eb2ab595665f1ff95caf819d260b…

1 0

git:master:a383027e: topos: set context when executing event route
by Daniel-Constantin Mierla 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: a383027eae25e63a779ecf9377facefdd2e05ef6 URL: https://github.com/kamailio/kamailio/commit/a383027eae25e63a779ecf9377facef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-09T13:04:19+02:00 topos: set context when executing event route - should fix detection of using KSR.drop() - reported by GH #1924 --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a383027eae25e63a779ecf9377facef… Patch: https://github.com/kamailio/kamailio/commit/a383027eae25e63a779ecf9377facef… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index e13029db54..f6b6a3a2f5 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -521,7 +521,7 @@ static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, run_top_route(event_rt.rlist[evidx], (msg)?msg:fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, (msg)?msg:fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE, &_tps_eventrt_callback, evname)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

1 0

git:master:395cae83: core: kemi - wrapper function to run callbacks with context
by Daniel-Constantin Mierla 09 Apr '19

09 Apr '19

Module: kamailio Branch: master Commit: 395cae83da4d83920dd038d299c30ffa97b6c272 URL: https://github.com/kamailio/kamailio/commit/395cae83da4d83920dd038d299c30ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-09T13:03:38+02:00 core: kemi - wrapper function to run callbacks with context --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/395cae83da4d83920dd038d299c30ff… Patch: https://github.com/kamailio/kamailio/commit/395cae83da4d83920dd038d299c30ff… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 2469e067c6..deb9285b9d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2422,3 +2422,13 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, setsflagsval(sfbk); return ret; } + +/** + * + */ +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata) +{ + sr_kemi_act_ctx_set(ctx); + return sr_kemi_route(keng, msg, rtype, ename, edata); +} diff --git a/src/core/kemi.h b/src/core/kemi.h index 3321dd8b4e..5d3c84ebb7 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -147,5 +147,7 @@ int sr_kemi_core_set_drop(sip_msg_t *msg); int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, str *ename, str *edata); +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata); #endif

1 0

[kamailio/kamailio] Entities for from tag and to tag (#1921)
by Øyvind Kolbu 08 Apr '19

08 Apr '19

#### 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 - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  We have locally needed to update the `from_tag` and `to_tag` columns in `acc`, `dialog` and `siptrace` as we get requests which are larger than the defaults can handle. While bumping the limit, I added two entities to `entities.xml` to get consistent sizes for `from_tag` and `to_tag` in the tables. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1921 -- Commit Summary -- * lib/srdb1: schema - add definitions for from_tag and to_tag * lib/srdb1: schema - use defined entities for from_tag and to_tag. * kamctl: regenerated db schema files for from_tag and to_tag changes. -- File Changes -- M src/lib/srdb1/schema/acc.xml (4) M src/lib/srdb1/schema/dialog.xml (4) M src/lib/srdb1/schema/entities.xml (2) M src/lib/srdb1/schema/missed_calls.xml (4) M src/lib/srdb1/schema/pr_active_watchers.xml (4) M src/lib/srdb1/schema/pr_pua.xml (4) M src/lib/srdb1/schema/rls_watchers.xml (4) M src/lib/srdb1/schema/sca.xml (4) M src/lib/srdb1/schema/sip_trace.xml (4) M utils/kamctl/db_sqlite/acc-create.sql (8) M utils/kamctl/db_sqlite/dialog-create.sql (4) M utils/kamctl/db_sqlite/presence-create.sql (8) M utils/kamctl/db_sqlite/rls-create.sql (4) M utils/kamctl/db_sqlite/sca-create.sql (4) M utils/kamctl/db_sqlite/siptrace-create.sql (4) M utils/kamctl/mysql/acc-create.sql (8) M utils/kamctl/mysql/dialog-create.sql (4) M utils/kamctl/mysql/presence-create.sql (8) M utils/kamctl/mysql/rls-create.sql (4) M utils/kamctl/mysql/sca-create.sql (4) M utils/kamctl/mysql/siptrace-create.sql (4) M utils/kamctl/oracle/acc-create.sql (8) M utils/kamctl/oracle/dialog-create.sql (4) M utils/kamctl/oracle/presence-create.sql (8) M utils/kamctl/oracle/rls-create.sql (4) M utils/kamctl/oracle/sca-create.sql (4) M utils/kamctl/oracle/siptrace-create.sql (4) M utils/kamctl/postgres/acc-create.sql (8) M utils/kamctl/postgres/dialog-create.sql (4) M utils/kamctl/postgres/presence-create.sql (8) M utils/kamctl/postgres/rls-create.sql (4) M utils/kamctl/postgres/sca-create.sql (4) M utils/kamctl/postgres/siptrace-create.sql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1921.patch https://github.com/kamailio/kamailio/pull/1921.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/1921

2 4

git:master:98c352de: kamctl: regenerated db schema files for from_tag and to_tag changes.
by Henning Westerholt 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: 98c352de1829a8238395290679280e11e9ee6b0a URL: https://github.com/kamailio/kamailio/commit/98c352de1829a8238395290679280e1… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-08T21:21:33+02:00 kamctl: regenerated db schema files for from_tag and to_tag changes. --- Modified: utils/kamctl/db_sqlite/acc-create.sql Modified: utils/kamctl/db_sqlite/dialog-create.sql Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/db_sqlite/rls-create.sql Modified: utils/kamctl/db_sqlite/sca-create.sql Modified: utils/kamctl/db_sqlite/siptrace-create.sql Modified: utils/kamctl/mysql/acc-create.sql Modified: utils/kamctl/mysql/dialog-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/mysql/rls-create.sql Modified: utils/kamctl/mysql/sca-create.sql Modified: utils/kamctl/mysql/siptrace-create.sql Modified: utils/kamctl/oracle/acc-create.sql Modified: utils/kamctl/oracle/dialog-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/oracle/rls-create.sql Modified: utils/kamctl/oracle/sca-create.sql Modified: utils/kamctl/oracle/siptrace-create.sql Modified: utils/kamctl/postgres/acc-create.sql Modified: utils/kamctl/postgres/dialog-create.sql Modified: utils/kamctl/postgres/presence-create.sql Modified: utils/kamctl/postgres/rls-create.sql Modified: utils/kamctl/postgres/sca-create.sql Modified: utils/kamctl/postgres/siptrace-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/98c352de1829a8238395290679280e1… Patch: https://github.com/kamailio/kamailio/commit/98c352de1829a8238395290679280e1…

1 0

git:master:9f351514: lib/srdb1: schema - add definitions for from_tag and to_tag
by Henning Westerholt 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: 9f35151401563877285f673b2de2a662fd1bd4e3 URL: https://github.com/kamailio/kamailio/commit/9f35151401563877285f673b2de2a66… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-08T21:21:33+02:00 lib/srdb1: schema - add definitions for from_tag and to_tag --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/9f35151401563877285f673b2de2a66… Patch: https://github.com/kamailio/kamailio/commit/9f35151401563877285f673b2de2a66… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 2bfe39540f..17a47baf83 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,5 +1,7 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> +<!ENTITY from_tag_len "128"> +<!ENTITY to_tag_len "128"> <!ENTITY password_len "64"> <!ENTITY ha1_len "128"> <!ENTITY realm_len "64">

1 0

git:master:9fc28c69: lib/srdb1: schema - use defined entities for from_tag and to_tag.
by Henning Westerholt 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: 9fc28c698d88fa2f7ece351577fd7e5c9de774d3 URL: https://github.com/kamailio/kamailio/commit/9fc28c698d88fa2f7ece351577fd7e5… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-08T21:21:33+02:00 lib/srdb1: schema - use defined entities for from_tag and to_tag. Currently various 64 length entities have been used instead. --- Modified: src/lib/srdb1/schema/acc.xml Modified: src/lib/srdb1/schema/dialog.xml Modified: src/lib/srdb1/schema/missed_calls.xml Modified: src/lib/srdb1/schema/pr_active_watchers.xml Modified: src/lib/srdb1/schema/pr_pua.xml Modified: src/lib/srdb1/schema/rls_watchers.xml Modified: src/lib/srdb1/schema/sca.xml Modified: src/lib/srdb1/schema/sip_trace.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fc28c698d88fa2f7ece351577fd7e5… Patch: https://github.com/kamailio/kamailio/commit/9fc28c698d88fa2f7ece351577fd7e5…

1 0

git:master:ce00265d: lcr: implemented structured output for lcr.dump_rules rpc command
by Ovidiu Sas 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: ce00265d25741657f255bd35403ba9d6cce297fc URL: https://github.com/kamailio/kamailio/commit/ce00265d25741657f255bd35403ba9d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-08T15:00:06-04:00 lcr: implemented structured output for lcr.dump_rules rpc command --- Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ce00265d25741657f255bd35403ba9d… Patch: https://github.com/kamailio/kamailio/commit/ce00265d25741657f255bd35403ba9d… --- diff --git a/src/modules/lcr/lcr_rpc.c b/src/modules/lcr/lcr_rpc.c index ec10653a32..ef5b351e6c 100644 --- a/src/modules/lcr/lcr_rpc.c +++ b/src/modules/lcr/lcr_rpc.c @@ -131,7 +131,9 @@ static void dump_rules(rpc_t *rpc, void *c) str _prefix = {NULL,0}; struct rule_info **rules, *rule; struct target *t; - void *st; + void *rec = NULL; + void *srec = NULL; + void *st, *sst, *ssst; str prefix, from_uri, request_uri; if (rpc->scan(c, "d", &_lcr_id)>0) { @@ -156,7 +158,14 @@ static void dump_rules(rpc_t *rpc, void *c) continue; } } - if(rpc->add(c, "{", &st) < 0) + if (srec==NULL) { + /* We create one array per lcr_id */ + if(rpc->add(c, "{", &rec) < 0) + return; + if(rpc->struct_add(rec, "[", "rule", &srec) < 0) + return; + } + if(rpc->array_add(srec, "{", &st) < 0) return; prefix.s = rule->prefix; prefix.len = rule->prefix_len; @@ -168,24 +177,37 @@ static void dump_rules(rpc_t *rpc, void *c) rule->rule_id, "prefix", &prefix, "from_uri", &from_uri, "request_uri", &request_uri, "stopper", rule->stopper); t = rule->targets; - while(t) { - if(rpc->add(c, "{", &st) < 0) + if (t) { + if (rpc->struct_add(st, "[", "gw", &sst) < 0) return; - rpc->struct_add(st, "ddd", "gw_index", t->gw_index, - "priority", t->priority, "weight", t->weight); - t = t->next; + while(t) { + if (rpc->array_add(sst, "{", &ssst) < 0) + return; + rpc->struct_add(ssst, "ddd", "gw_index", t->gw_index, + "priority", t->priority, "weight", t->weight); + t = t->next; + } } rule = rule->next; } } + + /* Mark the end of rule array */ + srec = NULL; + if (_filter_by_prefix) continue; rule = rules[lcr_rule_hash_size_param]; - while(rule) { - rpc->add(c, "d", rule->prefix_len); - rule = rule->next; + if (rule) { + if(rpc->struct_add(rec, "[", "prefix_len", &st) < 0) + return; + while(rule) { + rpc->array_add(st, "d", rule->prefix_len); + rule = rule->next; + } } } + if (rec==NULL) rpc->fault(c, 404, "Empty reply"); }

1 0

git:master:b4cf8f68: websocket: added check mechanism based on tcp connection
by Daniel-Constantin Mierla 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: b4cf8f6819ddb89b572fe25e778baaad53a6e081 URL: https://github.com/kamailio/kamailio/commit/b4cf8f6819ddb89b572fe25e778baaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-08T10:33:22+02:00 websocket: added check mechanism based on tcp connection - type 3 (KEEPALIVE_MECHANISM_CONCHECK) - based on GH #1892 --- Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_frame.h --- Diff: https://github.com/kamailio/kamailio/commit/b4cf8f6819ddb89b572fe25e778baaa… Patch: https://github.com/kamailio/kamailio/commit/b4cf8f6819ddb89b572fe25e778baaa… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 840125a041..36b465bc65 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -812,6 +812,14 @@ void ws_keepalive(unsigned int ticks, void *param) if(wsc->state == WS_S_CLOSING || wsc->awaiting_pong) { LM_WARN("forcibly closing connection\n"); wsconn_close_now(wsc); + } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { + tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); + if(con==NULL) { + LM_INFO("tcp connection has been lost\n"); + wsc->state = WS_S_CLOSING; + } else { + tcpconn_put(con); + } } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING) ? OPCODE_PING diff --git a/src/modules/websocket/ws_frame.h b/src/modules/websocket/ws_frame.h index d2cfe3a577..d0f8d84ed0 100644 --- a/src/modules/websocket/ws_frame.h +++ b/src/modules/websocket/ws_frame.h @@ -40,7 +40,8 @@ enum { KEEPALIVE_MECHANISM_NONE = 0, KEEPALIVE_MECHANISM_PING = 1, - KEEPALIVE_MECHANISM_PONG = 2 + KEEPALIVE_MECHANISM_PONG = 2, + KEEPALIVE_MECHANISM_CONCHECK = 3 }; #define DEFAULT_KEEPALIVE_MECHANISM KEEPALIVE_MECHANISM_PING extern int ws_keepalive_mechanism;

1 0

[kamailio/kamailio] crash in slow timer (#1897)
by lazedo 08 Apr '19

08 Apr '19

### Description slow_timer proc exited with crash, kamailio kept running but tm transaction kept accumulating which will lead to shared memory exhaustion and crash. in line 1131 `ret=tl->f(*ticks, tl, tl->data);` f is null, reason of crash  ### Troubleshooting #### Reproduction happens from time to time, not a way to reliably reproduce it.  #### Debugging Data  ``` #0 0x0000000000000000 in ?? () #1 0x000000000049f648 in slow_timer_main () at core/timer.c:1131 #2 0x0000000000424b84 in main_loop () at main.c:1685 #3 0x000000000042b9d3 in main (argc=16, argv=0x7ffe568bcd08) at main.c:2663 (gdb) frame 1 #1 0x000000000049f648 in slow_timer_main () at core/timer.c:1131 1131 ret=tl->f(*ticks, tl, tl->data); (gdb) list 1126 #ifdef TIMER_DEBUG 1127 tl->expires_no++; 1128 #endif 1129 SET_RUNNING_SLOW(tl); 1130 UNLOCK_SLOW_TIMER_LIST(); 1131 ret=tl->f(*ticks, tl, tl->data); 1132 /* reset the configuration group handles */ 1133 cfg_reset_all(); 1134 if (ret==0){ 1135 /* one shot */ (gdb) p *tl $1 = {next = 0x0, prev = 0x0, expire = 938928580, initial_timeout = 80, data = 0x0, f = 0x0, flags = 768, slow_idx = 45488} (gdb) info locals n = 12 ret = 4294967295 tl = 0x7fb2d3c860d0 i = 432 __func__ = "slow_timer_main" ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.1.7 ``` * **Operating System**:  ``` centos 7 ``` -- 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/issues/1897

2 4

git:master:ee9f1a86: modules: readme files regenerated - sdpops ... [skip ci]
by Kamailio Dev 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: ee9f1a8695e4e921eb97834f880355f08aa97f16 URL: https://github.com/kamailio/kamailio/commit/ee9f1a8695e4e921eb97834f880355f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-08T09:31:53+02:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/ee9f1a8695e4e921eb97834f880355f… Patch: https://github.com/kamailio/kamailio/commit/ee9f1a8695e4e921eb97834f880355f…

1 0

git:master:a1884dca: sdpops: fix module README '&&' in example, fix conversion error
by Henning Westerholt 08 Apr '19

08 Apr '19

Module: kamailio Branch: master Commit: a1884dca372d0b3bc82d5ad36dced99fa088d141 URL: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-08T09:29:42+02:00 sdpops: fix module README '&&' in example, fix conversion error --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… Patch: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 6cd8a68f69..5ed3c57d40 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -583,15 +583,16 @@ if(sdp_get_line_startswith("$avp(mline)", "m=")) { </para> <example> <title><function>sdp_get_address_family</function>usage</title> - <programlisting format="linespecific"> - ... - if(is_method("INVITE") && has_body("application/sdp")){ - - $avp(af) = sdp_get_address_family(); - xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); - } - ... - </programlisting> + <programlisting> +<![CDATA[ +... +if(is_method("INVITE") && has_body("application/sdp")){ + $avp(af) = sdp_get_address_family(); + xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); +} +... +]]> + </programlisting> </example> </section>

1 0

[kamailio/kamailio] kamailio crashes when attempting to query offline database (#1821)
by srinikart 05 Apr '19

05 Apr '19

### Description I am testing how kamailio reacts to various database conditions. One such condition is if the database engine is simply shut down (that is, database server process no longer running, tcp listening socket closed, etc...) I am utilizing the db_unixodbc module to connect to an Informix database engine. I am currently running on Kamailio version 5.0.1. I have a test query that executes against the database engine every 10 seconds. Here is what i have noticed if i shut down the database engine at some point after i run Kamailio. The first test query that attempts to run against the db engine fails; it tries to reconnect and fails. The second test query (10 seconds after the 1st) results in a SIGCHILD and shuts down the entire Kamailio process. I communicated this info to the mailing list and was asked to open an issue regarding this and to also test the more recent version 5 releases. Here is the update on said tests: I have tested the master branch and 5.3.0-dev2 and neither branch resolves the issue. However I did notice in the master branch that there is new code that is related to this issue. https://github.com/kamailio/kamailio/issues/1681 In issue 1681 there is code that allows Kamailio to start even if a database connection can not be established. Queries attempting to run against the offline database fail gracefully. And once the database is back online, a connection is established and queries against it are successful. However, if at some later point I shut down the database, we're back to the original issue that i reported. Kamailio crashes with the same output as listed before except the first query that is attempted against the offline db causes the crash in this master branch unlike previously (branch 5.series) the first attempt fails, tries again and fails, and the second attempt causes the crash. Regardless, the output is more or less the same and Kamailio is down. I suspect this might be the same behavior even if one is not using an odbc driver; but maybe not. ### Troubleshooting #### Reproduction Start Kamailio; kill the database engine; run test query from kamailo to said database engine; Kamailio crashes. This can be replicated using the db_unixodbc module; not sure if it's the same for other types of database drivers. #### Log Messages Jan 17 20:07:25 [29297]: INFO: (s) SQL query: FIRST TEST QUERY Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [dbase.c:135]: db_unixodbc_submit_query(): rv=-1. Query= FIRST TEST QUERY Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [connection.c:220]: db_unixodbc_extract_error(): unixodbc:SQLExecDirect=08S01:1:-11020:[Informix][Informix ODBC Driver]Communication link failure. Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [dbase.c:59]: reconnect(): Attempting DB reconnect Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [dbase.c:74]: reconnect(): failed to connect Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [connection.c:220]: db_unixodbc_extract_error(): unixodbc:SQLDriverConnect=08002:1:0:[unixODBC][Driver Manager]Connection name in use Jan 17 20:07:25 [29297]: ERROR: db_unixodbc [connection.c:220]: db_unixodbc_extract_error(): unixodbc:SQLDriverConnect=HY010:2:-11067:[Informix][Informix ODBC Driver]Function sequence error. Jan 17 20:07:25 [29297]: ERROR: <core> [db_query.c:181]: db_do_raw_query(): error while submitting query Jan 17 20:07:25 [29297]: ERROR: sqlops [sql_api.c:265]: sql_do_query(): cannot do the query FIRST TEST QUERY Jan 17 20:07:25 [29297]: INFO: (s) [123] SQL ret: fail (-1) Jan 17 20:07:25 [29297]: INFO: (s) [123] SQL res: no rows Jan 17 20:07:35 [29297]: INFO: (s) [123] SQL query: 10 seconds later the SECOND TEST QUERY (it's the same query as the first one) Jan 17 20:07:35 [29301]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 28 Jan 17 20:07:35 [29283]: ALERT: <core> [main.c:744]: handle_sigs(): child process 29297 exited by a signal 11 Jan 17 20:07:35 [29283]: ALERT: <core> [main.c:747]: handle_sigs(): core was not generated Jan 17 20:07:35 [29283]: INFO: <core> [main.c:759]: handle_sigs(): terminating due to SIGCHLD Jan 17 20:07:35 [29301]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29295]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29291]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29288]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29300]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29284]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29286]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29293]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29289]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29287]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29292]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29296]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29298]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29299]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29285]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29294]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29290]: INFO: <core> [main.c:814]: sig_usr(): signal 15 received Jan 17 20:07:35 [29283]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ### Additional Information version: kamailio 5.0.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 11:25:09 May 2 2018 with gcc 4.1.2 version: kamailio 5.3.0-dev2 (x86_64/linux) 30857d-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 30857d -dirty compiled on 14:30:54 Jan 22 2019 with gcc 4.1.2 * **Operating System**: Red Hat Enterprise Linux Server release 5.11 (Tikanga) Linux 2.6.18-404.el5 #1 SMP Sat Mar 7 04:14:13 EST 2015 x86_64 x86_64 x86_64 GNU/Linux -- 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/issues/1821

3 16

git:master:83966b2a: sqlops: fix reversed logic in db re-connecting handling (GH #1821)
by Henning Westerholt 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 83966b2aaee656c0b18098f7e477190a8cb32c5c URL: https://github.com/kamailio/kamailio/commit/83966b2aaee656c0b18098f7e477190… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-05T11:03:51+02:00 sqlops: fix reversed logic in db re-connecting handling (GH #1821) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/83966b2aaee656c0b18098f7e477190… Patch: https://github.com/kamailio/kamailio/commit/83966b2aaee656c0b18098f7e477190… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 87c4f2f229..f39da7fed8 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -161,7 +161,7 @@ int sql_connect(int mode) sc->dbh = sc->dbf.init(&sc->db_url); if (sc->dbh==NULL) { - if(mode) { + if(!mode) { LM_ERR("failed to connect to the database [%.*s]\n", sc->name.len, sc->name.s); return -1;

1 0

git:master:21dc5288: sqlops: add debug output about sql connect_mode parameter
by Henning Westerholt 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 21dc5288533eb0860edc53b273f84cde76b82909 URL: https://github.com/kamailio/kamailio/commit/21dc5288533eb0860edc53b273f84cd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-05T10:51:26+02:00 sqlops: add debug output about sql connect_mode parameter --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/21dc5288533eb0860edc53b273f84cd… Patch: https://github.com/kamailio/kamailio/commit/21dc5288533eb0860edc53b273f84cd… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index bb75bebc35..87c4f2f229 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -143,6 +143,7 @@ int sql_connect(int mode) { sql_con_t *sc; sc = _sql_con_root; + LM_DBG("trying to connect to database with mode %d\n", mode); while(sc) { if (db_bind_mod(&sc->db_url, &sc->dbf))

1 0

git:master:179dadd3: app_ruby: execution log message based on core latency_limit_action
by Daniel-Constantin Mierla 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 179dadd31f1cad561163400a8fee8ea5861b6324 URL: https://github.com/kamailio/kamailio/commit/179dadd31f1cad561163400a8fee8ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-05T08:56:42+02:00 app_ruby: execution log message based on core latency_limit_action --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/179dadd31f1cad561163400a8fee8ea… Patch: https://github.com/kamailio/kamailio/commit/179dadd31f1cad561163400a8fee8ea… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 5a325f7538..ece9e6b76d 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -745,23 +745,19 @@ static VALUE ksr_ruby_exec_callback(VALUE ptr) } /** - * + * */ -VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, +VALUE sr_kemi_ruby_exec_func_ex(ksr_ruby_context_t *R, sr_kemi_t *ket, int argc, VALUE* argv, VALUE self) { sr_kemi_val_t vps[SR_KEMI_PARAMS_MAX]; sr_ruby_env_t *env_R; - sr_kemi_t *ket; str *fname; str *mname; int i; int ret = -1; env_R = app_ruby_sr_env_get(); - ket = sr_kemi_ruby_export_get(eidx); - - LM_DBG("executing %p eidx %d\n", ket, eidx); if(env_R==NULL || env_R->msg==NULL || ket==NULL) { LM_ERR("invalid ruby environment attributes or parameters\n"); return Qfalse; @@ -1035,6 +1031,47 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, } } +/** + * + */ +VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, + VALUE* argv, VALUE self) +{ + sr_kemi_t *ket; + int ret; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; + + ket = sr_kemi_ruby_export_get(eidx); + + LM_DBG("executing %p eidx %d\n", ket, eidx); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } + + ret = sr_kemi_ruby_exec_func_ex(R, ket, argc, argv, self); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u us]\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); + } + } + + return ret; +} + /** * */

1 0

git:master:639db054: app_sqlang: execution log message based on core latency_limit_action
by Daniel-Constantin Mierla 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 639db054d0d2e8b0bb50c9109750419654dedbe1 URL: https://github.com/kamailio/kamailio/commit/639db054d0d2e8b0bb50c9109750419… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-05T08:56:42+02:00 app_sqlang: execution log message based on core latency_limit_action --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/639db054d0d2e8b0bb50c9109750419… Patch: https://github.com/kamailio/kamailio/commit/639db054d0d2e8b0bb50c9109750419… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 79465940fd..0e878fa99a 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1457,9 +1457,36 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; + int ret; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_kemi_sqlang_export_get(eidx); - return sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } + + ret = sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u us]\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); + } + } + + return ret; } /**

1 0

git:master:626a8bf3: app_jsdt: use system time to compute execution duration
by Daniel-Constantin Mierla 05 Apr '19

05 Apr '19

Module: kamailio Branch: master Commit: 626a8bf3e6cbc6dbdf11de0e6f8737f08c79a0bb URL: https://github.com/kamailio/kamailio/commit/626a8bf3e6cbc6dbdf11de0e6f8737f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-05T08:56:42+02:00 app_jsdt: use system time to compute execution duration --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/626a8bf3e6cbc6dbdf11de0e6f8737f… Patch: https://github.com/kamailio/kamailio/commit/626a8bf3e6cbc6dbdf11de0e6f8737f… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 8ecd62c46b..abd54215da 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1347,29 +1347,34 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; int sline = 0; ket = sr_kemi_jsdt_export_get(eidx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_kemi_jsdt_exec_func_ex(J, ket); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { duk_inspect_callstack_entry(J, -1); duk_get_prop_string(J, -1, "lineNumber"); sline = (int)duk_to_int(J, -1); duk_pop_2(J); LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (line: %d)\n", + " took too long [%u us] (line: %d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, sline); + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, sline); } }

1 0

git:master:3131832b: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 04 Apr '19

04 Apr '19

Module: kamailio Branch: master Commit: 3131832b65850593b78dfd5b8335a0e26009fb58 URL: https://github.com/kamailio/kamailio/commit/3131832b65850593b78dfd5b8335a0e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-04T17:01:47+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/3131832b65850593b78dfd5b8335a0e… Patch: https://github.com/kamailio/kamailio/commit/3131832b65850593b78dfd5b8335a0e… --- diff --git a/src/modules/lcr/README b/src/modules/lcr/README index 0dd6fae04e..396945e714 100644 --- a/src/modules/lcr/README +++ b/src/modules/lcr/README @@ -10,6 +10,12 @@ Juha Heinanen <jh(a)tutpro.com> +Edited by + +Ovidiu Sas + + <osas(a)voipembedded.com> + Copyright © 2005-2014 Juha Heinanen __________________________________________________________________ @@ -1234,9 +1240,13 @@ if (to_any_gw("192.55.66.2", 1)) { 5.3. lcr.dump_rules Causes lcr module to dump the contents of its in-memory lcr_rule and - lcr_rule_target tables. + lcr_rule_target tables. Rules can be filetered by lcr_id or lcr_id and + prefix. The filters are passed as optional parameters. - Parameters: none + Parameters: + * lcr_id filter rules based on lcr_id. + * prefix filter rules based on prefix (prefixes shorter or equal to + the give prefix) in addition to the previous lcr_id parameter. Example 1.60. lcr.dump_rules RPC example $ kamcmd lcr.dump_rules

1 0

[kamailio/kamailio] lcr: enhance the lcr.dump_rules with filtering params: (#1922)
by Ovidiu Sas 04 Apr '19

04 Apr '19

lcr: enhance the lcr.dump_rules with filtering params: - lcr_id [optional] - prefix [optional] If lcr_id param is provided, then only the rules belonging to the given lcr_id will be dumped. If the lcr_id and prefix param is provided, then only the rules belonging to the given lcr_id and prefixes that equal or longer to the given prefix will be dumped.   #### 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  lcr: enhance the lcr.dump_rules with filtering params: - lcr_id [optional] - prefix [optional] If lcr_id param is provided, then only the rules belonging to the given lcr_id will be dumped. If the lcr_id and prefix param is provided, then only the rules belonging to the given lcr_id and prefixes that equal or longer to the given prefix will be dumped. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1922 -- Commit Summary -- * lcr: enhance the lcr.dump_rules with filtering params: -- File Changes -- M src/modules/lcr/lcr_rpc.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1922.patch https://github.com/kamailio/kamailio/pull/1922.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/1922

2 3

git:master:8f796ab6: lcr: enhance RPC command lcr.dump_rules with filetring params
by Ovidiu Sas 04 Apr '19

04 Apr '19

Module: kamailio Branch: master Commit: 8f796ab6f5b1edb0c4b9a7d4e3251a026dd0bb1a URL: https://github.com/kamailio/kamailio/commit/8f796ab6f5b1edb0c4b9a7d4e3251a0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-04T10:46:33-04:00 lcr: enhance RPC command lcr.dump_rules with filetring params --- Modified: src/modules/lcr/doc/lcr.xml Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8f796ab6f5b1edb0c4b9a7d4e3251a0… Patch: https://github.com/kamailio/kamailio/commit/8f796ab6f5b1edb0c4b9a7d4e3251a0… --- diff --git a/src/modules/lcr/doc/lcr.xml b/src/modules/lcr/doc/lcr.xml index 720528d713..a328860214 100644 --- a/src/modules/lcr/doc/lcr.xml +++ b/src/modules/lcr/doc/lcr.xml @@ -22,6 +22,11 @@ <surname>Heinanen</surname> <email>jh(a)tutpro.com</email> </editor> + <editor> + <firstname>Ovidiu</firstname> + <surname>Sas</surname> + <email>osas(a)voipembedded.com</email> + </editor> </authorgroup> <copyright> <year>2005-2014</year> diff --git a/src/modules/lcr/doc/lcr_admin.xml b/src/modules/lcr/doc/lcr_admin.xml index e0e8755322..47bed3ee9f 100644 --- a/src/modules/lcr/doc/lcr_admin.xml +++ b/src/modules/lcr/doc/lcr_admin.xml @@ -1641,8 +1641,20 @@ if (to_any_gw("192.55.66.2", 1)) { <para> Causes lcr module to dump the contents of its in-memory lcr_rule and lcr_rule_target tables. + Rules can be filetered by lcr_id or lcr_id and prefix. + The filters are passed as optional parameters. </para> - <para>Parameters: <emphasis>none</emphasis></para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>lcr_id</emphasis> filter rules based on lcr_id. + </para></listitem> + <listitem><para> + <emphasis>prefix</emphasis> filter rules based on prefix + (prefixes shorter or equal to the give prefix) in addition + to the previous lcr_id parameter. + </para></listitem> + </itemizedlist> <example> <title><function>lcr.dump_rules</function> RPC example</title> <programlisting format="linespecific"> diff --git a/src/modules/lcr/lcr_rpc.c b/src/modules/lcr/lcr_rpc.c index baf657ad0c..ec10653a32 100644 --- a/src/modules/lcr/lcr_rpc.c +++ b/src/modules/lcr/lcr_rpc.c @@ -126,18 +126,36 @@ static const char *dump_rules_doc[2] = { static void dump_rules(rpc_t *rpc, void *c) { int i, j; + int _filter_by_prefix = 0; + int _lcr_id = 0; + str _prefix = {NULL,0}; struct rule_info **rules, *rule; struct target *t; void *st; str prefix, from_uri, request_uri; + if (rpc->scan(c, "d", &_lcr_id)>0) { + if (rpc->scan(c, ".S", &_prefix)>0) { + _filter_by_prefix = 1; + } + } + for(j = 1; j <= lcr_count_param; j++) { + if (_lcr_id && _lcr_id!=j) continue; + rules = rule_pt[j]; for(i = 0; i < lcr_rule_hash_size_param; i++) { rule = rules[i]; while(rule) { + if (_filter_by_prefix && _prefix.len && _prefix.s) { + if (_prefix.len < rule->prefix_len || + strncmp(_prefix.s, rule->prefix, rule->prefix_len)!=0) { + rule = rule->next; + continue; + } + } if(rpc->add(c, "{", &st) < 0) return; prefix.s = rule->prefix; @@ -160,6 +178,8 @@ static void dump_rules(rpc_t *rpc, void *c) rule = rule->next; } } + if (_filter_by_prefix) + continue; rule = rules[lcr_rule_hash_size_param]; while(rule) { rpc->add(c, "d", rule->prefix_len); @@ -243,4 +263,4 @@ rpc_export_t lcr_rpc[] = { {"lcr.load_gws", load_gws, load_gws_doc, 0}, {0, 0, 0, 0} }; -/* clang-format on */ \ No newline at end of file +/* clang-format on */

1 0

[kamailio/kamailio] cannot build rpm on OpenSUSE (#1915)
by sergey-safarov 04 Apr '19

04 Apr '19

### Description Cannot build postgres module on openSUSE Tumbleweed ### Troubleshooting #### Reproduction Package kamailio on openSUSE Tumbleweed. #### Debugging Data N/A #### Log Messages ``` [ 434s] xsubpp -typemap `perl -MConfig -e 'print $Config{installprivlib}'`/ExtUtils/typemap -typemap typemap kamailioxs.xs > kamailioxs.c [ 434s] CC (gcc) [M app_perl.so] kamailioxs.o [ 435s] LD (gcc) [M app_perl.so] app_perl.so [ 436s] CC (gcc) [M db_perlvdb.so] perlvdbfunc.o [ 437s] CC (gcc) [M db_perlvdb.so] perlvdb_oohelpers.o [ 437s] CC (gcc) [M db_perlvdb.so] perlvdb_conv.o [ 438s] CC (gcc) [M db_perlvdb.so] db_perlvdb.o [ 439s] make[3]: 'libsrdb1.so.1.0' is up to date. [ 439s] LD (gcc) [M db_perlvdb.so] db_perlvdb.so [ 439s] which: no pg_config in (/usr/local/bin:/usr/bin:/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin) [ 439s] which: no pg_config in (/usr/local/bin:/usr/bin:/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin) [ 439s] CC (gcc) [M db_postgres.so] pg_uri.o [ 439s] CC (gcc) [M db_postgres.so] pg_sql.o [ 439s] CC (gcc) [M db_postgres.so] pg_res.o [ 439s] In file included from pg_res.c:33: [ 439s] pg_res.h:40:10: fatal error: libpq-fe.h: No such file or directory [ 439s] #include <libpq-fe.h> [ 439s] ^~~~~~~~~~~~ [ 439s] compilation terminated. [ 439s] make[2]: *** [../../Makefile.rules:100: pg_res.o] Error 1 [ 439s] make[1]: *** [Makefile:511: modules] Error 1 [ 439s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/kamailio-5.3.0-dev4/src' [ 439s] make: *** [Makefile:30: every-module] Error 2 [ 439s] error: Bad exit status from /var/tmp/rpm-tmp.dwfwP1 (%build) [ 439s] [ 439s] [ 439s] RPM build errors: [ 439s] bogus date in %changelog: Tue Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 [ 439s] Bad exit status from /var/tmp/rpm-tmp.dwfwP1 (%build) [ 439s] [ 439s] build80 failed "build kamailio.spec" at Sat Mar 30 09:44:29 UTC 2019. [ 439s] ``` #### SIP Traffic N/A ### Possible Solutions Add ability to use pkgconfig file from Makefile ``` d90393c7d32a:/ # cat /usr/lib64/pkgconfig/libpq.pc Name: libpq Description: PostgreSQL libpq library Url: http://www.postgresql.org/ Version: 11.2 Requires: Requires.private: Cflags: -I/usr/include/pgsql Libs: -lpq Libs.private: -lssl -lcrypto -lgssapi_krb5 -lcrypt -lldap_r ``` ### Additional Information Current master * **Operating System**: ``` d90393c7d32a:/ # cat /etc/os-release NAME="openSUSE Tumbleweed" # VERSION="20190327" ID="opensuse-tumbleweed" ID_LIKE="opensuse suse" VERSION_ID="20190327" PRETTY_NAME="openSUSE Tumbleweed" ANSI_COLOR="0;32" CPE_NAME="cpe:/o:opensuse:tumbleweed:20190327" BUG_REPORT_URL="https://bugs.opensuse.org" HOME_URL="https://www.opensuse.org/" ``` -- 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/issues/1915

2 10

Kamailio v5.0.8 Released
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Hello, Kamailio SIP Server v5.0.8 stable release is out. This is a maintenance release of the old stable branch 5.0, that includes fixes since the release of v5.0.7. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.0.x. Deployments running previous v5.0.x versions are strongly recommended to be upgraded to v5.0.8 or even better directly to v5.1.x or v5.2.x because v5.0.x is getting out of the official maintenance time frame. Important note: this is the last planned release from branch5.0. For more details about version 5.0.8 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/04/kamailio-v5-0-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 5.2, at this moment with its latest release v5.2.2. See more details about it at: * https://www.kamailio.org/w/kamailio-v5-2-0-release-notes/ Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com

1 0

[kamailio/kamailio] dialog: segfault with db_mode = 1 and broken SIP message (#1899)
by Bastian Triller 04 Apr '19

04 Apr '19

### Description `dialog` module is configured with `db_mode` 1 (realtime). When receiving following broken SIP `200` response (missing 6 bytes between header and body), Kamailio crashes: ``` SIP/2.0 200 OK Via: SIP/2.0/UDP 1.2.3.4;branch=z9hG4bKa185.ad1e5804a90a4f79fa2b09b3b2118053.0 Via: SIP/2.0/UDP 2.3.4.5:7016;received=2.3.4.5;branch=z9hG4bK370933d4;rport=7016 Record-Route: <sip:1.2.3.4;lr=on;did=c41.dee> From: "1234" <sip:1234@example.com>;tag=as4cbf81fd To: <sip:2345@example.com>;tag=3450065082 Call-ID: 727ca44f1e962eb321143475380dfbd9(a)example.com CSeq: 102 INVITE Contact: <sip:2345@3.4.5.6:12500> Content-Type: application/sdp Allow: INVITE, INFO, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE Content-Length: 2170 o=- 20568 20568 IN IP4 3.4.5.6 s=SDP data c=IN IP4 3.4.5.6 t=0 0 m=audio 13002 RTP/AVP 8 101 a=rtpmap:8 PCMA/8000 a=ptime:20 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 a=sendrecv ``` Crash happens in [dlg_db_handler.c](https://github.com/kamailio/kamailio/blob/master/src/modu… ``` LM_DBG("sock_info is %.*s\n", cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); ``` #### Debugging Data ``` Thread 1 (Thread 0x7fc64b620700 (LWP 2333)): +bt #0 0x00007fc641675b63 in update_dialog_dbinfo_unsafe (cell=0x7fc619a71ff8) at dlg_db_handler.c:784 #1 0x00007fc641676852 in update_dialog_dbinfo (cell=0x7fc619a71ff8) at dlg_db_handler.c:881 #2 0x00007fc64167c861 in dlg_onreply (t=0x7fc61d7888f0, type=1048576, param=0x7ffe1ce712f0) at dlg_handlers.c:509 #3 0x00007fc6443f4f17 in run_trans_callbacks_internal (cb_lst=0x7fc61d788960, type=1048576, trans=0x7fc61d7888f0, params=0x7ffe1ce712f0) at t_hooks.c:260 #4 0x00007fc6443f5144 in run_trans_callbacks_with_buf (type=1048576, rbuf=0x7fc61d7889b0, req=0x7fc61ec43928, repl=0x7fc646dcbd80, flags=0) at t_hooks.c:305 #5 0x00007fc6443aaabc in relay_reply (t=0x7fc61d7888f0, p_msg=0x7fc646dcbd80, branch=0, msg_status=200, cancel_data=0x7ffe1ce71580, do_put_on_wait=1) at t_reply.c:1950 #6 0x00007fc6443ae844 in reply_received (p_msg=0x7fc646dcbd80) at t_reply.c:2521 #7 0x000055fd54405df6 in do_forward_reply (msg=0x7fc646dcbd80, mode=0) at core/forward.c:749 #8 0x000055fd5440784b in forward_reply (msg=0x7fc646dcbd80) at core/forward.c:851 #9 0x000055fd544522d2 in receive_msg (buf=0x55fd5492d080 <buf> "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP ...", len=960, rcv_info=0x7ffe1ce71ad0) at core/receive.c:341 #10 0x000055fd5436e207 in udp_rcv_loop () at core/udp_server.c:515 #11 0x000055fd542dc608 in main_loop () at main.c:1623 #12 0x000055fd542e46a9 in main (argc=13, argv=0x7ffe1ce71f78) at main.c:2642 ``` ### Possible Solutions Check `bind_addr` before accessing. ### Additional Information Version was 5.0.x, but at least code in `dlg_handler.c` wasn't modified in `master` since then. -- 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/issues/1899

2 4

git:5.0:9e14e589: ChangeLog: content prepared for v5.0.8
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.0 Commit: 9e14e589624d839873a82d0b626a74d6fd9461f8 URL: https://github.com/kamailio/kamailio/commit/9e14e589624d839873a82d0b626a74d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T13:02:05+02:00 ChangeLog: content prepared for v5.0.8 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9e14e589624d839873a82d0b626a74d… Patch: https://github.com/kamailio/kamailio/commit/9e14e589624d839873a82d0b626a74d… --- diff --git a/ChangeLog b/ChangeLog index 5275d4281f..eb07869807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,32 @@ ===================== Changes Since Version 5.0.7 =========================== +commit 17dab52919e161e0820a835771ee63ffd20cf57c (HEAD -> 5.0) +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Fri Mar 22 04:34:26 2019 +0100 + + dialog: parse headers for request and transfer reply for errors + + (cherry picked from commit 4e1ebc6b446e6264f91c96deaed0548de353d731) + (cherry picked from commit b4df4fc4b0401b522b7fce516e286aec85d4ad96) + (cherry picked from commit 5e7201ef86ab6152034989728272204ef02a4685) + +commit a32b6da224872bb831ff3014ad553336c7d295cb +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Fri Mar 22 04:17:23 2019 +0100 + + dialog: parse tm callback reply in early phase to detect broken format + + (cherry picked from commit 6b9837c30f9d2a2ca937d7e6d8c1c496fe4d7d30) + (cherry picked from commit c2995f731ab3a94f302af63bdad9c3bf61d4e995) + (cherry picked from commit a9fb58a83ec8738a371d6be995d457b88e16a2f4) + +commit 56696a65fb69940ffe9f8aeff6a90b37826393e7 (origin/5.0) +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Apr 4 12:10:06 2019 +0200 + + ChangeLog: content updated for v5.0.8 + commit 36a7fc87e3523de23d3af3523fb08c41596543c2 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 4 12:07:25 2019 +0200

1 0

git:5.0:a32b6da2: dialog: parse tm callback reply in early phase to detect broken format
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.0 Commit: a32b6da224872bb831ff3014ad553336c7d295cb URL: https://github.com/kamailio/kamailio/commit/a32b6da224872bb831ff3014ad55333… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:59:49+02:00 dialog: parse tm callback reply in early phase to detect broken format (cherry picked from commit 6b9837c30f9d2a2ca937d7e6d8c1c496fe4d7d30) (cherry picked from commit c2995f731ab3a94f302af63bdad9c3bf61d4e995) (cherry picked from commit a9fb58a83ec8738a371d6be995d457b88e16a2f4) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/a32b6da224872bb831ff3014ad55333… Patch: https://github.com/kamailio/kamailio/commit/a32b6da224872bb831ff3014ad55333… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 8621836ad2..303513b065 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -435,6 +435,13 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) if(dlg==0) return; + if (rpl != FAKED_REPLY) { + if(parse_headers(rpl, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the reply headers\n"); + goto done_early; + } + } + unref = 0; if (type & (TMCB_RESPONSE_IN|TMCB_ON_FAILURE)) { /* Set the dialog context so it is available in onreply_route and failure_route*/

1 0

git:5.0:17dab529: dialog: parse headers for request and transfer reply for errors
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.0 Commit: 17dab52919e161e0820a835771ee63ffd20cf57c URL: https://github.com/kamailio/kamailio/commit/17dab52919e161e0820a835771ee63f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:59:59+02:00 dialog: parse headers for request and transfer reply for errors (cherry picked from commit 4e1ebc6b446e6264f91c96deaed0548de353d731) (cherry picked from commit b4df4fc4b0401b522b7fce516e286aec85d4ad96) (cherry picked from commit 5e7201ef86ab6152034989728272204ef02a4685) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_transfer.c --- Diff: https://github.com/kamailio/kamailio/commit/17dab52919e161e0820a835771ee63f… Patch: https://github.com/kamailio/kamailio/commit/17dab52919e161e0820a835771ee63f… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 303513b065..80f9a9890d 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -849,6 +849,11 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) if(req->first_line.u.request.method_value != METHOD_INVITE) return -1; + if(parse_headers(req, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the request headers\n"); + return -1; + } + if(pre_match_parse( req, &callid, &ftag, &ttag, 0)<0) { LM_WARN("pre-matching failed\n"); return -1; diff --git a/src/modules/dialog/dlg_transfer.c b/src/modules/dialog/dlg_transfer.c index f3e594bcbe..a920eb52c1 100644 --- a/src/modules/dialog/dlg_transfer.c +++ b/src/modules/dialog/dlg_transfer.c @@ -252,6 +252,10 @@ void dlg_bridge_tm_callback(struct cell *t, int type, struct tmcb_params *ps) /* 2xx - build dialog/send refer */ msg = ps->rpl; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the reply headers\n"); + goto error; + } if((msg->cseq==NULL || parse_headers(msg,HDR_CSEQ_F,0)<0) || msg->cseq==NULL || msg->cseq->parsed==NULL) {

1 0

git:5.1:5e7201ef: dialog: parse headers for request and transfer reply for errors
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.1 Commit: 5e7201ef86ab6152034989728272204ef02a4685 URL: https://github.com/kamailio/kamailio/commit/5e7201ef86ab6152034989728272204… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:58:30+02:00 dialog: parse headers for request and transfer reply for errors (cherry picked from commit 4e1ebc6b446e6264f91c96deaed0548de353d731) (cherry picked from commit b4df4fc4b0401b522b7fce516e286aec85d4ad96) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_transfer.c --- Diff: https://github.com/kamailio/kamailio/commit/5e7201ef86ab6152034989728272204… Patch: https://github.com/kamailio/kamailio/commit/5e7201ef86ab6152034989728272204… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index a2f50b7e3e..296a2d5c61 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -852,6 +852,11 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) if(req->first_line.u.request.method_value != METHOD_INVITE) return -1; + if(parse_headers(req, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the request headers\n"); + return -1; + } + if(pre_match_parse( req, &callid, &ftag, &ttag, 0)<0) { LM_WARN("pre-matching failed\n"); return -1; diff --git a/src/modules/dialog/dlg_transfer.c b/src/modules/dialog/dlg_transfer.c index f3e594bcbe..a920eb52c1 100644 --- a/src/modules/dialog/dlg_transfer.c +++ b/src/modules/dialog/dlg_transfer.c @@ -252,6 +252,10 @@ void dlg_bridge_tm_callback(struct cell *t, int type, struct tmcb_params *ps) /* 2xx - build dialog/send refer */ msg = ps->rpl; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the reply headers\n"); + goto error; + } if((msg->cseq==NULL || parse_headers(msg,HDR_CSEQ_F,0)<0) || msg->cseq==NULL || msg->cseq->parsed==NULL) {

1 0

git:5.1:a9fb58a8: dialog: parse tm callback reply in early phase to detect broken format
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.1 Commit: a9fb58a83ec8738a371d6be995d457b88e16a2f4 URL: https://github.com/kamailio/kamailio/commit/a9fb58a83ec8738a371d6be995d457b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:58:21+02:00 dialog: parse tm callback reply in early phase to detect broken format (cherry picked from commit 6b9837c30f9d2a2ca937d7e6d8c1c496fe4d7d30) (cherry picked from commit c2995f731ab3a94f302af63bdad9c3bf61d4e995) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/a9fb58a83ec8738a371d6be995d457b… Patch: https://github.com/kamailio/kamailio/commit/a9fb58a83ec8738a371d6be995d457b… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index c80ca7d59f..a2f50b7e3e 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -438,6 +438,13 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) if(dlg==0) return; + if (rpl != FAKED_REPLY) { + if(parse_headers(rpl, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the reply headers\n"); + goto done_early; + } + } + unref = 0; if (type & (TMCB_RESPONSE_IN|TMCB_ON_FAILURE)) { /* Set the dialog context so it is available in onreply_route and failure_route*/

1 0

git:5.2:b4df4fc4: dialog: parse headers for request and transfer reply for errors
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.2 Commit: b4df4fc4b0401b522b7fce516e286aec85d4ad96 URL: https://github.com/kamailio/kamailio/commit/b4df4fc4b0401b522b7fce516e286ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:57:10+02:00 dialog: parse headers for request and transfer reply for errors (cherry picked from commit 4e1ebc6b446e6264f91c96deaed0548de353d731) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_transfer.c --- Diff: https://github.com/kamailio/kamailio/commit/b4df4fc4b0401b522b7fce516e286ae… Patch: https://github.com/kamailio/kamailio/commit/b4df4fc4b0401b522b7fce516e286ae… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 80389a3446..7e8d72b6c7 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -852,6 +852,11 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) if(req->first_line.u.request.method_value != METHOD_INVITE) return -1; + if(parse_headers(req, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the request headers\n"); + return -1; + } + if(pre_match_parse( req, &callid, &ftag, &ttag, 0)<0) { LM_WARN("pre-matching failed\n"); return -1; diff --git a/src/modules/dialog/dlg_transfer.c b/src/modules/dialog/dlg_transfer.c index f3e594bcbe..a920eb52c1 100644 --- a/src/modules/dialog/dlg_transfer.c +++ b/src/modules/dialog/dlg_transfer.c @@ -252,6 +252,10 @@ void dlg_bridge_tm_callback(struct cell *t, int type, struct tmcb_params *ps) /* 2xx - build dialog/send refer */ msg = ps->rpl; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the reply headers\n"); + goto error; + } if((msg->cseq==NULL || parse_headers(msg,HDR_CSEQ_F,0)<0) || msg->cseq==NULL || msg->cseq->parsed==NULL) {

1 0

git:5.2:c2995f73: dialog: parse tm callback reply in early phase to detect broken format
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.2 Commit: c2995f731ab3a94f302af63bdad9c3bf61d4e995 URL: https://github.com/kamailio/kamailio/commit/c2995f731ab3a94f302af63bdad9c3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:57:01+02:00 dialog: parse tm callback reply in early phase to detect broken format (cherry picked from commit 6b9837c30f9d2a2ca937d7e6d8c1c496fe4d7d30) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/c2995f731ab3a94f302af63bdad9c3b… Patch: https://github.com/kamailio/kamailio/commit/c2995f731ab3a94f302af63bdad9c3b… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index a52b62805b..80389a3446 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -438,6 +438,13 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) if(dlg==0) return; + if (rpl != FAKED_REPLY) { + if(parse_headers(rpl, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the reply headers\n"); + goto done_early; + } + } + unref = 0; if (type & (TMCB_RESPONSE_IN|TMCB_ON_FAILURE)) { /* Set the dialog context so it is available in onreply_route and failure_route*/

1 0

git:5.0:36a7fc87: Makefile.defs: version set to 5.0.8
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.0 Commit: 36a7fc87e3523de23d3af3523fb08c41596543c2 URL: https://github.com/kamailio/kamailio/commit/36a7fc87e3523de23d3af3523fb08c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:07:25+02:00 Makefile.defs: version set to 5.0.8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/36a7fc87e3523de23d3af3523fb08c4… Patch: https://github.com/kamailio/kamailio/commit/36a7fc87e3523de23d3af3523fb08c4… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ad242738a8..0a7bcb6a3d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = # memory manager switcher

1 0

git:5.0:56696a65: ChangeLog: content updated for v5.0.8
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.0 Commit: 56696a65fb69940ffe9f8aeff6a90b37826393e7 URL: https://github.com/kamailio/kamailio/commit/56696a65fb69940ffe9f8aeff6a90b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T12:10:06+02:00 ChangeLog: content updated for v5.0.8 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/56696a65fb69940ffe9f8aeff6a90b3… Patch: https://github.com/kamailio/kamailio/commit/56696a65fb69940ffe9f8aeff6a90b3…

1 0

Kamailio-error reading: Connection reset by peer
by Mangesh Kharade 04 Apr '19

04 Apr '19

Hi Team, We are facing issue with kamailio application , we are not able to communicate to kamailio application getting below error. Can you please suggestion us how to resolved this issue issue, it production servers and we did not get any clue to resolve it. Error1:- Apr 2 06:53:54 urcmcs /usr/local/sbin/kamailio[2240]: ERROR: <core> [tcp_read.c:299]: tcp_read_data(): error reading: Connection reset by peer (104) Apr 2 06:53:54 urcmcs /usr/local/sbin/kamailio[2240]: ERROR: <core> [tcp_read.c:1326]: tcp_read_req(): ERROR: tcp_read_req: error reading Apr 2 06:54:12 urcmcs /usr/local/sbin/kamailio[2244]: ERROR: <core> [tcp_read.c:299]: tcp_read_data(): error reading: Connection reset by peer (104) Apr 2 06:54:12 urcmcs /usr/local/sbin/kamailio[2244]: ERROR: <core> [tcp_read.c:1326]: tcp_read_req(): ERROR: tcp_read_req: error reading Apr 2 06:54:17 urcmcs /usr/local/sbin/kamailio[2244]: ERROR: <core> [tcp_read.c:299]: tcp_read_data(): error reading: Connection reset by peer (104) Apr 2 06:54:17 urcmcs /usr/local/sbin/kamailio[2244]: ERROR: <core> [tcp_read.c:1326]: tcp_read_req(): ERROR: tcp_read_req: error reading Error1:- Apr 2 06:54:26 urcmcs /usr/local/sbin/kamailio[2179]: INFO: <script>: WebSocket connection from ###################:3008 has closed Apr 2 06:54:26 urcmcs /usr/local/sbin/kamailio[2179]: INFO: <script>: WebSocket connection from ###################:3009 has closed Apr 2 06:54:26 urcmcs /usr/local/sbin/kamailio[2179]: INFO: <script>: WebSocket connection from ###################:3010 has closed Apr 2 06:54:26 urcmcs /usr/local/sbin/kamailio[2179]: INFO: <script>: WebSocket connection from ###################:3011 has closed Apr 2 06:54:26 urcmcs /usr/local/sbin/kamailio[2179]: INFO: <script>: WebSocket connection from ###################:3012 has closed Please let us know if you need more help from our end. Thanks and Regards, Mangesh Kharade Consultant - Microsoft Azure | Managed Services [cid:image003.png@01D15FFB.27B1AA80] Pune IT Park, 34 Aundh Road Bhau Patil Marg, Pune 411020 Tel: +91.20.30204000 | Extn. 9694 VOIP: +1.713.353.7464 Mobile: +91.9168181166 Mangesh.kharade(a)silicus.com<mailto:Mangesh.kharade@silicus.com>| www.silicus.com<http://www.silicus.com/> The information in this email is confidential and may be legally privileged. It is intended solely for the addressee and access to it by anyone else is unauthorized. If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken based on it, is strictly prohibited and may be unlawful.

2 2

git:5.0:e3b3a752: pkg/kamailio/deb: version set to 5.0.8
by Victor Seva 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.0 Commit: e3b3a75212a1df986288b5885750c56c3f742e43 URL: https://github.com/kamailio/kamailio/commit/e3b3a75212a1df986288b5885750c56… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-04T11:06:33+02:00 pkg/kamailio/deb: version set to 5.0.8 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/e3b3a75212a1df986288b5885750c56… Patch: https://github.com/kamailio/kamailio/commit/e3b3a75212a1df986288b5885750c56… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva <vseva(a)debian.org> Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7

1 0

git:5.0:4b59670f: pkg/rpm: set version to 5.0.8 in spec files
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Module: kamailio Branch: 5.0 Commit: 4b59670f497ce9a028f053922717e39f2333082d URL: https://github.com/kamailio/kamailio/commit/4b59670f497ce9a028f053922717e39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-04T10:48:59+02:00 pkg/rpm: set version to 5.0.8 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/4b59670f497ce9a028f053922717e39… Patch: https://github.com/kamailio/kamailio/commit/4b59670f497ce9a028f053922717e39… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 02613b2513..9a74ccb349 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel dev0.0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 60b2e74c64..2b6ce85583 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel dev0.0%{dist} %bcond_with dnssec %bcond_with kazoo diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 81714e906f..d187a8c30e 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel dev7.2%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 44cf481f66..9372dfd384 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel dev0.0%{dist} %if 0%{?fedora} == 24 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 2a7f86c504..2c2b777a3f 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index cc98d428f6..8953319788 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 41a589f462..c8849a4c85 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index a1bf9e3b41..d49a8fe330 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 81146e02ab..7c2031375b 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.7 +%define ver 5.0.8 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

Releasing Kamailio v5.0.8
by Daniel-Constantin Mierla 04 Apr '19

04 Apr '19

Hello, I am considering to release v5.0.8 to mark the end of official maintenance for branch 5.0 on Thursday, April 4. If no major regression will be introduced, this will be the last release from branch 5.0. Afterwards, the stable branches maintained will be 5.1 and 5.2. In case you have in mind some specific commits that should get into 5.0 branch, then reply and list them to be sure they are not missed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com

4 6

git:5.0:06c6a73f: topoh: detect when via param is shorter than expected prefix
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.0 Commit: 06c6a73f05740bc017048c73a9479715f3d1ac0b URL: https://github.com/kamailio/kamailio/commit/06c6a73f05740bc017048c73a947971… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-03T23:26:50+02:00 topoh: detect when via param is shorter than expected prefix (cherry picked from commit e6950ffb1985493e717e3d774eddad779aed1514) --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/06c6a73f05740bc017048c73a947971… Patch: https://github.com/kamailio/kamailio/commit/06c6a73f05740bc017048c73a947971… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 3de34f13f1..f8a8180727 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -410,12 +410,17 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) LM_ERR("cannot find param in via %d\n", i); return -1; } - if(i==2) + if(vp->value.len <= th_vparam_prefix.len) { + LM_ERR("invalid param len in via %d\n", i); + return -1; + } + if(i==2) { out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, CRLF_LEN+1, &out.len); - else + } else { out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, 0, &out.len); + } if(out.s==NULL || out.len<=0) { LM_ERR("cannot decode via %d\n", i);

1 0

git:5.0:d3d5fcbe: topoh: improve checks for contact header processing
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.0 Commit: d3d5fcbe57c8e61bc0926250a7273b1aa9b9bf8c URL: https://github.com/kamailio/kamailio/commit/d3d5fcbe57c8e61bc0926250a7273b1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-03T23:25:03+02:00 topoh: improve checks for contact header processing (cherry picked from commit 101670ac2c120cf0008a860b6a766aaa529e578d) --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/d3d5fcbe57c8e61bc0926250a7273b1… Patch: https://github.com/kamailio/kamailio/commit/d3d5fcbe57c8e61bc0926250a7273b1… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index f0c3420309..3de34f13f1 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -267,6 +267,11 @@ int th_mask_contact(sip_msg_t *msg) } c = ((contact_body_t*)msg->contact->parsed)->contacts; + if(c == NULL) + { + LM_ERR("invalid contact header\n"); + return -1; + } in = c->uri; out.s = th_mask_encode(in.s, in.len, &th_uri_prefix, &out.len);

1 0

git:5.0:7931da0c: topoh: improve checks for via header processing
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.0 Commit: 7931da0ca46626d7bb06c631e0be012f9ee8d3ea URL: https://github.com/kamailio/kamailio/commit/7931da0ca46626d7bb06c631e0be012… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-03T23:24:45+02:00 topoh: improve checks for via header processing (cherry picked from commit 78ccdb7ff1ebc34748092fe01ff249f5eeb661c8) --- Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/7931da0ca46626d7bb06c631e0be012… Patch: https://github.com/kamailio/kamailio/commit/7931da0ca46626d7bb06c631e0be012… --- diff --git a/src/modules/topoh/th_mask.c b/src/modules/topoh/th_mask.c index 2c0d1aa24f..fce9255f20 100644 --- a/src/modules/topoh/th_mask.c +++ b/src/modules/topoh/th_mask.c @@ -141,6 +141,12 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) *olen = (((ilen-((prefix!=NULL&&prefix->len>0)?prefix->len:0)) * 6) >> 3) - n; + + if (*olen<=0) { + LM_ERR("invalid olen parameter calculated, can't continue %d\n", *olen); + return NULL; + } + out = (char*)pkg_malloc((*olen+1+extra)*sizeof(char)); if(out==NULL) diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index c2c1ee6e32..f0c3420309 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -411,7 +411,7 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) else out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, 0, &out.len); - if(out.s==NULL) + if(out.s==NULL || out.len<=0) { LM_ERR("cannot decode via %d\n", i); return -1; @@ -945,7 +945,12 @@ int th_add_via_cookie(sip_msg_t *msg, struct via_body *via) if (via->params.s) { viap = via->params.s - via->hdr.s - 1; } else { - viap = via->host.s - via->hdr.s + via->host.len; + if (via->host.s) { + viap = via->host.s - via->hdr.s + via->host.len; + } else { + LM_ERR("no via parameter and no via host, can't insert cookie\n"); + return -1; + } if (via->port!=0) viap += via->port_str.len + 1; /* +1 for ':'*/ }

1 0

git:master:9d9af521: pv: added $TV(Fn) - formatted time with microseconds YYYY-MM-DD HH:MM:SS.UUUUUU
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: master Commit: 9d9af5216d28c5088f79aa1937dff65c2e5de93b URL: https://github.com/kamailio/kamailio/commit/9d9af5216d28c5088f79aa1937dff65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T14:36:37+02:00 pv: added $TV(Fn) - formatted time with microseconds YYYY-MM-DD HH:MM:SS.UUUUUU - current time in human readable format with microseconds precission --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/9d9af5216d28c5088f79aa1937dff65… Patch: https://github.com/kamailio/kamailio/commit/9d9af5216d28c5088f79aa1937dff65… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index 4414b09ac9..f3baccf6df 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -289,13 +289,15 @@ int pv_get_timeb(struct sip_msg *msg, pv_param_t *param, } static struct timeval _timeval_ts = {0}; -static char _timeval_ts_buf[32]; +static char _timeval_ts_buf[64]; int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { struct timeval tv; str s; + struct tm lt; + char lbuf[64]; if(msg==NULL || param==NULL) return -1; @@ -320,12 +322,29 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, LM_ERR("unable to get time val attributes\n"); return pv_get_null(msg, param, res); } - s.len = snprintf(_timeval_ts_buf, 32, "%u.%06u", + s.len = snprintf(_timeval_ts_buf, 64, "%u.%06u", (unsigned int)tv.tv_sec, (unsigned int)tv.tv_usec); if(s.len<0) return pv_get_null(msg, param, res); s.s = _timeval_ts_buf; return pv_get_strval(msg, param, res, &s); + case 5: + if(gettimeofday(&tv, NULL)!=0) { + LM_ERR("unable to get time val attributes\n"); + return pv_get_null(msg, param, res); + } + (void)localtime_r(&tv.tv_sec, &lt); + if (strftime(lbuf, sizeof(lbuf), "%Y-%m-%d %H:%M:%S", &lt) == 0) { + LM_ERR("failed to format current time\n"); + return pv_get_null(msg, param, res); + } + s.len = snprintf(_timeval_ts_buf, 64, "%s.%06u", + lbuf, (unsigned int)tv.tv_usec); + if(s.len<0) + return pv_get_null(msg, param, res); + s.s = _timeval_ts_buf; + return pv_get_strval(msg, param, res, &s); + default: msg_set_time(msg); return pv_get_uintval(msg, param, res, (unsigned int)msg->tval.tv_sec); @@ -353,6 +372,8 @@ int pv_parse_timeval_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 3; else if(strncmp(in->s, "Sn", 2)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "Fn", 2)==0) + sp->pvp.pvn.u.isname.name.n = 5; else goto error; break; default:

1 0

git:5.0:83b7d6d6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.0 Commit: 83b7d6d67f418e450e692da645fdf16d74d230d4 URL: https://github.com/kamailio/kamailio/commit/83b7d6d67f418e450e692da645fdf16… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-03T14:16:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/dialog/README Modified: src/modules/dialplan/README Modified: src/modules/siputils/README Modified: src/modules/tsilo/README Modified: src/modules/uac_redirect/README Modified: src/modules/usrloc/README Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/83b7d6d67f418e450e692da645fdf16… Patch: https://github.com/kamailio/kamailio/commit/83b7d6d67f418e450e692da645fdf16…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

- URL: https://github.com/kamailio/kamailio/commit/480eeb1a659ee7e0e672803d93347fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:05:37+02:00 tls: docs - some updates to sample tls.cfg (cherry picked from commit 957b43ddea8dad434736e800a16581d49ccb2478) (cherry picked from commit 57d8b5287d27fe32b302442c2b18a17642dd6898) - URL: https://github.com/kamailio/kamailio/commit/3f49306210915844348d05e03b05dfd… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2019-04-03T12:05:55+02:00 tm: crash on memcpy fix - in some cases tag is not initialized and lead to crash. Memory pointer check before writing to added. (cherry picked from commit db3b9dbd48f7bb74abf08b0e97bcac15015df719) (cherry picked from commit 6815f91eba33216102f7e8ebb0a67e74d0594e2a) - URL: https://github.com/kamailio/kamailio/commit/ecab9a9d1dd7ee644b3cff2694816da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:06:05+02:00 core: Makefiles - catch unavailbility of docbook2man tool - print an info message instead of ending up in execution error of Makefile rule trying to generate man pages from xml files - DOCBOOK var renamed to DOCBOOKMAN to be more suggestive for its purpose - related to GH #1624 (cherry picked from commit 35aef078dfbcb92de9591eea2841b3ba0f9682f6) (cherry picked from commit 2ce4f035be25c8d43a96d24331a5673a0e574eb9) - URL: https://github.com/kamailio/kamailio/commit/11c6bbc9c2b9f4e0eaccc6bbe3c64a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:06:16+02:00 core: xavp - more debug details when printing xavp (cherry picked from commit 3fef2b3c18f83add1af13c2b84303b507e27aeca) (cherry picked from commit 7417602f16f17495bad935e87ef504aadc6595b3) - URL: https://github.com/kamailio/kamailio/commit/ce0fed98594201f4e5d0a6c49f761bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:06:27+02:00 pv: increased transformation buffer slots from 4 to 8 (cherry picked from commit d68c1bcb350bce2f1951b604f97e246734e43b84) (cherry picked from commit 290073feb2ebf94bfa64be8071cf4cc60c8618c1) - URL: https://github.com/kamailio/kamailio/commit/625ea7be57952942a4130dab2c5ef8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:06:40+02:00 tcpops: more debug messages when executing event route (cherry picked from commit d453bdd36a6cd569978a1d19e41d55b28c2b4e13) (cherry picked from commit e6676483116cac28a958d5dc5edeea3fc07be102) - URL: https://github.com/kamailio/kamailio/commit/0b10f994db5fd4f9710b9233cdbc71e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:06:56+02:00 core: tcp - improved safety check for available byte in tcp read buffer (cherry picked from commit 2fc11f183d8fcedeb35559c5236ad7159a6a5864) (cherry picked from commit ce5fd6f415e504f967e00820d6c57ec3b450e53e) - URL: https://github.com/kamailio/kamailio/commit/1d5272c408094e0ce212d265204180a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:07:05+02:00 core: tcp - more safety check to avoid jumping out if receive buf for ws proto (cherry picked from commit db00d11d6a30cb779cecfae73487de6d05b6b915) (cherry picked from commit aec30b799256fc3c1aeac537d111ecf2a60ff5a1) - URL: https://github.com/kamailio/kamailio/commit/3d50b948534273ccb7eb68ca4b08174… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:07:15+02:00 tls: cast to usigned for computing available size for read (cherry picked from commit 1e67fdd53a1c6dc3964d25e891caad24029b7887) (cherry picked from commit aa7d8921eac1379f3d31648f99f71388f761b430) - URL: https://github.com/kamailio/kamailio/commit/74341c54d4b66ebc1f53f1c154d3b9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:07:25+02:00 rtpengine: safety check for tm uas.request field (cherry picked from commit 75040f62238d6181dc9aec977588c63d15dc5cbc) (cherry picked from commit d877cd62175dd31d8eb7a1fbcabb32b9d7b3683f) - URL: https://github.com/kamailio/kamailio/commit/ee25118fcb367d6e3e432df35ec87da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:08:02+02:00 tm: update uas rb activ_type when overwriting realyed_code - otherwise could end up skipping the execution for TMCB_RESPONSE_OUT tm callback, affecting acc, ... (cherry picked from commit 5b223a2e8a92f351b8eab756f5256fda7645ff21) (cherry picked from commit 5195a700241650a1407f4e663db4c6ec85a068af) - URL: https://github.com/kamailio/kamailio/commit/e1ca85d48b4d9f6345b7d1a616ccea1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:08:13+02:00 tm: activ_type field renamed to rbtype in struct retr_buf - better matching the purpose and do not use a typo word - field t_active changed from char to short for better mem align (cherry picked from commit 1aad02edc6b9ffb104900cbc624f0853166ae926) (cherry picked from commit c9b1410c13fb8d70d4785779b4998987f8f5f19d) - URL: https://github.com/kamailio/kamailio/commit/f77b6f4ff0ef94535a9f1e0e7b745b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:08:31+02:00 tm: typedefs renamed to match better module and common pattern - were not used so far (cherry picked from commit 0ea62995ab026737411f3106a4584ba4ba640426) (cherry picked from commit 7438c7511c4ee151d5126ee34748e49a492da868) - URL: https://github.com/kamailio/kamailio/commit/95526438757d3f108be59c779c05f97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:08:42+02:00 tm: set uas rb type along with the buffer when relaying replies - ensure it is same reply code used in outgoing buffer (cherry picked from commit 35dec4c20d78f49ba242229c877894d70c94705c) (cherry picked from commit ebcffdb917b2c2c0a1b6d85cbf9c46e7a6afac4f) - URL: https://github.com/kamailio/kamailio/commit/f54a659a9181d85bb0dd8cbb09fa5c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:08:58+02:00 tls: proper upper limit for tls connection lifetime - GH #1639 (cherry picked from commit deb2904d73a7a540f8eb6e2e8722185b7f0a9a99) (cherry picked from commit 3c4f242fff1171fbe9c19472b8d9430bd7fb1edb) - URL: https://github.com/kamailio/kamailio/commit/5159572be2f4fb3ef7f5db350e54674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:09:13+02:00 jsonrpcs: print flags in error message when rpc reply is not initialized (cherry picked from commit 1501e20b65f63c64a89b84196dc925cef79b7c76) (cherry picked from commit 9ff43b7f8017fb68681a49379ab92736386be1e9) - URL: https://github.com/kamailio/kamailio/commit/ceb4442fd7adf69b57249cf5001518c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:09:24+02:00 jsonrpcs: set global active context to delayed value for async commands - GH #1640 (cherry picked from commit 1db7dc4de6588131b4340390b5996141940b7ef0) (cherry picked from commit 780e44b9045e6051fc7f41a34db24187f80045a6) - URL: https://github.com/kamailio/kamailio/commit/610d86de5258df7a7f498138e1ef32f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:10:35+02:00 core: more info in log message when sendto() fails (cherry picked from commit 317701dc3d1ddb27395ded873a3055af2d029a5a) (cherry picked from commit fdc74217580a526b1848406b308c6563b6700e85) - URL: https://github.com/kamailio/kamailio/commit/0e05a987f719d56c750d518425fd33b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:10:48+02:00 usrloc: use sruid_next_safe() (cherry picked from commit fd30ccf4473d43d98cfb0d896c47d4824c089bce) (cherry picked from commit bff608273684aa472547fb9bfccded24adb361b0) - URL: https://github.com/kamailio/kamailio/commit/d2ae034cc9d271b0219f1561dc6cffe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:10:59+02:00 registrar: use sruid_next_safe() (cherry picked from commit 89676b9774ecc0f72272b7027821a9531dc1a6ea) (cherry picked from commit 592438a1991f5b2f4dca977032d0a2c24d2a128f) - URL: https://github.com/kamailio/kamailio/commit/c73ca0214ca2a17ce1c7a5af3f4a254… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:11:30+02:00 core: use parentesis to surround condtion on raw_ipip header size (cherry picked from commit 55575264332e07611c269873c9ce0b5a63c35454) (cherry picked from commit 8b8fccedeaede8e1d4828e4ccdd380b48bdddb1a) - URL: https://github.com/kamailio/kamailio/commit/94f9146069d34296464ebad098b4a29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:12:01+02:00 tls: update to default session id value to reflect major version (cherry picked from commit 491e19eb47384162cba64fd9f043e77574ce5017) (cherry picked from commit 5f1178f090916054aeccfe57db22e042be1bc76c) - URL: https://github.com/kamailio/kamailio/commit/e02566882bd0acb24372ad97293cff7… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-04-03T12:12:20+02:00 src: Fix misspelled Kamailio (cherry picked from commit 62790cc279550fef9ce3f7a6c0ee8dcc055f9625) (cherry picked from commit 1d86c8c858aa6362c0f7bd10d513573e73cbf8b5) - URL: https://github.com/kamailio/kamailio/commit/72f497893a28e065acd21165a31c34f… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-04-03T12:12:33+02:00 rtpproxy: fix comment typo (cherry picked from commit f7ac556e699d323e816c14a554122c87d38b3a83) (cherry picked from commit 5c5cfcf379cf9ecf74a3d2646bfaa9137c3ea3f8) - URL: https://github.com/kamailio/kamailio/commit/11f86ff170095dd324d403f95a2c262… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-04-03T12:12:45+02:00 uac_redirect: fix documentation typo (cherry picked from commit f788766522cb0f9bb8bca42954337889198462ee) (cherry picked from commit 09ea75e9100405a48ea7f2c9285b36045d9f8de8) - URL: https://github.com/kamailio/kamailio/commit/1607d329fec856e955a1356d65fb7b2… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-04-03T12:12:57+02:00 core: fix comment typo (cherry picked from commit 37fb1b68675c637c4d9bbfbc27572b2c748ad673) (cherry picked from commit 8dda2f02b4bfdac65f73834d92513855788ff60f) - URL: https://github.com/kamailio/kamailio/commit/1c33ad56877365fe130599a1ad2c601… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:14:12+02:00 tm: reset the tm cell content during free (cherry picked from commit fe19995ba150beca0acf6f4bdc1bb92f3c8348e1) (cherry picked from commit 837dc3e07fb71e217706f6233f6d789256dd7dd6) - URL: https://github.com/kamailio/kamailio/commit/6a40d5eca9b68ae885f88d3f6248c8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:14:22+02:00 tm: macro to define the ptr address for tm cell uac field (cherry picked from commit cb984a53016762cb0932ed4dec4c75edb8997c0f) (cherry picked from commit 275ff956e460af769cb4f659a21162317e653695) - URL: https://github.com/kamailio/kamailio/commit/038a44fcf4a995780062409b1472676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:14:49+02:00 Makefile.defs: enabled clang compile warning flags -Wunused-variable -Wuninitialized (cherry picked from commit d63548dc311df5f2550e788fc026d9ec7c7dd2f4) (cherry picked from commit 1252ae2523d16edda0465cfb441eaedd2de62d27) - URL: https://github.com/kamailio/kamailio/commit/eef5eb20579e84837737f0f02869077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:15:05+02:00 siputils: note that is_first_hop() works only for IP addresses in record route - this is done for reply handling (cherry picked from commit 840d8edc3cae5a921aaa14e62f170613bc8da844) (cherry picked from commit 38379247e653bd17711f980aa977080b004ad272) - URL: https://github.com/kamailio/kamailio/commit/25f1004754281fa91c7a97f9fa2089e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:15:24+02:00 Makefile.defs: detect gcc v8.x (cherry picked from commit e3134724116c89caaa795b5d20612fd4a4b30d7e) (cherry picked from commit 800e7394c1b7b71bccbf6b1898a039e6de6384e9) - URL: https://github.com/kamailio/kamailio/commit/348ee9a755ce9c71f8b229848fadafa… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2019-04-03T12:16:07+02:00 kamctl: make jsonrpc filter portable The filter has a regex looking for a literal '{' in the beginning of a line. Some awk implementations interpret this as a meta character, so the regex is deemed broken. Example with busybox awk (POSIX): root@hank2:~# kamctl ps awk: bad regex '^{.+"id"[ ]*:[ ]*[0-9]+[ ]*}$': Invalid contents of {} root@hank2:~# To fix this enclose the character in square brackets. This always matches for a literal '{' and is portable. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 59d287586f502a8df71c2e91899fde49594e072e) (cherry picked from commit b43fbb18acb86b97ff86bd867ab46c25747b2cf0) - URL: https://github.com/kamailio/kamailio/commit/71fd31992a2d97839e17bb84d607d13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:16:31+02:00 dialplan: note and example for prefixing string param with s: for rpc dialplan.translate (cherry picked from commit a169b298018f08a57da8e7a8c116560ee4fff006) (cherry picked from commit 3d203d97f28e8d5eefb5ea63c0f3ff12b3cb9d2f) - URL: https://github.com/kamailio/kamailio/commit/d3fa280c1fc82ff23022d227099d60e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:16:45+02:00 utils/kamcmd: man page - note about the suto-conversion of number parameters (cherry picked from commit c998a7cc2d265d6e3c0e10facc280866495d827e) (cherry picked from commit 3733918a287af1f9aa323b0b4e454c2db409ac9a) - URL: https://github.com/kamailio/kamailio/commit/19dc455e38d05a65bbd0c657fed4a01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:16:58+02:00 kamctl: man page - note about prefixing number params with 's:' to enforce string (cherry picked from commit 48048b0e372eabdde14460cb539b3e1ecbc13ae5) (cherry picked from commit df1f0cc707255e848e8b5defd4c3ec43a7eab3f7) - URL: https://github.com/kamailio/kamailio/commit/de1513046149737dc76267c677744c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:17:09+02:00 core: info log at startup with number of precesses, pkg and shm sizes - useful to see if needed to troubleshoot by analyzing log messages (cherry picked from commit f057e844ba407333ad8d876daa1f6ee49bd41c86) (cherry picked from commit df62658bb3af88b69c4dc4d019b4814967f9f8e3) - URL: https://github.com/kamailio/kamailio/commit/4d8dd58922327fcb5b25f44e22a3e9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:17:40+02:00 core: fake msg - added sip schema to From/To URIs (cherry picked from commit 044cdefcadf5c7949945544dce30becb2d84c56e) (cherry picked from commit 552d90b8a0c649917eedf7a6af47f03980b7b77f) - URL: https://github.com/kamailio/kamailio/commit/e01a1b71b625ace9a118f3bc7b03663… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:17:54+02:00 core: init cfg framework before executing event_route[core:worker-one-init] (cherry picked from commit a4b6a5cb1dda7576b265a23c91321b7f2a034658) (cherry picked from commit e178b8c620c991635d74c01e14b837e0080b1eea) - URL: https://github.com/kamailio/kamailio/commit/d0d4ba7909ddf475bc77263c1676ca6… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2019-04-03T12:19:37+02:00 presence: test if event is dialog to avoid unnecessary xml parsing (cherry picked from commit 6d0f8994611b50faa7ef7d1299acf0c390a2eed1) (cherry picked from commit 4ffe23dc473b170ec21ba9c6c32acfbc8b09016e) - URL: https://github.com/kamailio/kamailio/commit/81a34710bbca9d8457366f3092c5e12… Author: dnadares <dnadares(a)gmail.com> Date: 2019-04-03T12:20:14+02:00 evapi: minor fix in tag length compare It was assigning the length instead of comparing it. (cherry picked from commit 3da3aa0c9ee3fcd5aadd3924ee883666d2a15ac6) (cherry picked from commit d2a6728c6d7fd39d009150ddfa4c5980e8142cab) - URL: https://github.com/kamailio/kamailio/commit/8f434d086a2ecace80ef50769e3692e… Author: mtirpak <miklos.tirpak(a)gmail.com> Date: 2019-04-03T12:20:28+02:00 core: variables declared in the config file could cause memory corruption The config variables that are declared in the config file were recorded in the reverse order as their padding was calculated, which could cause the allocated memory block to be smaller as required at the end. Credits go to vinesinha. (cherry picked from commit 2ecf601c472bb81b9cf4ffd5b1ac17c4dfd742f2) (cherry picked from commit 00720d55c2f838486a68b799e8f92abcebf8dba0) - URL: https://github.com/kamailio/kamailio/commit/67152d75636adff5df282ea89726018… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:21:11+02:00 uac: test if qop field has a list of values for remote auth challenge - GH #1684 (cherry picked from commit 6e6a2f442e06a23aa180f07c2a954068dfc58843) (cherry picked from commit 64afdf27e7ea8e2ef38211af1233d780102ab4c3) - URL: https://github.com/kamailio/kamailio/commit/fb6b0b2f8869355e721564b93c54fa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:21:30+02:00 dialog: handle alias in contact address for local bye only when no route headers - GH #1689 (cherry picked from commit 810d84981b4ed83b11e4090740a36653ec10ef16) (cherry picked from commit 9bad6f16ce9b21b3f298eb03bb6c8ef1911d6fc2) - URL: https://github.com/kamailio/kamailio/commit/22d92aee87636ce02a5bbcedadadd24… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2019-04-03T12:21:48+02:00 pdb: fix SIGABRT in case of too long uris buf in pdb_msg_dbg should correctly accomodate for pdb_bdy size pdb_hdr + pdb_bdy should add to pdb_hdr.length (max 255) (cherry picked from commit 783763e8accef47aa563cd17d1e170250268751c) (cherry picked from commit 5ca5ee2beed67efd5ab8a973367e754d23883db7) - URL: https://github.com/kamailio/kamailio/commit/e08fbc71af311fa340d563fc44bf238… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T12:22:05+02:00 core: add helper function for flag reset - add helper function for flag reset (needed for bugfix in #GH1674) - patch from: Julien Chavanton jchavanton at gmail dot com (cherry picked from commit 253d35c84bc1886c9eae774a731452f5d2f521cd) (cherry picked from commit d2b805d335c283ef5570c6cb5d61bd561e0de996) - URL: https://github.com/kamailio/kamailio/commit/1230164755b23bd833f9bd7b0297644… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T12:22:14+02:00 acc: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com (cherry picked from commit a7525829309427fbb9357e0104b9dba1016f6777) (cherry picked from commit f8ebc379063e316badf09faf368bd9a373a82822) - URL: https://github.com/kamailio/kamailio/commit/2afb35b17607712aab29606c97e9fe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:23:37+02:00 regex: fixed section ids for functions - removed trailing whitespaces (cherry picked from commit e8aec6d15bcef95f628108398e682571763464c5) (cherry picked from commit afa6eecd1587d4fc566aaa29dc7f902def771a55) - URL: https://github.com/kamailio/kamailio/commit/b98c669c41d8d7357e268b839fb71f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:23:54+02:00 cfgutils: error log message mentioning the param lock_set_size (cherry picked from commit 55347626b189cd009c29b0e058949ed7671ae0d0) (cherry picked from commit 9374328bb2c05955658042fbf31807bd060a04de) (cherry picked from commit 0c2ddea18d6c5a7d309cfffce4163d491fd05e83) - URL: https://github.com/kamailio/kamailio/commit/646802c4998b6418fd27b2910e802a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:24:06+02:00 tmx: use branch index for $T_rpl() cache invalidation (cherry picked from commit e2ca5516ae086cf33c61dbb9e653a5484cca2074) (cherry picked from commit 0305e2773a07472f442ab8cf4fbecdc0bffaf32b) (cherry picked from commit 9883fbc438da48ea399d0f107e4bdc846ff16818) - URL: https://github.com/kamailio/kamailio/commit/ee123666d9d7405c3db90507d05a859… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:24:19+02:00 websocket: aligned example statements - few more details about return code of handshake process (cherry picked from commit d33ee59bc807acf95b07838d24b888b14a286ddd) (cherry picked from commit 0327674281bcd27ef72bf617215f8e6e8f85a0a4) (cherry picked from commit 35204e8eec1f5830b89a331dac274b45e2ce3933) - URL: https://github.com/kamailio/kamailio/commit/df5a84541f1ca7e0307336e8a8edbef… Author: Yasin CANER <ycaner06(a)users.noreply.github.com> Date: 2019-04-03T12:24:59+02:00 core : add word to log get_boundary function added word to log for more understanding (cherry picked from commit 2daa351dd0cf716284ff90cd57d2241ee97f165d) (cherry picked from commit a1a95ab27911ce0ff02c3a7ec7c9286cfee82894) (cherry picked from commit f876ce5b5aba544495abb982f56fb009fb8eedd1) - URL: https://github.com/kamailio/kamailio/commit/f757d8b9cd41bfddcdb4f5d38e7da5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:25:09+02:00 core: function to test if a msg structure is faked request (cherry picked from commit ab72c5e7188266baef0da70f1aa7d7d28b6d077c) (cherry picked from commit e2ffc481a3f6673debf45f45abb7914e679c9f1b) (cherry picked from commit 2820a9620e31de907185d33de272773e62df770c) - URL: https://github.com/kamailio/kamailio/commit/6ba028796529b6fd4f991cc0e1a492c… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2019-04-03T12:26:05+02:00 rtpengine: print command in log message on timeout - few indentation fixes - GH #1732 (cherry picked from commit 9d1e8e256e49968776f7abb740a6d02739547ec2) (cherry picked from commit e9320c09738766d80fae2fe2b1704facbce6221a) (cherry picked from commit 1a6dc025088f5a74e0f8593f930b5362f57441a5) - URL: https://github.com/kamailio/kamailio/commit/5d67e4fdddf954d53ae26f4fc67d375… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:26:32+02:00 topoh: safety checks for couple of mandatory headers - first via and call-id - GH #1735 (cherry picked from commit 97da6b1a5f656db4a91c8909167706fc8ec3d932) (cherry picked from commit 01828ecdff3e048845ee0cee58cfe1ffbceb761f) (cherry picked from commit 6e1c4b6807e2b31e8e7400bc358a7b689989c8d8) - URL: https://github.com/kamailio/kamailio/commit/1dbad33f22c81ab40b740d1af18c1bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:26:48+02:00 presence: test if event is dialog when attempting to delete old records (cherry picked from commit 55c7f781be7cc40d0cd161640a47244aad60c0e7) (cherry picked from commit 8b6665b5d27fa8c36764078b9ae615075486a4b3) (cherry picked from commit 03c971d27b235b71d343e2771b87a34d9c397b11) - URL: https://github.com/kamailio/kamailio/commit/5c565d10662561df4bf9121766c3ea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:26:59+02:00 core: parse body - debug instead of error log message when mime mismatch - GH #1746 (cherry picked from commit 08820db104c7dbfce36af0f59dfcc28f97cffbd0) (cherry picked from commit 81f328095f6c06b5ca7cb18b6cdcfad430fb7359) (cherry picked from commit 24064631d8de14a9af89ad0748eff9939c16da03) - URL: https://github.com/kamailio/kamailio/commit/1b1d17f1ffe07bb6e9018b3f7002a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:27:14+02:00 dialog: safety checks for local cseq and contact vars - avoid crash on systems not printing null string of length 0 - GH #1717 (cherry picked from commit 46401e465d88495d510d2cb36dc36ec86978c53e) (cherry picked from commit 79946bbb6d1731f503fc378ae38311b630e55999) (cherry picked from commit 893562c7e698e001f6fe883ea7e5497e67c6eee7) - URL: https://github.com/kamailio/kamailio/commit/5c9b35535e04837c48827da0a9ba93c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:28:42+02:00 dialog: check for cseq value only when getting it for caller/request (cherry picked from commit 740bc8ce88da612ac30a73db0145908355cab192) (cherry picked from commit b66ebc658b22b992c4b0c6ecad7915b217b344a1) - URL: https://github.com/kamailio/kamailio/commit/85edb217ea5d2ad39f39ce7b2e1b468… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:29:24+02:00 lib/srdb1: memset db connection structure earlier in db_bind_mod() (cherry picked from commit 1b014d65e26a99f9f5d4aea1b27949776f083c2d) (cherry picked from commit 1133f818461cf2ed6c8bd755543f93b366a02683) (cherry picked from commit 3bf230b75b181dd213b08a7cc133fe188b5fcfa5) - URL: https://github.com/kamailio/kamailio/commit/68cb3012dc3b7b30dfe63bcbcb9a143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:29:53+02:00 auth_xkeys: clone value before inserting the lump inside auth_xkeys_add() (cherry picked from commit 01f5ecbc45c236daea62d6638a02c168720c8479) (cherry picked from commit 3a2d9921dc8a3c8133e7e3bacfba94468f9bbeb6) (cherry picked from commit 3e6f951c070291b0b2e9df6cde3f287625995aac) - URL: https://github.com/kamailio/kamailio/commit/ad93e3cb93cf7cd6561e8d7e974d112… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:30:08+02:00 dialog: store call-id, r-uri, f-uri and t-uri with 0-ending char - can simplify matching with standard string comparison and regexp (cherry picked from commit f1ab32ee4a0bf64017a0b05f2013b81d37d50208) (cherry picked from commit 2e81abf1262784e390eb31efa95c5f437bd7051e) (cherry picked from commit 67657f5ceef6528fab2371bfea386d3a9fb3cfb8) - URL: https://github.com/kamailio/kamailio/commit/fae7a7f5e0f4a39cbe01af683f76bd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:30:20+02:00 pv: {param.count} accept static string "," as delimiter (cherry picked from commit 80b3c37557d446bfe9ca5a5f469a42af60648280) (cherry picked from commit cb98198e595c776ccbf2cd8777e178eb81e85b58) (cherry picked from commit e3eb15272e5940222ceb40c0119e1f7897d3054b) - URL: https://github.com/kamailio/kamailio/commit/d8084c8c0654211b36174be1cd83e0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:30:34+02:00 tm: error log message about new final reply made info - can happen due to races of packets on the network (cherry picked from commit 3d43f546ddff613c50068c9d47521a15b42f1c7b) (cherry picked from commit 9ccbcc089e70001dd94136eadb68d2711669142f) (cherry picked from commit 4942d5cecc310f516d20594f58bc7b83eec67028) - URL: https://github.com/kamailio/kamailio/commit/7ea27e6d1bb7b9dc480b69507f80402… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:31:11+02:00 cplc: init var to avoid compile warning (cherry picked from commit 0f1b970ae7f47478649b61a8dc43fe42714b2a95) (cherry picked from commit 2dc84951b8f0e2503ee4c551b8693de36b36ef77) (cherry picked from commit 44666e217420dda4bda31ae7ffb46ca8fc63d455) - URL: https://github.com/kamailio/kamailio/commit/850394460fea79d669cecd4b42a7f95… Author: Balajee <balajee(a)Balajees-MacBook-Air.local> Date: 2019-04-03T12:31:20+02:00 topoh: fixed unmask route issue, if maksing fails for one of the routes (cherry picked from commit d57f70127c44fd74c459aefc8d2655978b9cb48b) (cherry picked from commit 4fe56123b424638a5967832f4ac05d3e63a13577) (cherry picked from commit ab850a6ad3373dea409eed96fe87da305fda09b7) - URL: https://github.com/kamailio/kamailio/commit/1d53bbb2dd27d9c10f0b6fbf73fe55b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:31:33+02:00 topoh: aded debug message for knowing the reason of no decoding rr (cherry picked from commit cee4941daf56985d9734263c4b99c33f9ef3a149) (cherry picked from commit 3a78d068a3678471efe0a7e7f4ea0e7c9bc18675) (cherry picked from commit 91763e1661c575db1f0ffb1916188a370a8fc143) - URL: https://github.com/kamailio/kamailio/commit/b9ebd1487679ec0b8f83fb9d6295d94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:32:40+02:00 dialog: only write debug messages in case cseq or contact fields are empty (cherry picked from commit ae4087ef615c1de5b67c8406eab8316300282d8b) (cherry picked from commit 5067fe22cc16af943126ea88a9ddd35281ca8636) (cherry picked from commit 19f585b4a32673ee15a9fe50f2edc1211bee44c5) - URL: https://github.com/kamailio/kamailio/commit/9eb508dd7ecd06998915ccdaec0b399… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:33:17+02:00 auth_db: print db table name when version check fails (cherry picked from commit a8de371e90ddc8a6921b5bf7464961865804cc06) (cherry picked from commit f62c3cb67c9c2be10393bdeec684eb3dc9325dd6) (cherry picked from commit d498c3ca48ad2e0538d29e13eb283f480a352916) - URL: https://github.com/kamailio/kamailio/commit/5c46a4fe5288c3bb63de2effff433bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:33:33+02:00 dialog: docs - more info about using the flag and dlg_manage() (cherry picked from commit e4dfe3587943d69d556b15df3492cf38c3b21a5f) (cherry picked from commit 3dd154faeead29f54145843d14367c5b28a4fb7b) (cherry picked from commit aadd286fe15ddd121580f2770c3c29f56fab36ec) - URL: https://github.com/kamailio/kamailio/commit/e60e413e3abdc7a00089527df6a319e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:33:48+02:00 dialog: do not require dlg_flag parameter to be set - using dlg_manage() should be enough for tracking dialogs (cherry picked from commit 404f403786478a917637186446bb285e8e32cc59) (cherry picked from commit 563f1d6af3123485ed25cc58bb3badd68e7793a4) (cherry picked from commit 3720283674cc783bceb64987ec8f27a54a1e1d47) - URL: https://github.com/kamailio/kamailio/commit/82262031cf19653ff77b471cf106ab3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-03T12:33:58+02:00 tsilo: add check for empty aor Fix: #1775 (cherry picked from commit 5a5d742eb459249995114eb6a3642f99c6770496) (cherry picked from commit 23a5c07e924a2feb5f09b727f4ad0faf6c5af349) (cherry picked from commit f9e7ea0a35d4115f2437d285a8e27aceaf74a5fd) - URL: https://github.com/kamailio/kamailio/commit/869c62e033a9d941b63ddd4602296e9… Author: Federico Cabiddu <fcabiddu(a)libon.com> Date: 2019-04-03T12:34:11+02:00 tsilo: fixed ts_append example in the doc (cherry picked from commit 18ef9da4c029fefd5089aed484cd8f32ddb0fb17) (cherry picked from commit f727b05ad76c1b22ddba8b3aed311084c260c588) - URL: https://github.com/kamailio/kamailio/commit/d2bc6dcff707151d0c475ddaba0932e… Author: Alex Hermann <alex(a)hexla.nl> Date: 2019-04-03T12:34:45+02:00 jsonrpcs: Fix memleak with srjson_doc_t (cherry picked from commit 8e5742ff1657bdb2adce357fc6f1a2e04fd913c6) (cherry picked from commit 0a885dab3dd4a54dd7a6948bf25629fd6681770a) - URL: https://github.com/kamailio/kamailio/commit/650293548b0aafeb6f5108b492a7386… Author: Alex Hermann <alex(a)hexla.nl> Date: 2019-04-03T12:35:04+02:00 siputils: Return true if options_reply() succeeds (cherry picked from commit 73d29ddde2b38cfea2c9ca4a84f4b8a246b7da50) (cherry picked from commit 3de32c77ae628bfa11f8a826e5eb4607a435a828) - URL: https://github.com/kamailio/kamailio/commit/5da494161af68e359a4874928e97ed5… Author: Alex Hermann <alex(a)hexla.nl> Date: 2019-04-03T12:35:16+02:00 jansson: Fix reverse logic for JSON boolean (cherry picked from commit 0125c1c8d8c1179670def9dc4b3e66d6a8e58360) (cherry picked from commit 26cfea05082fbd2c4236510397986ace2b495b0f) - URL: https://github.com/kamailio/kamailio/commit/a1ab1d61592796f240a1dc54151b014… Author: Sean Bright <sean.bright(a)gmail.com> Date: 2019-04-03T12:36:52+02:00 utils: Fix copy/paste of 'database port' (cherry picked from commit 21ae69c83759f344492078db756a08cd554bf04c) (cherry picked from commit 417c75f2848f942a6ce0670d5c57096dadf54400) - URL: https://github.com/kamailio/kamailio/commit/60d7c56da8e28e9cf6d5547c2f5fcbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:37:35+02:00 kamctl: shift only when expecting more parameters for rpc command (cherry picked from commit 8b1458e97270a4094085226dce1108d8ea5ca7af) (cherry picked from commit c8b65f5f562db763b013ab945cba7caadb9f6535) (cherry picked from commit 53ea4bc3c760637390ff0f51ce10e7c53be25240) - URL: https://github.com/kamailio/kamailio/commit/156b6ac8ff8e1c0addc0b96195896ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:37:46+02:00 kamctl: also shift only on params when printing rpc command (cherry picked from commit 6de8d942b626b05dff8dd5a4f20776db632eba19) (cherry picked from commit cd3bf5c2721385f80e5343f32d576b8fc9a0c672) (cherry picked from commit 709f99c20b1945c03018711d2c652b95e8d36749) - URL: https://github.com/kamailio/kamailio/commit/5d1d4a88c63eba937e4500ee17d7ee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:37:58+02:00 kamctl: updates to trap command to work with pretty printed jsonrpc (cherry picked from commit 4349c4f9bdd82ae099aadb5b626366deb7ef1109) (cherry picked from commit 69ec6f2248dfda10c1c38df3a8a1c3c432b7d0d5) (cherry picked from commit 1c48bddfebe7ce441a9e529b9b6de475d5b5d7c7) - URL: https://github.com/kamailio/kamailio/commit/dbc209042eb6c1d4972b9a8a1bed2a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:38:09+02:00 doc/tutorials/tcp_tunning: note about network buffers size - they may need tunning when dealing with large data (cherry picked from commit 38a696fff66f0a453e54c92c93e8c459a1b4e77d) (cherry picked from commit d44cf2168b45ec24926ca9a4bc5d2558b2b85f8c) (cherry picked from commit bd6dffa696e8ecc4ac52f34178c26acd0c1cc57d) - URL: https://github.com/kamailio/kamailio/commit/f780066c79e1f1c8bc177bed127152a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:38:43+02:00 presence_mwi: small improvement to error log message (cherry picked from commit 91c0e1434d743b8af7bcaa7d993029b6a3c15cb8) (cherry picked from commit a7e227ffe1675d1f47f2209541c15a395d9d6474) (cherry picked from commit 288fd8e118804097087805d2059db6940c2d11a9) - URL: https://github.com/kamailio/kamailio/commit/71708b910394ae2a0b8ffaadf6d9c29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:39:10+02:00 pike: init head list and safety check - related to GH #1822 (cherry picked from commit a055214404b86d6418b7b6797e789773f1f42adb) (cherry picked from commit b310509c7eed3b057a4e126538ed646f39af0351) (cherry picked from commit df0337787713bc1bbd9bc380be9c7b2baca9e9e5) - URL: https://github.com/kamailio/kamailio/commit/7bfd01694eabab9b311ecdd3e362761… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:39:31+02:00 mqueue: added missing license header, removed svn ids (cherry picked from commit 065b1d64453d8b5709069f50cfd705901206feb3) (cherry picked from commit 7c64052b4b101846c9334ea4193a0df63fae49d8) (cherry picked from commit 6fe5067f99334fbd0160ae4afbd10d5011aa25af) - URL: https://github.com/kamailio/kamailio/commit/d860aa06be35e787735ee8435eff11c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:40:01+02:00 app_lua: docs - added note about KSR KEMI exports for register parameter - mention that old 'sr' Lua module might be obsoleted soon (cherry picked from commit bf13f41a642752602c49d090a06a615a19f84ee5) (cherry picked from commit 5e3cdf062b1f1e1a9aae34f4804cf4aad5989630) (cherry picked from commit 32abd7aaf8a2b4a93910da85564eff17928a689c) - URL: https://github.com/kamailio/kamailio/commit/db3913e6cf4b214c3a3a79a24c954e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:40:17+02:00 tm: debug message when matching a skip method for transaction lookup (cherry picked from commit 0374a573604dfac337d69f8db38cca0e3ef30300) (cherry picked from commit a909e7d9213ee071917c785f10d883ea6a06fc39) (cherry picked from commit 1c9d31aaa9d1c5478762770fddc4bf70d2f8e216) - URL: https://github.com/kamailio/kamailio/commit/975dbe0ca69865dab26b0acd3adf33d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:40:37+02:00 core: log printed size, current token size and buffer size for pv printf overflow (cherry picked from commit 44e48809a608d4de46d61198137cd669c6a4763f) (cherry picked from commit 88d4e86bccd252717329e75924a44dd5c2cc7955) (cherry picked from commit 90e88674f88225ba5b43bdb5a6946b1e30cd6f6c) - URL: https://github.com/kamailio/kamailio/commit/847d860d36a78884896170ed165e86d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:41:06+02:00 core: set msg->pid when building local sip_msg_t from buf (cherry picked from commit b5f3a21d919f44f8842c2d85fb9447072b0f1889) (cherry picked from commit 58261d83f454e9f3ad259532d35ca2ca150d2076) (cherry picked from commit 92ac558f300829a060f3cfa5a50cb3bf5ca4d975) - URL: https://github.com/kamailio/kamailio/commit/e9ecbdc3287ad0572dd2525710b371d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:42:12+02:00 dialplan: basic safety for concurent rpc reload - reported by GH #1874 (cherry picked from commit 99d5da8d595961063249f871a5d150474fa6f317) (cherry picked from commit 567c5b91ff0de3237d4dc98138675f19e152bcf5) (cherry picked from commit 6b7a4735339bbb0cfa7919d160d064f3729e8e97) - URL: https://github.com/kamailio/kamailio/commit/bacc0cba98e1a65a0c66c2493f6afce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:42:23+02:00 dialplan: docs - note about limiting to max 1 rpc reload in 5 seconds (cherry picked from commit 34f928427ecf315f638cd59fa512d59f4c64f22e) (cherry picked from commit e1116aca38ad55305593c8936fcacff0d00cf668) (cherry picked from commit 4a8a1e858afb2ea88442d7fa82ea38b2df47c532) - URL: https://github.com/kamailio/kamailio/commit/8333006fb80971b22897a633df5e3a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:42:54+02:00 core: tcp - more details in debug messages (cherry picked from commit 60f7ff60a95ab5dd8192391f50f760e802d11e07) (cherry picked from commit efbf7aa7b8b3af03be43d926c6e0fc23c2349e87) (cherry picked from commit ca1adbf32bc8a20c8199bad7f769c2a80d70eff5) - URL: https://github.com/kamailio/kamailio/commit/3198cfaad5d1fdbe3a1aed937573ca4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:43:07+02:00 tm: more debug to track decision to relay reply or not (cherry picked from commit b292adb668528340fca381925724540afc7f13e8) (cherry picked from commit 56802275b4b4cc77b85b7ef9460134265974e455) (cherry picked from commit b0477d9a77d0f08e298da81d78d23a8f13c19910) - URL: https://github.com/kamailio/kamailio/commit/0c2054114b568c6807f4a5a63d6ce87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:43:18+02:00 topoh: check returned pointer when decoding call-id (cherry picked from commit b5ce9d8f9a1b1fd705ad4b533e7cbc9166a3f577) (cherry picked from commit 77eebed8be1930fdb03f4fce0a1caac1bd45c583) (cherry picked from commit c14bb3cb8ff6ba7df81f1955f629ee169da0edd6) - URL: https://github.com/kamailio/kamailio/commit/68ec32ac47d4479da95865e244608ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:43:29+02:00 usrloc: docs - fixes for some param types (cherry picked from commit 0c2815aec9068511c1abbfd3fa0f1c89b66c57ce) (cherry picked from commit 73c1fde7932a39a74e43013994525ac2a4473366) (cherry picked from commit 95ef9ddcf41e1522a78ac9eca14460c069562018) - URL: https://github.com/kamailio/kamailio/commit/4b9e97b38fb23807d70c7581fcdcea4… Author: sergey-safarov <s.safarov(a)gmail.com> Date: 2019-04-03T12:43:45+02:00 ipops: Fixed mask for 172.16.0.0/12 network (#1907) (cherry picked from commit 1b6332fe565d97695a1eb84172e6f19f26381101) (cherry picked from commit de2364784f5c7b257ff796a83d12f3bb2d130308) - URL: https://github.com/kamailio/kamailio/commit/90b709c7b8043ff208641475efe6b66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:44:08+02:00 tcpops: set tcp keepalive values when available per option - cover macos and *bsd for couple of options (cherry picked from commit 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3) (cherry picked from commit eb5f2096282e93b14fecfc64f22aba0db467dec5) (cherry picked from commit 37f847af805ec20762348898c6427c8df8d02025) - URL: https://github.com/kamailio/kamailio/commit/fc2bf318622154a9530e63a8063b71c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T12:44:19+02:00 lib/srdb1: use the proper field for latency db limit (cherry picked from commit 7560edb8aac6b60a5c4392db21c16e4096bf529d) (cherry picked from commit 8d1996ac6c6c7b1445bcb8f4589bfc3b1cfed805) (cherry picked from commit c3132d81f52197938b9be5616233d59ddc7126f2)

1 0

git:5.1:37f847af: tcpops: set tcp keepalive values when available per option
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.1 Commit: 37f847af805ec20762348898c6427c8df8d02025 URL: https://github.com/kamailio/kamailio/commit/37f847af805ec20762348898c6427c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:54:56+02:00 tcpops: set tcp keepalive values when available per option - cover macos and *bsd for couple of options (cherry picked from commit 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3) (cherry picked from commit eb5f2096282e93b14fecfc64f22aba0db467dec5) --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/37f847af805ec20762348898c6427c8… Patch: https://github.com/kamailio/kamailio/commit/37f847af805ec20762348898c6427c8… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 6815bf4897..9bf4eaa8e0 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -107,8 +107,13 @@ int tcpops_acquire_fd_from_tcpmain(int conid, int *fd) return 0; } -#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) - #warning "TCP keepalive is not fully supported by your platform" +#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) + #define KSR_TCPOPS_NOKEEPALIVE +#endif + +#ifdef KSR_TCPOPS_NOKEEPALIVE + +#warning "TCP keepalive options not supported by this platform" int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) { @@ -121,6 +126,7 @@ int tcpops_keepalive_disable(int fd, int closefd) LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n"); return -1; } + #else int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) @@ -133,11 +139,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno)); return -1; } else { - +#ifdef HAVE_TCP_KEEPIDLE if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle))<0){ LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } +#else + #warning "TCP_KEEPIDLE option not supported by this platform" + LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); +#endif if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count))<0){

1 0

git:5.1:c3132d81: lib/srdb1: use the proper field for latency db limit
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.1 Commit: c3132d81f52197938b9be5616233d59ddc7126f2 URL: https://github.com/kamailio/kamailio/commit/c3132d81f52197938b9be5616233d59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:55:48+02:00 lib/srdb1: use the proper field for latency db limit (cherry picked from commit 7560edb8aac6b60a5c4392db21c16e4096bf529d) (cherry picked from commit 8d1996ac6c6c7b1445bcb8f4589bfc3b1cfed805) --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/c3132d81f52197938b9be5616233d59… Patch: https://github.com/kamailio/kamailio/commit/c3132d81f52197938b9be5616233d59… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index 36b8139ed1..b1900e4c2e 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -47,14 +47,14 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int ret; unsigned int ms = 0; - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) ms = TICKS_TO_MS(get_ticks_raw()); ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { LOG(cfg_get(core, core_cfg, latency_log), "alert - query execution too long [%u ms] for [%.*s]\n", ms, _query->len<50?_query->len:50, _query->s);

1 0

git:5.1:36bd57d9: lib/srdb1: use system time to compute db query execution duration
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.1 Commit: 36bd57d902f990f9d05e1cd6589f2fa3f0ef6897 URL: https://github.com/kamailio/kamailio/commit/36bd57d902f990f9d05e1cd6589f2fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:56:02+02:00 lib/srdb1: use system time to compute db query execution duration (cherry picked from commit ce8d36f301d7688255597a67693e47dc14448650) (cherry picked from commit a2de837273c84c42233dd12829a8aca57257ce9f) --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/36bd57d902f990f9d05e1cd6589f2fa… Patch: https://github.com/kamailio/kamailio/commit/36bd57d902f990f9d05e1cd6589f2fa… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index b1900e4c2e..b2cd9056dc 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <stdlib.h> +#include <time.h> #include "../../core/dprint.h" #include "db_ut.h" #include "db_query.h" @@ -45,19 +46,26 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int (*submit_query)(const db1_con_t*, const str*)) { int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { - LOG(cfg_get(core, core_cfg, latency_log), - "alert - query execution too long [%u ms] for [%.*s]\n", - ms, _query->len<50?_query->len:50, _query->s); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_db)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - query execution too long [%u us] for [%.*s]\n", + tdiff, _query->len<100?_query->len:100, _query->s); } }

1 0

git:5.2:a2de8372: lib/srdb1: use system time to compute db query execution duration
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: a2de837273c84c42233dd12829a8aca57257ce9f URL: https://github.com/kamailio/kamailio/commit/a2de837273c84c42233dd12829a8aca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:45:25+02:00 lib/srdb1: use system time to compute db query execution duration (cherry picked from commit ce8d36f301d7688255597a67693e47dc14448650) --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/a2de837273c84c42233dd12829a8aca… Patch: https://github.com/kamailio/kamailio/commit/a2de837273c84c42233dd12829a8aca… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index b1900e4c2e..b2cd9056dc 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <stdlib.h> +#include <time.h> #include "../../core/dprint.h" #include "db_ut.h" #include "db_query.h" @@ -45,19 +46,26 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int (*submit_query)(const db1_con_t*, const str*)) { int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { - LOG(cfg_get(core, core_cfg, latency_log), - "alert - query execution too long [%u ms] for [%.*s]\n", - ms, _query->len<50?_query->len:50, _query->s); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_db)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - query execution too long [%u us] for [%.*s]\n", + tdiff, _query->len<100?_query->len:100, _query->s); } }

1 0

git:5.2:86944f59: db_postgres: Makefile - fixed name of variable used to detect pkg-config
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: 86944f591edcc8436d2303ac0861992ad25ad5bd URL: https://github.com/kamailio/kamailio/commit/86944f591edcc8436d2303ac0861992… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:45:01+02:00 db_postgres: Makefile - fixed name of variable used to detect pkg-config (cherry picked from commit 49a34c863335e6b0b09e397d7962395306506c00) --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/86944f591edcc8436d2303ac0861992… Patch: https://github.com/kamailio/kamailio/commit/86944f591edcc8436d2303ac0861992… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index 2663ee7515..0d26d8609e 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -10,13 +10,13 @@ NAME=db_postgres.so # CROSS_COMPILE=true ifeq ($(CROSS_COMPILE),) -LIBPQL_BUILDER = $(shell \ +LIBPQ_BUILDER = $(shell \ if pkg-config --exists libpq; then \ echo 'pkg-config libpq'; \ fi) ifneq ($(LIBPQ_BUILDER),) - DEFS += $(shell $(LIBPQL_BUILDER) --cflags) - LIBS += $(shell $(LIBPQL_BUILDER) --libs) + DEFS += $(shell $(LIBPQ_BUILDER) --cflags) + LIBS += $(shell $(LIBPQ_BUILDER) --libs) endif endif

1 0

git:5.2:8d1996ac: lib/srdb1: use the proper field for latency db limit
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: 8d1996ac6c6c7b1445bcb8f4589bfc3b1cfed805 URL: https://github.com/kamailio/kamailio/commit/8d1996ac6c6c7b1445bcb8f4589bfc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:45:16+02:00 lib/srdb1: use the proper field for latency db limit (cherry picked from commit 7560edb8aac6b60a5c4392db21c16e4096bf529d) --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/8d1996ac6c6c7b1445bcb8f4589bfc3… Patch: https://github.com/kamailio/kamailio/commit/8d1996ac6c6c7b1445bcb8f4589bfc3… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index 36b8139ed1..b1900e4c2e 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -47,14 +47,14 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int ret; unsigned int ms = 0; - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) ms = TICKS_TO_MS(get_ticks_raw()); ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { LOG(cfg_get(core, core_cfg, latency_log), "alert - query execution too long [%u ms] for [%.*s]\n", ms, _query->len<50?_query->len:50, _query->s);

1 0

git:5.2:64d87fd6: core: action.c - use system time to compute execution duration
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: 64d87fd6c8971650749fc5238bc1ddab1a48d1c4 URL: https://github.com/kamailio/kamailio/commit/64d87fd6c8971650749fc5238bc1dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:44:20+02:00 core: action.c - use system time to compute execution duration (cherry picked from commit a7660333c790572201d8bc2f8c19fb72d3cb442b) --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/64d87fd6c8971650749fc5238bc1dda… Patch: https://github.com/kamailio/kamailio/commit/64d87fd6c8971650749fc5238bc1dda… --- diff --git a/src/core/action.c b/src/core/action.c index 2102c1abe6..e7829c38b1 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1527,7 +1527,9 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) { struct action* t; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ret=E_UNSPEC; h->rec_lev++; @@ -1555,8 +1557,11 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) } for (t=a; t!=0; t=t->next){ - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) - ms = TICKS_TO_MS(get_ticks_raw()); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } _cfg_crt_action = t; if(unlikely(log_prefix_mode==1)) { log_prefix_set(msg); @@ -1566,16 +1571,19 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if(unlikely(log_prefix_mode==1)) { log_prefix_set(msg); } - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action [%s (%d)]" - " cfg [%s:%d] took too long [%u ms]\n", + " cfg [%s:%d] took too long [%u us]\n", is_mod_func(t) ? ((cmd_export_t*)(t->val[0].u.data))->name : "corefunc", - t->type, (t->cfile)?t->cfile:"", t->cline, ms); + t->type, (t->cfile)?t->cfile:"", t->cline, tdiff); } } /* break, return or drop/exit stop execution of the current

1 0

git:5.2:8662b187: db_postgres: try to use pkg-config for lib paths
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: 8662b187a9a3df0bd2ac683b56bb512987487081 URL: https://github.com/kamailio/kamailio/commit/8662b187a9a3df0bd2ac683b56bb512… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:44:30+02:00 db_postgres: try to use pkg-config for lib paths - GH #1915 (cherry picked from commit b23e8e47474d9c25c6de0f6c3da07ae43b85ad8a) --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/8662b187a9a3df0bd2ac683b56bb512… Patch: https://github.com/kamailio/kamailio/commit/8662b187a9a3df0bd2ac683b56bb512… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index f3a0f6eba9..2663ee7515 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -9,6 +9,19 @@ NAME=db_postgres.so # the autodetection # CROSS_COMPILE=true +ifeq ($(CROSS_COMPILE),) +LIBPQL_BUILDER = $(shell \ + if pkg-config --exists libpq; then \ + echo 'pkg-config libpq'; \ + fi) +ifneq ($(LIBPQ_BUILDER),) + DEFS += $(shell $(LIBPQL_BUILDER) --cflags) + LIBS += $(shell $(LIBPQL_BUILDER) --libs) +endif +endif + +ifeq ($(LIBPQ_BUILDER),) + ifeq ($(CROSS_COMPILE),) PGCFG=$(shell which pg_config) endif @@ -27,6 +40,8 @@ else -L$(LOCALBASE)/lib/pgsql -lpq endif +endif + SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

1 0

git:5.2:c06fb117: app_ruby: proper check for param types
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: c06fb117baeaed51b488a9e9adceaaf5b1413f90 URL: https://github.com/kamailio/kamailio/commit/c06fb117baeaed51b488a9e9adceaaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:44:00+02:00 app_ruby: proper check for param types (cherry picked from commit 6d43eacd6d5b78fe857267e70b7fa85519a7d5b6) --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/c06fb117baeaed51b488a9e9adceaaf… Patch: https://github.com/kamailio/kamailio/commit/c06fb117baeaed51b488a9e9adceaaf… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index ff944ca20e..12f539f364 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -353,7 +353,7 @@ static VALUE app_ruby_pv_seti(int argc, VALUE* argv, VALUE self) return Qfalse; } - if(!RB_TYPE_P(argv[2], T_FIXNUM)) { + if(!RB_TYPE_P(argv[1], T_FIXNUM)) { LM_ERR("invalid pv val parameter type\n"); return Qfalse; } @@ -410,7 +410,7 @@ static VALUE app_ruby_pv_sets(int argc, VALUE* argv, VALUE self) return Qfalse; } - if(!RB_TYPE_P(argv[2], T_FIXNUM)) { + if(!RB_TYPE_P(argv[1], T_STRING)) { LM_ERR("invalid pv val parameter type\n"); return Qfalse; } @@ -600,11 +600,11 @@ static VALUE app_ruby_sr_modf(int argc, VALUE* argv, VALUE self) } /* first is function name, then parameters */ for(i=0; i<argc; i++) { - if(!RB_TYPE_P(argv[0], T_STRING)) { + if(!RB_TYPE_P(argv[i], T_STRING)) { LM_ERR("invalid parameter type (%d)\n", i); return INT2NUM(-1); } - rbv[i] = (char*)StringValuePtr(argv[0]); + rbv[i] = (char*)StringValuePtr(argv[i]); } LM_ERR("request to execute cfg function '%s'\n", rbv[0]); /* pkg copy only parameters */

1 0

git:5.2:cbef48a1: app_python: use system time to compute execution duration
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: cbef48a15d023ae602bb88bafdcf69d4e1b42e27 URL: https://github.com/kamailio/kamailio/commit/cbef48a15d023ae602bb88bafdcf69d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:44:11+02:00 app_python: use system time to compute execution duration (cherry picked from commit a300cf008b86dec22a1006328ab73c3ce399c6c3) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/cbef48a15d023ae602bb88bafdcf69d… Patch: https://github.com/kamailio/kamailio/commit/cbef48a15d023ae602bb88bafdcf69d… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 2bb60b9948..5f2b4b3f8f 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -677,24 +677,29 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) { sr_kemi_t *ket = NULL; PyObject *ret = NULL; - unsigned int ms = 0; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_apy_kemi_export_get(idx); if(ket==NULL) { return sr_kemi_apy_return_false(); } - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_apy_kemi_exec_func_ex(ket, self, args, idx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); if (pstate != NULL && pstate->frame != NULL) { pframe = pstate->frame; @@ -702,9 +707,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (file:%s func:%s line:%d)\n", + " took too long [%u us] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, (pframe)?PyString_AsString(pframe->f_code->co_filename):"", (pframe)?PyString_AsString(pframe->f_code->co_name):"", (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0);

1 0

git:5.2:eb5f2096: tcpops: set tcp keepalive values when available per option
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: eb5f2096282e93b14fecfc64f22aba0db467dec5 URL: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:43:39+02:00 tcpops: set tcp keepalive values when available per option - cover macos and *bsd for couple of options (cherry picked from commit 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3) --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0… Patch: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index cab215365c..1c70eb3409 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -130,8 +130,13 @@ int tcpops_acquire_fd_from_tcpmain(int conid, int *fd) return 0; } -#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) - #warning "TCP keepalive is not fully supported by your platform" +#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) + #define KSR_TCPOPS_NOKEEPALIVE +#endif + +#ifdef KSR_TCPOPS_NOKEEPALIVE + +#warning "TCP keepalive options not supported by this platform" int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) { @@ -144,6 +149,7 @@ int tcpops_keepalive_disable(int fd, int closefd) LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n"); return -1; } + #else int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) @@ -156,11 +162,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno)); return -1; } else { - +#ifdef HAVE_TCP_KEEPIDLE if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle))<0){ LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } +#else + #warning "TCP_KEEPIDLE option not supported by this platform" + LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); +#endif if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count))<0){

1 0

git:master:c5278237: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 03 Apr '19

03 Apr '19

Module: kamailio Branch: master Commit: c5278237a53f232991843a91f8d8e93e1de4de7f URL: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-03T09:17:50+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93… Patch: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index e7cc136dd2..1add3075d2 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -223,6 +223,13 @@ Chapter 1. Admin Guide * The “uac_replace_*” functions can only be run once on the same SIP request. Try to save needed changes in a pseudovariable and apply them once. + There is also a limitation regarding the use of the + “msg_apply_changes()” function together with the “uac_replace_*” + functions for messages that are loose-routed (e.g. Re-INVITE + requests). In this case you need to call the “loose_route()” + function after the replace and msg_apply_changes. Otherwise + Kamailio can create replies with wrong From/To headers (e.g. for + the 100 - Trying reply in the Re-INVITE example). 2. Dependencies

1 0

git:5.2:3e78f6d0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: 3e78f6d060466363f0d61c69f6196f4d09e35ae9 URL: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-03T09:17:20+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4… Patch: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index e7cc136dd2..1add3075d2 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -223,6 +223,13 @@ Chapter 1. Admin Guide * The “uac_replace_*” functions can only be run once on the same SIP request. Try to save needed changes in a pseudovariable and apply them once. + There is also a limitation regarding the use of the + “msg_apply_changes()” function together with the “uac_replace_*” + functions for messages that are loose-routed (e.g. Re-INVITE + requests). In this case you need to call the “loose_route()” + function after the replace and msg_apply_changes. Otherwise + Kamailio can create replies with wrong From/To headers (e.g. for + the 100 - Trying reply in the Re-INVITE example). 2. Dependencies

1 0

git:5.1:d57e47ea: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.1 Commit: d57e47ea5e6ab26258ca596ff85c3fa7e5b0ded6 URL: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-03T09:16:45+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa… Patch: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index ba1c3d1bb7..34d11daab0 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -208,6 +208,13 @@ Chapter 1. Admin Guide * The “uac_replace_*” functions can only be run once on the same SIP request. Try to save needed changes in a pseudovariable and apply them once. + There is also a limitation regarding the use of the + “msg_apply_changes()” function together with the “uac_replace_*” + functions for messages that are loose-routed (e.g. Re-INVITE + requests). In this case you need to call the “loose_route()” + function after the replace and msg_apply_changes. Otherwise + Kamailio can create replies with wrong From/To headers (e.g. for + the 100 - Trying reply in the Re-INVITE example). 2. Dependencies

1 0

git:5.2:ecb15d3f: uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: ecb15d3f84185c00450e8ab68df52ffbb9003d83 URL: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T09:06:38+02:00 uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes (cherry picked from commit 05696125b775d3c275b2516ae34e73b91ce51c9a) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff… Patch: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index fe4046a733..6e514eeea1 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -54,6 +54,16 @@ SIP request. Try to save needed changes in a pseudovariable and apply them once. </para> + <para> + There is also a limitation regarding the use of the + <quote>msg_apply_changes()</quote> function together with the + <quote>uac_replace_*</quote> functions for messages that are + loose-routed (e.g. Re-INVITE requests). In this case you need + to call the <quote>loose_route()</quote> function after the + replace and msg_apply_changes. Otherwise Kamailio can create + replies with wrong From/To headers (e.g. for the 100 - Trying + reply in the Re-INVITE example). + </para> </listitem> </itemizedlist> </section>

1 0

git:5.1:b0a9b150: uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.1 Commit: b0a9b1509c08af68e13ee5cef1214ae416d4c542 URL: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T09:06:45+02:00 uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes (cherry picked from commit 05696125b775d3c275b2516ae34e73b91ce51c9a) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae… Patch: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 78b8f5615b..94a703218f 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -54,6 +54,16 @@ SIP request. Try to save needed changes in a pseudovariable and apply them once. </para> + <para> + There is also a limitation regarding the use of the + <quote>msg_apply_changes()</quote> function together with the + <quote>uac_replace_*</quote> functions for messages that are + loose-routed (e.g. Re-INVITE requests). In this case you need + to call the <quote>loose_route()</quote> function after the + replace and msg_apply_changes. Otherwise Kamailio can create + replies with wrong From/To headers (e.g. for the 100 - Trying + reply in the Re-INVITE example). + </para> </listitem> </itemizedlist> </section>

1 0

git:master:05696125: uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: master Commit: 05696125b775d3c275b2516ae34e73b91ce51c9a URL: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T09:05:32+02:00 uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b… Patch: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index fe4046a733..6e514eeea1 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -54,6 +54,16 @@ SIP request. Try to save needed changes in a pseudovariable and apply them once. </para> + <para> + There is also a limitation regarding the use of the + <quote>msg_apply_changes()</quote> function together with the + <quote>uac_replace_*</quote> functions for messages that are + loose-routed (e.g. Re-INVITE requests). In this case you need + to call the <quote>loose_route()</quote> function after the + replace and msg_apply_changes. Otherwise Kamailio can create + replies with wrong From/To headers (e.g. for the 100 - Trying + reply in the Re-INVITE example). + </para> </listitem> </itemizedlist> </section>

1 0

[kamailio/kamailio] How to add timestamp when kamailio dumps? (#1920)
by aleczmw 03 Apr '19

03 Apr '19

here is the current kamailio log example. ### 0(20) INFO: sipcapture [sipcapture.c:459]: parse_table_names(): INFO: table name:sip_capture 0(20) ERROR: db_mysql [km_my_con.c:129]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'waiting for initial communication packet', system error: 110 "Connection timed out" could we add timestamp for printing log? example: 0(20) **### Y/M/D/H/M/S** INFO: sipcapture [sipcapture.c:459]: parse_table_names(): INFO: table name:sip_capture 0(20) ERROR: db_mysql [km_my_con.c:129]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'waiting for initial communication packet', system error: 110 "Connection timed out" -- 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/issues/1920

2 6

Forced update on master?
by Mikko Lehto 02 Apr '19

02 Apr '19

Hi Was there rebase done (accidentally or on purpose) in master branch lately? I ask because typically fast forward merge just flys through without excitement, but not this time: --- $ git fetch remote: Enumerating objects: 149, done. remote: Counting objects: 100% (149/149), done. remote: Compressing objects: 100% (11/11), done. remote: Total 198 (delta 138), reused 147 (delta 137), pack-reused 49 Receiving objects: 100% (198/198), 43.82 KiB | 1.46 MiB/s, done. Resolving deltas: 100% (144/144), completed with 48 local objects. >From github.com:kamailio/kamailio + a15210d06...ce8d36f30 master -> origin/master (forced update) a7f6227ef..d36634a36 5.2 -> origin/5.2 $ git pull --ff-only fatal: Not possible to fast-forward, aborting. --- I did not forcefully merge local master yet, so my current local HEAD is: --- $ git show HEAD commit a15210d064e08ac8b1a271502360b7066bff43b6 (HEAD -> master) Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 28 19:33:22 2019 +0100 app_lua: get lua execution stack for previous level - returns the info where current function was executed --- And my recently fetched origin/HEAD is: --- $ git show origin/HEAD commit ce8d36f301d7688255597a67693e47dc14448650 (origin/master, origin/HEAD) Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 2 17:09:53 2019 +0200 lib/srdb1: use system time to compute db query execution duration --- If I read "git log --graph --decorate" output correctly, their common ancestor is: --- * | commit 1b6332fe565d97695a1eb84172e6f19f26381101 | | Author: sergey-safarov <s.safarov(a)gmail.com> | | Date: Wed Mar 27 10:43:42 2019 +0300 | | | | ipops: Fixed mask for 172.16.0.0/12 network (#1907) --- >From github web interface I can load same commit as is my local HEAD: https://github.com/kamailio/kamailio/commit/a15210d064e08ac8b1a271502360b70… And it looks that commit is also known as: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… I try to figure out if something is happening on my end, but meanwhile I must ask is it just me or did anyone else exprience this? Best regards -- Mikko

2 2

Re: [sr-dev] [SR-Users] ENUM for CNAM dips
by Henning Westerholt 02 Apr '19

02 Apr '19

Am Montag, 1. April 2019, 19:22:13 CEST schrieb Spencer Thomason: > I’m interested in extending the ENUM module to add support for > draft-ietf-enum-cnam-08 CNAM queries using ENUM. I’m looking for high > level guidance as to the best way to implement this and any feedback on > naming of exported functions and parameters. Maybe something like > enum_cnam_query("pvar", "destination", [,"suffix" [,"service"]]) ? Hello Spencer, (added sr-dev) thank you for your interesting in contribution to Kamailio. I am not the author of the enum module - but your suggestion: enum_cnam_query("pvar", "destination", [,"suffix" [,"service"]]) sounds fine for me. This fits to the existing function naming. If you have specific questions regarding coding topics please use our developer mailing list (sr-dev). We integrate new code usually with github, you find a guide here: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

1 0

git:master:ce8d36f3: lib/srdb1: use system time to compute db query execution duration
by Daniel-Constantin Mierla 02 Apr '19

02 Apr '19

Module: kamailio Branch: master Commit: ce8d36f301d7688255597a67693e47dc14448650 URL: https://github.com/kamailio/kamailio/commit/ce8d36f301d7688255597a67693e47d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-02T17:09:53+02:00 lib/srdb1: use system time to compute db query execution duration --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/ce8d36f301d7688255597a67693e47d… Patch: https://github.com/kamailio/kamailio/commit/ce8d36f301d7688255597a67693e47d… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index e6f237d654..8510999aba 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <stdlib.h> +#include <time.h> #include "../../core/dprint.h" #include "db_ut.h" #include "db_query.h" @@ -45,19 +46,26 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int (*submit_query)(const db1_con_t*, const str*)) { int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { - LOG(cfg_get(core, core_cfg, latency_log), - "alert - query execution too long [%u ms] for [%.*s]\n", - ms, _query->len<50?_query->len:50, _query->s); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_db)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - query execution too long [%u us] for [%.*s]\n", + tdiff, _query->len<100?_query->len:100, _query->s); } }

1 0

git:master:7560edb8: lib/srdb1: use the proper field for latency db limit
by Daniel-Constantin Mierla 02 Apr '19

02 Apr '19

Module: kamailio Branch: master Commit: 7560edb8aac6b60a5c4392db21c16e4096bf529d URL: https://github.com/kamailio/kamailio/commit/7560edb8aac6b60a5c4392db21c16e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-02T13:45:56+02:00 lib/srdb1: use the proper field for latency db limit --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/7560edb8aac6b60a5c4392db21c16e4… Patch: https://github.com/kamailio/kamailio/commit/7560edb8aac6b60a5c4392db21c16e4… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index 4bb235fab1..e6f237d654 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -47,14 +47,14 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int ret; unsigned int ms = 0; - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) ms = TICKS_TO_MS(get_ticks_raw()); ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { LOG(cfg_get(core, core_cfg, latency_log), "alert - query execution too long [%u ms] for [%.*s]\n", ms, _query->len<50?_query->len:50, _query->s);

1 0

[kamailio/kamailio] Changed default db_redis location schema type for timestamps. Fixes i… (#1918)
by Joan 02 Apr '19

02 Apr '19

#### 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 - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #1917 #### Description Changed default db_redis location schema type of expires and last_modified from int to timestamp. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1918 -- Commit Summary -- * Changed default db_redis location schema type for timestamps. Fixes issue reported by Joan Salvatella #1917 -- File Changes -- M utils/kamctl/db_redis/kamailio/location (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1918.patch https://github.com/kamailio/kamailio/pull/1918.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/1918

3 4

[kamailio/kamailio] db_redis location schema (#1917)
by Joan 02 Apr '19

02 Apr '19

### Description Configured the location module to load the expires column as a datetime instead of an integer but db_redis ignored the parameter and loaded the data with the default schema. As of today, the default schema has last_modified and expires columns as integers but stores them as timestamps. ``` id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/**int**,q/double,callid/string,cseq/int,last_modified/**int**,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9 ``` ### Troubleshooting #### Reproduction Use db_redis as backend and use the location module. While handling INVITE: if (!lookup("location")) { sl_send_reply("404", "User Not Found"); return; } While handling REGISTER: if (!save("location")) sl_reply_error(); #### Debugging Data #### Log Messages ``` 8(34) ERROR: <core> [db_ut.c:92]: db_str2int(): Unexpected characters: [-04-01 07:17:14] 8(34) ERROR: <core> [db_val.c:76]: db_str2val(): error while converting integer value from string 8(34) ERROR: db_redis [redis_dbase.c:1062]: db_redis_convert_row(): Failed to convert redis column 'expires' to db value 8(34) ERROR: db_redis [redis_dbase.c:1231]: db_redis_perform_query(): Failed to convert redis reply for row 8(34) ERROR: db_redis [redis_dbase.c:1243]: db_redis_perform_query(): failed to perform the query 8(34) ERROR: db_redis [redis_dbase.c:1829]: db_redis_query(): failed to do the query 8(34) ERROR: usrloc [udomain.c:641]: db_load_urecord(): db_query failed ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions I patched the default schema with the following and it worked. ``` id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/**timestamp**,q/double,callid/string,cseq/int,last_modified/**timestamp**,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**:  ``` Linux gke-production-cluster-default-pool-fb621121-qz3r 4.14.65+ #1 SMP Thu Oct 25 10:42:50 PDT 2018 x86_64 GNU/Linux ``` -- 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/issues/1917

3 4

git:5.2:d36634a3: kamctl: regenerate db schema files
by Victor Seva 02 Apr '19

02 Apr '19

Module: kamailio Branch: 5.2 Commit: d36634a3628ef21088b9930108a0ce845ccc38d6 URL: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-02T11:31:12+02:00 kamctl: regenerate db schema files --- Modified: utils/kamctl/db_redis/kamailio/location --- Diff: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce8… Patch: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce8… --- diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index 9ca18f2fb0..7c0ea2ab81 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ -id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, +id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9

1 0

git:5.2:0853dd48: lib/srdb1: update location types for db_redis
by Victor Seva 02 Apr '19

02 Apr '19

Module: kamailio Branch: 5.2 Commit: 0853dd48f40e4d91c207e5f4f01b4edeb34ef187 URL: https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4ed… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-02T11:30:08+02:00 lib/srdb1: update location types for db_redis changed introduced directly at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea (cherry picked from commit 741f7c08a86fc101a4f0290192dcbacff1673575) --- Modified: src/lib/srdb1/schema/location.xml --- Diff: https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4ed… Patch: https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4ed… --- diff --git a/src/lib/srdb1/schema/location.xml b/src/lib/srdb1/schema/location.xml index f951f1f4e0..f923394144 100644 --- a/src/lib/srdb1/schema/location.xml +++ b/src/lib/srdb1/schema/location.xml @@ -89,6 +89,7 @@ <column id="expires"> <name>expires</name> <type>datetime</type> + <type db="db_redis">time</type> <default>&DEFAULT_ALIASES_EXPIRES;</default> <default db="oracle">to_date('&DEFAULT_ALIASES_EXPIRES;','yyyy-mm-dd hh24:mi:ss')</default> <description>Date and time when this entry expires.</description> @@ -121,6 +122,7 @@ <column> <name>last_modified</name> <type>datetime</type> + <type db="db_redis">time</type> <default>&DEFAULT_DATETIME;</default> <default db="oracle">to_date('&DEFAULT_DATETIME;','yyyy-mm-dd hh24:mi:ss')</default> <description>Date and time when this entry was last modified.</description>

1 0

[kamailio/kamailio] db_redis: fix schema (#1919)
by Victor Seva 02 Apr '19

02 Apr '19

manual schema changes introduced at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea were lost by regeneration at 5e0440aa27154c263fc883f3a7cb9680805af6c3 This change sets the types changes at location for db_redis You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1919 -- Commit Summary -- * lib/srdb1: update location types for db_redis * kamctl: regenerated db schema files -- File Changes -- M src/lib/srdb1/schema/location.xml (2) M utils/kamctl/db_redis/kamailio/location (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1919.patch https://github.com/kamailio/kamailio/pull/1919.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/1919

2 2

git:master:ae54cf7b: kamctl: regenerated db schema files
by Victor Seva 02 Apr '19

02 Apr '19

Module: kamailio Branch: master Commit: ae54cf7bf6c268a3fef8834a57991601e3487d57 URL: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a5799160… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-02T11:28:05+02:00 kamctl: regenerated db schema files restore db_redis location changes --- Modified: utils/kamctl/db_redis/kamailio/location --- Diff: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a5799160… Patch: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a5799160… --- diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index 9ca18f2fb0..7c0ea2ab81 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ -id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, +id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9

1 0

git:master:741f7c08: lib/srdb1: update location types for db_redis
by Victor Seva 02 Apr '19

02 Apr '19

Module: kamailio Branch: master Commit: 741f7c08a86fc101a4f0290192dcbacff1673575 URL: https://github.com/kamailio/kamailio/commit/741f7c08a86fc101a4f0290192dcbac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-02T11:28:05+02:00 lib/srdb1: update location types for db_redis changed introduced directly at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea --- Modified: src/lib/srdb1/schema/location.xml --- Diff: https://github.com/kamailio/kamailio/commit/741f7c08a86fc101a4f0290192dcbac… Patch: https://github.com/kamailio/kamailio/commit/741f7c08a86fc101a4f0290192dcbac… --- diff --git a/src/lib/srdb1/schema/location.xml b/src/lib/srdb1/schema/location.xml index f951f1f4e0..f923394144 100644 --- a/src/lib/srdb1/schema/location.xml +++ b/src/lib/srdb1/schema/location.xml @@ -89,6 +89,7 @@ <column id="expires"> <name>expires</name> <type>datetime</type> + <type db="db_redis">time</type> <default>&DEFAULT_ALIASES_EXPIRES;</default> <default db="oracle">to_date('&DEFAULT_ALIASES_EXPIRES;','yyyy-mm-dd hh24:mi:ss')</default> <description>Date and time when this entry expires.</description> @@ -121,6 +122,7 @@ <column> <name>last_modified</name> <type>datetime</type> + <type db="db_redis">time</type> <default>&DEFAULT_DATETIME;</default> <default db="oracle">to_date('&DEFAULT_DATETIME;','yyyy-mm-dd hh24:mi:ss')</default> <description>Date and time when this entry was last modified.</description>

1 0

[kamailio/kamailio] kamailio 5.0.6 segfault in pike module (#1822)
by lschweizer 01 Apr '19

01 Apr '19

### Description Hello, I get a segfault with kamailio 5.0.6 on a centos 7 (gdb) #0 0x00007f8d37f1c35e in clean_routine (ticks=43668909, param=0x0) at pike_funcs.c:206 #1 0x000000000047deb2 in compat_old_handler (ti=698702557, tl=0x7f8d38ed01a8, data=0x7f8d38ed01a8) at core/timer.c:997 #2 0x000000000047e92d in slow_timer_main () at core/timer.c:1131 #3 0x0000000000422fc4 in main_loop () at main.c:1679 #4 0x0000000000429e4d in main (argc=7, argv=0x7ffe1787ac98) at main.c:2642 (gdb) bt full #0 0x00007f8d37f1c35e in clean_routine (ticks=43668909, param=0x0) at pike_funcs.c:206 mask = "\000\000\000\000\000\000\000\000\000 \000\020\000\000\000\000\000\000\000\000\000\000\004\002\000\000\000\000\000\000\000" head = {next = 0x7f8d3aa110f8, prev = 0x7f8d39d36470} ll = 0x0 dad = 0x29a55ad00a4c9c0 node = 0xfffffffffffffff0 i = 77 __FUNCTION__ = "clean_routine" __PRETTY_FUNCTION__ = "clean_routine" #1 0x000000000047deb2 in compat_old_handler (ti=698702557, tl=0x7f8d38ed01a8, data=0x7f8d38ed01a8) at core/timer.c:997 t = 0x7f8d38ed01a8 #2 0x000000000047e92d in slow_timer_main () at core/timer.c:1131 n = 12 ret = 4294967295 tl = 0x7f8d38ed01a8 i = 925 __FUNCTION__ = "slow_timer_main" #3 0x0000000000422fc4 in main_loop () at main.c:1679 i = 20 pid = 0 si = 0x0 si_desc = "udp receiver child=19 sock=185.190.125.3:6000\000\000\000\006\000\000\000\000\000\000\000H\342\370r\231\177\000\000\060\251\207\027\376\177\000\000p'\355\070\215\177\000\000\240\262<m\231\177\000\000\210\330Et\231\177\000\000 \202<m\231\177\000\000\003\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\200\066\070\215\177\000" nrprocs = 20 woneinit = 1 __FUNCTION__ = "main_loop" #4 0x0000000000429e4d in main (argc=7, argv=0x7ffe1787ac98) at main.c:2642 cfg_stream = 0x183e010 c = -1 r = 0 tmp = 0x7ffe1787b86e "" tmp_len = 0 port = 0 proto = 2496 options = 0x7387e0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1816923433 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffe1787ab50 p = 0x7f997c3cb9ad <intel_check_word+173> "H\205\300t\025\017\266P\003\017\266\312D9\371\017\204", <incomplete sequence \316> st = {st_dev = 20, st_ino = 30979, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1530437017, tv_nsec = 316150519}, st_mtim = {tv_sec = 1542572308, tv_nsec = 811767469}, st_ctim = {tv_sec = 1542572308, tv_nsec = 811767469}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) info locals cfg_stream = 0x183e010 c = -1 r = 0 tmp = 0x7ffe1787b86e "" tmp_len = 0 port = 0 proto = 2496 options = 0x7387e0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1816923433 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffe1787ab50 p = 0x7f997c3cb9ad <intel_check_word+173> "H\205\300t\025\017\266P\003\017\266\312D9\371\017\204", <incomplete sequence \316> st = {st_dev = 20, st_ino = 30979, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1530437017, tv_nsec = 316150519}, st_mtim = {tv_sec = 1542572308, tv_nsec = 811767469}, st_ctim = {tv_sec = 1542572308, tv_nsec = 811767469}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) list 201 continue; 202 203 lock_tree_branch( i ); 204 for( ll=head.next ; ll!=&head ; ) { 205 node = ll2ipnode( ll ); 206 ll = ll->next; 207 /* skip nodes from a different branch */ 208 if (node->branch!=i) 209 continue; 210 (gdb) I have no SIP traffic and no idea how to reproduce for the moment Laurent -- 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/issues/1822

2 4

[kamailio/kamailio] usrloc: core dump (#1900)
by Bastian Triller 01 Apr '19

01 Apr '19

### Description Kamailio crashes while querying for unexpired contacts in a location table while it is saving contacts to db. Seems to be a regression, since this didn't happened with Kamailio 4.4. #### Reproduction Constantly flush many locations and simultaneously get location statistics from `usrloc` module via `kamcmd ul.db_users`: ```sh shell1 % while kamcmd ul.flush ; do : ; done ``` ```sh shell2 % curl -H content-type:\ application/json -s -d '{"jsonrpc":"2.0", "method":"ul.db_contacts", "params": ["location"]}' localhost:5060/JSONRPC ``` #### Debugging Data ``` #0 0x00007f600e3345ad in ul_rpc_db_contacts (rpc=0x7f6004f8b960 <func_param>, ctx=0x7f6004f8b8e0 <_jsonrpc_ctx>) at ul_rpc.c:774 #1 0x00007f6004d6c15c in jsonrpc_dispatch (msg=0x7ffc7fc4e250, s1=0x0, s2=0x0) at jsonrpcs_mod.c:1251 #2 0x000055c674d60eb9 in do_action (h=0x7ffc7fc4e170, a=0x7f6012607828, msg=0x7ffc7fc4e250) at core/action.c:1054 #3 0x000055c674d6ea4d in run_actions (h=0x7ffc7fc4e170, a=0x7f6012607828, msg=0x7ffc7fc4e250) at core/action.c:1552 #4 0x000055c674d60e25 in do_action (h=0x7ffc7fc4e170, a=0x7f6012607ac8, msg=0x7ffc7fc4e250) at core/action.c:1045 #5 0x000055c674d6ea4d in run_actions (h=0x7ffc7fc4e170, a=0x7f6012600b28, msg=0x7ffc7fc4e250) at core/action.c:1552 #6 0x000055c674d60e25 in do_action (h=0x7ffc7fc4e170, a=0x7f6012607d00, msg=0x7ffc7fc4e250) at core/action.c:1045 #7 0x000055c674d6ea4d in run_actions (h=0x7ffc7fc4e170, a=0x7f60125fecf8, msg=0x7ffc7fc4e250) at core/action.c:1552 #8 0x00007f6004f913b4 in xhttp_process_request (orig_msg=0x7f6012622410, new_buf=0x7f6012638ad0 "POST /JSONRPC HTTP/1.1\r\nVia: SIP/2.0/TCP 127.0.0.1:58590\r\nHost: localhost:5060\r\nUser-Agent: curl/7.52.1\r\nAccept: */*\r\nContent-Length: 67\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\":\"ul.db_contacts\",\"params\":[\"location\"]}", new_len=256) at xhttp_mod.c:282 #9 0x00007f6004f9253b in xhttp_handler (msg=0x7f6012622410) at xhttp_mod.c:357 #10 0x000055c674e4be83 in nonsip_msg_run_hooks (msg=0x7f6012622410) at core/nonsip_hooks.c:111 #11 0x000055c674e944d7 in receive_msg (buf=0x7f5feac686a8 "POST /JSONRPC HTTP/1.1\r\nHost: localhost:5060\r\nUser-Agent: curl/7.52.1\r\nAccept: */*\r\nContent-Length: 67\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\":\"ul.db_contacts\",\"params\":[\"location\"]}", len=222, rcv_info=0x7f5feac683c8) at core/receive.c:202 #12 0x000055c674f2e43c in receive_tcp_msg (tcpbuf=0x7f5feac686a8 "POST /JSONRPC HTTP/1.1\r\nHost: localhost:5060\r\nUser-Agent: curl/7.52.1\r\nAccept: */*\r\nContent-Length: 67\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\":\"ul.db_contacts\",\"params\":[\"location\"]}", len=222, rcv_info=0x7f5feac683c8, con=0x7f5feac683b0) at core/tcp_read.c:1263 #13 0x000055c674f30a70 in tcp_read_req (con=0x7f5feac683b0, bytes_read=0x7ffc7fc4ee68, read_flags=0x7ffc7fc4ee6c) at core/tcp_read.c:1478 #14 0x000055c674f339bb in handle_io (fm=0x7f60126506b0, events=1, idx=-1) at core/tcp_read.c:1652 #15 0x000055c674f23d9b in io_wait_loop_epoll (h=0x55c6753e0fa0 <io_w>, t=2, repeat=0) at core/io_wait.h:1065 #16 0x000055c674f359b0 in tcp_receive_loop (unix_sock=54) at core/tcp_read.c:1822 #17 0x000055c674e14095 in tcp_init_children () at core/tcp_main.c:4802 #18 0x000055c674d216e1 in main_loop () at main.c:1713 #19 0x000055c674d286a9 in main (argc=13, argv=0x7ffc7fc4f4f8) at main.c:2642 ``` #### Log Messages ``` ERROR: usrloc [urecord.c:431]: wb_timer(): updating contact in db failed (aor: 1234(a)example.com) ERROR: db_mysql [km_dbase.c:127]: db_mysql_submit_query(): driver error on query: Commands out of sync; you can't run this command now (2014) ERROR: <core> [db_query.c:339]: db_do_update(): error while submitting query ERROR: usrloc [ucontact.c:1378]: db_update_ucontact_instance(): updating database failed ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.7 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**: ``` Debian 9.5 ``` -- 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/issues/1900

2 3

git:master:49a34c86: db_postgres: Makefile - fixed name of variable used to detect pkg-config
by Daniel-Constantin Mierla 01 Apr '19

01 Apr '19

Module: kamailio Branch: master Commit: 49a34c863335e6b0b09e397d7962395306506c00 URL: https://github.com/kamailio/kamailio/commit/49a34c863335e6b0b09e397d7962395… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-01T16:52:21+02:00 db_postgres: Makefile - fixed name of variable used to detect pkg-config --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/49a34c863335e6b0b09e397d7962395… Patch: https://github.com/kamailio/kamailio/commit/49a34c863335e6b0b09e397d7962395… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index 2663ee7515..0d26d8609e 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -10,13 +10,13 @@ NAME=db_postgres.so # CROSS_COMPILE=true ifeq ($(CROSS_COMPILE),) -LIBPQL_BUILDER = $(shell \ +LIBPQ_BUILDER = $(shell \ if pkg-config --exists libpq; then \ echo 'pkg-config libpq'; \ fi) ifneq ($(LIBPQ_BUILDER),) - DEFS += $(shell $(LIBPQL_BUILDER) --cflags) - LIBS += $(shell $(LIBPQL_BUILDER) --libs) + DEFS += $(shell $(LIBPQ_BUILDER) --cflags) + LIBS += $(shell $(LIBPQ_BUILDER) --libs) endif endif

1 0

git:master:9af0f27f: app_python3: use system time to compute execution duration
by Daniel-Constantin Mierla 01 Apr '19

01 Apr '19

Module: kamailio Branch: master Commit: 9af0f27f664a2514e1b471411a2b8c362763fccf URL: https://github.com/kamailio/kamailio/commit/9af0f27f664a2514e1b471411a2b8c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-01T12:16:58+02:00 app_python3: use system time to compute execution duration --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9af0f27f664a2514e1b471411a2b8c3… Patch: https://github.com/kamailio/kamailio/commit/9af0f27f664a2514e1b471411a2b8c3… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index baa2eccb90..18f9dd6aa6 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -728,24 +728,29 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) { sr_kemi_t *ket = NULL; PyObject *ret = NULL; - unsigned int ms = 0; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_apy_kemi_export_get(idx); if(ket==NULL) { return sr_kemi_apy_return_false(); } - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_apy_kemi_exec_func_ex(ket, self, args, idx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); if (pstate != NULL && pstate->frame != NULL) { pframe = pstate->frame; @@ -755,7 +760,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, (pframe)?PyString_AsString(pframe->f_code->co_filename):"", (pframe)?PyString_AsString(pframe->f_code->co_name):"", (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0);

1 0

[kamailio/kamailio] Frequently TCP/TLS sessions remain in CLOSE_WAIT (#1881)
by kvrban 01 Apr '19

01 Apr '19

### Description On our setup with Kamailio 5.2.1 with users connected via TLS. i see frequently TCP/TLS sessions remain in CLOSE_WAIT: netstat -ntp |grep CLOSE tcp 238 0 172.17.217.10:5061 xxx.xxx.xxx.218:52613 CLOSE_WAIT 117912/kamailio tcp 4681 0 172.17.217.10:5061 xxx.xxx.xxx.125:8892 CLOSE_WAIT 117912/kamailio In tcpdump i see, that the client send a TCP FIN,ACK and and the OS which is hosting the Kamailio send TCP ACK. But Kamailio is not closing. So the session remain in CLOSE_WAIT for a long time (over a hour) We also have configured: tcp_connection_lifetime=65 modparam("tls", "connection_timeout", 63) Which should finally close after 65 second. But no effect. ### Troubleshooting #### Reproduction Register SIP clients via TLS, and then let the client close the TCP session ia TCP FIN,ACK * **Operating System**: Debian GNU/Linux 9 -- 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/issues/1881

3 8

[kamailio/kamailio] Run kamcmd failed. (#1909)
by aleczmw 01 Apr '19

01 Apr '19

### Description  ### Troubleshooting #### Reproduction  [root@kamailio-665b74f766-sv4mx /]# kamcmd ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory [2] #### Debugging Data  ``` [root@kamailio-665b74f766-sv4mx /]# kamcmd ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory [2] ``` #### Log Messages [root@kamailio-665b74f766-sv4mx /]# kamcmd ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory [2]  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/issues/1909

3 7

git:master:b23e8e47: db_postgres: try to use pkg-config for lib paths
by Daniel-Constantin Mierla 01 Apr '19

01 Apr '19

Module: kamailio Branch: master Commit: b23e8e47474d9c25c6de0f6c3da07ae43b85ad8a URL: https://github.com/kamailio/kamailio/commit/b23e8e47474d9c25c6de0f6c3da07ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-01T09:52:16+02:00 db_postgres: try to use pkg-config for lib paths - GH #1915 --- Modified: src/modules/db_postgres/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b23e8e47474d9c25c6de0f6c3da07ae… Patch: https://github.com/kamailio/kamailio/commit/b23e8e47474d9c25c6de0f6c3da07ae… --- diff --git a/src/modules/db_postgres/Makefile b/src/modules/db_postgres/Makefile index f3a0f6eba9..2663ee7515 100644 --- a/src/modules/db_postgres/Makefile +++ b/src/modules/db_postgres/Makefile @@ -9,6 +9,19 @@ NAME=db_postgres.so # the autodetection # CROSS_COMPILE=true +ifeq ($(CROSS_COMPILE),) +LIBPQL_BUILDER = $(shell \ + if pkg-config --exists libpq; then \ + echo 'pkg-config libpq'; \ + fi) +ifneq ($(LIBPQ_BUILDER),) + DEFS += $(shell $(LIBPQL_BUILDER) --cflags) + LIBS += $(shell $(LIBPQL_BUILDER) --libs) +endif +endif + +ifeq ($(LIBPQ_BUILDER),) + ifeq ($(CROSS_COMPILE),) PGCFG=$(shell which pg_config) endif @@ -27,6 +40,8 @@ else -L$(LOCALBASE)/lib/pgsql -lpq endif +endif + SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

1 0

git:master:a7660333: core: action.c - use system time to compute execution duration
by Daniel-Constantin Mierla 31 Mar '19

31 Mar '19

Module: kamailio Branch: master Commit: a7660333c790572201d8bc2f8c19fb72d3cb442b URL: https://github.com/kamailio/kamailio/commit/a7660333c790572201d8bc2f8c19fb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-31T12:54:34+02:00 core: action.c - use system time to compute execution duration --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/a7660333c790572201d8bc2f8c19fb7… Patch: https://github.com/kamailio/kamailio/commit/a7660333c790572201d8bc2f8c19fb7… --- diff --git a/src/core/action.c b/src/core/action.c index 83b1f708cd..06775a88fc 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1527,7 +1527,9 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) { struct action* t; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ret=E_UNSPEC; h->rec_lev++; @@ -1555,8 +1557,11 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) } for (t=a; t!=0; t=t->next){ - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) - ms = TICKS_TO_MS(get_ticks_raw()); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } _cfg_crt_action = t; if(unlikely(log_prefix_mode==1)) { log_prefix_set(msg); @@ -1566,16 +1571,19 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if(unlikely(log_prefix_mode==1)) { log_prefix_set(msg); } - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action [%s (%d)]" - " cfg [%s:%d] took too long [%u ms]\n", + " cfg [%s:%d] took too long [%u us]\n", is_mod_func(t) ? ((cmd_export_t*)(t->val[0].u.data))->name : "corefunc", - t->type, (t->cfile)?t->cfile:"", t->cline, ms); + t->type, (t->cfile)?t->cfile:"", t->cline, tdiff); } } /* break, return or drop/exit stop execution of the current

1 0

git:master:a300cf00: app_python: use system time to compute execution duration
by Daniel-Constantin Mierla 31 Mar '19

31 Mar '19

Module: kamailio Branch: master Commit: a300cf008b86dec22a1006328ab73c3ce399c6c3 URL: https://github.com/kamailio/kamailio/commit/a300cf008b86dec22a1006328ab73c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-31T12:50:14+02:00 app_python: use system time to compute execution duration --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/a300cf008b86dec22a1006328ab73c3… Patch: https://github.com/kamailio/kamailio/commit/a300cf008b86dec22a1006328ab73c3… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 7a3717ecce..f89ff5252a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -706,24 +706,29 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) { sr_kemi_t *ket = NULL; PyObject *ret = NULL; - unsigned int ms = 0; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_apy_kemi_export_get(idx); if(ket==NULL) { return sr_kemi_apy_return_false(); } - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_apy_kemi_exec_func_ex(ket, self, args, idx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); if (pstate != NULL && pstate->frame != NULL) { pframe = pstate->frame; @@ -731,9 +736,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (file:%s func:%s line:%d)\n", + " took too long [%u us] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, (pframe)?PyString_AsString(pframe->f_code->co_filename):"", (pframe)?PyString_AsString(pframe->f_code->co_name):"", (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0);

1 0

git:5.2:ca470cb6: pv: add $def pseudo variable
by Sergey Safarov 31 Mar '19

31 Mar '19

Module: kamailio Branch: 5.2 Commit: ca470cb6c5f341c518b208e8e595be2ed1309802 URL: https://github.com/kamailio/kamailio/commit/ca470cb6c5f341c518b208e8e595be2… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:08:50+03:00 pv: add $def pseudo variable --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/ca470cb6c5f341c518b208e8e595be2… Patch: https://github.com/kamailio/kamailio/commit/ca470cb6c5f341c518b208e8e595be2… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 06f831bd97..0df9353606 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -189,6 +189,8 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, + {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, + pv_parse_def_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 01cebc8534..2e54253eb4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3658,3 +3658,28 @@ int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +int pv_parse_def_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +extern str *pp_define_get(int len, const char * text); + +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); + + if (val) { + return pv_get_strval(msg, param, res, val); + } + return pv_get_null(msg, param, res); +} + diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 411f2f8aac..86629e66e0 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -379,5 +379,8 @@ int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_def_name(pv_spec_p sp, str *in); +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif

3 3

[kamailio/kamailio] Phonenum not in the package for RHEL (#1867)
by nicoonline 30 Mar '19

30 Mar '19

### Description Hi Nicolas, it seems that the phonenum module is not packaged right now in the fedora/rhel packages. The best would be to create an issue about that on our github tracker, that it can be investigated and fixed. Henning ### Troubleshooting #### Reproduction - #### Debugging Data Ask to build the phonenum package in the RHEL tree. -- 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/issues/1867

3 20

git:master:6d43eacd: app_ruby: proper check for param types
by Daniel-Constantin Mierla 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: 6d43eacd6d5b78fe857267e70b7fa85519a7d5b6 URL: https://github.com/kamailio/kamailio/commit/6d43eacd6d5b78fe857267e70b7fa85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-30T14:21:35+01:00 app_ruby: proper check for param types --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6d43eacd6d5b78fe857267e70b7fa85… Patch: https://github.com/kamailio/kamailio/commit/6d43eacd6d5b78fe857267e70b7fa85… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 7f4488a6e2..5a325f7538 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -358,7 +358,7 @@ static VALUE app_ruby_pv_seti(int argc, VALUE* argv, VALUE self) return Qfalse; } - if(!RB_TYPE_P(argv[2], T_FIXNUM)) { + if(!RB_TYPE_P(argv[1], T_FIXNUM)) { LM_ERR("invalid pv val parameter type\n"); return Qfalse; } @@ -415,7 +415,7 @@ static VALUE app_ruby_pv_sets(int argc, VALUE* argv, VALUE self) return Qfalse; } - if(!RB_TYPE_P(argv[2], T_FIXNUM)) { + if(!RB_TYPE_P(argv[1], T_STRING)) { LM_ERR("invalid pv val parameter type\n"); return Qfalse; } @@ -605,11 +605,11 @@ static VALUE app_ruby_sr_modf(int argc, VALUE* argv, VALUE self) } /* first is function name, then parameters */ for(i=0; i<argc; i++) { - if(!RB_TYPE_P(argv[0], T_STRING)) { + if(!RB_TYPE_P(argv[i], T_STRING)) { LM_ERR("invalid parameter type (%d)\n", i); return INT2NUM(-1); } - rbv[i] = (char*)StringValuePtr(argv[0]); + rbv[i] = (char*)StringValuePtr(argv[i]); } LM_ERR("request to execute cfg function '%s'\n", rbv[0]); /* pkg copy only parameters */

1 0

git:5.2:703b0902: Revert "pv: add $def pseudo variable"
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: 703b09024a462348b49d8abbf9c0f41775eb724d URL: https://github.com/kamailio/kamailio/commit/703b09024a462348b49d8abbf9c0f41… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T16:20:27+03:00 Revert "pv: add $def pseudo variable" This reverts commit ca470cb6c5f341c518b208e8e595be2ed1309802. --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/703b09024a462348b49d8abbf9c0f41… Patch: https://github.com/kamailio/kamailio/commit/703b09024a462348b49d8abbf9c0f41… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 0df9353606..06f831bd97 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -189,8 +189,6 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, - {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, - pv_parse_def_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 2e54253eb4..01cebc8534 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3658,28 +3658,3 @@ int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } -int pv_parse_def_name(pv_spec_p sp, str *in) -{ - if (in == NULL || in->s == NULL || sp == NULL) { - LM_ERR("INVALID DEF NAME\n"); - return -1; - } - sp->pvp.pvn.type = PV_NAME_INTSTR; - sp->pvp.pvn.u.isname.type = AVP_NAME_STR; - sp->pvp.pvn.u.isname.name.s = *in; - return 0; - -} - -extern str *pp_define_get(int len, const char * text); - -int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) -{ - str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); - - if (val) { - return pv_get_strval(msg, param, res, val); - } - return pv_get_null(msg, param, res); -} - diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 86629e66e0..411f2f8aac 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -379,8 +379,5 @@ int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); -int pv_parse_def_name(pv_spec_p sp, str *in); -int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); - #endif

1 0

git:5.2:25dac9c2: Revert "core: allow pp_define_get to be used by modules"
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: 25dac9c25bbfecbff2922a2fdf8d9d3e9a11e762 URL: https://github.com/kamailio/kamailio/commit/25dac9c25bbfecbff2922a2fdf8d9d3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T16:20:23+03:00 Revert "core: allow pp_define_get to be used by modules" This reverts commit 299dd60a13269c65780e5a31030c323b58bf7784. --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/25dac9c25bbfecbff2922a2fdf8d9d3… Patch: https://github.com/kamailio/kamailio/commit/25dac9c25bbfecbff2922a2fdf8d9d3… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 1f7b8de958..6a0d23d76f 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -113,7 +113,7 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; - str *pp_define_get(int len, const char * text); + static str *pp_define_get(int len, const char * text); static int pp_ifdef_type(int pos); static void pp_ifdef_var(int len, const char * text); static void pp_ifdef(); @@ -1854,7 +1854,7 @@ int pp_define_set(int len, char *text) return 0; } -str *pp_define_get(int len, const char * text) +static str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; int i;

1 0

git:5.2:ab0122a7: Revert "core: allow pvar resolve in subsdef"
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: ab0122a7f521fc1721f6a28021af1924a4f791dc URL: https://github.com/kamailio/kamailio/commit/ab0122a7f521fc1721f6a28021af192… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T16:20:18+03:00 Revert "core: allow pvar resolve in subsdef" This reverts commit ded4f064602d54bdb42b0bde15dda1b886009cd0. --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/ab0122a7f521fc1721f6a28021af192… Patch: https://github.com/kamailio/kamailio/commit/ab0122a7f521fc1721f6a28021af192… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 901c7dc04f..d15e0f899e 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -32,7 +32,6 @@ #include "dprint.h" #include "ppcfg.h" -#include "fmsg.h" typedef struct _pp_subst_rule { char *indata; @@ -185,8 +184,7 @@ int pp_subst_run(char **data) i = 0; while(pr) { - sip_msg_t *fmsg = faked_msg_get_next(); - result=subst_str(*data, fmsg, + result=subst_str(*data, 0, (struct subst_expr*)pr->ppdata, 0); /* pkg malloc'ed result */ if(result!=NULL) {

1 0

git:5.2:63b43167: pkg/kamailio/obs: Added phonenum package
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: 63b43167b053f485557f930b344ab4b95b24e0b8 URL: https://github.com/kamailio/kamailio/commit/63b43167b053f485557f930b344ab4b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:45:26+03:00 pkg/kamailio/obs: Added phonenum package (cherry picked from commit 356f9a837470434923165b7e3c627658b0c56b60) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/63b43167b053f485557f930b344ab4b… Patch: https://github.com/kamailio/kamailio/commit/63b43167b053f485557f930b344ab4b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 2ab9f2c22e..1b99719050 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -17,6 +17,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -40,6 +41,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -63,6 +65,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -86,6 +89,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -109,6 +113,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -133,6 +138,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -156,6 +162,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_without redis %bcond_without ruby @@ -179,6 +186,7 @@ %bcond_with memcached %bcond_with mongodb %bcond_with perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -202,6 +210,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_without redis %bcond_with ruby @@ -668,6 +677,19 @@ Perl extensions and database driver for Kamailio. %endif +%if %{with phonenum} +%package phonenum +Summary: Phonenum module the Kamailio +Group: %{PKGGROUP} +Requires: kamailio = %ver +Requires: libphonenumber +BuildRequires: libphonenumber-devel libicu-devel protobuf-devel + +%description phonenum +Phonenum module the Kamailio. +%endif + + %package postgresql Summary: PostgreSQL database connectivity for Kamailio Group: %{PKGGROUP} @@ -1096,6 +1118,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kmysql koutbound \ %if %{with perl} kperl \ +%endif +%if %{with phonenum} + kphonenum \ %endif kpostgres kpresence kpython kradius \ %if %{with redis} @@ -1173,6 +1198,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kmysql koutbound \ %if %{with perl} kperl \ +%endif +%if %{with phonenum} + kphonenum \ %endif kpostgres kpresence kpython kradius \ %if %{with redis} @@ -1845,6 +1873,14 @@ fi %endif +%if %{with phonenum} +%files phonenum +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.phonenum +%{_libdir}/kamailio/modules/phonenum.so +%endif + + %files postgresql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_postgres

1 0

git:5.2:56c22338: pkg/kamailio/obs: Added Fedora 30 packaging
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: 56c22338fee2f35a9e6d0050194ee7ea80788425 URL: https://github.com/kamailio/kamailio/commit/56c22338fee2f35a9e6d0050194ee7e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:42:32+03:00 pkg/kamailio/obs: Added Fedora 30 packaging (cherry picked from commit fc7d03a17c7d17dcaf11a3c5aa8bf4af7044b7ac) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/56c22338fee2f35a9e6d0050194ee7e… Patch: https://github.com/kamailio/kamailio/commit/56c22338fee2f35a9e6d0050194ee7e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 35dde3191e..2ab9f2c22e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -71,6 +71,29 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 30 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -2071,7 +2094,7 @@ fi %changelog * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 dists + - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 and Fedora 30 dists * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 - Added Ruby package * Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0

1 0

git:5.2:bc8119a7: pkg/kamailio/obs: Added openSUSE:Leap:15.1 and 15.0 packaging
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: bc8119a79bbf72807a130320c1344ad922985dcf URL: https://github.com/kamailio/kamailio/commit/bc8119a79bbf72807a130320c1344ad… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:40:35+03:00 pkg/kamailio/obs: Added openSUSE:Leap:15.1 and 15.0 packaging (cherry picked from commit 45f251ff673f1a26d184c9f42e6e492b73f57be0) --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/bc8119a79bbf72807a130320c1344ad… Patch: https://github.com/kamailio/kamailio/commit/bc8119a79bbf72807a130320c1344ad… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9b45c70b1d..35dde3191e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1004,6 +1004,7 @@ ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 +ln -s ../obs pkg/kamailio/opensuse/1500 ln -s ../obs pkg/kamailio/opensuse/1550 ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7 @@ -2069,6 +2070,8 @@ fi %changelog +* Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 + - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 dists * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 - Added Ruby package * Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0 diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 41bf5745bd..bec3a6b458 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -15,6 +15,14 @@ <path project="openSUSE:Leap:42.2:Update" repository="standard"/> <arch>x86_64</arch> </repository> + <repository name="openSUSE_Leap_15.1"> + <path project="openSUSE:Leap:15.1" repository="standard"/> + <arch>x86_64</arch> + </repository> + <repository name="openSUSE_Leap_15.0"> + <path project="openSUSE:Leap:15.0" repository="standard"/> + <arch>x86_64</arch> + </repository> <repository name="RHEL_7"> <path project="Fedora:EPEL:7" repository="RHEL"/> <arch>x86_64</arch>

1 0

git:5.2:299dd60a: core: allow pp_define_get to be used by modules
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: 299dd60a13269c65780e5a31030c323b58bf7784 URL: https://github.com/kamailio/kamailio/commit/299dd60a13269c65780e5a31030c323… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:08:50+03:00 core: allow pp_define_get to be used by modules --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/299dd60a13269c65780e5a31030c323… Patch: https://github.com/kamailio/kamailio/commit/299dd60a13269c65780e5a31030c323… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 6a0d23d76f..1f7b8de958 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -113,7 +113,7 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; - static str *pp_define_get(int len, const char * text); + str *pp_define_get(int len, const char * text); static int pp_ifdef_type(int pos); static void pp_ifdef_var(int len, const char * text); static void pp_ifdef(); @@ -1854,7 +1854,7 @@ int pp_define_set(int len, char *text) return 0; } -static str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; int i;

1 0

git:5.2:ded4f064: core: allow pvar resolve in subsdef
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: 5.2 Commit: ded4f064602d54bdb42b0bde15dda1b886009cd0 URL: https://github.com/kamailio/kamailio/commit/ded4f064602d54bdb42b0bde15dda1b… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:08:50+03:00 core: allow pvar resolve in subsdef --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/ded4f064602d54bdb42b0bde15dda1b… Patch: https://github.com/kamailio/kamailio/commit/ded4f064602d54bdb42b0bde15dda1b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index d15e0f899e..901c7dc04f 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -32,6 +32,7 @@ #include "dprint.h" #include "ppcfg.h" +#include "fmsg.h" typedef struct _pp_subst_rule { char *indata; @@ -184,7 +185,8 @@ int pp_subst_run(char **data) i = 0; while(pr) { - result=subst_str(*data, 0, + sip_msg_t *fmsg = faked_msg_get_next(); + result=subst_str(*data, fmsg, (struct subst_expr*)pr->ppdata, 0); /* pkg malloc'ed result */ if(result!=NULL) {

1 0

git:master:356f9a83: pkg/kamailio/obs: Added phonenum package
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: 356f9a837470434923165b7e3c627658b0c56b60 URL: https://github.com/kamailio/kamailio/commit/356f9a837470434923165b7e3c62765… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:01:02+03:00 pkg/kamailio/obs: Added phonenum package --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/356f9a837470434923165b7e3c62765… Patch: https://github.com/kamailio/kamailio/commit/356f9a837470434923165b7e3c62765… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 0252a19f75..e38d1b9770 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -17,6 +17,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -40,6 +41,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -63,6 +65,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -86,6 +89,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -109,6 +113,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -133,6 +138,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl +%bcond_without phonenum %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -156,6 +162,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_without redis %bcond_without ruby @@ -179,6 +186,7 @@ %bcond_with memcached %bcond_with mongodb %bcond_with perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -202,6 +210,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl +%bcond_with phonenum %bcond_with rabbitmq %bcond_without redis %bcond_with ruby @@ -668,6 +677,19 @@ Perl extensions and database driver for Kamailio. %endif +%if %{with phonenum} +%package phonenum +Summary: Phonenum module the Kamailio +Group: %{PKGGROUP} +Requires: kamailio = %ver +Requires: libphonenumber +BuildRequires: libphonenumber-devel libicu-devel protobuf-devel + +%description phonenum +Phonenum module the Kamailio. +%endif + + %package postgresql Summary: PostgreSQL database connectivity for Kamailio Group: %{PKGGROUP} @@ -798,7 +820,6 @@ SCTP transport for Kamailio. Summary: Additional layer of security over our communications Group: %{PKGGROUP} Requires: kamailio = %ver -#BuildRequires: lksctp-tools-devel %description secfilter Additional layer of security over our communications. @@ -1106,6 +1127,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kmysql koutbound \ %if %{with perl} kperl \ +%endif +%if %{with phonenum} + kphonenum \ %endif kpostgres kpresence kpython kradius \ %if %{with redis} @@ -1183,6 +1207,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kmysql koutbound \ %if %{with perl} kperl \ +%endif +%if %{with phonenum} + kphonenum \ %endif kpostgres kpresence kpython kradius \ %if %{with redis} @@ -1855,6 +1882,14 @@ fi %endif +%if %{with phonenum} +%files phonenum +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.phonenum +%{_libdir}/kamailio/modules/phonenum.so +%endif + + %files postgresql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_postgres

1 0

git:master:45f251ff: pkg/kamailio/obs: Added openSUSE:Leap:15.1 and 15.0 packaging
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: 45f251ff673f1a26d184c9f42e6e492b73f57be0 URL: https://github.com/kamailio/kamailio/commit/45f251ff673f1a26d184c9f42e6e492… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:01:02+03:00 pkg/kamailio/obs: Added openSUSE:Leap:15.1 and 15.0 packaging --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/45f251ff673f1a26d184c9f42e6e492… Patch: https://github.com/kamailio/kamailio/commit/45f251ff673f1a26d184c9f42e6e492… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ed0736440a..7eba6e29d0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1014,6 +1014,7 @@ ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 +ln -s ../obs pkg/kamailio/opensuse/1500 ln -s ../obs pkg/kamailio/opensuse/1550 ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7 @@ -2085,6 +2086,8 @@ fi %changelog +* Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 + - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 dists * Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added secfilter package * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 41bf5745bd..bec3a6b458 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -15,6 +15,14 @@ <path project="openSUSE:Leap:42.2:Update" repository="standard"/> <arch>x86_64</arch> </repository> + <repository name="openSUSE_Leap_15.1"> + <path project="openSUSE:Leap:15.1" repository="standard"/> + <arch>x86_64</arch> + </repository> + <repository name="openSUSE_Leap_15.0"> + <path project="openSUSE:Leap:15.0" repository="standard"/> + <arch>x86_64</arch> + </repository> <repository name="RHEL_7"> <path project="Fedora:EPEL:7" repository="RHEL"/> <arch>x86_64</arch>

1 0

git:master:fc7d03a1: pkg/kamailio/obs: Added Fedora 30 packaging
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: fc7d03a17c7d17dcaf11a3c5aa8bf4af7044b7ac URL: https://github.com/kamailio/kamailio/commit/fc7d03a17c7d17dcaf11a3c5aa8bf4a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:01:02+03:00 pkg/kamailio/obs: Added Fedora 30 packaging --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/fc7d03a17c7d17dcaf11a3c5aa8bf4a… Patch: https://github.com/kamailio/kamailio/commit/fc7d03a17c7d17dcaf11a3c5aa8bf4a… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7eba6e29d0..0252a19f75 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -71,6 +71,29 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 30 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without ims +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without mongodb +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without ruby +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -2087,7 +2110,7 @@ fi %changelog * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 dists + - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 and Fedora 30 dists * Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added secfilter package * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1

1 0

git:master:df3bdbde: pkg/kamailio/obs: Fixed bogus date in spec file
by Sergey Safarov 30 Mar '19

30 Mar '19

Module: kamailio Branch: master Commit: df3bdbdeec3b10df69defeec42a7449516110e31 URL: https://github.com/kamailio/kamailio/commit/df3bdbdeec3b10df69defeec42a7449… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-30T15:00:59+03:00 pkg/kamailio/obs: Fixed bogus date in spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/df3bdbdeec3b10df69defeec42a7449… Patch: https://github.com/kamailio/kamailio/commit/df3bdbdeec3b10df69defeec42a7449… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7b2d2eb99c..ed0736440a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2085,7 +2085,7 @@ fi %changelog -* Tue Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 +* Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added secfilter package * Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 - Added Ruby package

1 0

git:5.2:f66f2bec: app_lua: use 'us' instead of 'ms' in latency execution time logs
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: 5.2 Commit: f66f2bec4e3de50591e8257b36de695863e740d2 URL: https://github.com/kamailio/kamailio/commit/f66f2bec4e3de50591e8257b36de695… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T15:05:17+01:00 app_lua: use 'us' instead of 'ms' in latency execution time logs - the value is in microseconds (cherry picked from commit e8e115631a804de72a1ec9477e21289e9788744b) --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/f66f2bec4e3de50591e8257b36de695… Patch: https://github.com/kamailio/kamailio/commit/f66f2bec4e3de50591e8257b36de695… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index d223975f04..f44670360f 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1946,7 +1946,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (%s:%d - %s [%s])\n", + " took too long [%u us] (%s:%d - %s [%s])\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, @@ -1957,7 +1957,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) } else { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms]\n", + " took too long [%u us]\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff);

1 0

git:master:e8e11563: app_lua: use 'us' instead of 'ms' in latency execution time logs
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: e8e115631a804de72a1ec9477e21289e9788744b URL: https://github.com/kamailio/kamailio/commit/e8e115631a804de72a1ec9477e21289… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T15:02:47+01:00 app_lua: use 'us' instead of 'ms' in latency execution time logs - the value is in microseconds --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/e8e115631a804de72a1ec9477e21289… Patch: https://github.com/kamailio/kamailio/commit/e8e115631a804de72a1ec9477e21289… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 72cbc7180b..9334a67835 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1956,7 +1956,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (%s:%d - %s [%s])\n", + " took too long [%u us] (%s:%d - %s [%s])\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, @@ -1967,7 +1967,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) } else { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms]\n", + " took too long [%u us]\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff);

1 0

[kamailio/kamailio] Small notes on $http_req(timeout) usage. (#1913)
by Igor Olhovskiy 29 Mar '19

29 Mar '19

#### 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 - [x ] Small bug fix (non-breaking change which fixes an issue) - [ ] 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  Just small notes on $http_req(timeout) usage. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1913 -- Commit Summary -- * Notes on use http_req(timeout) * Typo * Fix README -- File Changes -- M src/modules/http_async_client/doc/http_async_client_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1913.patch https://github.com/kamailio/kamailio/pull/1913.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/1913

3 9

git:master:278fd5a8: tcpops: set tcp keepalive values when available per option
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3 URL: https://github.com/kamailio/kamailio/commit/278fd5a892c14f23e9f2b8d1f3fd323… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:15:17+01:00 tcpops: set tcp keepalive values when available per option - cover macos and *bsd for couple of options --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/278fd5a892c14f23e9f2b8d1f3fd323… Patch: https://github.com/kamailio/kamailio/commit/278fd5a892c14f23e9f2b8d1f3fd323… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9abf34af6e..3f66958b6c 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -130,8 +130,13 @@ int tcpops_acquire_fd_from_tcpmain(int conid, int *fd) return 0; } -#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) - #warning "TCP keepalive is not fully supported by your platform" +#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) + #define KSR_TCPOPS_NOKEEPALIVE +#endif + +#ifdef KSR_TCPOPS_NOKEEPALIVE + +#warning "TCP keepalive options not supported by this platform" int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) { @@ -144,6 +149,7 @@ int tcpops_keepalive_disable(int fd, int closefd) LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n"); return -1; } + #else int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) @@ -156,11 +162,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno)); return -1; } else { - +#ifdef HAVE_TCP_KEEPIDLE if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle))<0){ LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } +#else + #warning "TCP_KEEPIDLE option not supported by this platform" + LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); +#endif if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count))<0){

1 0

git:master:c3632f5d: modules: readme files regenerated - http_async_client ... [skip ci]
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: c3632f5d37e3d1ecc9232491c0ec18ccca24f612 URL: https://github.com/kamailio/kamailio/commit/c3632f5d37e3d1ecc9232491c0ec18c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:15:17+01:00 modules: readme files regenerated - http_async_client ... [skip ci] --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/c3632f5d37e3d1ecc9232491c0ec18c… Patch: https://github.com/kamailio/kamailio/commit/c3632f5d37e3d1ecc9232491c0ec18c… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 1f4540b69e..f2afe6325d 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,9 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout + * timeout: sets the HTTP timeout. (Note, this timeout should be + normally less than tm.fr_timer timeout, because transaction timeout + has a higher priority over HTTP timeout) * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use

1 0

git:master:19ecfaa0: http_async_client: docs - small edits for readability
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 19ecfaa092eb54626a8543bf0639f51e7361672a URL: https://github.com/kamailio/kamailio/commit/19ecfaa092eb54626a8543bf0639f51… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:13:33+01:00 http_async_client: docs - small edits for readability --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/19ecfaa092eb54626a8543bf0639f51… Patch: https://github.com/kamailio/kamailio/commit/19ecfaa092eb54626a8543bf0639f51… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 962d60e9a6..a9e344a5dc 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -435,7 +435,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less, than <literal>tm.fr_timer</literal> timeout, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less than <literal>tm.fr_timer</literal> timeout, because transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem>

1 0

git:master:4b1c0d18: http_async_client: removed typo tag from previous commit
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 4b1c0d18b4555183181275000780f010b63fda47 URL: https://github.com/kamailio/kamailio/commit/4b1c0d18b4555183181275000780f01… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:12:12+01:00 http_async_client: removed typo tag from previous commit --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b1c0d18b4555183181275000780f01… Patch: https://github.com/kamailio/kamailio/commit/4b1c0d18b4555183181275000780f01… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index e6219e96ec..962d60e9a6 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -440,7 +440,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem> <listitem><para><emphasis>authmethod</emphasis>: - Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap<literal> + Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap and multiple methods can be used. Note that in this case, the CURL library will make an extra request to discover server-supported authentication methods. You may want to use a specific value.

1 0

git:master:bded7151: http_async_client: updates to README after last edits
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: bded7151a3926e4d44b26d9037b6480ad82b5f60 URL: https://github.com/kamailio/kamailio/commit/bded7151a3926e4d44b26d9037b6480… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:13:01+01:00 http_async_client: updates to README after last edits --- Modified: src/modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/bded7151a3926e4d44b26d9037b6480… Patch: https://github.com/kamailio/kamailio/commit/bded7151a3926e4d44b26d9037b6480… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 45fe6f0e5f..1f4540b69e 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout (Note, this timeout should be normally less, than tm.fr_timer timeout, cause transaction timeout has a higher priority over HTTP timeout) + * timeout: sets the HTTP timeout * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use

1 0

git:master:cffc1159: http_async_client: small notes on $http_req(timeout) usage
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: cffc1159ce4cfc67f77c51c634f7d73c96e1371a URL: https://github.com/kamailio/kamailio/commit/cffc1159ce4cfc67f77c51c634f7d73… Author: Igor Olhovskiy <IgorOlhovskiy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 http_async_client: small notes on $http_req(timeout) usage --- Modified: src/modules/http_async_client/README Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cffc1159ce4cfc67f77c51c634f7d73… Patch: https://github.com/kamailio/kamailio/commit/cffc1159ce4cfc67f77c51c634f7d73… --- diff --git a/src/modules/http_async_client/README b/src/modules/http_async_client/README index 1f4540b69e..45fe6f0e5f 100644 --- a/src/modules/http_async_client/README +++ b/src/modules/http_async_client/README @@ -425,7 +425,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); * method: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified) - * timeout: sets the HTTP timeout + * timeout: sets the HTTP timeout (Note, this timeout should be normally less, than tm.fr_timer timeout, cause transaction timeout has a higher priority over HTTP timeout) * tls_client_cert: sets the client certificate to use * tls_client_key: sets the client certificate key to use * tls_ca_path: sets the CA certificate path to use diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 5a050bf424..e6219e96ec 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -435,12 +435,12 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less, than <literal>tm.fr_timer</literal> timeout, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem> <listitem><para><emphasis>authmethod</emphasis>: - Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap + Sets the preferred authentication mode for HTTP/HTTPS requests. The value is a bitmap<literal> and multiple methods can be used. Note that in this case, the CURL library will make an extra request to discover server-supported authentication methods. You may want to use a specific value.

1 0

git:master:cb1637f3: app_lua: use lib functions for execution time and check return for lua debug
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: cb1637f346f3a0bd3659c8074ddffd61a8da4fff URL: https://github.com/kamailio/kamailio/commit/cb1637f346f3a0bd3659c8074ddffd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 app_lua: use lib functions for execution time and check return for lua debug --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/cb1637f346f3a0bd3659c8074ddffd6… Patch: https://github.com/kamailio/kamailio/commit/cb1637f346f3a0bd3659c8074ddffd6… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index bd3773e46c..041cb32182 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1932,28 +1932,34 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) { sr_kemi_t *ket; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; lua_Debug dinfo; ket = sr_kemi_lua_export_get(eidx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_kemi_lua_exec_func_ex(L, ket, 0); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { memset(&dinfo, 0, sizeof(lua_Debug)); - if(lua_getstack(L, 0, &dinfo)==0 - && lua_getinfo(L, "nSl", &dinfo)==0) { + if(lua_getstack(L, 0, &dinfo)>0 + && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (%s:%d - %s [%s])\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff, (dinfo.short_src[0])?dinfo.short_src:"<unknown>", dinfo.currentline, (dinfo.name)?dinfo.name:"<unknown>", @@ -1963,7 +1969,8 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) "alert - action KSR.%s%s%s(...)" " took too long [%u ms]\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms); + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); } } }

1 0

git:master:fb99f748: app_lua: get lua execution stack for previous level
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: fb99f748db187d2699b6c050cf16f3f54d08ee47 URL: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 app_lua: get lua execution stack for previous level - returns the info where current function was executed --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… Patch: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 041cb32182..72cbc7180b 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1952,7 +1952,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) + (tve.tv_usec - tvb.tv_usec); if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { memset(&dinfo, 0, sizeof(lua_Debug)); - if(lua_getstack(L, 0, &dinfo)>0 + if(lua_getstack(L, 1, &dinfo)>0 && lua_getinfo(L, "nSl", &dinfo)>0) { LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)"

1 0

git:master:1f334f21: cfgutils: exported sleep() and usleep() to kemi framework
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 1f334f218d9e7c7f0c89cecb4aeeefca7cda232d URL: https://github.com/kamailio/kamailio/commit/1f334f218d9e7c7f0c89cecb4aeeefc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 cfgutils: exported sleep() and usleep() to kemi framework --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/1f334f218d9e7c7f0c89cecb4aeeefc… Patch: https://github.com/kamailio/kamailio/commit/1f334f218d9e7c7f0c89cecb4aeeefc… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index e62012cd14..02d7c46c54 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -623,6 +623,12 @@ static int m_sleep(struct sip_msg *msg, char *time, char *str2) return 1; } +static int ki_sleep(sip_msg_t* msg, int v) +{ + sleep((unsigned int)v); + return 1; +} + static int m_usleep(struct sip_msg *msg, char *time, char *str2) { int s; @@ -635,6 +641,12 @@ static int m_usleep(struct sip_msg *msg, char *time, char *str2) return 1; } +static int ki_usleep(sip_msg_t* msg, int v) +{ + sleep_us((unsigned int)v); + return 1; +} + static int dbg_abort(struct sip_msg* msg, char* foo, char* bar) { LM_CRIT("abort called\n"); @@ -1055,6 +1067,16 @@ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("cfgutils"), str_init("sleep"), + SR_KEMIP_INT, ki_sleep, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("usleep"), + SR_KEMIP_INT, ki_usleep, + { SR_KEMIP_INT, SR_KEMIP_NONE, 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:ee1ea030: dialplan: fixed error log in rule_translate
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: ee1ea030d90818f5547c4970f0785b33889d8b75 URL: https://github.com/kamailio/kamailio/commit/ee1ea030d90818f5547c4970f0785b3… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 dialplan: fixed error log in rule_translate - Print an error line only if the string fails a match with all the subst_exp avp values. --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/ee1ea030d90818f5547c4970f0785b3… Patch: https://github.com/kamailio/kamailio/commit/ee1ea030d90818f5547c4970f0785b3… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 2cd568ca5f..06534a9dab 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -432,7 +432,7 @@ int rule_translate(sip_msg_t *msg, str *instr, dpl_node_t *rule, /*search for the pattern from the compiled subst_exp*/ if (pcre_exec(subst_comp, NULL, instr->s, instr->len, 0, 0, ovector, 3 * (MAX_REPLACE_WITH + 1)) <= 0) { - LM_ERR("the string %.*s matched " + LM_DBG("the string %.*s matched " "the match_exp %.*s but not the subst_exp %.*s!\n", instr->len, instr->s, rule->match_exp.len, rule->match_exp.s, @@ -721,6 +721,13 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, pkg_free(re_list); re_list = rt; } while(re_list); + if(rez<0) { + LM_ERR("the string %.*s matched " + "the match_exp %.*s but not the subst_exp %.*s!\n", + input->len, input->s, + rulep->match_exp.len, rulep->match_exp.s, + rulep->subst_exp.len, rulep->subst_exp.s); + } } else { if(rule_translate(msg, input, rulep, rulep->subst_comp, output)!=0){

1 0

git:master:2ddc54ba: kamctl: added acc initdb command
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 2ddc54ba212aa9c64a5488e8ae542cc13c97f195 URL: https://github.com/kamailio/kamailio/commit/2ddc54ba212aa9c64a5488e8ae542cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 kamctl: added acc initdb command - command to add additional columns needed with default kamailio.cfg and defined WITH_ACCDB for acc and missed_calls table --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/2ddc54ba212aa9c64a5488e8ae542cc… Patch: https://github.com/kamailio/kamailio/commit/2ddc54ba212aa9c64a5488e8ae542cc… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 3a25443355..a5f51803d8 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2345,6 +2345,32 @@ acc() { shift; require_dbengine case $1 in + initdb) + QUERY=$(cat <<-END +ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; +ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; +ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; +ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; +END +) + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "error - acc db init" + exit 1 + fi + + mecho "ok - acc db init" + + ;; + showdb) QUERY="select * FROM $ACC_TABLE ;" $DBROCMD "$QUERY" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 16f61e04a5..46494f5a04 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -577,6 +577,7 @@ usage_acc() { mecho " -- command 'acc' - manage accounding records" echo cat <<EOF + acc initdb .................. init acc table by adding extra colums acc showdb .................. show content of acc table recent [<secs>] ............. show most recent records in acc (default 300s) EOF

1 0

git:master:81b268d9: dialplan: fixed avp usage in subst_exp field
by Daniel-Constantin Mierla 29 Mar '19

29 Mar '19

Module: kamailio Branch: master Commit: 81b268d9610ea16420d7ce2aa1a9e3ba5364773c URL: https://github.com/kamailio/kamailio/commit/81b268d9610ea16420d7ce2aa1a9e3b… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-29T10:11:06+01:00 dialplan: fixed avp usage in subst_exp field - in case both match_exp and subst_exp contain avps, the content of match_exp were used to evaluate the substitute expression. --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/81b268d9610ea16420d7ce2aa1a9e3b… Patch: https://github.com/kamailio/kamailio/commit/81b268d9610ea16420d7ce2aa1a9e3b… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 06762ce6d2..2cd568ca5f 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -700,7 +700,7 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, } } if(rulep->tflags&DP_TFLAGS_PV_SUBST) { - re_list = dpl_dynamic_pcre_list(msg, &rulep->match_exp); + re_list = dpl_dynamic_pcre_list(msg, &rulep->subst_exp); if(re_list==NULL) { /* failed to compile dynamic pcre -- ignore */ LM_DBG("failed to compile dynamic pcre[%.*s]\n",

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev