- sr-dev - kamailio.org

git:master:46084c89: rls: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: 46084c898d0598e94c7f22ab03d321e037fd7f55 URL: https://github.com/kamailio/kamailio/commit/46084c898d0598e94c7f22ab03d321e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-22T16:39:46+02:00 rls: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/rls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/46084c898d0598e94c7f22ab03d321e… Patch: https://github.com/kamailio/kamailio/commit/46084c898d0598e94c7f22ab03d321e… --- diff --git a/src/modules/rls/Makefile b/src/modules/rls/Makefile index 33ed9f4a39..b62be93d4c 100644 --- a/src/modules/rls/Makefile +++ b/src/modules/rls/Makefile @@ -10,6 +10,12 @@ NAME=rls.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -21,6 +27,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + DEFS+= SERLIBPATH=../../lib

1 0

git:master:15070284: rls: added rpc command rls.update_subs
by Daniel-Constantin Mierla 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: 1507028464a724cc5628144c4017e01494a2fbb4 URL: https://github.com/kamailio/kamailio/commit/1507028464a724cc5628144c4017e01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-22T16:39:46+02:00 rls: added rpc command rls.update_subs --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/1507028464a724cc5628144c4017e01… Patch: https://github.com/kamailio/kamailio/commit/1507028464a724cc5628144c4017e01… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 00dc87e548..19ecce0ca2 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -1085,8 +1085,46 @@ static const char* rls_rpc_cleanup_doc[2] = { 0 }; +static void rls_rpc_update_subs(rpc_t* rpc, void* ctx) +{ + str uri = {0, 0}; + str event = {0, 0}; + int pn = 0; + + LM_DBG("executing update subs\n"); + pn = rpc->scan(ctx, "SS", &uri, &event); + if(pn < 2) { + rpc->fault(ctx, 500, "Not enough parameters"); + return; + } + + if(uri.s == NULL || uri.len == 0) { + LM_ERR("empty uri\n"); + rpc->fault(ctx, 500, "Empty URI"); + return; + } + + if(event.s == NULL || event.len == 0) { + LM_ERR("empty event parameter\n"); + rpc->fault(ctx, 500, "Empty event parameter"); + return; + } + LM_DBG("uri '%.*s' - event '%.*s'\n", uri.len, uri.s, event.len, event.s); + + if(ki_rls_update_subs(NULL, &uri, &event)<0) { + rpc->fault(ctx, 500, "Processing failure"); + return; + } +} + +static const char* rls_rpc_update_subs_doc[2] = { + "Trigger rls cleanup.", + 0 +}; + rpc_export_t rls_rpc[] = { {"rls.cleanup", rls_rpc_cleanup, rls_rpc_cleanup_doc, 0}, + {"rls.update_subs", rls_rpc_update_subs, rls_rpc_update_subs_doc, 0}, {0, 0, 0, 0} };

1 0

async_task_push(): async task pushed, but no async workers - ignoring
by Yebe Keffa 21 Jun '19

21 Jun '19

Hi i am getting this error in log: [core/async_task.c:244]: async_task_push(): async task pushed, but no async workers - ignoring for kamailio.cfg line: sql_query_async("cb", "DELETE FROM `acc` WHERE sip_code='200' and method='INVITE' "); thank you for your advise Keffa Yebe Diomandé Gérant de NaN.CI E: keffa(a)nan.ci (https://link.getmailspring.com/link/E1B96786-7C2C-4EDA-B9A3-5930CF261DBD@ge…) P: +225 02772222 (tel:+225%2002772222) A: Cocody, Angré, Carrefour GESTOCI (https://link.getmailspring.com/link/E1B96786-7C2C-4EDA-B9A3-5930CF261DBD@ge…) W: https://www.nan.ci (https://link.getmailspring.com/link/E1B96786-7C2C-4EDA-B9A3-5930CF261DBD@ge…)

1 0

git:master:e1ea5743: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 21 Jun '19

21 Jun '19

Module: kamailio Branch: master Commit: e1ea5743fa57b433352270adc6929968a395590c URL: https://github.com/kamailio/kamailio/commit/e1ea5743fa57b433352270adc692996… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-06-21T11:23:12+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README Modified: src/modules/rls/README --- Diff: https://github.com/kamailio/kamailio/commit/e1ea5743fa57b433352270adc692996… Patch: https://github.com/kamailio/kamailio/commit/e1ea5743fa57b433352270adc692996… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 74f1a8f337..18d6d59a21 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -12,8 +12,6 @@ Edited by Anca-Maria Vamanu -Edited by - Juha Heinanen Copyright © 2006 Voice Sistem SRL @@ -92,7 +90,7 @@ Juha Heinanen 7. Events - 7.1. present:notify-reply + 7.1. presence:notify-reply 8. Installation @@ -234,7 +232,7 @@ Chapter 1. Admin Guide 7. Events - 7.1. present:notify-reply + 7.1. presence:notify-reply 8. Installation @@ -388,9 +386,9 @@ modparam("presence", "clean_period", 100) Default value is “0”. Example 1.6. Set cseq_offset parameter - ... - modparam("presence", "cseq_offset", 1) - ... +... +modparam("presence", "cseq_offset", 1) +... 3.7. db_update_period (int) @@ -535,9 +533,9 @@ modparam("presence", "max_expires", 3600) Default value is “0”. Example 1.16. Set min_expires parameter - ... - modparam("presence", "min_expires", 1800) - ... +... +modparam("presence", "min_expires", 1800) +... 3.17. min_expires_action (int) @@ -831,9 +829,9 @@ modparam("presence", "retrieve_order_by", "priority, received_time") Default value is “0”. Example 1.34. Set sip_uri_match parameter - ... - modparam("presence", "sip_uri_match", 1) - ... +... +modparam("presence", "sip_uri_match", 1) +... 3.35. enable_dmq (integer) @@ -848,9 +846,9 @@ modparam("presence", "retrieve_order_by", "priority, received_time") Default value is 0. Example 1.35. Set enable_dmq parameter - ... - modparam("presence", "enable_dmq", 1) - ... +... +modparam("presence", "enable_dmq", 1) +... 4. Functions @@ -950,10 +948,10 @@ if (method=="MESSAGE") { This function can be used from ANY_ROUTE. Example 1.39. pres_has_subscribers usage - ... - if(pres_has_subscribers($var(uri), "message-summary")) - do something...; - ... +... +if(pres_has_subscribers($var(uri), "message-summary")) + # do something...; +... 4.5. pres_refresh_watchers(uri, event, type[, file_uri, filename]) @@ -1060,7 +1058,7 @@ kamcmd presence.refreshWatchers sip:test@kamailio.org presence 1 Access the attributes of handled subscription. It must be used after a successful call of “handle_subscription()” or in the following events. * tm:local-request - before notify is sent - * present:notify-reply - after notify is sent + * presence:notify-reply - after notify is sent The “attr” can be: * uri - subscription presentity uri @@ -1100,7 +1098,7 @@ if(handle_subscription()) Access the reply message received when notifying subscriber. It must be used in the following events. - * present:notify-reply - after notify is sent + * presence:notify-reply - after notify is sent The “attr” can be any pseudo var that accesses attributes of msg @@ -1114,9 +1112,9 @@ event_route[presence:notify-reply] 7. Events - 7.1. present:notify-reply + 7.1. presence:notify-reply -7.1. present:notify-reply +7.1. presence:notify-reply Fired after notify reply is received or timeout. diff --git a/src/modules/rls/README b/src/modules/rls/README index 38b670594c..677046344c 100644 --- a/src/modules/rls/README +++ b/src/modules/rls/README @@ -602,6 +602,8 @@ For rls only: 4.2. rls_handle_notify() + Handle NOTIFY requests. + This function can be used from REQUEST_ROUTE. Example 1.27. rls_handle_notify usage

1 0

git:master:8a909021: presence: docs - aligned examples to avoid large whitespacing
by Daniel-Constantin Mierla 21 Jun '19

21 Jun '19

Module: kamailio Branch: master Commit: 8a909021ccccc321b06b3437d124978bd901ab18 URL: https://github.com/kamailio/kamailio/commit/8a909021ccccc321b06b3437d124978… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-21T11:08:12+02:00 presence: docs - aligned examples to avoid large whitespacing --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a909021ccccc321b06b3437d124978… Patch: https://github.com/kamailio/kamailio/commit/8a909021ccccc321b06b3437d124978… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 769e30be79..3ff750d633 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -192,10 +192,10 @@ modparam("presence", "clean_period", 100) <example> <title>Set <varname>cseq_offset</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "cseq_offset", 1) - ... - </programlisting> +... +modparam("presence", "cseq_offset", 1) +... +</programlisting> </example> </section> <section id="presence.p.db_update_period"> @@ -422,10 +422,10 @@ modparam("presence", "max_expires", 3600) <example> <title>Set <varname>min_expires</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "min_expires", 1800) - ... - </programlisting> +... +modparam("presence", "min_expires", 1800) +... +</programlisting> </example> </section> @@ -895,10 +895,10 @@ modparam("presence", "retrieve_order_by", "priority, received_time") <example> <title>Set <varname>sip_uri_match</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "sip_uri_match", 1) - ... - </programlisting> +... +modparam("presence", "sip_uri_match", 1) +... +</programlisting> </example> </section> @@ -922,10 +922,10 @@ modparam("presence", "retrieve_order_by", "priority, received_time") <example> <title>Set <varname>enable_dmq</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("presence", "enable_dmq", 1) - ... - </programlisting> +... +modparam("presence", "enable_dmq", 1) +... +</programlisting> </example> </section> @@ -1087,11 +1087,11 @@ if (method=="MESSAGE") { <example> <title><function>pres_has_subscribers</function> usage</title> <programlisting format="linespecific"> - ... - if(pres_has_subscribers($var(uri), "message-summary")) - do something...; - ... - </programlisting> +... +if(pres_has_subscribers($var(uri), "message-summary")) + # do something...; +... +</programlisting> </example> </section> @@ -1208,7 +1208,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... &kamcmd; presence.cleanup ... - </programlisting> +</programlisting> </section> <section id="presence.r.refreshWatchers"> <title>presence.refreshWatchers</title> @@ -1264,7 +1264,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... &kamcmd; presence.refreshWatchers sip:test@kamailio.org presence 1 ... - </programlisting> +</programlisting> </section> </section> @@ -1399,7 +1399,7 @@ if(handle_subscription()) xlog("presentity=$subs(uri)\n"); } ... - </programlisting> +</programlisting> </example> </section> @@ -1428,7 +1428,7 @@ event_route[presence:notify-reply] xlog("received message = $notify_reply($mb)\n"); } ... - </programlisting> +</programlisting> </example> </section> </section> @@ -1450,7 +1450,7 @@ event_route[presence:notify-reply] xlog("received message = $notify_reply($mb)\n"); } ... - </programlisting> +</programlisting> </example> </section> </section>

1 0

git:master:f005e2ed: presence: docs - fixed name for event route presence:notify-reply
by Daniel-Constantin Mierla 20 Jun '19

20 Jun '19

Module: kamailio Branch: master Commit: f005e2edca8fef350546cb743bf1cb51ee4ddd8d URL: https://github.com/kamailio/kamailio/commit/f005e2edca8fef350546cb743bf1cb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-20T20:35:04+02:00 presence: docs - fixed name for event route presence:notify-reply --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f005e2edca8fef350546cb743bf1cb5… Patch: https://github.com/kamailio/kamailio/commit/f005e2edca8fef350546cb743bf1cb5… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index c535553089..769e30be79 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1283,7 +1283,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); </para> </listitem> <listitem> - <para><emphasis>present:notify-reply</emphasis> - after notify is sent + <para><emphasis>presence:notify-reply</emphasis> - after notify is sent </para> </listitem> </itemizedlist> @@ -1410,7 +1410,7 @@ if(handle_subscription()) It must be used in the following events. <itemizedlist> <listitem> - <para><emphasis>present:notify-reply</emphasis> - after notify is sent + <para><emphasis>presence:notify-reply</emphasis> - after notify is sent </para> </listitem> </itemizedlist> @@ -1436,7 +1436,7 @@ event_route[presence:notify-reply] <section> <title>Events</title> <section> - <title><varname>present:notify-reply</varname></title> + <title><varname>presence:notify-reply</varname></title> <para> Fired after notify reply is received or timeout. </para>

1 0

git:master:50dfec2f: rls: docs - added section ids
by Daniel-Constantin Mierla 20 Jun '19

20 Jun '19

Module: kamailio Branch: master Commit: 50dfec2f2b7a467afe7c935524d0d385e9018f02 URL: https://github.com/kamailio/kamailio/commit/50dfec2f2b7a467afe7c935524d0d38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-20T11:01:09+02:00 rls: docs - added section ids --- Modified: src/modules/rls/doc/rls_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/50dfec2f2b7a467afe7c935524d0d38… Patch: https://github.com/kamailio/kamailio/commit/50dfec2f2b7a467afe7c935524d0d38…

1 0

git:master:08bf7784: presence_xml: removed extra semicolon
by Daniel-Constantin Mierla 20 Jun '19

20 Jun '19

Module: kamailio Branch: master Commit: 08bf7784ea497a78baa63445dd1404dca0abec9d URL: https://github.com/kamailio/kamailio/commit/08bf7784ea497a78baa63445dd1404d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-20T11:00:37+02:00 presence_xml: removed extra semicolon --- Modified: src/modules/presence_xml/xcap_auth.c --- Diff: https://github.com/kamailio/kamailio/commit/08bf7784ea497a78baa63445dd1404d… Patch: https://github.com/kamailio/kamailio/commit/08bf7784ea497a78baa63445dd1404d… --- diff --git a/src/modules/presence_xml/xcap_auth.c b/src/modules/presence_xml/xcap_auth.c index fe05ffe392..0cded997e2 100644 --- a/src/modules/presence_xml/xcap_auth.c +++ b/src/modules/presence_xml/xcap_auth.c @@ -115,7 +115,6 @@ int pres_watcher_allowed(subs_t *subs) } if(strncmp((char *)sub_handling, "block", 5) == 0) { subs->status = TERMINATED_STATUS; - ; subs->reason.s = "rejected"; subs->reason.len = 8; } else if(strncmp((char *)sub_handling, "confirm", 7) == 0) {

1 0

git:master:e9f24ff3: kamctl: fixed c&p error in version command matching
by Daniel-Constantin Mierla 19 Jun '19

19 Jun '19

Module: kamailio Branch: master Commit: e9f24ff3b974f4a2b6e93b6f8c3a3a5863763610 URL: https://github.com/kamailio/kamailio/commit/e9f24ff3b974f4a2b6e93b6f8c3a3a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T10:06:32+02:00 kamctl: fixed c&p error in version command matching --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/e9f24ff3b974f4a2b6e93b6f8c3a3a5… Patch: https://github.com/kamailio/kamailio/commit/e9f24ff3b974f4a2b6e93b6f8c3a3a5… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a6dbd47a2b..aab756a191 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1791,7 +1791,7 @@ ksr_srv() { mecho "list server rpc commands" ctl_cmd_run system.listMethods ;; - rpclist) + version) require_ctlengine mecho "list server version" ctl_cmd_run core.version

1 0

git:master:fea4b388: kamctl: added subcommand srv version
by Daniel-Constantin Mierla 19 Jun '19

19 Jun '19

Module: kamailio Branch: master Commit: fea4b3881574c304b7e73aa764cd49b109f24c61 URL: https://github.com/kamailio/kamailio/commit/fea4b3881574c304b7e73aa764cd49b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T09:51:39+02:00 kamctl: added subcommand srv version - print the server version using rpc command --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/fea4b3881574c304b7e73aa764cd49b… Patch: https://github.com/kamailio/kamailio/commit/fea4b3881574c304b7e73aa764cd49b… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index cc92e0eba6..a6dbd47a2b 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1791,6 +1791,11 @@ ksr_srv() { mecho "list server rpc commands" ctl_cmd_run system.listMethods ;; + rpclist) + require_ctlengine + mecho "list server version" + ctl_cmd_run core.version + ;; *) usage_ksr_srv exit 1 diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 46494f5a04..d16fa978b8 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -553,6 +553,7 @@ cat <<EOF srv sockets ................... show the list of listen sockets srv aliases ................... show the list of server aliases srv rpclist ................... show the list of server rpc commands + srv version ................... show the server version EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"

1 0

git:master:6ada2d4f: kemix: added from uri user and host functions to exports structure
by Daniel-Constantin Mierla 19 Jun '19

19 Jun '19

Module: kamailio Branch: master Commit: 6ada2d4f04fd5439eb7b424dfaae422ff1bc203c URL: https://github.com/kamailio/kamailio/commit/6ada2d4f04fd5439eb7b424dfaae422… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T08:46:04+02:00 kemix: added from uri user and host functions to exports structure --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6ada2d4f04fd5439eb7b424dfaae422… Patch: https://github.com/kamailio/kamailio/commit/6ada2d4f04fd5439eb7b424dfaae422… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index a01a72f7a3..aef7fc75d1 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -460,6 +460,36 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_ruser"), + SR_KEMIP_XVAL, ki_kx_get_ruser, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_ruser"), + SR_KEMIP_XVAL, ki_kx_getw_ruser, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_ruser"), + SR_KEMIP_XVAL, ki_kx_gete_ruser, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rhost"), + SR_KEMIP_XVAL, ki_kx_get_rhost, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_rhost"), + SR_KEMIP_XVAL, ki_kx_getw_rhost, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_rhost"), + SR_KEMIP_XVAL, ki_kx_gete_rhost, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_ouri"), SR_KEMIP_XVAL, ki_kx_get_ouri, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, @@ -470,38 +500,38 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_turi"), - SR_KEMIP_XVAL, ki_kx_get_turi, + { str_init("kx"), str_init("get_fuser"), + SR_KEMIP_XVAL, ki_kx_get_fuser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_ruser"), - SR_KEMIP_XVAL, ki_kx_get_ruser, + { str_init("kx"), str_init("getw_fuser"), + SR_KEMIP_XVAL, ki_kx_getw_fuser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("getw_ruser"), - SR_KEMIP_XVAL, ki_kx_getw_ruser, + { str_init("kx"), str_init("gete_fuser"), + SR_KEMIP_XVAL, ki_kx_gete_fuser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("gete_ruser"), - SR_KEMIP_XVAL, ki_kx_gete_ruser, + { str_init("kx"), str_init("get_fhost"), + SR_KEMIP_XVAL, ki_kx_get_fhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_rhost"), - SR_KEMIP_XVAL, ki_kx_get_rhost, + { str_init("kx"), str_init("getw_fhost"), + SR_KEMIP_XVAL, ki_kx_getw_fhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("getw_rhost"), - SR_KEMIP_XVAL, ki_kx_getw_rhost, + { str_init("kx"), str_init("gete_fhost"), + SR_KEMIP_XVAL, ki_kx_gete_rhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("gete_rhost"), - SR_KEMIP_XVAL, ki_kx_gete_rhost, + { str_init("kx"), str_init("get_turi"), + SR_KEMIP_XVAL, ki_kx_get_turi, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:e63e182b: kemix: functions to return from-uri user and host
by Daniel-Constantin Mierla 19 Jun '19

19 Jun '19

Module: kamailio Branch: master Commit: e63e182bb0cf62fa7ec2941c25e8459fe59382d7 URL: https://github.com/kamailio/kamailio/commit/e63e182bb0cf62fa7ec2941c25e8459… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T08:37:37+02:00 kemix: functions to return from-uri user and host --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e63e182bb0cf62fa7ec2941c25e8459… Patch: https://github.com/kamailio/kamailio/commit/e63e182bb0cf62fa7ec2941c25e8459… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index add50f09cb..a01a72f7a3 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -272,6 +272,71 @@ static sr_kemi_xval_t* ki_kx_gete_rhost(sip_msg_t *msg) return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_furi_attr(sip_msg_t *msg, int iattr, int xmode) +{ + sip_uri_t *uri; + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + uri=parse_from_uri(msg); + if(uri==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + return ki_kx_get_xuri_attr(msg, uri, iattr, xmode); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_fuser(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 1, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_fuser(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 1, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_fuser(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 1, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_fhost(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 2, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_fhost(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 2, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_fhost(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); +} + /** * */

1 0

git:master:3c07e235: pdb: safety check for header length in pdb_msg_dbg()
by Daniel-Constantin Mierla 18 Jun '19

18 Jun '19

Module: kamailio Branch: master Commit: 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760 URL: https://github.com/kamailio/kamailio/commit/3c07e2351a94e4ff2cf3c6b9b9df4d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-18T16:25:25+02:00 pdb: safety check for header length in pdb_msg_dbg() --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/3c07e2351a94e4ff2cf3c6b9b9df4d7… Patch: https://github.com/kamailio/kamailio/commit/3c07e2351a94e4ff2cf3c6b9b9df4d7… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index eb59656734..b72ecf7f29 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -148,9 +148,13 @@ static void pdb_msg_dbg(struct pdb_msg msg, char *dbg_msg) { char buf[PAYLOADSIZE * 3 + 1]; char *ptr = buf; - for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { - ptr += sprintf(ptr,"%02X ", msg.bdy.payload[i]); - } + if(msg.hdr.length > sizeof(msg.hdr)) { + for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { + ptr += sprintf(ptr, "%02X ", msg.bdy.payload[i]); + } + } else { + *ptr = '\0'; + } LM_DBG("%s\n" "version = %d\ntype = %d\ncode = %d\nid = %d\nlen = %d\n"

1 0

git:master:bb66d054: core: kemi - added KSR.hsr.rminsert(hrm, hadd)
by Daniel-Constantin Mierla 18 Jun '19

18 Jun '19

Module: kamailio Branch: master Commit: bb66d054b2eb0d7bd8c4d8a3040b790ce4a03918 URL: https://github.com/kamailio/kamailio/commit/bb66d054b2eb0d7bd8c4d8a3040b790… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-18T14:22:52+02:00 core: kemi - added KSR.hsr.rminsert(hrm, hadd) - helper function to remove and insert headers in a single operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/bb66d054b2eb0d7bd8c4d8a3040b790… Patch: https://github.com/kamailio/kamailio/commit/bb66d054b2eb0d7bd8c4d8a3040b790… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index d95a0a3cea..3ca2e9065f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1970,6 +1970,21 @@ static int sr_kemi_hdr_rmappend(sip_msg_t *msg, str *hrm, str *hadd) return sr_kemi_hdr_append(msg, hadd); } +/** + * + */ +static int sr_kemi_hdr_rminsert(sip_msg_t *msg, str *hrm, str *hadd) +{ + int ret; + + ret = sr_kemi_hdr_remove(msg, hrm); + if(ret<0) { + return ret; + } + return sr_kemi_hdr_insert(msg, hadd); +} + + /** * */ @@ -2108,6 +2123,11 @@ static sr_kemi_t _sr_kemi_hdr[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("hdr"), str_init("rminsert"), + SR_KEMIP_INT, sr_kemi_hdr_rminsert, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("hdr"), str_init("is_present"), SR_KEMIP_INT, sr_kemi_hdr_is_present, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

Question about registrar behaviour
by Lars Olsson 18 Jun '19

18 Jun '19

Hi, I have found a behaviour in the registrar module that I do have a question about. Is the current behaviour correct and wanted? Using the save() method in the script I see the following: * Processing a register request for a user gives return code 1 ( or 2 ) * Processing a unregister request (expires=0) for registered user gives return code 3 * Processing a unregister request (expires=0) for a user which is NOT registered gives return code 1. Why? What is the reason behind this? No database entry is added which is expected. Test performed on 5.1.4, using DB mode 3. Cheers, Lars

1 0

Info: Kamailio.org - Infrastructure Maintenance - June 18, 2019
by Daniel-Constantin Mierla 18 Jun '19

18 Jun '19

The infrastructure hosting the main server for Kamailio project will go under scheduled maintenance during June 18, 2019 (tomorrow). The work is expected to start around 7:00am UTC and can last for a few hours. During the maintenance interval, the services related to Kamailio project may become unavailable, among them: * the web server (www.kamailio.org), including the wiki portal (www.kamailio.org/wiki) * the mailing lists and the email contact addresses * the GIT repository mirror git.kamailio.org Once the maintenance work is completed, there will be an update notification sent about it! If there are relevant events to be notified, we are going to publish on our twitter stream: * https://twitter.com/kamailio Also, you can join #kamailio channel on irc.freenode.net in case you want to report some incident related to our infrastructure that you discover while maintenance goes on. For bugs or other issues related to Kamailio code, use the tracker on github.com/kamailio/kamailio – that service is not affected being maintained by GitHub corporation. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:master:92b8d7aa: core: kemi - added KSR.hsr.rmappend(hrm, hadd)
by Daniel-Constantin Mierla 18 Jun '19

18 Jun '19

Module: kamailio Branch: master Commit: 92b8d7aa0bf0cf407ecea1211d7333562657bd5a URL: https://github.com/kamailio/kamailio/commit/92b8d7aa0bf0cf407ecea1211d73335… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-18T09:18:01+02:00 core: kemi - added KSR.hsr.rmappend(hrm, hadd) - helper function to remove and append headers in a single operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/92b8d7aa0bf0cf407ecea1211d73335… Patch: https://github.com/kamailio/kamailio/commit/92b8d7aa0bf0cf407ecea1211d73335… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f8c490211d..d95a0a3cea 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1956,6 +1956,20 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) return 1; } +/** + * + */ +static int sr_kemi_hdr_rmappend(sip_msg_t *msg, str *hrm, str *hadd) +{ + int ret; + + ret = sr_kemi_hdr_remove(msg, hrm); + if(ret<0) { + return ret; + } + return sr_kemi_hdr_append(msg, hadd); +} + /** * */ @@ -2089,6 +2103,11 @@ static sr_kemi_t _sr_kemi_hdr[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("hdr"), str_init("rmappend"), + SR_KEMIP_INT, sr_kemi_hdr_rmappend, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("hdr"), str_init("is_present"), SR_KEMIP_INT, sr_kemi_hdr_is_present, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

Adding new fields in pcscf.location table
by Александър Йосифов 14 Jun '19

14 Jun '19

Hello, What is the procedure for adding new fields in some DB table? In particular, I am working under a feature for multiple tcp connections for IPSEC in P-CSCF and for this purpose new fields are needed to store pcscf client and server ports for each registered contact. The new fields 'port_pc', 'port_ps', 't_port_pc' and 't_port_ps' should be added in pcscf.location table. Thank you for your help! -- Best Regards, Aleksandar Yosifov

1 0

git:master:955e8a54: kamctl: usrloc command to delete older expired records from database table
by Daniel-Constantin Mierla 14 Jun '19

14 Jun '19

Module: kamailio Branch: master Commit: 955e8a5412490020b719f7f57d0a068916bcf8e5 URL: https://github.com/kamailio/kamailio/commit/955e8a5412490020b719f7f57d0a068… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-14T13:06:32+02:00 kamctl: usrloc command to delete older expired records from database table - kamctl ul dbclean [<secs>] - if secs parameter is not given, the value 3600 is used --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.ctlbase --- Diff: https://github.com/kamailio/kamailio/commit/955e8a5412490020b719f7f57d0a068… Patch: https://github.com/kamailio/kamailio/commit/955e8a5412490020b719f7f57d0a068… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a5f51803d8..cc92e0eba6 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2717,6 +2717,18 @@ usrloc() { fi ;; + dbclean) + require_dbengine + KSR_CLEAN_VAL=3600 + if [ $# -eq 2 ] ; then + KSR_CLEAN_VAL=$2 + fi + QUERY="delete from $USRLOC_TABLE where expires < SUBDATE(NOW(), INTERVAL $KSR_CLEAN_VAL SECOND);" + $DBCMD "$QUERY" + + exit $? + ;; + *) usage_usrloc exit 1 diff --git a/utils/kamctl/kamctl.ctlbase b/utils/kamctl/kamctl.ctlbase index 1fc64091af..5215099a3e 100644 --- a/utils/kamctl/kamctl.ctlbase +++ b/utils/kamctl/kamctl.ctlbase @@ -71,6 +71,7 @@ cat <<EOF ul add <username> <uri> ............... introduce a permanent usrloc entry ul add <username> <uri> <expires> ..... introduce a temporary usrloc entry ul add <user> <uri> <expires> <path> .. introduce a temporary usrloc entry + ul dbclean [<secs>].................... remove older expired records from db table EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_usrloc"

1 0

[kamailio/kamailio] gcj is no more let's use openjdk (#1971)
by xevilstar 14 Jun '19

14 Jun '19

I have compiled this app_java module on my debian buster, there's still a memory leak problem to solve : core> [core/route.c:872]: fix_actions(): fixing xlog() May 31 15:15:03 PROXY-TEST-01 /usr/sbin/kamailio[16509]: CRITICAL: <core> [core/mem/q_malloc.c:144]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(55c775816cd0, abcdefed)[0x7f64aa9c9d80:0x7f64aa9c9db8]! Memory allocator was called from xlog: xlog.c:498. Fragment marked by core: db_res.c:88. Exec from core/mem/q_malloc.c:384   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1971 -- Commit Summary -- * gcj is no more let's use openjdk -- File Changes -- M src/modules/app_java/Makefile (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1971.patch https://github.com/kamailio/kamailio/pull/1971.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/1971

2 3

[kamailio/kamailio] Jansson Module (#1978)
by nicoonline 14 Jun '19

14 Jun '19

Hello, is there a way to add Jansson module for Centos 6 packages ? -- 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/1978

3 21

git:5.1:c5ee9015: pkg/kamailio/centos: Removed not updated packaging files
by Sergey Safarov 14 Jun '19

14 Jun '19

Module: kamailio Branch: 5.1 Commit: c5ee9015af545179ac43fe930991b96a5e495272 URL: https://github.com/kamailio/kamailio/commit/c5ee9015af545179ac43fe930991b96… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T02:34:10+03:00 pkg/kamailio/centos: Removed not updated packaging files (cherry picked from commit 8a274cb474799428b4ec838da53000fedd16abd8) --- Removed: pkg/kamailio/centos/6/README Removed: pkg/kamailio/centos/6/kamailio.init Removed: pkg/kamailio/centos/6/kamailio.spec Removed: pkg/kamailio/centos/6/kamailio.sysconfig Removed: pkg/kamailio/centos/7/README Removed: pkg/kamailio/centos/7/kamailio.init Removed: pkg/kamailio/centos/7/kamailio.service Removed: pkg/kamailio/centos/7/kamailio.spec Removed: pkg/kamailio/centos/7/kamailio.sysconfig Removed: pkg/kamailio/centos/7/kamailio.tmpfiles --- Diff: https://github.com/kamailio/kamailio/commit/c5ee9015af545179ac43fe930991b96… Patch: https://github.com/kamailio/kamailio/commit/c5ee9015af545179ac43fe930991b96…

1 0

git:5.1:c03ba1f1: pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci]
by Sergey Safarov 14 Jun '19

14 Jun '19

Module: kamailio Branch: 5.1 Commit: c03ba1f14f74b94d2ced1c79a8b44645ec636563 URL: https://github.com/kamailio/kamailio/commit/c03ba1f14f74b94d2ced1c79a8b4464… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T12:19:29+03:00 pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci] (cherry picked from commit a54b36e2533a71d8e38c03b497b470110a1e33fb) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c03ba1f14f74b94d2ced1c79a8b4464… Patch: https://github.com/kamailio/kamailio/commit/c03ba1f14f74b94d2ced1c79a8b4464… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8803cffd39..9a7c7ca00e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -74,12 +74,12 @@ %bcond_with cnxcc %bcond_without dnssec %bcond_without geoip -%bcond_with http_async_client +%bcond_without http_async_client %bcond_without ims -%bcond_with jansson -%bcond_with json +%bcond_without jansson +%bcond_without json %bcond_without lua -%bcond_with kazoo +%bcond_without kazoo %bcond_without memcached %bcond_with mongodb %bcond_without perl @@ -418,8 +418,14 @@ Compressed body (SIP and HTTP) handling for kamailio. %package http_async_client Summary: Async HTTP client module for Kamailio Group: System Environment/Daemons -Requires: libevent, kamailio = %ver -BuildRequires: libevent-devel +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libcurl4 BuildRequires: libcurl-devel @@ -464,7 +470,14 @@ IMS modules and extensions module for Kamailio. %package jansson Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: System Environment/Daemons -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -482,8 +495,14 @@ JSON string handling and RPC modules for Kamailio using JANSSON library. %package json Summary: JSON string handling and RPC modules for Kamailio Group: System Environment/Daemons -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjson-c-devel @@ -501,8 +520,15 @@ JSON string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons -Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %description kazoo Kazoo module for Kamailio.

1 0

git:5.2:dcce685a: pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci]
by Sergey Safarov 14 Jun '19

14 Jun '19

Module: kamailio Branch: 5.2 Commit: dcce685ab41097dc77fad50c414a66e634db72b9 URL: https://github.com/kamailio/kamailio/commit/dcce685ab41097dc77fad50c414a66e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T12:17:27+03:00 pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci] (cherry picked from commit a54b36e2533a71d8e38c03b497b470110a1e33fb) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/dcce685ab41097dc77fad50c414a66e… Patch: https://github.com/kamailio/kamailio/commit/dcce685ab41097dc77fad50c414a66e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 1890646357..5a801d389c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -108,12 +108,12 @@ %bcond_with cnxcc %bcond_without dnssec %bcond_without geoip -%bcond_with http_async_client +%bcond_without http_async_client %bcond_without ims -%bcond_with jansson -%bcond_with json +%bcond_without jansson +%bcond_without json %bcond_without lua -%bcond_with kazoo +%bcond_without kazoo %bcond_without memcached %bcond_with mongodb %bcond_without perl @@ -311,8 +311,14 @@ like Asterisk™, FreeSWITCH™ or SEMS. %package acc_json Summary: Account transaction information in a JSON dictionary Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjansson BuildRequires: libjansson-devel @@ -488,8 +494,14 @@ Compressed body (SIP and HTTP) handling for kamailio. %package http_async_client Summary: Async HTTP client module for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver -BuildRequires: libevent-devel +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libcurl4 BuildRequires: libcurl-devel @@ -534,8 +546,14 @@ IMS modules and extensions module for Kamailio. %package jansson Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -553,8 +571,14 @@ JSON string handling and RPC modules for Kamailio using JANSSON library. %package json Summary: JSON string handling and RPC modules for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjson-c-devel @@ -572,8 +596,15 @@ JSON string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: %{PKGGROUP} -Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %description kazoo Kazoo module for Kamailio.

1 0

git:master:a54b36e2: pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci]
by Sergey Safarov 14 Jun '19

14 Jun '19

Module: kamailio Branch: master Commit: a54b36e2533a71d8e38c03b497b470110a1e33fb URL: https://github.com/kamailio/kamailio/commit/a54b36e2533a71d8e38c03b497b4701… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-14T12:16:27+03:00 pkg/kamailio/obs: Updated libevent2 deps for CentOS 6 dist [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a54b36e2533a71d8e38c03b497b4701… Patch: https://github.com/kamailio/kamailio/commit/a54b36e2533a71d8e38c03b497b4701… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 064e30aaba..8fd4254eb7 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -108,12 +108,12 @@ %bcond_with cnxcc %bcond_without dnssec %bcond_without geoip -%bcond_with http_async_client +%bcond_without http_async_client %bcond_without ims -%bcond_with jansson -%bcond_with json +%bcond_without jansson +%bcond_without json %bcond_without lua -%bcond_with kazoo +%bcond_without kazoo %bcond_without memcached %bcond_with mongodb %bcond_without perl @@ -311,8 +311,14 @@ like Asterisk™, FreeSWITCH™ or SEMS. %package acc_json Summary: Account transaction information in a JSON dictionary Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjansson BuildRequires: libjansson-devel @@ -488,8 +494,14 @@ Compressed body (SIP and HTTP) handling for kamailio. %package http_async_client Summary: Async HTTP client module for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver -BuildRequires: libevent-devel +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libcurl4 BuildRequires: libcurl-devel @@ -534,8 +546,14 @@ IMS modules and extensions module for Kamailio. %package jansson Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -553,8 +571,14 @@ JSON string handling and RPC modules for Kamailio using JANSSON library. %package json Summary: JSON string handling and RPC modules for Kamailio Group: %{PKGGROUP} -Requires: libevent, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent BuildRequires: libevent-devel +%endif %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjson-c-devel @@ -572,8 +596,15 @@ JSON string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: %{PKGGROUP} -Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel +%if 0%{?rhel} == 6 +Requires: libevent2 +BuildRequires: libevent2-devel +%else +Requires: libevent +BuildRequires: libevent-devel +%endif %description kazoo Kazoo module for Kamailio.

1 0

[kamailio/kamailio] [5.2.3][UAC] Via header does not respect "advertise" option of listen parameter (#1973)
by Michael Seifert 14 Jun '19

14 Jun '19

### Description Setting the `advertise` parameter of the `listen` option in `kamailio.cfg` has no effect on the `Via` address sent by the UAC module. I expected the `Via` header to contain the public IP. Instead, the REGISTER requests sent by the UAC module continue to use the private ip: ``` listen=<private ip>:5060 advertise <public ip>:5060 ``` ``` Via: SIP/2.0/UDP <private ip>:5060;branch=z9hG4bK6c7b.fc053184000000000000000000000000.0 ``` This is confusing since the core cookbook recommends against using `advertised_address`. ### Possible Solutions With the `advertised_address` option, the IP in the Via header is set to the public IP address as expected: ``` advertised_address=<public ip>:5060 listen=<private ip>:5060 ``` ``` Via: SIP/2.0/UDP <public ip>:5060;branch=z9hG4bK45ba.c2851fa6000000000000000000000000.0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.3 (x86_64/linux) c36229 flags: STATS: Off, USE_TCP, USE_TLS, 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: c36229 compiled on 13:25:11 Jun 2 2019 with gcc 8.3.0 ``` * **Operating System**:  ``` Linux linux 5.1.5-gentoo #1 SMP PREEMPT Mon May 27 14:42:14 CEST 2019 x86_64 AMD A6-3670 APU with Radeon(tm) HD Graphics AuthenticAMD 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/1973

2 12

git:master:1a3fc004: kemix: functions to get src/rcv ip and port
by Daniel-Constantin Mierla 14 Jun '19

14 Jun '19

Module: kamailio Branch: master Commit: 1a3fc004e27555063a8bc942c946f6d54f84cf45 URL: https://github.com/kamailio/kamailio/commit/1a3fc004e27555063a8bc942c946f6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-14T09:01:37+02:00 kemix: functions to get src/rcv ip and port --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1a3fc004e27555063a8bc942c946f6d… Patch: https://github.com/kamailio/kamailio/commit/1a3fc004e27555063a8bc942c946f6d… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index d3464b9a42..add50f09cb 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -317,6 +317,74 @@ static sr_kemi_xval_t* ki_kx_getw_ua(sip_msg_t *msg) return ki_kx_get_ua_mode(msg, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_srcip(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s.s = ip_addr2a(&msg->rcv.src_ip); + _sr_kemi_kx_xval.v.s.len = strlen(_sr_kemi_kx_xval.v.s.s); + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_srcport(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = 0; + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = (int)msg->rcv.src_port; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvip(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL || msg->rcv.bind_address==NULL + || msg->rcv.bind_address->address_str.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->rcv.bind_address->address_str; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rcvport(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL || msg->rcv.bind_address==NULL) { + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = 0; + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_INT; + _sr_kemi_kx_xval.v.n = (int)msg->rcv.bind_address->port_no; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -387,6 +455,26 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_srcip"), + SR_KEMIP_XVAL, ki_kx_get_srcip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_srcport"), + SR_KEMIP_XVAL, ki_kx_get_srcport, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rcvip"), + SR_KEMIP_XVAL, ki_kx_get_rcvip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rcvport"), + SR_KEMIP_XVAL, ki_kx_get_rcvport, + { SR_KEMIP_NONE, 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

[kamailio/kamailio] Ipsec fix defects (#1982)
by alexyosifov 13 Jun '19

13 Jun '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1982 -- Commit Summary -- * ims_ipsec_pcscf: fixed possible use of uninitialized value in ipsec_forward() * ims_registrar_pcscf: fixed dereferencing null pointer "cb->contacts" in save() -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (4) M src/modules/ims_registrar_pcscf/save.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1982.patch https://github.com/kamailio/kamailio/pull/1982.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/1982

2 1

git:master:3696a59f: ims_registrar_pcscf: fixed dereferencing null pointer "cb->contacts" in save()
by Aleksandar Yosifov 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 3696a59f1c6e0c23aea01ae090ca142e11541d62 URL: https://github.com/kamailio/kamailio/commit/3696a59f1c6e0c23aea01ae090ca142… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-06-13T13:23:31+03:00 ims_registrar_pcscf: fixed dereferencing null pointer "cb->contacts" in save() - removed unnecessary debug message --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/3696a59f1c6e0c23aea01ae090ca142… Patch: https://github.com/kamailio/kamailio/commit/3696a59f1c6e0c23aea01ae090ca142… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index fb701e6af6..61a1d7a001 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -444,12 +444,6 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { cscf_get_p_associated_uri(_m, &public_ids, &num_public_ids, 1); service_routes = cscf_get_service_route(_m, &num_service_routes, 1); - { - struct via_body* vb = cscf_get_ue_via(_m); - LM_DBG("Save contact with AOR(uri) [%.*s], proto %d, port %d\n", - cb->contacts->uri.len, cb->contacts->uri.s, vb->proto, vb->port?vb->port:5060); - } - //update contacts if (!update_contacts(req, _m, _d, cb->star, expires_hdr, public_ids, num_public_ids, service_routes, num_service_routes, 0)) { LM_ERR("failed to update pcontact\n");

1 0

git:master:15066536: Merge pull request #1982 from alexyosifov/ipsec_fix_defects
by GitHub 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 15066536e65314f976328fc4387be2a5b53fe455 URL: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-13T22:05:21+03:00 Merge pull request #1982 from alexyosifov/ipsec_fix_defects --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… Patch: https://github.com/kamailio/kamailio/commit/15066536e65314f976328fc4387be2a… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 576bf56ded..f696ac9e71 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -571,7 +571,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct cell *t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); - goto cleanup; + return ret; } req = t->uas.request; @@ -662,7 +662,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { LM_ERR("Error calling grep_sock_info() for ipsec client port\n"); - return -1; + goto cleanup; } m->force_send_socket = client_sock; diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index fb701e6af6..61a1d7a001 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -444,12 +444,6 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) { cscf_get_p_associated_uri(_m, &public_ids, &num_public_ids, 1); service_routes = cscf_get_service_route(_m, &num_service_routes, 1); - { - struct via_body* vb = cscf_get_ue_via(_m); - LM_DBG("Save contact with AOR(uri) [%.*s], proto %d, port %d\n", - cb->contacts->uri.len, cb->contacts->uri.s, vb->proto, vb->port?vb->port:5060); - } - //update contacts if (!update_contacts(req, _m, _d, cb->star, expires_hdr, public_ids, num_public_ids, service_routes, num_service_routes, 0)) { LM_ERR("failed to update pcontact\n");

1 0

git:master:287d1824: ims_ipsec_pcscf: fixed possible use of uninitialized value in ipsec_forward()
by Aleksandar Yosifov 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 287d182453e2818c17d439ff68ddd363a86ef578 URL: https://github.com/kamailio/kamailio/commit/287d182453e2818c17d439ff68ddd36… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-06-13T13:22:58+03:00 ims_ipsec_pcscf: fixed possible use of uninitialized value in ipsec_forward() - related to calling "*ul.unlock_udomain" --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/287d182453e2818c17d439ff68ddd36… Patch: https://github.com/kamailio/kamailio/commit/287d182453e2818c17d439ff68ddd36… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 576bf56ded..f696ac9e71 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -571,7 +571,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct cell *t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); - goto cleanup; + return ret; } req = t->uas.request; @@ -662,7 +662,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d) struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { LM_ERR("Error calling grep_sock_info() for ipsec client port\n"); - return -1; + goto cleanup; } m->force_send_socket = client_sock;

1 0

[kamailio/kamailio] Ipsec fix defects (#1981)
by alexyosifov 13 Jun '19

13 Jun '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1981 -- Commit Summary -- * ims_registrar_pcscf: fixed possible use of uninitialized value in ipsec_forward() * ims_registrar_pcscf: fixed dereferencing null pointer "cb->contacts" in save() -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (4) M src/modules/ims_registrar_pcscf/save.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1981.patch https://github.com/kamailio/kamailio/pull/1981.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/1981

1 1

[kamailio/kamailio] Ipsec defects (#1980)
by alexyosifov 13 Jun '19

13 Jun '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1980 -- Commit Summary -- * ims_ipsec_pcscf: fix reported defect * ims_registrar_pcscf: fix reported defect -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (4) M src/modules/ims_registrar_pcscf/save.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1980.patch https://github.com/kamailio/kamailio/pull/1980.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/1980

2 2

[kamailio/kamailio] xhttp_prom: module to generate Prometheus metrics. (#1976)
by vhernando 13 Jun '19

13 Jun '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 - [ ] 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  New module to generate Prometheus metrics. It creates user defined metrics and also displays metrics based on Kamailio statistics. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1976 -- Commit Summary -- * xhttp_prom: module to generate Prometheus metrics. -- File Changes -- A src/modules/xhttp_prom/Makefile (9) A src/modules/xhttp_prom/doc/Makefile (4) A src/modules/xhttp_prom/doc/xhttp_prom.xml (41) A src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (728) A src/modules/xhttp_prom/prom.c (280) A src/modules/xhttp_prom/prom.h (56) A src/modules/xhttp_prom/prom_metric.c (1361) A src/modules/xhttp_prom/prom_metric.h (78) A src/modules/xhttp_prom/xhttp_prom.c (2092) A src/modules/xhttp_prom/xhttp_prom.h (74) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1976.patch https://github.com/kamailio/kamailio/pull/1976.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/1976

3 3

git:master:f1142486: Makefile.groups: added xhttp_prom module to extra group
by Daniel-Constantin Mierla 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: f114248615f2ebc5dc4b4eac46e067706eb75c87 URL: https://github.com/kamailio/kamailio/commit/f114248615f2ebc5dc4b4eac46e0677… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-13T11:27:50+02:00 Makefile.groups: added xhttp_prom module to extra group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/f114248615f2ebc5dc4b4eac46e0677… Patch: https://github.com/kamailio/kamailio/commit/f114248615f2ebc5dc4b4eac46e0677… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 229b3fe8d8..4d6236bc02 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -22,7 +22,7 @@ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ - sipjson + sipjson xhttp_prom # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:828df22e: xhttp_prom: imported initial README file
by Daniel-Constantin Mierla 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 828df22ef38a75d960cb8932a2f477ba2179e460 URL: https://github.com/kamailio/kamailio/commit/828df22ef38a75d960cb8932a2f477b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-13T11:28:42+02:00 xhttp_prom: imported initial README file --- Added: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/828df22ef38a75d960cb8932a2f477b… Patch: https://github.com/kamailio/kamailio/commit/828df22ef38a75d960cb8932a2f477b…

1 0

git:master:1c3ab78a: Merge pull request #1976 from kamailio/vhernando/xhttp_prom_branch
by GitHub 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 1c3ab78a6e70a4e2af2c0926e13e71e00ae47459 URL: https://github.com/kamailio/kamailio/commit/1c3ab78a6e70a4e2af2c0926e13e71e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-13T11:26:28+02:00 Merge pull request #1976 from kamailio/vhernando/xhttp_prom_branch xhttp_prom: module to generate Prometheus metrics. --- Added: src/modules/xhttp_prom/Makefile Added: src/modules/xhttp_prom/doc/Makefile Added: src/modules/xhttp_prom/doc/xhttp_prom.xml Added: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml Added: src/modules/xhttp_prom/prom.c Added: src/modules/xhttp_prom/prom.h Added: src/modules/xhttp_prom/prom_metric.c Added: src/modules/xhttp_prom/prom_metric.h Added: src/modules/xhttp_prom/xhttp_prom.c Added: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/1c3ab78a6e70a4e2af2c0926e13e71e… Patch: https://github.com/kamailio/kamailio/commit/1c3ab78a6e70a4e2af2c0926e13e71e…

1 0

git:master:b595e97e: xhttp_prom: module to generate Prometheus metrics.
by Vicente Hernando 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: b595e97e69bfdb3577a70d50812922a7f7ce2d87 URL: https://github.com/kamailio/kamailio/commit/b595e97e69bfdb3577a70d50812922a… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-06-07T15:40:55+02:00 xhttp_prom: module to generate Prometheus metrics. --- Added: src/modules/xhttp_prom/Makefile Added: src/modules/xhttp_prom/doc/Makefile Added: src/modules/xhttp_prom/doc/xhttp_prom.xml Added: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml Added: src/modules/xhttp_prom/prom.c Added: src/modules/xhttp_prom/prom.h Added: src/modules/xhttp_prom/prom_metric.c Added: src/modules/xhttp_prom/prom_metric.h Added: src/modules/xhttp_prom/xhttp_prom.c Added: src/modules/xhttp_prom/xhttp_prom.h --- Diff: https://github.com/kamailio/kamailio/commit/b595e97e69bfdb3577a70d50812922a… Patch: https://github.com/kamailio/kamailio/commit/b595e97e69bfdb3577a70d50812922a…

1 0

git:5.2:bda9d6a2: pkg/kamailio/obs: Updated jansson module dependences
by Sergey Safarov 13 Jun '19

13 Jun '19

Module: kamailio Branch: 5.2 Commit: bda9d6a23a2c2e5f5548f0a57444aeb4137a0bb0 URL: https://github.com/kamailio/kamailio/commit/bda9d6a23a2c2e5f5548f0a57444aeb… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-13T11:53:20+03:00 pkg/kamailio/obs: Updated jansson module dependences (cherry picked from commit 602eacf713a092eb0b4758f243ddd2342d2ee16f) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/bda9d6a23a2c2e5f5548f0a57444aeb… Patch: https://github.com/kamailio/kamailio/commit/bda9d6a23a2c2e5f5548f0a57444aeb… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 3a4cabb0ac..1890646357 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -311,6 +311,8 @@ like Asterisk™, FreeSWITCH™ or SEMS. %package acc_json Summary: Account transaction information in a JSON dictionary Group: %{PKGGROUP} +Requires: libevent, kamailio = %ver +BuildRequires: libevent-devel %if 0%{?suse_version} Requires: libjansson BuildRequires: libjansson-devel @@ -533,6 +535,7 @@ IMS modules and extensions module for Kamailio. Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: %{PKGGROUP} Requires: libevent, kamailio = %ver +BuildRequires: libevent-devel %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -747,6 +750,7 @@ BuildRequires: python3, python3-devel %endif %endif + %description python Python extensions for Kamailio.

1 0

git:master:602eacf7: pkg/kamailio/obs: Updated jansson module dependences
by Sergey Safarov 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 602eacf713a092eb0b4758f243ddd2342d2ee16f URL: https://github.com/kamailio/kamailio/commit/602eacf713a092eb0b4758f243ddd23… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-06-13T11:51:17+03:00 pkg/kamailio/obs: Updated jansson module dependences --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/602eacf713a092eb0b4758f243ddd23… Patch: https://github.com/kamailio/kamailio/commit/602eacf713a092eb0b4758f243ddd23… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 92e328ccba..064e30aaba 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -311,6 +311,8 @@ like Asterisk™, FreeSWITCH™ or SEMS. %package acc_json Summary: Account transaction information in a JSON dictionary Group: %{PKGGROUP} +Requires: libevent, kamailio = %ver +BuildRequires: libevent-devel %if 0%{?suse_version} Requires: libjansson BuildRequires: libjansson-devel @@ -533,6 +535,7 @@ IMS modules and extensions module for Kamailio. Summary: JSON string handling and RPC modules for Kamailio using JANSSON library Group: %{PKGGROUP} Requires: libevent, kamailio = %ver +BuildRequires: libevent-devel %if 0%{?suse_version} Requires: libjson-c2 BuildRequires: libjansson-devel @@ -747,6 +750,7 @@ BuildRequires: python3, python3-devel %endif %endif + %description python Python extensions for Kamailio.

1 0

git:master:6a633ef3: dialog: fixed return type for kemi exports for var rm and is-null
by Daniel-Constantin Mierla 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 6a633ef3dfdee015f3ea8f0b071ffb38a80a69f9 URL: https://github.com/kamailio/kamailio/commit/6a633ef3dfdee015f3ea8f0b071ffb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-13T10:28:37+02:00 dialog: fixed return type for kemi exports for var rm and is-null --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/6a633ef3dfdee015f3ea8f0b071ffb3… Patch: https://github.com/kamailio/kamailio/commit/6a633ef3dfdee015f3ea8f0b071ffb3… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 34d243a3f1..b8b68434b7 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2085,12 +2085,12 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("var_rm"), - SR_KEMIP_XVAL, ki_dlg_var_rm, + SR_KEMIP_INT, ki_dlg_var_rm, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("var_is_null"), - SR_KEMIP_XVAL, ki_dlg_var_is_null, + SR_KEMIP_INT, ki_dlg_var_is_null, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:5f738f19: CONTRIBUTING.md: note that references to names do not belong to commit messages
by Daniel-Constantin Mierla 13 Jun '19

13 Jun '19

Module: kamailio Branch: master Commit: 5f738f19c9ed1f5c40040f788c10bc8fca016e82 URL: https://github.com/kamailio/kamailio/commit/5f738f19c9ed1f5c40040f788c10bc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-13T09:41:36+02:00 CONTRIBUTING.md: note that references to names do not belong to commit messages --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/5f738f19c9ed1f5c40040f788c10bc8… Patch: https://github.com/kamailio/kamailio/commit/5f738f19c9ed1f5c40040f788c10bc8… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index af9c1799fa..d22cbc0ce2 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -137,6 +137,9 @@ dialplan: basic safety for concurrent rpc reload ``` ...: fix for http://private-tracker.lab/1234 ``` + * do not mention any developer name or yourself when fixing an issue introduced + by an old commit done by that developer or you. That commit can be referenced + by hash id. #### Commit Message Examples ####

1 0

Info: ClueCon Weekly - Kamailio Project Updates
by Daniel-Constantin Mierla 12 Jun '19

12 Jun '19

Hello, later today I will join ClueCon Weekly for a discussion about what is new for Kamailio project and the plans for the future. ClueCon Weekly is a web video conference organized by the FreeSwitch project team. They announced recently a revamp of the format, however, I expect that other people can still join live if they want to listen and ask questions, couple of ways to connect being listed at: * https://freeswitch.org/confluence/display/FREESWITCH/ClueCon+Weekly+Confere… If joining live is no longer possible, I will post a link to the recording and if someone has any questions following my presentation, I can answer here. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 1

git:master:6263bf35: pkg/kamailio/deb: version set 5.3.0~dev6 [skip ci]
by Victor Seva 12 Jun '19

12 Jun '19

Module: kamailio Branch: master Commit: 6263bf3535d8f646b07d573a0fe05dd223d5a2bf URL: https://github.com/kamailio/kamailio/commit/6263bf3535d8f646b07d573a0fe05dd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-06-12T09:53:02+02:00 pkg/kamailio/deb: version set 5.3.0~dev6 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog 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/6263bf3535d8f646b07d573a0fe05dd… Patch: https://github.com/kamailio/kamailio/commit/6263bf3535d8f646b07d573a0fe05dd…

1 0

git:master:3af22766: lib/srutils: removed svn ids
by Daniel-Constantin Mierla 12 Jun '19

12 Jun '19

Module: kamailio Branch: master Commit: 3af22766b1554193ef7990dd5d575f876f44732e URL: https://github.com/kamailio/kamailio/commit/3af22766b1554193ef7990dd5d575f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-12T09:18:35+02:00 lib/srutils: removed svn ids --- Modified: src/lib/srutils/sha256.c Modified: src/lib/srutils/sha256.h Modified: src/lib/srutils/shautils.c Modified: src/lib/srutils/shautils.h Modified: src/lib/srutils/tmrec.c Modified: src/lib/srutils/tmrec.h --- Diff: https://github.com/kamailio/kamailio/commit/3af22766b1554193ef7990dd5d575f8… Patch: https://github.com/kamailio/kamailio/commit/3af22766b1554193ef7990dd5d575f8… --- diff --git a/src/lib/srutils/sha256.c b/src/lib/srutils/sha256.c index 2b405511af..a0e23c080e 100644 --- a/src/lib/srutils/sha256.c +++ b/src/lib/srutils/sha256.c @@ -29,7 +29,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $ */ #include <string.h> /* memcpy()/memset() or bcopy()/bzero() */ diff --git a/src/lib/srutils/sha256.h b/src/lib/srutils/sha256.h index 111c8be6c2..760ccc0de6 100644 --- a/src/lib/srutils/sha256.h +++ b/src/lib/srutils/sha256.h @@ -29,7 +29,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $ */ #ifndef __SHA2_H__ diff --git a/src/lib/srutils/shautils.c b/src/lib/srutils/shautils.c index 13bc89f5e9..5fa79527bf 100644 --- a/src/lib/srutils/shautils.c +++ b/src/lib/srutils/shautils.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! @defgroup srutils Various utilities diff --git a/src/lib/srutils/shautils.h b/src/lib/srutils/shautils.h index 1ca8d0789a..aa2d16ad90 100644 --- a/src/lib/srutils/shautils.h +++ b/src/lib/srutils/shautils.h @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! diff --git a/src/lib/srutils/tmrec.c b/src/lib/srutils/tmrec.c index d04e72c36d..6203a4db83 100644 --- a/src/lib/srutils/tmrec.c +++ b/src/lib/srutils/tmrec.c @@ -1,5 +1,4 @@ /* - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of Kamailio, a free SIP server. diff --git a/src/lib/srutils/tmrec.h b/src/lib/srutils/tmrec.h index 7786578a18..be531a83da 100644 --- a/src/lib/srutils/tmrec.h +++ b/src/lib/srutils/tmrec.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server.

1 0

git:master:b4f61648: Makefile.defs: version set to 5.3.0-dev6
by Daniel-Constantin Mierla 12 Jun '19

12 Jun '19

Module: kamailio Branch: master Commit: b4f616485255689ebaffa97a93ff06f9a4d82dcb URL: https://github.com/kamailio/kamailio/commit/b4f616485255689ebaffa97a93ff06f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-12T09:07:14+02:00 Makefile.defs: version set to 5.3.0-dev6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b4f616485255689ebaffa97a93ff06f… Patch: https://github.com/kamailio/kamailio/commit/b4f616485255689ebaffa97a93ff06f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5ee01b4b14..3d66d830dc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Problem with 503
by Salah Uddin Ahmed 12 Jun '19

12 Jun '19

Hello, When using DNS SRV records and 1st destination no response then it try to 2nd destination. If 2nd destination rejected the call with 486 then kamailio(version: 4.1.1) forward this code as 503. In config we use failure_route as, if (t_check_status("408")) { t_reply("503","Service Unavailable"); } Could anyone please explain this scenario? why this 486 translated to 503? Thanks, Salah

1 0

git:master:0dfd5bd1: dialog: kemi functions to remove or test for null vars
by Daniel-Constantin Mierla 11 Jun '19

11 Jun '19

Module: kamailio Branch: master Commit: 0dfd5bd14792353b47ca397f22b3c323fd276b28 URL: https://github.com/kamailio/kamailio/commit/0dfd5bd14792353b47ca397f22b3c32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-11T12:10:53+02:00 dialog: kemi functions to remove or test for null vars --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0dfd5bd14792353b47ca397f22b3c32… Patch: https://github.com/kamailio/kamailio/commit/0dfd5bd14792353b47ca397f22b3c32… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index cb3a80b3b1..34d243a3f1 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1928,6 +1928,37 @@ static sr_kemi_xval_t* ki_dlg_var_getw(sip_msg_t *msg, str *name) return ki_dlg_var_get_mode(msg, name, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static int ki_dlg_var_rm(sip_msg_t *msg, str *name) +{ + dlg_cell_t *dlg; + + dlg = dlg_get_msg_dialog(msg); + set_dlg_variable_unsafe(dlg, name, NULL); + return 1; +} + +/** + * + */ +static int ki_dlg_var_is_null(sip_msg_t *msg, str *name) +{ + dlg_cell_t *dlg; + str *pval; + + dlg = dlg_get_msg_dialog(msg); + if(dlg==NULL) { + return 1; + } + pval = get_dlg_variable(dlg, name); + if(pval==NULL || pval->s==NULL) { + return 1; + } + return -1; +} + /** * */ @@ -2053,6 +2084,16 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialog"), str_init("var_rm"), + SR_KEMIP_XVAL, ki_dlg_var_rm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dialog"), str_init("var_is_null"), + SR_KEMIP_XVAL, ki_dlg_var_is_null, + { SR_KEMIP_STR, 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:7d8ee6fc: dialog: added kemi functions to get/set dialog vars
by Daniel-Constantin Mierla 11 Jun '19

11 Jun '19

Module: kamailio Branch: master Commit: 7d8ee6fc4860b77bd7c9920ea6db6fb2e44bd2b5 URL: https://github.com/kamailio/kamailio/commit/7d8ee6fc4860b77bd7c9920ea6db6fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-11T09:45:01+02:00 dialog: added kemi functions to get/set dialog vars --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/7d8ee6fc4860b77bd7c9920ea6db6fb… Patch: https://github.com/kamailio/kamailio/commit/7d8ee6fc4860b77bd7c9920ea6db6fb… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 497176a760..a28daae1c2 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1854,6 +1854,65 @@ static int w_dlg_db_load_extra(sip_msg_t *msg, char *p1, char *p2) return ki_dlg_db_load_extra(msg); } +/** + * + */ +static int ki_dlg_var_sets(sip_msg_t *msg, str *name, str *val) +{ + dlg_cell_t *dlg; + int ret; + + dlg = dlg_get_msg_dialog(msg); + ret = set_dlg_variable_unsafe(dlg, name, val); + if(dlg) { + dlg_release(dlg); + } + + return (ret==0)?1:ret; +} + +/** + * + */ +static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_dlg_var_get_mode(sip_msg_t *msg, str *name, int rmode) +{ + dlg_cell_t *dlg; + str *pval; + + memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); + + dlg = dlg_get_msg_dialog(msg); + if(dlg==NULL) { + sr_kemi_xval_null(&_sr_kemi_dialog_xval, rmode); + return &_sr_kemi_dialog_xval; + } + pval = get_dlg_variable(dlg, name); + if(pval==NULL || pval->s==NULL) { + sr_kemi_xval_null(&_sr_kemi_dialog_xval, rmode); + goto done; + } + + _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; + _sr_kemi_dialog_xval.v.s = *pval; + +done: + dlg_release(dlg); + return &_sr_kemi_dialog_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_dlg_var_get(sip_msg_t *msg, str *name) +{ + return ki_dlg_var_get_mode(msg, name, SR_KEMI_XVAL_NULL_NONE); +} + /** * */ @@ -1959,6 +2018,16 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialog"), str_init("var_sets"), + SR_KEMIP_INT, ki_dlg_var_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dialog"), str_init("var_get"), + SR_KEMIP_XVAL, ki_dlg_var_get, + { SR_KEMIP_STR, 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:71522702: dialog: exported kemi variants to get empty and print var values
by Daniel-Constantin Mierla 11 Jun '19

11 Jun '19

Module: kamailio Branch: master Commit: 71522702d94c3269ca0bde5f68562036c7908ffd URL: https://github.com/kamailio/kamailio/commit/71522702d94c3269ca0bde5f6856203… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-11T10:39:11+02:00 dialog: exported kemi variants to get empty and print var values --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/71522702d94c3269ca0bde5f6856203… Patch: https://github.com/kamailio/kamailio/commit/71522702d94c3269ca0bde5f6856203… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index a28daae1c2..cb3a80b3b1 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1913,6 +1913,21 @@ static sr_kemi_xval_t* ki_dlg_var_get(sip_msg_t *msg, str *name) return ki_dlg_var_get_mode(msg, name, SR_KEMI_XVAL_NULL_NONE); } +/** + * + */ +static sr_kemi_xval_t* ki_dlg_var_gete(sip_msg_t *msg, str *name) +{ + return ki_dlg_var_get_mode(msg, name, SR_KEMI_XVAL_NULL_EMPTY); +} +/** + * + */ +static sr_kemi_xval_t* ki_dlg_var_getw(sip_msg_t *msg, str *name) +{ + return ki_dlg_var_get_mode(msg, name, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -2028,6 +2043,16 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialog"), str_init("var_gete"), + SR_KEMIP_XVAL, ki_dlg_var_gete, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dialog"), str_init("var_getw"), + SR_KEMIP_XVAL, ki_dlg_var_getw, + { SR_KEMIP_STR, 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

[kamailio/kamailio] iax2 (#1979)
by EduardShaid 11 Jun '19

11 Jun '19

And what, unless there is no iax2 support ? -- 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/1979

2 1

Some issue in developing module
by Mojtaba 10 Jun '19

10 Jun '19

Hello Everybody, In during developing new module in Kamailio, I encountered with strange thing. I used htable module instead of linked list for save some temporary data during call process.dependencies module to save some information. the skeleton of my code is like thus: if (SIP_REQUEST &METHOD_INVITE) { insert_data_htable("some data"); other_process(msg); }else if(SIP_REPLY){ get_data_htable("some data"); other_process(msg); } In other_process function i have some changes in msg's body with message lump. But after i make first call in kamailio. The kamailio was crashed.What is it's problem? In additional if i comment either insert/get_data_htable function or othet_process function, i dont have this issue. With best regards. -- --Mojtaba Esfandiari.S

1 0

[kamailio/kamailio] [5.2] 200 Ok on Re-invite faces "transaction not found - (branch -1)" when topos module is used (#1975)
by altanai 10 Jun '19

10 Jun '19

[5.2] 200 Ok on Re-invite faces "transaction not found - (branch -1)" when topos module is used ### Description My setup is UAC --> Kamailio SBC --> External PBX When external PBX sends 407 Proxy Autehtication required , the kamailio SBC sends another invite with auth header ( uac module ) and updated cseq ( from dialog modules track_cseq_updates ). To this the external PBX replies with 200 OK . However Kamailio SBC drops this 200 ok with "**t_reply_matching(): failure to match a transaction**" and "**reply_received(): transaction not found - (branch -1)"**. I am using Lua engine but problem is reproducible even with plain config file based routing configuration ### Troubleshooting #### Reproduction Reproducible everytime with uac module working with uac and topos module from v5.1 and above. #### Debugging Data Sample parameters declaration I am using is like ``` modparam("dialog", "dlg_flag", 4) modparam("dialog", "track_cseq_updates", 1) modparam("uac","auth_username_avp","$avp(auser)") modparam("uac","auth_password_avp","$avp(apass)") modparam("uac","auth_realm_avp","$avp(arealm)") modparam("topos", "storage", "redis") modparam("topos", "sanity_checks", 1) modparam("topos_redis", "serverid", "sbc") ``` #### Log Messages Pasting some snippets from Kamailio in deug mode 3 ( mangled the ips and values of some private identities) ``` <To> [31]; uri=[sip:1234567890@<kamailio_pvt_ip_addr>] to body [<sip:1234567890@<kamailio_pvt_ip_addr>>] cseq <CSeq>: <1> <INVITE> content_length=286 found end of header add param: tag=e0090423 SIP Request: method: <INVITE> uri: <sip:1234567890@<kamailio_pvt_ip_addr>> version: <SIP/2.0> <branch> = <z9hG4bK-d8754z-e7184457335bac6a-1---d8754z->; state=6 <rport> = <n/a>; state=17 parse_via(): end of header reached, state=5 parse_headers(): Via found, flags=2 parse_headers(): this is the first via parse_addr_spec(): end of header reached, state=10 get_hdr_field(): <To> [31]; uri=[sip:1234567890@<kamailio_pvt_ip_addr>] get_hdr_field(): to body [<sip:1234567890@<kamailio_pvt_ip_addr>>] get_hdr_field(): cseq <CSeq>: <1> <INVITE> --- received sip message - request - call-id: [OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM] - cseq: [1 INVITE] Jun 3 07:23:05 inbound1 kamailio[3901]: DEBUG: app_lua [app_lua_api.c:666]: app_lua_run_ex(): executing Lua function: [[ksr_request_route]] get_hdr_field(): content_length=286 get_hdr_field(): found end of header add param: tag=e0090423 end of header reached, state=29 internal_get_dlg(): no dialog callid='OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM' found dlg_search(): dialog with callid='OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM' not found build_new_dlg(): new dialog on hash 3407 populate_leg_info(): leg(0) route_set [], contact [sip:8887779996@<uac_pvt_ip_addr>:10376], cseq [1] and bind_addr [udp:<kamilio_pvt_ip_addr>:5060] dialog [dlg_hash.c:894]: link_dlg(): linking dialog [3407:2543] dialog [dlg_hash.c:903]: link_dlg(): ref dlg 0x7f898dd3f4d8 with 1 -> 1 dialog [dlg_cb.c:228]: run_create_callbacks(): dialog=0x7f898dd3f4d8 rr [record.c:918]: add_rr_param(): rr_param_buf=<;did=f4d.fe9> dialog [dlg_profile.c:536]: set_current_dialog(): setting current dialog [3407:2543] dialog [dlg_hash.c:705]: dlg_lookup(): ref dlg 0x7f898dd3f4d8 with 1 -> 2 dialog [dlg_hash.c:707]: dlg_lookup(): dialog id=2543 found on entry 3407 dialog [dlg_handlers.c:1834]: dlg_manage(): dialog created before transaction has_totag(): no totag matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK-d8754z-e7184457335bac6a-1---d8754z-] tm [t_lookup.c:682]: t_lookup_request(): no transaction found SIP Request: method: <INVITE> uri: <sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true> version: <SIP/2.0> Found param type 232, <branch> = <z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0>; state=16 end of header reached, state=5 Via found, flags=2 this is the first via Found param type 234, <received> = <<uac_pub_ip_addr>>; state=6 Found param type 232, <branch> = <z9hG4bK-d8754z-e7184457335bac6a-1---d8754z->; state=6 Found param type 235, <rport> = <18214>; state=16 end of header reached, state=5 Via found, flags=4 this is the second via end of header reached, state=10 <To> [74]; uri=[sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true] to body [<sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>] cseq <CSeq>: <1> <INVITE> content_length=286 found end of header add param: tag=e0090423 end of header reached, state=29 handling outgoing request (0, 0) compacted headers - x_via1: [SIP/2.0/UDP <kamailio_pvt_ip_addr>:5060;branch=z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0](82) - x_via2: [SIP/2.0/UDP <uac_pvt_ip_addr>:10376;received=<uac_pub_ip_addr>;branch=z9hG4bK-d8754z-e7184457335bac6a-1---d8754z-;rport=18214](118) - x_vbranch1: [z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0](46) received on udp socket: (106/100/741) [[SIP/2.0 407 Proxy Authentication Required 0D 0A Via: SIP/2.0/UDP <kamailio_pvt_ip_addr>:5060;branch=z9hG4bK68dc.5ad3]] Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: dialog [dlg_cseq.c:116]: dlg_cseq_prepare_new_msg(): prepare new msg for cseq update operations Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): SIP Reply (status): Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:616]: parse_msg(): version: <SIP/2.0> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:618]: parse_msg(): status: <407> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:620]: parse_msg(): reason: <Proxy Authentication Required> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0>; state=16 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: dialog [dlg_cseq.c:59]: dlg_cseq_prepare_msg(): prepare msg for cseq update operations Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=ZZ2ry8U898rSH Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 <To> [92]; uri=[sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true] to body [<sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>] cseq <CSeq>: <1> <INVITE> content_length=0 found end of header Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: dialog [dlg_cseq.c:87]: dlg_cseq_prepare_msg(): no second via in this message Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): SIP Reply (status): version: <SIP/2.0> status: <407> reason: <Proxy Authentication Required> Found param type 232, <branch> = <z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0>; state=16 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=ZZ2ry8U898rSH Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 <To> [92]; uri=[sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true] to body [<sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>] cseq <CSeq>: <1> <INVITE> content_length=0 found end of header add param: tag=e0090423 end of header reached, state=29 handling incoming response branchi 0 From: <sip:8887779996@<kamailio_pvt_ip_addr>>;tag=e0090423 To: <sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>;tag=ZZ2ry8U898rSH Call-ID: OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM CSeq: 1 INVITE User-Agent: FreeSWITCH-mod_sofia/1.9.0-742-8f1b7e0~64bit Accept: application/sdpAllow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY Supported: timer, path, replaces Allow-Events: talk, hold, conference, refer Proxy-Authenticate: Digest realm="<pbx_pub_ip_addr>", nonce="df67c993-df56-4246-9e79-10fdf0c79cbb", algorithm=MD5, qop="auth" Content-Length: 0 Via: SIP/2.0/UDP <uac_pvt_ip_addr>:10376;received=<uac_pub_ip_addr>;branch=z9hG4bK-d8754z-e7184457335bac6a-1---d8754z-;rport=18214 Record-Route: <sip:<kamailio_pvt_ip_addr>;lr;ftag=e0090423;did=f4d.fe9;nat=yes> P-SR-XBranch: z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0 , branchl 1 , branch_id 0 ... parse_msg(): SIP Request: Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): method: <ACK> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:608]: parse_msg(): uri: <sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): version: <SIP/2.0> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0>; state=16 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=ZZ2ry8U898rSH Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [92]; uri=[sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true] Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>] Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <1> <ACK> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:183]: get_hdr_field(): content_length=0 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=e0090423 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (1, 1) Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: topos [tps_msg.c:380]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP <kamailio_pvt_ip_addr>:5060;branch=z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0](82) - x_via2: [](0) - x_vbranch1: [z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0](46) DEBUG: app_lua [app_lua_sr.c:1649]: sr_kemi_lua_exec_func_ex(): param[1] for: log is str: OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE|failure route: incoming reply received - 407#012 Jun 3 07:23:05 inbound1 kamailio[3902]: ERROR: <core> [core/kemi.c:144]: sr_kemi_core_log(): OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE|failure route: incoming reply received - 407 OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE|Auth Request, send authorization to sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true;timeout=60;username=<username>;password=<pass>;carrierid=55 OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| ksr_auth gateway : sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true;timeout=60;username=<username>;password=<pass>;carrierid=55 OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| ksr_auth creds : <username><pass><pbx_pub_ip_addr> hdr is <Proxy-Authorization: Digest username="<username>", realm="<pbx_pub_ip_addr>", nonce="df67c993-df56-4246-9e79-10fdf0c79cbb", uri="sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true", qop=auth, nc=00000001, cnonce="2931066055", response="65cbbb1afd6b54bcd5f594a336b53b89", algorithm=MD5> OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| uac auth headers formed OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| relay auth req OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| ksr_route_realy OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE|relaying the message with Request-Uri - sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true Destination-Uri - ... OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| req_mtd INVITE1 OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| not is dialog request , goto set carrier info OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| target not set for branch route setting OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE|target not set for failure , setting OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| core.is_trans_target_set onreply_routetrue OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM|udp:<uac_pub_ip_addr>:18214|INVITE| ew branch [1] to sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true has_totag(): no totag parse_msg(): SIP Request: method: <INVITE> uri: <sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true> version: <SIP/2.0> Found param type 232, <branch> = <z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.1>; state=16 end of header reached, state=5 Via found, flags=2 this is the first via Found param type 234, <received> = <<uac_pub_ip_addr>>; state=6 Found param type 232, <branch> = <z9hG4bK-d8754z-e7184457335bac6a-1---d8754z->; state=6 Found param type 235, <rport> = <18214>; state=16 end of header reached, state=5 Via found, flags=4 this is the second via end of header reached, state=10 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [74]; uri=[sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true] Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>] Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <1> <INVITE> Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:183]: get_hdr_field(): content_length=286 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=e0090423 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: topos [tps_msg.c:934]: tps_request_sent(): handling outgoing request (0, 0) Jun 3 07:23:05 inbound1 kamailio[3902]: DEBUG: topos [tps_msg.c:380]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP <kamailio_pvt_ip_addr>:5060;branch=z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.1](82) - x_via2: [SIP/2.0/UDP <uac_pvt_ip_addr>:10376;received=<uac_pub_ip_addr>;branch=z9hG4bK-d8754z-e7184457335bac6a-1---d8754z-;rport=18214](118) - x_vbranch1: [z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.1](46) received on udp socket: (106/100/389) [[SIP/2.0 100 Trying 0D 0A Via: SIP/2.0/UDP <kamailio_pvt_ip_addr>:5060;branch=z9hG4bK68dc.5ad386873790061ba2a8f1d254e]] Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: dialog [dlg_cseq.c:116]: dlg_cseq_prepare_new_msg(): prepare new msg for cseq update operations Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): SIP Reply (status): Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:616]: parse_msg(): version: <SIP/2.0> Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:618]: parse_msg(): status: <100> Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:620]: parse_msg(): reason: <Trying> Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.1.cs1>; state=16 Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: dialog [dlg_cseq.c:59]: dlg_cseq_prepare_msg(): prepare msg for cseq update operations Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [74]; uri=[sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true] Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>] Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <2> <INVITE> Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:183]: get_hdr_field(): content_length=0 Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Jun 3 07:23:05 inbound1 kamailio[3898]: DEBUG: dialog [dlg_cseq.c:87]: dlg_cseq_prepare_msg(): no second via in this message receive_msg(): --- received sip message - reply - call-id: [OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM] - cseq: [2 INVITE] t_reply_matching(): branchi 1.cs1 From: <sip:8887779996@<kamailio_pvt_ip_addr>>;tag=e0090423 To: <sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true> Call-ID: OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM CSeq: 2 INVITE User-Agent: FreeSWITCH-mod_sofia/1.9.0-742-8f1b7e0~64bitContent-Length: 0 , branchl 5 , branch_id 16 **t_reply_matching(): failure to match a transaction** udp_rcv_loop(): received on udp socket: (106/100/1032) [[SIP/2.0 200 OK 0D 0A Via: SIP/2.0/UDP <kamailio_pvt_ip_addr>:5060;branch=z9hG4bK68dc.5ad386873790061ba2a8f1d254ec330]] Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: dialog [dlg_cseq.c:116]: dlg_cseq_prepare_new_msg(): prepare new msg for cseq update operations Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): SIP Reply (status): Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:616]: parse_msg(): version: <SIP/2.0> Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:618]: parse_msg(): status: <200> Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:620]: parse_msg(): reason: <OK> Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.1.cs1>; state=16 Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: dialog [dlg_cseq.c:59]: dlg_cseq_prepare_msg(): prepare msg for cseq update operations Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=08UH03cc7HFcD Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [92]; uri=[sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true] Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>] Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <2> <INVITE> Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:183]: get_hdr_field(): content_length=218 Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Jun 3 07:23:05 inbound1 kamailio[3903]: DEBUG: dialog [dlg_cseq.c:87]: dlg_cseq_prepare_msg(): no second via in this message receive_msg(): --- received sip message - reply - call-id: [OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM] - cseq: [2 INVITE] t_reply_matching(): branchi 1.cs1From: <sip:8887779996@<kamailio_pvt_ip_addr>>;tag=e0090423To: <sip:1231231230@<pbx_pub_ip_addr>:5080;pstn_inbound=true;ignore_userinfo=true>;tag=08UH03cc7HFcDCall-ID: OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjMCSeq: 2 INVITEContact: <sip:1231231230@<pbx_pub_ip_addr>:5080;transport=udp>User-Agent: FreeSWITCH-mod_sofia/1.9.0-742-8f1b7e0~64bitAccept: application/sdpAllow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFYSupported: timer, path, replacesAllow-Events: talk, hold, conference, referContent-Type: application/sdpContent-Disposition: sessionContent-Length: 218Remote-Party-ID: "1231231230" <sip:1231231230@<pbx_pub_ip_addr>>;party=calling;privacy=off;screen=nov=0o=FreeSWITCH 1559530170 1559530171 IN IP4 <pbx_pub_ip_addr>s=FreeSWITCHc=IN IP4 <pbx_pub_ip_addr>t=0 0m=audio 16432 RTP/AVP 0 101a=rtpmap:0 PCMU/8000a=rtpmap:101 telephone-event/8000a=fmtp:101 0-16a=ptime:20 , branchl 5 , branch_id 16 **t_reply_matching(): failure to match a transaction** ``` #### SIP Traffic Not sure if the callflow will appear disfigured below. Primarily what it depicts is that 200 ok from External PBX is dropped by Kamailio and hence kamailio tries to resen the auth based invote multiple times till request timeout occurs ``` |Time | UAC | Kamailio SBC | External PBX | |6.649019 | INVITE SDP (g711U te | |SIP INVITE From: <sip:8887779996@<uac_address> To:<sip:18077881601@<uac_address> Call-ID:OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM CSeq:1 | | ------------------> | | |6.649538 | 100 trying -- your c | |SIP Status 100 trying -- your call is important to us | | <------------------ | | |6.650087 | | INVITE SDP (g711U te |SIP INVITE From: <sip:8887779996@<uac_address> To:<sip:18077881601@<uac_address> CSeq:1 | | | ------------------> | |6.651861 | | 407 Proxy Authentica |SIP Status 407 Proxy Authentication Required | | | <------------------ | |6.652194 | | ACK | |SIP ACK From: <sip:8887779996@<uac_address> To:<sip:18077881601@<uac_address> CSeq:1 | | | ------------------> | |6.653097 | | INVITE SDP (g711U te |SIP INVITE From: <sip:8887779996@<uac_address> To:<sip:18077881601@<uac_address> CSeq:2 | | | ------------------> | |6.673088 | | 100 Trying| |SIP Status 100 Trying | | | <------------------ | |6.676293 | | 200 OK SDP (g711U te |SIP Status 200 OK | | | <------------------ | |7.109339 | | INVITE SDP (g711U te |SIP INVITE From: <sip:8887779996@<uac_address> To:<sip:18077881601@<uac_address> CSeq:2 | | | ------------------> | |7.110230 | | 200 OK SDP (g711U te |SIP Status 200 OK | | | <------------------ | |7.176010 | | 200 OK SDP (g711U te |SIP Status 200 OK | | | <------------------ | |8.109281 | | INVITE SDP (g711U te |SIP INVITE From: <sip:8887779996@<uac_address> To:<sip:18077881601@<uac_address> CSeq:2 | | | ------------------> | |8.110154 | | 200 OK SDP (g711U te |SIP Status 200 OK | | | <------------------ | |8.176005 | | 200 OK SDP (g711U te |SIP Status 200 OK | | | <------------------ | ``` ### Possible Solutions By monitoring redis, I can see that compacting headers by topos and tps storage C file on redis is only happening for the branch id of the first invite , such as ``` "HMSET" "b:x:z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0" "rectime" "1559887868" "a_callid" "OWY3ZTQ3NGM3NTg0N2U3YmE2MTBiOTIxMTRkOGZmNjM" "a_uuid" "atpsh-5cf9fea7-123a-1" "b_uuid" "btpsh-5cf9fea7-123a-1" "direction" "0" "x_via" "SIP/2.0/TCP <uac_pvt_address>:9364;received=<uac_pub_address>;branch=z9hG4bK-d8754z-e7184457335bac6a-1---d8754z-;rport=29567" "x_vbranch" "z9hG4bK68dc.5ad386873790061ba2a8f1d254ec3300.0" "s_rr" "<sip:<kamailio_pub_address>:5060;r2=on;lr;ftag=e0090423;did=508.39e1;nat=yes>,<sip:<kamailio_pub_address>;transport=tcp;r2=on;lr;ftag=e0090423;did=f4d.fe9;nat=yes>" "x_tag" "45a56f2c" "s_method" "INVITE" "s_cseq" "1" "a_contact" "sip:6666666666@<uac_pvt_address>:9364;transport=tcp;alias=<uac_pub_address>~29567~2" "as_contact" "<sip:atpsh-5cf9fea7-123a-1@<kamailio_pub_address>;transport=tcp>" "bs_contact" "<sip:btpsh-5cf9fea7-123a-1@<kamailio_pub_address>:5060>" "a_tag" "45a56f2c" ``` But when the 200 ok for re-invite comes back after authentication, the topos module tries to extract the records for new branch cseq such as "HGETALL" "b:x:5ad386873790061ba2a8f1d254ec3300.1.cs1" which is obviously not set and hence not fetched resulting in transaction not matched error and 200 ok being dropped. If topos storage can HMSET for newer branch id as they are created, I presumme it should fix things up and matching transactions will be ok ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.8 (x86_64/linux) 5534c0 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: 5534c0 compiled on 09:32:39 Jun 7 2019 with gcc 4.8.4 ``` * **Operating System**: ``` My OS is Distributor ID: Ubuntu Description: Ubuntu 14.04.5 LTS Release: 14.04 Codename: trusty ``` -- 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/1975

3 6

[kamailio/kamailio] token parser (#648)
by Dmitri Savolainen 07 Jun '19

07 Jun '19

i try script: ``` $var(some_string) = 'a=foo1;b=foo2;c=foo3,4,5;d=3'; $var(c_value) = $(var(some_string){param.value,c,;}); xlog("L_INFO", "'c' param from '$var(some_string)' is '$var(c_value)'"); ``` in log: > 'c' param from 'a=foo1;b=foo2;c=foo3,4,5;d=3' is 'foo3' Has this behaviour any reason? or it's possible to delete comma from stop list (and use separator parameter for comma-delimited list)? ``` diff --git a/parser/parse_param.c b/parser/parse_param.c index b9e0fbc..e7784c8 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -355,7 +355,6 @@ static inline int parse_token_param(str* _s, str* _r, char separator) case '\t': case '\r': case '\n': - case ',': /* So if you find * any of them * stop iterating ``` --- 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/648

2 5

[kamailio/kamailio] core:server_id is not sufficient enough to store the one that is generated for the ipv6 socket (#1322)
by Surendra Tiwari 07 Jun '19

07 Jun '19

### Description i want to give decimal value of ip address to the server_id but when i am converting the ipv6 address to decimal then its bigger then integer range.so here in kamailio, we need to update every place where ever we are using server id by int64.we need to also make changes to database also by changing the server_id field type. ### Troubleshooting #### Reproduction issue can be reproduced by following steps: first get the server_id by converting the ipv6 ip address to decimal so whenever any endpoint register it will store the -1 into database as integer range is reached to limit. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.4 (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 13:58:01 Nov 20 2017 with unknown ``` * **Operating System**:  ``` root@ip-172-31-0-35:~# uname -a Linux ip-172-31-0-35 4.4.0-1022-aws #31-Ubuntu SMP Tue Jun 27 11:27:55 UTC 2017 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/1322

2 5

git:master:964b50b5: pv: fixed name for avp_sets() kemi export
by Daniel-Constantin Mierla 07 Jun '19

07 Jun '19

Module: kamailio Branch: master Commit: 964b50b5609c91cead9e9b6db10965ad9593e57d URL: https://github.com/kamailio/kamailio/commit/964b50b5609c91cead9e9b6db10965a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-07T11:54:55+02:00 pv: fixed name for avp_sets() kemi export --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/964b50b5609c91cead9e9b6db10965a… Patch: https://github.com/kamailio/kamailio/commit/964b50b5609c91cead9e9b6db10965a… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 42ef30676b..e629d66d10 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1749,7 +1749,7 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("pvx"), str_init("avp_sets"), - SR_KEMIP_INT, ki_avp_seti, + SR_KEMIP_INT, ki_avp_sets, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

[kamailio/kamailio] [Feature Request] Fix Python 2 & 3 build warnings (#1748)
by Anthony Messina 07 Jun '19

07 Jun '19

### app_python (Python2) ``` make[2]: Entering directory '/builddir/build/BUILD/kamailio-5.2.0/src/modules/app_python' gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -Wall -DNAME='"kamailio"' -DVERSION='"5.2.0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 8.2.1"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5002000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/python2.7 -DMOD_NAME='"app_python"' -c apy_kemi_export.c -o apy_kemi_export.o -MMD -MP make[2]: Leaving directory '/builddir/build/BUILD/kamailio-5.2.0/src/modules/app_python' BUILDSTDERR: In file included from /usr/include/python2.7/pyconfig.h:6, BUILDSTDERR: from /usr/include/python2.7/Python.h:8, BUILDSTDERR: from apy_kemi_export.c:30: BUILDSTDERR: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined BUILDSTDERR: #define _POSIX_C_SOURCE 200112L BUILDSTDERR: BUILDSTDERR: In file included from /usr/include/bits/libc-header-start.h:33, BUILDSTDERR: from /usr/include/stdio.h:27, BUILDSTDERR: from apy_kemi_export.c:26: BUILDSTDERR: /usr/include/features.h:265: note: this is the location of the previous definition BUILDSTDERR: # define _POSIX_C_SOURCE 200809L ``` ``` make[2]: Entering directory '/builddir/build/BUILD/kamailio-5.2.0/src/modules/app_python' gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -Wall -DNAME='"kamailio"' -DVERSION='"5.2.0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 8.2.1"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5002000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/python2.7 -DMOD_NAME='"app_python"' -c apy_kemi.c -o apy_kemi.o -MMD -MP make[2]: Leaving directory '/builddir/build/BUILD/kamailio-5.2.0/src/modules/app_python' BUILDSTDERR: In file included from /usr/include/python2.7/pyconfig.h:6, BUILDSTDERR: from /usr/include/python2.7/Python.h:8, BUILDSTDERR: from apy_kemi.c:25: BUILDSTDERR: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined BUILDSTDERR: #define _POSIX_C_SOURCE 200112L BUILDSTDERR: BUILDSTDERR: In file included from /usr/include/bits/libc-header-start.h:33, BUILDSTDERR: from /usr/include/stdio.h:27, BUILDSTDERR: from apy_kemi.c:21: BUILDSTDERR: /usr/include/features.h:265: note: this is the location of the previous definition BUILDSTDERR: # define _POSIX_C_SOURCE 200809L ``` ### app_python3 (Python3) ``` make[2]: Entering directory '/builddir/build/BUILD/kamailio-5.2.0/src/modules/app_python3' gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -Wall -DNAME='"kamailio"' -DVERSION='"5.2.0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 8.2.1"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5002000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/python3.7m -DMOD_NAME='"app_python3"' -c python_support.c -o python_support.o -MMD -MP BUILDSTDERR: python_support.c: In function 'get_class_name': BUILDSTDERR: python_support.c:249:7: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] BUILDSTDERR: name = PyUnicode_AsUTF8(p); BUILDSTDERR: ^ BUILDSTDERR: python_support.c: In function 'get_instance_class_name': BUILDSTDERR: python_support.c:275:7: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] BUILDSTDERR: name = PyUnicode_AsUTF8(p); BUILDSTDERR: ^ ``` ``` gcc -fPIC -DPIC -g -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -Wall -DNAME='"kamailio"' -DVERSION='"5.2.0"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 8.2.1"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5002000 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/include/python3.7m -DMOD_NAME='"app_python3"' -c python_exec.c -o python_exec.o -MMD -MP make[2]: Leaving directory '/builddir/build/BUILD/kamailio-5.2.0/src/modules/app_python3' BUILDSTDERR: app_python3_mod.c: In function 'child_init': BUILDSTDERR: app_python3_mod.c:180:2: warning: 'PyOS_AfterFork' is deprecated [-Wdeprecated-declarations] BUILDSTDERR: PyOS_AfterFork(); BUILDSTDERR: ^~~~~~~~~~~~~~ BUILDSTDERR: In file included from /usr/include/python3.7m/Python.h:125, BUILDSTDERR: from app_python3_mod.c:22: BUILDSTDERR: /usr/include/python3.7m/intrcheck.h:18:18: note: declared here BUILDSTDERR: PyAPI_FUNC(void) PyOS_AfterFork(void) Py_DEPRECATED(3.7); BUILDSTDERR: ^~~~~~~~~~~~~~ ``` -- 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/1748

3 8

git:master:aa320ea3: mqueue: kemi functions to retrieve key and value from mqueue
by Daniel-Constantin Mierla 07 Jun '19

07 Jun '19

Module: kamailio Branch: master Commit: aa320ea32c3c90905483a1fe9cdfb5c48201b78c URL: https://github.com/kamailio/kamailio/commit/aa320ea32c3c90905483a1fe9cdfb5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-07T10:36:45+02:00 mqueue: kemi functions to retrieve key and value from mqueue --- Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aa320ea32c3c90905483a1fe9cdfb5c… Patch: https://github.com/kamailio/kamailio/commit/aa320ea32c3c90905483a1fe9cdfb5c…

1 0

git:master:01c50c84: exec: debug message with number of results for exec_avp()
by Daniel-Constantin Mierla 07 Jun '19

07 Jun '19

Module: kamailio Branch: master Commit: 01c50c84aed717f9de689ab4eec3faec59a498e4 URL: https://github.com/kamailio/kamailio/commit/01c50c84aed717f9de689ab4eec3fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-07T09:55:04+02:00 exec: debug message with number of results for exec_avp() --- Modified: src/modules/exec/exec.c --- Diff: https://github.com/kamailio/kamailio/commit/01c50c84aed717f9de689ab4eec3fae… Patch: https://github.com/kamailio/kamailio/commit/01c50c84aed717f9de689ab4eec3fae… --- diff --git a/src/modules/exec/exec.c b/src/modules/exec/exec.c index 6bcf01f74f..0e809ed8af 100644 --- a/src/modules/exec/exec.c +++ b/src/modules/exec/exec.c @@ -282,8 +282,11 @@ int exec_avp(struct sip_msg *msg, char *cmd, pvname_list_p avpl) i++; } - if(i == 0) + if(i == 0) { LM_DBG("no result from %s\n", cmd); + } else { + LM_DBG("%d results from %s\n", i, cmd); + } /* success */ ret = 1;

1 0

git:master:d19b32f7: pv: exported kemi functions to set root xavp values
by Daniel-Constantin Mierla 07 Jun '19

07 Jun '19

Module: kamailio Branch: master Commit: d19b32f75d3b84a3218163a090087f0c974ae009 URL: https://github.com/kamailio/kamailio/commit/d19b32f75d3b84a3218163a090087f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-07T09:14:43+02:00 pv: exported kemi functions to set root xavp values --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/d19b32f75d3b84a3218163a090087f0… Patch: https://github.com/kamailio/kamailio/commit/d19b32f75d3b84a3218163a090087f0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 8af4af59e9..42ef30676b 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -899,6 +899,40 @@ static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname) return ki_xavp_params_implode(msg, &sxname, (str*)pvname); } +/** + * + */ +static int ki_xavp_seti(sip_msg_t *msg, str *rname, int ival) +{ + sr_xavp_t *xavp = NULL; + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_INT; + xval.v.i = ival; + + xavp = xavp_add_value(rname, &xval, NULL); + + return (xavp!=NULL)?1:-1; +} + +/** + * + */ +static int ki_xavp_sets(sip_msg_t *msg, str *rname, str *sval) +{ + sr_xavp_t *xavp = NULL; + sr_xval_t xval; + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = *sval; + + xavp = xavp_add_value(rname, &xval, NULL); + + return (xavp!=NULL)?1:-1; +} + /** * */ @@ -1634,6 +1668,16 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_seti"), + SR_KEMIP_INT, ki_xavp_seti, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_sets"), + SR_KEMIP_INT, ki_xavp_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_get"), SR_KEMIP_XVAL, ki_xavp_get, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:cf0008d8: tm: detect local uac transaction not inserted in the hash table
by Daniel-Constantin Mierla 07 Jun '19

07 Jun '19

Module: kamailio Branch: master Commit: cf0008d843009acc8e40fcad3eceda063b1a358c URL: https://github.com/kamailio/kamailio/commit/cf0008d843009acc8e40fcad3eceda0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-07T08:48:34+02:00 tm: detect local uac transaction not inserted in the hash table --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/cf0008d843009acc8e40fcad3eceda0… Patch: https://github.com/kamailio/kamailio/commit/cf0008d843009acc8e40fcad3eceda0… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 9e67c91fa2..340c011d6e 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -589,7 +589,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, if (is_ack) { free_cell(new_cell); } else { - if(atomic_get_int(&new_cell->ref_count)==0) { + if((new_cell->next_c == 0 && new_cell->prev_c == 0) + || (atomic_get_int(&new_cell->ref_count)==0)) { free_cell(new_cell); } else { UNREF_FREE(new_cell, 0);

1 0

git:master:844a8854: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: 844a8854d52e7cb8056fdff286215f6318fc0122 URL: https://github.com/kamailio/kamailio/commit/844a8854d52e7cb8056fdff286215f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-06-06T12:32:47+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/844a8854d52e7cb8056fdff286215f6… Patch: https://github.com/kamailio/kamailio/commit/844a8854d52e7cb8056fdff286215f6…

1 0

git:master:e42cb58d: pv: docs - updated xavp management functions names
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: e42cb58d3be13c1bfb65ce426c53a2f0ff78af0b URL: https://github.com/kamailio/kamailio/commit/e42cb58d3be13c1bfb65ce426c53a2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T12:09:41+02:00 pv: docs - updated xavp management functions names --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e42cb58d3be13c1bfb65ce426c53a2f… Patch: https://github.com/kamailio/kamailio/commit/e42cb58d3be13c1bfb65ce426c53a2f… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 464d5ac80b..c563f90d6f 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -327,9 +327,9 @@ xavp_params_implode("x", "$var(out)"); </programlisting> </example> </section> - <section id="pv.f.xavp_set_child_ival"> + <section id="pv.f.xavp_child_seti"> <title> - <function moreinfo="none">xavp_set_child_ival(rname, cname, ival)</function> + <function moreinfo="none">xavp_child_seti(rname, cname, ival)</function> </title> <para> Set the value of $xavp(rname=>cname) to integer value ival. @@ -343,19 +343,19 @@ xavp_params_implode("x", "$var(out)"); Function can be used from ANY ROUTE. </para> <example> - <title><function>xavp_set_child_ival</function> usage</title> + <title><function>xavp_child_seti</function> usage</title> <programlisting format="linespecific"> ... $var(n) = 10; -xavp_set_child_ival("x", "y", "$var(n)"); +xavp_child_seti("x", "y", "$var(n)"); # results in: $xavp(x=>y) is 10 ... </programlisting> </example> </section> - <section id="pv.f.xavp_set_child_sval"> + <section id="pv.f.xavp_child_sets"> <title> - <function moreinfo="none">xavp_set_child_sval(rname, cname, sval)</function> + <function moreinfo="none">xavp_child_sets(rname, cname, sval)</function> </title> <para> Set the value of $xavp(rname=>cname) to string value sval. @@ -369,11 +369,11 @@ xavp_set_child_ival("x", "y", "$var(n)"); Function can be used from ANY ROUTE. </para> <example> - <title><function>xavp_set_child_sval</function> usage</title> + <title><function>xavp_child_sets</function> usage</title> <programlisting format="linespecific"> ... $var(n) = 10; -xavp_set_child_sval("x", "y", "Count: $var(n)"); +xavp_child_sets("x", "y", "Count: $var(n)"); # results in: $xavp(x=>y) is "Count: 10" ... </programlisting> @@ -397,16 +397,16 @@ xavp_set_child_sval("x", "y", "Count: $var(n)"); <title><function>xavp_rm</function> usage</title> <programlisting format="linespecific"> ... -xavp_rm_child_sval("x"); +xavp_rm("x"); # same result as: $xavp(x) = $null; ... </programlisting> </example> </section> - <section id="pv.f.xavp_rm_child"> + <section id="pv.f.xavp_child_rm"> <title> - <function moreinfo="none">xavp_rm_child(rname, cname)</function> + <function moreinfo="none">xavp_child_rm(rname, cname)</function> </title> <para> Remove the value of $xavp(rname=>cname). @@ -420,10 +420,10 @@ xavp_rm_child_sval("x"); Function can be used from ANY ROUTE. </para> <example> - <title><function>xavp_rm_child</function> usage</title> + <title><function>xavp_child_rm</function> usage</title> <programlisting format="linespecific"> ... -xavp_rm_child_sval("x", "y"); +xavp_child_rm("x", "y"); # same result as: $xavp(x=>y) = $null; ... </programlisting>

1 0

git:master:15e6a4a9: pv: added kemi functions to test if xavp is null
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: 15e6a4a9548edbae5c553a8c6e59f3ffe0006d4f URL: https://github.com/kamailio/kamailio/commit/15e6a4a9548edbae5c553a8c6e59f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T11:33:14+02:00 pv: added kemi functions to test if xavp is null --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/15e6a4a9548edbae5c553a8c6e59f3f… Patch: https://github.com/kamailio/kamailio/commit/15e6a4a9548edbae5c553a8c6e59f3f… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 0c5288b748..8031a56642 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1061,6 +1061,23 @@ static int w_xavp_rm_child(sip_msg_t *msg, char *prname, char *pcname) return ki_xavp_rm_child(msg, &rname, &cname); } +/** + * + */ +static int ki_xavp_is_null(sip_msg_t *msg, str *rname) +{ + sr_xavp_t *xavp=NULL; + + xavp = xavp_get_by_index(rname, 0, NULL); + if(xavp==NULL) { + return 1; + } + if(xavp->val.type == SR_XTYPE_NULL) { + return 1; + } + return -1; +} + /** * */ @@ -1171,6 +1188,30 @@ static sr_kemi_xval_t* ki_xavp_getw(sip_msg_t *msg, str *rname) return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static int ki_xavp_child_is_null(sip_msg_t *msg, str *rname, str *cname) +{ + sr_xavp_t *xavp=NULL; + + xavp = xavp_get_by_index(rname, 0, NULL); + if(xavp==NULL) { + return 1; + } + if(xavp->val.type != SR_XTYPE_XAVP) { + return 1; + } + xavp = xavp_get_by_index(cname, 0, &xavp->val.v.xavp); + if(xavp==NULL) { + return 1; + } + if(xavp->val.type == SR_XTYPE_NULL) { + return 1; + } + return -1; +} + /** * */ @@ -1637,11 +1678,21 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_is_null"), + SR_KEMIP_INT, ki_xavp_is_null, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_rm_child"), SR_KEMIP_INT, ki_xavp_rm_child, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_child_is_null"), + SR_KEMIP_INT, ki_xavp_child_is_null, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_get"), SR_KEMIP_XVAL, ki_xavp_get, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:a80f6e9c: pv: renamed xavp child management functions
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: a80f6e9caffc80152c1a47a5f19774f919775cec URL: https://github.com/kamailio/kamailio/commit/a80f6e9caffc80152c1a47a5f19774f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T12:05:35+02:00 pv: renamed xavp child management functions - coherent pattern to reflect the operations --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a80f6e9caffc80152c1a47a5f19774f… Patch: https://github.com/kamailio/kamailio/commit/a80f6e9caffc80152c1a47a5f19774f…

1 0

git:master:04cd53eb: pv: added kemi functions to manage avps
by Daniel-Constantin Mierla 06 Jun '19

06 Jun '19

Module: kamailio Branch: master Commit: 04cd53eb9dec6079082a552f58f351f80bfc58dc URL: https://github.com/kamailio/kamailio/commit/04cd53eb9dec6079082a552f58f351f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-06T11:09:12+02:00 pv: added kemi functions to manage avps --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/04cd53eb9dec6079082a552f58f351f… Patch: https://github.com/kamailio/kamailio/commit/04cd53eb9dec6079082a552f58f351f…

1 0

[kamailio/kamailio] Ipsec tcp (#1974)
by alexyosifov 06 Jun '19

06 Jun '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1974 -- Commit Summary -- * ims_ipsec_pcscf: IPv6 support * ims_usrloc_pcscf: get_pcontact changes for IPv6 -- File Changes -- M src/modules/ims_ipsec_pcscf/README (80) M src/modules/ims_ipsec_pcscf/cmd.c (207) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (21) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (93) M src/modules/ims_ipsec_pcscf/ipsec.c (14) M src/modules/ims_ipsec_pcscf/ipsec.h (2) M src/modules/ims_usrloc_pcscf/udomain.c (128) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1974.patch https://github.com/kamailio/kamailio/pull/1974.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/1974

5 9

git:master:7c773a12: db_postgres: add missing line breaks to log statements
by Henning Westerholt 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 7c773a1278abfc99b7d9310d6faa39589cc2484b URL: https://github.com/kamailio/kamailio/commit/7c773a1278abfc99b7d9310d6faa395… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-06-05T22:26:09+02:00 db_postgres: add missing line breaks to log statements --- Modified: src/modules/db_postgres/km_dbase.c Modified: src/modules/db_postgres/pg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7c773a1278abfc99b7d9310d6faa395… Patch: https://github.com/kamailio/kamailio/commit/7c773a1278abfc99b7d9310d6faa395… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 5725349d25..4ddbe641b9 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -606,7 +606,7 @@ int db_postgres_insert(const db1_con_t *_h, const db_key_t *_k, int tmp = db_postgres_store_result(_h, &_r); if(tmp < 0) { - LM_WARN("unexpected result returned"); + LM_WARN("unexpected result returned\n"); ret = tmp; } @@ -635,7 +635,7 @@ int db_postgres_delete(const db1_con_t *_h, const db_key_t *_k, int tmp = db_postgres_store_result(_h, &_r); if(tmp < 0) { - LM_WARN("unexpected result returned"); + LM_WARN("unexpected result returned\n"); ret = tmp; } @@ -914,7 +914,7 @@ int db_postgres_update(const db1_con_t *_h, const db_key_t *_k, int tmp = db_postgres_store_result(_h, &_r); if(tmp < 0) { - LM_WARN("unexpected result returned"); + LM_WARN("unexpected result returned\n"); ret = tmp; } diff --git a/src/modules/db_postgres/pg_mod.c b/src/modules/db_postgres/pg_mod.c index 7ebee934c4..4fc40ac6e8 100644 --- a/src/modules/db_postgres/pg_mod.c +++ b/src/modules/db_postgres/pg_mod.c @@ -523,7 +523,7 @@ int pg_test(void) int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(!pg_alloc_buffer()) { - LM_ERR("failed too allocate buffer"); + LM_ERR("failed too allocate buffer\n"); return -1; } if(db_api_init() < 0)

1 0

git:master:54840835: kazoo: add missing log line breaks, partially by conversion to mem log helper
by Henning Westerholt 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 5484083570e1e2b21d73a296fc9e1e80633d6c66 URL: https://github.com/kamailio/kamailio/commit/5484083570e1e2b21d73a296fc9e1e8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-06-05T22:46:02+02:00 kazoo: add missing log line breaks, partially by conversion to mem log helper --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/5484083570e1e2b21d73a296fc9e1e8… Patch: https://github.com/kamailio/kamailio/commit/5484083570e1e2b21d73a296fc9e1e8…

1 0

git:master:f2ba8d56: p_usrloc: fix a few more missing line breaks for log statements
by Henning Westerholt 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: f2ba8d560480c591401dd114411510357e7c0cea URL: https://github.com/kamailio/kamailio/commit/f2ba8d560480c591401dd1144115103… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-06-05T22:51:23+02:00 p_usrloc: fix a few more missing line breaks for log statements --- Modified: src/modules/p_usrloc/dlist.c Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_mi.c --- Diff: https://github.com/kamailio/kamailio/commit/f2ba8d560480c591401dd1144115103… Patch: https://github.com/kamailio/kamailio/commit/f2ba8d560480c591401dd1144115103…

1 0

git:master:4dff7404: p_usrloc: add missing linebreak in log statement
by Henning Westerholt 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 4dff740464bb98b8dfe2b8ac9a339cc196b202b5 URL: https://github.com/kamailio/kamailio/commit/4dff740464bb98b8dfe2b8ac9a339cc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-06-05T22:09:14+02:00 p_usrloc: add missing linebreak in log statement --- Modified: src/modules/p_usrloc/ul_db_watch.c --- Diff: https://github.com/kamailio/kamailio/commit/4dff740464bb98b8dfe2b8ac9a339cc… Patch: https://github.com/kamailio/kamailio/commit/4dff740464bb98b8dfe2b8ac9a339cc… --- diff --git a/src/modules/p_usrloc/ul_db_watch.c b/src/modules/p_usrloc/ul_db_watch.c index 3f5edfc57f..ba5ca143d4 100644 --- a/src/modules/p_usrloc/ul_db_watch.c +++ b/src/modules/p_usrloc/ul_db_watch.c @@ -91,7 +91,7 @@ void ul_db_watch_destroy(void){ } void check_dbs(unsigned int ticks, void *param){ - LM_DBG("check availability of databases"); + LM_DBG("check availability of databases\n"); ul_db_watch_list_t * tmp; ul_db_handle_list_t * tmp2, * new_element; int found;

1 0

git:master:09b36467: tm: add missing line breaks in log statements
by Henning Westerholt 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 09b36467b21a742d5d2fa61834190d662e458a4a URL: https://github.com/kamailio/kamailio/commit/09b36467b21a742d5d2fa61834190d6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-06-05T22:24:09+02:00 tm: add missing line breaks in log statements --- Modified: src/modules/tm/dlg.c Modified: src/modules/tm/rpc_uac.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/tm.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/09b36467b21a742d5d2fa61834190d6… Patch: https://github.com/kamailio/kamailio/commit/09b36467b21a742d5d2fa61834190d6…

1 0

git:master:38ff06af: ims_ipsec_pcscf: add back the README file
by Daniel-Constantin Mierla 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 38ff06af407c26b21828485a6da7a5a51bf87d59 URL: https://github.com/kamailio/kamailio/commit/38ff06af407c26b21828485a6da7a5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-05T12:20:03+02:00 ims_ipsec_pcscf: add back the README file - it was removed completely with the merge of PR #1974 --- Added: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/38ff06af407c26b21828485a6da7a5a… Patch: https://github.com/kamailio/kamailio/commit/38ff06af407c26b21828485a6da7a5a…

1 0

git:master:9d33196d: core: kemi - added KSR.hdr.get/e/w(...) functions
by Daniel-Constantin Mierla 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 9d33196d9cd460372bd535298f0b1877ba5d2fc9 URL: https://github.com/kamailio/kamailio/commit/9d33196d9cd460372bd535298f0b187… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-05T12:16:21+02:00 core: kemi - added KSR.hdr.get/e/w(...) functions - return the body of a SIP header, with variants to return empty and null strings --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9d33196d9cd460372bd535298f0b187… Patch: https://github.com/kamailio/kamailio/commit/9d33196d9cd460372bd535298f0b187… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index e4403af9d0..f8c490211d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -49,6 +49,11 @@ str kemi_onsend_route_callback = str_init("ksr_onsend_route"); str kemi_reply_route_callback = str_init("ksr_reply_route"); str kemi_event_route_callback = str_init(""); +/** + * + */ +static sr_kemi_xval_t _sr_kemi_xval = {0}; + /** * */ @@ -1969,6 +1974,92 @@ static int sr_kemi_hdr_append_to_reply(sip_msg_t *msg, str *txt) return 1; } +/** + * + */ +static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int rmode) +{ + char hbuf[256]; + str s; + hdr_field_t shdr; + hdr_field_t *ihdr; + + memset(&_sr_kemi_xval, 0, sizeof(sr_kemi_xval_t)); + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_xval, rmode); + return &_sr_kemi_xval; + } + /* we need to be sure we have parsed all headers */ + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("error parsing headers\n"); + sr_kemi_xval_null(&_sr_kemi_xval, rmode); + return &_sr_kemi_xval; + } + if(hname->len>=252) { + LM_ERR("header name too long\n"); + sr_kemi_xval_null(&_sr_kemi_xval, rmode); + return &_sr_kemi_xval; + } + + memcpy(hbuf, hname->s, hname->len); + hbuf[hname->len] = ':'; + hbuf[hname->len+1] = '\0'; + s.s = hbuf; + s.len = hname->len + 1; + + if (parse_hname2_short(s.s, s.s + s.len, &shdr)==0) { + LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); + sr_kemi_xval_null(&_sr_kemi_xval, rmode); + return &_sr_kemi_xval; + } + for (ihdr=msg->headers; ihdr; ihdr=ihdr->next) { + if (shdr.type!=HDR_OTHER_T && shdr.type!=HDR_ERROR_T) { + /* find by type */ + if (shdr.type==ihdr->type) { + break; + } + } else { + /* find by name */ + if (cmp_hdrname_str(&ihdr->name, hname)==0) { + break; + } + } + } + if(ihdr==NULL) { + sr_kemi_xval_null(&_sr_kemi_xval, rmode); + return &_sr_kemi_xval; + } + + _sr_kemi_xval.vtype = SR_KEMIP_STR; + _sr_kemi_xval.v.s = ihdr->body; + return &_sr_kemi_xval; +} + +/** + * + */ +static sr_kemi_xval_t* sr_kemi_hdr_get(sip_msg_t *msg, str *hname) +{ + return sr_kemi_hdr_get_mode(msg, hname, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* sr_kemi_hdr_gete(sip_msg_t *msg, str *hname) +{ + return sr_kemi_hdr_get_mode(msg, hname, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* sr_kemi_hdr_getw(sip_msg_t *msg, str *hname) +{ + return sr_kemi_hdr_get_mode(msg, hname, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -2008,6 +2099,21 @@ static sr_kemi_t _sr_kemi_hdr[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("hdr"), str_init("get"), + SR_KEMIP_XVAL, sr_kemi_hdr_get, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("hdr"), str_init("gete"), + SR_KEMIP_XVAL, sr_kemi_hdr_gete, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("hdr"), str_init("getw"), + SR_KEMIP_XVAL, sr_kemi_hdr_getw, + { SR_KEMIP_STR, 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 } } }; @@ -2031,11 +2137,6 @@ void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode) } } -/** - * - */ -static sr_kemi_xval_t _sr_kemi_xval = {0}; - /** * */

1 0

git:master:067fbd44: kemix: added kemi functions to return user-agent header body
by Daniel-Constantin Mierla 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 067fbd44e110c0f0b95d43bc65d83a47385601ff URL: https://github.com/kamailio/kamailio/commit/067fbd44e110c0f0b95d43bc65d83a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-05T11:51:24+02:00 kemix: added kemi functions to return user-agent header body - shortcut to improve tests for security in scripts --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/067fbd44e110c0f0b95d43bc65d83a4… Patch: https://github.com/kamailio/kamailio/commit/067fbd44e110c0f0b95d43bc65d83a4… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index ff675442d4..4f69098b8b 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -272,6 +272,51 @@ static sr_kemi_xval_t* ki_kx_get_rhoste(sip_msg_t *msg) return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_ua_mode(sip_msg_t *msg, int rmode) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, rmode); + return &_sr_kemi_kx_xval; + } + if(msg->user_agent==NULL && ((parse_headers(msg, HDR_USERAGENT_F, 0)==-1) + || (msg->user_agent==NULL))) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, rmode); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->user_agent->body; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_ua(sip_msg_t *msg) +{ + return ki_kx_get_ua_mode(msg, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_ua(sip_msg_t *msg) +{ + return ki_kx_get_ua_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_ua(sip_msg_t *msg) +{ + return ki_kx_get_ua_mode(msg, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -327,6 +372,21 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_ua"), + SR_KEMIP_XVAL, ki_kx_get_ua, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_ua"), + SR_KEMIP_XVAL, ki_kx_gete_ua, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_ua"), + SR_KEMIP_XVAL, ki_kx_getw_ua, + { SR_KEMIP_NONE, 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:63cb2650: kemix: renamed functions that return empty and null string for r-uri user and host
by Daniel-Constantin Mierla 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 63cb2650b65caab4326b5fbdf476bc5371eb1d30 URL: https://github.com/kamailio/kamailio/commit/63cb2650b65caab4326b5fbdf476bc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-05T11:51:24+02:00 kemix: renamed functions that return empty and null string for r-uri user and host - set a common pattern with gete and getw in function names --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63cb2650b65caab4326b5fbdf476bc5… Patch: https://github.com/kamailio/kamailio/commit/63cb2650b65caab4326b5fbdf476bc5… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 4f69098b8b..d3464b9a42 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -235,7 +235,7 @@ static sr_kemi_xval_t* ki_kx_get_ruser(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_ruserw(sip_msg_t *msg) +static sr_kemi_xval_t* ki_kx_getw_ruser(sip_msg_t *msg) { return ki_kx_get_ruri_attr(msg, 1, SR_KEMI_XVAL_NULL_PRINT); } @@ -243,7 +243,7 @@ static sr_kemi_xval_t* ki_kx_get_ruserw(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_rusere(sip_msg_t *msg) +static sr_kemi_xval_t* ki_kx_gete_ruser(sip_msg_t *msg) { return ki_kx_get_ruri_attr(msg, 1, SR_KEMI_XVAL_NULL_EMPTY); } @@ -259,7 +259,7 @@ static sr_kemi_xval_t* ki_kx_get_rhost(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_rhostw(sip_msg_t *msg) +static sr_kemi_xval_t* ki_kx_getw_rhost(sip_msg_t *msg) { return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_PRINT); } @@ -267,7 +267,7 @@ static sr_kemi_xval_t* ki_kx_get_rhostw(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_rhoste(sip_msg_t *msg) +static sr_kemi_xval_t* ki_kx_gete_rhost(sip_msg_t *msg) { return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); } @@ -347,13 +347,13 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_ruserw"), - SR_KEMIP_XVAL, ki_kx_get_ruserw, + { str_init("kx"), str_init("getw_ruser"), + SR_KEMIP_XVAL, ki_kx_getw_ruser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_rusere"), - SR_KEMIP_XVAL, ki_kx_get_rusere, + { str_init("kx"), str_init("gete_ruser"), + SR_KEMIP_XVAL, ki_kx_gete_ruser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -362,13 +362,13 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_rhostw"), - SR_KEMIP_XVAL, ki_kx_get_rhostw, + { str_init("kx"), str_init("getw_rhost"), + SR_KEMIP_XVAL, ki_kx_getw_rhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_rhoste"), - SR_KEMIP_XVAL, ki_kx_get_rhoste, + { str_init("kx"), str_init("gete_rhost"), + SR_KEMIP_XVAL, ki_kx_gete_rhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:71e8bf1e: Delete README
by GitHub 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 71e8bf1e99e830800f379ea8ceabbc37d048cdd6 URL: https://github.com/kamailio/kamailio/commit/71e8bf1e99e830800f379ea8ceabbc3… Author: alexyosifov <47529095+alexyosifov(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-05T09:32:58+03:00 Delete README Will be autogenerated. --- Removed: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/71e8bf1e99e830800f379ea8ceabbc3… Patch: https://github.com/kamailio/kamailio/commit/71e8bf1e99e830800f379ea8ceabbc3…

1 0

git:master:711da9dd: Merge pull request #1974 from alexyosifov/ipsec_tcp
by GitHub 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 711da9ddac8e58603558ec5440bcc240d38b0bcb URL: https://github.com/kamailio/kamailio/commit/711da9ddac8e58603558ec5440bcc24… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-05T09:53:50+03:00 Merge pull request #1974 from alexyosifov/ipsec_tcp Ipsec tcp --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h Modified: src/modules/ims_usrloc_pcscf/udomain.c Removed: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/711da9ddac8e58603558ec5440bcc24… Patch: https://github.com/kamailio/kamailio/commit/711da9ddac8e58603558ec5440bcc24…

1 0

git:master:5fe9c7d5: ims_ipsec_pcscf: IPv6 support
by Aleksandar Yosifov 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 5fe9c7d5a82a12f0033785e3ee7fa2d35bc0f3df URL: https://github.com/kamailio/kamailio/commit/5fe9c7d5a82a12f0033785e3ee7fa2d… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-06-04T09:37:38+03:00 ims_ipsec_pcscf: IPv6 support - Set authentication algorithm for SA depending of parsed security-client info from REGISTER request msg. For now, the supported algorithms are md5 and sha1, the default algorithm is sha1. - fill_contact() changes: No significant changes, but added a debug message and code is more readable. - Added support for IPv6. A new parameter IPSEC_LISTEN_ADDR6 is added in pcscf.cfg file that describe IPv6 listen address. A new module parameter ipsec_listen_addr6 is added in kamailio.cfg to pass IPv6 listen address into the ipsec module. - mode_init() changes: Add ipv4 and/or ipv6 listen interfaces depending of configured parameters in pcscf/kamailio config files. - create_ipsec_tunnel() changes: Update temp security parameters for contact. Add 4 SAs and polisies (UE client->Proxy server, Proxy client-> UE server, Proxy server->UE client and UE server->Proxy client). Server->client SAs are used for TCP connections. - destroy_ipsec_tunnel() changes: Remove all SAs and policies. - ipsec_forward() changes: Refactored to use both UDP and TCP protocols. Selects the protocol type, sourse and destination ports based on message type. - Removed unused method convert_ip_address(). Replaced by core methods str2ipbuf() and str2ip6buf(). - changes in README README regenerated via ims_ipsec_pscscf_admin.xml. Added a new parameter for listen IPv6 address. --- Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h --- Diff: https://github.com/kamailio/kamailio/commit/5fe9c7d5a82a12f0033785e3ee7fa2d… Patch: https://github.com/kamailio/kamailio/commit/5fe9c7d5a82a12f0033785e3ee7fa2d…

1 0

git:master:80bea250: ims_usrloc_pcscf: get_pcontact changes for IPv6
by Aleksandar Yosifov 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 80bea2509fb3b7f792e3d12cf309ee55cfcc72d7 URL: https://github.com/kamailio/kamailio/commit/80bea2509fb3b7f792e3d12cf309ee5… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-06-04T09:37:38+03:00 ims_usrloc_pcscf: get_pcontact changes for IPv6 - Sometimes IPv6 address is coming with square brackets and can not be found in userloc database. The search algorithm is not changed, only used methods are changed. --- Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/80bea2509fb3b7f792e3d12cf309ee5… Patch: https://github.com/kamailio/kamailio/commit/80bea2509fb3b7f792e3d12cf309ee5…

1 0

git:master:2ab4cad8: pv: exposed kemi functions for getting xavp empty and print variants
by Daniel-Constantin Mierla 05 Jun '19

05 Jun '19

Module: kamailio Branch: master Commit: 2ab4cad891dd8aeff44f759a9f185207dc174949 URL: https://github.com/kamailio/kamailio/commit/2ab4cad891dd8aeff44f759a9f18520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-05T08:30:49+02:00 pv: exposed kemi functions for getting xavp empty and print variants --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/2ab4cad891dd8aeff44f759a9f18520… Patch: https://github.com/kamailio/kamailio/commit/2ab4cad891dd8aeff44f759a9f18520… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c59e44fbb4..e6cd248d8c 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1155,6 +1155,22 @@ static sr_kemi_xval_t* ki_xavp_get(sip_msg_t *msg, str *rname) return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_NONE); } +/** + * + */ +static sr_kemi_xval_t* ki_xavp_gete(sip_msg_t *msg, str *rname) +{ + return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_xavp_getw(sip_msg_t *msg, str *rname) +{ + return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -1193,6 +1209,24 @@ static sr_kemi_xval_t* ki_xavp_get_child(sip_msg_t *msg, str *rname, str *cname) return ki_xavp_get_child_mode(msg, rname, cname, SR_KEMI_XVAL_NULL_NONE); } + +/** + * + */ +static sr_kemi_xval_t* ki_xavp_gete_child(sip_msg_t *msg, str *rname, str *cname) +{ + return ki_xavp_get_child_mode(msg, rname, cname, SR_KEMI_XVAL_NULL_EMPTY); +} + + +/** + * + */ +static sr_kemi_xval_t* ki_xavp_getw_child(sip_msg_t *msg, str *rname, str *cname) +{ + return ki_xavp_get_child_mode(msg, rname, cname, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -1465,11 +1499,31 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_gete"), + SR_KEMIP_XVAL, ki_xavp_gete, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_getw"), + SR_KEMIP_XVAL, ki_xavp_getw, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_get_child"), SR_KEMIP_XVAL, ki_xavp_get_child, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_gete_child"), + SR_KEMIP_XVAL, ki_xavp_gete_child, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_getw_child"), + SR_KEMIP_XVAL, ki_xavp_getw_child, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("evalx"), SR_KEMIP_INT, ki_pv_evalx, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] [5.2.3][app_python3][KEMI] KSR.registrar.save fails with "domain not found" (#1972)
by Michael Seifert 04 Jun '19

04 Jun '19

### Description When using the Python3 extension for KEMI, `registrar.save` complains about an unknown location: `registrar [api.c:44]: regapi_save(): usrloc domain [location] not found`. Saving the user location works without problems in the core scripting language. ### Troubleshooting #### Reproduction Here is a fairly minimal Python3 script: ```python import KSR as KSR def mod_init(): KSR.info("===== from Python mod init\n") return kamailio() class kamailio: def __init__(self): KSR.info('===== kamailio.__init__\n') def child_init(self, rank): KSR.info('===== kamailio.child_init(%d)\n' % rank) return 0 def ksr_request_route(self, msg): KSR.hdr.remove('Route') if KSR.is_method('INVITE'): KSR.rr.record_route() if not KSR.is_myself_ruri(): KSR.info(f'Relaying to foreign domain: to={msg.RURI} method={msg.Method}\n') return self.relay(msg) if KSR.is_method("REGISTER"): return self.registration(msg) KSR.registrar.lookup("location") KSR.sl.send_reply(100, "Trying") return self.relay(msg) def ksr_reply_route(self, msg): KSR.info(f'Received response: from={msg.src_address} status={msg.Status}\n') return 1 def ksr_onsend_route(self, msg): if msg.Type == 'SIP_REQUEST': KSR.info(f'Sending request: to={msg.dst_address} method={msg.Method}\n') return 1 def registration(self, msg): if not KSR.registrar.save("location", 0x01): KSR.sl.sl_reply_error() return 1 def relay(self, msg): if not KSR.tm.t_relay(): KSR.sl.sl_reply_error() return 1 ``` If this script is used for request routing, the user locations cannot be saved and the above mentioned error is logged. #### Log Messages `4(4360) ERROR: {1 15678 REGISTER 16c11b02-2458-4263-9350-c2f26fafee53} registrar [api.c:44]: regapi_save(): usrloc domain [location] not found` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.3 (x86_64/linux) c36229 flags: STATS: Off, USE_TCP, USE_TLS, 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: c36229 compiled on 13:25:11 Jun 2 2019 with gcc 8.3.0 ``` * **Operating System**: ``` Linux linux 5.1.5-gentoo #1 SMP PREEMPT Mon May 27 14:42:14 CEST 2019 x86_64 AMD A6-3670 APU with Radeon(tm) HD Graphics AuthenticAMD 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/1972

2 3

[kamailio/kamailio] Memory leaks in websocket module (#1892)
by Andrey Deykunov 04 Jun '19

04 Jun '19

### Description We had Kamailio 5.1.4 with websocket module. Unfortunately, our clients don't support websocket keepalive mechanism at all, so I used TCP keepalive instead with the following parameters: ``` tcp_keepalive=yes tcp_keepcnt=6 tcp_keepidle=60 tcp_keepintvl=10 ``` and set up KEEPALIVE_MECHANISM_NONE: `modparam("websocket", "keepalive_mechanism", 0)` During load testing and debugging, when 8k clients sent registrations, it was found out that shared memory was not freed after closing connections (_ws_connection_list_t *wsconn_used_list_ variable in ws_conn.c ). ### Possible Solutions I've decided to add new keepalive mechanism that periodically checks TCP connection related to websocket: ``` enum { KEEPALIVE_MECHANISM_NONE = 0, KEEPALIVE_MECHANISM_PING = 1, KEEPALIVE_MECHANISM_PONG = 2, KEEPALIVE_MECHANISM_TCP_CONN_CHECK = 3 }; ``` and added the line to config: ``` # Enable custom tcp-connection-health based keepalive mechanism (3) # KEEPALIVE_MECHANISM_NONE = 0, # KEEPALIVE_MECHANISM_PING = 1, # KEEPALIVE_MECHANISM_PONG = 2 # KEEPALIVE_MECHANISM_TCP_CONN_CHECK = 3 modparam("websocket", "keepalive_mechanism", 3) ``` Also, I've implemented the mechanism in ws_keepalive function: ``` void ws_keepalive(unsigned int ticks, void *param) { int check_time = (int)time(NULL) - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_t **list = NULL, **list_head = NULL; ws_connection_t *wsc = NULL; /* get an array of pointer to all ws connection */ list_head = wsconn_get_list(); if(!list_head) return; list = list_head; wsc = *list_head; while(wsc && wsc->last_used < check_time) { if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_TCP_CONN_CHECK) { struct tcp_connection *con = tcpconn_get(wsc->id, 0, 0, 0, 0); if(!con) { LM_INFO("tcp connection has been lost\n"); wsc->state = WS_S_CLOSING; } } if(wsc->state == WS_S_CLOSING || wsc->awaiting_pong) { LM_INFO("forcibly closing connection\n"); wsconn_close_now(wsc); } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING) ? OPCODE_PING : OPCODE_PONG; ping_pong(wsc, opcode); } wsc = *(++list); } wsconn_put_list(list_head); } ``` and changed memory allocation method in wsconn_get_list and wsconn_put_list methods from pkg to shm, because, as it turned out during load testing, using pkg_malloc (the C malloc) in this functions may cousing fails under serious loads. These modifications solved the problem. But about a week ago we've started switching to ver. 5.2.1 and found a lot of changes in the websocket module. So, I've added my changes in this commit https://github.com/korizza/kamailio/commit/b3e03d03574ff4ff076005bb8a01d746… . Please take a look. ### Additional Information Adding ws_conn_put_id in this commit https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… did not solve problem with ref counter increasing. -- 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/1892

2 4

[kamailio/kamailio] [5.2.2] sometimes wss doesn't work with received TLS packet in specific condition (#1933)
by BroWater 04 Jun '19

04 Jun '19

### Description I bind a wss port on kamailio for connecting to WebRTC clients, when I received a TLS packet on wss port, it will reply a HTML window to browser who sent the packet , as defined in kamailio.cfg: > \# xhttp event route > event_route[xhttp:request] { > ... > > If(wss port receives a packet) > { > xhttp_reply("200", "OK", "text/html","<html><head><meta http-equiv=\"refresh\" content=\"0;url=$shv(URLToBeOpened)\"></head></html>"); > } > ... > } However , sometimes the HTML window appears stuck in a connecting state, it may be connected or timeout finally. Above problem happens on ARMv4 , but works smoothly on AArch64. I put some related information in Troubleshooting block, hope these may help to figure out why this happens. ### Troubleshooting #### Reproduction Access to https://(IP address of kamailio):(wss port), and stuck in loading page. <Environment settings> [ARMv4] config.mak: CC=/opt/toolchains/sdk51/gcc/bin/arm-marvell-linux-gnueabi-gcc make cfg include_modules="db_sqlite tls websocket" mode=debug ARCH=armv41 CPUTYPE=cortex-a8 LOCALBASE=/mnt/test/kamailio/ [AArch64] config.mak: CC=/opt/toolchains/aarch64-thunderx/bin/aarch64-thunderx-linux-gnu-gcc make cfg include_modules="db_sqlite tls websocket" mode=debug ARCH=aarch64 CPUTYPE=ARMv8 LOCALBASE=/mnt/test/kamailio/ #### Debugging Data **Note: Not the same time as Log Messsages and SIP Traffic** [ARMv4] \# netstat -apn | grep 10443 tcp 0 0 10.100.92.52:10443 0.0.0.0:* LISTEN 32418/kamailio tcp 518 0 10.100.92.52:10443 10.100.92.29:54693 CLOSE_WAIT 32417/kamailio Recv-Q on wss port seems stuck here... [AArch64] \# netstat -apn | grep 10443 tcp 0 0 10.100.92.222:10443 0.0.0.0:* LISTEN 9799/kamailio tcp 0 0 10.100.92.222:10443 10.100.92.29:54817 TIME_WAIT - tcp 0 0 10.100.92.222:10443 10.100.92.29:54818 TIME_WAIT - tcp 0 0 10.100.92.222:10443 10.100.92.29:54820 ESTABLISHED 9798/kamailio #### Log Messages WSS port used here is 10443, 10.100.92.29 is my PC which uses a WebRTC client to connect to kamailio, 10.100.92.222 is kamailio on AAch64, 10.100.92.52 is kamailio on ARMv4. [ARMv4] (which stuck in connecting to https://10.100.92.222:10443 ) (no related log was output...) whole log here: [WSS_TLS_FAIL_10.100.92.52.txt](https://github.com/kamailio/kamailio/files/3… [AArch64] ... DEBUG: tls [tls_locking.c:110]: locking_f(): lock get (9): 2 (ex_data.c:318) DEBUG: tls [tls_locking.c:116]: locking_f(): lock release (10): 2 (ex_data.c:338) DEBUG: tls [tls_locking.c:110]: locking_f(): lock get (5): 2 (ex_data.c:507) DEBUG: tls [tls_locking.c:116]: locking_f(): lock release (6): 2 (ex_data.c:517) DEBUG: tls [tls_domain.c:736]: sr_ssl_ctx_info_callback(): SSL handshake done DEBUG: tls [tls_domain.c:740]: sr_ssl_ctx_info_callback(): SSL disable renegotiation DEBUG: tls [tls_server.c:415]: tls_accept(): TLS accept successful EBUG: tls [tls_server.c:422]: tls_accept(): tls_accept: new connection from 10.100.92.29:53189 using TLSv1/SSLv3 AES256-SHA 256 DEBUG: tls [tls_server.c:425]: tls_accept(): tls_accept: local socket: 10.100.92.222:10443 DEBUG: tls [tls_server.c:436]: tls_accept(): tls_accept: client did not present a certificate DEBUG: <core> [core/tcp_read.c:1492]: tcp_read_req(): read= 0 bytes, parsed=0, state=0, error=1 DEBUG: <core> [core/tcp_read.c:1495]: tcp_read_req(): last char=0x00, parsed msg= ... whole log here: [WSS_TLS_OK_10.100.92.222.txt](https://github.com/kamailio/kamailio/files/31… #### SIP Traffic TLS packets captured image [ARMv4] https://imgur.com/jgnTaLy [AArch64] https://imgur.com/pfpWSXB ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` [ARMv4] /mnt/test/kamailio/sbin# ./kamailio -v version: MyLogo , 5.2.2 (armv41/linux) a82930-dirty flags: STATS: Off, EXTRA_DEBUG, 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, USE_PTHREAD_MUTEX, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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: a82930 -dirty compiled on 15:20:56 Apr 22 2019 with /opt/toolchains/sdk51/gcc/bin/arm-marvell-linux-gnueabi-gcc 4.6.2 [AArch64] /mnt/test/kamailio/sbin# ./kamailio -v version: MyLogo , 5.2.0-dev3 (aarch64/linux) flags: STATS: Off, EXTRA_DEBUG, 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-NOSMP, 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 15:47:47 Feb 6 2018 with /opt/toolchains/aarch64-thunderx/bin/aarch64-thunderx-linux-gnu-gcc 5.3.0 * **Operating System**: [ARMv4] Linux Test 3.2.36-1.00 #1479 SMP Mon Apr 15 10:21:28 CST 2019 armv7l GNU/Linux [AArch64] Linux Test 4.4.13 #1 SMP PREEMPT Fri Mar 24 10:50:44 CST 2017 aarch64 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/1933

3 8

[kamailio/kamailio] Siptrace patch review (#1955)
by Daniel-Constantin Mierla 04 Jun '19

04 Jun '19

### Description A patch was pushed to master branch to enable use of trace_type in the ki_sip_trace_dst_cid_flag(), following the latest additions to the module. It seemed that the trace type was used only for kamailio.cfg functions, because inside ki_sip_trace_dst_cid_flag() the trace_type was parsed and stored in local variable, but it was not used further. I open this issue for review, to be sure something was not overlooked, the commit is: * e8d765610c6926cc6cb4dfa490595214a3680f97 @ionutionita92 - can you have a look and eventually do some tests to be sure it still works as expected for kamailio.cfg functions? There is one more aspect to clarify. The trace info structure is alocated in shared memory, but some of its fields (duplicate uri and correlation id) were set to addresses of function parameters/local variables. The code was relocated and now is at the following lines: * https://github.com/kamailio/kamailio/blob/master/src/modules/siptrace/siptr… Is it safe to do it like this? Are the fields used in this case only in current process and the callbacks use the variant stored in AVP? Speaking of serializing to a string stored in AVP, it might be better to just have a structure compacted with all content in shared memory and stored in an XAVP -- the xavp can store a pointer and also have in its structure the callback to free the pointer.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` Git Master Branch ``` * **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/1955

2 3

git:master:a1264685: pv: kemi functions to get xavp value from root and child lists
by Daniel-Constantin Mierla 04 Jun '19

04 Jun '19

Module: kamailio Branch: master Commit: a1264685bca4b5f96e63d8120de55528ff47d282 URL: https://github.com/kamailio/kamailio/commit/a1264685bca4b5f96e63d8120de5552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-04T13:16:23+02:00 pv: kemi functions to get xavp value from root and child lists --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a1264685bca4b5f96e63d8120de5552… Patch: https://github.com/kamailio/kamailio/commit/a1264685bca4b5f96e63d8120de5552…

1 0

git:master:1e6d7df2: kemix: kemi function to get print and empty variants for r-uri user and host
by Daniel-Constantin Mierla 04 Jun '19

04 Jun '19

Module: kamailio Branch: master Commit: 1e6d7df24f86a92a7425a510c6125d67869a9168 URL: https://github.com/kamailio/kamailio/commit/1e6d7df24f86a92a7425a510c6125d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-04T12:37:06+02:00 kemix: kemi function to get print and empty variants for r-uri user and host --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e6d7df24f86a92a7425a510c6125d6… Patch: https://github.com/kamailio/kamailio/commit/1e6d7df24f86a92a7425a510c6125d6… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 5c61703b31..ff675442d4 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -235,9 +235,17 @@ static sr_kemi_xval_t* ki_kx_get_ruser(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_ruserx(sip_msg_t *msg, int xmode) +static sr_kemi_xval_t* ki_kx_get_ruserw(sip_msg_t *msg) { - return ki_kx_get_ruri_attr(msg, 1, xmode); + return ki_kx_get_ruri_attr(msg, 1, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rusere(sip_msg_t *msg) +{ + return ki_kx_get_ruri_attr(msg, 1, SR_KEMI_XVAL_NULL_EMPTY); } /** @@ -251,9 +259,17 @@ static sr_kemi_xval_t* ki_kx_get_rhost(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_rhostx(sip_msg_t *msg, int xmode) +static sr_kemi_xval_t* ki_kx_get_rhostw(sip_msg_t *msg) { - return ki_kx_get_ruri_attr(msg, 2, xmode); + return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rhoste(sip_msg_t *msg) +{ + return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); } /** @@ -286,9 +302,14 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_ruserx"), - SR_KEMIP_XVAL, ki_kx_get_ruserx, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { str_init("kx"), str_init("get_ruserw"), + SR_KEMIP_XVAL, ki_kx_get_ruserw, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rusere"), + SR_KEMIP_XVAL, ki_kx_get_rusere, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("kx"), str_init("get_rhost"), @@ -296,12 +317,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_rhostx"), - SR_KEMIP_XVAL, ki_kx_get_rhostx, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { str_init("kx"), str_init("get_rhostw"), + SR_KEMIP_XVAL, ki_kx_get_rhostw, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rhoste"), + SR_KEMIP_XVAL, ki_kx_get_rhoste, + { SR_KEMIP_NONE, 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

Info: app_lua_sr module - old Lua sr library
by Daniel-Constantin Mierla 04 Jun '19

04 Jun '19

Hello, several days ago I split the app_lua module, relocating the code related to old Lua sr library to app_lua_sr module, keeping in this way app_lua smaller and focused to the KEMI code. Over the time, app_lua_sr should be deprecated and removed, as we are sure the functions in Lua sr have an equivalent in Lua KSR. Therefore, if you are using in Lua scripts functions from 'sr' library, consider migrating to KSR as soon as possible. The intermediary solution for a quick upgrade to master version (to be release as v5.3.x) is to load app_lua_sr and update some modparams, like: loadmodule "app_lua.so" loadmodule "app_lua_sr.so" modparam("app_lua_sr", "register", "sl") If you find a function from Lua sr not available in Lua KSR, then report it via mailing lists or bug tracker. An article about this topic was published at: * https://www.kamailio.org/w/2019/05/new-module-app_lua_sr/ Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:f23e256a: htable: kemi functions to get the value of an hash table item
by Daniel-Constantin Mierla 04 Jun '19

04 Jun '19

Module: kamailio Branch: master Commit: f23e256acbc10cd24238f71a70b6f1a7bf64826d URL: https://github.com/kamailio/kamailio/commit/f23e256acbc10cd24238f71a70b6f1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-04T08:54:13+02:00 htable: kemi functions to get the value of an hash table item --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f23e256acbc10cd24238f71a70b6f1a… Patch: https://github.com/kamailio/kamailio/commit/f23e256acbc10cd24238f71a70b6f1a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 1320330f35..667653639c 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -917,6 +917,83 @@ int ht_param(modparam_t type, void *val) } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_htable_xval = {0}; + +/* pkg copy */ +static ht_cell_t *_htc_kemi_local=NULL; + +/** + * + */ +static sr_kemi_xval_t* ki_ht_get_mode(sip_msg_t *msg, str *htname, str *itname, + int rmode) +{ + ht_t *ht = NULL; + ht_cell_t *htc=NULL; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + sr_kemi_xval_null(&_sr_kemi_htable_xval, rmode); + return &_sr_kemi_htable_xval; + } + + htc = ht_cell_pkg_copy(ht, itname, _htc_kemi_local); + if(_htc_kemi_local!=htc) { + ht_cell_pkg_free(_htc_kemi_local); + _htc_kemi_local=htc; + } + if(htc==NULL) { + if(ht->flags==PV_VAL_INT) { + _sr_kemi_htable_xval.vtype = SR_KEMIP_INT; + _sr_kemi_htable_xval.v.n = ht->initval.n; + return &_sr_kemi_htable_xval; + } + sr_kemi_xval_null(&_sr_kemi_htable_xval, rmode); + return &_sr_kemi_htable_xval; + } + + if(htc->flags&AVP_VAL_STR) { + _sr_kemi_htable_xval.vtype = SR_KEMIP_STR; + _sr_kemi_htable_xval.v.s = htc->value.s; + return &_sr_kemi_htable_xval; + } + + /* integer */ + _sr_kemi_htable_xval.vtype = SR_KEMIP_INT; + _sr_kemi_htable_xval.v.n = htc->value.n; + return &_sr_kemi_htable_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_ht_get(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_get_mode(msg, htname, itname, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_ht_gete(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_get_mode(msg, htname, itname, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_ht_getw(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_get_mode(msg, htname, itname, SR_KEMI_XVAL_NULL_PRINT); +} + + /** * */ @@ -1694,6 +1771,21 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_get"), + SR_KEMIP_XVAL, ki_ht_get, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_gete"), + SR_KEMIP_XVAL, ki_ht_gete, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_getw"), + SR_KEMIP_XVAL, ki_ht_getw, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("htable"), str_init("sht_sets"), SR_KEMIP_INT, ki_ht_sets, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

1 0

git:master:a3a2b00b: app_sqlang: removed local implementation for KSR.pv sub-module
by Daniel-Constantin Mierla 03 Jun '19

03 Jun '19

Module: kamailio Branch: master Commit: a3a2b00b2acf37bd18067be266769441899aa406 URL: https://github.com/kamailio/kamailio/commit/a3a2b00b2acf37bd18067be26676944… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-03T18:16:21+02:00 app_sqlang: removed local implementation for KSR.pv sub-module - switch to use the one from core --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/a3a2b00b2acf37bd18067be26676944… Patch: https://github.com/kamailio/kamailio/commit/a3a2b00b2acf37bd18067be26676944…

1 0

git:master:fa0107dc: app_ruby: removed local implementation for KSR.pv sub-module
by Daniel-Constantin Mierla 03 Jun '19

03 Jun '19

Module: kamailio Branch: master Commit: fa0107dca53333665434c32fe3d4f2cfcc2082e6 URL: https://github.com/kamailio/kamailio/commit/fa0107dca53333665434c32fe3d4f2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-03T12:25:45+02:00 app_ruby: removed local implementation for KSR.pv sub-module - switch to use the one from core --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/fa0107dca53333665434c32fe3d4f2c… Patch: https://github.com/kamailio/kamailio/commit/fa0107dca53333665434c32fe3d4f2c…

1 0

git:master:3c9c1ca5: app_python3: removed local implementation for KSR.pv sub-module
by Daniel-Constantin Mierla 03 Jun '19

03 Jun '19

Module: kamailio Branch: master Commit: 3c9c1ca5e5672ba4fc00911989f307cbce311538 URL: https://github.com/kamailio/kamailio/commit/3c9c1ca5e5672ba4fc00911989f307c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-03T09:52:33+02:00 app_python3: removed local implementation for KSR.pv sub-module - switch to use the one from core --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3c9c1ca5e5672ba4fc00911989f307c… Patch: https://github.com/kamailio/kamailio/commit/3c9c1ca5e5672ba4fc00911989f307c…

1 0

git:master:84f9c641: app_python: removed unused function to return str variants
by Daniel-Constantin Mierla 03 Jun '19

03 Jun '19

Module: kamailio Branch: master Commit: 84f9c64101395f5b754e2141972cea883f2ae6cc URL: https://github.com/kamailio/kamailio/commit/84f9c64101395f5b754e2141972cea8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-03T09:53:49+02:00 app_python: removed unused function to return str variants --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/84f9c64101395f5b754e2141972cea8… Patch: https://github.com/kamailio/kamailio/commit/84f9c64101395f5b754e2141972cea8… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 3dd0de3153..19d67dbd0a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1824,21 +1824,6 @@ static sr_kemi_t _sr_apy_kemi_test[] = { { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; -/** - * - */ -PyObject *sr_apy_kemi_return_none_mode(int rmode) -{ - if(rmode==1) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else if(rmode==2) { - return sr_apy_kemi_return_str(NULL, "", 0); - } else { - return sr_apy_kemi_return_none(); - } -} - - /** * */

1 0

git:master:07e4a028: app_python: removed local implementation for KSR.pv sub-module
by Daniel-Constantin Mierla 03 Jun '19

03 Jun '19

Module: kamailio Branch: master Commit: 07e4a02830a005bdad2fb5989b623f292a4f8588 URL: https://github.com/kamailio/kamailio/commit/07e4a02830a005bdad2fb5989b623f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-03T09:27:48+02:00 app_python: removed local implementation for KSR.pv sub-module - switch to use the one from core --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/07e4a02830a005bdad2fb5989b623f2… Patch: https://github.com/kamailio/kamailio/commit/07e4a02830a005bdad2fb5989b623f2…

1 0

git:master:897402d0: app_lua/utils/app_lua_ctl: updated include file name
by Daniel-Constantin Mierla 03 Jun '19

03 Jun '19

Module: kamailio Branch: master Commit: 897402d0c30740654c0bbba9d010aca0cb1c22e0 URL: https://github.com/kamailio/kamailio/commit/897402d0c30740654c0bbba9d010aca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-03T09:04:50+02:00 app_lua/utils/app_lua_ctl: updated include file name --- Modified: src/modules/app_lua/utils/app_lua_ctl --- Diff: https://github.com/kamailio/kamailio/commit/897402d0c30740654c0bbba9d010aca… Patch: https://github.com/kamailio/kamailio/commit/897402d0c30740654c0bbba9d010aca… --- diff --git a/src/modules/app_lua/utils/app_lua_ctl b/src/modules/app_lua/utils/app_lua_ctl index a14c160b1d..8b9f01514b 100755 --- a/src/modules/app_lua/utils/app_lua_ctl +++ b/src/modules/app_lua/utils/app_lua_ctl @@ -89,7 +89,7 @@ cat > ../app_lua_kemi_export.c <<EOF #include "../../core/dprint.h" -#include "app_lua_sr.h" +#include "app_lua_api.h" #include "app_lua_kemi_export.h" EOF

1 0

git:5.2:2d2b9936: htable: fix a possible null pointer dereference in dmq startup error case
by Henning Westerholt 31 May '19

31 May '19

Module: kamailio Branch: 5.2 Commit: 2d2b993673d0296e6d9c08ff78b73341e407a37a URL: https://github.com/kamailio/kamailio/commit/2d2b993673d0296e6d9c08ff78b7334… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-05-31T12:57:56+02:00 htable: fix a possible null pointer dereference in dmq startup error case (cherry picked from commit 6f0b67b675dd18dce60fa3e5a4ece063216bbab5) --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/2d2b993673d0296e6d9c08ff78b7334… Patch: https://github.com/kamailio/kamailio/commit/2d2b993673d0296e6d9c08ff78b7334… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 1f27e97684..26c6eb859a 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -588,11 +588,11 @@ int ht_dmq_handle_sync(srjson_doc_t* jdoc) { if(ht==NULL) { LM_WARN("unable to get table %.*s\n", htname.len, (htname.s)?htname.s:""); - } - - if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { - LM_WARN("unable to set cell %.*s in table %.*s\n", - cname.len, cname.s, ht->name.len, ht->name.s); + } else { + if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { + LM_WARN("unable to set cell %.*s in table %.*s\n", + cname.len, cname.s, ht->name.len, ht->name.s); + } } }

1 0

git:master:6f0b67b6: htable: fix a possible null pointer dereference in dmq startup error case
by Henning Westerholt 31 May '19

31 May '19

Module: kamailio Branch: master Commit: 6f0b67b675dd18dce60fa3e5a4ece063216bbab5 URL: https://github.com/kamailio/kamailio/commit/6f0b67b675dd18dce60fa3e5a4ece06… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-05-31T12:42:21+02:00 htable: fix a possible null pointer dereference in dmq startup error case --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/6f0b67b675dd18dce60fa3e5a4ece06… Patch: https://github.com/kamailio/kamailio/commit/6f0b67b675dd18dce60fa3e5a4ece06… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 1f27e97684..26c6eb859a 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -588,11 +588,11 @@ int ht_dmq_handle_sync(srjson_doc_t* jdoc) { if(ht==NULL) { LM_WARN("unable to get table %.*s\n", htname.len, (htname.s)?htname.s:""); - } - - if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { - LM_WARN("unable to set cell %.*s in table %.*s\n", - cname.len, cname.s, ht->name.len, ht->name.s); + } else { + if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { + LM_WARN("unable to set cell %.*s in table %.*s\n", + cname.len, cname.s, ht->name.len, ht->name.s); + } } }

1 0

[kamailio/kamailio] debian official package repository made by kamailio (#1970)
by xevilstar 31 May '19

31 May '19

Since debian excludes some modules from the repo, I'd love to have an official debian repository for buster and stretch with all modules to add to my /etc/apt/sources.list -- 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/1970

2 4

Additional headers on a dispatcher options ping
by Tim Chubb 31 May '19

31 May '19

Hi Is there any mechanism to add a contact and rr headers to the option messages generated by dispatcher? I have a need for both headers to be present otherwise the message gets rejected at the proxy im trying to connect to, the content of the headers in my use case is the from address, so would seem trivial (in so far I know enough c to just about follow what's going on in the code, but wouldn't know where to start to add the functionality) to add using the existing from attribute and a pair of additional modparams to enable this functionality, if its not already possible Currently I have a workaround by generating the pings in asterisk and routing as usual, but would really prefer to not reinvent the wheel and use dispatcher as I do with other trunks and services mainly for consistency and keeping what is essentially a routing issue out of the application stack, as apart from the missing headers dispatchers functionality is exactly what I need. Any suggestions? Tim.

4 4

git:master:01795ee7: Makefile.groups: add new module app_lua_sr to lua group
by Henning Westerholt 30 May '19

30 May '19

Module: kamailio Branch: master Commit: 01795ee7f909519814fc8047480c1c436657c505 URL: https://github.com/kamailio/kamailio/commit/01795ee7f909519814fc8047480c1c4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-05-30T17:29:20+02:00 Makefile.groups: add new module app_lua_sr to lua group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/01795ee7f909519814fc8047480c1c4… Patch: https://github.com/kamailio/kamailio/commit/01795ee7f909519814fc8047480c1c4… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 90f62e0127..229b3fe8d8 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -115,7 +115,7 @@ mod_list_presence=presence presence_conference presence_dialoginfo \ # - modules depending on lua library -mod_list_lua=app_lua +mod_list_lua=app_lua app_lua_sr # - modules depending on perl library mod_list_perldeps=app_perl db_perlvdb

1 0

New Approach Of Relaying RTP (Media) In TURN
by Mojtaba 30 May '19

30 May '19

Hello Everyone, Since last my email about optimization hiops module for kamailio, I am thinking about new approach of relaying RTP (media) in Kamailio. I know there are some modules like RTPEngine, RTPProxy and rtp_media_server in Kamailio. All those modules are in TURN concept of NAT-Traversal in vioce over ip networks. Suppose there is no needed for transcoding in some calls, then those modules get RTP packets from one hand and relay them to another hand. This activities (with no transcoding) could be done by just forwarding RTP-packet in third level of networks,too. Just like as connection tracking have been doing in Linux Kernel. The RTPEngine use Linux Kernel, But it is different from my own idea. Actually i have written another module in Kamailio (light-rtp-engine or lre) for checking this concept. it works great.It increase concurrent of calls rather than other modules in the same situation (no transcoding situation). Now i want to integrate this module with all other RTP-engine module in Kamailio, For example in some situation that the call no need for transcoding, the module runs as upper layer on other RTP modules and active forwarding packet by add new rule in Linux Kernel connection tracking. Now i need to get some idea of working this module with other RTP module in Kamailio. Do you have any idea in regard of this module works as upper layer on other RTP-modules? Do you have better idea of using this new approach of relaying RTP in Kamailio? With Best Regards. -- --Mojtaba Esfandiari.S

2 1

$fU pv Assign New Value Isnt Rewrite old value
by Cléviton Mendes de Araújo 29 May '19

29 May '19

Hi,Kamailio Community Is there a bug when we assign new value to $fU pseudo-variable multi time? My scenery is according below: In a point on config file, let us that $fU value is: 7777. When I do assign: ..... $fU = "5555" + $fU; ### Here $fU = 55557777 ..... In another point, let us that value $sht(htble=>$var(nnnn)) hold is: 44444444. And I do: ..... $fU = $sht(htble=>$var(nnnn)); #### Here, it seems that this is happening $fU = 5555777744444444 ..... When I turn on ngrep analysis, I catch From header: ................. ................. From: "User Name" <sip:5555777744444444@IP-Address> ................. ................. This two assignments are realizing on same route block. So, it seems to be a bug. Best Regards, CMA

3 5

RFC: split out old sr api from app_lua
by Daniel-Constantin Mierla 29 May '19

29 May '19

Hello, I am considering to split the app_lua module in order to move the older style API available under Lua 'sr' module in a dedicated module (like app_lua_sr). Later this module can be obsoleted and removed, once we know that everything there is covered by KEMI KSR Lua module. In this way, we make it more clear that KSR is the preferred API to use as well have the app_lua smaller, for those using only KSR and not needing 'sr' API. Therefore I am starting the discussion to see if anyone has something against or other suggestions. I cc-ed sr-dev to make developers aware, but I think the best place for discussion is sr-users, being related to how Kamailio is used, therefore reply only to sr-users. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 2

git:master:1a2a4fde: modules: readme files regenerated - app_lua ... [skip ci]
by Kamailio Dev 29 May '19

29 May '19

Module: kamailio Branch: master Commit: 1a2a4fdef4d745407c917675782c9e28754a2832 URL: https://github.com/kamailio/kamailio/commit/1a2a4fdef4d745407c917675782c9e2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-29T14:02:05+02:00 modules: readme files regenerated - app_lua ... [skip ci] --- Modified: src/modules/app_lua/README --- Diff: https://github.com/kamailio/kamailio/commit/1a2a4fdef4d745407c917675782c9e2… Patch: https://github.com/kamailio/kamailio/commit/1a2a4fdef4d745407c917675782c9e2…

1 0

git:master:fcbf4421: app_lua_sr: new module split from app_lua to export old Lua sr lib
by Daniel-Constantin Mierla 29 May '19

29 May '19

Module: kamailio Branch: master Commit: fcbf44217b29e2358fcb7c1c23154dae420cd170 URL: https://github.com/kamailio/kamailio/commit/fcbf44217b29e2358fcb7c1c23154da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-29T13:55:26+02:00 app_lua_sr: new module split from app_lua to export old Lua sr lib --- Added: src/modules/app_lua_sr/Makefile Added: src/modules/app_lua_sr/README Added: src/modules/app_lua_sr/app_lua_sr_api.c Added: src/modules/app_lua_sr/app_lua_sr_api.h Added: src/modules/app_lua_sr/app_lua_sr_exp.c Added: src/modules/app_lua_sr/app_lua_sr_exp.h Added: src/modules/app_lua_sr/app_lua_sr_mod.c Added: src/modules/app_lua_sr/doc/Makefile Added: src/modules/app_lua_sr/doc/app_lua_sr.xml Added: src/modules/app_lua_sr/doc/app_lua_sr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fcbf44217b29e2358fcb7c1c23154da… Patch: https://github.com/kamailio/kamailio/commit/fcbf44217b29e2358fcb7c1c23154da…

1 0

git:master:ce100cee: app_lua: docs - removed register modparam, relocated to app_lua_sr
by Daniel-Constantin Mierla 29 May '19

29 May '19

Module: kamailio Branch: master Commit: ce100cee8578510967c7edf3985f31c2b67b35c2 URL: https://github.com/kamailio/kamailio/commit/ce100cee8578510967c7edf3985f31c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-29T13:54:01+02:00 app_lua: docs - removed register modparam, relocated to app_lua_sr --- Modified: src/modules/app_lua/doc/app_lua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ce100cee8578510967c7edf3985f31c… Patch: https://github.com/kamailio/kamailio/commit/ce100cee8578510967c7edf3985f31c…

1 0

git:master:7f2d7aae: app_lua: removed old Lua sr module exports
by Daniel-Constantin Mierla 29 May '19

29 May '19

Module: kamailio Branch: master Commit: 7f2d7aae71758b5b682d5d77d7b7b0187b583de7 URL: https://github.com/kamailio/kamailio/commit/7f2d7aae71758b5b682d5d77d7b7b01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-29T11:18:20+02:00 app_lua: removed old Lua sr module exports - exporting only KSR via KEMI framework - Lua sr module is relocated to app_lua_sr kamailio module, to be obsoleted and removed over the time - export KSR.pv submodule using implementation from core --- Modified: src/modules/app_lua/app_lua_api.c Modified: src/modules/app_lua/app_lua_api.h Modified: src/modules/app_lua/app_lua_kemi_export.c Modified: src/modules/app_lua/app_lua_mod.c Removed: src/modules/app_lua/app_lua_exp.c Removed: src/modules/app_lua/app_lua_exp.h Removed: src/modules/app_lua/app_lua_sr.c Removed: src/modules/app_lua/app_lua_sr.h --- Diff: https://github.com/kamailio/kamailio/commit/7f2d7aae71758b5b682d5d77d7b7b01… Patch: https://github.com/kamailio/kamailio/commit/7f2d7aae71758b5b682d5d77d7b7b01…

1 0

git:master:dbd46b4e: app_lua: exposed inter-module api
by Daniel-Constantin Mierla 29 May '19

29 May '19

Module: kamailio Branch: master Commit: dbd46b4e1d8b37534992e9339b29df308688b34c URL: https://github.com/kamailio/kamailio/commit/dbd46b4e1d8b37534992e9339b29df3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-29T13:32:04+02:00 app_lua: exposed inter-module api --- Added: src/modules/app_lua/modapi.h Modified: src/modules/app_lua/app_lua_api.c Modified: src/modules/app_lua/app_lua_api.h Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dbd46b4e1d8b37534992e9339b29df3… Patch: https://github.com/kamailio/kamailio/commit/dbd46b4e1d8b37534992e9339b29df3…

1 0

[kamailio] dialog: run event_route[dialog:end] in case of dialog termination by … (#246)
by Andrey Utkin 29 May '19

29 May '19

…interface commands You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/246 -- Commit Summary -- * dialog: run event_route[dialog:end] in case of dialog termination by interface commands -- File Changes -- M modules/dialog/dlg_req_within.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/246.patch https://github.com/kamailio/kamailio/pull/246.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/246

3 7

git:master:decfc7ff: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 28 May '19

28 May '19

Module: kamailio Branch: master Commit: decfc7ff92fafe157c1b56201de6c4817e2034d4 URL: https://github.com/kamailio/kamailio/commit/decfc7ff92fafe157c1b56201de6c48… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-28T22:01:49+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/decfc7ff92fafe157c1b56201de6c48… Patch: https://github.com/kamailio/kamailio/commit/decfc7ff92fafe157c1b56201de6c48… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 7ffcc90253..6849bce7f7 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -565,6 +565,10 @@ kamcmd siptrace.status check case of internal timeouts) won't be traced. At the moment kamailio offers no posibility to trace those messages. + Trace_info xavp name is reserved by this module. Any use of xavp with + this name will result in overlapping internal avp used by the module + therefore causing unknown consequences. + Example 1.22. Send relayed ACK message ... onsend_route {

1 0

[kamailio/kamailio] siptrace: use xavps to pass data for the duration of transaction/dialog (#1963)
by Ionut Ionita 28 May '19

28 May '19

Before this data was serialized in order to fit a normal AVP and be passed to DLGCB_CREATED callback. Moreover for transaction tracing data was allocated in current process memory which would have crashed if the reply were to be recieved in a different process. With the current implementation data is allocated in shared memory, all processes having access to it. For dialogs data is passed through xavp to dlgcb created. From there all dialog callbacks are registered and they receive argument the pointer to siptrace info. For transactions the pointer is passed as dialog callback parameter.   #### 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 #1955 #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1963 -- Commit Summary -- * siptrace: use xavps to pass data for the duration of transaction/dialog -- File Changes -- M src/modules/siptrace/siptrace.c (238) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1963.patch https://github.com/kamailio/kamailio/pull/1963.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/1963

3 11

git:master:244eb42c: siptrace: document usage of trace_info xavp to prevent overlapping
by Henning Westerholt 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 244eb42c3bba647582fdc5ef0d61573bd18a5f3d URL: https://github.com/kamailio/kamailio/commit/244eb42c3bba647582fdc5ef0d61573… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-05-28T21:56:25+02:00 siptrace: document usage of trace_info xavp to prevent overlapping --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/244eb42c3bba647582fdc5ef0d61573… Patch: https://github.com/kamailio/kamailio/commit/244eb42c3bba647582fdc5ef0d61573… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index b3cb739130..0ec443ce3a 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -662,6 +662,11 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID"); case of internal timeouts) won't be traced. At the moment kamailio offers no posibility to trace those messages. </para> + <para> + <emphasis>Trace_info</emphasis> xavp name is reserved by this module. + Any use of xavp with this name will result in overlapping internal + avp used by the module therefore causing unknown consequences. + </para> <example> <title>Send relayed ACK message</title> <programlisting format="linespecific">

1 0

git:master:796a12d6: siptrace: use xavps to pass data for the duration of transaction/dialog
by Henning Westerholt 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 796a12d6ef27c01e9c5a9ad36b82833b03b62109 URL: https://github.com/kamailio/kamailio/commit/796a12d6ef27c01e9c5a9ad36b82833… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-05-28T21:56:25+02:00 siptrace: use xavps to pass data for the duration of transaction/dialog Before this data was serialized in order to fit a normal AVP and be passed to DLGCB_CREATED callback. Moreover for transaction tracing data was allocated in current process memory which would have crashed if the reply were to be recieved in a different process. With the current implementation data is allocated in shared memory, all processes having access to it. For dialogs data is passed through xavp to dlgcb created. From there all dialog callbacks are registered and they receive argument the pointer to siptrace info. For transactions the pointer is passed as dialog callback parameter. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/796a12d6ef27c01e9c5a9ad36b82833… Patch: https://github.com/kamailio/kamailio/commit/796a12d6ef27c01e9c5a9ad36b82833…

1 0

git:master:26f68412: siptrace: avoid flooding logs with unnecessary errors on common scenarios
by Henning Westerholt 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 26f68412921323a6c681a14718f0091f42a44167 URL: https://github.com/kamailio/kamailio/commit/26f68412921323a6c681a14718f0091… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-05-28T21:56:25+02:00 siptrace: avoid flooding logs with unnecessary errors on common scenarios --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/26f68412921323a6c681a14718f0091… Patch: https://github.com/kamailio/kamailio/commit/26f68412921323a6c681a14718f0091… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 95753610f7..8fa832a043 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1814,13 +1814,18 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p } if (!(params->req->msg_flags & FL_SIPTRACE)) { - LM_ERR("Trace is off for this request...\n"); + LM_DBG("Trace is off for this request...\n"); return; } xavp = xavp_get(&xavp_trace_info_name_s, NULL); if (!xavp) { - LM_ERR("%.*s xavp not registered\n", xavp_trace_info_name_s.len, + /* this actually happens when only the transaction is traced + * FL_SIPTRACE is set from trace_onreq_out + * but xavp is set only for dialogs so this will avoid + * registering dialog callbacks which is the desired behavior */ + LM_DBG("%.*s xavp not registered! " + "Probably incoming E2E CANCEL!\n", xavp_trace_info_name_s.len, xavp_trace_info_name_s.s); return; }

1 0

[kamailio/kamailio] [Low Priority] Build warning with gcc-9.1.1 (#1965)
by Anthony Messina 28 May '19

28 May '19

Building on Fedora 30 x86_64, the following warning appears: ` BUILDSTDERR: Makefile.defs:1014: You are using an old and unsupported gcc version (9.1.1), compile at your own risk!` -- 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/1965

3 5

Re: [sr-dev] [kamailio/kamailio] Makefile.defs: detect gcc 9.0+ (07209c3)
by sergey-safarov 28 May '19

28 May '19

think i many places missed "," -- 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/commit/07209c3095d8c3ab47108af94c004ce…

1 0

git:master:07209c30: Makefile.defs: detect gcc 9.0+
by Daniel-Constantin Mierla 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 07209c3095d8c3ab47108af94c004ce963012a92 URL: https://github.com/kamailio/kamailio/commit/07209c3095d8c3ab47108af94c004ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-28T14:27:34+02:00 Makefile.defs: detect gcc 9.0+ - reported by GH #1965 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/07209c3095d8c3ab47108af94c004ce… Patch: https://github.com/kamailio/kamailio/commit/07209c3095d8c3ab47108af94c004ce…

1 0

git:master:e91d9562: core: kemi - defines for modes used to return null string
by Daniel-Constantin Mierla 28 May '19

28 May '19

Module: kamailio Branch: master Commit: e91d9562689dc879540d8b04a337dcd016de4a21 URL: https://github.com/kamailio/kamailio/commit/e91d9562689dc879540d8b04a337dcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-28T14:06:19+02:00 core: kemi - defines for modes used to return null string --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/e91d9562689dc879540d8b04a337dcd… Patch: https://github.com/kamailio/kamailio/commit/e91d9562689dc879540d8b04a337dcd… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 037532f96b..e4403af9d0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2018,10 +2018,10 @@ static sr_kemi_t _sr_kemi_hdr[] = { */ void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode) { - if(rmode==1) { + if(rmode==SR_KEMI_XVAL_NULL_PRINT) { xval->vtype = SR_KEMIP_STR; xval->v.s = *pv_get_null_str(); - } else if(rmode==2) { + } else if(rmode==SR_KEMI_XVAL_NULL_EMPTY) { xval->vtype = SR_KEMIP_STR; xval->v.s = *pv_get_empty_str(); } else { @@ -2086,7 +2086,7 @@ static sr_kemi_xval_t* sr_kemi_pv_get_mode(sip_msg_t *msg, str *pvn, int rmode) */ static sr_kemi_xval_t* sr_kemi_pv_get(sip_msg_t *msg, str *pvn) { - return sr_kemi_pv_get_mode(msg, pvn, 0); + return sr_kemi_pv_get_mode(msg, pvn, SR_KEMI_XVAL_NULL_NONE); } /** @@ -2094,7 +2094,7 @@ static sr_kemi_xval_t* sr_kemi_pv_get(sip_msg_t *msg, str *pvn) */ static sr_kemi_xval_t* sr_kemi_pv_getw(sip_msg_t *msg, str *pvn) { - return sr_kemi_pv_get_mode(msg, pvn, 1); + return sr_kemi_pv_get_mode(msg, pvn, SR_KEMI_XVAL_NULL_PRINT); } /** @@ -2102,7 +2102,7 @@ static sr_kemi_xval_t* sr_kemi_pv_getw(sip_msg_t *msg, str *pvn) */ static sr_kemi_xval_t* sr_kemi_pv_gete(sip_msg_t *msg, str *pvn) { - return sr_kemi_pv_get_mode(msg, pvn, 2); + return sr_kemi_pv_get_mode(msg, pvn, SR_KEMI_XVAL_NULL_EMPTY); } /** diff --git a/src/core/kemi.h b/src/core/kemi.h index ef9451b2d5..7824ce2f60 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -204,6 +204,9 @@ int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, sr_kemi_t* sr_kemi_exports_get_pv(void); +#define SR_KEMI_XVAL_NULL_NONE 0 +#define SR_KEMI_XVAL_NULL_PRINT 1 +#define SR_KEMI_XVAL_NULL_EMPTY 2 void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode); #endif

1 0

git:master:78d73877: kemix: functions to return directly user and host from ruri
by Daniel-Constantin Mierla 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 78d73877e1f08ac5ab542fce832653f78a05de93 URL: https://github.com/kamailio/kamailio/commit/78d73877e1f08ac5ab542fce832653f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-28T14:06:19+02:00 kemix: functions to return directly user and host from ruri --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/78d73877e1f08ac5ab542fce832653f… Patch: https://github.com/kamailio/kamailio/commit/78d73877e1f08ac5ab542fce832653f… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 7ed5fe9c98..5c61703b31 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -174,6 +174,88 @@ static sr_kemi_xval_t* ki_kx_get_turi(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_xuri_attr(sip_msg_t *msg, sip_uri_t *puri, + int iattr, int xmode) +{ + if(iattr==1) { + /* username */ + if(puri->user.s==NULL || puri->user.len<=0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = puri->user; + return &_sr_kemi_kx_xval; + } else if(iattr==2) { + /* domain */ + if(puri->host.s==NULL || puri->host.len<=0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = puri->host; + return &_sr_kemi_kx_xval; + } + LM_ERR("unknown attribute id: %d\n", iattr); + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_ruri_attr(sip_msg_t *msg, int iattr, int xmode) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + + if(msg==NULL || msg->first_line.type == SIP_REPLY) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + return ki_kx_get_xuri_attr(msg, &(msg->parsed_uri), iattr, xmode); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_ruser(sip_msg_t *msg) +{ + return ki_kx_get_ruri_attr(msg, 1, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_ruserx(sip_msg_t *msg, int xmode) +{ + return ki_kx_get_ruri_attr(msg, 1, xmode); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rhost(sip_msg_t *msg) +{ + return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rhostx(sip_msg_t *msg, int xmode) +{ + return ki_kx_get_ruri_attr(msg, 2, xmode); +} + /** * */ @@ -199,6 +281,27 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_ruser"), + SR_KEMIP_XVAL, ki_kx_get_ruser, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_ruserx"), + SR_KEMIP_XVAL, ki_kx_get_ruserx, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rhost"), + SR_KEMIP_XVAL, ki_kx_get_rhost, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rhostx"), + SR_KEMIP_XVAL, ki_kx_get_rhostx, + { 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

[kamailio/kamailio] ims_registrar_pcscf: parse security verify header (#1964)
by alexyosifov 28 May '19

28 May '19

- Parse 'security verify' header from REGISTER request message and save updated parameters into the database. - Added debug messages in save_pendign and save for easy debugging.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1964 -- Commit Summary -- * ims_registrar_pcscf: parse security verify header -- File Changes -- M src/modules/ims_registrar_pcscf/save.c (24) M src/modules/ims_registrar_pcscf/sec_agree.c (66) M src/modules/ims_registrar_pcscf/sec_agree.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1964.patch https://github.com/kamailio/kamailio/pull/1964.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/1964

3 3

git:master:6c902f52: Merge pull request #1964 from alexyosifov/registrar_pcscf_sec_agree
by GitHub 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 6c902f526698904129cc5369c74d83312b435ff7 URL: https://github.com/kamailio/kamailio/commit/6c902f526698904129cc5369c74d833… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-28T13:27:24+02:00 Merge pull request #1964 from alexyosifov/registrar_pcscf_sec_agree ims_registrar_pcscf: parse security verify header --- Modified: src/modules/ims_registrar_pcscf/save.c Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/sec_agree.h --- Diff: https://github.com/kamailio/kamailio/commit/6c902f526698904129cc5369c74d833… Patch: https://github.com/kamailio/kamailio/commit/6c902f526698904129cc5369c74d833…

1 0

git:master:6845772a: ims_registrar_pcscf: parse security verify header
by Aleksandar Yosifov 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 6845772a5345d60d48b702b624f673d979451004 URL: https://github.com/kamailio/kamailio/commit/6845772a5345d60d48b702b624f673d… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-05-23T11:34:12+03:00 ims_registrar_pcscf: parse security verify header - Parse 'security verify' header from REGISTER request message and save updated parameters into the database. - Added debug messages in save_pendign and save for easy debugging. --- Modified: src/modules/ims_registrar_pcscf/save.c Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/sec_agree.h --- Diff: https://github.com/kamailio/kamailio/commit/6845772a5345d60d48b702b624f673d… Patch: https://github.com/kamailio/kamailio/commit/6845772a5345d60d48b702b624f673d…

1 0

[kamailio/kamailio] kamdbctl: Fixes name of ims_charging sql script. (#1967)
by Ali Shirvani 28 May '19

28 May '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1967 -- Commit Summary -- * Fixes name of ims_charging sql script. -- File Changes -- R utils/kamctl/mysql/ims_charging-create.sql (0) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1967.patch https://github.com/kamailio/kamailio/pull/1967.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/1967

2 4

git:master:8351df3d: Merge pull request #1967 from alishir/master
by GitHub 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 8351df3db3891d52cdeb1fd59de4e44cecb67dcd URL: https://github.com/kamailio/kamailio/commit/8351df3db3891d52cdeb1fd59de4e44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-28T13:26:55+02:00 Merge pull request #1967 from alishir/master kamdbctl: Fixes name of ims_charging sql script. --- Added: utils/kamctl/mysql/ims_charging-create.sql Removed: utils/kamctl/mysql/ims_charging_create.sql --- Diff: https://github.com/kamailio/kamailio/commit/8351df3db3891d52cdeb1fd59de4e44… Patch: https://github.com/kamailio/kamailio/commit/8351df3db3891d52cdeb1fd59de4e44… --- diff --git a/utils/kamctl/mysql/ims_charging_create.sql b/utils/kamctl/mysql/ims_charging-create.sql similarity index 100% rename from utils/kamctl/mysql/ims_charging_create.sql rename to utils/kamctl/mysql/ims_charging-create.sql

1 0

git:master:4062f65f: kamdbctl: fixes name of ims_charging sql script.
by Ali Shirvani 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 4062f65f909d01148da90d83c018581bcaef94c4 URL: https://github.com/kamailio/kamailio/commit/4062f65f909d01148da90d83c018581… Author: Ali Shirvani <aj.shirvani(a)gmail.com> Committer: Ali Shirvani <aj.shirvani(a)gmail.com> Date: 2019-05-28T15:10:23+04:30 kamdbctl: fixes name of ims_charging sql script. - ims_charging_create renamed to ims_charging-create --- Added: utils/kamctl/mysql/ims_charging-create.sql Removed: utils/kamctl/mysql/ims_charging_create.sql --- Diff: https://github.com/kamailio/kamailio/commit/4062f65f909d01148da90d83c018581… Patch: https://github.com/kamailio/kamailio/commit/4062f65f909d01148da90d83c018581… --- diff --git a/utils/kamctl/mysql/ims_charging_create.sql b/utils/kamctl/mysql/ims_charging-create.sql similarity index 100% rename from utils/kamctl/mysql/ims_charging_create.sql rename to utils/kamctl/mysql/ims_charging-create.sql

1 0

git:master:76f0fa8a: usrloc: clone xavp list in contact struct in memory mode
by Daniel-Constantin Mierla 28 May '19

28 May '19

Module: kamailio Branch: master Commit: 76f0fa8a0330de3885f5f3830eb90061c59045d4 URL: https://github.com/kamailio/kamailio/commit/76f0fa8a0330de3885f5f3830eb9006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-28T08:44:32+02:00 usrloc: clone xavp list in contact struct in memory mode --- Modified: src/modules/usrloc/ucontact.h Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/76f0fa8a0330de3885f5f3830eb9006… Patch: https://github.com/kamailio/kamailio/commit/76f0fa8a0330de3885f5f3830eb9006… --- diff --git a/src/modules/usrloc/ucontact.h b/src/modules/usrloc/ucontact.h index c0e0bcfde7..abe7353ce7 100644 --- a/src/modules/usrloc/ucontact.h +++ b/src/modules/usrloc/ucontact.h @@ -169,4 +169,11 @@ int uldb_delete_attrs(str* _dname, str *_user, str *_domain, str *_ruid); */ int uldb_insert_attrs(str *_dname, str *_user, str *_domain, str *_ruid, sr_xavp_t *_xhead); + +/*! + * \brief Set the value for cloning the xavp list to contact structure + * \param v - the value to be set + */ +void ul_set_xavp_contact_clone(int v); + #endif diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 240b9f24f3..a834fe0040 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -377,8 +377,11 @@ static int mod_init(void) if (handle_lost_tcp && db_mode == DB_ONLY) LM_WARN("handle_lost_tcp option makes nothing in DB_ONLY mode\n"); - init_flag = 1; + if(db_mode != DB_ONLY) { + ul_set_xavp_contact_clone(1); + } + init_flag = 1; return 0; }

1 0

git:master:003871b0: kemix: exported functions to get common URI values via KSR.kx
by Daniel-Constantin Mierla 27 May '19

27 May '19

Module: kamailio Branch: master Commit: 003871b0a81afcc029c34e6e0ca26b6efff38857 URL: https://github.com/kamailio/kamailio/commit/003871b0a81afcc029c34e6e0ca26b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-27T11:56:52+02:00 kemix: exported functions to get common URI values via KSR.kx --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/003871b0a81afcc029c34e6e0ca26b6… Patch: https://github.com/kamailio/kamailio/commit/003871b0a81afcc029c34e6e0ca26b6… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index f342ef6b53..7ed5fe9c98 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -28,6 +28,8 @@ #include "../../core/dprint.h" #include "../../core/kemi.h" #include "../../core/parser/parse_uri.h" +#include "../../core/parser/parse_from.h" +#include "../../core/parser/parse_to.h" MODULE_VERSION @@ -83,6 +85,95 @@ static sr_kemi_xval_t* ki_kx_get_ruri(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_ouri(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + + if(msg->first_line.type == SIP_REPLY) { + /* REPLY doesnt have a ruri */ + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = msg->first_line.u.request.uri; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_furi(sip_msg_t *msg) +{ + to_body_t *xto = NULL; + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + if(parse_from_header(msg)<0) { + LM_ERR("cannot parse From header\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + if(msg->from==NULL || get_from(msg)==NULL) { + LM_DBG("no From header\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + + xto = get_from(msg); + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = xto->uri; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_turi(sip_msg_t *msg) +{ + to_body_t *xto = NULL; + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + if(parse_to_header(msg)<0) { + LM_ERR("cannot parse To header\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + if(msg->to==NULL || get_to(msg)==NULL) { + LM_DBG("no To header\n"); + sr_kemi_xval_null(&_sr_kemi_kx_xval, 0); + return &_sr_kemi_kx_xval; + } + + xto = get_to(msg); + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = xto->uri; + return &_sr_kemi_kx_xval; +} + /** * */ @@ -93,6 +184,21 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_ouri"), + SR_KEMIP_XVAL, ki_kx_get_ouri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_furi"), + SR_KEMIP_XVAL, ki_kx_get_furi, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_turi"), + SR_KEMIP_XVAL, ki_kx_get_turi, + { SR_KEMIP_NONE, 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:ff6a44b7: kemix: new module to collect KEMI specific collections
by Daniel-Constantin Mierla 24 May '19

24 May '19

Module: kamailio Branch: master Commit: ff6a44b73b1f3134ec4352f5c3844a3da7a8b31a URL: https://github.com/kamailio/kamailio/commit/ff6a44b73b1f3134ec4352f5c3844a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-24T12:44:16+02:00 kemix: new module to collect KEMI specific collections - avoid pushing code in core for alternatives to core keywords, conditions, a.s.o. --- Added: src/modules/kemix/Makefile Added: src/modules/kemix/README Added: src/modules/kemix/doc/Makefile Added: src/modules/kemix/doc/kemix.xml Added: src/modules/kemix/doc/kemix_admin.xml Added: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ff6a44b73b1f3134ec4352f5c3844a3… Patch: https://github.com/kamailio/kamailio/commit/ff6a44b73b1f3134ec4352f5c3844a3…

1 0

git:master:850681da: core: kemi - exposed sr_kemi_xval_null() function prototype
by Daniel-Constantin Mierla 24 May '19

24 May '19

Module: kamailio Branch: master Commit: 850681da515f45f9ed23de4eb6a3f3089c838619 URL: https://github.com/kamailio/kamailio/commit/850681da515f45f9ed23de4eb6a3f30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-24T12:30:12+02:00 core: kemi - exposed sr_kemi_xval_null() function prototype --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/850681da515f45f9ed23de4eb6a3f30… Patch: https://github.com/kamailio/kamailio/commit/850681da515f45f9ed23de4eb6a3f30… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 9872e0fa42..037532f96b 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2016,7 +2016,7 @@ static sr_kemi_t _sr_kemi_hdr[] = { /** * */ -static void sr_kemi_xval_pv_null(sr_kemi_xval_t *xval, int rmode) +void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode) { if(rmode==1) { xval->vtype = SR_KEMIP_STR; @@ -2051,24 +2051,24 @@ static sr_kemi_xval_t* sr_kemi_pv_get_mode(sip_msg_t *msg, str *pvn, int rmode) pl = pv_locate_name(pvn); if(pl != pvn->len) { LM_ERR("invalid pv [%.*s] (%d/%d)\n", pvn->len, pvn->s, pl, pvn->len); - sr_kemi_xval_pv_null(&_sr_kemi_xval, rmode); + sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } pvs = pv_cache_get(pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%.*s]\n", pvn->len, pvn->s); - sr_kemi_xval_pv_null(&_sr_kemi_xval, rmode); + sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%.*s]\n", pvn->len, pvn->s); - sr_kemi_xval_pv_null(&_sr_kemi_xval, rmode); + sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } if(val.flags&PV_VAL_NULL) { - sr_kemi_xval_pv_null(&_sr_kemi_xval, rmode); + sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } if(val.flags&PV_TYPE_INT) { diff --git a/src/core/kemi.h b/src/core/kemi.h index 5abba44b1e..ef9451b2d5 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -204,4 +204,6 @@ int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, sr_kemi_t* sr_kemi_exports_get_pv(void); +void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode); + #endif

1 0

Generating TCP traffic via TM module's C API
by Ivan Ribakov 23 May '19

23 May '19

Hi, I’ve been using TM module’s C API (tm_load..h -> struct tm_binds -> t_request_outside()) for some time now to generate new requests from custom module’s C code. What I haven’t come across so far is any type of switch to generate TCP traffic. Is it supported? If so, how can that be controlled? Via transport URI parameter perhaps? Thanks in advance! Regards, Ivan

2 2

git:master:6147bfe2: misc/examples/kemi: fix another small copy and paste error
by Henning Westerholt 23 May '19

23 May '19

Module: kamailio Branch: master Commit: 6147bfe28dd54d62417040c96a7d54efb0f6ec56 URL: https://github.com/kamailio/kamailio/commit/6147bfe28dd54d62417040c96a7d54e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-05-23T21:34:01+02:00 misc/examples/kemi: fix another small copy and paste error --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6147bfe28dd54d62417040c96a7d54e… Patch: https://github.com/kamailio/kamailio/commit/6147bfe28dd54d62417040c96a7d54e… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index c102fa7f9c..9245056a80 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -407,7 +407,7 @@ cfgengine "sqlang" #!ifdef WITH_CFGRUBY modparam("app_ruby", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-ruby.rb") -cfgengine "sqlang" +cfgengine "ruby" #!else cfgengine "native" include_file "/usr/local/etc/kamailio/kamailio-basic-kemi-native.cfg"

1 0

git:master:98e6d1a6: misc/examples/kemi: fixed copy&paste error with type of language
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: 98e6d1a6f6c7fa78d470551de5d17a742e86c2ac URL: https://github.com/kamailio/kamailio/commit/98e6d1a6f6c7fa78d470551de5d17a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T11:50:55+02:00 misc/examples/kemi: fixed copy&paste error with type of language --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/98e6d1a6f6c7fa78d470551de5d17a7… Patch: https://github.com/kamailio/kamailio/commit/98e6d1a6f6c7fa78d470551de5d17a7… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index ea45b5a746..040af8656c 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -18,7 +18,7 @@ var FLB_NATSIPPING=7 function ksr_request_route() { // KSR.sl.sl_send_reply(100,"Intelligent trying"); - // KSR.info("===== request - from kamailio lua script\n"); + // KSR.info("===== request - from kamailio javascript script\n"); // per request initial checks ksr_route_reqinit();

1 0

git:master:83030746: app_lua: set reload parameter to 0 value if given via modparam
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: 830307467ec5c9dddce1e27d8e93f88ddf9a39b7 URL: https://github.com/kamailio/kamailio/commit/830307467ec5c9dddce1e27d8e93f88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T11:37:45+02:00 app_lua: set reload parameter to 0 value if given via modparam --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/830307467ec5c9dddce1e27d8e93f88… Patch: https://github.com/kamailio/kamailio/commit/830307467ec5c9dddce1e27d8e93f88… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 68e079d648..16319d1d05 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -171,6 +171,9 @@ int sr_lua_reload_module(unsigned int reload) if(reload!=0) { _app_lua_sr_reload = 1; LM_DBG("reload param activated!\n"); + } else { + _app_lua_sr_reload = 0; + LM_DBG("reload param inactivated!\n"); } return 0; }

1 0

git:master:2deb2aa5: misc/examples/kemi: added python3 and ruby as options to basic example
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: 2deb2aa53c7e89dbcf64e2e33211a1ca3814a817 URL: https://github.com/kamailio/kamailio/commit/2deb2aa53c7e89dbcf64e2e33211a1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T11:38:44+02:00 misc/examples/kemi: added python3 and ruby as options to basic example --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/2deb2aa53c7e89dbcf64e2e33211a1c… Patch: https://github.com/kamailio/kamailio/commit/2deb2aa53c7e89dbcf64e2e33211a1c… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index 805d78c61e..c102fa7f9c 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -114,14 +114,32 @@ memlog=5 log_prefix="LUA {$rm}: " #!else #!ifdef WITH_CFGPYTHON -log_prefix="PYT {$rm}: " +log_prefix="PY2 {$rm}: " +#!else +#!ifdef WITH_CFGPYTHON3 +log_prefix="PY3 {$rm}: " +#!else +#!ifdef WITH_CFGJSDT +log_prefix="JSC {$rm}: " +#!else +#!ifdef WITH_CFGSQLANG +log_prefix="SQL {$rm}: " +#!else +#!ifdef WITH_CFGJRUBY +log_prefix="RUB {$rm}: " #!else log_prefix="NAT {$rm}: " #!endif #!endif +#!endif +#!endif +#!endif +#!endif latency_cfg_log=2 - +latency_log=2 +latency_limit_action=100000 +latency_limit_db=200000 log_facility=LOG_LOCAL0 fork=yes @@ -215,10 +233,18 @@ loadmodule "app_lua.so" loadmodule "app_python.so" #!endif +#!ifdef WITH_CFGPYTHON3 +loadmodule "app_python3.so" +#!endif + #!ifdef WITH_CFGJSDT loadmodule "app_jsdt.so" #!endif +#!ifdef WITH_CFGRUBY +loadmodule "app_ruby.so" +#!endif + #!ifdef WITH_CFGSQLANG loadmodule "app_sqlang.so" #!endif @@ -355,12 +381,16 @@ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_CFGPYTHON -modparam("app_python", "script_name", "/usr/local/etc/kamailio/kamailio-basic-kemi-python.py") +modparam("app_python", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-python.py") +cfgengine "python" +#!else + +#!ifdef WITH_CFGPYTHON3 +modparam("app_python3", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-python.py") cfgengine "python" #!else #!ifdef WITH_CFGLUA -modparam("app_lua", "reload", 1) modparam("app_lua", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-lua.lua") cfgengine "lua" #!else @@ -369,10 +399,16 @@ cfgengine "lua" modparam("app_jsdt", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-jsdt.js") cfgengine "jsdt" #!else + #!ifdef WITH_CFGSQLANG modparam("app_sqlang", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-sqlang.sq") cfgengine "sqlang" #!else + +#!ifdef WITH_CFGRUBY +modparam("app_ruby", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-ruby.rb") +cfgengine "sqlang" +#!else cfgengine "native" include_file "/usr/local/etc/kamailio/kamailio-basic-kemi-native.cfg" #!endif @@ -383,3 +419,6 @@ include_file "/usr/local/etc/kamailio/kamailio-basic-kemi-native.cfg" #!endif +#!endif + +#!endif

1 0

git:master:e1f1db6d: app_jsdt: removed local implementation for KSR.pv sub-module
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: e1f1db6dbe3b61bd062205682ddeb75cbba6f145 URL: https://github.com/kamailio/kamailio/commit/e1f1db6dbe3b61bd062205682ddeb75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T11:21:47+02:00 app_jsdt: removed local implementation for KSR.pv sub-module - switch to use the one from core --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e1f1db6dbe3b61bd062205682ddeb75… Patch: https://github.com/kamailio/kamailio/commit/e1f1db6dbe3b61bd062205682ddeb75…

1 0

git:master:fa8fd1e1: app_jsdt: handle functions that return xval and have up to two params
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: fa8fd1e1ce6ac55aacbda9c573c04d291fd04b35 URL: https://github.com/kamailio/kamailio/commit/fa8fd1e1ce6ac55aacbda9c573c04d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T10:51:33+02:00 app_jsdt: handle functions that return xval and have up to two params --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/fa8fd1e1ce6ac55aacbda9c573c04d2… Patch: https://github.com/kamailio/kamailio/commit/fa8fd1e1ce6ac55aacbda9c573c04d2…

1 0

git:master:beb80c94: core: kemi - prototypes for functions returning xval with up to two params
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: beb80c948d0a5afc097bd4a5d9701907d553407f URL: https://github.com/kamailio/kamailio/commit/beb80c948d0a5afc097bd4a5d970190… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T10:49:50+02:00 core: kemi - prototypes for functions returning xval with up to two params --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/beb80c948d0a5afc097bd4a5d970190… Patch: https://github.com/kamailio/kamailio/commit/beb80c948d0a5afc097bd4a5d970190… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 834d393ac8..5abba44b1e 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -152,6 +152,19 @@ typedef int (*sr_kemi_fmnnnnn_f)(sip_msg_t*, int, int, int, int, int); /* sip_msg_t and six int|str params */ typedef int (*sr_kemi_fmssssss_f)(sip_msg_t*, str*, str*, str*, str*, str*, str*); +/* return xval, params only sip_msg_t */ +typedef sr_kemi_xval_t* (*sr_kemi_xfm_f)(sip_msg_t*); + +/* return xval, params sip_msg_t and one int|str param */ +typedef sr_kemi_xval_t* (*sr_kemi_xfmn_f)(sip_msg_t*, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfms_f)(sip_msg_t*, str*); + +/* return xval, params sip_msg_t and two int|str params */ +typedef sr_kemi_xval_t* (*sr_kemi_xfmnn_f)(sip_msg_t*, int, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmns_f)(sip_msg_t*, int, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsn_f)(sip_msg_t*, str*, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmss_f)(sip_msg_t*, str*, str*); + sr_kemi_t* sr_kemi_lookup(str *mname, int midx, str *fname); int sr_kemi_modules_add(sr_kemi_t *klist);

1 0

git:master:714adde1: core: xavp - updated comments about vptr filed
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: 714adde1fc42cd4adc76d22b7fa028179ff6cb18 URL: https://github.com/kamailio/kamailio/commit/714adde1fc42cd4adc76d22b7fa0281… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T10:01:14+02:00 core: xavp - updated comments about vptr filed --- Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/714adde1fc42cd4adc76d22b7fa0281… Patch: https://github.com/kamailio/kamailio/commit/714adde1fc42cd4adc76d22b7fa0281… --- diff --git a/src/core/xavp.h b/src/core/xavp.h index 84af5ad182..071a421a4a 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -57,7 +57,7 @@ typedef struct _sr_xval { long l; long long ll; struct _sr_xavp *xavp; /* must be given in shm (not cloned) */ - void *vptr; /* void pointer - address copied, not freed */ + void *vptr; /* void pointer - see SR_XTYPE_VPTR, SR_XTYPE_SPTR */ sr_data_t *data; /* must be given in shm (not cloned) */ } v; } sr_xval_t;

1 0

git:master:126cfa51: core: xvavp - new data type SR_XTYPE_SPTR
by Daniel-Constantin Mierla 23 May '19

23 May '19

Module: kamailio Branch: master Commit: 126cfa51be8718082e20e268cf14d0649c60b17d URL: https://github.com/kamailio/kamailio/commit/126cfa51be8718082e20e268cf14d06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-23T09:30:51+02:00 core: xvavp - new data type SR_XTYPE_SPTR - store a shm pointer that has to be freed at destroy with shm_free() --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/126cfa51be8718082e20e268cf14d06… Patch: https://github.com/kamailio/kamailio/commit/126cfa51be8718082e20e268cf14d06… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index f9b0fd627f..b3a2654764 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -57,6 +57,10 @@ void xavp_free(sr_xavp_t *xa) xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free); shm_free(xa->val.v.data); } + } else if(xa->val.type == SR_XTYPE_SPTR) { + if(xa->val.v.vptr) { + shm_free(xa->val.v.vptr); + } } else if(xa->val.type == SR_XTYPE_XAVP) { xavp_destroy_list(&xa->val.v.xavp); } @@ -70,6 +74,10 @@ void xavp_free_unsafe(sr_xavp_t *xa) xa->val.v.data->pfree(xa->val.v.data->p, xavp_shm_free_unsafe); shm_free_unsafe(xa->val.v.data); } + } else if(xa->val.type == SR_XTYPE_SPTR) { + if(xa->val.v.vptr) { + shm_free_unsafe(xa->val.v.vptr); + } } else if(xa->val.type == SR_XTYPE_XAVP) { xavp_destroy_list_unsafe(&xa->val.v.xavp); } @@ -588,6 +596,9 @@ void xavp_print_list_content(sr_xavp_t **head, int level) case SR_XTYPE_VPTR: LM_INFO(" XAVP value: <vptr:%p>\n", avp->val.v.vptr); break; + case SR_XTYPE_SPTR: + LM_INFO(" XAVP value: <sptr:%p>\n", avp->val.v.vptr); + break; case SR_XTYPE_DATA: LM_INFO(" XAVP value: <data:%p>\n", avp->val.v.data); break; @@ -697,7 +708,7 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) { return NULL; } - if(xold->val.type==SR_XTYPE_DATA) + if(xold->val.type==SR_XTYPE_DATA || xold->val.type==SR_XTYPE_SPTR) { LM_INFO("xavp value type is 'data' - ignoring in clone\n"); return NULL; @@ -720,7 +731,8 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) while(oavp) { - if(oavp->val.type!=SR_XTYPE_DATA && oavp->val.type!=SR_XTYPE_XAVP) + if(oavp->val.type!=SR_XTYPE_DATA && oavp->val.type!=SR_XTYPE_XAVP + && oavp->val.type!=SR_XTYPE_SPTR) { navp = xavp_new_value(&oavp->name, &oavp->val); if(navp==NULL) diff --git a/src/core/xavp.h b/src/core/xavp.h index 4f440ea612..84af5ad182 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -33,7 +33,8 @@ typedef enum { SR_XTYPE_LONG, /* long value */ SR_XTYPE_LLONG, /* long long value */ SR_XTYPE_XAVP, /* xavp value */ - SR_XTYPE_VPTR, /* void pointer value */ + SR_XTYPE_VPTR, /* void pointer value (no free on destroy) */ + SR_XTYPE_SPTR, /* void pointer value (shm free on destroy) */ SR_XTYPE_DATA /* custom data value */ } sr_xtype_t;

1 0

Kamailio v5.2.3 Released
by Daniel-Constantin Mierla 22 May '19

22 May '19

Hello, Kamailio SIP Server v5.2.3 stable release is out. This is a maintenance release of the latest stable branch, 5.2, that includes fixes since the release of v5.2.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.2.x. Deployments running previous v5.2.x versions are strongly recommended to be upgraded to v5.2.3. For more details about version 5.2.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/05/kamailio-v5-2-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. 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

1 0

git:5.2:f946e1bd: Makefile.defs: version set to 5.2.3
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: 5.2 Commit: f946e1bd70099c0d6c490cdafdb2d111fad4fbfc URL: https://github.com/kamailio/kamailio/commit/f946e1bd70099c0d6c490cdafdb2d11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T12:42:04+02:00 Makefile.defs: version set to 5.2.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f946e1bd70099c0d6c490cdafdb2d11… Patch: https://github.com/kamailio/kamailio/commit/f946e1bd70099c0d6c490cdafdb2d11… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 7a403c60a1..f73a9aa8c1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 2 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.2:c3622912: ChangeLog: content updated for v5.2.3
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: 5.2 Commit: c36229127452f7f1f897f837b643693eb5b25f29 URL: https://github.com/kamailio/kamailio/commit/c36229127452f7f1f897f837b643693… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T12:45:13+02:00 ChangeLog: content updated for v5.2.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c36229127452f7f1f897f837b643693… Patch: https://github.com/kamailio/kamailio/commit/c36229127452f7f1f897f837b643693…

1 0

git:5.2:45cae4e6: pkg/kamailio/deb: version set to 5.2.3
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: 5.2 Commit: 45cae4e6829ba2affd17c31745f217b97f173b07 URL: https://github.com/kamailio/kamailio/commit/45cae4e6829ba2affd17c31745f217b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T12:40:04+02:00 pkg/kamailio/deb: version set to 5.2.3 --- Modified: pkg/kamailio/deb/bionic/changelog 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/45cae4e6829ba2affd17c31745f217b… Patch: https://github.com/kamailio/kamailio/commit/45cae4e6829ba2affd17c31745f217b…

1 0

git:5.2:4a6a9574: pkg: version set to 5.2.3 for obs, rpms and apkbuild
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: 5.2 Commit: 4a6a9574536400d67713f1317111c5fc1417e2db URL: https://github.com/kamailio/kamailio/commit/4a6a9574536400d67713f1317111c5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T12:32:04+02:00 pkg: version set to 5.2.3 for obs, rpms and apkbuild --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/4a6a9574536400d67713f1317111c5f… Patch: https://github.com/kamailio/kamailio/commit/4a6a9574536400d67713f1317111c5f… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 910004f9f7..fc3004f67f 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.2.2 +pkgver=5.2.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index dc7152bae6..3a4cabb0ac 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.2 +%define ver 5.2.3 %define rel dev1.0%{dist} %if 0%{?fedora} == 27 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 5e59e41a92..de1aca796c 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.2.2 +%define ver 5.2.3 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index f4d635d3bd..940b0db365 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.2.2 +%define ver 5.2.3 %define rel 0 %define _sharedir %{_prefix}/share

1 0

git:master:fb75e905: core: added a few variants for parsing IPv4/6 addresses
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: fb75e90549a2ed901d15842c6d621ad7d0850106 URL: https://github.com/kamailio/kamailio/commit/fb75e90549a2ed901d15842c6d621ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T12:28:11+02:00 core: added a few variants for parsing IPv4/6 addresses - store parsed structure directly in a provided buffer - wrapper for parsing either IPv4 or IPv6 --- Modified: src/core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/fb75e90549a2ed901d15842c6d621ad… Patch: https://github.com/kamailio/kamailio/commit/fb75e90549a2ed901d15842c6d621ad…

1 0

[kamailio/kamailio] ims_registrar_scscf: changed str r_reginfo_s format: from 'version=%s… (#1961)
by alexyosifov 22 May '19

22 May '19

…' to 'version=%d'.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1961 -- Commit Summary -- * ims_registrar_scscf: changed str r_reginfo_s format: from 'version=%s' to 'version=%d'. -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (16) M src/modules/ims_registrar_scscf/registrar_notify.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1961.patch https://github.com/kamailio/kamailio/pull/1961.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/1961

2 4

git:master:cab1b069: ims_registrar_scscf: changed str r_reginfo_s format: from 'version=%s ' to 'version=%d'. (GH #1961)
by Henning Westerholt 22 May '19

22 May '19

Module: kamailio Branch: master Commit: cab1b069e7e52e58e7f071e6612836bfa057f9d4 URL: https://github.com/kamailio/kamailio/commit/cab1b069e7e52e58e7f071e6612836b… Author: Aleksandar Yosifov <notifications(a)github.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-05-22T10:34:34+02:00 ims_registrar_scscf: changed str r_reginfo_s format: from 'version=%s ' to 'version=%d'. (GH #1961) - changed str r_reginfo_s format: from 'version=%s ' to 'version=%d'. (GH #1961) - In NOTIFY message from S-CSCF to UE, Message Body contains different xml parameters and one of them can be a contact parameter with list of unknown-params. In some cases unknown-param has value with '%' inside. Before the fix, adding of reginfo version breaks the string of unknown-param. Adding reginfo version before contact parameters keeps unknown-param string unchanged. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/cab1b069e7e52e58e7f071e6612836b… Patch: https://github.com/kamailio/kamailio/commit/cab1b069e7e52e58e7f071e6612836b…

1 0

[kamailio/kamailio] core: Added methods for ip conversation. (#1962)
by alexyosifov 22 May '19

22 May '19

- The new methods are used in usrloc pscscf module, but they are universal and can be used anywhere. core: Added debug messages in grep_sock_info.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1962 -- Commit Summary -- * core: Added methods for ip conversation. -- File Changes -- M src/core/resolve.c (138) M src/core/resolve.h (3) M src/core/socket_info.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1962.patch https://github.com/kamailio/kamailio/pull/1962.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/1962

2 2

git:master:4ec855e2: app_sqlang: skip registering KSR.pv from global list
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: 4ec855e2d0fe7c93bb3d633b40de9b0689335f7f URL: https://github.com/kamailio/kamailio/commit/4ec855e2d0fe7c93bb3d633b40de9b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T09:56:15+02:00 app_sqlang: skip registering KSR.pv from global list - for now is still done with the custom functions from the module --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/4ec855e2d0fe7c93bb3d633b40de9b0… Patch: https://github.com/kamailio/kamailio/commit/4ec855e2d0fe7c93bb3d633b40de9b0… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index f3017f6eec..29651be4da 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1875,6 +1875,10 @@ SQInteger sqlang_open_KSR(HSQUIRRELVM J) /* registered kemi modules */ if(emods_size>1) { for(k=1; k<emods_size; k++) { + if(emods[k].kexp == sr_kemi_exports_get_pv()) { + LM_DBG("skip registering the core KSR.pv module\n"); + continue; + } n++; _sr_crt_J_KSRMethods = _sr_J_KSRMethods + n; snprintf(mname, 128, "%s", emods[k].kexp[0].mname.s);

1 0

git:master:29a765a2: app_python3: skip registering KSR.pv from global list
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: 29a765a2ba6d4529f29027d85c47abeb9628a049 URL: https://github.com/kamailio/kamailio/commit/29a765a2ba6d4529f29027d85c47abe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T09:55:24+02:00 app_python3: skip registering KSR.pv from global list - for now is still done with the custom functions from the module --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/29a765a2ba6d4529f29027d85c47abe… Patch: https://github.com/kamailio/kamailio/commit/29a765a2ba6d4529f29027d85c47abe… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index cfced28226..838c432a0c 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -2351,6 +2351,10 @@ PyObject* init_KSR(void) if(emods_size>1) { for(k=1; k<emods_size; k++) { + if(emods[k].kexp == sr_kemi_exports_get_pv()) { + LM_DBG("skip registering the core KSR.pv module\n"); + continue; + } n++; _sr_crt_KSRMethods = _sr_KSRMethods + n; snprintf(mname, 128, "KSR.%s", emods[k].kexp[0].mname.s);

1 0

git:master:b56312e1: app_ruby: skip registering KSR.pv from global list
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: b56312e1b8e357e4c3403cb14eff792190225687 URL: https://github.com/kamailio/kamailio/commit/b56312e1b8e357e4c3403cb14eff792… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T09:55:43+02:00 app_ruby: skip registering KSR.pv from global list - for now is still done with the custom functions from the module --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/b56312e1b8e357e4c3403cb14eff792… Patch: https://github.com/kamailio/kamailio/commit/b56312e1b8e357e4c3403cb14eff792… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 03655c6ea2..92b45fb57e 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1557,6 +1557,10 @@ int app_ruby_kemi_export_libs(void) /* registered kemi modules */ if(emods_size>1) { for(k=1; k<emods_size; k++) { + if(emods[k].kexp == sr_kemi_exports_get_pv()) { + LM_DBG("skip registering the core KSR.pv module\n"); + continue; + } n++; _sr_crt_R_KSRMethods = _sr_R_KSRMethods + n; ksr_app_ruby_toupper(emods[k].kexp[0].mname.s, rmname);

1 0

git:master:ad0f1a82: app_lua: skip registering KSR.pv from global list
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: ad0f1a82b23f8bd5f9c8cc2aa65ea7d7b9f8f418 URL: https://github.com/kamailio/kamailio/commit/ad0f1a82b23f8bd5f9c8cc2aa65ea7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T09:54:27+02:00 app_lua: skip registering KSR.pv from global list - for now is still done with the custom functions from the module --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/ad0f1a82b23f8bd5f9c8cc2aa65ea7d… Patch: https://github.com/kamailio/kamailio/commit/ad0f1a82b23f8bd5f9c8cc2aa65ea7d… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 17649f3e2d..b3c2b7df41 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -2496,6 +2496,10 @@ void lua_sr_kemi_register_libs(lua_State *L) /* registered kemi modules */ if(emods_size>1) { for(k=1; k<emods_size; k++) { + if(emods[k].kexp == sr_kemi_exports_get_pv()) { + LM_DBG("skip registering the core KSR.pv module\n"); + continue; + } n++; _sr_crt_KSRMethods = _sr_KSRMethods + n; snprintf(mname, 128, "KSR.%s", emods[k].kexp[0].mname.s);

1 0

git:master:d0578762: app_python: skip registering KSR.pv from global list
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: d0578762943c7136188c329391f1e6c46b98bcd4 URL: https://github.com/kamailio/kamailio/commit/d0578762943c7136188c329391f1e6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T09:54:54+02:00 app_python: skip registering KSR.pv from global list - for now is still done with the custom functions from the module --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d0578762943c7136188c329391f1e6c… Patch: https://github.com/kamailio/kamailio/commit/d0578762943c7136188c329391f1e6c… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 70f9ca9d37..e6bb316e6a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -2306,6 +2306,10 @@ int sr_apy_init_ksr(void) if(emods_size>1) { for(k=1; k<emods_size; k++) { + if(emods[k].kexp == sr_kemi_exports_get_pv()) { + LM_DBG("skip registering the core KSR.pv module\n"); + continue; + } n++; _sr_crt_KSRMethods = _sr_KSRMethods + n; snprintf(mname, 128, "KSR.%s", emods[k].kexp[0].mname.s);

1 0

git:master:2e95afb3: core: kemi - added KSR.pv module in the global list
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: 2e95afb3704222cfbb0adc6f65d22ba68968ce50 URL: https://github.com/kamailio/kamailio/commit/2e95afb3704222cfbb0adc6f65d22ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T09:46:43+02:00 core: kemi - added KSR.pv module in the global list --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/2e95afb3704222cfbb0adc6f65d22ba… Patch: https://github.com/kamailio/kamailio/commit/2e95afb3704222cfbb0adc6f65d22ba… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 007c4bd885..9872e0fa42 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2389,6 +2389,10 @@ int sr_kemi_modules_add(sr_kemi_t *klist) _sr_kemi_modules[_sr_kemi_modules_size].mname = _sr_kemi_core[0].mname; _sr_kemi_modules[_sr_kemi_modules_size].kexp = _sr_kemi_core; _sr_kemi_modules_size++; + LM_DBG("adding pv module\n"); + _sr_kemi_modules[_sr_kemi_modules_size].mname = _sr_kemi_pv[0].mname; + _sr_kemi_modules[_sr_kemi_modules_size].kexp = _sr_kemi_pv; + _sr_kemi_modules_size++; LM_DBG("adding hdr module\n"); _sr_kemi_modules[_sr_kemi_modules_size].mname = _sr_kemi_hdr[0].mname; _sr_kemi_modules[_sr_kemi_modules_size].kexp = _sr_kemi_hdr;

1 0

git:master:352258fa: app_jsdt: skip registering KSR.pv from global list
by Daniel-Constantin Mierla 22 May '19

22 May '19

Module: kamailio Branch: master Commit: 352258fa530f2c307187b65a16634da87d7c5888 URL: https://github.com/kamailio/kamailio/commit/352258fa530f2c307187b65a16634da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-22T09:47:33+02:00 app_jsdt: skip registering KSR.pv from global list - for now is still done with the custom functions from the module --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/352258fa530f2c307187b65a16634da… Patch: https://github.com/kamailio/kamailio/commit/352258fa530f2c307187b65a16634da… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 4643f017ff..7cdcf4dafd 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1750,6 +1750,10 @@ duk_ret_t dukopen_KSR(duk_context *J) /* registered kemi modules */ if(emods_size>1) { for(k=1; k<emods_size; k++) { + if(emods[k].kexp == sr_kemi_exports_get_pv()) { + LM_DBG("skip registering the core KSR.pv module\n"); + continue; + } n++; _sr_crt_J_KSRMethods = _sr_J_KSRMethods + n; snprintf(mname, 128, "KSR_%s", emods[k].kexp[0].mname.s);

1 0

[kamailio/kamailio] app_python3 threading exceptions on startup (#1916)
by weili-jiang 22 May '19

22 May '19

### Description When Kamailio starts up with app_python3 enabled, multiple threading exceptions appear in the log after forking. The same setup previously using app_python2 exhibits no such errors. ### Expected behavior When Kamailio starts up with app_python3 enabled, everything is successful. #### Actual observed behavior When Kamailio starts up with app_python3 enabled, exceptions in the Python interpreter are logged. #### Debugging Data #### Log Messages [dump.log](https://github.com/kamailio/kamailio/files/3027162/dump.log) #### SIP Traffic N/A ### Possible Solutions The errors may or may not be benign (and thus safe to ignore), routing still appear to work. ### 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**: Debian GNU/Linux 9 (stretch) ``` Linux 4e0ff3e84062 4.15.0-46-generic #49-Ubuntu SMP Wed Feb 6 09:33:07 UTC 2019 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/1916

3 4

Releasing Kamailio v5.2.3
by Daniel-Constantin Mierla 22 May '19

22 May '19

Hello, I am considering to release Kamailo v5.2.3 out of latest git branch 5.2 next week, likely on Wednesday, May 22. As usual, if you are aware of issues not reported to the github bug tracker, fill a report there as soon as possible to give a chance to be analyzed and fixed. Also, if there was a fix for an issue that you were reporting, check to see if it was backported to be sure it is not forgotten. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 1

[kamailio/kamailio] rtpengine with same config works <5.2 but not working on 5.2 (#1940)
by David Villasmil 21 May '19

21 May '19

### Description Same exact configuration that works with kamailio5.1+rtpengine7 does NOT work on 5.2 #### Reproduction I'm using https://github.com/davidcsi/kamailio-private-public/blob/master/README.md and i used kamailio's 5.0, 5.1 from the kamailio's debian repo. Both start properly. When i switched to 5.2 it won't start, complaining it's running out of memory, but no matter how much memory I'd add, it just won't start. #### Log Messages kamailio's log https://github.com/davidcsi/kamailio-private-public/blob/master/kamailio52-… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-10-0-210-226:~# 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**: Debian stretch 9 ``` root@ip-10-0-210-226:~# uname -a Linux ip-10-0-210-226 4.9.0-8-amd64 #1 SMP Debian 4.9.130-2 (2018-10-27) 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/1940

4 14

git:master:69b87dd2: core: copy discovered interface name only when its len is > 0
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: master Commit: 69b87dd212313635fda0e31c287591e8fd0e0166 URL: https://github.com/kamailio/kamailio/commit/69b87dd212313635fda0e31c287591e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T17:26:14+02:00 core: copy discovered interface name only when its len is > 0 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/69b87dd212313635fda0e31c287591e… Patch: https://github.com/kamailio/kamailio/commit/69b87dd212313635fda0e31c287591e… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 472be175c0..ee2a543289 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1155,6 +1155,7 @@ static int build_iface_list(void) entry->ifa_flags = ifi->ifa_flags; is_link_local = 0; + name[0] = '\0'; for(;RTA_OK(rtap, rtl);rtap=RTA_NEXT(rtap,rtl)){ switch(rtap->rta_type){ case IFA_ADDRESS: @@ -1194,8 +1195,9 @@ static int build_iface_list(void) } } - if(strlen(ifaces[index].name)==0) + if(strlen(ifaces[index].name)==0 && strlen(name)>0) { strncpy(ifaces[index].name, name, MAX_IF_LEN-1); + } ifaces[index].index = index;

1 0

git:master:64f744e9: core: kemi - functions for KSR.pv module implemented in core
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: master Commit: 64f744e9c70d1404221ad05edb5566cda77ab2c9 URL: https://github.com/kamailio/kamailio/commit/64f744e9c70d1404221ad05edb5566c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T14:56:40+02:00 core: kemi - functions for KSR.pv module implemented in core - to replace those implemented in each interpreter module for better coherence and make it easier to extend the KSR.pv sub-module in the future --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/64f744e9c70d1404221ad05edb5566c… Patch: https://github.com/kamailio/kamailio/commit/64f744e9c70d1404221ad05edb5566c…

1 0

git:master:a97f2f7b: core: pv - exposed the function to return the str empty static variable
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: master Commit: a97f2f7b255bb00a4eb68bf2225be9b6a508ea05 URL: https://github.com/kamailio/kamailio/commit/a97f2f7b255bb00a4eb68bf2225be9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T14:55:53+02:00 core: pv - exposed the function to return the str empty static variable --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/a97f2f7b255bb00a4eb68bf2225be9b… Patch: https://github.com/kamailio/kamailio/commit/a97f2f7b255bb00a4eb68bf2225be9b… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index bd0d3c2e98..28429406c6 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -695,6 +695,14 @@ str *pv_get_null_str(void) return &pv_str_null; } +/** + * + */ +str *pv_get_empty_str(void) +{ + return &pv_str_empty; +} + /** * */ diff --git a/src/core/pvar.h b/src/core/pvar.h index 564bc03d90..a61072ff6b 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -210,6 +210,7 @@ int pv_locate_name(str *in); pv_spec_t* pv_cache_get(str *name); str* pv_cache_get_name(pv_spec_t *spec); str *pv_get_null_str(void); +str *pv_get_empty_str(void); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a9a8731d: core: kemi - changed SR_KEMIP_INTSTR to SR_KEMIP_XVAL
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: master Commit: a9a8731d3741ba357d2e835c1a41ffd061c9061f URL: https://github.com/kamailio/kamailio/commit/a9a8731d3741ba357d2e835c1a41ffd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:35:21+02:00 core: kemi - changed SR_KEMIP_INTSTR to SR_KEMIP_XVAL - added also SR_KEMIP_NULL to mark null values --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/a9a8731d3741ba357d2e835c1a41ffd… Patch: https://github.com/kamailio/kamailio/commit/a9a8731d3741ba357d2e835c1a41ffd… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 6a1d61af43..169bd520f1 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2347,7 +2347,7 @@ static sr_kemi_param_map_t _sr_kemi_param_map[] = { { SR_KEMIP_INT, str_init("int") }, { SR_KEMIP_STR, str_init("str") }, { SR_KEMIP_BOOL, str_init("bool") }, - { SR_KEMIP_INTSTR, str_init("int-str") }, + { SR_KEMIP_XVAL, str_init("xval") }, { 0, STR_NULL } }; diff --git a/src/core/kemi.h b/src/core/kemi.h index 26e56e3087..8b5458f1a7 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -30,7 +30,8 @@ #define SR_KEMIP_INT (1<<0) /* type integer */ #define SR_KEMIP_STR (1<<1) /* type str* */ #define SR_KEMIP_BOOL (1<<2) /* type boolean (0/1) */ -#define SR_KEMIP_INTSTR (1<<3) /* type integer or str* */ +#define SR_KEMIP_XVAL (1<<3) /* type extended value (integer, str*, ...) */ +#define SR_KEMIP_NULL (1<<4) /* type NULL */ #define SR_KEMI_FALSE 0 #define SR_KEMI_TRUE 1 @@ -65,6 +66,14 @@ typedef union { str s; } sr_kemi_val_t; +typedef struct sr_kemi_xval { + int vtype; + union { + int n; + str *s; + } v; +} sr_kemi_xval_t; + /* only sip_msg_t */ typedef int (*sr_kemi_fm_f)(sip_msg_t*);

1 0

git:master:2116ab08: lcr: pass gw struct by pointer to dump_gw() function
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: master Commit: 2116ab0803557b9f797094a5cd8ccce8f89be87e URL: https://github.com/kamailio/kamailio/commit/2116ab0803557b9f797094a5cd8ccce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:12:35+02:00 lcr: pass gw struct by pointer to dump_gw() function - passing the struct value is inneficient due to its large size (688 bytes) --- Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/2116ab0803557b9f797094a5cd8ccce… Patch: https://github.com/kamailio/kamailio/commit/2116ab0803557b9f797094a5cd8ccce… --- diff --git a/src/modules/lcr/lcr_rpc.c b/src/modules/lcr/lcr_rpc.c index 13850e82cc..3a990c7d04 100644 --- a/src/modules/lcr/lcr_rpc.c +++ b/src/modules/lcr/lcr_rpc.c @@ -48,7 +48,7 @@ static void reload(rpc_t *rpc, void *c) static const char *dump_gws_doc[2] = {"Dump the contents of lcr_gws table.", 0}; -static void dump_gw(rpc_t *rpc, void *st, struct gw_info gw, unsigned int gw_index, unsigned int lcr_id) +static void dump_gw(rpc_t *rpc, void *st, struct gw_info *gw, unsigned int gw_index, unsigned int lcr_id) { str scheme, gw_name, hostname, params, transport; str prefix, tag; @@ -57,53 +57,53 @@ static void dump_gw(rpc_t *rpc, void *st, struct gw_info gw, unsigned int gw_ind rpc->struct_add(st, "d", "lcr_id", lcr_id); rpc->struct_add(st, "d", "gw_index", gw_index); - rpc->struct_add(st, "d", "gw_id", gw.gw_id); - gw_name.s = gw.gw_name; - gw_name.len = gw.gw_name_len; + rpc->struct_add(st, "d", "gw_id", gw->gw_id); + gw_name.s = gw->gw_name; + gw_name.len = gw->gw_name_len; rpc->struct_add(st, "S", "gw_name", &gw_name); - scheme.s = gw.scheme; - scheme.len = gw.scheme_len; + scheme.s = gw->scheme; + scheme.len = gw->scheme_len; rpc->struct_add(st, "S", "scheme", &scheme); - switch(gw.ip_addr.af) { + switch(gw->ip_addr.af) { case AF_INET: rpc->struct_printf(st, "ip_addr", "%d.%d.%d.%d", - gw.ip_addr.u.addr[0], gw.ip_addr.u.addr[1], - gw.ip_addr.u.addr[2], gw.ip_addr.u.addr[3]); + gw->ip_addr.u.addr[0], gw->ip_addr.u.addr[1], + gw->ip_addr.u.addr[2], gw->ip_addr.u.addr[3]); break; case AF_INET6: rpc->struct_printf(st, "ip_addr", "%x:%x:%x:%x:%x:%x:%x:%x", - gw.ip_addr.u.addr16[0], - gw.ip_addr.u.addr16[1], - gw.ip_addr.u.addr16[2], - gw.ip_addr.u.addr16[3], - gw.ip_addr.u.addr16[4], - gw.ip_addr.u.addr16[5], - gw.ip_addr.u.addr16[6], - gw.ip_addr.u.addr16[7]); + gw->ip_addr.u.addr16[0], + gw->ip_addr.u.addr16[1], + gw->ip_addr.u.addr16[2], + gw->ip_addr.u.addr16[3], + gw->ip_addr.u.addr16[4], + gw->ip_addr.u.addr16[5], + gw->ip_addr.u.addr16[6], + gw->ip_addr.u.addr16[7]); break; case 0: rpc->struct_add(st, "s", "ip_addr", "0.0.0.0"); break; } - hostname.s = gw.hostname; - hostname.len = gw.hostname_len; + hostname.s = gw->hostname; + hostname.len = gw->hostname_len; rpc->struct_add(st, "S", "hostname", &hostname); - rpc->struct_add(st, "d", "port", gw.port); - params.s = gw.params; - params.len = gw.params_len; + rpc->struct_add(st, "d", "port", gw->port); + params.s = gw->params; + params.len = gw->params_len; rpc->struct_add(st, "S", "params", &params); - transport.s = gw.transport; - transport.len = gw.transport_len; + transport.s = gw->transport; + transport.len = gw->transport_len; rpc->struct_add(st, "S", "transport", &transport); - prefix.s = gw.prefix; - prefix.len = gw.prefix_len; - tag.s = gw.tag; - tag.len = gw.tag_len; + prefix.s = gw->prefix; + prefix.len = gw->prefix_len; + tag.s = gw->tag; + tag.len = gw->tag_len; start = int2strbuf( - gw.defunct_until, &(buf[0]), INT2STR_MAX_LEN, &len); - rpc->struct_add(st, "dSSdds", "strip", gw.strip, "prefix", - &prefix, "tag", &tag, "flags", gw.flags, "state", - gw.state, "defunct_until", start); + gw->defunct_until, &(buf[0]), INT2STR_MAX_LEN, &len); + rpc->struct_add(st, "dSSdds", "strip", gw->strip, "prefix", + &prefix, "tag", &tag, "flags", gw->flags, "state", + gw->state, "defunct_until", start); } static void dump_gws(rpc_t *rpc, void *c) @@ -128,7 +128,7 @@ static void dump_gws(rpc_t *rpc, void *c) } if(rpc->array_add(srec, "{", &st) < 0) return; - dump_gw(rpc, st, gws[i], i, j); + dump_gw(rpc, st, &gws[i], i, j); } } } @@ -296,7 +296,7 @@ static void load_gws(rpc_t *rpc, void *c) if(rpc->array_add(rec, "{", &st) < 0) return; i = gw_indexes[j]; - dump_gw(rpc, st, gws[i], i, lcr_id); + dump_gw(rpc, st, &gws[i], i, lcr_id); } return;

1 0

Re: [sr-dev] [SR-Users] Plans for next major release - v5.3.0
by Luis Azedo 21 May '19

21 May '19

sorry, didn't find the the dev mail, replying from sr users to dev i prefer to freeze / test / release after the holidays. Best ________________________________ From: sr-users <sr-users-bounces(a)lists.kamailio.org> on behalf of Social Boh <social(a)bohboh.info> Sent: Monday, May 20, 2019 3:15:58 PM To: sr-users(a)lists.kamailio.org Subject: Re: [SR-Users] Plans for next major release - v5.3.0 Me too. Thank you --- I'm SoCIaL, MayBe On 5/20/19 02:49, Juha Heinanen wrote: > Daniel-Constantin Mierla writes: > >> Any preference for one of the two options? > I would prefer release after holidays. Freeze and testing OK during > that period. > > -- Juha > > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users > _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users

1 0

git:5.2:a67274df: core: kemi - typedefs for functions with 5 parameters
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: 5.2 Commit: a67274df404107a729890b5d4936928f8cdde379 URL: https://github.com/kamailio/kamailio/commit/a67274df404107a729890b5d4936928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:19:19+02:00 core: kemi - typedefs for functions with 5 parameters (cherry picked from commit e184648a9cf9b7be2cc12ef64bbb978926384e2b) --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/a67274df404107a729890b5d4936928… Patch: https://github.com/kamailio/kamailio/commit/a67274df404107a729890b5d4936928… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 5d3c84ebb7..26e56e3087 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -108,7 +108,37 @@ typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); /* sip_msg_t and five int|str params */ typedef int (*sr_kemi_fmsssss_f)(sip_msg_t*, str*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmssssn_f)(sip_msg_t*, str*, str*, str*, str*, int); +typedef int (*sr_kemi_fmsssns_f)(sip_msg_t*, str*, str*, str*, int, str*); +typedef int (*sr_kemi_fmsssnn_f)(sip_msg_t*, str*, str*, str*, int, int); +typedef int (*sr_kemi_fmssnss_f)(sip_msg_t*, str*, str*, int, str*, str*); +typedef int (*sr_kemi_fmssnsn_f)(sip_msg_t*, str*, str*, int, str*, int); typedef int (*sr_kemi_fmssnns_f)(sip_msg_t*, str*, str*, int, int, str*); +typedef int (*sr_kemi_fmssnnn_f)(sip_msg_t*, str*, str*, int, int, int); +typedef int (*sr_kemi_fmsnsss_f)(sip_msg_t*, str*, int, str*, str*, str*); +typedef int (*sr_kemi_fmsnssn_f)(sip_msg_t*, str*, int, str*, str*, int); +typedef int (*sr_kemi_fmsnsns_f)(sip_msg_t*, str*, int, str*, int, str*); +typedef int (*sr_kemi_fmsnsnn_f)(sip_msg_t*, str*, int, str*, int, int); +typedef int (*sr_kemi_fmsnnss_f)(sip_msg_t*, str*, int, int, str*, str*); +typedef int (*sr_kemi_fmsnnsn_f)(sip_msg_t*, str*, int, int, str*, int); +typedef int (*sr_kemi_fmsnnns_f)(sip_msg_t*, str*, int, int, int, str*); +typedef int (*sr_kemi_fmsnnnn_f)(sip_msg_t*, str*, int, int, int, int); +typedef int (*sr_kemi_fmnssss_f)(sip_msg_t*, int, str*, str*, str*, str*); +typedef int (*sr_kemi_fmnsssn_f)(sip_msg_t*, int, str*, str*, str*, int); +typedef int (*sr_kemi_fmnssns_f)(sip_msg_t*, int, str*, str*, int, str*); +typedef int (*sr_kemi_fmnssnn_f)(sip_msg_t*, int, str*, str*, int, int); +typedef int (*sr_kemi_fmnsnss_f)(sip_msg_t*, int, str*, int, str*, str*); +typedef int (*sr_kemi_fmnsnsn_f)(sip_msg_t*, int, str*, int, str*, int); +typedef int (*sr_kemi_fmnsnns_f)(sip_msg_t*, int, str*, int, int, str*); +typedef int (*sr_kemi_fmnsnnn_f)(sip_msg_t*, int, str*, int, int, int); +typedef int (*sr_kemi_fmnnsss_f)(sip_msg_t*, int, int, str*, str*, str*); +typedef int (*sr_kemi_fmnnssn_f)(sip_msg_t*, int, int, str*, str*, int); +typedef int (*sr_kemi_fmnnsns_f)(sip_msg_t*, int, int, str*, int, str*); +typedef int (*sr_kemi_fmnnsnn_f)(sip_msg_t*, int, int, str*, int, int); +typedef int (*sr_kemi_fmnnnss_f)(sip_msg_t*, int, int, int, str*, str*); +typedef int (*sr_kemi_fmnnnsn_f)(sip_msg_t*, int, int, int, str*, int); +typedef int (*sr_kemi_fmnnnns_f)(sip_msg_t*, int, int, int, int, str*); +typedef int (*sr_kemi_fmnnnnn_f)(sip_msg_t*, int, int, int, int, int); /* sip_msg_t and six int|str params */ typedef int (*sr_kemi_fmssssss_f)(sip_msg_t*, str*, str*, str*, str*, str*, str*);

1 0

git:5.2:1d064994: tls: register SNI callback for server default profile
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: 5.2 Commit: 1d06499462e1e893e5965d2cc9553cbdd5bd347d URL: https://github.com/kamailio/kamailio/commit/1d06499462e1e893e5965d2cc9553cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:20:23+02:00 tls: register SNI callback for server default profile - make SNI work for other profile when the default one does not have server_name - GH #1938 (cherry picked from commit 08d22b7bd95828554e30f4c23e906cd9d234e1cd) --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/1d06499462e1e893e5965d2cc9553cb… Patch: https://github.com/kamailio/kamailio/commit/1d06499462e1e893e5965d2cc9553cb… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index f22b8e8049..fff4603eba 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1061,17 +1061,20 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) * check server domains for server_name extension and register * callback function */ - if ((d->type & TLS_DOMAIN_SRV) && d->server_name.len>0) { + if ((d->type & TLS_DOMAIN_SRV) + && (d->server_name.len>0 || (d->type & TLS_DOMAIN_DEF))) { if (!SSL_CTX_set_tlsext_servername_callback(d->ctx[i], tls_server_name_cb)) { LM_ERR("register server_name callback handler for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, d->server_name.s, i); + ip_addr2a(&d->ip), d->port, + (d->server_name.s)?d->server_name.s:"<default>", i); return -1; } if (!SSL_CTX_set_tlsext_servername_arg(d->ctx[i], d)) { LM_ERR("register server_name callback handler data for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, d->server_name.s, i); + ip_addr2a(&d->ip), d->port, + (d->server_name.s)?d->server_name.s:"<default>", i); return -1; } } @@ -1079,10 +1082,11 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) } #ifndef OPENSSL_NO_TLSEXT - if ((d->type & TLS_DOMAIN_SRV) && d->server_name.len>0) { + if ((d->type & TLS_DOMAIN_SRV) + && (d->server_name.len>0 || (d->type & TLS_DOMAIN_DEF))) { LM_NOTICE("registered server_name callback handler for socket " "[%s:%d], server_name='%s' ...\n", ip_addr2a(&d->ip), d->port, - d->server_name.s); + (d->server_name.s)?d->server_name.s:"<default>"); } #endif

1 0

git:5.2:110de278: core: pv - define the string printed for null value
by Daniel-Constantin Mierla 21 May '19

21 May '19

Module: kamailio Branch: 5.2 Commit: 110de27806d7703939b3123cff7a8fe423028d0a URL: https://github.com/kamailio/kamailio/commit/110de27806d7703939b3123cff7a8fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:18:16+02:00 core: pv - define the string printed for null value - added function to return the str null value (cherry picked from commit c84a89a3ab5b3f3174203753e51926143b0309f8) --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/110de27806d7703939b3123cff7a8fe… Patch: https://github.com/kamailio/kamailio/commit/110de27806d7703939b3123cff7a8fe… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 878ae30f8e..9b5234f1be 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -674,7 +674,8 @@ static char pv_str_empty_buf[2]; static char pv_str_null_buf[8]; static str pv_str_empty = { "", 0 }; -static str pv_str_null = { "<null>", 6 }; +#define PV_STR_NULL_VAL "<null>" +static str pv_str_null = { PV_STR_NULL_VAL, sizeof(PV_STR_NULL_VAL)-1 }; int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { if(res==NULL) @@ -686,6 +687,14 @@ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } +/** + * + */ +str *pv_get_null_str(void) +{ + return &pv_str_null; +} + /** * */ @@ -2003,7 +2012,7 @@ int pv_init_api(void) pv_str_empty_buf[0] = '\0'; pv_str_empty_buf[1] = '\0'; pv_str_empty.s = pv_str_empty_buf; - strcpy(pv_str_null_buf, "<null>"); + strcpy(pv_str_null_buf, PV_STR_NULL_VAL); pv_str_null.s = pv_str_null_buf; if(register_pvars_mod("core", _core_pvs)<0) diff --git a/src/core/pvar.h b/src/core/pvar.h index 3e838e20f8..564bc03d90 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -209,6 +209,7 @@ int pv_free_extra_list(void); int pv_locate_name(str *in); pv_spec_t* pv_cache_get(str *name); str* pv_cache_get_name(pv_spec_t *spec); +str *pv_get_null_str(void); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

[kamailio/kamailio] In-place string transform having occasionally corrupted results (#1937)
by andycwlai 20 May '19

20 May '19

If I do a substring operation where I extract the middle of a string, I occasionally get results that are not correct. Example code: $var(x) = $(var(y){s.substr,1,5}); This seems to be the same issue as: http://sip-router.1086192.n5.nabble.com/PATCH-Memory-corruption-using-s-sub… This issue had a fix which added "tr_string_clone_result" in numerous exit points in pv_trans.c: https://github.com/kamailio/kamailio/commit/fe7e4a5152674aa9c81c09dd2fc9938… It seemed to be missing at the exit path for the substring operation which may explain my observation. See: https://github.com/kamailio/kamailio/blob/master/src/modules/pv/pv_trans.c#… I also notice that this is not used in some other string operations which leads me to wonder if this problem is more prevalent (likely, since I've heard reports of similar symptoms with the replace). Suggestion: Investigate if we can have this "tr_string_clone_result" called here and remove all other occurrences in the switch clause. -- 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/1937

3 7

git:5.1:5534c048: pv: clone string in all substr operations, related to GH #1937
by Henning Westerholt 20 May '19

20 May '19

Module: kamailio Branch: 5.1 Commit: 5534c048648d99424c5a5e1d67a510d96da52ff1 URL: https://github.com/kamailio/kamailio/commit/5534c048648d99424c5a5e1d67a510d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-05-20T21:00:40+02:00 pv: clone string in all substr operations, related to GH #1937 (cherry picked from commit 280eabf16a45f522655f8b49677e46c75d34024f) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/5534c048648d99424c5a5e1d67a510d… Patch: https://github.com/kamailio/kamailio/commit/5534c048648d99424c5a5e1d67a510d… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index e7c07a0054..8b894689e8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -614,6 +614,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } val->rs.s += i; val->rs.len = j; + tr_string_clone_result; break; } i = -i;

1 0

git:master:8ee81c12: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 8ee81c12b60c2de74dc604f16369e5fbd38922b7 URL: https://github.com/kamailio/kamailio/commit/8ee81c12b60c2de74dc604f16369e5f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-20T17:16:42+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/8ee81c12b60c2de74dc604f16369e5f… Patch: https://github.com/kamailio/kamailio/commit/8ee81c12b60c2de74dc604f16369e5f… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index eb63603d8f..21a1c0249b 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -951,7 +951,7 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") If set to 0, no rate limit is configured. Note carefully: use this configuration only in tests environments because executing many RPC - reload commandss at the same time can cause unexpected behavior. + reload commands at the same time can cause unexpected behavior. Default value is “5”.

1 0

git:master:dc6901ea: dispatcher: docs - fixed typo in description for reload_delta
by Daniel-Constantin Mierla 20 May '19

20 May '19

Module: kamailio Branch: master Commit: dc6901eaa1024431c86c4e13a65b37194ec9fbe9 URL: https://github.com/kamailio/kamailio/commit/dc6901eaa1024431c86c4e13a65b371… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T17:11:21+02:00 dispatcher: docs - fixed typo in description for reload_delta --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dc6901eaa1024431c86c4e13a65b371… Patch: https://github.com/kamailio/kamailio/commit/dc6901eaa1024431c86c4e13a65b371… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index a797c0b6ac..9754e3f320 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1019,7 +1019,7 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") <para> If set to 0, no rate limit is configured. Note carefully: use this configuration only in tests environments because executing many RPC - reload commandss at the same time can cause unexpected behavior. + reload commands at the same time can cause unexpected behavior. </para> <para> <emphasis>

1 0

git:5.2:4676d3d2: pv: clone string in all substr operations, related to GH #1937
by Daniel-Constantin Mierla 20 May '19

20 May '19

Module: kamailio Branch: 5.2 Commit: 4676d3d2c1267761ac6405464459b49c809afcbf URL: https://github.com/kamailio/kamailio/commit/4676d3d2c1267761ac6405464459b49… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T14:23:55+02:00 pv: clone string in all substr operations, related to GH #1937 (cherry picked from commit 280eabf16a45f522655f8b49677e46c75d34024f) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/4676d3d2c1267761ac6405464459b49… Patch: https://github.com/kamailio/kamailio/commit/4676d3d2c1267761ac6405464459b49… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index efbf8e8cf2..17c6a3e204 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -614,6 +614,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } val->rs.s += i; val->rs.len = j; + tr_string_clone_result; break; } i = -i;

1 0

Configuration for dummies
by jespinosa 20 May '19

20 May '19

Hello, My name is Javier Espinosa and I am trying to connect a Kamailio IMS Core with my LTE EPC that I already have working. To make it faster I had downloaded the VM that Franz Edler post here: https://www.kamailio.org/w/2016/02/kamailio-ims-getting-started-box/ but I can't find the properly way to connect it with my EPC that is a real EPC so, I have IMSI codes for each user and I don't know how to register them in the HSS of the IMS and I also have one HSS in my EPC so I am a little bit lost. If anyone can help me with this I will be very grateful. Thank you so much, Javier Espinosa.

1 0

git:master:2921bb2d: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 2921bb2da7e257ea5ff6fac76e35d08be26e6008 URL: https://github.com/kamailio/kamailio/commit/2921bb2da7e257ea5ff6fac76e35d08… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-20T11:46:45+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/2921bb2da7e257ea5ff6fac76e35d08… Patch: https://github.com/kamailio/kamailio/commit/2921bb2da7e257ea5ff6fac76e35d08…

1 0

git:master:ad9ec1c9: rtp_media_server: removed execution flag from source files and makefile
by Daniel-Constantin Mierla 20 May '19

20 May '19

Module: kamailio Branch: master Commit: ad9ec1c94abaffafe3dcd762d961ed35a429849c URL: https://github.com/kamailio/kamailio/commit/ad9ec1c94abaffafe3dcd762d961ed3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T11:38:24+02:00 rtp_media_server: removed execution flag from source files and makefile --- Modified: src/modules/rtp_media_server/Makefile Modified: src/modules/rtp_media_server/rms_media.h Modified: src/modules/rtp_media_server/rms_sdp.h --- Diff: https://github.com/kamailio/kamailio/commit/ad9ec1c94abaffafe3dcd762d961ed3… Patch: https://github.com/kamailio/kamailio/commit/ad9ec1c94abaffafe3dcd762d961ed3… --- diff --git a/src/modules/rtp_media_server/Makefile b/src/modules/rtp_media_server/Makefile old mode 100755 new mode 100644 diff --git a/src/modules/rtp_media_server/rms_media.h b/src/modules/rtp_media_server/rms_media.h old mode 100755 new mode 100644 diff --git a/src/modules/rtp_media_server/rms_sdp.h b/src/modules/rtp_media_server/rms_sdp.h old mode 100755 new mode 100644

1 0

[kamailio/kamailio] Kamailio memory leak - versions 5.1.3 (#1939)
by ohammami 20 May '19

20 May '19

## Description kamailio dispatcher cache is inaccessible and ds_select_domain is failing. all new calls are rejected. ``` # kamctl kamcmd dispatcher.list error: 500 - no destination sets ``` ## Troubleshooting This is happened is production after a dispatcher reload and we are unable to reproduced it again. we restarted kamailio service and that fixed the issue. ## Reproduction I think this happened after we did a 10 simultaneous RPC command to reload the dispatcher cache. ## Log Messages ``` Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: INFO: <script>: [XX.XX.XX.62:1900]: /http_rpc/dispatcher/dispatcher.reload?arg= hdr(Host)=<XX.XX.XX.7:5060> hdr(Via)=<SIP/2.0/TCP XX.XX.XX.62:1900> Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: INFO: <script>: [XX.XX.XX.62:1900]: /http_rpc/dispatcher/dispatcher.reload?arg= hdr(Authorization)=<yyyyyyyzzzzzzzzzzxxxxxzzzzzzzwww> = <yyyyyyyzzzzzzzzzzxxxxxzzzzzzzwww> Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: INFO: <script>: [XX.XX.XX.62:1900]: Successful authentication Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: INFO: <script>: [XX.XX.XX.54:3314]: http_rpc detected Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: INFO: <script>: [XX.XX.XX.54:3314]: /http_rpc/dispatcher/dispatcher.reload?arg= hdr(Host)=<XX.XX.XX.7:5060> hdr(Via)=<SIP/2.0/TCP XX.XX.XX.54:3314> Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: INFO: <script>: [XX.XX.XX.54:3314]: /http_rpc/dispatcher/dispatcher.reload?arg= hdr(Authorization)=<yyyyyyyzzzzzzzzzzxxxxxzzzzzzzwww> = <yyyyyyyzzzzzzzzzzxxxxxzzzzzzzwww> Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: INFO: <script>: [XX.XX.XX.54:3314]: Successful authentication Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69c949b0), called from dispatcher: dispatch.c: ds_avl_destroy(3032), first free dispatcher: dispatch.c: ds_avl_destroy(3032) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69ae3840), called from dispatcher: dispatch.c: ds_avl_destroy(3032), first free dispatcher: dispatch.c: ds_avl_destroy(3032) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f696c5458), called from dispatcher: dispatch.c: ds_avl_destroy(3032), first free dispatcher: dispatch.c: ds_avl_destroy(3032) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69ce8610), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f698e3cd0), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f697498c8), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69662058), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f699b1990), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69663320), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69a4f418), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69663928), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f699125a0), called from dispatcher: dispatch.c: ds_avl_destroy(3032), first free dispatcher: dispatch.c: ds_avl_destroy(3032) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f698b4c30), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69acbee8), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69716f28), called from dispatcher: dispatch.c: ds_avl_destroy(3032), first free dispatcher: dispatch.c: ds_avl_destroy(3032) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69978d18), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69662d38), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f698c4e70), called from dispatcher: dispatch.c: ds_avl_destroy(3032), first free dispatcher: dispatch.c: ds_avl_destroy(3032) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69b13130), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f699027a0), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f6987f500), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69663f10), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69664400), called from dispatcher: dispatch.c: ds_avl_destroy(3032), first free dispatcher: dispatch.c: ds_avl_destroy(3032) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69667bd0), called from dispatcher: dispatch.c: ds_avl_destroy(3037), first free dispatcher: dispatch.c: ds_avl_destroy(3037) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69661a50), called from dispatcher: dispatch.c: ds_avl_destroy(3038), first free dispatcher: dispatch.c: ds_avl_destroy(3038) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32246]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f69857670), called from dispatcher: dispatch.c: reindex_dests(648), first free dispatcher: dispatch.c: reindex_dests(648) - aborting Apr 26 10:28:54 kamailio-gateway-01 /usr/sbin/kamailio[32245]: CRITICAL: <core> [core/mem/q_malloc.c:500]: qm_free(): BUG: freeing already freed pointer (0x7f6f6987f500), called from dispatcher: dispatch.c: reindex_dests(648), first free dispatcher: dispatch.c: reindex_dests(648) - aborting Apr 26 10:28:55 kamailio-gateway-01 /usr/sbin/kamailio[32182]: INFO: <script>: ===== redis sip code insert: SIP Code: 183 * time: 1556274535 * Rebtel-CID: TJI4V81TAP24NCN0DHHJG54NKG(a)YY.YY.YY.107 * Call-Id: 4b6b9685-c797-4e13-8cf5-cd6f7d23a39f Apr 26 10:28:55 kamailio-gateway-01 /usr/sbin/kamailio[32191]: INFO: <script>: ===== redis sip code insert: SIP Code: 181 * time: 1556274535 * Rebtel-CID: UBQ1HL47T51HH51BESVJIOE66K(a)YY.YY.YY.107 * Call-Id: d74592af-d240-481f-92bc-6b6f1010887c Apr 26 10:28:56 kamailio-gateway-01 /usr/sbin/kamailio[32187]: INFO: <script>: ===== redis sip code insert: SIP Code: 487 * time: 1556274536 * Rebtel-CID: 12-12-73EB33B1-5CC2DD5B000379CB-51039700 * Call-Id: b8078da6-7dff-4689-a28b-76268200a01a Apr 26 10:28:56 kamailio-gateway-01 /usr/sbin/kamailio[32187]: INFO: <script>: ===== redis sip code insert: SIP Code: 487 * time: 1556274523 * Rebtel-CID: 12-12-73EB33B1-5CC2DD5B000379CB-51039700 * Call-Id: b8078da6-7dff-4689-a28b-76268200a01a Apr 26 10:28:56 kamailio-gateway-01 /usr/sbin/kamailio[32206]: ERROR: dispatcher [dispatch.c:1808]: ds_select_dst_limit(): no destination sets Apr 26 10:28:57 kamailio-gateway-01 /usr/sbin/kamailio[32210]: ERROR: dispatcher [dispatch.c:1808]: ds_select_dst_limit(): no destination sets Apr 26 10:28:57 kamailio-gateway-01 /usr/sbin/kamailio[32207]: ERROR: dispatcher [dispatch.c:1808]: ds_select_dst_limit(): no destination sets Apr 26 10:28:57 kamailio-gateway-01 /usr/sbin/kamailio[32195]: ERROR: dispatcher [dispatch.c:1808]: ds_select_dst_limit(): no destination sets Apr 26 10:28:57 kamailio-gateway-01 /usr/sbin/kamailio[32209]: ERROR: dispatcher [dispatch.c:1808]: ds_select_dst_limit(): no destination sets Apr 26 10:28:57 kamailio-gateway-01 /usr/sbin/kamailio[32202]: ERROR: dispatcher [dispatch.c:1808]: ds_select_dst_limit(): no destination sets ``` ## Possible Solutions Restarting Kamailio ## Additional Information Kamailio Version - output of kamailio -v ``` version: kamailio 5.1.3 (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 13:05:41 Apr 24 2018 with gcc 4.8.5 ``` ## Operating System: CentOS Linux release 7.4.1708 (Core) -- 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/1939

2 4

git:master:513917ea: dispatcher: docs for reload_delta parameter
by Daniel-Constantin Mierla 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 513917ea47dfdcf67cdb46539a1745555c929cfa URL: https://github.com/kamailio/kamailio/commit/513917ea47dfdcf67cdb46539a17455… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T11:34:16+02:00 dispatcher: docs for reload_delta parameter - GH #1939 --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/513917ea47dfdcf67cdb46539a17455… Patch: https://github.com/kamailio/kamailio/commit/513917ea47dfdcf67cdb46539a17455… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 50fa5e4b70..a797c0b6ac 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1009,6 +1009,32 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") </example> </section> + <section id="dispatcher.p.reload_delta"> + <title><varname>reload_delta</varname> (int)</title> + <para> + The number of seconds that have to be waited before executing a new reload + of dispatcher records. By default there is a rate limiting of maximum + one reload in five seconds. + </para> + <para> + If set to 0, no rate limit is configured. Note carefully: use this + configuration only in tests environments because executing many RPC + reload commandss at the same time can cause unexpected behavior. + </para> + <para> + <emphasis> + Default value is <quote>5</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reload_delta</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "reload_delta", 1) +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:master:2b032137: dispatcher: added reload_delta parameter
by Daniel-Constantin Mierla 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 2b032137886a7074a6be4ac5772a428661a3130c URL: https://github.com/kamailio/kamailio/commit/2b032137886a7074a6be4ac5772a428… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T11:15:48+02:00 dispatcher: added reload_delta parameter - limit the frequency of rpc reload commands to try to avoid races of parallel reload operations - default value is 5 seconds (no more than one reload command every 5 seconds) --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/2b032137886a7074a6be4ac5772a428… Patch: https://github.com/kamailio/kamailio/commit/2b032137886a7074a6be4ac5772a428… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index df11722215..101927099a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -141,6 +141,9 @@ str ds_event_callback = STR_NULL; str ds_db_extra_attrs = STR_NULL; param_t *ds_db_extra_attrs_list = NULL; +static int ds_reload_delta = 5; +static time_t *ds_rpc_reload_time = NULL; + /** module functions */ static int mod_init(void); static int child_init(int); @@ -271,6 +274,7 @@ static param_export_t params[]={ {"ds_attrs_none", PARAM_INT, &ds_attrs_none}, {"ds_db_extra_attrs", PARAM_STR, &ds_db_extra_attrs}, {"ds_load_mode", PARAM_INT, &ds_load_mode}, + {"reload_delta", PARAM_INT, &ds_reload_delta }, {0,0,0} }; @@ -451,6 +455,14 @@ static int mod_init(void) LM_ERR("invalid ds_latency_estimator_alpha must be between 0 and 1000," " using default[%.3f]\n", ds_latency_estimator_alpha); } + + ds_rpc_reload_time = shm_malloc(sizeof(time_t)); + if(ds_rpc_reload_time == NULL) { + SHM_MEM_ERROR; + return -1; + } + *ds_rpc_reload_time = 0; + return 0; } @@ -477,6 +489,10 @@ static void destroy(void) shm_free(ds_ping_reply_codes); if(ds_ping_reply_codes_cnt) shm_free(ds_ping_reply_codes_cnt); + if(ds_rpc_reload_time!=NULL) { + shm_free(ds_rpc_reload_time); + ds_rpc_reload_time = 0; + } } #define GET_VALUE(param_name, param, i_value, s_value, value_flags) \ @@ -1373,6 +1389,19 @@ static const char *dispatcher_rpc_reload_doc[2] = { */ static void dispatcher_rpc_reload(rpc_t *rpc, void *ctx) { + + if(ds_rpc_reload_time==NULL) { + LM_ERR("not ready for reload\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return; + } + if(*ds_rpc_reload_time!=0 && *ds_rpc_reload_time > time(NULL) - ds_reload_delta) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "Ongoing reload"); + return; + } + *ds_rpc_reload_time = time(NULL); + if(!ds_db_url.s) { if(ds_load_list(dslistfile) != 0) { rpc->fault(ctx, 500, "Reload Failed");

1 0

git:master:08d22b7b: tls: register SNI callback for server default profile
by Daniel-Constantin Mierla 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 08d22b7bd95828554e30f4c23e906cd9d234e1cd URL: https://github.com/kamailio/kamailio/commit/08d22b7bd95828554e30f4c23e906cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T10:56:08+02:00 tls: register SNI callback for server default profile - make SNI work for other profile when the default one does not have server_name - GH #1938 --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/08d22b7bd95828554e30f4c23e906cd… Patch: https://github.com/kamailio/kamailio/commit/08d22b7bd95828554e30f4c23e906cd… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index f22b8e8049..fff4603eba 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1061,17 +1061,20 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) * check server domains for server_name extension and register * callback function */ - if ((d->type & TLS_DOMAIN_SRV) && d->server_name.len>0) { + if ((d->type & TLS_DOMAIN_SRV) + && (d->server_name.len>0 || (d->type & TLS_DOMAIN_DEF))) { if (!SSL_CTX_set_tlsext_servername_callback(d->ctx[i], tls_server_name_cb)) { LM_ERR("register server_name callback handler for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, d->server_name.s, i); + ip_addr2a(&d->ip), d->port, + (d->server_name.s)?d->server_name.s:"<default>", i); return -1; } if (!SSL_CTX_set_tlsext_servername_arg(d->ctx[i], d)) { LM_ERR("register server_name callback handler data for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, d->server_name.s, i); + ip_addr2a(&d->ip), d->port, + (d->server_name.s)?d->server_name.s:"<default>", i); return -1; } } @@ -1079,10 +1082,11 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) } #ifndef OPENSSL_NO_TLSEXT - if ((d->type & TLS_DOMAIN_SRV) && d->server_name.len>0) { + if ((d->type & TLS_DOMAIN_SRV) + && (d->server_name.len>0 || (d->type & TLS_DOMAIN_DEF))) { LM_NOTICE("registered server_name callback handler for socket " "[%s:%d], server_name='%s' ...\n", ip_addr2a(&d->ip), d->port, - d->server_name.s); + (d->server_name.s)?d->server_name.s:"<default>"); } #endif

1 0

Plans for next major release - v5.3.0
by Daniel-Constantin Mierla 20 May '19

20 May '19

Hello, a while ago, during the last IRC devel meeting, it was proposed to either do the next major release (5.3.0) before the usual summer holidays or leave it for autumn. Given that time is approaching, we have to decide. If it is going to happen before the summer holidays, probably we should freeze the development in 2-3 weeks, then do 3-4 weeks of testing and release during the first part of July. It would be a shorter development cycle, so I do not expect much needs for testing. Only a few new modules and plenty of work to consolidate and enhance the existing code. Any preference for one of the two options? Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 1

[kamailio/kamailio] src/Makefile.defs: fix build on mips (#1958)
by sergey-safarov 20 May '19

20 May '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 Back ported patch from Alpine Linux dist [related commit](https://github.com/alpinelinux/aports/commit/20f53ef43230040b6bb5a2… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1958 -- Commit Summary -- * src/Makefile.defs: fix build on mips -- File Changes -- M src/Makefile.defs (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1958.patch https://github.com/kamailio/kamailio/pull/1958.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/1958

2 1

git:master:70061f56: Merge pull request #1958 from sergey-safarov/mips
by GitHub 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 70061f565e8f2132fc2f2856d9d83a7c45202053 URL: https://github.com/kamailio/kamailio/commit/70061f565e8f2132fc2f2856d9d83a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-20T09:16:49+02:00 Merge pull request #1958 from sergey-safarov/mips src/Makefile.defs: fix build on mips --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/70061f565e8f2132fc2f2856d9d83a7… Patch: https://github.com/kamailio/kamailio/commit/70061f565e8f2132fc2f2856d9d83a7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 21ca28e097..0577ac011c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -321,7 +321,8 @@ ppc64_macros= __ppc64__ _ARCH_PPC64 mips_macros= __mips__ __mips _MIPS_ARCH_MIPS1 mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS3 _MIPS_ISA_MIPS4 \ - _MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4 + _MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4 \ + _MIPS_ISA_MIPS32 mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64 alpha_macros= __alpha__ __alpha _M_ALPHA_ @@ -1344,7 +1345,7 @@ ifeq ($(ARCH), mips2) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+,$(CC_SHORTVER)))) CFLAGS+=-ftree-vectorize -fno-strict-overflow @@ -1390,7 +1391,7 @@ ifeq ($(ARCH), mips64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+,$(CC_SHORTVER)))) CFLAGS+=-ftree-vectorize -fno-strict-overflow

1 0

git:master:1699dc31: src/Makefile.defs: fix build on mips
by Sergey Safarov 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 1699dc31ffa01ec2ce94e191285ba800497e94e1 URL: https://github.com/kamailio/kamailio/commit/1699dc31ffa01ec2ce94e191285ba80… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T12:38:14+03:00 src/Makefile.defs: fix build on mips --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1699dc31ffa01ec2ce94e191285ba80… Patch: https://github.com/kamailio/kamailio/commit/1699dc31ffa01ec2ce94e191285ba80… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 21ca28e097..0577ac011c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -321,7 +321,8 @@ ppc64_macros= __ppc64__ _ARCH_PPC64 mips_macros= __mips__ __mips _MIPS_ARCH_MIPS1 mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS3 _MIPS_ISA_MIPS4 \ - _MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4 + _MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4 \ + _MIPS_ISA_MIPS32 mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64 alpha_macros= __alpha__ __alpha _M_ALPHA_ @@ -1344,7 +1345,7 @@ ifeq ($(ARCH), mips2) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+,$(CC_SHORTVER)))) CFLAGS+=-ftree-vectorize -fno-strict-overflow @@ -1390,7 +1391,7 @@ ifeq ($(ARCH), mips64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+,$(CC_SHORTVER)))) CFLAGS+=-ftree-vectorize -fno-strict-overflow

1 0

[kamailio/kamailio] Fixed compile warnings on Fedora 30 (#1957)
by sergey-safarov 20 May '19

20 May '19

Warning example *** WARNING: ./usr/src/debug/kamailio-5.3.0-dev1.0.fc30.x86_64/src/modules/app_python3/apy_kemi.c is executable but has empty or no shebang, removing executable bit *** WARNING: ./usr/src/debug/kamailio-5.3.0-dev1.0.fc30.x86_64/src/modules/ims_auth/pvt_message.c is executable but has empty or no shebang, removing executable bit *** WARNING: ./usr/src/debug/kamailio-5.3.0-dev1.0.fc30.x86_64/src/modules/auth/api.c is executable but has empty or no shebang, removing executable bit You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1957 -- Commit Summary -- * Fixed compile warnings on Fedora 30 -- File Changes -- M src/modules/app_python3/apy_kemi.c (0) M src/modules/auth/api.c (0) M src/modules/ims_auth/pvt_message.c (0) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1957.patch https://github.com/kamailio/kamailio/pull/1957.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/1957

2 2

git:master:03c60941: app_python3, auth, ims_auth: chmod to 0644 for source code file with exec flag
by Daniel-Constantin Mierla 20 May '19

20 May '19

Module: kamailio Branch: master Commit: 03c60941cdc1a72ec23fbe7f67d5e6ce13d97af3 URL: https://github.com/kamailio/kamailio/commit/03c60941cdc1a72ec23fbe7f67d5e6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T09:15:26+02:00 app_python3, auth, ims_auth: chmod to 0644 for source code file with exec flag - GH #1957 --- Modified: src/modules/app_python3/apy_kemi.c Modified: src/modules/auth/api.c Modified: src/modules/ims_auth/pvt_message.c --- Diff: https://github.com/kamailio/kamailio/commit/03c60941cdc1a72ec23fbe7f67d5e6c… Patch: https://github.com/kamailio/kamailio/commit/03c60941cdc1a72ec23fbe7f67d5e6c… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c old mode 100755 new mode 100644 diff --git a/src/modules/auth/api.c b/src/modules/auth/api.c old mode 100755 new mode 100644 diff --git a/src/modules/ims_auth/pvt_message.c b/src/modules/ims_auth/pvt_message.c old mode 100755 new mode 100644

1 0

[kamailio/kamailio] How to define IP Trunk in kamailio (#1960)
by maryamb99 20 May '19

20 May '19

Hello everyone, I install and setup an IMS Network by kamailio-5.2.2 . I have p-cscf, i-cscf and s-cscf in three different systems . my Hss is Fokus. Registration and call between subscribers of network works successfully . now I want to define IP Trunk in my network which can pass transfer and external subscribers calls through my IMS network. I don't know how to define IP Trunk -- 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/1960

2 2

git:5.2:b1e1fc10: pkg/kamailio/obs: Packaged app_python3
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: 5.2 Commit: b1e1fc1002bc4a11b7c4ff0421de483b9a78dceb URL: https://github.com/kamailio/kamailio/commit/b1e1fc1002bc4a11b7c4ff0421de483… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T23:04:08+03:00 pkg/kamailio/obs: Packaged app_python3 (cherry picked from commit 1abcd38495c39cb0ba69ddcb9ddd06a695bd6e67) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b1e1fc1002bc4a11b7c4ff0421de483… Patch: https://github.com/kamailio/kamailio/commit/b1e1fc1002bc4a11b7c4ff0421de483… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 91344c01df..dc7152bae6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -18,6 +18,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -42,6 +43,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -66,6 +68,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -90,6 +93,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -114,6 +118,7 @@ %bcond_with mongodb %bcond_without perl %bcond_with phonenum +%bcond_with python3 %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -139,6 +144,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -163,6 +169,7 @@ %bcond_with mongodb %bcond_without perl %bcond_with phonenum +%bcond_without python3 %bcond_with rabbitmq %bcond_without redis %bcond_without ruby @@ -187,6 +194,7 @@ %bcond_with mongodb %bcond_with perl %bcond_with phonenum +%bcond_with python3 %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -211,6 +219,7 @@ %bcond_without mongodb %bcond_without perl %bcond_with phonenum +%bcond_with python3 %bcond_with rabbitmq %bcond_without redis %bcond_with ruby @@ -283,15 +292,6 @@ BuildRequires: bison, flex Requires: filesystem BuildRequires: systemd-mini, shadow %endif -%if 0%{?fedora} == 27 -BuildRequires: python3-devel -%endif -%if 0%{?fedora} == 28 -BuildRequires: python3-devel -%endif -%if 0%{?fedora} == 30 -BuildRequires: python3-devel -%endif %description @@ -737,6 +737,15 @@ Summary: Python extensions for Kamailio Group: %{PKGGROUP} Requires: python, kamailio = %ver BuildRequires: python, python-devel +%if %{with python3} +%if 0%{?rhel} == 7 +Requires: python36, kamailio = %ver +BuildRequires: python36, python36-devel +%else +Requires: python3, kamailio = %ver +BuildRequires: python3, python3-devel +%endif +%endif %description python Python extensions for Kamailio. @@ -1136,7 +1145,11 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with phonenum} kphonenum \ %endif - kpostgres kpresence kpython kradius \ + kpostgres kpresence kpython \ +%if %{with python3} + kpython3 \ +%endif + kradius \ %if %{with redis} kredis \ %endif @@ -1216,7 +1229,11 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with phonenum} kphonenum \ %endif - kpostgres kpresence kpython kradius \ + kpostgres kpresence kpython \ +%if %{with python3} + kpython3 \ +%endif + kradius \ %if %{with redis} kredis \ %endif @@ -1952,6 +1969,10 @@ fi %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.app_python %{_libdir}/kamailio/modules/app_python.so +%if %{with python3} +%doc %{_docdir}/kamailio/modules/README.app_python3 +%{_libdir}/kamailio/modules/app_python3.so +%endif %if %{with rabbitmq}

1 0

git:master:1abcd384: pkg/kamailio/obs: Packaged app_python3
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: master Commit: 1abcd38495c39cb0ba69ddcb9ddd06a695bd6e67 URL: https://github.com/kamailio/kamailio/commit/1abcd38495c39cb0ba69ddcb9ddd06a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T23:00:38+03:00 pkg/kamailio/obs: Packaged app_python3 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1abcd38495c39cb0ba69ddcb9ddd06a… Patch: https://github.com/kamailio/kamailio/commit/1abcd38495c39cb0ba69ddcb9ddd06a… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 09e8e0580a..92e328ccba 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -18,6 +18,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -42,6 +43,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -66,6 +68,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -90,6 +93,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -114,6 +118,7 @@ %bcond_with mongodb %bcond_without perl %bcond_with phonenum +%bcond_with python3 %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -139,6 +144,7 @@ %bcond_without mongodb %bcond_without perl %bcond_without phonenum +%bcond_without python3 %bcond_without rabbitmq %bcond_without redis %bcond_without ruby @@ -163,6 +169,7 @@ %bcond_with mongodb %bcond_without perl %bcond_with phonenum +%bcond_without python3 %bcond_with rabbitmq %bcond_without redis %bcond_without ruby @@ -187,6 +194,7 @@ %bcond_with mongodb %bcond_with perl %bcond_with phonenum +%bcond_with python3 %bcond_with rabbitmq %bcond_with redis %bcond_with ruby @@ -211,6 +219,7 @@ %bcond_without mongodb %bcond_without perl %bcond_with phonenum +%bcond_with python3 %bcond_with rabbitmq %bcond_without redis %bcond_with ruby @@ -283,15 +292,6 @@ BuildRequires: bison, flex Requires: filesystem BuildRequires: systemd-mini, shadow %endif -%if 0%{?fedora} == 27 -BuildRequires: python3-devel -%endif -%if 0%{?fedora} == 28 -BuildRequires: python3-devel -%endif -%if 0%{?fedora} == 30 -BuildRequires: python3-devel -%endif %description @@ -737,6 +737,15 @@ Summary: Python extensions for Kamailio Group: %{PKGGROUP} Requires: python, kamailio = %ver BuildRequires: python, python-devel +%if %{with python3} +%if 0%{?rhel} == 7 +Requires: python36, kamailio = %ver +BuildRequires: python36, python36-devel +%else +Requires: python3, kamailio = %ver +BuildRequires: python3, python3-devel +%endif +%endif %description python Python extensions for Kamailio. @@ -1145,7 +1154,11 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with phonenum} kphonenum \ %endif - kpostgres kpresence kpython kradius \ + kpostgres kpresence kpython \ +%if %{with python3} + kpython3 \ +%endif + kradius \ %if %{with redis} kredis \ %endif @@ -1225,7 +1238,11 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with phonenum} kphonenum \ %endif - kpostgres kpresence kpython kradius \ + kpostgres kpresence kpython \ +%if %{with python3} + kpython3 \ +%endif + kradius \ %if %{with redis} kredis \ %endif @@ -1961,6 +1978,10 @@ fi %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.app_python %{_libdir}/kamailio/modules/app_python.so +%if %{with python3} +%doc %{_docdir}/kamailio/modules/README.app_python3 +%{_libdir}/kamailio/modules/app_python3.so +%endif %if %{with rabbitmq}

1 0

[kamailio/kamailio] failed app_python3 packaging (#1959)
by sergey-safarov 18 May '19

18 May '19

### Description I tried package app_python3 and found this error on all dist where python3 is exist ``` [ 419s] CC (gcc) [M app_python.so] python_support.o [ 419s] python_support.c:22:20: fatal error: Python.h: No such file or directory [ 419s] #include <Python.h> [ 419s] ^ [ 419s] compilation terminated. [ 419s] make[2]: *** [python_support.o] Error 1 [ 419s] make[1]: *** [modules] Error 1 [ 419s] make[1]: Leaving directory `/home/abuild/rpmbuild/BUILD/kamailio-5.3.0-dev5/src' [ 419s] make: *** [every-module] Error 2 ``` But `Python.h` is present in system. Include dir and libsdir you can get using command `python3-config`. Like ``` # python3-config --includes -I/usr/include/python3.7m -I/usr/include/python3.7m # python3-config --libs -lpython3.7m -lpthread -ldl -lutil -lm ``` ### Possible Solutions Update make files to use `python3-config`. -- 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/1959

1 3

git:5.1:6ee5ceb1: pkg/kamailio/obs: Fixed packaging on Fedora 30 [skip ci]
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: 5.1 Commit: 6ee5ceb15f20b6b8a3d52d2b2dfecaa1da1792a9 URL: https://github.com/kamailio/kamailio/commit/6ee5ceb15f20b6b8a3d52d2b2dfecaa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T19:36:45+03:00 pkg/kamailio/obs: Fixed packaging on Fedora 30 [skip ci] (cherry picked from commit b2402ec1fdde4584c9061e0a47a92e3328b5e7a8) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6ee5ceb15f20b6b8a3d52d2b2dfecaa… Patch: https://github.com/kamailio/kamailio/commit/6ee5ceb15f20b6b8a3d52d2b2dfecaa… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7e5301b2d3..8803cffd39 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -231,6 +231,10 @@ BuildRequires: python3-devel %if 0%{?fedora} == 28 BuildRequires: python3-devel %endif +%if 0%{?fedora} == 30 +BuildRequires: python3-devel +%endif + %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -325,7 +329,7 @@ Module which provides a mechanism to limit call duration based on credit informa %package cpl Summary: CPL (Call Processing Language) interpreter for Kamailio Group: System Environment/Daemons -Requires: libxml2, kamailio = %ver +Requires: which, libxml2, kamailio = %ver BuildRequires: libxml2-devel %description cpl @@ -942,9 +946,14 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} +%if "%{__python2}" != "" + sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py +%endif + ln -s ../obs pkg/kamailio/fedora/27 ln -s ../obs pkg/kamailio/fedora/28 ln -s ../obs pkg/kamailio/fedora/29 +ln -s ../obs pkg/kamailio/fedora/30 ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 ln -s ../obs pkg/kamailio/opensuse/1315 @@ -1612,6 +1621,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf +%doc %{_docdir}/kamailio/modules/README.ims_usrloc_scscf %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so %{_libdir}/kamailio/modules/ims_auth.so

1 0

git:5.2:089874a2: pkg/kamailio/obs: Fixed packaging on Fedora 30 [skip ci]
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: 5.2 Commit: 089874a2eb218e7f43bde12f95a113a1b4de5988 URL: https://github.com/kamailio/kamailio/commit/089874a2eb218e7f43bde12f95a113a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T19:35:15+03:00 pkg/kamailio/obs: Fixed packaging on Fedora 30 [skip ci] (cherry picked from commit b2402ec1fdde4584c9061e0a47a92e3328b5e7a8) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/089874a2eb218e7f43bde12f95a113a… Patch: https://github.com/kamailio/kamailio/commit/089874a2eb218e7f43bde12f95a113a… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index b2ca027d5a..91344c01df 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -289,6 +289,10 @@ BuildRequires: python3-devel %if 0%{?fedora} == 28 BuildRequires: python3-devel %endif +%if 0%{?fedora} == 30 +BuildRequires: python3-devel +%endif + %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -393,7 +397,7 @@ Module which provides a mechanism to limit call duration based on credit informa %package cpl Summary: CPL (Call Processing Language) interpreter for Kamailio Group: %{PKGGROUP} -Requires: libxml2, kamailio = %ver +Requires: which, libxml2, kamailio = %ver BuildRequires: libxml2-devel %description cpl @@ -1047,9 +1051,14 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} +%if "%{__python2}" != "" + sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py +%endif + ln -s ../obs pkg/kamailio/fedora/27 ln -s ../obs pkg/kamailio/fedora/28 ln -s ../obs pkg/kamailio/fedora/29 +ln -s ../obs pkg/kamailio/fedora/30 ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 ln -s ../obs pkg/kamailio/opensuse/1315 @@ -1739,6 +1748,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf +%doc %{_docdir}/kamailio/modules/README.ims_usrloc_scscf %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so %{_libdir}/kamailio/modules/ims_auth.so

1 0

git:master:b2402ec1: pkg/kamailio/obs: Fixed packaging on Fedora 30 [skip ci]
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: master Commit: b2402ec1fdde4584c9061e0a47a92e3328b5e7a8 URL: https://github.com/kamailio/kamailio/commit/b2402ec1fdde4584c9061e0a47a92e3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T19:28:58+03:00 pkg/kamailio/obs: Fixed packaging on Fedora 30 [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b2402ec1fdde4584c9061e0a47a92e3… Patch: https://github.com/kamailio/kamailio/commit/b2402ec1fdde4584c9061e0a47a92e3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5706b5178e..03bdb4c33c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -289,6 +289,10 @@ BuildRequires: python3-devel %if 0%{?fedora} == 28 BuildRequires: python3-devel %endif +%if 0%{?fedora} == 30 +BuildRequires: python3-devel +%endif + %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -393,7 +397,7 @@ Module which provides a mechanism to limit call duration based on credit informa %package cpl Summary: CPL (Call Processing Language) interpreter for Kamailio Group: %{PKGGROUP} -Requires: libxml2, kamailio = %ver +Requires: which, libxml2, kamailio = %ver BuildRequires: libxml2-devel %description cpl @@ -1056,9 +1060,14 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} +%if "%{__python2}" != "" + sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py +%endif + ln -s ../obs pkg/kamailio/fedora/27 ln -s ../obs pkg/kamailio/fedora/28 ln -s ../obs pkg/kamailio/fedora/29 +ln -s ../obs pkg/kamailio/fedora/30 ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 ln -s ../obs pkg/kamailio/opensuse/1315 @@ -1748,6 +1757,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf +%doc %{_docdir}/kamailio/modules/README.ims_usrloc_scscf %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so %{_libdir}/kamailio/modules/ims_auth.so

1 0

git:master:e29e50e0: pkg/kamailio/obs: Added openssl_mutex_shared into TLS module package [skip ci]
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: master Commit: e29e50e0ed02a34d9b4bfd63853fbe3b6d2a78ef URL: https://github.com/kamailio/kamailio/commit/e29e50e0ed02a34d9b4bfd63853fbe3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T19:29:51+03:00 pkg/kamailio/obs: Added openssl_mutex_shared into TLS module package [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e29e50e0ed02a34d9b4bfd63853fbe3… Patch: https://github.com/kamailio/kamailio/commit/e29e50e0ed02a34d9b4bfd63853fbe3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 03bdb4c33c..09e8e0580a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2096,6 +2096,8 @@ fi %doc %{_docdir}/kamailio/modules/README.tls %{_libdir}/kamailio/modules/auth_identity.so %{_libdir}/kamailio/modules/tls.so +%dir %{_libdir}/kamailio/openssl_mutex_shared +%{_libdir}/kamailio/openssl_mutex_shared/openssl_mutex_shared.so %files tcpops

1 0

git:5.2:14ac6f41: pkg/kamailio/alpine: Packaged pua_json, db_redis, ims_ocs, acc_json [skip ci]
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: 5.2 Commit: 14ac6f410e2e2a6bf6010598234e2bb772ecec0f URL: https://github.com/kamailio/kamailio/commit/14ac6f410e2e2a6bf6010598234e2bb… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T13:03:23+03:00 pkg/kamailio/alpine: Packaged pua_json, db_redis, ims_ocs, acc_json [skip ci] (cherry picked from commit fd98820199be3c395174b6f86a24773356d802b6) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/14ac6f410e2e2a6bf6010598234e2bb… Patch: https://github.com/kamailio/kamailio/commit/14ac6f410e2e2a6bf6010598234e2bb… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4a08a3c065..910004f9f7 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -178,17 +178,17 @@ _mod_list_sqlite="db_sqlite" _mod_list_oracle="db_oracle" # - modules depending on json library -_mod_list_json="json jsonrpcc jsonrpcs" +_mod_list_json="json jsonrpcc jsonrpcs pua_json" # - modules depending on redis library -_mod_list_redis="ndb_redis topos_redis" +_mod_list_redis="db_redis ndb_redis topos_redis" # - modules depending on mono library _mod_list_mono="app_mono" # - modules related to IMS extensions _mod_list_ims="cdp cdp_avp ims_dialog ims_diameter_server ims_auth ims_isc ims_icscf ims_qos \ - ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ + ims_ocs ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ ims_usrloc_scscf ims_charging" # - modules depending on osp toolkit library @@ -216,7 +216,7 @@ _mod_list_kazoo="kazoo" _mod_list_mongodb="db_mongodb ndb_mongodb" # - modules depending on jansson library -_mod_list_jansson="jansson janssonrpcc" +_mod_list_jansson="acc_json jansson janssonrpcc" # - modules depending on libm _mod_list_jsdt="app_jsdt"

1 0

git:master:fd988201: pkg/kamailio/alpine: Packaged pua_json, db_redis, ims_ocs, acc_json [skip ci]
by Sergey Safarov 18 May '19

18 May '19

Module: kamailio Branch: master Commit: fd98820199be3c395174b6f86a24773356d802b6 URL: https://github.com/kamailio/kamailio/commit/fd98820199be3c395174b6f86a24773… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-05-18T12:57:04+03:00 pkg/kamailio/alpine: Packaged pua_json, db_redis, ims_ocs, acc_json [skip ci] --- Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/fd98820199be3c395174b6f86a24773… Patch: https://github.com/kamailio/kamailio/commit/fd98820199be3c395174b6f86a24773… --- diff --git a/pkg/docker b/pkg/docker index b1c54322f0..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b1c54322f0f490786772db41c4390d7687ed16a6 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index ffcaa136ff..57c1c4bbcb 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -178,17 +178,17 @@ _mod_list_sqlite="db_sqlite" _mod_list_oracle="db_oracle" # - modules depending on json library -_mod_list_json="json jsonrpcc jsonrpcs" +_mod_list_json="json jsonrpcc jsonrpcs pua_json" # - modules depending on redis library -_mod_list_redis="ndb_redis topos_redis" +_mod_list_redis="db_redis ndb_redis topos_redis" # - modules depending on mono library _mod_list_mono="app_mono" # - modules related to IMS extensions _mod_list_ims="cdp cdp_avp ims_dialog ims_diameter_server ims_auth ims_isc ims_icscf ims_qos \ - ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ + ims_ocs ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ ims_usrloc_scscf ims_charging" # - modules depending on osp toolkit library @@ -216,7 +216,7 @@ _mod_list_kazoo="kazoo" _mod_list_mongodb="db_mongodb ndb_mongodb" # - modules depending on jansson library -_mod_list_jansson="jansson janssonrpcc" +_mod_list_jansson="acc_json jansson janssonrpcc" # - modules depending on libm _mod_list_jsdt="app_jsdt"

1 0

Re: [sr-dev] [SR-Users] "If you're struggling with your Tele callers to improve sales? you're not alone.
by Daniel-Constantin Mierla 17 May '19

17 May '19

Given the type of messages sent quickly one after the other, I removed the user from both sr-dev and sr-users mailing lists. Either his email account was hacked or he subscribed for advertising/spam purposes. If anyone knows him and thinks it is the first case, notify him. Cheers, Daniel On 17.05.19 14:21, Prakash wrote: [...] _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

"If you're struggling with your Tele callers to improve sales? you're not alone.
by Prakash 17 May '19

17 May '19

http://www.doocti.com +919790776655 Doocti Next Generation CTI for Smarter Sales Teams http://www.doocti.com Dear Customer, Greeting from Tevatel. Hope this mail finds you well. We are happy to announce the launch of our new product Doocti - Call center connector for crm What is Doocti? Doocti is a Computer telephony integration platform that can integrate your communication devices with your Helpdesk, CRM, and Other Key Tools. Increase agent productivity, improve customer experience and enable personalized service through deep customer insights at the point of interaction. Features of Doocti Single click Dial On-Screen Customer Profile Build on the Customer Profile Efficient Call Disposition Auto Dial Sticky Agent Feedback from the clients Reduce call time by 10-20 seconds per call Instantly retrieves and screen-pops customer related information Provides a better and more immediate response to the customers Offers a more personalized experience to the caller Dials out automatically and faster with a single mouse click Handles higher call volumes Increases first call resolution Intergrated with Currently we have associated with more than 20 brands. Curious to see what's under the hood? Enjoy a detailed look at the Doocti experience in a demo guided by a member of our team. Get a meeting on the calendar today. mailto:prakash.n@tevatel.com?subject=Need More Information about Doocti Request for a Demo [ mailto:prakash.n@tevatel.com?subject=Need More Information about Doocti ] Communications Simplified Contact Us: +919790776655 | prakash.n(a)tevatel.com No:76, Swamibakthan Street, Nammalwarpet, Chennai - 600012. www.tevatel.com | www.doocti.com http://viewstripo.email/?utm_source=templates&utm_medium=email&utm_campaign… ---------------------------------------------------------------------- This email was sent by prakash.n(a)tevatel.com to sr-dev(a)lists.sip-router.org Not interested?Unsubscribe - https://tihk.maillist-manage.com/ua/optout?od=27218d28c96aa859ed0ac1287be0e… Update profile - https://tihk.maillist-manage.com/ua/upc?upd=164d3589027540bb&r=164d35890275… Asterfone technologies pvt ltd | Swamibakthan St, Thiruvalluvar Nagar, Nammalwarpet, Ayanavaram, Chennai, Tamil Nadu 600010 Our Privacy Policy [ ] and Terms of Use. [ ]

1 0

git:master:14d69ddb: core: allow to set advertised address to -l command line parameter
by Daniel-Constantin Mierla 17 May '19

17 May '19

Module: kamailio Branch: master Commit: 14d69ddb39cb3072fd51d6f8f053430b0750e2ba URL: https://github.com/kamailio/kamailio/commit/14d69ddb39cb3072fd51d6f8f053430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-17T10:31:22+02:00 core: allow to set advertised address to -l command line parameter * -l listen-address/advertised-address * -l udp:10.0.0.10:5080/1.2.3.4:5060 --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/14d69ddb39cb3072fd51d6f8f053430… Patch: https://github.com/kamailio/kamailio/commit/14d69ddb39cb3072fd51d6f8f053430… --- diff --git a/src/main.c b/src/main.c index 95a7c9e001..e680d92e69 100644 --- a/src/main.c +++ b/src/main.c @@ -177,11 +177,14 @@ Options:\n\ -I Print more internal compile flags and options\n\ -K Turn on \"via:\" host checking when forwarding replies\n\ -l address Listen on the specified address/interface (multiple -l\n\ - mean listening on more addresses). The address format is\n\ - [proto:]addr_lst[:port], where proto=udp|tcp|tls|sctp, \n\ - addr_lst= addr|(addr, addr_lst) and \n\ - addr= host|ip_address|interface_name. \n\ + mean listening on more addresses). The address format is\n\ + [proto:]addr_lst[:port][/advaddr], \n\ + where proto=udp|tcp|tls|sctp, \n\ + addr_lst= addr|(addr, addr_lst), \n\ + addr=host|ip_address|interface_name and \n\ + advaddr=addr[:port] (advertised address). \n\ E.g: -l localhost, -l udp:127.0.0.1:5080, -l eth0:5062,\n\ + -l udp:127.0.0.1:5080/1.2.3.4:5060,\n\ -l \"sctp:(eth0)\", -l \"(eth0, eth1, 127.0.0.1):5065\".\n\ The default behaviour is to listen on all the interfaces.\n\ -L path Modules search path (default: " MODS_DIR ")\n\ @@ -1885,6 +1888,8 @@ int main(int argc, char** argv) int tmp_len; int port; int proto; + char *ahost = NULL; + int aport = 0; char *options; int ret; unsigned int seed; @@ -1895,6 +1900,9 @@ int main(int argc, char** argv) char *p; struct stat st = {0}; +#define KSR_TBUF_SIZE 512 + char tbuf[KSR_TBUF_SIZE]; + int option_index = 0; #define KARGOPTVAL 1024 @@ -2321,7 +2329,38 @@ int main(int argc, char** argv) #endif break; case 'l': - if ((n_lst=parse_phostport_mh(optarg, &tmp, &tmp_len, + p = strrchr(optarg, '/'); + if(p==NULL) { + p = optarg; + } else { + if(strlen(optarg)>=KSR_TBUF_SIZE-1) { + fprintf(stderr, "listen value too long: %s\n", + optarg); + goto error; + } + strcpy(tbuf, optarg); + p = strrchr(tbuf, '/'); + if(p==NULL) { + fprintf(stderr, "unexpected bug for listen: %s\n", + optarg); + goto error; + } + *p = '\0'; + p++; + tmp_len = 0; + if(parse_phostport(p, &ahost, &tmp_len, &aport, + &proto)<0) + { + fprintf(stderr, "listen value with invalid advertise: %s\n", + optarg); + goto error; + } + if(ahost) { + ahost[tmp_len] = '\0'; + } + p = tbuf; + } + if ((n_lst=parse_phostport_mh(p, &tmp, &tmp_len, &port, &proto))==0){ fprintf(stderr, "bad -l address specifier: %s\n" "Check disabled protocols\n", @@ -2329,9 +2368,10 @@ int main(int argc, char** argv) goto error; } /* add a new addr. to our address list */ - if (add_listen_iface(n_lst->name, n_lst->next, port, - proto, n_lst->flags)!=0){ - fprintf(stderr, "failed to add new listen address\n"); + if (add_listen_advertise_iface(n_lst->name, n_lst->next, port, + proto, ahost, aport, n_lst->flags)!=0){ + fprintf(stderr, "failed to add new listen address: %s\n", + optarg); free_name_lst(n_lst); goto error; }

1 0

git:5.2:353192ca: db_mongodb: catch the null values and set the type to DB1_STRING
by Daniel-Constantin Mierla 17 May '19

17 May '19

Module: kamailio Branch: 5.2 Commit: 353192ca4f2203fb85fdda6e0ea9e734f27019cf URL: https://github.com/kamailio/kamailio/commit/353192ca4f2203fb85fdda6e0ea9e73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-17T09:22:17+02:00 db_mongodb: catch the null values and set the type to DB1_STRING - avoid the log message on unhandled type (cherry picked from commit a5781fc4bb3063c6e7abf54d93178ef610617298) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/353192ca4f2203fb85fdda6e0ea9e73… Patch: https://github.com/kamailio/kamailio/commit/353192ca4f2203fb85fdda6e0ea9e73… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 8d88049919..db7f67c1e9 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -504,13 +504,18 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) RES_TYPES(_r)[col] = DB1_STRING; break; + case BSON_TYPE_NULL: + /* 'null' value - default to type DB1_STRING */ + LM_DBG("BSON_TYPE_NULL - use DB1_STRING result type\n"); + RES_TYPES(_r)[col] = DB1_STRING; + break; + #if 0 case BSON_TYPE_EOD: case BSON_TYPE_DOCUMENT: case BSON_TYPE_ARRAY: case BSON_TYPE_UNDEFINED: case BSON_TYPE_OID: - case BSON_TYPE_NULL: case BSON_TYPE_REGEX: case BSON_TYPE_DBPOINTER: case BSON_TYPE_CODE:

1 0

git:master:10414705: misc/tools/kemi: added tool to generate code for KEMI modules
by Daniel-Constantin Mierla 17 May '19

17 May '19

Module: kamailio Branch: master Commit: 104147050fdcba8cdb870f866fbb4cbac3281ba4 URL: https://github.com/kamailio/kamailio/commit/104147050fdcba8cdb870f866fbb4cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-17T09:11:03+02:00 misc/tools/kemi: added tool to generate code for KEMI modules - kemi-code-gen.py - can generate typedefs for functions and the large if-else blocks for variants of parameters --- Added: misc/tools/kemi/README.md Added: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/104147050fdcba8cdb870f866fbb4cb… Patch: https://github.com/kamailio/kamailio/commit/104147050fdcba8cdb870f866fbb4cb…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev