- sr-dev - kamailio.org

[kamailio/kamailio] siptrace: check if trace_to_database is set before checking the db co… (#2047)
by Federico Cabiddu 27 Aug '19

27 Aug '19

…nnection   #### Pre-Submission Checklist    - [ X] Commit message has the format required by CONTRIBUTING guide - [ X] Commits are split per component (core, individual modules, libs, utils, ...) - [ X] Each component has a single commit (if not, squash them into one commit) - [X ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ X] PR should be backported to stable branches - [ X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Return the proper error code to not stop message processing in reply_route. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2047 -- Commit Summary -- * siptrace: check if trace_to_database is set before checking the db connection -- File Changes -- M src/modules/siptrace/siptrace.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2047.patch https://github.com/kamailio/kamailio/pull/2047.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/2047

2 2

git:master:042971bc: Merge pull request #2047 from kamailio/grumvalski/siptrace_fix
by GitHub 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 042971bcb6bb47ced735f5405fa5534f94d81dce URL: https://github.com/kamailio/kamailio/commit/042971bcb6bb47ced735f5405fa5534… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-27T09:26:48+02:00 Merge pull request #2047 from kamailio/grumvalski/siptrace_fix siptrace: check if trace_to_database is set before checking the db coâ¦ --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/042971bcb6bb47ced735f5405fa5534… Patch: https://github.com/kamailio/kamailio/commit/042971bcb6bb47ced735f5405fa5534… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 8fa832a043..211ddac363 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -542,14 +542,14 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, static int sip_trace_store_db(siptrace_data_t *sto) { + if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) + goto done; + if(db_con == NULL) { LM_DBG("database connection not initialized\n"); return -1; } - if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) - goto done; - db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS];

1 0

git:master:afd0c929: siptrace: check if trace_to_database is set before checking the db connection
by Federico Cabiddu 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: afd0c929dc72a975e2ca3c88f307fd8c140a4fda URL: https://github.com/kamailio/kamailio/commit/afd0c929dc72a975e2ca3c88f307fd8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-08-26T20:21:13+02:00 siptrace: check if trace_to_database is set before checking the db connection --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/afd0c929dc72a975e2ca3c88f307fd8… Patch: https://github.com/kamailio/kamailio/commit/afd0c929dc72a975e2ca3c88f307fd8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 8fa832a043..211ddac363 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -542,14 +542,14 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, static int sip_trace_store_db(siptrace_data_t *sto) { + if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) + goto done; + if(db_con == NULL) { LM_DBG("database connection not initialized\n"); return -1; } - if(trace_to_database_flag == NULL || *trace_to_database_flag == 0) - goto done; - db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS];

1 0

git:master:b241fc7e: tm: docs - clarifications about event routes
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: b241fc7e1d20098dd8b0666297303fe7255587e8 URL: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T09:17:18+02:00 tm: docs - clarifications about event routes --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… Patch: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index adda5536ed..b969695c9a 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -10,20 +10,20 @@ <section id="tm.e.branch-failure"> <title> - <function moreinfo="none">event_route[tm:branch-failure]</function> + <function moreinfo="none">event_route[tm:branch-failure:id]</function> </title> <para> Named branch failure routes can be defined to run when when a failure response is received. This allows handling failures on individual branches, for example, retrying an alternative outbound flow. </para> - <para> - The format of the event_route name is "tm:branch-failure:<name>" - and is enabled with the t_on_branch_failure function. - This event_route uses the BRANCH_FAILURE_ROUTE route type. - </para> + <para> + The format of the event_route name is "tm:branch-failure:<id>" + and is enabled with the t_on_branch_failure function. + This event_route uses the BRANCH_FAILURE_ROUTE route type. + </para> <example> - <title><function>event_route[tm:branch-failure]</function> usage</title> + <title><function>event_route[tm:branch-failure:id]</function> usage</title> <programlisting> ... request_route { @@ -44,7 +44,17 @@ event_route[tm:branch-failure:myroute] { <function moreinfo="none">event_route[tm:local-request]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful request. + Executed when the tm module generates a request, in other words, + the request originates from &kamailio; and a transaction is created + for it. The source of the requests can be tm itself or other modules + that use tm internally (e.g., msilo, uac). The event route is executed + if it is defined in the native &kamailio; config file. To execute + the equivalent callback when using KEMI scripting, see the + 'event_callback' module parameter. + </para> + <para> + The request can still be updated, i.e., changes are possible to + R-URI ($ru), destination URI ($du) or the send socket ($fs). </para> <example> <title><function>event_route[tm:local-request]</function> usage</title> @@ -63,7 +73,8 @@ event_route [tm:local-request] { <function moreinfo="none">event_route[tm:local-response]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful response. + Executed when the tm module is about to send a local generated, + transaction stateful response. </para> <example> <title><function>event_route[tm:local-response]</function> usage</title>

1 0

[kamailio/kamailio] pkg/kamailio/alpine: packaged MongoDB module (#2000)
by sergey-safarov 27 Aug '19

27 Aug '19

#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ x Related to issue #1995 #### Description Packaged MongoDB driver for Alpine dist Need wait utils merged [PR for alpine dist](https://github.com/alpinelinux/aports/pull/9273) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2000 -- Commit Summary -- * pkg/kamailio/alpine: packaged MongoDB module [skip ci] -- File Changes -- M pkg/kamailio/alpine/APKBUILD (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2000.patch https://github.com/kamailio/kamailio/pull/2000.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/2000

2 3

git:master:fa7e915b: pkg/kamailio/alpine: packaged MongoDB module [skip ci]
by sergey-safarov 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: fa7e915b31965709be6549076f70ff6a65817db0 URL: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2019-08-27T09:44:21+03:00 pkg/kamailio/alpine: packaged MongoDB module [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… Patch: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index d82f5a8279..74a6566248 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -31,7 +31,7 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev - ruby-dev libmaxminddb-dev libunistring-dev" + ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -253,7 +253,7 @@ _modules="$_module_group_kstandard" for _i in db postgres sqlite dbtext mysql \ cpl xml unixodbc snmpstats xmpp carrierroute \ ldap utils tls presence lua ims outbound debugger \ - extras json websocket authephemeral \ + extras json websocket authephemeral mongodb\ uuid ev memcached redis geoip2 jansson sqlang sipdump \ jsdt http_async kazoo rabbitmq sctp radius perl python \ python3 ruby; do @@ -499,6 +499,11 @@ memcached() { "$_mod_list_memcached" } +mongodb() { + _generic_pkg "MongoDB database connectivity" \ + "$_mod_list_mongodb" +} + rabbitmq() { _generic_pkg "RabbitMQ client for configuration file" \ "$_mod_list_rabbitmq"

1 0

git:master:6b52ccc6: pkg/docker: updated submodule
by Sergey Safarov 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 6b52ccc6176da328205dafcde55a34af59f1729e URL: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-08-27T09:40:52+03:00 pkg/docker: updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… Patch: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… --- diff --git a/pkg/docker b/pkg/docker index b92a1c899b..424756ff7a 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 +Subproject commit 424756ff7aca572466a99059f76d44ce57e01646

1 0

[kamailio/kamailio] rtpengine module set_rtpengine_set(set1, set2) issue (#2039)
by juha-h 26 Aug '19

26 Aug '19

My Kamailio master based test sip proxy has two rtpengine sets: ``` # sip-proxy_ctl rtpengine.show all { url: udp:192.26.134.1:6050 set: 0 index: 0 weight: 1 disabled: 0 recheck_ticks: 0 } { url: udp:192.26.134.40:6050 set: 1 index: 1 weight: 1 disabled: 0 recheck_ticks: 0 } ``` Config calls set_rtpengine_set() with two set argument followed by rtpengine_offer(): ``` set_rtpengine_set("1", "0"); rtpengine_offer("..."); ``` Debug shows that sip proxy sends TWO offer commands to the rtpproxy in the first set 1 and NONE to the rtpproxy in the second set 0. Debug at set 1 engine: ``` Aug 19 18:06:08 buster-10-0 rtpengine[1314]: NOTICE: [5e1407211cc50fd9]: Creating new call Aug 19 18:06:08 buster-10-0 rtpengine[1314]: INFO: [5e1407211cc50fd9]: Replying to 'offer' from 192.26.134.1:33284 (elapsed time 0.000812 sec) Aug 19 18:06:08 buster-10-0 rtpengine[1314]: INFO: [5e1407211cc50fd9]: Received command 'offer' from 192.26.134.1:33284 Aug 19 18:06:08 buster-10-0 rtpengine[1314]: INFO: [5e1407211cc50fd9]: Replying to 'offer' from 192.26.134.1:33284 (elapsed time 0.005247 sec) ``` This looks like a bug to me, since according to README, rtpengine should first send the offer to an engine in the first set and then to an engine in the second set. -- 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/2039

1 5

[kamailio/kamailio] modules/rtpengine: set_rtpengine_set fix (#2040)
by juha-h 26 Aug '19

26 Aug '19

WIthout this fix, set_rtpengine_set(set1, set2) sets set1 twice and set2 not at all. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2040 -- Commit Summary -- * modules/rtpengine: set_rtpengine_set fix -- File Changes -- M src/modules/rtpengine/rtpengine.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2040.patch https://github.com/kamailio/kamailio/pull/2040.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/2040

3 5

git:master:e4edf538: Merge pull request #2040 from kamailio/set_rtpengine_set
by GitHub 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: e4edf53858c399e5a3e635d04725a8a137523d15 URL: https://github.com/kamailio/kamailio/commit/e4edf53858c399e5a3e635d04725a8a… Author: juha-h <jh(a)tutpro.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-26T21:43:53+03:00 Merge pull request #2040 from kamailio/set_rtpengine_set modules/rtpengine: set_rtpengine_set fix --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e4edf53858c399e5a3e635d04725a8a… Patch: https://github.com/kamailio/kamailio/commit/e4edf53858c399e5a3e635d04725a8a… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7a6b73d747..6e436083ec 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3079,6 +3079,15 @@ select_rtpp_node_old(str callid, str viabranch, int do_test, enum rtpe_operation return node; } +unsigned int node_in_set(struct rtpp_node *node, struct rtpp_set *set) { + struct rtpp_node *current = set->rn_first; + while (current) { + if (current->idx == node->idx) return 1; + current = current->rn_next; + } + return 0; +} + /* * Main balancing routine. This DO try to keep the same proxy for * the call if some proxies were disabled or enabled (e.g. kamctl command) @@ -3107,7 +3116,7 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer node = select_rtpp_node_old(callid, viabranch, do_test, op); // check node - if (!node) { + if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm node = select_rtpp_node_new(callid, viabranch, do_test, queried_nodes_ptr, queried_nodes);

1 0

git:master:fe6614fe: modules/rtpengine: set_rtpengine_set fix
by Juha Heinanen 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: fe6614feb5f9b062a556de82fd7df6fc12c96471 URL: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2019-08-23T10:05:33+03:00 modules/rtpengine: set_rtpengine_set fix --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… Patch: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7a6b73d747..6e436083ec 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3079,6 +3079,15 @@ select_rtpp_node_old(str callid, str viabranch, int do_test, enum rtpe_operation return node; } +unsigned int node_in_set(struct rtpp_node *node, struct rtpp_set *set) { + struct rtpp_node *current = set->rn_first; + while (current) { + if (current->idx == node->idx) return 1; + current = current->rn_next; + } + return 0; +} + /* * Main balancing routine. This DO try to keep the same proxy for * the call if some proxies were disabled or enabled (e.g. kamctl command) @@ -3107,7 +3116,7 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer node = select_rtpp_node_old(callid, viabranch, do_test, op); // check node - if (!node) { + if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm node = select_rtpp_node_new(callid, viabranch, do_test, queried_nodes_ptr, queried_nodes);

1 0

git:master:78a62e19: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: 78a62e19955ada9d67245031780bad29035b0ef2 URL: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-26T16:02:22+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… Patch: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index d9643f2ce1..47598f379e 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1161,8 +1161,11 @@ modparam("tm", "reparse_on_dns_failover", 0) Sets reply route block, to which control is passed when a reply is received that has no associated transaction. The reply is passed to the - core for stateless forwarding after the route block execution unless it - returns 0. + core for stateless forwarding after the route block execution unless + drop is executed (or it returns 0). + + If KEMI is used, the parameter has to be the KEMI function name, which + receives a string parameter with the event name. Example 1.24. Set on_sl_reply parameter ...

1 0

git:master:fa3c97a3: tm: docs - note about kemi for on_sl_reply parameter
by Daniel-Constantin Mierla 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: fa3c97a331b06ea675e830f418771e94375216cc URL: https://github.com/kamailio/kamailio/commit/fa3c97a331b06ea675e830f418771e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T15:52:29+02:00 tm: docs - note about kemi for on_sl_reply parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/fa3c97a331b06ea675e830f418771e9… Patch: https://github.com/kamailio/kamailio/commit/fa3c97a331b06ea675e830f418771e9… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index c7923d8c25..e17137c0cd 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -711,7 +711,11 @@ modparam("tm", "reparse_on_dns_failover", 0) Sets reply route block, to which control is passed when a reply is received that has no associated transaction. The reply is passed to the core for stateless forwarding after - the route block execution unless it returns 0. + the route block execution unless drop is executed (or it returns 0). + </para> + <para> + If KEMI is used, the parameter has to be the KEMI function name, which + receives a string parameter with the event name. </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,7 +731,7 @@ onreply_route["stateless_replies"] { </programlisting> </example> </section> - + <section id ="tm.p.contacts_avp"> <title><varname>contacts_avp</varname> (string)</title> <para>

1 0

git:master:3f1b5142: tm: lookup on_sl_reply route in mod_init()
by Daniel-Constantin Mierla 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: 3f1b5142c45f979b7847b2878ccf3b130baeae65 URL: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T13:31:29+02:00 tm: lookup on_sl_reply route in mod_init() - moved from fixup during modparam to store the name of the route block --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… Patch: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index f138e9a2e4..1fa7f9dda8 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -96,6 +96,7 @@ static int goto_on_branch_failure=0; static int goto_on_reply=0; /* where to go on receipt of reply without transaction context */ int goto_on_sl_reply=0; +extern str on_sl_reply_name; /* remap 503 response code to 500 */ extern int tm_remap_503_500; diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 370d477109..105bbaf1f2 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -96,7 +96,6 @@ static int fixup_on_branch_failure(void** param, int param_no); static int fixup_on_reply(void** param, int param_no); static int fixup_on_branch(void** param, int param_no); static int fixup_t_reply(void** param, int param_no); -static int fixup_on_sl_reply(modparam_t type, void* val); static int fixup_t_relay_to(void** param, int param_no); static int fixup_t_is_set(void** param, int param_no); @@ -217,7 +216,7 @@ static char *fr_inv_timer_param = 0 /*FR_INV_TIMER_AVP*/; str contacts_avp = {0, 0}; str contact_flows_avp = {0, 0}; str ulattrs_xavp_name = {NULL, 0}; - +str on_sl_reply_name = {NULL, 0}; int tm_remap_503_500 = 1; int tm_failure_exec_mode = 0; @@ -454,7 +453,7 @@ static param_export_t params[]={ {"cancel_b_method", PARAM_INT, &default_tm_cfg.cancel_b_flags}, {"reparse_on_dns_failover", PARAM_INT, &default_tm_cfg.reparse_on_dns_failover}, - {"on_sl_reply", PARAM_STRING|PARAM_USE_FUNC, fixup_on_sl_reply }, + {"on_sl_reply", PARAM_STR, &on_sl_reply_name }, {"contacts_avp", PARAM_STR, &contacts_avp }, {"contact_flows_avp", PARAM_STR, &contact_flows_avp }, {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, @@ -588,21 +587,6 @@ static int fixup_on_branch(void** param, int param_no) return 0; } -static int fixup_on_sl_reply(modparam_t type, void* val) -{ - if ((type & PARAM_STRING) == 0) { - LM_ERR("not a string parameter\n"); - return -1; - } - - if (fixup_routes(0, &onreply_rt, &val)) - return -1; - - goto_on_sl_reply = (int)(long)val; - return 0; -} - - /* (char *hostname, char *port_nr) ==> (struct proxy_l *, -) */ static int fixup_hostport2proxy(void** param, int param_no) @@ -716,6 +700,13 @@ static int mod_init(void) return -1; } + if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { + goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); + if (goto_on_sl_reply==-1){ + LM_ERR("route get failed for on_sl_reply\n"); + return -1; + } + } if (init_callid() < 0) { LM_CRIT("Error while initializing Call-ID generator\n"); return -1;

1 0

git:master:ce661240: tm: execute on_sl_reply callback via kemi
by Daniel-Constantin Mierla 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: ce6612402f122d38878834f7da70ebf75c12b37b URL: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T15:49:42+02:00 tm: execute on_sl_reply callback via kemi - the value of the parameter on_sl_reply has to be the kemi function name --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… Patch: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 1fa7f9dda8..30006ae8a6 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2162,7 +2162,6 @@ enum rps local_reply( struct cell *t, struct sip_msg *p_msg, int branch, */ int reply_received( struct sip_msg *p_msg ) { - int msg_status; int last_uac_status; char *ack; @@ -2192,6 +2191,8 @@ int reply_received( struct sip_msg *p_msg ) struct run_act_ctx ctx; struct run_act_ctx *bctx; sr_kemi_eng_t *keng = NULL; + int ret; + str evname = str_init("on_sl_reply"); /* make sure we know the associated transaction ... */ branch = T_BR_UNDEFINED; @@ -2566,17 +2567,40 @@ int reply_received( struct sip_msg *p_msg ) trans_not_found: /* transaction context was not found */ - if (goto_on_sl_reply) { - /* The script writer has a chance to decide whether to - * forward the reply or not. - * Pre- and post-script callbacks have already - * been execueted by the core. (Miklos) - */ - return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg, 0); - } else { - /* let the core forward the reply */ - return 1; + if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + if (goto_on_sl_reply) { + /* The script writer has a chance to decide whether to + * forward the reply or not. + * Pre- and post-script callbacks have already + * been execueted by the core. (Miklos) + */ + return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg, 0); + } else { + /* let the core forward the reply */ + return 1; + } + } else { + bctx = sr_kemi_act_ctx_get(); + init_run_actions_ctx(&ctx); + sr_kemi_act_ctx_set(&ctx); + ret = sr_kemi_ctx_route(keng, &ctx, p_msg, EVENT_ROUTE, + &on_sl_reply_name, &evname); + sr_kemi_act_ctx_set(bctx); + if(ret<0) { + LM_ERR("error running on sl reply callback\n"); + return -1; + } + if(unlikely(ctx.run_flags & DROP_R_F)) { + LM_DBG("drop flag set - skip forwarding the reply\n"); + return 0; + } + /* let the core forward the reply */ + return 1; + } } + return 1; } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 105bbaf1f2..99e20afcd3 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -689,6 +689,8 @@ static int script_init( struct sip_msg *foo, unsigned int flags, void *bar) static int mod_init(void) { + sr_kemi_eng_t *keng = NULL; + DBG( "TM - (sizeof cell=%ld, sip_msg=%ld) initializing...\n", (long)sizeof(struct cell), (long)sizeof(struct sip_msg)); @@ -701,10 +703,13 @@ static int mod_init(void) } if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { - goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); - if (goto_on_sl_reply==-1){ - LM_ERR("route get failed for on_sl_reply\n"); - return -1; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); + if (goto_on_sl_reply==-1){ + LM_ERR("route get failed for on_sl_reply\n"); + return -1; + } } } if (init_callid() < 0) {

1 0

git:master:b8e725c4: websocket: remove core stats.h #include, remove no-op #defines as well
by Henning Westerholt 25 Aug '19

25 Aug '19

Module: kamailio Branch: master Commit: b8e725c407ce5b0b9580ab0d8bd7a9223b509193 URL: https://github.com/kamailio/kamailio/commit/b8e725c407ce5b0b9580ab0d8bd7a92… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:27:56+02:00 websocket: remove core stats.h #include, remove no-op #defines as well --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/b8e725c407ce5b0b9580ab0d8bd7a92… Patch: https://github.com/kamailio/kamailio/commit/b8e725c407ce5b0b9580ab0d8bd7a92… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 36b465bc65..2da0863de5 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -34,7 +34,6 @@ #include "../../core/events.h" #include "../../core/receive.h" -#include "../../core/stats.h" #include "../../core/str.h" #include "../../core/tcp_conn.h" #include "../../core/tcp_read.h" @@ -244,7 +243,6 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if(dst.proto == PROTO_WS) { if(unlikely(tcp_disable)) { - STATS_TX_DROPS; LM_WARN("TCP disabled\n"); pkg_free(send_buf); tcpconn_put(con); @@ -254,7 +252,6 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) #ifdef USE_TLS else if(dst.proto == PROTO_WSS) { if(unlikely(tls_disable)) { - STATS_TX_DROPS; LM_WARN("TLS disabled\n"); pkg_free(send_buf); tcpconn_put(con); @@ -275,7 +272,6 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) dst.send_flags.f |= SND_F_FORCE_CON_REUSE; if(tcp_send(&dst, from, send_buf, frame_length) < 0) { - STATS_TX_DROPS; LM_ERR("sending WebSocket frame\n"); pkg_free(send_buf); update_stat(ws_failed_connections, 1);

1 0

git:master:74dd23ad: tls: remove core stats.h #include, add necessary system #include for open(..)
by Henning Westerholt 25 Aug '19

25 Aug '19

Module: kamailio Branch: master Commit: 74dd23adc125ee2e3e9f31a4d33a9fd687638a21 URL: https://github.com/kamailio/kamailio/commit/74dd23adc125ee2e3e9f31a4d33a9fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:26:34+02:00 tls: remove core stats.h #include, add necessary system #include for open(..) --- Modified: src/modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/74dd23adc125ee2e3e9f31a4d33a9fd… Patch: https://github.com/kamailio/kamailio/commit/74dd23adc125ee2e3e9f31a4d33a9fd… --- diff --git a/src/modules/tls/tls_config.c b/src/modules/tls/tls_config.c index 72ed987360..4c7d2963ab 100644 --- a/src/modules/tls/tls_config.c +++ b/src/modules/tls/tls_config.c @@ -36,10 +36,11 @@ #include "../../core/trim.h" #include "../../core/ut.h" #include "../../core/cfg/cfg.h" -#include "../../core/stats.h" #include <dirent.h> +#include <sys/types.h> #include <sys/stat.h> +#include <fcntl.h> static tls_domains_cfg_t* _ksr_tls_cfg = NULL; static tls_domain_t* _ksr_tls_domain = NULL;

1 0

git:master:b38fe1b5: core: remove STATS #define, depends on non-existing module, does not compile
by Henning Westerholt 25 Aug '19

25 Aug '19

Module: kamailio Branch: master Commit: b38fe1b5b6061c07a050b329bacd55377bdd45ef URL: https://github.com/kamailio/kamailio/commit/b38fe1b5b6061c07a050b329bacd553… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:20:17+02:00 core: remove STATS #define, depends on non-existing module, does not compile - remove STATS #define, depends on non-existing snmp module, does not compile - could be used to print e.g. number of packets on SIGUSR1 - these numbers were reported through SNMP - replaced by Kamailio statistics support - remove stats.c and stats.h files --- Modified: src/Makefile.defs Modified: src/core/cfg.y Modified: src/core/forward.c Modified: src/core/forward.h Modified: src/core/receive.c Modified: src/core/ver_defs.h Modified: src/main.c Removed: src/core/stats.c Removed: src/core/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/b38fe1b5b6061c07a050b329bacd553… Patch: https://github.com/kamailio/kamailio/commit/b38fe1b5b6061c07a050b329bacd553…

1 0

ims_diameter_server and cdp modules modification
by Maryam Baghdadi 25 Aug '19

25 Aug '19

Hello, I used from kamailio with MMTel features as AS in my IMS scenario and I wanted to send UDR diameter request from AS to my HSS. According to my study I should use "diameter_request" or "diameter_request_async" in ims_diameter_server module . but some problem exists in diameter_request function which caused "json" string as input of "diameter_request" ignored and fault happened. I added parse and checking "json" string in diameter_request function in ims_diameter_server.c file : if (message) { if (get_str_fparam(&s_message, msg, (fparam_t*)message) < 0) { LM_ERR("failed to get json string\n"); return -1; } LM_DBG("json %.*s\n", s_message.len, s_message.s); } also cdp_get_session function in cdp module has problem with "lock and unlock session" and " AAASessionsLock(hash); " doesn't work correctly. I comment " AAASessionsLock(hash);" and " AAASessionsUnlock(hash);" I recompiled ims_diameter_server and cdp modules again called below part in request_route of my configuration : if(is_method("REGISTER")) { diameter_request("hss domain address", "16777217", "306", "{ 'avpCode':263 , ....}"); } this worked correctly and UDR request sent to hss .

2 1

git:5.2:b16b9bf4: core: kemi - warning when using an unsupported method flag for is_method_in()
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: b16b9bf49d1b8437673c8913265daf8ee311e51a URL: https://github.com/kamailio/kamailio/commit/b16b9bf49d1b8437673c8913265daf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:23:27+02:00 core: kemi - warning when using an unsupported method flag for is_method_in() (cherry picked from commit 7dc450006743ea160864ce5583a4494fb1033e9e) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b16b9bf49d1b8437673c8913265daf8… Patch: https://github.com/kamailio/kamailio/commit/b16b9bf49d1b8437673c8913265daf8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ccdc90cf18..fda12d72e4 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -869,6 +869,8 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + default: + LM_WARN("unsupported method flag: %c\n", vmethod->s[i]); } } return SR_KEMI_FALSE;

1 0

git:master:7dc45000: core: kemi - warning when using an unsupported method flag for is_method_in()
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 7dc450006743ea160864ce5583a4494fb1033e9e URL: https://github.com/kamailio/kamailio/commit/7dc450006743ea160864ce5583a4494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:22:16+02:00 core: kemi - warning when using an unsupported method flag for is_method_in() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7dc450006743ea160864ce5583a4494… Patch: https://github.com/kamailio/kamailio/commit/7dc450006743ea160864ce5583a4494… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f7c0086eaf..286e81fed0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -875,6 +875,8 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + default: + LM_WARN("unsupported method flag: %c\n", vmethod->s[i]); } } return SR_KEMI_FALSE;

1 0

git:5.2:b21a75da: core: kemi - fix matching update for is_method_in("U")
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: b21a75dad1575999549f9a84de522dfb8d7fb50f URL: https://github.com/kamailio/kamailio/commit/b21a75dad1575999549f9a84de522df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:11:59+02:00 core: kemi - fix matching update for is_method_in("U") (cherry picked from commit e876770e36c83ce47d1b0f95c14fe269b92a4e70) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b21a75dad1575999549f9a84de522df… Patch: https://github.com/kamailio/kamailio/commit/b21a75dad1575999549f9a84de522df… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f638174947..ccdc90cf18 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -839,6 +839,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'U': + case 'u': + if(imethod==METHOD_UPDATE) { + return SR_KEMI_TRUE; + } + break; case 'K': case 'k': if(imethod==METHOD_KDMQ) {

1 0

git:master:e876770e: core: kemi - fix matching update for is_method_in("U")
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: e876770e36c83ce47d1b0f95c14fe269b92a4e70 URL: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:10:36+02:00 core: kemi - fix matching update for is_method_in("U") --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… Patch: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 39ee38773c..f7c0086eaf 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -845,6 +845,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'U': + case 'u': + if(imethod==METHOD_UPDATE) { + return SR_KEMI_TRUE; + } + break; case 'K': case 'k': if(imethod==METHOD_KDMQ) {

1 0

[kamailio/kamailio] Dispatcher probes a maximum of 15 Gateways at a time (#2041)
by duarterocha91 24 Aug '19

24 Aug '19

### Description I have a Kamailio with several Gateways configured. It's Probing is done using Dispatcher module and setting the GW state with value "8". If more than 15 Gw's are set as "8" with a probing frequency of 1min, only 15 GW will be probed each minute. I can't find a configuration for this and have already posted this issue in the sr-users mailing list I'm using Kamailio 5.2.0. Best Regards -- 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/2041

2 4

git:master:c8132a25: uac: small whitespace change in docs
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: c8132a25d412c4fb907b27dc4f4d24a479fc2770 URL: https://github.com/kamailio/kamailio/commit/c8132a25d412c4fb907b27dc4f4d24a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T12:29:57+02:00 uac: small whitespace change in docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c8132a25d412c4fb907b27dc4f4d24a… Patch: https://github.com/kamailio/kamailio/commit/c8132a25d412c4fb907b27dc4f4d24a… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e3a1abd35c..3ac4cc2a17 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -570,9 +570,9 @@ modparam("uac", "reg_gc_interval", 60) interfaces are available. </para> <para> - A send socket in the $uac_reg variable used together with the uac_req_send() - function will override this parameter. A socket value in the uacreg table will - also override the parameter for this particular entry. + A send socket in the $uac_reg variable used together with the uac_req_send() + function will override this parameter. A socket value in the uacreg table will + also override the parameter for this particular entry. </para> <para> <emphasis>

1 0

git:master:8c8aaa62: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 8c8aaa62db91c0b4ea25f09b4214947a6b80950b URL: https://github.com/kamailio/kamailio/commit/8c8aaa62db91c0b4ea25f09b4214947… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T12:01:42+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/8c8aaa62db91c0b4ea25f09b4214947… Patch: https://github.com/kamailio/kamailio/commit/8c8aaa62db91c0b4ea25f09b4214947… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 72722e0cc4..d2f1a180d6 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -567,9 +567,12 @@ modparam("uac", "reg_gc_interval", 60) Default socket to be used for generating registration requests and sending requests with the function uac_req_send(). Useful e.g. when - several public interfaces are available. A send socket in the $uac_reg - variable used together with the uac_req_send() function will override - this parameter. + several public interfaces are available. + + A send socket in the $uac_reg variable used together with the + uac_req_send() function will override this parameter. A socket value in + the uacreg table will also override the parameter for this particular + entry. By default no default socket is defined, the send socket is choosen from the “tm” module when the requests is send out. @@ -1079,6 +1082,9 @@ event_route[uac:reply] { * reg_delay - delay initial registration with at least reg_delay seconds, e.g.,: 3 + * socket - Used socket for sending out registration requests, e.g.:, + udp:192.168.0.125:5060 + The module takes care of sending REGISTER and refresh registrations before they expire.

1 0

git:master:55740c2b: uac: add functionality to specify a custom socket for each uacreg table entry
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 55740c2b1eb69a19a0a42b4264edcb1b5a9a0aa9 URL: https://github.com/kamailio/kamailio/commit/55740c2b1eb69a19a0a42b4264edcb1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T11:59:08+02:00 uac: add functionality to specify a custom socket for each uacreg table entry - add functionality to specify a custom socket for each uacreg table entry - necessary if you need to REGISTER over different outgoing interfaces with uac - add socket column to module database schemes - bump uacreg database table version from 3 to 4 - add database version check helper to module - extend RPC commands to output and also add this value - add documentation for the new functionality --- Modified: src/lib/srdb1/schema/uacreg.xml Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h Modified: utils/kamctl/db_berkeley/kamailio/uacreg Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_redis/kamailio/uacreg Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/dbtext/kamailio/uacreg Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/uacreg.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uac-table --- Diff: https://github.com/kamailio/kamailio/commit/55740c2b1eb69a19a0a42b4264edcb1… Patch: https://github.com/kamailio/kamailio/commit/55740c2b1eb69a19a0a42b4264edcb1…

1 0

git:master:6fe6b336: modules: readme files regenerated - ims_registrar_scscf ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 6fe6b336acd28d07aa227f9252a4b2cfbb8c2d39 URL: https://github.com/kamailio/kamailio/commit/6fe6b336acd28d07aa227f9252a4b2c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T10:47:22+02:00 modules: readme files regenerated - ims_registrar_scscf ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/6fe6b336acd28d07aa227f9252a4b2c… Patch: https://github.com/kamailio/kamailio/commit/6fe6b336acd28d07aa227f9252a4b2c… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index 889da1a800..e5bd47f275 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -1,4 +1,4 @@ -IMS Usrloc PCSCF Module +IMS Registrar SCSCF Module Jason Penton @@ -810,28 +810,28 @@ Chapter 2. Frequently Asked Questions 2.1. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at https://www.kamailio.org/. + Take a look at https://www.kamailio.org/. 2.2. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.kamailio.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.kamailio.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.kamailio.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.kamailio.org>. 2.3. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - https://github.com/kamailio/kamailio/issues. + Please follow the guidelines provided at: + https://github.com/kamailio/kamailio/issues.

1 0

git:5.2:5244a3ac: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: 5244a3ac50f9766fff9bf4f769eb1d3464d1fc74 URL: https://github.com/kamailio/kamailio/commit/5244a3ac50f9766fff9bf4f769eb1d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T10:47:03+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/5244a3ac50f9766fff9bf4f769eb1d3… Patch: https://github.com/kamailio/kamailio/commit/5244a3ac50f9766fff9bf4f769eb1d3… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index 889da1a800..e5bd47f275 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -1,4 +1,4 @@ -IMS Usrloc PCSCF Module +IMS Registrar SCSCF Module Jason Penton @@ -810,28 +810,28 @@ Chapter 2. Frequently Asked Questions 2.1. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at https://www.kamailio.org/. + Take a look at https://www.kamailio.org/. 2.2. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.kamailio.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.kamailio.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.kamailio.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.kamailio.org>. 2.3. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - https://github.com/kamailio/kamailio/issues. + Please follow the guidelines provided at: + https://github.com/kamailio/kamailio/issues.

1 0

git:5.1:d7730b1c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.1 Commit: d7730b1c271b7699267fb4ddd9afb2ab3548105c URL: https://github.com/kamailio/kamailio/commit/d7730b1c271b7699267fb4ddd9afb2a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T10:46:47+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/d7730b1c271b7699267fb4ddd9afb2a… Patch: https://github.com/kamailio/kamailio/commit/d7730b1c271b7699267fb4ddd9afb2a… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index 3401e825ef..79dc6846a1 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -1,4 +1,4 @@ -IMS Usrloc PCSCF Module +IMS Registrar SCSCF Module Jason Penton @@ -810,31 +810,31 @@ Chapter 2. Frequently Asked Questions 2.1. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at https://www.kamailio.org/. + Take a look at https://www.kamailio.org/. 2.2. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.kamailio.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.kamailio.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.kamailio.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.kamailio.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.kamailio.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.kamailio.org>. 2.3. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - https://github.com/kamailio/kamailio/issues. + Please follow the guidelines provided at: + https://github.com/kamailio/kamailio/issues.

1 0

git:5.1:b34c3b97: ims_registrar_scscf : document title is fixed
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.1 Commit: b34c3b97676f06d756da3797bddd1a71464f26fd URL: https://github.com/kamailio/kamailio/commit/b34c3b97676f06d756da3797bddd1a7… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T10:45:04+02:00 ims_registrar_scscf : document title is fixed Document title is fixed (cherry picked from commit 2668110abe7b008470740ffbace1235933b9ba09) --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/b34c3b97676f06d756da3797bddd1a7… Patch: https://github.com/kamailio/kamailio/commit/b34c3b97676f06d756da3797bddd1a7… --- diff --git a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml index e545f729d9..a6398b7a88 100644 --- a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml +++ b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml @@ -7,7 +7,7 @@ ]> <book> <bookinfo> - <title>IMS Usrloc PCSCF Module</title> + <title>IMS Registrar SCSCF Module</title> <productname class="trade">&kamailioname;</productname>

1 0

git:5.2:63cf7598: ims_registrar_scscf : document title is fixed
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: 63cf7598b2ed0bdf8420782a21a39a44094a6f64 URL: https://github.com/kamailio/kamailio/commit/63cf7598b2ed0bdf8420782a21a39a4… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T10:44:57+02:00 ims_registrar_scscf : document title is fixed Document title is fixed (cherry picked from commit 2668110abe7b008470740ffbace1235933b9ba09) --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/63cf7598b2ed0bdf8420782a21a39a4… Patch: https://github.com/kamailio/kamailio/commit/63cf7598b2ed0bdf8420782a21a39a4… --- diff --git a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml index e545f729d9..a6398b7a88 100644 --- a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml +++ b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml @@ -7,7 +7,7 @@ ]> <book> <bookinfo> - <title>IMS Usrloc PCSCF Module</title> + <title>IMS Registrar SCSCF Module</title> <productname class="trade">&kamailioname;</productname>

1 0

[kamailio/kamailio] ims_registrar_scscf : document title is fixed (#2042)
by Yasin CANER 24 Aug '19

24 Aug '19

Document title is fixed   #### 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  Document title is fixed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2042 -- Commit Summary -- * ims_registrar_scscf : document title is fixed -- File Changes -- M src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2042.patch https://github.com/kamailio/kamailio/pull/2042.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/2042

2 2

git:master:2668110a: ims_registrar_scscf : document title is fixed
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 2668110abe7b008470740ffbace1235933b9ba09 URL: https://github.com/kamailio/kamailio/commit/2668110abe7b008470740ffbace1235… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T10:36:27+02:00 ims_registrar_scscf : document title is fixed Document title is fixed --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/2668110abe7b008470740ffbace1235… Patch: https://github.com/kamailio/kamailio/commit/2668110abe7b008470740ffbace1235… --- diff --git a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml index e545f729d9..a6398b7a88 100644 --- a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml +++ b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml @@ -7,7 +7,7 @@ ]> <book> <bookinfo> - <title>IMS Usrloc PCSCF Module</title> + <title>IMS Registrar SCSCF Module</title> <productname class="trade">&kamailioname;</productname>

1 0

About STIR/SHAKEN - Caller Identity
by Daniel-Constantin Mierla 23 Aug '19

23 Aug '19

Hello, at couple of events I participated during the past few months, I was asked about support of STIR/SHAKEN (caller identity authentication/verification), which is a hot topic these days at least in USA, aiming to combat "fraudulent" robo-calling. Therefore I thought of share some details with everyone in the community about the state in Kamailio, writing to both devs and users, the information being relevant for everyone. We already have the (related) module named auth_identity, available since 2008 (iirc): - https://www.kamailio.org/docs/modules/stable/modules/auth_identity.html But it implements the previous iteration of the specs for caller identity, respectively RFC 4474: - https://tools.ietf.org/html/rfc4474 However, that RFC is obsoleted by 8224 (the latest core specs for STIR/SHAKEN): - https://tools.ietf.org/html/rfc8224 Then, there are also RFCs 8225 and 8226 to add to the core specs. Should anyone be interested to implement STIR/SHAKEN specs in a modules, I would suggest to start from auth_identity -- might not be much work to update it to become conform with latest specs (a new module can be created, of course, even when starting from auth_identity). However, these specs are about signing the SIP request (the INVITE) with special PKI certificate. It can be done easily with embedded scripts such as Lua or Python (inline execution in native kamailio.cfg or using kemi scripts). At Kamailio World 2019, one of the participants I discussed with told me they already implemented using Lua. That's it for a starting point, if anyone wants to discuss more, just reply to sr-users and add your comments or ask the questions. If someone wants to go ahead and work on a C module, announce yourself to avoid duplicate work of others, and use sr-dev if you need assistance on module development. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 2

[kamailio/kamailio] Module:rtpengine: memory leak is fixed, if no rtpengine in list (#2038)
by Surendra Tiwari 23 Aug '19

23 Aug '19

… reload   #### 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/2038 -- Commit Summary -- * Module:rtpengine: memory leak is fixed, if no rtpengine in list while reload -- File Changes -- M src/modules/rtpengine/rtpengine_db.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2038.patch https://github.com/kamailio/kamailio/pull/2038.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/2038

2 3

git:master:7d7670f6: Merge pull request #2038 from surendratiwari3/memory_leak_rtpengine
by GitHub 23 Aug '19

23 Aug '19

Module: kamailio Branch: master Commit: 7d7670f6d19cba5cbb8a3533795d6e271edad8f1 URL: https://github.com/kamailio/kamailio/commit/7d7670f6d19cba5cbb8a3533795d6e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-23T09:46:40+02:00 Merge pull request #2038 from surendratiwari3/memory_leak_rtpengine Module:rtpengine: memory leak is fixed, if no rtpengine in list --- Modified: src/modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/7d7670f6d19cba5cbb8a3533795d6e2… Patch: https://github.com/kamailio/kamailio/commit/7d7670f6d19cba5cbb8a3533795d6e2… --- diff --git a/src/modules/rtpengine/rtpengine_db.c b/src/modules/rtpengine/rtpengine_db.c index 0da3a6f371..8532fd270a 100644 --- a/src/modules/rtpengine/rtpengine_db.c +++ b/src/modules/rtpengine/rtpengine_db.c @@ -98,6 +98,7 @@ static int rtpp_load_db(void) if (n_rows == 0) { LM_WARN("No rtpproxy instances in database\n"); + rtpp_dbf.free_result(rtpp_db_handle, res); return 0; }

1 0

git:master:0e29879e: Module:rtpengine: memory leak is fixed, if no rtpengine in list while reload
by surendra tiwari 23 Aug '19

23 Aug '19

Module: kamailio Branch: master Commit: 0e29879ee950d5a9e9a669c7d5c634416d52f5c9 URL: https://github.com/kamailio/kamailio/commit/0e29879ee950d5a9e9a669c7d5c6344… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: surendra tiwari <surendratiwari3(a)gmail.com> Date: 2019-08-20T13:17:04+05:30 Module:rtpengine: memory leak is fixed, if no rtpengine in list while reload --- Modified: src/modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/0e29879ee950d5a9e9a669c7d5c6344… Patch: https://github.com/kamailio/kamailio/commit/0e29879ee950d5a9e9a669c7d5c6344… --- diff --git a/src/modules/rtpengine/rtpengine_db.c b/src/modules/rtpengine/rtpengine_db.c index 0da3a6f371..8532fd270a 100644 --- a/src/modules/rtpengine/rtpengine_db.c +++ b/src/modules/rtpengine/rtpengine_db.c @@ -98,6 +98,7 @@ static int rtpp_load_db(void) if (n_rows == 0) { LM_WARN("No rtpproxy instances in database\n"); + rtpp_dbf.free_result(rtpp_db_handle, res); return 0; }

1 0

git:master:92a25673: uac: remove obselete DB definition from source code
by Henning Westerholt 22 Aug '19

22 Aug '19

Module: kamailio Branch: master Commit: 92a25673cb3b16b0d324569c25dc74f14a7c9147 URL: https://github.com/kamailio/kamailio/commit/92a25673cb3b16b0d324569c25dc74f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-22T22:28:11+02:00 uac: remove obselete DB definition from source code --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/92a25673cb3b16b0d324569c25dc74f… Patch: https://github.com/kamailio/kamailio/commit/92a25673cb3b16b0d324569c25dc74f… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c19d758630..8b12fe4361 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -139,26 +139,6 @@ str reg_delay_column = str_init("reg_delay"); str str_empty = str_init(""); -#if 0 -INSERT INTO version (table_name, table_version) values ('uacreg','1'); -CREATE TABLE uacreg ( - id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - l_uuid VARCHAR(64) NOT NULL, - l_username VARCHAR(64) NOT NULL, - l_domain VARCHAR(128) DEFAULT '' NOT NULL, - r_username VARCHAR(64) NOT NULL, - r_domain VARCHAR(128) NOT NULL, - realm VARCHAR(64) NOT NULL, - auth_username VARCHAR(64) NOT NULL, - auth_password VARCHAR(64) NOT NULL, - auth_proxy VARCHAR(128) DEFAULT '' NOT NULL, - expires INT(10) UNSIGNED DEFAULT 0 NOT NULL, - flags INT(10) UNSIGNED DEFAULT 0 NOT NULL, - reg_delay INT(10) UNSIGNED DEFAULT 0 NOT NULL, - CONSTRAINT l_uuid_idx UNIQUE (l_uuid) - ) ENGINE=MyISAM; -#endif - extern struct tm_binds uac_tmb; extern pv_spec_t auth_username_spec;

1 0

Failed to catch some reply message with reply_route block
by Salah Ahmed 22 Aug '19

22 Aug '19

Hello, We facing an issue on capturing sip message in Kamailio(Version: 5.2.3). The scenario is very simple. UAC Kamailio UAS |--------INVITE--------->| | | |-------INVITE------->| | |<------100 Trying----| |<-------100 Trying------| | | |<------200 Ok--------| |<-------200 Ok----------| | In this simple scenario, we can't catch any reply messages in between the Kamailio and UAC. We have tried reply_route, onreply_route, and onsend_route. But no one work to grep that reply on that side. onsend_route was bad try as its only for forwarded reply message. Is there any other magic to capture those replies. A debug=3 log message attached here. Thanks, Salah

2 4

git:5.1:144a4945: dialog: run dlg callbacks also for PRACK requests (as done for "other" requests)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.1 Commit: 144a49451387eee0cc75725af121348596184a7d URL: https://github.com/kamailio/kamailio/commit/144a49451387eee0cc75725af121348… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T22:28:41+02:00 dialog: run dlg callbacks also for PRACK requests (as done for "other" requests) - run dlg callbacks also for PRACK requests (as done for "other" requests) - bugfix for uac module in auto mode with dialog storage for PRACK requests (cherry picked from commit 4efe19f64d8bb787d2d620a833f5dd29619fa588) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/144a49451387eee0cc75725af121348… Patch: https://github.com/kamailio/kamailio/commit/144a49451387eee0cc75725af121348… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 8d45d7818f..cb156e0f9d 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1451,7 +1451,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) goto done; } - if ( (event==DLG_EVENT_REQ || event==DLG_EVENT_REQACK) + if ( (event==DLG_EVENT_REQ || event==DLG_EVENT_REQACK || event==DLG_EVENT_REQPRACK) && (new_state==DLG_STATE_CONFIRMED || new_state==DLG_STATE_EARLY)) { timeout = get_dlg_timeout(req);

1 0

git:5.2:a5713816: dialog: run dlg callbacks also for PRACK requests (as done for "other" requests)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: a57138162a40390c245236a8ab693e62292d92ce URL: https://github.com/kamailio/kamailio/commit/a57138162a40390c245236a8ab693e6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T22:28:37+02:00 dialog: run dlg callbacks also for PRACK requests (as done for "other" requests) - run dlg callbacks also for PRACK requests (as done for "other" requests) - bugfix for uac module in auto mode with dialog storage for PRACK requests (cherry picked from commit 4efe19f64d8bb787d2d620a833f5dd29619fa588) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/a57138162a40390c245236a8ab693e6… Patch: https://github.com/kamailio/kamailio/commit/a57138162a40390c245236a8ab693e6… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 79a547aef1..ef36db8976 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1451,7 +1451,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) goto done; } - if ( (event==DLG_EVENT_REQ || event==DLG_EVENT_REQACK) + if ( (event==DLG_EVENT_REQ || event==DLG_EVENT_REQACK || event==DLG_EVENT_REQPRACK) && (new_state==DLG_STATE_CONFIRMED || new_state==DLG_STATE_EARLY)) { timeout = get_dlg_timeout(req);

1 0

git:master:4efe19f6: dialog: run dlg callbacks also for PRACK requests (as done for "other" requests)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: 4efe19f64d8bb787d2d620a833f5dd29619fa588 URL: https://github.com/kamailio/kamailio/commit/4efe19f64d8bb787d2d620a833f5dd2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T22:24:30+02:00 dialog: run dlg callbacks also for PRACK requests (as done for "other" requests) - run dlg callbacks also for PRACK requests (as done for "other" requests) - bugfix for uac module in auto mode with dialog storage for PRACK requests --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/4efe19f64d8bb787d2d620a833f5dd2… Patch: https://github.com/kamailio/kamailio/commit/4efe19f64d8bb787d2d620a833f5dd2… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index eebb1e502e..71f29e24fc 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1472,7 +1472,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) goto done; } - if ( (event==DLG_EVENT_REQ || event==DLG_EVENT_REQACK) + if ( (event==DLG_EVENT_REQ || event==DLG_EVENT_REQACK || event==DLG_EVENT_REQPRACK) && (new_state==DLG_STATE_CONFIRMED || new_state==DLG_STATE_EARLY)) { timeout = get_dlg_timeout(req);

1 0

git:master:c5208429: build: lost module depends (also via http_client) on curl library, correct group
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: c5208429d1e2b4f4c0d3e7928849a172d8779644 URL: https://github.com/kamailio/kamailio/commit/c5208429d1e2b4f4c0d3e7928849a17… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:44:36+02:00 build: lost module depends (also via http_client) on curl library, correct group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/c5208429d1e2b4f4c0d3e7928849a17… Patch: https://github.com/kamailio/kamailio/commit/c5208429d1e2b4f4c0d3e7928849a17… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 936c8817ca..22fa6db0ed 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 xhttp_prom lost + sipjson xhttp_prom # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \ @@ -76,7 +76,7 @@ mod_list_xmpp=xmpp mod_list_berkeley=db_berkeley # - modules depending on curl library -mod_list_utils=utils http_client +mod_list_utils=utils http_client lost # - modules depending on curl and libevent2 library mod_list_http_async=http_async_client

1 0

git:5.2:000e778c: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 000e778cf8838989e316aa71f35f2e0e252c511d URL: https://github.com/kamailio/kamailio/commit/000e778cf8838989e316aa71f35f2e0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:12:57+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a memset (cherry picked from commit a263f5b62c03851a5d8a61f09e69745f90370703) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/000e778cf8838989e316aa71f35f2e0… Patch: https://github.com/kamailio/kamailio/commit/000e778cf8838989e316aa71f35f2e0… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 47ddad0c1a..dd454935e1 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -727,6 +727,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, memset(argv, 0, TPS_REDIS_NR_KEYS * sizeof(char*)); memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + memset(&id, 0, sizeof(tps_data_t)); if(mode==0) { /* load same transaction using Via branch */ @@ -737,7 +738,6 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } - memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } if(xvbranch1->len<=0 || xvbranch1->s==NULL) {

1 0

git:5.1:9ebd82b6: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.1 Commit: 9ebd82b66c2967f38e94c58c4fd22d8c2be61479 URL: https://github.com/kamailio/kamailio/commit/9ebd82b66c2967f38e94c58c4fd22d8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:13:02+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a memset (cherry picked from commit a263f5b62c03851a5d8a61f09e69745f90370703) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/9ebd82b66c2967f38e94c58c4fd22d8… Patch: https://github.com/kamailio/kamailio/commit/9ebd82b66c2967f38e94c58c4fd22d8… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 6d09029b48..377ef3db9d 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -727,6 +727,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, memset(argv, 0, TPS_REDIS_NR_KEYS * sizeof(char*)); memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + memset(&id, 0, sizeof(tps_data_t)); if(mode==0) { /* load same transaction using Via branch */ @@ -737,7 +738,6 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } - memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } if(xvbranch1->len<=0 || xvbranch1->s==NULL) {

1 0

git:master:dc437506: core: tcp - new global parameter tcp_connection_match
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: dc43750644f723494c6821e3298b3580cf49797a URL: https://github.com/kamailio/kamailio/commit/dc43750644f723494c6821e3298b358… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T13:48:48+02:00 core: tcp - new global parameter tcp_connection_match - control how the connection is matched - set it to 1 to force a more strict matching trying to lookup using local port as well, not only remote ip/port and local address - default 0 - exiting behaviour --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/forward.h Modified: src/core/globals.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/dc43750644f723494c6821e3298b358… Patch: https://github.com/kamailio/kamailio/commit/dc43750644f723494c6821e3298b358…

1 0

[kamailio/kamailio] topoh: PKG memory leak (#2027)
by Whitey 20 Aug '19

20 Aug '19

### Description I've noticed PKG memory increasing since enabling the topoh module last week in a significant manner (~7MB per worker over 3000 calls split between 4 workers). Removing the topoh module removed the memory usage. Here is a pkg dump of one of the process post 3000 calls: https://paste.ubuntu.com/p/85KYg7gD2z/ ### Additional Information ```kamailio 5.3.0-dev4 (x86_64/linux) 6d43ea-dirty. ``` I'm unsure why it's tagged dirty, as I simply cloned master and reset to 6d43eacd6d5b78fe857267e70b7fa85519a7d5b6. I do plan to test this on dev7, however an unrelated issue is preventing me from testing this with my app_ruby based code. -- 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/2027

3 10

git:master:8d608d1c: tm: set send socket flag when computing the destination and local socket is found
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: 8d608d1c3ed0fe4c69cb02868b746cd0497dd1f5 URL: https://github.com/kamailio/kamailio/commit/8d608d1c3ed0fe4c69cb02868b746cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T12:07:30+02:00 tm: set send socket flag when computing the destination and local socket is found --- Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/8d608d1c3ed0fe4c69cb02868b746cd… Patch: https://github.com/kamailio/kamailio/commit/8d608d1c3ed0fe4c69cb02868b746cd… --- diff --git a/src/modules/tm/ut.h b/src/modules/tm/ut.h index 41e69c407f..98aaffa549 100644 --- a/src/modules/tm/ut.h +++ b/src/modules/tm/ut.h @@ -296,6 +296,7 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, dst->proto, 0); if (dst->send_sock){ dst->to=to; + dst->send_flags.f |= SND_F_FORCE_SOCKET; return dst; /* found a good one */ } }while(dns_srv_handle_next(dns_h, err)); @@ -317,6 +318,8 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, proto2a(dst->proto), su2a(&dst->to, sizeof(dst->to))); /* ser_error = E_NO_SOCKET;*/ /* try to continue */ + } else { + dst->send_flags.f |= SND_F_FORCE_SOCKET; } return dst; }

1 0

git:5.2:67f889bc: core: clear branches and expose the function for a new faked msg
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 67f889bcda49ad8f99f619b495e3fa201968ad64 URL: https://github.com/kamailio/kamailio/commit/67f889bcda49ad8f99f619b495e3fa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:29+02:00 core: clear branches and expose the function for a new faked msg (cherry picked from commit d7bd8a187546f132547788c47ff9a3947be49957) --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/commit/67f889bcda49ad8f99f619b495e3fa2… Patch: https://github.com/kamailio/kamailio/commit/67f889bcda49ad8f99f619b495e3fa2… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 1450509f8c..71ea74a5e2 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -127,6 +127,7 @@ sip_msg_t* faked_msg_get_next_clear(void) int faked_msg_get_new(sip_msg_t *fmsg) { + clear_branches(); if(faked_msg_init_new(fmsg)<0) { return -1; } diff --git a/src/core/fmsg.h b/src/core/fmsg.h index 99eb9f61b3..734b4c0090 100644 --- a/src/core/fmsg.h +++ b/src/core/fmsg.h @@ -29,6 +29,7 @@ sip_msg_t* faked_msg_next(void); sip_msg_t* faked_msg_get_next(void); sip_msg_t* faked_msg_next_clear(void); sip_msg_t* faked_msg_get_next_clear(void); +int faked_msg_get_new(sip_msg_t *fmsg); int faked_msg_match(sip_msg_t *tmsg); #endif

1 0

git:5.2:0ded702c: evapi: use a completely new fake message structure for dispatcher handling
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 0ded702ccbb746a26c7172bcbf80dd971ec8b530 URL: https://github.com/kamailio/kamailio/commit/0ded702ccbb746a26c7172bcbf80dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:39+02:00 evapi: use a completely new fake message structure for dispatcher handling (cherry picked from commit 769dce2fad66efdbc6cce6951bc60b60bf453a19) --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0ded702ccbb746a26c7172bcbf80dd9… Patch: https://github.com/kamailio/kamailio/commit/0ded702ccbb746a26c7172bcbf80dd9… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index e603753cec..b0e1e8386b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -151,8 +151,10 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) if((rt<0) && (_evapi_event_callback.s==NULL || _evapi_event_callback.len<=0)) return 0; - fmsg = faked_msg_next(); - memcpy(&tmsg, fmsg, sizeof(sip_msg_t)); + if(faked_msg_get_new(&tmsg)<0) { + LM_ERR("failed to get a new faked message\n"); + return -1; + } fmsg = &tmsg; evapi_set_msg_env(fmsg, evenv); backup_rt = get_route_type();

1 0

git:5.2:4db7db84: core: function to get a new faked message in a specific structure
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 4db7db8486ecab55e649a4037a1d86cda7633faf URL: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:19+02:00 core: function to get a new faked message in a specific structure - refactored the code to be able to fill a sip msg structure with content from the faked request (cherry picked from commit 4a904b5fe90253d0d5517cf1a5cdca3695e59ec3) --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… Patch: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 28d24cd116..1450509f8c 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -30,48 +30,69 @@ #define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) -static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; -static struct sip_msg _faked_msg; +static char _faked_sip_buf[BUF_SIZE]; +static int _faked_sip_buf_init = 0; +static sip_msg_t _faked_msg; static unsigned int _faked_msg_no = 0; -int faked_msg_init(void) +static unsigned int faked_msg_get_next_id(void) { - if(_faked_msg_no>0) - return 0; - /* init faked sip msg */ + _faked_msg_no += ((_faked_msg_no+1)==0)?2:1; + return _faked_msg_no; +} + +static void faked_msg_buf_init(void) +{ + if(_faked_sip_buf_init!=0) { + return; + } memcpy(_faked_sip_buf, FAKED_SIP_MSG, FAKED_SIP_MSG_LEN); _faked_sip_buf[FAKED_SIP_MSG_LEN] = '\0'; + _faked_sip_buf_init = 1; +} + +static int faked_msg_init_new(sip_msg_t *fmsg) +{ + faked_msg_buf_init(); - memset(&_faked_msg, 0, sizeof(struct sip_msg)); + /* init faked sip msg */ + memset(fmsg, 0, sizeof(sip_msg_t)); - _faked_msg.buf=_faked_sip_buf; - _faked_msg.len=FAKED_SIP_MSG_LEN; + fmsg->buf=_faked_sip_buf; + fmsg->len=FAKED_SIP_MSG_LEN; - _faked_msg.set_global_address=default_global_address; - _faked_msg.set_global_port=default_global_port; + fmsg->set_global_address=default_global_address; + fmsg->set_global_port=default_global_port; - if (parse_msg(_faked_msg.buf, _faked_msg.len, &_faked_msg)!=0) - { - LM_ERR("parse_msg failed\n"); + if (parse_msg(fmsg->buf, fmsg->len, fmsg)!=0) { + LM_ERR("parse faked msg failed\n"); return -1; } - _faked_msg.rcv.proto = PROTO_UDP; - _faked_msg.rcv.src_port = 5060; - _faked_msg.rcv.src_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.src_ip.af = AF_INET; - _faked_msg.rcv.src_ip.len = 4; - _faked_msg.rcv.dst_port = 5060; - _faked_msg.rcv.dst_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.dst_ip.af = AF_INET; - _faked_msg.rcv.dst_ip.len = 4; + fmsg->rcv.proto = PROTO_UDP; + fmsg->rcv.src_port = 5060; + fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.src_ip.af = AF_INET; + fmsg->rcv.src_ip.len = 4; + fmsg->rcv.dst_port = 5060; + fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.dst_ip.af = AF_INET; + fmsg->rcv.dst_ip.len = 4; return 0; } -static inline sip_msg_t* faked_msg_next_id(int mode) +int faked_msg_init(void) +{ + if(_faked_msg_no>0) { + return 0; + } + return faked_msg_init_new(&_faked_msg); +} + +static inline sip_msg_t* faked_msg_build_next(int mode) { - _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.id = faked_msg_get_next_id(); _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); if(mode) clear_branches(); @@ -80,12 +101,12 @@ static inline sip_msg_t* faked_msg_next_id(int mode) sip_msg_t* faked_msg_next(void) { - return faked_msg_next_id(0); + return faked_msg_build_next(0); } sip_msg_t* faked_msg_next_clear(void) { - return faked_msg_next_id(1); + return faked_msg_build_next(1); } sip_msg_t* faked_msg_get_next(void) @@ -104,6 +125,18 @@ sip_msg_t* faked_msg_get_next_clear(void) return faked_msg_next_clear(); } +int faked_msg_get_new(sip_msg_t *fmsg) +{ + if(faked_msg_init_new(fmsg)<0) { + return -1; + } + fmsg->id = faked_msg_get_next_id(); + fmsg->pid = my_pid(); + memset(&fmsg->tval, 0, sizeof(struct timeval)); + + return 0; +} + int faked_msg_match(sip_msg_t *tmsg) { return ( tmsg == &_faked_msg ) ? 1 : 0;

1 0

git:5.2:9b6d1e9e: corex: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 9b6d1e9ee767e2bf2a31dcf817558566d99f81b2 URL: https://github.com/kamailio/kamailio/commit/9b6d1e9ee767e2bf2a31dcf81755856… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:54+02:00 corex: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit c79dfbeab0bfefaa4dd5cefc41cba3ba157da0ce) --- Modified: src/modules/corex/corex_nio.c --- Diff: https://github.com/kamailio/kamailio/commit/9b6d1e9ee767e2bf2a31dcf81755856… Patch: https://github.com/kamailio/kamailio/commit/9b6d1e9ee767e2bf2a31dcf81755856… --- diff --git a/src/modules/corex/corex_nio.c b/src/modules/corex/corex_nio.c index 96837e8a0c..6b79fcc648 100644 --- a/src/modules/corex/corex_nio.c +++ b/src/modules/corex/corex_nio.c @@ -141,6 +141,7 @@ int nio_msg_sent(sr_event_param_t *evp) int_str avp_value; struct usr_avp *avp; struct run_act_ctx ra_ctx; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -163,7 +164,15 @@ int nio_msg_sent(sr_event_param_t *evp) if(avp!=NULL && is_avp_str_val(avp)) { msg.buf = avp_value.s.s; msg.len = avp_value.s.len; - obuf->s = nio_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = nio_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } } else { LM_WARN("no value set for AVP %.*s, using unmodified message\n", nio_msg_avp_param.len, nio_msg_avp_param.s);

1 0

git:5.2:9f4c8c37: evapi: free the faked msg clone used for dispatcher event route
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 9f4c8c37f50ce15e52ea64388d7aab46167e78cd URL: https://github.com/kamailio/kamailio/commit/9f4c8c37f50ce15e52ea64388d7aab4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:22:59+02:00 evapi: free the faked msg clone used for dispatcher event route (cherry picked from commit d36a4b00c6becd42cfcec4fc7eb398371e1cc812) --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9f4c8c37f50ce15e52ea64388d7aab4… Patch: https://github.com/kamailio/kamailio/commit/9f4c8c37f50ce15e52ea64388d7aab4… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index ec56945b5e..e603753cec 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -37,6 +37,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/kemi.h" #include "../../core/fmsg.h" @@ -170,6 +171,9 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) } set_route_type(backup_rt); evapi_set_msg_env(fmsg, NULL); + /* free the structure -- it is a clone of faked msg */ + free_sip_msg(fmsg); + ksr_msg_env_reset(); return 0; }

1 0

git:5.2:d815945c: gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: d815945cdf85250877c89b3368506d444aa0ff2f URL: https://github.com/kamailio/kamailio/commit/d815945cdf85250877c89b3368506d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:40+02:00 gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit d9a1cbc8f66f9fd0991048e5e1ba1579916a092e) --- Modified: src/modules/gzcompress/gzcompress_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d815945cdf85250877c89b3368506d4… Patch: https://github.com/kamailio/kamailio/commit/d815945cdf85250877c89b3368506d4… --- diff --git a/src/modules/gzcompress/gzcompress_mod.c b/src/modules/gzcompress/gzcompress_mod.c index 3e06c1c267..3ff22d723d 100644 --- a/src/modules/gzcompress/gzcompress_mod.c +++ b/src/modules/gzcompress/gzcompress_mod.c @@ -338,6 +338,7 @@ int gzc_msg_sent(sr_event_param_t *evp) unsigned long olen; unsigned long nlen; int ret; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -383,7 +384,15 @@ int gzc_msg_sent(sr_event_param_t *evp) goto done; } - obuf->s = gzc_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = gzc_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:5.2:0df6f49f: dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 0df6f49fe7a13ce6c01542a16fdd8932043f5ec9 URL: https://github.com/kamailio/kamailio/commit/0df6f49fe7a13ce6c01542a16fdd893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:31+02:00 dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit ad8d9628da27a3ab68b005ef52842784af6bda3a) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/0df6f49fe7a13ce6c01542a16fdd893… Patch: https://github.com/kamailio/kamailio/commit/0df6f49fe7a13ce6c01542a16fdd893… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index b97e8f7123..29fcaa7494 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -364,6 +364,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) struct via_body *via; hdr_field_t *hfk = NULL; sr_cfgenv_t *cenv = NULL; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -520,11 +521,13 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } } /* replace old msg content */ - obuf->s = pkg_malloc((tbuf_len+1)*sizeof(char)); - if(obuf->s==NULL) { + nbuf.s = pkg_malloc((tbuf_len+1)*sizeof(char)); + if(nbuf.s==NULL) { LM_ERR("not enough memory for new message\n"); goto done; } + pkg_free(obuf->s); + obuf->s = nbuf.s; memcpy(obuf->s, tbuf, tbuf_len); obuf->s[tbuf_len] = 0; obuf->len = tbuf_len;

1 0

git:5.2:bbac0720: topos: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: bbac07207f55216ece4fad4d1aed2ed578cb0e15 URL: https://github.com/kamailio/kamailio/commit/bbac07207f55216ece4fad4d1aed2ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:22+02:00 topos: free old outbound buffer inside SREV_NET_DATA_OUT callback - GH #2027 (cherry picked from commit 21816a11a56628a9eee17765645fcf03d57929bd) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bbac07207f55216ece4fad4d1aed2ed… Patch: https://github.com/kamailio/kamailio/commit/bbac07207f55216ece4fad4d1aed2ed… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index f6b6a3a2f5..942c545d58 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -390,6 +390,7 @@ int tps_msg_sent(sr_event_param_t *evp) str *obuf; int dialog; int local; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -443,7 +444,15 @@ int tps_msg_sent(sr_event_param_t *evp) tps_response_sent(&msg); } - obuf->s = tps_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = tps_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:5.2:aaeb0ca5: topoh: free old outbound buffer inside th_msg_sent()
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: aaeb0ca500f4cbf98631c58da5289eea30b3dd92 URL: https://github.com/kamailio/kamailio/commit/aaeb0ca500f4cbf98631c58da5289ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:10+02:00 topoh: free old outbound buffer inside th_msg_sent() - GH #2027 (cherry picked from commit 37a1765853294016f43bd633667cd623aaaa2d3e) --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aaeb0ca500f4cbf98631c58da5289ee… Patch: https://github.com/kamailio/kamailio/commit/aaeb0ca500f4cbf98631c58da5289ee… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index c1a597eb1e..0eb5345598 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -411,6 +411,7 @@ int th_msg_sent(sr_event_param_t *evp) int direction; int dialog; int local; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -497,7 +498,15 @@ int th_msg_sent(sr_event_param_t *evp) } ready: - obuf->s = th_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = th_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:5.2:891bd927: core: forward - clone outbound buffer for SREV_NET_DATA_OUT event
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 891bd927f3e519bb9fb2f23a65f21f82f2f7e0af URL: https://github.com/kamailio/kamailio/commit/891bd927f3e519bb9fb2f23a65f21f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:43:58+02:00 core: forward - clone outbound buffer for SREV_NET_DATA_OUT event - this event can execute a series of callbacks, leading to leak if only the core function does pkg free - GH #2027 (cherry picked from commit 98249e2cc97e818cf7ad492132ecfea2ce13a78b) --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/891bd927f3e519bb9fb2f23a65f21f8… Patch: https://github.com/kamailio/kamailio/commit/891bd927f3e519bb9fb2f23a65f21f8… --- diff --git a/src/core/forward.h b/src/core/forward.h index d039900aac..a629748686 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -136,9 +136,18 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len, outb.s = buf; outb.len = len; if(!(flags&1)) { - evp.data = (void*)&outb; - evp.dst = dst; - sr_event_exec(SREV_NET_DATA_OUT, &evp); + if(sr_event_enabled(SREV_NET_DATA_OUT)) { + outb.s = (char*)pkg_malloc(len + 1); + if(outb.s==NULL) { + LM_ERR("failed to clone outgoing buffer\n"); + return -1; + } + memcpy(outb.s, buf, len); + outb.s[len] = '\0'; + evp.data = (void*)&outb; + evp.dst = dst; + sr_event_exec(SREV_NET_DATA_OUT, &evp); + } } if(outb.s==NULL) {

1 0

git:master:18eb1c97: pv: added {s.count, c} transformation
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: 18eb1c973c5d863a562864c2b77b4e1d520f9406 URL: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T11:17:17+02:00 pv: added {s.count,c} transformation - count how many times c appears in the pv value "abababa"{s.count,a} => 4 --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… Patch: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 8ab46d328f..ea693bffd4 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1207,6 +1207,42 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s[val->rs.len] = '\0'; break; + case TR_S_COUNT: + if(tp==NULL) + { + LM_ERR("invalid parameters (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + } + if(tp->type==TR_PARAM_STRING) + { + st = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("cannot get parameter value (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + st = v.rs; + } + LM_DBG("counting [%.*s](%d) in [%.*s](%d)\n", + st.len, st.s, st.len, val->rs.len, val->rs.s, val->rs.len); + j = 0; + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + j++; + } + } + val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; + val->ri = j; + val->rs.s = int2str(j, &val->rs.len); + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2575,6 +2611,26 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==9 && strncasecmp(name.s, "unbracket", 9)==0) { t->subtype = TR_S_UNBRACKET; goto done; + } else if(name.len==5 && strncasecmp(name.s, "count", 5)==0) { + t->subtype = TR_S_COUNT; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid count transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid count transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index da2cb87624..0b579e4b27 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -42,7 +42,7 @@ enum _tr_s_subtype { TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE, - TR_S_UNBRACKET + TR_S_UNBRACKET, TR_S_COUNT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio/kamailio] UAC (#2036)
by Antoineb2s 19 Aug '19

19 Aug '19

Hi, I'm trying to register to a SIP provider (v5.2.4), so I added in kamailio.cfg: ... loadmodule "uac.so" ... modparam("rr", "append_fromtag", 1) modparam("uac", "credential", "user:host_provider_ip:password") modparam("uac", "reg_retry_interval", 300) Seems that nothing happens after a service restart. I also tried : `kamcmd uac.reg_dump error: 500 - command uac.reg_dump not found` Is there something I misunderstood ? Thanks in advanced ! -- 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/2036

2 2

git:master:4acc8aa7: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 4acc8aa71b50efc0f8ec073d711dda27b928e991 URL: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-19T11:47:13+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… Patch: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index cbb49366e7..357c41d388 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -230,9 +230,11 @@ var(uri)\n"); https://www.digitalocean.com/community/questions/how-to-upgrade-curl-in -centos6 - Note: http_client_query exported by the http_client API returns the - first line of the HTTP response (query_params.oneline = 1), but the - lost module requires the complete response message, which requires - query_params.oneline set to 0. In the case lost_query is used with the - default http_client API, dereferencing location via HTTP provided with - the Geolocation header causes an error. + Note: http_client_query exported by the http_client API returns by + default the first line of the HTTP response (query_params.oneline = 1), + but the lost module requires the complete response message, which + requires query_params.oneline set to 0. In the case lost_query is used + with the default http_client API, dereferencing location via HTTP + provided with the Geolocation header causes an error. Therefore, to + work properlu=y, it requires to set http_client module parameter + query_result to 0.

1 0

git:master:a743a6c7: core: tcp - debug messages when looking up tcp connection
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: a743a6c7d3f7b65a366251dd121011725964d07b URL: https://github.com/kamailio/kamailio/commit/a743a6c7d3f7b65a366251dd1210117… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: tcp - debug messages when looking up tcp connection --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/a743a6c7d3f7b65a366251dd1210117… Patch: https://github.com/kamailio/kamailio/commit/a743a6c7d3f7b65a366251dd1210117… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 7ecaf47eb6..819cfe9c3f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1622,7 +1622,7 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, int is_local_ip_any; #ifdef EXTRA_DEBUG - LM_DBG("%d port %d\n",id, port); + LM_DBG("%d port %d\n", id, port); if (ip) print_ip("tcpconn_find: ip ", ip, "\n"); #endif if (likely(id)){ @@ -1632,7 +1632,10 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, LM_DBG("c=%p, c->id=%d, port=%d\n", c, c->id, c->rcv.src_port); print_ip("ip=", &c->rcv.src_ip, "\n"); #endif - if ((id==c->id)&&(c->state!=S_CONN_BAD)) return c; + if ((id==c->id)&&(c->state!=S_CONN_BAD)) { + LM_DBG("found connection by id: %d\n", id); + return c; + } } }else if (likely(ip)){ hash=tcp_addr_hash(ip, port, l_ip, l_port); @@ -1648,8 +1651,11 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)) - ) + ) { + LM_DBG("found connection by peer address (id: %d)\n", + a->parent->id); return a->parent; + } } } return 0;

1 0

git:master:9ff491a8: tm: propagate tcp connection id in outbound branch dst structure
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 9ff491a881f326b5ee6eee4fd40c427f8d83ecf0 URL: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 tm: propagate tcp connection id in outbound branch dst structure --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… Patch: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index d814e3d5b2..0e484d9ebf 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -284,8 +284,9 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, e2e ACKs do not establish a transaction and are fwd-ed statelessly */ if ( p_msg->REQ_METHOD==METHOD_ACK) { LM_DBG("forwarding ACK statelessly\n"); + init_dest_info(&dst); + dst.id = p_msg->otcpid; if (proxy==0) { - init_dest_info(&dst); dst.proto=proto; if (get_uri_send_info(GET_NEXT_HOP(p_msg), &host, &port, &dst.proto, &comp)!=0){ @@ -299,7 +300,6 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, * of it */ ret=forward_request(p_msg, &host, port, &dst); } else { - init_dest_info(&dst); dst.proto=get_proto(proto, proxy->proto); proxy2su(&dst.to, proxy); /* dst->send_sock not set, but forward_request will take care diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 213f0df746..33a50d7799 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1596,22 +1596,15 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, struct proxy_l * proxy, int proto) { int branch_ret, lowest_ret; - str current_uri; branch_bm_t added_branches; int first_branch; - int i, q; + int i; struct cell *t_invite; int success_branch; int try_new; int lock_replies; - str dst_uri, path, instance, ruid, location_ua; - struct socket_info* si; flag_t backup_bflags = 0; - flag_t bflags = 0; - - - /* make -Wall happy */ - current_uri.s=0; + branch_data_t obranch; getbflagsval(0, &backup_bflags); @@ -1667,40 +1660,46 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, */ if (ruri_get_forking_state()) { try_new=1; - branch_ret=add_uac( t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), + branch_ret=add_uac(t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), &p_msg->path_vec, proxy, p_msg->force_send_socket, p_msg->fwd_send_flags, proto, (p_msg->dst_uri.len)?0:UAC_SKIP_BR_DST_F, &p_msg->instance, &p_msg->ruid, &p_msg->location_ua); /* test if cancel was received meanwhile */ if (t->flags & T_CANCELED) goto canceled; - if (branch_ret>=0) + if (branch_ret>=0) { added_branches |= 1<<branch_ret; - else + t->uac[branch_ret].request.dst.id = p_msg->otcpid; + } else { lowest_ret=MIN_int(lowest_ret, branch_ret); - } else try_new=0; + } + } else { + try_new=0; + } + memset(&obranch, 0, sizeof(branch_data_t)); init_branch_iterator(); - while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, - &bflags, &si, &ruid, &instance, &location_ua))) { + while(next_branch_data(&obranch)==1) { try_new++; - setbflagsval(0, bflags); + setbflagsval(0, obranch.flags); - branch_ret=add_uac( t, p_msg, &current_uri, - (dst_uri.len) ? (&dst_uri) : &current_uri, - &path, proxy, si, p_msg->fwd_send_flags, - proto, (dst_uri.len)?0:UAC_SKIP_BR_DST_F, &instance, - &ruid, &location_ua); + branch_ret=add_uac(t, p_msg, &obranch.uri, + (obranch.dst_uri.len>0) ? &obranch.dst_uri : &obranch.uri, + &obranch.path, proxy, obranch.force_socket, p_msg->fwd_send_flags, + proto, (obranch.dst_uri.len>0)?0:UAC_SKIP_BR_DST_F, + &obranch.instance, &obranch.ruid, &obranch.location_ua); /* test if cancel was received meanwhile */ if (t->flags & T_CANCELED) goto canceled; /* pick some of the errors in case things go wrong; * note that picking lowest error is just as good as * any other algorithm which picks any other negative * branch result */ - if (branch_ret>=0) + if (branch_ret>=0) { added_branches |= 1<<branch_ret; - else + t->uac[branch_ret].request.dst.id = obranch.otcpid; + } else { lowest_ret=MIN_int(lowest_ret, branch_ret); + } } /* consume processed branches */ clear_branches();

1 0

git:master:4917283a: core: dset - comment to document return code for getting branch data
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 4917283ae2ed27a852a63cde78e9f8739958ff92 URL: https://github.com/kamailio/kamailio/commit/4917283ae2ed27a852a63cde78e9f87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: dset - comment to document return code for getting branch data - differentiate when returning data for valid or invalid branch index --- Modified: src/core/dset.c --- Diff: https://github.com/kamailio/kamailio/commit/4917283ae2ed27a852a63cde78e9f87… Patch: https://github.com/kamailio/kamailio/commit/4917283ae2ed27a852a63cde78e9f87… --- diff --git a/src/core/dset.c b/src/core/dset.c index f1b79ba037..faa61db72b 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -314,6 +314,10 @@ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, return ret; } +/** + * Link branch attributes in the data structure + * - return: -1 (<0) on error; 0 - on no valid branch; 1 - on a valid branch + */ int get_branch_data(unsigned int i, branch_data_t *vbranch) { if(vbranch==NULL) { @@ -348,18 +352,23 @@ int get_branch_data(unsigned int i, branch_data_t *vbranch) vbranch->location_ua.s = branches[i].location_ua; } vbranch->otcpid = branches[i].otcpid; + return 1; } else { vbranch->q = Q_UNSPECIFIED; + return 0; } - - return 0; } +/** + * Link branch attributes in the data structure and advance the iterator on + * return of a valid branch + * - return: -1 (<0) on error; 0 - on no valid branch; 1 - on a valid branch + */ int next_branch_data(branch_data_t *vbranch) { int ret; ret= get_branch_data(branch_iterator, vbranch); - if (ret < 0) { + if (ret <= 0) { return ret; } branch_iterator++;

1 0

git:master:a8d3274c: core: dset - function to link branch data in a structure
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: a8d3274c32ba7d7cfb93d0f6d4090a7832db7ff7 URL: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: dset - function to link branch data in a structure - existing functions to retrive branch attributes have too many parameters already --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… Patch: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… --- diff --git a/src/core/dset.c b/src/core/dset.c index 184ddc9e92..f1b79ba037 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -232,9 +232,9 @@ void set_branch_iterator(int n) * more branches */ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, - str* path, unsigned int *flags, - struct socket_info** force_socket, - str *ruid, str *instance, str *location_ua) + str* path, unsigned int *flags, + struct socket_info** force_socket, + str *ruid, str *instance, str *location_ua) { if (i < nr_branches) { *len = branches[i].len; @@ -302,18 +302,69 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, * 0 is returned if there are no more branches */ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, - unsigned int* flags, struct socket_info** force_socket, - str* ruid, str *instance, str *location_ua) + unsigned int* flags, struct socket_info** force_socket, + str* ruid, str *instance, str *location_ua) { char* ret; - + ret=get_branch(branch_iterator, len, q, dst_uri, path, flags, - force_socket, ruid, instance, location_ua); + force_socket, ruid, instance, location_ua); if (likely(ret)) branch_iterator++; return ret; } +int get_branch_data(unsigned int i, branch_data_t *vbranch) +{ + if(vbranch==NULL) { + return -1; + } + memset(vbranch, 0, sizeof(branch_data_t)); + + if (i < nr_branches) { + vbranch->uri.s = branches[i].uri; + vbranch->uri.len = branches[i].len; + vbranch->q = branches[i].q; + if (branches[i].dst_uri_len > 0) { + vbranch->dst_uri.len = branches[i].dst_uri_len; + vbranch->dst_uri.s = branches[i].dst_uri; + } + if (branches[i].path_len > 0) { + vbranch->path.len = branches[i].path_len; + vbranch->path.s = branches[i].path; + } + vbranch->force_socket = branches[i].force_send_socket; + vbranch->flags = branches[i].flags; + if (branches[i].ruid_len > 0) { + vbranch->ruid.len = branches[i].ruid_len; + vbranch->ruid.s = branches[i].ruid; + } + if (branches[i].instance_len > 0) { + vbranch->instance.len = branches[i].instance_len; + vbranch->instance.s =branches[i].instance; + } + if (branches[i].location_ua_len > 0) { + vbranch->location_ua.len = branches[i].location_ua_len; + vbranch->location_ua.s = branches[i].location_ua; + } + vbranch->otcpid = branches[i].otcpid; + } else { + vbranch->q = Q_UNSPECIFIED; + } + + return 0; +} + +int next_branch_data(branch_data_t *vbranch) +{ + int ret; + ret= get_branch_data(branch_iterator, vbranch); + if (ret < 0) { + return ret; + } + branch_iterator++; + return ret; +} /* * Empty the dset array diff --git a/src/core/dset.h b/src/core/dset.h index ebb4e765bb..9a640da704 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -43,7 +43,7 @@ extern int ruri_is_new; /*! \brief * Structure for storing branch attributes */ -struct branch +typedef struct branch { char uri[MAX_URI_SIZE]; unsigned int len; @@ -79,9 +79,20 @@ struct branch /* Branch flags */ flag_t flags; -}; - -typedef struct branch branch_t; +} branch_t; + +typedef struct branch_data { + str uri; + str dst_uri; + qvalue_t q; + str path; + unsigned int flags; + socket_info_t* force_socket; + str ruid; + str instance; + str location_ua; + int otcpid; +} branch_data_t; /*! \brief * Return pointer to branch[idx] structure @@ -163,6 +174,9 @@ char* get_branch( unsigned int i, int* len, qvalue_t* q, str* dst_uri, struct socket_info** force_socket, str* ruid, str *instance, str *location_ua); +int get_branch_data(unsigned int i, branch_data_t *vbranch); +int next_branch_data(branch_data_t *vbranch); + /*! \brief * Empty the array of branches */

1 0

git:master:878c41b7: lost: docs - note that http_client param query_result has to be set to 0
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 878c41b7dbd1a716d5a2a9281ab99af585737022 URL: https://github.com/kamailio/kamailio/commit/878c41b7dbd1a716d5a2a9281ab99af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 lost: docs - note that http_client param query_result has to be set to 0 --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/878c41b7dbd1a716d5a2a9281ab99af… Patch: https://github.com/kamailio/kamailio/commit/878c41b7dbd1a716d5a2a9281ab99af… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index d4228f3044..b5701d3fb8 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -255,11 +255,13 @@ xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ https://www.digitalocean.com/community/questions/how-to-upgrade-curl-in-cen…</ulink> </para> <para> - Note: http_client_query exported by the http_client API returns the first line of + Note: http_client_query exported by the http_client API returns by default the first line of the HTTP response (query_params.oneline = 1), but the lost module requires the complete response message, which requires query_params.oneline set to 0. In the case lost_query is used with the default http_client API, dereferencing location via HTTP provided with - the Geolocation header causes an error. + the Geolocation header causes an error. Therefore, to work properlu=y, it requires to set + <ulink url="https://www.kamailio.org/docs/modules/devel/modules/http_client.html#http_c…"> + http_client module parameter query_result to 0</ulink>. </para> </section> </chapter>

1 0

git:master:0e4e0a16: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 0e4e0a162aa4fc4e3b8467c68b20fea992012e18 URL: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-16T23:01:36+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… Patch: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index e3a2f182ae..cbb49366e7 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -1,4 +1,3 @@ - LOST Module Wolfgang Kampichler @@ -219,7 +218,7 @@ var(uri)\n"); 5. Counters - This module has no specific counters but uses http_client therfore + This module has no specific counters but uses http_client therefore according counters may apply. 6. Remarks

1 0

git:master:769dce2f: evapi: use a completely new fake message structure for dispatcher handling
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 769dce2fad66efdbc6cce6951bc60b60bf453a19 URL: https://github.com/kamailio/kamailio/commit/769dce2fad66efdbc6cce6951bc60b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:57:33+02:00 evapi: use a completely new fake message structure for dispatcher handling --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/769dce2fad66efdbc6cce6951bc60b6… Patch: https://github.com/kamailio/kamailio/commit/769dce2fad66efdbc6cce6951bc60b6… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index e603753cec..b0e1e8386b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -151,8 +151,10 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) if((rt<0) && (_evapi_event_callback.s==NULL || _evapi_event_callback.len<=0)) return 0; - fmsg = faked_msg_next(); - memcpy(&tmsg, fmsg, sizeof(sip_msg_t)); + if(faked_msg_get_new(&tmsg)<0) { + LM_ERR("failed to get a new faked message\n"); + return -1; + } fmsg = &tmsg; evapi_set_msg_env(fmsg, evenv); backup_rt = get_route_type();

1 0

git:master:d7bd8a18: core: clear branches and expose the function for a new faked msg
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: d7bd8a187546f132547788c47ff9a3947be49957 URL: https://github.com/kamailio/kamailio/commit/d7bd8a187546f132547788c47ff9a39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:56:49+02:00 core: clear branches and expose the function for a new faked msg --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/commit/d7bd8a187546f132547788c47ff9a39… Patch: https://github.com/kamailio/kamailio/commit/d7bd8a187546f132547788c47ff9a39… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 1450509f8c..71ea74a5e2 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -127,6 +127,7 @@ sip_msg_t* faked_msg_get_next_clear(void) int faked_msg_get_new(sip_msg_t *fmsg) { + clear_branches(); if(faked_msg_init_new(fmsg)<0) { return -1; } diff --git a/src/core/fmsg.h b/src/core/fmsg.h index 99eb9f61b3..734b4c0090 100644 --- a/src/core/fmsg.h +++ b/src/core/fmsg.h @@ -29,6 +29,7 @@ sip_msg_t* faked_msg_next(void); sip_msg_t* faked_msg_get_next(void); sip_msg_t* faked_msg_next_clear(void); sip_msg_t* faked_msg_get_next_clear(void); +int faked_msg_get_new(sip_msg_t *fmsg); int faked_msg_match(sip_msg_t *tmsg); #endif

1 0

git:master:4a904b5f: core: function to get a new faked message in a specific structure
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 4a904b5fe90253d0d5517cf1a5cdca3695e59ec3 URL: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:37:58+02:00 core: function to get a new faked message in a specific structure - refactored the code to be able to fill a sip msg structure with content from the faked request --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… Patch: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 28d24cd116..1450509f8c 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -30,48 +30,69 @@ #define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) -static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; -static struct sip_msg _faked_msg; +static char _faked_sip_buf[BUF_SIZE]; +static int _faked_sip_buf_init = 0; +static sip_msg_t _faked_msg; static unsigned int _faked_msg_no = 0; -int faked_msg_init(void) +static unsigned int faked_msg_get_next_id(void) { - if(_faked_msg_no>0) - return 0; - /* init faked sip msg */ + _faked_msg_no += ((_faked_msg_no+1)==0)?2:1; + return _faked_msg_no; +} + +static void faked_msg_buf_init(void) +{ + if(_faked_sip_buf_init!=0) { + return; + } memcpy(_faked_sip_buf, FAKED_SIP_MSG, FAKED_SIP_MSG_LEN); _faked_sip_buf[FAKED_SIP_MSG_LEN] = '\0'; + _faked_sip_buf_init = 1; +} + +static int faked_msg_init_new(sip_msg_t *fmsg) +{ + faked_msg_buf_init(); - memset(&_faked_msg, 0, sizeof(struct sip_msg)); + /* init faked sip msg */ + memset(fmsg, 0, sizeof(sip_msg_t)); - _faked_msg.buf=_faked_sip_buf; - _faked_msg.len=FAKED_SIP_MSG_LEN; + fmsg->buf=_faked_sip_buf; + fmsg->len=FAKED_SIP_MSG_LEN; - _faked_msg.set_global_address=default_global_address; - _faked_msg.set_global_port=default_global_port; + fmsg->set_global_address=default_global_address; + fmsg->set_global_port=default_global_port; - if (parse_msg(_faked_msg.buf, _faked_msg.len, &_faked_msg)!=0) - { - LM_ERR("parse_msg failed\n"); + if (parse_msg(fmsg->buf, fmsg->len, fmsg)!=0) { + LM_ERR("parse faked msg failed\n"); return -1; } - _faked_msg.rcv.proto = PROTO_UDP; - _faked_msg.rcv.src_port = 5060; - _faked_msg.rcv.src_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.src_ip.af = AF_INET; - _faked_msg.rcv.src_ip.len = 4; - _faked_msg.rcv.dst_port = 5060; - _faked_msg.rcv.dst_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.dst_ip.af = AF_INET; - _faked_msg.rcv.dst_ip.len = 4; + fmsg->rcv.proto = PROTO_UDP; + fmsg->rcv.src_port = 5060; + fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.src_ip.af = AF_INET; + fmsg->rcv.src_ip.len = 4; + fmsg->rcv.dst_port = 5060; + fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.dst_ip.af = AF_INET; + fmsg->rcv.dst_ip.len = 4; return 0; } -static inline sip_msg_t* faked_msg_next_id(int mode) +int faked_msg_init(void) +{ + if(_faked_msg_no>0) { + return 0; + } + return faked_msg_init_new(&_faked_msg); +} + +static inline sip_msg_t* faked_msg_build_next(int mode) { - _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.id = faked_msg_get_next_id(); _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); if(mode) clear_branches(); @@ -80,12 +101,12 @@ static inline sip_msg_t* faked_msg_next_id(int mode) sip_msg_t* faked_msg_next(void) { - return faked_msg_next_id(0); + return faked_msg_build_next(0); } sip_msg_t* faked_msg_next_clear(void) { - return faked_msg_next_id(1); + return faked_msg_build_next(1); } sip_msg_t* faked_msg_get_next(void) @@ -104,6 +125,18 @@ sip_msg_t* faked_msg_get_next_clear(void) return faked_msg_next_clear(); } +int faked_msg_get_new(sip_msg_t *fmsg) +{ + if(faked_msg_init_new(fmsg)<0) { + return -1; + } + fmsg->id = faked_msg_get_next_id(); + fmsg->pid = my_pid(); + memset(&fmsg->tval, 0, sizeof(struct timeval)); + + return 0; +} + int faked_msg_match(sip_msg_t *tmsg) { return ( tmsg == &_faked_msg ) ? 1 : 0;

1 0

git:master:860cf242: registrar: lookup() sets the tcp connection id in sip msg and branch structures
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 860cf242c1d9fb964b8e64acba136af561ffa748 URL: https://github.com/kamailio/kamailio/commit/860cf242c1d9fb964b8e64acba136af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T11:06:42+02:00 registrar: lookup() sets the tcp connection id in sip msg and branch structures --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/860cf242c1d9fb964b8e64acba136af… Patch: https://github.com/kamailio/kamailio/commit/860cf242c1d9fb964b8e64acba136af… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 89a0b7f600..682eb7bace 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -227,6 +227,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) sr_xavp_t *xavp=NULL; sip_uri_t path_uri; str path_str; + branch_t *nbranch; ret = -1; @@ -419,6 +420,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) } _m->reg_id = ptr->reg_id; + _m->otcpid = ptr->tcpconn_id; if (ptr->ruid.len) { if (set_ruid(_m, &(ptr->ruid)) < 0) { @@ -507,18 +509,19 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) * regarding path vs. received. */ LM_DBG("instance is %.*s\n", ptr->instance.len, ptr->instance.s); - if (append_branch(_m, &ptr->c, + nbranch = ksr_push_branch(_m, &ptr->c, path_dst.len?&path_dst:&ptr->received, path_dst.len?&path_str:0, ptr->q, ptr->cflags, ptr->sock, ptr->instance.len?&(ptr->instance):0, ptr->instance.len?ptr->reg_id:0, - &ptr->ruid, &ptr->user_agent) - == -1) { + &ptr->ruid, &ptr->user_agent); + if (nbranch==NULL) { LM_ERR("failed to append a branch\n"); /* Also give a chance to the next branches*/ continue; } + nbranch->otcpid = ptr->tcpconn_id; if(ptr->xavp!=NULL) { xavp = xavp_clone_level_nodata(ptr->xavp); if(xavp != NULL) {

1 0

git:master:9115bcda: core: dset - function to push a new branch and return its pointer
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 9115bcdabaa3da04e3e563bb43a04358b33e2c17 URL: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T11:05:35+02:00 core: dset - function to push a new branch and return its pointer --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… Patch: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… --- diff --git a/src/core/dset.c b/src/core/dset.c index 1803155206..184ddc9e92 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -328,7 +328,7 @@ void clear_branches(void) -/** Add a new branch to the current transaction. +/** Add a new branch to the current destination set. * @param msg sip message, used for getting the uri if not specified (0). * @param uri uri, can be 0 (in which case the uri is taken from msg) * @param dst_uri destination uri, can be 0. @@ -352,7 +352,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, str luri; /* if we have already set up the maximum number - * of branches, don't try new ones + * of branches, don't try new ones */ if (unlikely(nr_branches == sr_dst_max_branches - 1)) { LM_ERR("max nr of branches exceeded\n"); @@ -466,12 +466,40 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, branches[nr_branches].location_ua[0] = '\0'; branches[nr_branches].location_ua_len = 0; } - + nr_branches++; return 1; } +/** Push a new branch to the current destination set. + * @param msg sip message, used for getting the uri if not specified (0). + * @param uri uri, can be 0 (in which case the uri is taken from msg) + * @param dst_uri destination uri, can be 0. + * @param path path vector (passed in a string), can be 0. + * @param q q value. + * @param flags per branch flags. + * @param force_socket socket that should be used when sending. + * @param instance sip instance contact header param value + * @param reg_id reg-id contact header param value + * @param ruid ruid value from usrloc + * @param location_ua location user agent + * + * @return NULL on failure, new branch pointer on success. + */ +branch_t* ksr_push_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, + qvalue_t q, unsigned int flags, + struct socket_info* force_socket, + str* instance, unsigned int reg_id, + str* ruid, str* location_ua) +{ + if(append_branch(msg, uri, dst_uri, path, q, flags, force_socket, + instance, reg_id, ruid, location_ua)<0) { + return NULL; + } + return &branches[nr_branches-1]; +} + /*! \brief * Combines the given elements into a Contact header field * dest = target buffer, will be updated to new position after the printed contact diff --git a/src/core/dset.h b/src/core/dset.h index 96f31978a6..ebb4e765bb 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -94,7 +94,16 @@ branch_t *get_sip_branch(int idx); int drop_sip_branch(int idx); /*! \brief - * Add a new branch to current transaction + * Push a new branch to current destination set + */ +branch_t *ksr_push_branch(sip_msg_t* msg, str* uri, str* dst_uri, str* path, + qvalue_t q, unsigned int flags, + struct socket_info* force_socket, + str* instance, unsigned int reg_id, + str* ruid, str* location_ua); + +/*! \brief + * Add a new branch to current destination set */ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, qvalue_t q, unsigned int flags,

1 0

git:master:f3b977d3: core: store tcp connection id in sip msg and branch structure
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: f3b977d39ca72e5787a5b97ee2cf154adbe7d0ca URL: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T10:42:43+02:00 core: store tcp connection id in sip msg and branch structure - try to use it to identify outbound connection for stateless forward() --- Modified: src/core/action.c Modified: src/core/dset.h Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… Patch: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… --- diff --git a/src/core/action.c b/src/core/action.c index 45581ba312..8211cf00f7 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -383,10 +383,16 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) init_dest_info(&dst); if (a->type==FORWARD_UDP_T) dst.proto=PROTO_UDP; #ifdef USE_TCP - else if (a->type==FORWARD_TCP_T) dst.proto= PROTO_TCP; + else if (a->type==FORWARD_TCP_T) { + dst.proto= PROTO_TCP; + dst.id = msg->otcpid; + } #endif #ifdef USE_TLS - else if (a->type==FORWARD_TLS_T) dst.proto= PROTO_TLS; + else if (a->type==FORWARD_TLS_T) { + dst.proto= PROTO_TLS; + dst.id = msg->otcpid; + } #endif #ifdef USE_SCTP else if (a->type==FORWARD_SCTP_T) dst.proto=PROTO_SCTP; diff --git a/src/core/dset.h b/src/core/dset.h index 65b54c3104..96f31978a6 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -48,7 +48,7 @@ struct branch char uri[MAX_URI_SIZE]; unsigned int len; - /* Real destination of the request */ + /* Real destination of the request */ char dst_uri[MAX_URI_SIZE]; unsigned int dst_uri_len; @@ -74,6 +74,9 @@ struct branch char location_ua[MAX_UA_SIZE + 1]; unsigned int location_ua_len; + /* tcp connection id */ + int otcpid; + /* Branch flags */ flag_t flags; }; diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 5dff970206..827c541086 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -378,6 +378,7 @@ typedef struct sip_msg { unsigned int reg_id; str ruid; str location_ua; + int otcpid; /*!< outbound tcp connection id, if known */ /* structure with fields that are needed for local processing * - not cloned to shm, reset to 0 in the clone */

1 0

git:master:308b7a2f: core: tcp - new core parameter tcp_accept_unique
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 308b7a2f7b6a7c50e05a2c83537f85b95f979c32 URL: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T10:11:21+02:00 core: tcp - new core parameter tcp_accept_unique - if set to 1, do an extra check when a new connection is created to be sure the is no overlapping with another connection on local ip/port and remote ip/port - recently some tcp/ip router/balancers can do port sharing, but that can create troubles for routing of the requests with the current tcp routing implementation (e.g., using the wrong connection in such group) - default is set to 0 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… Patch: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index dd1b935d8f..20a8fd94ef 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -375,6 +375,7 @@ MHOMED mhomed DISABLE_TCP "disable_tcp" TCP_CHILDREN "tcp_children" TCP_ACCEPT_ALIASES "tcp_accept_aliases" +TCP_ACCEPT_UNIQUE "tcp_accept_unique" TCP_SEND_TIMEOUT "tcp_send_timeout" TCP_CONNECT_TIMEOUT "tcp_connect_timeout" TCP_CON_LIFETIME "tcp_connection_lifetime" @@ -814,6 +815,8 @@ IMPORTFILE "import_file" <INITIAL>{TCP_CHILDREN} { count(); yylval.strval=yytext; return TCP_CHILDREN; } <INITIAL>{TCP_ACCEPT_ALIASES} { count(); yylval.strval=yytext; return TCP_ACCEPT_ALIASES; } +<INITIAL>{TCP_ACCEPT_UNIQUE} { count(); yylval.strval=yytext; + return TCP_ACCEPT_UNIQUE; } <INITIAL>{TCP_SEND_TIMEOUT} { count(); yylval.strval=yytext; return TCP_SEND_TIMEOUT; } <INITIAL>{TCP_CONNECT_TIMEOUT} { count(); yylval.strval=yytext; diff --git a/src/core/cfg.y b/src/core/cfg.y index 4c7dcd1307..3adff2429b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -406,6 +406,7 @@ extern char *default_routename; %token MHOMED %token DISABLE_TCP %token TCP_ACCEPT_ALIASES +%token TCP_ACCEPT_UNIQUE %token TCP_CHILDREN %token TCP_CONNECT_TIMEOUT %token TCP_SEND_TIMEOUT @@ -994,6 +995,14 @@ assign_stm: #endif } | TCP_ACCEPT_ALIASES EQUAL error { yyerror("boolean value expected"); } + | TCP_ACCEPT_UNIQUE EQUAL NUMBER { + #ifdef USE_TCP + tcp_accept_unique=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_ACCEPT_UNIQUE EQUAL error { yyerror("number expected"); } | TCP_CHILDREN EQUAL NUMBER { #ifdef USE_TCP tcp_cfg_children_no=$3; diff --git a/src/core/globals.h b/src/core/globals.h index 3790058075..78a8e5aadc 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -93,6 +93,7 @@ extern int socket_workers; #ifdef USE_TCP extern int tcp_main_pid; extern int tcp_cfg_children_no; +extern int tcp_accept_unique; extern int tcp_children_no; extern int tcp_disable; extern enum poll_types tcp_poll_method; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 54288e908f..7ecaf47eb6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -158,6 +158,7 @@ enum poll_types tcp_poll_method=0; /* by default choose the best method */ int tcp_main_max_fd_no=0; int tcp_max_connections=DEFAULT_TCP_MAX_CONNECTIONS; int tls_max_connections=DEFAULT_TLS_MAX_CONNECTIONS; +int tcp_accept_unique=0; static union sockaddr_union tcp_source_ipv4_addr; /* saved bind/srv v4 addr. */ static union sockaddr_union* tcp_source_ipv4=0; @@ -1655,6 +1656,24 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, } +/** + * find if a tcp connection exits by id or remote+local address/port + * - return: 1 if found; 0 if not found + */ +int tcpconn_exists(int conn_id, ip_addr_t* peer_ip, int peer_port, + ip_addr_t* local_ip, int local_port) +{ + tcp_connection_t* c; + + TCPCONN_LOCK; + c=_tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port); + TCPCONN_UNLOCK; + if (c) { + return 1; + } + return 0; + +} /* _tcpconn_find with locks and timeout * local_addr contains the desired local ip:port. If null any local address @@ -4245,6 +4264,15 @@ static inline int handle_new_connect(struct socket_info* si) /* add socket to list */ tcpconn=tcpconn_new(new_sock, &su, dst_su, si, si->proto, S_CONN_ACCEPT); if (likely(tcpconn)){ + if(tcp_accept_unique) { + if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + LM_ERR("duplicated connection by local and remote addresses\n"); + _tcpconn_free(tcpconn); + tcp_safe_close(new_sock); + return 1; /* success, because the accept was succesfull */ + } + } tcpconn->flags|=F_CONN_PASSIVE; #ifdef TCP_PASS_NEW_CONNECTION_ON_DATA atomic_set(&tcpconn->refcnt, 1); /* safe, not yet available to the

1 0

[kamailio/kamailio] lost: code review, updates to memory managment and error handling (#2034)
by Wolfgang Kampichler 16 Aug '19

16 Aug '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/2034 -- Commit Summary -- * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing -- File Changes -- A src/modules/lost/Makefile (23) A src/modules/lost/doc/Makefile (4) A src/modules/lost/doc/lost.xml (36) A src/modules/lost/doc/lost_admin.xml (265) A src/modules/lost/functions.c (590) A src/modules/lost/functions.h (40) A src/modules/lost/lost.c (339) A src/modules/lost/pidf.c (137) A src/modules/lost/pidf.h (50) A src/modules/lost/utilities.c (653) A src/modules/lost/utilities.h (76) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2034.patch https://github.com/kamailio/kamailio/pull/2034.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/2034

3 3

git:master:edd056dd: lost: small spelling fix in docs
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: edd056dd85e2f68fd7877592e7bd2fc5d15b7b64 URL: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:16:03+02:00 lost: small spelling fix in docs --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… Patch: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 9acfc3e4b6..d4228f3044 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -239,7 +239,7 @@ xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ <section id="lost.s.counters"> <title>Counters</title> <para> - This module has no specific counters but uses http_client therfore + This module has no specific counters but uses http_client therefore according counters may apply. </para> </section>

1 0

git:master:4b317d12: build: add new lost module to extra module group
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 4b317d12a3b9786b1d5ba152e9fb1f1189484e02 URL: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:15:24+02:00 build: add new lost module to extra module group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… Patch: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 4d6236bc02..936c8817ca 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 xhttp_prom + sipjson xhttp_prom lost # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:2ab96d98: lost: initial checkin of README file
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 2ab96d985676889f4145f7aecbb7ca21a9048f29 URL: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:09:52+02:00 lost: initial checkin of README file --- Added: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2… Patch: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2…

1 0

[kamailio/kamailio] lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-bas… (#2031)
by Wolfgang Kampichler 16 Aug '19

16 Aug '19

…ed routing - lost_held_query() takes specific id (pvar, P-A-I, or From), assembles a locationRequest (XML), and sends it to an http_client connection, responses are parsed (pidf-lo and location reference are returned) - lost_query() takes pidf-lo (pvar, msg body, or de-referenced), a service urn (pvar, request line) assembles a findService request (XML), and sends it to an http_client connection, responses are parsed (target uri and display name are returned)   #### 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/2031 -- Commit Summary -- * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing -- File Changes -- A src/modules/lost/Makefile (23) A src/modules/lost/README (238) A src/modules/lost/doc/Makefile (4) A src/modules/lost/doc/lost.xml (36) A src/modules/lost/doc/lost_admin.xml (265) A src/modules/lost/functions.c (551) A src/modules/lost/functions.h (40) A src/modules/lost/lost.c (343) A src/modules/lost/pidf.c (143) A src/modules/lost/pidf.h (53) A src/modules/lost/utilities.c (592) A src/modules/lost/utilities.h (73) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2031.patch https://github.com/kamailio/kamailio/pull/2031.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/2031

3 9

git:master:31866942: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 318669423164b7c96e48861fd49de17d34e957ab URL: https://github.com/kamailio/kamailio/commit/318669423164b7c96e48861fd49de17… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - header comment included --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/318669423164b7c96e48861fd49de17… Patch: https://github.com/kamailio/kamailio/commit/318669423164b7c96e48861fd49de17… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 78fb45caab..5b6afe8b39 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -95,7 +95,7 @@ void lost_rand_str(char *dest, size_t lgth) /* * lost_free_loc(ptr) - * freess a location object + * frees a location object */ void lost_free_loc(p_loc_t ptr) { @@ -106,6 +106,10 @@ void lost_free_loc(p_loc_t ptr) pkg_free(ptr); } +/* + * lost_free_string(ptr) + * frees and resets a string + */ void lost_free_string(str *string) { str ptr = *string;

1 0

git:master:c655e401: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: c655e401e0a839a73c60217b3feb7be87d183bf5 URL: https://github.com/kamailio/kamailio/commit/c655e401e0a839a73c60217b3feb7be… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - code review, updates to memory managment and error handling --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/pidf.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/c655e401e0a839a73c60217b3feb7be… Patch: https://github.com/kamailio/kamailio/commit/c655e401e0a839a73c60217b3feb7be…

1 0

git:master:0f006f09: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 0f006f092cc56f06a153b3c8f363c2d81e2afb1e URL: https://github.com/kamailio/kamailio/commit/0f006f092cc56f06a153b3c8f363c2d… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - code review, updates to memory managment and error handling --- Removed: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0f006f092cc56f06a153b3c8f363c2d… Patch: https://github.com/kamailio/kamailio/commit/0f006f092cc56f06a153b3c8f363c2d…

1 0

git:master:e255aaa5: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: e255aaa596d622103628903d08f07a226dacdbd9 URL: https://github.com/kamailio/kamailio/commit/e255aaa596d622103628903d08f07a2… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - lost_held_query() takes specific id (pvar, P-A-I, or From), assembles a locationRequest (XML), and sends it to an http_client connection, responses are parsed (pidf-lo and location reference are returned) - lost_query() takes pidf-lo (pvar, msg body, or de-referenced), a service urn (pvar, request line) assembles a findService request (XML), and sends it to an http_client connection, responses are parsed (target uri and display name are returned) --- Added: src/modules/lost/Makefile Added: src/modules/lost/README Added: src/modules/lost/doc/Makefile Added: src/modules/lost/doc/lost.xml Added: src/modules/lost/doc/lost_admin.xml Added: src/modules/lost/functions.c Added: src/modules/lost/functions.h Added: src/modules/lost/lost.c Added: src/modules/lost/pidf.c Added: src/modules/lost/pidf.h Added: src/modules/lost/utilities.c Added: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/e255aaa596d622103628903d08f07a2… Patch: https://github.com/kamailio/kamailio/commit/e255aaa596d622103628903d08f07a2…

1 0

git:master:a263f5b6: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: a263f5b62c03851a5d8a61f09e69745f90370703 URL: https://github.com/kamailio/kamailio/commit/a263f5b62c03851a5d8a61f09e69745… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T16:25:57+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a memset --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/a263f5b62c03851a5d8a61f09e69745… Patch: https://github.com/kamailio/kamailio/commit/a263f5b62c03851a5d8a61f09e69745… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 3cc24ef558..fe366403c8 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -727,6 +727,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, memset(argv, 0, TPS_REDIS_NR_KEYS * sizeof(char*)); memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + memset(&id, 0, sizeof(tps_data_t)); if(mode==0) { /* load same transaction using Via branch */ @@ -737,7 +738,6 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } - memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } if(xvbranch1->len<=0 || xvbranch1->s==NULL) {

1 1

git:master:3cd50f17: topos_redis: a few improvements for debugging output
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: 3cd50f171d4443abe21beba8e5e07081f29747d1 URL: https://github.com/kamailio/kamailio/commit/3cd50f171d4443abe21beba8e5e0708… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T16:23:58+02:00 topos_redis: a few improvements for debugging output --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/3cd50f171d4443abe21beba8e5e0708… Patch: https://github.com/kamailio/kamailio/commit/3cd50f171d4443abe21beba8e5e0708… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 47ddad0c1a..3cc24ef558 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -360,7 +360,7 @@ int tps_redis_insert_invite_branch(tps_data_t *td) } return -1; } - LM_DBG("inserting branch record for [%.*s] with argc %d\n", + LM_DBG("inserting invite branch record for [%.*s] with argc %d\n", rkey.len, rkey.s, argc); freeReplyObject(rrpl); @@ -570,7 +570,7 @@ int tps_redis_load_invite_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) return -1; if(md->a_callid.len<=0 || md->b_tag.len<=0) { - LM_INFO("no call-id or to-rag for this message\n"); + LM_INFO("no call-id or to-tag for this message\n"); return -1; } @@ -607,7 +607,7 @@ int tps_redis_load_invite_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) argvlen[argc] = rkey.len; argc++; - LM_DBG("loading branch record for [%.*s]\n", rkey.len, rkey.s); + LM_DBG("loading invite branch record for [%.*s]\n", rkey.len, rkey.s); rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) {

1 0

git:5.2:6670a3b6: add ims_usrloc_scscf README
by Kamailio Dev 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.2 Commit: 6670a3b6403fb43670042103ce4e087f92fa0c1b URL: https://github.com/kamailio/kamailio/commit/6670a3b6403fb43670042103ce4e087… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-14T19:37:37+02:00 add ims_usrloc_scscf README --- Added: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/6670a3b6403fb43670042103ce4e087… Patch: https://github.com/kamailio/kamailio/commit/6670a3b6403fb43670042103ce4e087…

3 4

git:5.1:988fc2ed: ims_dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.1 Commit: 988fc2edb33215e97e6efb88981f43b3a548f753 URL: https://github.com/kamailio/kamailio/commit/988fc2edb33215e97e6efb88981f43b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:33+02:00 ims_dialog: small spelling fix in WARN log messages (cherry picked from commit f25cf7806a84caccf49275be14a5885a9038bdca) --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/988fc2edb33215e97e6efb88981f43b… Patch: https://github.com/kamailio/kamailio/commit/988fc2edb33215e97e6efb88981f43b… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 27b13c8cb5..495aa91c65 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -976,7 +976,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1015,7 +1015,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1051,7 +1051,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/ims_dialog/dlg_req_within.c b/src/modules/ims_dialog/dlg_req_within.c index aa960ecdbc..cba9a39130 100644 --- a/src/modules/ims_dialog/dlg_req_within.c +++ b/src/modules/ims_dialog/dlg_req_within.c @@ -190,7 +190,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps) { dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s);

1 0

git:5.1:e6b8d218: dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.1 Commit: e6b8d218faed267e2963b1e75dd11b2addef8e8c URL: https://github.com/kamailio/kamailio/commit/e6b8d218faed267e2963b1e75dd11b2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:27+02:00 dialog: small spelling fix in WARN log messages (cherry picked from commit 389843c34eed6f39f4631eede6f6ab8b6bade2eb) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/e6b8d218faed267e2963b1e75dd11b2… Patch: https://github.com/kamailio/kamailio/commit/e6b8d218faed267e2963b1e75dd11b2… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 296a2d5c61..8d45d7818f 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1428,7 +1428,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s, dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 62693808c8..d48d139965 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -208,7 +208,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps){ dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s, dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s,

1 0

git:5.2:5e314acb: ims_dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.2 Commit: 5e314acbe9c66fb868ed4cbff1e57a98fc18fa60 URL: https://github.com/kamailio/kamailio/commit/5e314acbe9c66fb868ed4cbff1e57a9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:20+02:00 ims_dialog: small spelling fix in WARN log messages (cherry picked from commit f25cf7806a84caccf49275be14a5885a9038bdca) --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/5e314acbe9c66fb868ed4cbff1e57a9… Patch: https://github.com/kamailio/kamailio/commit/5e314acbe9c66fb868ed4cbff1e57a9… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index e9257b2cc1..b0f5b491bb 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -981,7 +981,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1020,7 +1020,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1056,7 +1056,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/ims_dialog/dlg_req_within.c b/src/modules/ims_dialog/dlg_req_within.c index aa960ecdbc..cba9a39130 100644 --- a/src/modules/ims_dialog/dlg_req_within.c +++ b/src/modules/ims_dialog/dlg_req_within.c @@ -190,7 +190,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps) { dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s);

1 0

git:5.2:9f766cbb: dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.2 Commit: 9f766cbb6d4820e5418594681ae0ebb305204bfd URL: https://github.com/kamailio/kamailio/commit/9f766cbb6d4820e5418594681ae0ebb… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:06+02:00 dialog: small spelling fix in WARN log messages (cherry picked from commit 389843c34eed6f39f4631eede6f6ab8b6bade2eb) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/9f766cbb6d4820e5418594681ae0ebb… Patch: https://github.com/kamailio/kamailio/commit/9f766cbb6d4820e5418594681ae0ebb… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 7e8d72b6c7..79a547aef1 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1428,7 +1428,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s, dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 62693808c8..d48d139965 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -208,7 +208,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps){ dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s, dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s,

1 0

git:master:f25cf780: ims_dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: f25cf7806a84caccf49275be14a5885a9038bdca URL: https://github.com/kamailio/kamailio/commit/f25cf7806a84caccf49275be14a5885… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:47:21+02:00 ims_dialog: small spelling fix in WARN log messages --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/f25cf7806a84caccf49275be14a5885… Patch: https://github.com/kamailio/kamailio/commit/f25cf7806a84caccf49275be14a5885… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index e9257b2cc1..b0f5b491bb 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -981,7 +981,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1020,7 +1020,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1056,7 +1056,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/ims_dialog/dlg_req_within.c b/src/modules/ims_dialog/dlg_req_within.c index aa960ecdbc..cba9a39130 100644 --- a/src/modules/ims_dialog/dlg_req_within.c +++ b/src/modules/ims_dialog/dlg_req_within.c @@ -190,7 +190,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps) { dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s);

1 0

git:master:389843c3: dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: 389843c34eed6f39f4631eede6f6ab8b6bade2eb URL: https://github.com/kamailio/kamailio/commit/389843c34eed6f39f4631eede6f6ab8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:47:21+02:00 dialog: small spelling fix in WARN log messages --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/389843c34eed6f39f4631eede6f6ab8… Patch: https://github.com/kamailio/kamailio/commit/389843c34eed6f39f4631eede6f6ab8… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index adb0278c1e..eebb1e502e 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1449,7 +1449,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s, dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 62693808c8..d48d139965 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -208,7 +208,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps){ dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s, dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s,

1 0

git:master:d36a4b00: evapi: free the faked msg clone used for dispatcher event route
by Daniel-Constantin Mierla 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: d36a4b00c6becd42cfcec4fc7eb398371e1cc812 URL: https://github.com/kamailio/kamailio/commit/d36a4b00c6becd42cfcec4fc7eb3983… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T08:33:49+02:00 evapi: free the faked msg clone used for dispatcher event route --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/d36a4b00c6becd42cfcec4fc7eb3983… Patch: https://github.com/kamailio/kamailio/commit/d36a4b00c6becd42cfcec4fc7eb3983… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index ec56945b5e..e603753cec 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -37,6 +37,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/kemi.h" #include "../../core/fmsg.h" @@ -170,6 +171,9 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) } set_route_type(backup_rt); evapi_set_msg_env(fmsg, NULL); + /* free the structure -- it is a clone of faked msg */ + free_sip_msg(fmsg); + ksr_msg_env_reset(); return 0; }

1 0

Re: [sr-dev] [SR-Users] Question regarding Dispatcher + ds_default_socket() modparam + Call-ID generation
by Henning Westerholt 14 Aug '19

14 Aug '19

Hi Daniel, good tip about the crypto module. It will indeed hide the IP address in the call-id, just tried it: Call-ID: d810d369-aa60-4d79-aee5-9c03d2e66781 I think if we would feed the sruid unique ID (in libs/srutils) into the SHA256 hash (also available there) this it should be secure enough without the crypto dependencies. The sruid is based on a LSFR implementation which is quite fast, and the SHA256 should provide the necessary unpredictability. But as the crypto module approach works, it has probably not a really high priority. I can also look a bit into it when I got time. Cheers, Henning Am 14.08.19 um 19:21 schrieb Daniel-Constantin Mierla: Hello, using the ip in call-id is not a good practice imo, I had it in mind to replace it properly everywhere for quite some time -- actually at this moment there is an option that can be activated in the crypto module making the call-id to be generated with libssl unique id generation functions, but I don't recall if the local ip is still appended. This would require libssl, so my goal was to add an alternative to generate a "good-enough" unique id, without external dependencies, to be used as local call-id. Cheers, Daniel On 14.08.19 19:01, Joel Serrano wrote: Hello Henning, No concerns at all!! As you say, the Call-ID can really say whatever... The only concern could/would be in the security topic that you are disclosing potential sensible information about your infrastructure blablabla... but that can be solved just by changing the listen= order so even that wouldn't be a problem.. In reality I was just curious so I thought I'd ask :) Thanks!! Joel. On Wed, Aug 14, 2019 at 9:32 AM Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hello Joel, funny - I just had this discussion about the same topic some days ago. In the end this is "only" the call-id, the IP should not be used to to routing descisions etc.. Do you have some more concerns about this? I think as well it just uses the first IP. I think at the moment the call-id is generated internally from tm, but this could be of course changed for the module with some coding/extension. Cheers, Henning Am 14.08.19 um 17:12 schrieb Joel Serrano: Hello, Simple doubt regarding dispatcher module when you have the ds_default_socket() modparam set: Say you have 2 kamailio boxes, active + passive, one shared IP via keepalived.... On the actrive node, you have dispatcher.send_ping to 1, and the passive has it set to 0. So far OK, only the active box is sending out probing OPTIONS requests, and it's using as outbound socket the virtual IP out of all the available ones (as defined with ds_default_socket() modparam) I have seen in a capture that the outbound OPTIONS look like: OPTIONS sip:190.14.203.219:5060<http://190.14.203.219:5060> SIP/2.0 Via: SIP/2.0/UDP A.B.C.180;branch=z9hG4bK7abb.6fbaccc1000000000000000000000000.0 To: <sip:190.14.203.219:5060<http://190.14.203.219:5060>> From: <sip:dspinger@my.domain><mailto:sip:dspinger@my.domain>;tag=e2bdd495733c59fd91487a137fccad4e-8a73 CSeq: 10 OPTIONS Call-ID: 2019f8491329c382-31419(a)A.B.C.181 Max-Forwards: 70 Content-Length: 0 A.B.C.180 -> VRRP A.B.C.181 -> Physical IP of the box My doubt is, shouldn't ds_default_socket also update the IP used to generate the Call-ID used in the OPTIONS request? Currently, I believe it's using the first defined listen= IP from config script as I switched the order the listen= are defined and I get the desired result: OPTIONS sip:186.188.220.174:5060<http://186.188.220.174:5060> SIP/2.0 Via: SIP/2.0/UDP A.B.C.180;branch=z9hG4bKc97e.a8d9e1c2000000000000000000000000.0 To: <sip:186.188.220.174:5060<http://186.188.220.174:5060>> From: <sip:dspinger@my.domain><mailto:sip:dspinger@my.domain>;tag=5e2e1773f812f6a7e4085c5d036e29d8-d323 CSeq: 10 OPTIONS Call-ID: 7d9a92c218fc1ba0-32111(a)A.B.C.180 Max-Forwards: 70 Content-Length: 0 Is this expected? Cheers, Joel. _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Daniel-Constantin Mierla -- www.asipto.com<http://www.asipto.com> www.twitter.com/miconda<http://www.twitter.com/miconda> -- www.linkedin.com/in/miconda<http://www.linkedin.com/in/miconda> -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

1 0

git:5.1:f031ae77: add ims_usrloc_scscf README
by Kamailio Dev 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.1 Commit: f031ae7792ab487b6bbcae7c5df3103431441668 URL: https://github.com/kamailio/kamailio/commit/f031ae7792ab487b6bbcae7c5df3103… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-14T19:37:55+02:00 add ims_usrloc_scscf README --- Added: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/f031ae7792ab487b6bbcae7c5df3103… Patch: https://github.com/kamailio/kamailio/commit/f031ae7792ab487b6bbcae7c5df3103…

1 0

[kamailio/kamailio] ims_usrloc_scscf module lacks module documentation (#1644)
by Henning Westerholt 14 Aug '19

14 Aug '19

The ims_usrloc_scscf module lacks module documentation in git master: ~/repositories/kamailio/src/modules/ims_usrloc_scscf> ls -la README doc* ls: cannot access 'README': No such file or directory ls: cannot access 'doc*': No such file or directory The purpose of this module and also its parameters that are exported should be documented in a doc/*.xml files like the other modules. This are the exported parameters from the source code: {"timer_interval", INT_PARAM, &timer_interval }, {"desc_time_order", INT_PARAM, &desc_time_order }, {"matching_mode", INT_PARAM, &matching_mode }, {"cseq_delay", INT_PARAM, &cseq_delay }, {"fetch_rows", INT_PARAM, &ul_fetch_rows }, {"hash_size", INT_PARAM, &ul_hash_size }, {"subs_hash_size", INT_PARAM, &subs_hash_size }, {"contacts_hash_size", INT_PARAM, &contacts_hash_size }, {"nat_bflag", INT_PARAM, &nat_bflag }, {"contact_delete_delay", INT_PARAM, &contact_delete_delay }, {"usrloc_debug_file", PARAM_STR, &usrloc_debug_file}, {"enable_debug_file", INT_PARAM, &usrloc_debug}, {"user_data_dtd", PARAM_STRING, &scscf_user_data_dtd}, {"user_data_xsd", PARAM_STRING, &scscf_user_data_xsd}, {"support_wildcardPSI", INT_PARAM, &scscf_support_wildcardPSI}, {"unreg_validity", INT_PARAM, &unreg_validity}, {"maxcontact_behaviour",INT_PARAM, &maxcontact_behaviour}, {"maxcontact", INT_PARAM, &maxcontact}, {"maxcontact_3gpp", INT_PARAM, &maxcontact_3gpp}, {"max_subscribes", INT_PARAM, &max_subscribes}, {"sub_dialog_hash_size",INT_PARAM, &sub_dialog_hash_size}, {"db_mode", INT_PARAM, &db_mode}, {"db_url", PARAM_STR, &db_url}, {"timer_procs", INT_PARAM, &ul_timer_procs}, -- 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/1644

4 6

[kamailio/kamailio] ims_usrloc_scscf : documentation is added (#1835)
by Yasin CANER 14 Aug '19

14 Aug '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  ims_usrloc_scscf module documentation is added. removed unnecessary files. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1835 -- Commit Summary -- * ims_registrar_scscf : fixed wrong comment for emergency register * ims_registrar_scscf: removed screensharing log file. * ims_usrloc_scscf: removed NewFile.xml file * ims_usrloc_scscf: doc is added -- File Changes -- M src/modules/ims_registrar_scscf/config.c (4) D src/modules/ims_registrar_scscf/screensharing.log (66) D src/modules/ims_usrloc_scscf/NewFile.xml (9) A src/modules/ims_usrloc_scscf/doc/Makefile (4) A src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf.xml (62) A src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml (340) A src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_faq.xml (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1835.patch https://github.com/kamailio/kamailio/pull/1835.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/1835

3 2

git:5.1:263a078e: ims_usrloc_scscf: doc is added
by Henning Westerholt 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.1 Commit: 263a078e581c11173d89f1114fa8827ee6259c35 URL: https://github.com/kamailio/kamailio/commit/263a078e581c11173d89f1114fa8827… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-14T18:15:12+02:00 ims_usrloc_scscf: doc is added documentation is added for ims_usrloc_scscf (cherry picked from commit 44049e9a9793824a8ef09759813b3cc8b5864103) --- Added: src/modules/ims_usrloc_scscf/doc/Makefile Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/263a078e581c11173d89f1114fa8827… Patch: https://github.com/kamailio/kamailio/commit/263a078e581c11173d89f1114fa8827…

1 0

git:5.2:3dc241b4: ims_usrloc_scscf: doc is added
by Henning Westerholt 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 3dc241b48be634ff444443ef9e0a4c4f4ddf33a6 URL: https://github.com/kamailio/kamailio/commit/3dc241b48be634ff444443ef9e0a4c4… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-14T18:14:03+02:00 ims_usrloc_scscf: doc is added documentation is added for ims_usrloc_scscf (cherry picked from commit 44049e9a9793824a8ef09759813b3cc8b5864103) --- Added: src/modules/ims_usrloc_scscf/doc/Makefile Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml Added: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/3dc241b48be634ff444443ef9e0a4c4… Patch: https://github.com/kamailio/kamailio/commit/3dc241b48be634ff444443ef9e0a4c4…

1 0

Kamailio v5.2.4 Released
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Hello, Kamailio SIP Server v5.2.4 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.3. 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.4. For more details about version 5.2.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2019/08/kamailio-v5-2-4-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:759867b6: ChangeLog: content updated for v5.2.4
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 759867b67e1031d037378168984b87b2590fb7c5 URL: https://github.com/kamailio/kamailio/commit/759867b67e1031d037378168984b87b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T11:35:30+02:00 ChangeLog: content updated for v5.2.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/759867b67e1031d037378168984b87b… Patch: https://github.com/kamailio/kamailio/commit/759867b67e1031d037378168984b87b…

1 0

git:5.2:0c23deea: Makefile.defs: version set to 5.2.4
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 0c23deeaad6b54236966807172388f4073e54dde URL: https://github.com/kamailio/kamailio/commit/0c23deeaad6b54236966807172388f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T11:17:03+02:00 Makefile.defs: version set to 5.2.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0c23deeaad6b54236966807172388f4… Patch: https://github.com/kamailio/kamailio/commit/0c23deeaad6b54236966807172388f4… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index f73a9aa8c1..450edabada 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 2 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.2:7218d1fd: pkg/kamailio: updated version to 5.2.4 in spec files
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 7218d1fdad903fabaff224cf2be8212013e35221 URL: https://github.com/kamailio/kamailio/commit/7218d1fdad903fabaff224cf2be8212… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T11:13:54+02:00 pkg/kamailio: updated version to 5.2.4 in spec files --- 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/7218d1fdad903fabaff224cf2be8212… Patch: https://github.com/kamailio/kamailio/commit/7218d1fdad903fabaff224cf2be8212… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index fc3004f67f..ced35284bf 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.3 +pkgver=5.2.4 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 5a801d389c..76bd037c35 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.2.3 +%define ver 5.2.4 %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 de1aca796c..0495af393e 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.3 +%define ver 5.2.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 940b0db365..86707938b6 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.3 +%define ver 5.2.4 %define rel 0 %define _sharedir %{_prefix}/share

1 0

[kamailio/kamailio] Kemi sqlops memory leak (#2032)
by Sebastian Damm 14 Aug '19

14 Aug '19

### Description We are running Kamailio 5.1.x in a mixed native/Kemi environment. That means, most of the config is still native Kamailio language, but some newer functions were written in JS and included via `jsdt_run("...");`. In one of those functions, we place an sqlops query. And since introducing this code, Kamailio leaks memory. Slowly, but eventually, the private memory will fill up. ### Troubleshooting #### Reproduction In Kamailio, the code looks like this: ``` if (!jsdt_run("ksrIsCallAccountingRequired", "$(var(accentries){s.select,10,|})", "$(var(accentries){s.select,12,|})")) { xlog("L_ERR", "JS Call of ksrIsCallAccountingRequired route failed.\n"); } ``` And our JS code containing sqlops looks like this: ``` extension = '1234567e0'; mastersipid = '1234567'; KSR.sqlops.sql_query( "dbconn", `SELECT username, grp FROM grp WHERE username IN ('${mastersipid}', '${extension}') AND grp = 'ourGroupName'`, user ); ``` For each call, this query is executed once. Depending on the traffic, you can see the private package memory starting to fill up quicker or slower. #### Debugging Data ### Possible Solutions We had a similar problem about two years ago with app_lua and getting entries from a hash table, which we solved by introducing a temporary variable for using in the hash table index instead of strings. We tried doing the same thing in our current setup: ``` KSR.pv.sets("$var(extensionForQuery)", extension); KSR.pv.sets("$var(masterSipidForQuery)", masterSipid); KSR.sqlops.sql_query( "dbconn", "SELECT username, grp FROM grp WHERE username IN ('$var(masterSipidForQuery)', '$var(extensionForQuery)') AND grp = 'ourGroupName'", user ); ``` However, Kamailio doesn't replace the variables in the query string. Although the documentation of the sqlops module says, it supports pseudovars in the query string. We even tried putting the whole query into a variable, but ended up with a sqlops error. ### Additional Information ``` ersion: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.7.2 ``` * **Operating System**: ``` Debian Wheezy (yeah, I know... ) ``` -- 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/2032

3 5

git:master:897f58fd: sqlops: add a limit of maximum 32 result containers
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: master Commit: 897f58fd48c68d88df7967c1390a23f8b9069a61 URL: https://github.com/kamailio/kamailio/commit/897f58fd48c68d88df7967c1390a23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T09:53:17+02:00 sqlops: add a limit of maximum 32 result containers - prevent use of too much memory by defining too many result containers - related to GH #2032 --- Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/897f58fd48c68d88df7967c1390a23f… Patch: https://github.com/kamailio/kamailio/commit/897f58fd48c68d88df7967c1390a23f… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 54c123f85e..748d77320e 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -35,6 +35,8 @@ #include "sql_api.h" +#define SQLOPS_RESULT_MAXSIZE 32 + sql_con_t *_sql_con_root = NULL; sql_result_t *_sql_result_root = NULL; @@ -209,17 +211,25 @@ sql_result_t* sql_get_result(str *name) { sql_result_t *sr; unsigned int resid; + int i; resid = core_case_hash(name, 0, 0); sr = _sql_result_root; + i = 0; while(sr) { if(sr->resid==resid && sr->name.len==name->len && strncmp(sr->name.s, name->s, name->len)==0) return sr; + i++; sr = sr->next; } + if(i>SQLOPS_RESULT_MAXSIZE) + { + LM_ERR("too many result containers defined\n"); + return NULL; + } sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t) + name->len); if(sr==NULL) { @@ -736,7 +746,7 @@ int sqlops_do_query(str *scon, str *squery, str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } } @@ -764,7 +774,7 @@ int sqlops_get_value(str *sres, int i, int j, sql_val_t **val) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } if(i>=res->nrows) @@ -800,7 +810,7 @@ int sqlops_is_null(str *sres, int i, int j) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } if(i>=res->nrows) @@ -836,7 +846,7 @@ int sqlops_get_column(str *sres, int i, str *col) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } if(i>=res->ncols) @@ -866,7 +876,7 @@ int sqlops_num_columns(str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } return res->ncols; @@ -890,7 +900,7 @@ int sqlops_num_rows(str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } return res->nrows; @@ -914,7 +924,7 @@ void sqlops_reset_result(str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); return; } sql_reset_result(res); diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 1b16c06ed7..3943b1b81a 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -205,7 +205,7 @@ int sql_res_param(modparam_t type, void *val) res = sql_get_result(&s); if(res==NULL) { - LM_ERR("invalid result [%s]\n", s.s); + LM_ERR("invalid result container [%s]\n", s.s); goto error; } return 0; @@ -335,7 +335,7 @@ static int fixup_sql_query(void** param, int param_no) res = sql_get_result(&s); if(res==NULL) { - LM_ERR("invalid result [%s]\n", s.s); + LM_ERR("invalid result container [%s]\n", s.s); return E_UNSPEC; } *param = (void*)res; @@ -458,7 +458,7 @@ static int fixup_sql_rfree(void** param, int param_no) res = sql_get_result(&s); if(res==NULL) { - LM_ERR("invalid result [%s]\n", s.s); + LM_ERR("invalid result container [%s]\n", s.s); return E_UNSPEC; } *param = (void*)res;

1 0

git:5.2:f4f08a90: pkg/kamailio/deb: version set to 5.2.4 [skip ci]
by Victor Seva 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: f4f08a901bd798acd237851c7299c6d07083974e URL: https://github.com/kamailio/kamailio/commit/f4f08a901bd798acd237851c7299c6d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-08-14T08:32:33+02:00 pkg/kamailio/deb: version set to 5.2.4 [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/f4f08a901bd798acd237851c7299c6d… Patch: https://github.com/kamailio/kamailio/commit/f4f08a901bd798acd237851c7299c6d…

1 0

Planning the release of Kamailio v5.2.4
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Hello, I am considering to do soon a new release out of branch 5.2, respectively v5.2.4. I am aiming for August 12 or August 14, a matter of how backporting is finished, given that next week some devs travel to ClueCon. As usual, if you are aware of issues not reported yet on bug tracker or fixes not yet backported to branch 5.2, act during the next days to have enough time to approach them. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 3

git:master:29eb7561: rr: use msg_ctx_id_t for caching of request direction
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 29eb75611987c58a32904f5094055efa33c1c89a URL: https://github.com/kamailio/kamailio/commit/29eb75611987c58a32904f5094055ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T16:38:04+02:00 rr: use msg_ctx_id_t for caching of request direction --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/29eb75611987c58a32904f5094055ef… Patch: https://github.com/kamailio/kamailio/commit/29eb75611987c58a32904f5094055ef… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 37fa04f33d..fed7cc7140 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -1218,12 +1218,12 @@ int get_route_param(sip_msg_t *msg, str *name, str *val) int is_direction(struct sip_msg * msg, int dir) { static str ftag_param = {"ftag",4}; - static unsigned int last_id = (unsigned int)-1; + static msg_ctx_id_t last_id = {0}; static unsigned int last_dir = 0; str ftag_val; str tag; - if ( last_id==msg->id && last_dir!=0) { + if ( last_id.msgid==msg->id && last_id.pid==msg->pid && last_dir!=0) { if (last_dir==RR_FLOW_UPSTREAM) goto upstream; else @@ -1256,11 +1256,13 @@ int is_direction(struct sip_msg * msg, int dir) goto upstream; downstream: - last_id = msg->id; + last_id.msgid = msg->id; + last_id.pid = msg->pid; last_dir = RR_FLOW_DOWNSTREAM; return (dir==RR_FLOW_DOWNSTREAM)?0:-1; upstream: - last_id = msg->id; + last_id.msgid = msg->id; + last_id.pid = msg->pid; last_dir = RR_FLOW_UPSTREAM; return (dir==RR_FLOW_UPSTREAM)?0:-1; }

1 0

git:master:8d4ba1c5: rr: use msg_ctx_id_t for record route params caching
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 8d4ba1c577601c51903cc4b1bee8012318f70b54 URL: https://github.com/kamailio/kamailio/commit/8d4ba1c577601c51903cc4b1bee8012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T16:38:04+02:00 rr: use msg_ctx_id_t for record route params caching --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/8d4ba1c577601c51903cc4b1bee8012… Patch: https://github.com/kamailio/kamailio/commit/8d4ba1c577601c51903cc4b1bee8012… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index e9138985f3..37fa04f33d 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -57,8 +57,7 @@ #define ROUTE_SUFFIX_LEN (sizeof(ROUTE_SUFFIX)-1) /*! variables used to hook the param part of the local route */ -static unsigned int routed_msg_id = 0; -static int routed_msg_pid = 0; +static msg_ctx_id_t routed_msg_id = {0}; static str routed_params = {0,0}; extern int rr_force_send_socket; @@ -585,8 +584,8 @@ static inline int after_strict(struct sip_msg* _m) uri = rt->nameaddr.uri; /* reset rr handling static vars for safety in error case */ - routed_msg_id = 0; - routed_msg_pid = 0; + routed_msg_id.msgid = 0; + routed_msg_id.pid = 0; routed_params.s = NULL; routed_params.len = 0; @@ -637,8 +636,8 @@ static inline int after_strict(struct sip_msg* _m) /* set the hooks for the param * important note: RURI is already parsed by the above function, so * we just used it without any checking */ - routed_msg_id = _m->id; - routed_msg_pid = _m->pid; + routed_msg_id.msgid = _m->id; + routed_msg_id.pid = _m->pid; routed_params = _m->parsed_uri.params; if (is_strict(&puri.params)) { @@ -794,8 +793,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) uri = rt->nameaddr.uri; /* reset rr handling static vars for safety in error case */ - routed_msg_id = 0; - routed_msg_pid = 0; + routed_msg_id.msgid = 0; + routed_msg_id.pid = 0; if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI (%.*s)\n", @@ -812,8 +811,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) LM_DBG("Topmost route URI: '%.*s' is me\n", uri.len, ZSW(uri.s)); /* set the hooks for the params */ - routed_msg_id = _m->id; - routed_msg_pid = _m->pid; + routed_msg_id.msgid = _m->id; + routed_msg_id.pid = _m->pid; if ((use_ob = process_outbound(_m, puri.user)) < 0) { LM_INFO("failed to process outbound flow-token\n"); @@ -1015,7 +1014,7 @@ int redo_route_params(sip_msg_t *msg) } /* check if the hooked params belong to the same message */ - if (routed_msg_id != msg->id || routed_msg_pid != msg->pid) { + if (routed_msg_id.msgid != msg->id || routed_msg_id.pid != msg->pid) { redo = 1; } if((redo==0) && (routed_params.s==NULL || routed_params.len<=0)) { @@ -1031,8 +1030,8 @@ int redo_route_params(sip_msg_t *msg) uri = rt->nameaddr.uri; /* reset rr handling static vars for safety in error case */ - routed_msg_id = 0; - routed_msg_pid = 0; + routed_msg_id.msgid = 0; + routed_msg_id.pid = 0; if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI (%.*s)\n", @@ -1047,8 +1046,8 @@ int redo_route_params(sip_msg_t *msg) LM_DBG("Topmost route URI: '%.*s' is me\n", uri.len, ZSW(uri.s)); /* set the hooks for the params */ - routed_msg_id = msg->id; - routed_msg_pid = msg->pid; + routed_msg_id.msgid = msg->id; + routed_msg_id.pid = msg->pid; routed_params = puri.params; return 0; } else {

1 0

git:master:7dca532c: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 7dca532cf3ab3aed35571134081b3715b6fa75c8 URL: https://github.com/kamailio/kamailio/commit/7dca532cf3ab3aed35571134081b371… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-13T16:16:41+02:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/7dca532cf3ab3aed35571134081b371… Patch: https://github.com/kamailio/kamailio/commit/7dca532cf3ab3aed35571134081b371… --- diff --git a/src/modules/rr/README b/src/modules/rr/README index 4fe696ee3a..1b1ef14557 100644 --- a/src/modules/rr/README +++ b/src/modules/rr/README @@ -16,8 +16,6 @@ Edited by Jan Janak -Edited by - Bogdan-Andrei Iancu Copyright © 2003 FhG FOKUS @@ -52,7 +50,7 @@ Bogdan-Andrei Iancu 5. Functions 5.1. loose_route() - 5.2. record_route() and record_route(string) + 5.2. record_route([sparams]) 5.3. remove_record_route() 5.4. record_route_preset(string [,string2]) 5.5. record_route_advertised_address(address) @@ -128,7 +126,7 @@ Chapter 1. Admin Guide 5. Functions 5.1. loose_route() - 5.2. record_route() and record_route(string) + 5.2. record_route([sparams]) 5.3. remove_record_route() 5.4. record_route_preset(string [,string2]) 5.5. record_route_advertised_address(address) @@ -362,7 +360,7 @@ modparam("rr", "ignore_sips", 1) 5. Functions 5.1. loose_route() - 5.2. record_route() and record_route(string) + 5.2. record_route([sparams]) 5.3. remove_record_route() 5.4. record_route_preset(string [,string2]) 5.5. record_route_advertised_address(address) @@ -417,7 +415,7 @@ modparam("rr", "ignore_sips", 1) loose_route(); ... -5.2. record_route() and record_route(string) +5.2. record_route([sparams]) The function adds a new Record-Route header field. The header field will be inserted in the message before any other Record-Route header @@ -432,6 +430,10 @@ loose_route(); generate and add a flow-token as the username part of the Record-Route-URI. + Note: if append From-tag is enabled and the function is used for + requests within dialog, it must be executed after loose_route() in + order to detect properly the direction. + This function can be used from REQUEST_ROUTE, BRANCH_ROUTE and FAILURE_ROUTE.

1 0

git:master:6542a638: rr: docs - note about use of record_route() for requests within dialog
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 6542a638bee90afdbfe63b59d9d7f1d23b0406aa URL: https://github.com/kamailio/kamailio/commit/6542a638bee90afdbfe63b59d9d7f1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T16:07:05+02:00 rr: docs - note about use of record_route() for requests within dialog - it has to be used after loose_route() for a proper detection of request direction --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6542a638bee90afdbfe63b59d9d7f1d… Patch: https://github.com/kamailio/kamailio/commit/6542a638bee90afdbfe63b59d9d7f1d… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 74e59abe82..362edd4f1f 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -397,8 +397,7 @@ loose_route(); </section> <section id="rr.f.record_route"> - <title><function moreinfo="none">record_route()</function> and <function - moreinfo="none">record_route(string)</function></title> + <title><function moreinfo="none">record_route([sparams])</function></title> <para>The function adds a new Record-Route header field. The header field will be inserted in the message before any other Record-Route @@ -414,6 +413,10 @@ loose_route(); request and generate and add a flow-token as the username part of the Record-Route-URI.</para> + <para>Note: if append From-tag is enabled and the function is used for requests + within dialog, it must be executed after loose_route() in order to detect + properly the direction.</para> + <para>This function can be used from REQUEST_ROUTE, BRANCH_ROUTE and FAILURE_ROUTE.</para>

1 0

git:master:8546983d: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 8546983de13bba7ed7a84a88ed91027e4291a1bc URL: https://github.com/kamailio/kamailio/commit/8546983de13bba7ed7a84a88ed91027… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-13T10:16:43+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/8546983de13bba7ed7a84a88ed91027… Patch: https://github.com/kamailio/kamailio/commit/8546983de13bba7ed7a84a88ed91027… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index d55fc5a7c9..e4516756e6 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -1070,7 +1070,7 @@ add_sock_hdr("Sock-Info"); * ruid - The record unique ID for a a specific contact to be removed. It can contain pseudo-variables that are evaluated at runtime. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. Return values: * 0 - Successfully deleted contact(s)

1 0

git:master:0cc64de7: registrar: allow unregister() to be used in any route
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 0cc64de7530fe90cbe3183caa494d9ef9941ee51 URL: https://github.com/kamailio/kamailio/commit/0cc64de7530fe90cbe3183caa494d9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T10:01:35+02:00 registrar: allow unregister() to be used in any route --- Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/0cc64de7530fe90cbe3183caa494d9e… Patch: https://github.com/kamailio/kamailio/commit/0cc64de7530fe90cbe3183caa494d9e… --- diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 83730e9a19..ec374571e9 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -192,9 +192,9 @@ static cmd_export_t cmds[] = { {"add_sock_hdr", (cmd_function)w_add_sock_hdr, 1, fixup_spve_null, 0, REQUEST_ROUTE }, {"unregister", (cmd_function)w_unregister, 2, unreg_fixup, 0, - REQUEST_ROUTE| FAILURE_ROUTE }, + ANY_ROUTE }, {"unregister", (cmd_function)w_unregister2, 3, unreg_fixup, 0, - REQUEST_ROUTE| FAILURE_ROUTE }, + ANY_ROUTE }, {"reg_fetch_contacts", (cmd_function)pv_fetch_contacts, 3, fetchc_fixup, 0, REQUEST_ROUTE| FAILURE_ROUTE },

1 0

git:master:23a5b8d9: registrar: updated docs for unregister()
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 23a5b8d9baf40a416401017324ceb01e7d769494 URL: https://github.com/kamailio/kamailio/commit/23a5b8d9baf40a416401017324ceb01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T10:03:32+02:00 registrar: updated docs for unregister() - function is allowed to be used in any route --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/23a5b8d9baf40a416401017324ceb01… Patch: https://github.com/kamailio/kamailio/commit/23a5b8d9baf40a416401017324ceb01… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 32752eac89..67e13e09e3 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1400,7 +1400,7 @@ add_sock_hdr("Sock-Info"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. </para> <para> Return values:

1 0

git:master:8b8b5780: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 8b8b5780c968079fd57d7b236ebfbfe3c9c76607 URL: https://github.com/kamailio/kamailio/commit/8b8b5780c968079fd57d7b236ebfbfe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-13T09:32:20+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/8b8b5780c968079fd57d7b236ebfbfe… Patch: https://github.com/kamailio/kamailio/commit/8b8b5780c968079fd57d7b236ebfbfe…

1 0

git:master:f9f113d9: http_client: docs for query_maxdatasize parameter
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: f9f113d9b07ea351c75f3d7fed5478074d5575c4 URL: https://github.com/kamailio/kamailio/commit/f9f113d9b07ea351c75f3d7fed54780… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:25:15+02:00 http_client: docs for query_maxdatasize parameter --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f9f113d9b07ea351c75f3d7fed54780… Patch: https://github.com/kamailio/kamailio/commit/f9f113d9b07ea351c75f3d7fed54780… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 55c65ccc97..1079bfe17a 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -458,6 +458,24 @@ modparam("http_client", "keep_connections", 1) <programlisting format="linespecific"> ... modparam("http_client", "query_result", 0) +... + </programlisting> + </example> + </section> + <section id="http_client.p.query_maxdatasize"> + <title><varname>query_maxdatasize</varname> (int)</title> + <para> + Control the size in bytes of the data to be returned by the + http_client_query(...) in the result variable. + </para> + <para> + Default value: 0 (disabled, unlimited size). + </para> + <example> + <title>Set <varname>query_maxdatasize</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "query_maxdatasize", 2048) ... </programlisting> </example>

1 0

git:master:ea4b25c6: http_client: new param query_maxdatasize
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: ea4b25c67c0e4ea072ce1bbc11ae21bc7c9484a3 URL: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:20:08+02:00 http_client: new param query_maxdatasize - set the maximum size to be downloaded for http_client_query() result - default: 0 - disabled (unlimited size) --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… Patch: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 05dc827126..bfa42ac527 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -653,7 +653,7 @@ int http_client_query( query_params.timeout = default_connection_timeout; query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = default_query_result; - query_params.maxdatasize = 0; + query_params.maxdatasize = default_query_maxdatasize; if(default_useragent.s != NULL && default_useragent.len > 0) { query_params.useragent = default_useragent.s; } diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index fc20b65525..bdc2253b3d 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -104,6 +104,8 @@ unsigned int default_authmethod = * - 0: return full result * - 1: return first line only */ unsigned int default_query_result = 1; +/*!< Default download size for result of query function. 0=disabled (no limit) */ +unsigned int default_query_maxdatasize = 0; str http_client_config_file = STR_NULL; @@ -201,6 +203,7 @@ static param_export_t params[] = { {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, {"query_result", PARAM_INT, &default_query_result }, + {"query_maxdatasize", PARAM_INT, &default_query_maxdatasize }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 7f236dfa7e..a3620bd233 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -63,6 +63,7 @@ extern unsigned int extern unsigned int default_keep_connections; /*!< Keep http connections open for reuse */ extern unsigned int default_query_result; /*!< Default query result mode */ +extern unsigned int default_query_maxdatasize; /*!< Default query result maximum download size */ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */

1 0

git:master:d93b1861: http_client: docs for query_result parameter
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: d93b1861c6e9be5991040d2da327d2f543d9f9ab URL: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:15:43+02:00 http_client: docs for query_result parameter --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… Patch: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 70bcd2a433..55c65ccc97 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -36,10 +36,10 @@ <para> Like in SIP, the HTTP URL may need encoding to be transported safely over the network. Check the string encoding functions in the Transformation - Cookbook (as used in the http_client_query example below). + Cookbook (as used in the http_client_query() example below). </para> <para> - The function http_client_query allows &kamailio; to issue an HTTP GET + The function http_client_query() allows &kamailio; to issue an HTTP GET request and get access to parts of the reply. This function has been ported from the utils module and now use the same libcurl functions. We recommend using the new functionality provided by @@ -433,6 +433,31 @@ modparam("http_client", "authmethod", 3) <programlisting format="linespecific"> ... modparam("http_client", "keep_connections", 1) +... + </programlisting> + </example> + </section> + <section id="http_client.p.query_result"> + <title><varname>query_result</varname> (int)</title> + <para> + Control what is returned by the http_client_query(...) in the result + variable. + </para> + <para> + Valid values are: + <itemizedlist> + <listitem><para>0 - Return the entire HTTP result body</para></listitem> + <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + </itemizedlist> + </para> + <para> + Default value: 1 (return first line). + </para> + <example> + <title>Set <varname>query_result</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "query_result", 0) ... </programlisting> </example> @@ -796,17 +821,18 @@ http_get_redirect("apiserver", "$var(targeturl)"); </para> <para> If HTTP server returns a class 2xx, 3xx or 4xx reply, - the first line of the reply's body (if any) is + the first line or the entire reply body (if any) is stored in <quote>result</quote> parameter, - which must be a writable pseudo variable. + which must be a writable pseudo variable. See the query_result + parameter for controling what value to be stored in the result + variable. </para> <para> Function returns reply code of HTTP reply or -1 if something went wrong. </para> <para> - This function can be used from REQUEST_ROUTE, - ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <para> Note that this function is based on the http_query function in the utils module.

1 0

git:master:d07b522b: http_client: new param query_result
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: d07b522b927f26b01a24417e0fb9f64c87fb79fb URL: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:07:34+02:00 http_client: new param query_result - control if the http_client_query() returns only the first line or the entire result - 0: return the entire result - 1: return the first line (default, backward compatible) --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… Patch: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 695324bf43..05dc827126 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -652,7 +652,7 @@ int http_client_query( query_params.verify_host = default_tls_verify_host; query_params.timeout = default_connection_timeout; query_params.http_follow_redirect = default_http_follow_redirect; - query_params.oneline = 1; + query_params.oneline = default_query_result; query_params.maxdatasize = 0; if(default_useragent.s != NULL && default_useragent.len > 0) { query_params.useragent = default_useragent.s; diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 432d71a6c8..fc20b65525 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -100,6 +100,11 @@ unsigned int default_authmethod = CURLAUTH_BASIC | CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */ +/*!< Default http query result mode + * - 0: return full result + * - 1: return first line only */ +unsigned int default_query_result = 1; + str http_client_config_file = STR_NULL; static curl_version_info_data *curl_info; @@ -195,6 +200,7 @@ static param_export_t params[] = { {"httpcon", PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param}, {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, + {"query_result", PARAM_INT, &default_query_result }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index d7bb7658f9..7f236dfa7e 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -62,6 +62,7 @@ extern unsigned int default_authmethod; /*!< authentication method - Basic, Digest or both */ extern unsigned int default_keep_connections; /*!< Keep http connections open for reuse */ +extern unsigned int default_query_result; /*!< Default query result mode */ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */

1 0

git:master:b3d9da5c: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: b3d9da5c5e80e42e550c4cf56c29aee1ab068c92 URL: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-12T21:01:45+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee… Patch: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index d75a9de697..d430714543 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -197,7 +197,11 @@ modparam("topos", "branch_expire", 300) 3.6. dialog_expire (int) - Interval in seconds after which the dialog records are deleted. + Interval in seconds after which the dialog records are deleted. Keep in + mind that the module does not update the dialog timestamp after the + initial call setup on re-INVITEs or other in-dialog messages. So set a + large enough value (according your longest call duration) to prevent + problems in re-writing messages. Default value is 10800 (3 hours).

1 0

git:5.2:db0ae1e3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: db0ae1e3dde3331810ba8b154d7e111bf3322583 URL: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-12T21:01:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111… Patch: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index d75a9de697..d430714543 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -197,7 +197,11 @@ modparam("topos", "branch_expire", 300) 3.6. dialog_expire (int) - Interval in seconds after which the dialog records are deleted. + Interval in seconds after which the dialog records are deleted. Keep in + mind that the module does not update the dialog timestamp after the + initial call setup on re-INVITEs or other in-dialog messages. So set a + large enough value (according your longest call duration) to prevent + problems in re-writing messages. Default value is 10800 (3 hours).

1 0

git:5.2:6e5cb772: topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: 6e5cb772817a8275c89869c868ce20a2ddb47df9 URL: https://github.com/kamailio/kamailio/commit/6e5cb772817a8275c89869c868ce20a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-12T20:55:26+02:00 topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024) (cherry picked from commit 3ccf5ee691440e806d441f0e58562ddc4137a488) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e5cb772817a8275c89869c868ce20a… Patch: https://github.com/kamailio/kamailio/commit/6e5cb772817a8275c89869c868ce20a… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b81672b006..681c5bb9a1 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -192,6 +192,10 @@ modparam("topos", "branch_expire", 300) <title><varname>dialog_expire</varname> (int)</title> <para> Interval in seconds after which the dialog records are deleted. + Keep in mind that the module does not update the dialog timestamp + after the initial call setup on re-INVITEs or other in-dialog + messages. So set a large enough value (according your longest call + duration) to prevent problems in re-writing messages. </para> <para> <emphasis>

1 0

git:master:3ccf5ee6: topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 3ccf5ee691440e806d441f0e58562ddc4137a488 URL: https://github.com/kamailio/kamailio/commit/3ccf5ee691440e806d441f0e58562dd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-12T20:54:48+02:00 topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3ccf5ee691440e806d441f0e58562dd… Patch: https://github.com/kamailio/kamailio/commit/3ccf5ee691440e806d441f0e58562dd… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b81672b006..681c5bb9a1 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -192,6 +192,10 @@ modparam("topos", "branch_expire", 300) <title><varname>dialog_expire</varname> (int)</title> <para> Interval in seconds after which the dialog records are deleted. + Keep in mind that the module does not update the dialog timestamp + after the initial call setup on re-INVITEs or other in-dialog + messages. So set a large enough value (according your longest call + duration) to prevent problems in re-writing messages. </para> <para> <emphasis>

1 0

[kamailio/kamailio] topos module does not update topos_d timestamp at re-INVITE (#2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

The topos module fails to update the dialog data in the topos_d table after the processing of re-INVITEs. I have setup a call at 11:55, and triggered a re-INVITE at 12:08. The respective topos_d table entry is not updated. This causes the entry to expire after topos dialog_timeout value. I would expect that the timestamp of the call in the topos_d table is updated. Is this assumption correct? If the current behavior is expected, it should documented in the module README. No error messages from topos module in kamailio.log. Output from tables: ``` MariaDB [kamailio]> select id, rectime, s_method, a_callid from topos_t; select id, rectime, s_method, a_callid from topos_d; +-----+---------------------+----------+----------------------------------+ | id | rectime | s_method | a_callid | +-----+---------------------+----------+----------------------------------+ | 305 | 2019-08-04 12:08:12 | INVITE | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | | 306 | 2019-08-04 12:08:12 | ACK | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | | 307 | 2019-08-04 12:08:14 | INVITE | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | | 308 | 2019-08-04 12:08:14 | ACK | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | +-----+---------------------+----------+----------------------------------+ +-----+---------------------+----------+----------------------------------+ | id | rectime | s_method | a_callid | +-----+---------------------+----------+----------------------------------+ | 156 | 2019-08-04 11:55:22 | INVITE | q0Jeh9g49GeYdJXqcjCo-G0CW4dQ0iav | +-----+---------------------+----------+----------------------------------+ ``` -- 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/2024

2 4

git:5.2:c1eaf335: dispatcher: skip inactive destinations for pointing next to be used record
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: c1eaf3353f43d34f164f28a871399ca785c40b4f URL: https://github.com/kamailio/kamailio/commit/c1eaf3353f43d34f164f28a871399ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T20:18:12+02:00 dispatcher: skip inactive destinations for pointing next to be used record (cherry picked from commit 18eeda012a711584239b03d5cfef8b7720f0ef31) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c1eaf3353f43d34f164f28a871399ca… Patch: https://github.com/kamailio/kamailio/commit/c1eaf3353f43d34f164f28a871399ca… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 372adda056..cdec4843eb 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2026,6 +2026,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int i; unsigned int hash; ds_set_t *idx = NULL; + int ulast = 0; if(msg == NULL) { LM_ERR("bad parameters\n"); @@ -2082,6 +2083,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) case DS_ALG_ROUNDROBIN: /* 4 - round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; case DS_ALG_HASHAUTHUSER: /* 5 - hash auth username */ i = ds_hash_authusername(msg, &hash); @@ -2093,6 +2095,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) /* No Authorization found: Use round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; default: LM_ERR("can't get authorization hash\n"); @@ -2194,6 +2197,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) rstate->emode = 1; } + /* update last field for next select to point after the current active used */ + if(ulast) { + idx->last = (hash + 1) % idx->nr; + } + LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, rstate->umode, hash, idx->dlist[hash].uri.len, idx->dlist[hash].uri.s);

1 0

git:master:18eeda01: dispatcher: skip inactive destinations for pointing next to be used record
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 18eeda012a711584239b03d5cfef8b7720f0ef31 URL: https://github.com/kamailio/kamailio/commit/18eeda012a711584239b03d5cfef8b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T20:15:17+02:00 dispatcher: skip inactive destinations for pointing next to be used record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/18eeda012a711584239b03d5cfef8b7… Patch: https://github.com/kamailio/kamailio/commit/18eeda012a711584239b03d5cfef8b7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 3d1098c462..43a7c8b8b2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2023,6 +2023,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int i; unsigned int hash; ds_set_t *idx = NULL; + int ulast = 0; if(msg == NULL) { LM_ERR("bad parameters\n"); @@ -2079,6 +2080,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) case DS_ALG_ROUNDROBIN: /* 4 - round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; case DS_ALG_HASHAUTHUSER: /* 5 - hash auth username */ i = ds_hash_authusername(msg, &hash); @@ -2090,6 +2092,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) /* No Authorization found: Use round robin */ hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + ulast = 1; break; default: LM_ERR("can't get authorization hash\n"); @@ -2191,6 +2194,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) rstate->emode = 1; } + /* update last field for next select to point after the current active used */ + if(ulast) { + idx->last = (hash + 1) % idx->nr; + } + LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, rstate->umode, hash, idx->dlist[hash].uri.len, idx->dlist[hash].uri.s);

1 0

Re: [sr-dev] [SR-Users] Dispatcher round-robin problems in 5.2
by Henning Westerholt 12 Aug '19

12 Aug '19

Hi Alex, there have been many changes to the modules between 5.1 and 5.2. I just looked a bit to the code of dispatch.c and also the commits. I noticed something in commit 3933a64c464acfb285e - there was a block related to round-robin before which got removed in this refactoring (if I analyzed it correctly): - /* if alg is round-robin then update the shortcut to next to be used */ - if(alg == DS_ALG_ROUNDROBIN) - idx->last = (hash + 1) % idx->nr; It could be simple added back, because of the changed logic, though. Cheers, Henning Am 12.08.19 um 17:28 schrieb Alex Balashov: > Hi Daniel, > > Haven’t checked that, no. But all the external system does is issue RPC commands (`dispatcher.set_state`) maybe a few times a day. It’s nothing volatile or overly Byzantine. > > — > Sent from mobile, with due apologies for brevity and errors. > >> On Aug 12, 2019, at 11:24 AM, Daniel-Constantin Mierla <miconda(a)gmail.com> wrote: >> >> Hello, >> >> could you observe similar behavior on other dispatchers that don't use >> an external system tomanage activation and deactivation of the gateways? >> Or you haven't checked such one so far? >> >> Cheers, >> Daniel >> >>> On 12.08.19 15:23, Alex Balashov wrote: >>> Hi, >>> >>> I've got a proxy that does very basic round-robin distribution of calls >>> to an elastic pool of servers, defined in a simple SQLite database with >>> equal priorities. Nothing too complicated, just a vanilla >>> `ds_select_domain("1", "4")`. >>> >>> The only complication is that seldom are most of the gateways enabled. >>> Probing stuff was turned on, but didn't do quite what was desired, so it >>> was replaced with a system that manages activation and deactivation of >>> the gateways externally. Nevertheless, these are the left-over probing >>> settings: >>> >>> modparam("dispatcher", "ds_ping_method", "OPTIONS") >>> modparam("dispatcher", "ds_ping_from", "sip:pinger@domain") >>> modparam("dispatcher", "ds_ping_interval", 15) >>> modparam("dispatcher", "ds_probing_threshold", 256) >>> modparam("dispatcher", "ds_inactive_threshold", 1) >>> modparam("dispatcher", "ds_probing_mode", 0) >>> >>> After an upgrade from 5.1 to 5.2.3 (009f62), the round-robin has become >>> extremely "sticky" and tendentious. That is to say, it directs _almost_ >>> all calls to a single gateway -- the first gateway in the table -- >>> though not 100%. There is also a marked tendency to send lots of >>> consecutive calls to the same gateway, even if it's not the first one, >>> though most of the time it is. >>> >>> Has anyone experienced similar upon upgrading to 5.2? >>> >>> Thanks much! >>> >>> -- Alex >>> >> -- >> Daniel-Constantin Mierla -- www.asipto.com >> www.twitter.com/miconda -- www.linkedin.com/in/miconda >> > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

1 0

[kamailio/kamailio] core: Fix the cfg framework variable input type default (#2022)
by Mancaș George 12 Aug '19

12 Aug '19

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description What the affected line of code really wants to achieve is: if an accepted inputs type mask is not specified then default to accepting only the actual variable type. So we must mask the var type first, then shift it by `CFG_INPUT_SHIFT`, before or-ing it with the rest. What happened before was that the entire type was shifted, and that included var type, input type and flags. What we end up with is some additional higher bits set (for flags). I actually discovered this while adding an additional flag that was meant to mark variables as private, only accessible through an internal API (not available to modules such as cfg_rpc). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2022 -- Commit Summary -- * core: Fix the cfg framework variable input type default -- File Changes -- M src/core/cfg/cfg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2022.patch https://github.com/kamailio/kamailio/pull/2022.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/2022

3 4

git:master:0a161d19: Merge pull request #2022 from mancasg/master
by GitHub 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 0a161d19707917f690b5823b64d120cccc354c8b URL: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-12T11:37:11+02:00 Merge pull request #2022 from mancasg/master core: Fix the cfg framework variable input type default --- Modified: src/core/cfg/cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… Patch: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 3822a9c94d..488d72f35a 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -94,7 +94,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, /* verify the type of the input */ if (CFG_INPUT_MASK(def[i].type)==0) { - def[i].type |= def[i].type << CFG_INPUT_SHIFT; + def[i].type |= CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT; } else { if ((CFG_INPUT_MASK(def[i].type) != CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT) && (def[i].on_change_cb == 0)) {

1 0

git:master:c3b2eacb: core: Fix the cfg framework variable input type default
by MancaÈ George 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: c3b2eacbba1097ed3d40cff18ea2d51ebcad1c67 URL: https://github.com/kamailio/kamailio/commit/c3b2eacbba1097ed3d40cff18ea2d51… Author: MancaÈ George <mancas.f.george(a)gmail.com> Committer: MancaÈ George <mancas.f.george(a)gmail.com> Date: 2019-08-01T09:39:28Z core: Fix the cfg framework variable input type default What the affected line of code really wants to achieve is: if an accepted inputs type mask is not specified then default to accepting only the actual variable type. So we must mask the var type first, then shift it by `CFG_INPUT_SHIFT`, before or-ing it with the rest. What happened before was that the entire type was shifted, and that included var type, input type and flags. What we end up with is some additional higher bits set (for flags). I actually discovered this while adding an additional flag that was meant to mark variables as private, only accessible through an internal API (not available to modules such as cfg_rpc). --- Modified: src/core/cfg/cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/c3b2eacbba1097ed3d40cff18ea2d51… Patch: https://github.com/kamailio/kamailio/commit/c3b2eacbba1097ed3d40cff18ea2d51… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 3822a9c94d..488d72f35a 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -94,7 +94,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, /* verify the type of the input */ if (CFG_INPUT_MASK(def[i].type)==0) { - def[i].type |= def[i].type << CFG_INPUT_SHIFT; + def[i].type |= CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT; } else { if ((CFG_INPUT_MASK(def[i].type) != CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT) && (def[i].on_change_cb == 0)) {

1 0

git:master:d9a1cbc8: gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: d9a1cbc8f66f9fd0991048e5e1ba1579916a092e URL: https://github.com/kamailio/kamailio/commit/d9a1cbc8f66f9fd0991048e5e1ba157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:18:21+02:00 gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback --- Modified: src/modules/gzcompress/gzcompress_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9a1cbc8f66f9fd0991048e5e1ba157… Patch: https://github.com/kamailio/kamailio/commit/d9a1cbc8f66f9fd0991048e5e1ba157… --- diff --git a/src/modules/gzcompress/gzcompress_mod.c b/src/modules/gzcompress/gzcompress_mod.c index 3e06c1c267..3ff22d723d 100644 --- a/src/modules/gzcompress/gzcompress_mod.c +++ b/src/modules/gzcompress/gzcompress_mod.c @@ -338,6 +338,7 @@ int gzc_msg_sent(sr_event_param_t *evp) unsigned long olen; unsigned long nlen; int ret; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -383,7 +384,15 @@ int gzc_msg_sent(sr_event_param_t *evp) goto done; } - obuf->s = gzc_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = gzc_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:master:c79dfbea: corex: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: c79dfbeab0bfefaa4dd5cefc41cba3ba157da0ce URL: https://github.com/kamailio/kamailio/commit/c79dfbeab0bfefaa4dd5cefc41cba3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:18:39+02:00 corex: free old outbound buffer inside SREV_NET_DATA_OUT callback --- Modified: src/modules/corex/corex_nio.c --- Diff: https://github.com/kamailio/kamailio/commit/c79dfbeab0bfefaa4dd5cefc41cba3b… Patch: https://github.com/kamailio/kamailio/commit/c79dfbeab0bfefaa4dd5cefc41cba3b… --- diff --git a/src/modules/corex/corex_nio.c b/src/modules/corex/corex_nio.c index 96837e8a0c..6b79fcc648 100644 --- a/src/modules/corex/corex_nio.c +++ b/src/modules/corex/corex_nio.c @@ -141,6 +141,7 @@ int nio_msg_sent(sr_event_param_t *evp) int_str avp_value; struct usr_avp *avp; struct run_act_ctx ra_ctx; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -163,7 +164,15 @@ int nio_msg_sent(sr_event_param_t *evp) if(avp!=NULL && is_avp_str_val(avp)) { msg.buf = avp_value.s.s; msg.len = avp_value.s.len; - obuf->s = nio_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = nio_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } } else { LM_WARN("no value set for AVP %.*s, using unmodified message\n", nio_msg_avp_param.len, nio_msg_avp_param.s);

1 0

git:master:ad8d9628: dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: ad8d9628da27a3ab68b005ef52842784af6bda3a URL: https://github.com/kamailio/kamailio/commit/ad8d9628da27a3ab68b005ef5284278… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:18:08+02:00 dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8d9628da27a3ab68b005ef5284278… Patch: https://github.com/kamailio/kamailio/commit/ad8d9628da27a3ab68b005ef5284278… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 8986d0aaa6..fd993b076f 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -364,6 +364,7 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) struct via_body *via; hdr_field_t *hfk = NULL; sr_cfgenv_t *cenv = NULL; + str nbuf = STR_NULL; obuf = (str*)evp->data; memset(&msg, 0, sizeof(sip_msg_t)); @@ -520,11 +521,13 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } } /* replace old msg content */ - obuf->s = pkg_malloc((tbuf_len+1)*sizeof(char)); - if(obuf->s==NULL) { + nbuf.s = pkg_malloc((tbuf_len+1)*sizeof(char)); + if(nbuf.s==NULL) { LM_ERR("not enough memory for new message\n"); goto done; } + pkg_free(obuf->s); + obuf->s = nbuf.s; memcpy(obuf->s, tbuf, tbuf_len); obuf->s[tbuf_len] = 0; obuf->len = tbuf_len;

1 0

git:master:21816a11: topos: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 21816a11a56628a9eee17765645fcf03d57929bd URL: https://github.com/kamailio/kamailio/commit/21816a11a56628a9eee17765645fcf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:17:33+02:00 topos: free old outbound buffer inside SREV_NET_DATA_OUT callback - GH #2027 --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/21816a11a56628a9eee17765645fcf0… Patch: https://github.com/kamailio/kamailio/commit/21816a11a56628a9eee17765645fcf0… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index f6b6a3a2f5..942c545d58 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -390,6 +390,7 @@ int tps_msg_sent(sr_event_param_t *evp) str *obuf; int dialog; int local; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -443,7 +444,15 @@ int tps_msg_sent(sr_event_param_t *evp) tps_response_sent(&msg); } - obuf->s = tps_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = tps_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:master:37a17658: topoh: free old outbound buffer inside th_msg_sent()
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 37a1765853294016f43bd633667cd623aaaa2d3e URL: https://github.com/kamailio/kamailio/commit/37a1765853294016f43bd633667cd62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:16:23+02:00 topoh: free old outbound buffer inside th_msg_sent() - GH #2027 --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/37a1765853294016f43bd633667cd62… Patch: https://github.com/kamailio/kamailio/commit/37a1765853294016f43bd633667cd62… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index c1a597eb1e..0eb5345598 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -411,6 +411,7 @@ int th_msg_sent(sr_event_param_t *evp) int direction; int dialog; int local; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -497,7 +498,15 @@ int th_msg_sent(sr_event_param_t *evp) } ready: - obuf->s = th_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = th_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } done: free_sip_msg(&msg);

1 0

git:master:eeade037: core: restore alignment after replacing mem error logs
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: eeade03783181aacdf0115a61050ec964434a880 URL: https://github.com/kamailio/kamailio/commit/eeade03783181aacdf0115a61050ec9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:28:05+02:00 core: restore alignment after replacing mem error logs --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/eeade03783181aacdf0115a61050ec9… Patch: https://github.com/kamailio/kamailio/commit/eeade03783181aacdf0115a61050ec9… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 25f9cce01e..485fecac1c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2187,10 +2187,11 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, new_buf=(char*)pkg_malloc(new_len+1); if (new_buf==0){ ser_error=E_OUT_OF_MEM; - if(unlikely(mode&BUILD_IN_SHM)) - SHM_MEM_ERROR; - else - PKG_MEM_ERROR; + if(unlikely(mode&BUILD_IN_SHM)) { + SHM_MEM_ERROR; + } else { + PKG_MEM_ERROR; + } goto error00; }

1 0

git:master:98249e2c: core: forward - clone outbound buffer for SREV_NET_DATA_OUT event
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 98249e2cc97e818cf7ad492132ecfea2ce13a78b URL: https://github.com/kamailio/kamailio/commit/98249e2cc97e818cf7ad492132ecfea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:14:38+02:00 core: forward - clone outbound buffer for SREV_NET_DATA_OUT event - this event can execute a series of callbacks, leading to leak if only the core function does pkg free - GH #2027 --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/98249e2cc97e818cf7ad492132ecfea… Patch: https://github.com/kamailio/kamailio/commit/98249e2cc97e818cf7ad492132ecfea… --- diff --git a/src/core/forward.h b/src/core/forward.h index d039900aac..a629748686 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -136,9 +136,18 @@ static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len, outb.s = buf; outb.len = len; if(!(flags&1)) { - evp.data = (void*)&outb; - evp.dst = dst; - sr_event_exec(SREV_NET_DATA_OUT, &evp); + if(sr_event_enabled(SREV_NET_DATA_OUT)) { + outb.s = (char*)pkg_malloc(len + 1); + if(outb.s==NULL) { + LM_ERR("failed to clone outgoing buffer\n"); + return -1; + } + memcpy(outb.s, buf, len); + outb.s[len] = '\0'; + evp.data = (void*)&outb; + evp.dst = dst; + sr_event_exec(SREV_NET_DATA_OUT, &evp); + } } if(outb.s==NULL) {

1 0

git:5.2:7069cbaf: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: 7069cbaf28beb35036eeb2ab9bde19844144eb00 URL: https://github.com/kamailio/kamailio/commit/7069cbaf28beb35036eeb2ab9bde198… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-12T10:32:22+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_ruby/README Modified: src/modules/db_redis/README Modified: src/modules/htable/README Modified: src/modules/presence/README Modified: src/modules/rls/README Modified: src/modules/uac/README Modified: src/modules/userblacklist/README Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/7069cbaf28beb35036eeb2ab9bde198… Patch: https://github.com/kamailio/kamailio/commit/7069cbaf28beb35036eeb2ab9bde198…

1 0

git: new commits in branch 5.2
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

- URL: https://github.com/kamailio/kamailio/commit/2f07bb77623c556b440d040203ade01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:41:04+02:00 usrloc: clone xavp list in contact struct in memory mode (cherry picked from commit 76f0fa8a0330de3885f5f3830eb90061c59045d4) - URL: https://github.com/kamailio/kamailio/commit/1789377bdb6180b8979a84502ba4393… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:44:17+02:00 tm: detect local uac transaction not inserted in the hash table (cherry picked from commit cf0008d843009acc8e40fcad3eceda063b1a358c) - URL: https://github.com/kamailio/kamailio/commit/db0cabd8673e5ad7468eebae1781dd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:44:40+02:00 exec: debug message with number of results for exec_avp() (cherry picked from commit 01c50c84aed717f9de689ab4eec3faec59a498e4) - URL: https://github.com/kamailio/kamailio/commit/29114b86e4360f2de53310070db872c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:46:21+02:00 pdb: safety check for header length in pdb_msg_dbg() (cherry picked from commit 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760) - URL: https://github.com/kamailio/kamailio/commit/59402a71c5c7d8fc4ffd3dbb5643fb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:47:40+02:00 rls: docs - added section ids (cherry picked from commit 50dfec2f2b7a467afe7c935524d0d385e9018f02) - URL: https://github.com/kamailio/kamailio/commit/0bcfc63dd365e50e8a6394e005972e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:47:59+02:00 presence: docs - fixed name for event route presence:notify-reply (cherry picked from commit f005e2edca8fef350546cb743bf1cb51ee4ddd8d) - URL: https://github.com/kamailio/kamailio/commit/df7a3c2b1c9dec3655f175728a57712… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:48:19+02:00 presence: docs - aligned examples to avoid large whitespacing (cherry picked from commit 8a909021ccccc321b06b3437d124978bd901ab18) - URL: https://github.com/kamailio/kamailio/commit/9d4f48b20216b688006fb68e9878a2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:48:43+02:00 rls: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it (cherry picked from commit 46084c898d0598e94c7f22ab03d321e037fd7f55) - URL: https://github.com/kamailio/kamailio/commit/2b58dee39ea92e2fd2038b70cb0c043… Author: Julien Arlt <julien-arlt(a)gmx.de> Date: 2019-08-12T09:49:25+02:00 userblacklist: fix double "check_user_blacklist" in module documentation (cherry picked from commit b7f7efe4f952894aa847165cc038cd5af4c3141a) - URL: https://github.com/kamailio/kamailio/commit/bf5e1698e543bce6cbf424773322a06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:49:57+02:00 sanity: free parsed proxy-required header in case of failure - reported by GH #1990 (cherry picked from commit ffa2aa438e2a13e6e8bdbe70dd90827ae18279ce) - URL: https://github.com/kamailio/kamailio/commit/8848bce61107c98a4b8e6fd2afe3670… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:50:40+02:00 lib/srdb1: support for username@domain in user id part of db url - used by some cloud database services - reworked patch from GH #1992 (cherry picked from commit d419f427d2acf890e5e45c4f3e8e7a2b2fe4cead) - URL: https://github.com/kamailio/kamailio/commit/203b027357259564aaef1db2f004bfa… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-08-12T09:51:14+02:00 call_obj_mod: no need to use a free function for call_obj_get. (cherry picked from commit a58b4c2afbffdd2584f553f8d7d36a84d40e2aee) - URL: https://github.com/kamailio/kamailio/commit/a5f51d169ab3cd890d005eac1ea5d91… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-08-12T09:51:47+02:00 call_obj: b/f acept optional limit parameter. (cherry picked from commit 8266f0ee05b1f2faf2d4148efca257f7322da4ce) - URL: https://github.com/kamailio/kamailio/commit/4761c2708a6b315d4cc0b1d8c88fd9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:52:05+02:00 sdpops: exported to kemi the functions to detect sdp with codecs - sdp_with_codecs_by_id() and sdp_with_codecs_by_name() (cherry picked from commit 3716541db01c09bd00998bdbd0c35b3a842cdaf5) - URL: https://github.com/kamailio/kamailio/commit/4d3bc9dbd2d4da88e6f04f0cdaa5294… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:52:19+02:00 uac: debug messages when initializing the remote uac registration (cherry picked from commit 0fcb2607d2d63a0e10fce189b6881ac15b985bb4) - URL: https://github.com/kamailio/kamailio/commit/1f7519fa002e7cfff0edd2180aeab2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:52:34+02:00 htable: docs - rephrased info for db_expires to clarify its purpose (cherry picked from commit f87adf6aba3fcebfe162341bc45d130365d34f5e) - URL: https://github.com/kamailio/kamailio/commit/942b0ab096a7981ddad19a74974eef3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:52:57+02:00 pv: relax uri and params transfromation parsing when separator is last char - more flexible in parsing custom values, detection done in transformations code (cherry picked from commit 1c4af823c39d28b694c1dec607d8d72c5b726456) - URL: https://github.com/kamailio/kamailio/commit/21af99321bbcc14ffeced749eafe003… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:53:26+02:00 uac: docs - examples with rpc commands having params numbers converted to string - GH #1988 (cherry picked from commit ec42a0b36a10dec0852bd1ef2bf3ad7ab9ad8dbc) - URL: https://github.com/kamailio/kamailio/commit/59d29bc35138939a14beed501e7d8ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:54:38+02:00 usrloc: coherence for int type of parameters - it was combination of int and integer, now all int - fix examples for int params, related to GH #1999 (cherry picked from commit 91fa799e436de252e9f5aa5d8f09609f46db6e58) - URL: https://github.com/kamailio/kamailio/commit/a77c4a9268e416abdae5ec74374451d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:54:55+02:00 kamctl: relaxed regex check on aor and sip uri - it required a dot (.), not valid for ipv6 and single word domains (e.g., localhost) - now just match on USERNAME_RE@.+ (cherry picked from commit 94e9d47d2d2da82be23f1bae8cd6491c758a384c) - URL: https://github.com/kamailio/kamailio/commit/787ebf8cef9972292a38c5d3335703a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:55:26+02:00 siputils: exported options_reply() to kemi framework (cherry picked from commit 183ff04e00e592cc2c7db54732c6a3bb8fb75bb8) - URL: https://github.com/kamailio/kamailio/commit/2fc5178d6557e2c1e8351330456cdcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:55:56+02:00 siputils: log method ids on mismatch for options_reply() (cherry picked from commit 9dab8303a96614fd74efff6add359a23713642a5) - URL: https://github.com/kamailio/kamailio/commit/681dd5d519c24e8e0574eafccb62e9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:56:56+02:00 pv: debug message when seting $fs (send socket) (cherry picked from commit ac95f0c29390e1dbc0779b56936ee68a424595e0) - URL: https://github.com/kamailio/kamailio/commit/2a864f3580fb97c9e920f8fa7cd9361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:57:10+02:00 core: debug message for forcing send socket action (cherry picked from commit abe060b417c5270082aa46660fdc2f78098a5888) - URL: https://github.com/kamailio/kamailio/commit/ae766571c230ef9b1e8edd0faade674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:57:21+02:00 corex: debug message for set rcv/snd sock functions (cherry picked from commit 5e961873401fd0a93ff03ba8d75dbcefbf2fbcf0) - URL: https://github.com/kamailio/kamailio/commit/77abc5d6923930649bb2fc76dd3b4f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:57:35+02:00 core: pv - increased the size for vars and transformations tables (cherry picked from commit e6b183a1ec3b267cc25040a9b67a1c151ee85555) - URL: https://github.com/kamailio/kamailio/commit/1bba5826292f0dbd6703f8df941f886… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2019-08-12T09:57:53+02:00 evapi:return code and log fixed for no evapi client while sending (cherry picked from commit 08cf17288861bcaa8f3b23166059ead517d1b4fe) - URL: https://github.com/kamailio/kamailio/commit/e2a0873df1e18640e1bfe7bc0adee72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:58:05+02:00 evapi: adjust log message when no client connected for dispatching (cherry picked from commit a6a2416e59c1e1a5cbadd3ecceecff52201be10d) - URL: https://github.com/kamailio/kamailio/commit/efaeb98c3a251e468573d6ebdb3d92c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:59:43+02:00 usrloc: coherent indentation and whitespacing (cherry picked from commit 12bf3cb574e2ead2da46e7e237a33415ae12df61) - URL: https://github.com/kamailio/kamailio/commit/5bbf4aeca8063da6f7f911260a95c74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T09:59:55+02:00 usrloc: delete contact attributes in db-only mode (cherry picked from commit b642263a08313e86cc4936a9c489e8afb4a2cb5f) - URL: https://github.com/kamailio/kamailio/commit/112529b9e9396c12ec5471ca651f580… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:00:11+02:00 kamctl: option to enable kamctl test from shell variable - set KAMCTL_TEST variable in shell (cherry picked from commit 4968e8994157f1152bf7461b16049d67e5c9cc59) - URL: https://github.com/kamailio/kamailio/commit/1c406f1e8ff2c02f1d739082c39835d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:00:54+02:00 usrloc: use static record for expires callback in db-only mode (cherry picked from commit 12dbf48d421680764f9e9621de9485616ca0c055) - URL: https://github.com/kamailio/kamailio/commit/f88580226306bdc02120e8a0d0042c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:01:08+02:00 db_redis: note about defining key when updating table content (cherry picked from commit f2df5df815f8dfca87324ca70e6fe9a51fc417e9) - URL: https://github.com/kamailio/kamailio/commit/164702ddbc2e88c818f9293d0c31fef… Author: Guillem Jover <gjover(a)sipwise.com> Date: 2019-08-12T10:02:08+02:00 build: Call make via $(MAKE) When we need to call make from within a Makefile, we should do so by using the MAKE variable, which has special meaning for make itself. This makes sure, it will get marked as recursive command, and will make it possible to use the make jobserver. Change-Id: I6829f3ee0a830fc8273e1dffe696382fccc6a093 (cherry picked from commit 2306dd47b308f99e5c22c2d6f4d2bc1200ed8453) - URL: https://github.com/kamailio/kamailio/commit/5c042d6e1023828f49d7ac75f2b761a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:02:29+02:00 tm: proper resoring of backup lumps in case of cloning failure (cherry picked from commit cd379886fa7a8ff01b9618491199f8e5b3ce897f) - URL: https://github.com/kamailio/kamailio/commit/21fa3d2c130d85a925d2db658dfbd29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:02:46+02:00 tm: removed unused error label in prepare_new_uac() (cherry picked from commit c7ceb08b31fdb3f6560d02fff6b6ee71602c19ec) - URL: https://github.com/kamailio/kamailio/commit/887c49e597572a58f6400736f8dcd75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:03:25+02:00 uac: debug messages when restoring from/to headers (cherry picked from commit 7a4c490a63cd3fa924b6921fcd20ba77a6d661fb) - URL: https://github.com/kamailio/kamailio/commit/2eafd02697f5f6c6885389e5ef25785… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:04:17+02:00 app_ruby: print pointers in error log message (cherry picked from commit ea526a8de9c961a57858ecc4c47ce4ba24e03908) - URL: https://github.com/kamailio/kamailio/commit/7368859780f258945f2077a9ea0e1c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:04:29+02:00 app_ruby: docs - fix rpc command name for listing the api (cherry picked from commit 5773fba2765c8a08be7016e82a6ec02579b49215) - URL: https://github.com/kamailio/kamailio/commit/91ffb3e9d2ff60d0e31a33cc00c966a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:04:56+02:00 app_python3: Makefile - get all ldflags for linking (cherry picked from commit d762848d4f71014a6c6b6693b44403324a8edd15) - URL: https://github.com/kamailio/kamailio/commit/5d7784a5e35e3060549e5e12a05d1df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:05:21+02:00 auth_radius: increase MAX_EXTRA from 4 to 8 - GH #2025 (cherry picked from commit df93a638040f4c1aa4d6ed3799d6f990b0593f94) - URL: https://github.com/kamailio/kamailio/commit/1d436e38cbadd47a36a5293b8871356… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T10:05:32+02:00 misc_radius: increase MAX_EXTRA from 4 to 8 - GH #2025 (cherry picked from commit 4c537a618949eb48ffed9297f3abc8cdc879b70d)

1 0

git:master:1c5c755a: core: remove WITH_AS_SUPPORT in Makefile.defs after tm change in 087eecdc22f7ae90
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: master Commit: 1c5c755ab50351ba0b4eadc260067f500c4422f9 URL: https://github.com/kamailio/kamailio/commit/1c5c755ab50351ba0b4eadc260067f5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T11:55:36+02:00 core: remove WITH_AS_SUPPORT in Makefile.defs after tm change in 087eecdc22f7ae90 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1c5c755ab50351ba0b4eadc260067f5… Patch: https://github.com/kamailio/kamailio/commit/1c5c755ab50351ba0b4eadc260067f5… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index eb1ab2d798..8392223723 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -631,8 +631,6 @@ data_target = $(prefix)/$(data_dir) # core that the DNS servers are down. No DNS query is performed # when the servers are unreachable, and even expired resource # records are used from the cache. (requires external watchdog) -# -DWITH_AS_SUPPORT -# adds support for Application Server interface # Sometimes is needes correct non-quoted $OS. HACK: gcc translates known OS to number ('linux'), so there is added underscore ifeq ($(OS), dragonfly) @@ -728,9 +726,6 @@ endif ifeq ($(FMSTATS), 1) C_DEFS+= -DMALLOC_STATS endif -ifeq ($(WITHAS), 1) - C_DEFS+= -DWITH_AS_SUPPORT -endif ifeq ($(SCTP), 1) C_DEFS+= -DUSE_SCTP

1 0

git:master:52dd926b: doc: update URL changelog references in NEWS file
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: master Commit: 52dd926bed08ca4a83ad995c2fb8cde7445599d8 URL: https://github.com/kamailio/kamailio/commit/52dd926bed08ca4a83ad995c2fb8cde… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T11:55:36+02:00 doc: update URL changelog references in NEWS file --- Modified: doc/misc/NEWS --- Diff: https://github.com/kamailio/kamailio/commit/52dd926bed08ca4a83ad995c2fb8cde… Patch: https://github.com/kamailio/kamailio/commit/52dd926bed08ca4a83ad995c2fb8cde… --- diff --git a/doc/misc/NEWS b/doc/misc/NEWS index 92a5b82038..9b62dd39c1 100644 --- a/doc/misc/NEWS +++ b/doc/misc/NEWS @@ -7,6 +7,9 @@ notes for previous versions are posted below. For releases after 3.1, please visit: +https://www.kamailio.org/wiki/features/new-in-5.2.x +https://www.kamailio.org/wiki/features/new-in-5.1.x +https://www.kamailio.org/wiki/features/new-in-5.0.x http://www.kamailio.org/wiki/features/new-in-4.4.x http://www.kamailio.org/wiki/features/new-in-4.3.x http://www.kamailio.org/wiki/features/new-in-4.2.x

1 0

git:master:38be6c77: tm: remove #define WITH_AS_SUPPORT, activated and unchanged since 2009
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: master Commit: 38be6c77e6f00d84d8d7da1f0e494459f84dd61c URL: https://github.com/kamailio/kamailio/commit/38be6c77e6f00d84d8d7da1f0e49445… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T11:55:36+02:00 tm: remove #define WITH_AS_SUPPORT, activated and unchanged since 2009 - remove #define WITH_AS_SUPPORT, activated and unchanged since 2009 - introduced in commit d65cdd3fd4ad8faab497 - without it some modules (e.g. ims_dialog, seas) also not compile anymore --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/38be6c77e6f00d84d8d7da1f0e49445… Patch: https://github.com/kamailio/kamailio/commit/38be6c77e6f00d84d8d7da1f0e49445…

1 0

git:master:8530be37: tm: remove unused #define TM_E2E_ACK_CHECK_FROM_URI, unchanged since 2009
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: master Commit: 8530be379abfe35472f34729975963c94e8869e1 URL: https://github.com/kamailio/kamailio/commit/8530be379abfe35472f34729975963c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T11:55:36+02:00 tm: remove unused #define TM_E2E_ACK_CHECK_FROM_URI, unchanged since 2009 - remove unused #define TM_E2E_ACK_CHECK_FROM_URI - it was unchanged since 2009, introduced in commit eddf3e3b7b3db814 --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/8530be379abfe35472f34729975963c… Patch: https://github.com/kamailio/kamailio/commit/8530be379abfe35472f34729975963c… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 3d114e2b0e..64fb797f1f 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -618,11 +618,6 @@ int t_lookup_request( struct sip_msg* p_msg , int leave_new_locked, if (! STR_EQ(get_from(t_msg)->tag_value, get_from(p_msg)->tag_value)) continue; -#ifdef TM_E2E_ACK_CHECK_FROM_URI - if (! STR_EQ(get_from(t_msg)->uri, - get_from(p_msg)->uri)) - continue; -#endif /* all criteria for proxied ACK are ok */ if (likely(p_cell->relayed_reply_branch!=-2)) {

1 0

git:master:19f959a4: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 11 Aug '19

11 Aug '19

Module: kamailio Branch: master Commit: 19f959a4f994eeedde62d25bec6270be1ce11605 URL: https://github.com/kamailio/kamailio/commit/19f959a4f994eeedde62d25bec6270b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-11T11:02:21+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/19f959a4f994eeedde62d25bec6270b… Patch: https://github.com/kamailio/kamailio/commit/19f959a4f994eeedde62d25bec6270b…

1 0

git:5.2:009f6289: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Aug '19

11 Aug '19

Module: kamailio Branch: 5.2 Commit: 009f62895e835606c1a6c378aeded6c7068f3902 URL: https://github.com/kamailio/kamailio/commit/009f62895e835606c1a6c378aeded6c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-11T11:02:02+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/009f62895e835606c1a6c378aeded6c… Patch: https://github.com/kamailio/kamailio/commit/009f62895e835606c1a6c378aeded6c…

1 0

git:5.1:5fae2cc3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Aug '19

11 Aug '19

Module: kamailio Branch: 5.1 Commit: 5fae2cc335e2479c08abe337ecc839456726006a URL: https://github.com/kamailio/kamailio/commit/5fae2cc335e2479c08abe337ecc8394… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-11T11:01:46+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/5fae2cc335e2479c08abe337ecc8394… Patch: https://github.com/kamailio/kamailio/commit/5fae2cc335e2479c08abe337ecc8394…

1 0

git:5.1:8e21911d: acc: remove diameter specific doc content, code was moved in 2017 to acc_diameter
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: 5.1 Commit: 8e21911d7833c8ff00f39ce933a6fb4c71d8f6b8 URL: https://github.com/kamailio/kamailio/commit/8e21911d7833c8ff00f39ce933a6fb4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T10:58:35+02:00 acc: remove diameter specific doc content, code was moved in 2017 to acc_diameter (cherry picked from commit d8cede175ddeada5ca5654a74e765f154dcfa86d) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8e21911d7833c8ff00f39ce933a6fb4… Patch: https://github.com/kamailio/kamailio/commit/8e21911d7833c8ff00f39ce933a6fb4… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index a57d411e60..2588243f7c 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -104,18 +104,8 @@ </itemizedlist> </para> <para> - The SQL backend support is compiled in the module. For - DIAMETER you need to enable it by recompiling the module with properly - set defines: uncomment the DDIAM_ACC lines in - modules/acc/Makefile. + The SQL backend support is compiled in the module. </para> - <para> - NOTE: diameter support was developed for DISC (DIameter Server Client - project at http://developer.berlios.de/projects/disc/). This project - seems to be no longer maintained and DIAMETER specifications were updated - in the meantime. Thus, the DIAMETER part in the module is obsolete and - needs rework to be usable with opendiameter or other DIAMETER servers. - </para> <section> <title>General Example</title> <programlisting format="linespecific"> @@ -1019,97 +1009,6 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") ... modparam("acc", "db_insert_mode", 1) ... -</programlisting> - </example> - </section> -  - <section id="acc.p.diameter_flag"> - <title><varname>diameter_flag</varname> (integer)</title> - <para> - Request flag which needs to be set to account a - transaction -- DIAMETER specific. - </para> - <para> - Default value is not-set (no flag). - </para> - <example> - <title>diameter_flag example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_flag", 2) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_missed_flag"> - <title><varname>diameter_missed_flag</varname> (integer)</title> - <para> - Request flag which needs to be set to account missed - calls -- DIAMETER specific. - </para> - <para> - Default value is not-set (no flag). - </para> - <example> - <title>diameter_missed_flag example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_missed_flag", 3) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_client_host"> - <title><varname>diameter_client_host</varname> (string)</title> - <para> - Hostname of the machine where the DIAMETER Client is - running -- DIAMETER specific. - </para> - <para> - Default value is <quote>localhost</quote>. - </para> - <example> - <title>diameter_client_host example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_client_host", "3a_server.net") -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_client_port"> - <title><varname>diameter_client_port</varname> (int)</title> - <para> - Port number where the Diameter Client is - listening -- DIAMETER specific. - </para> - <para> - Default value is 3000. - </para> - <example> - <title>diameter_client_host example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_client_port", 3000) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_extra"> - <title><varname>diameter_extra</varname> (string)</title> - <para> - Extra values to be logged via DIAMETER - DIAMETER specific. - See section <xref linkend="acc.i.extra-accounting"/> for more details. - </para> - <para> - Default value is NULL. - </para> - <example> - <title>diameter_extra example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_extra", "7846=$hdr(Content-type);7847=$avp(s:email)") -... </programlisting> </example> </section>

1 0

git:5.1:5c02cd9c: acc: doc improvement regarding radius and diameter modules
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: 5.1 Commit: 5c02cd9c4942e8f6a9756a11aaa2dddee01ecbbc URL: https://github.com/kamailio/kamailio/commit/5c02cd9c4942e8f6a9756a11aaa2ddd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T10:58:27+02:00 acc: doc improvement regarding radius and diameter modules (cherry picked from commit 59a58e8a01e91def4634b551cb69ebe1f1c953e0) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c02cd9c4942e8f6a9756a11aaa2ddd… Patch: https://github.com/kamailio/kamailio/commit/5c02cd9c4942e8f6a9756a11aaa2ddd… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 6365457f06..a57d411e60 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -18,15 +18,15 @@ <title>Overview</title> <para> ACC module is used to account transactions information to different - backends like syslog and <abbrev>SQL</abbrev>. With the separate module, - <acronym>radius</acronym> support is enabled. + backends like syslog and <abbrev>SQL</abbrev>. With the separate module + <quote>acc_radius</quote> support for <acronym>radius</acronym> is enabled. </para> <para> - There is some very early support of - the <acronym>Diameter</acronym> protocol in the code which is no longer included - by default and will be deleted in coming releases. - This support is not up to date with the current Diameter protocols and - is disabled. If you need Diameter support, please use the <acronym>ims_charging</acronym> module. + There is some very early support of the <acronym>Diameter</acronym> + protocol in the <quote>acc_diameter</quote> module which will be deleted + in coming releases. This support is not up to date with the current + Diameter protocols. If you need Diameter support, please use the + <acronym>ims_charging</acronym> module. </para> <para> To account a transaction and to choose which set of backends to be

1 0

git:5.2:71e384ab: acc: doc improvement regarding radius and diameter modules
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: 5.2 Commit: 71e384ab77faf7d09c7cb27996a16f588e9dd22e URL: https://github.com/kamailio/kamailio/commit/71e384ab77faf7d09c7cb27996a16f5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T10:58:07+02:00 acc: doc improvement regarding radius and diameter modules (cherry picked from commit 59a58e8a01e91def4634b551cb69ebe1f1c953e0) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/71e384ab77faf7d09c7cb27996a16f5… Patch: https://github.com/kamailio/kamailio/commit/71e384ab77faf7d09c7cb27996a16f5… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 48e8c6ac31..de3ad0e1f4 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -18,15 +18,15 @@ <title>Overview</title> <para> ACC module is used to account transactions information to different - backends like syslog and <abbrev>SQL</abbrev>. With the separate module, - <acronym>radius</acronym> support is enabled. + backends like syslog and <abbrev>SQL</abbrev>. With the separate module + <quote>acc_radius</quote> support for <acronym>radius</acronym> is enabled. </para> <para> - There is some very early support of - the <acronym>Diameter</acronym> protocol in the code which is no longer included - by default and will be deleted in coming releases. - This support is not up to date with the current Diameter protocols and - is disabled. If you need Diameter support, please use the <acronym>ims_charging</acronym> module. + There is some very early support of the <acronym>Diameter</acronym> + protocol in the <quote>acc_diameter</quote> module which will be deleted + in coming releases. This support is not up to date with the current + Diameter protocols. If you need Diameter support, please use the + <acronym>ims_charging</acronym> module. </para> <para> To account a transaction and to choose which set of backends to be

1 0

git:5.2:82282082: acc: remove diameter specific doc content, code was moved in 2017 to acc_diameter
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: 5.2 Commit: 822820827c55adb02efae9703cfda9b936686f3f URL: https://github.com/kamailio/kamailio/commit/822820827c55adb02efae9703cfda9b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T10:58:21+02:00 acc: remove diameter specific doc content, code was moved in 2017 to acc_diameter (cherry picked from commit d8cede175ddeada5ca5654a74e765f154dcfa86d) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/822820827c55adb02efae9703cfda9b… Patch: https://github.com/kamailio/kamailio/commit/822820827c55adb02efae9703cfda9b… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index de3ad0e1f4..61e27a196e 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -104,18 +104,8 @@ </itemizedlist> </para> <para> - The SQL backend support is compiled in the module. For - DIAMETER you need to enable it by recompiling the module with properly - set defines: uncomment the DDIAM_ACC lines in - modules/acc/Makefile. + The SQL backend support is compiled in the module. </para> - <para> - NOTE: diameter support was developed for DISC (DIameter Server Client - project at http://developer.berlios.de/projects/disc/). This project - seems to be no longer maintained and DIAMETER specifications were updated - in the meantime. Thus, the DIAMETER part in the module is obsolete and - needs rework to be usable with opendiameter or other DIAMETER servers. - </para> <section> <title>General Example</title> <programlisting format="linespecific"> @@ -1019,97 +1009,6 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") ... modparam("acc", "db_insert_mode", 1) ... -</programlisting> - </example> - </section> -  - <section id="acc.p.diameter_flag"> - <title><varname>diameter_flag</varname> (integer)</title> - <para> - Request flag which needs to be set to account a - transaction -- DIAMETER specific. - </para> - <para> - Default value is not-set (no flag). - </para> - <example> - <title>diameter_flag example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_flag", 2) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_missed_flag"> - <title><varname>diameter_missed_flag</varname> (integer)</title> - <para> - Request flag which needs to be set to account missed - calls -- DIAMETER specific. - </para> - <para> - Default value is not-set (no flag). - </para> - <example> - <title>diameter_missed_flag example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_missed_flag", 3) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_client_host"> - <title><varname>diameter_client_host</varname> (string)</title> - <para> - Hostname of the machine where the DIAMETER Client is - running -- DIAMETER specific. - </para> - <para> - Default value is <quote>localhost</quote>. - </para> - <example> - <title>diameter_client_host example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_client_host", "3a_server.net") -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_client_port"> - <title><varname>diameter_client_port</varname> (int)</title> - <para> - Port number where the Diameter Client is - listening -- DIAMETER specific. - </para> - <para> - Default value is 3000. - </para> - <example> - <title>diameter_client_host example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_client_port", 3000) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_extra"> - <title><varname>diameter_extra</varname> (string)</title> - <para> - Extra values to be logged via DIAMETER - DIAMETER specific. - See section <xref linkend="acc.i.extra-accounting"/> for more details. - </para> - <para> - Default value is NULL. - </para> - <example> - <title>diameter_extra example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_extra", "7846=$hdr(Content-type);7847=$avp(s:email)") -... </programlisting> </example> </section>

1 0

git:master:d8cede17: acc: remove diameter specific doc content, code was moved in 2017 to acc_diameter
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: master Commit: d8cede175ddeada5ca5654a74e765f154dcfa86d URL: https://github.com/kamailio/kamailio/commit/d8cede175ddeada5ca5654a74e765f1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T10:56:56+02:00 acc: remove diameter specific doc content, code was moved in 2017 to acc_diameter --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d8cede175ddeada5ca5654a74e765f1… Patch: https://github.com/kamailio/kamailio/commit/d8cede175ddeada5ca5654a74e765f1… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index de3ad0e1f4..61e27a196e 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -104,18 +104,8 @@ </itemizedlist> </para> <para> - The SQL backend support is compiled in the module. For - DIAMETER you need to enable it by recompiling the module with properly - set defines: uncomment the DDIAM_ACC lines in - modules/acc/Makefile. + The SQL backend support is compiled in the module. </para> - <para> - NOTE: diameter support was developed for DISC (DIameter Server Client - project at http://developer.berlios.de/projects/disc/). This project - seems to be no longer maintained and DIAMETER specifications were updated - in the meantime. Thus, the DIAMETER part in the module is obsolete and - needs rework to be usable with opendiameter or other DIAMETER servers. - </para> <section> <title>General Example</title> <programlisting format="linespecific"> @@ -1019,97 +1009,6 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") ... modparam("acc", "db_insert_mode", 1) ... -</programlisting> - </example> - </section> -  - <section id="acc.p.diameter_flag"> - <title><varname>diameter_flag</varname> (integer)</title> - <para> - Request flag which needs to be set to account a - transaction -- DIAMETER specific. - </para> - <para> - Default value is not-set (no flag). - </para> - <example> - <title>diameter_flag example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_flag", 2) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_missed_flag"> - <title><varname>diameter_missed_flag</varname> (integer)</title> - <para> - Request flag which needs to be set to account missed - calls -- DIAMETER specific. - </para> - <para> - Default value is not-set (no flag). - </para> - <example> - <title>diameter_missed_flag example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_missed_flag", 3) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_client_host"> - <title><varname>diameter_client_host</varname> (string)</title> - <para> - Hostname of the machine where the DIAMETER Client is - running -- DIAMETER specific. - </para> - <para> - Default value is <quote>localhost</quote>. - </para> - <example> - <title>diameter_client_host example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_client_host", "3a_server.net") -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_client_port"> - <title><varname>diameter_client_port</varname> (int)</title> - <para> - Port number where the Diameter Client is - listening -- DIAMETER specific. - </para> - <para> - Default value is 3000. - </para> - <example> - <title>diameter_client_host example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_client_port", 3000) -... -</programlisting> - </example> - </section> - <section id="acc.p.diameter_extra"> - <title><varname>diameter_extra</varname> (string)</title> - <para> - Extra values to be logged via DIAMETER - DIAMETER specific. - See section <xref linkend="acc.i.extra-accounting"/> for more details. - </para> - <para> - Default value is NULL. - </para> - <example> - <title>diameter_extra example</title> - <programlisting format="linespecific"> -... -modparam("acc", "diameter_extra", "7846=$hdr(Content-type);7847=$avp(s:email)") -... </programlisting> </example> </section>

1 0

git:master:59a58e8a: acc: doc improvement regarding radius and diameter modules
by Henning Westerholt 11 Aug '19

11 Aug '19

Module: kamailio Branch: master Commit: 59a58e8a01e91def4634b551cb69ebe1f1c953e0 URL: https://github.com/kamailio/kamailio/commit/59a58e8a01e91def4634b551cb69ebe… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-11T10:51:37+02:00 acc: doc improvement regarding radius and diameter modules --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59a58e8a01e91def4634b551cb69ebe… Patch: https://github.com/kamailio/kamailio/commit/59a58e8a01e91def4634b551cb69ebe… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 48e8c6ac31..de3ad0e1f4 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -18,15 +18,15 @@ <title>Overview</title> <para> ACC module is used to account transactions information to different - backends like syslog and <abbrev>SQL</abbrev>. With the separate module, - <acronym>radius</acronym> support is enabled. + backends like syslog and <abbrev>SQL</abbrev>. With the separate module + <quote>acc_radius</quote> support for <acronym>radius</acronym> is enabled. </para> <para> - There is some very early support of - the <acronym>Diameter</acronym> protocol in the code which is no longer included - by default and will be deleted in coming releases. - This support is not up to date with the current Diameter protocols and - is disabled. If you need Diameter support, please use the <acronym>ims_charging</acronym> module. + There is some very early support of the <acronym>Diameter</acronym> + protocol in the <quote>acc_diameter</quote> module which will be deleted + in coming releases. This support is not up to date with the current + Diameter protocols. If you need Diameter support, please use the + <acronym>ims_charging</acronym> module. </para> <para> To account a transaction and to choose which set of backends to be

1 0

[kamailio/kamailio] Ipsec fix defects (#2023)
by alexyosifov 10 Aug '19

10 Aug '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/2023 -- Commit Summary -- * ims_registrar_pcscf: reconfig ipsec in save pending * ims_usrloc_pcscf: Fix problems with double mem free * ims_ipsec_pcscf: Bug fixes and memory improvements -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (42) M src/modules/ims_ipsec_pcscf/cmd.h (5) M src/modules/ims_ipsec_pcscf/port_gen.c (144) M src/modules/ims_ipsec_pcscf/port_gen.h (1) M src/modules/ims_ipsec_pcscf/spi_gen.c (108) M src/modules/ims_ipsec_pcscf/spi_gen.h (1) M src/modules/ims_ipsec_pcscf/spi_list.c (37) M src/modules/ims_ipsec_pcscf/spi_list.h (1) M src/modules/ims_registrar_pcscf/save.c (2) M src/modules/ims_usrloc_pcscf/pcontact.c (28) M src/modules/ims_usrloc_pcscf/usrloc.c (1) M src/modules/ims_usrloc_pcscf/usrloc.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2023.patch https://github.com/kamailio/kamailio/pull/2023.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/2023

2 1

git:master:431e9459: Merge pull request #2023 from alexyosifov/ipsec_fix_defects
by GitHub 10 Aug '19

10 Aug '19

Module: kamailio Branch: master Commit: 431e9459225b7e58bdb7cc5cc9235bea98d2a82b URL: https://github.com/kamailio/kamailio/commit/431e9459225b7e58bdb7cc5cc9235be… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-10T23:05:13+03:00 Merge pull request #2023 from alexyosifov/ipsec_fix_defects Ipsec fix defects --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/port_gen.c Modified: src/modules/ims_ipsec_pcscf/port_gen.h Modified: src/modules/ims_ipsec_pcscf/spi_gen.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.h Modified: src/modules/ims_ipsec_pcscf/spi_list.c Modified: src/modules/ims_ipsec_pcscf/spi_list.h Modified: src/modules/ims_registrar_pcscf/save.c Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/usrloc.c Modified: src/modules/ims_usrloc_pcscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/431e9459225b7e58bdb7cc5cc9235be… Patch: https://github.com/kamailio/kamailio/commit/431e9459225b7e58bdb7cc5cc9235be…

1 0

git:master:48eb3cd5: ims_ipsec_pcscf: Bug fixes and memory improvements
by Aleksandar Yosifov 10 Aug '19

10 Aug '19

Module: kamailio Branch: master Commit: 48eb3cd5d3a0ff0b8b3125d3be3b7ff60d664435 URL: https://github.com/kamailio/kamailio/commit/48eb3cd5d3a0ff0b8b3125d3be3b7ff… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-08-02T15:13:20+03:00 ims_ipsec_pcscf: Bug fixes and memory improvements - Fix a problem with spi_list, spi_gen and port_gen. Now the global data structs for SPIs and IPSec ports lists are placed into shared memory to be accessible from different processes. SPIs and IPSec ports for expired contacts are released properly. That process is performed in timer's threads and for that reason the global structs are placed into the shared memory. - Add api for ipsec reconfig tunnels. Used in registrar module. Improve update_contact_ipsec_params() to avoid memory leak if the method fails. --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/port_gen.c Modified: src/modules/ims_ipsec_pcscf/port_gen.h Modified: src/modules/ims_ipsec_pcscf/spi_gen.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.h Modified: src/modules/ims_ipsec_pcscf/spi_list.c Modified: src/modules/ims_ipsec_pcscf/spi_list.h --- Diff: https://github.com/kamailio/kamailio/commit/48eb3cd5d3a0ff0b8b3125d3be3b7ff… Patch: https://github.com/kamailio/kamailio/commit/48eb3cd5d3a0ff0b8b3125d3be3b7ff…

1 0

git:master:b34d06ff: ims_registrar_pcscf: reconfig ipsec in save pending
by Aleksandar Yosifov 10 Aug '19

10 Aug '19

Module: kamailio Branch: master Commit: b34d06ffbee58d51f4ab01c394bdcf66ce6ba831 URL: https://github.com/kamailio/kamailio/commit/b34d06ffbee58d51f4ab01c394bdcf6… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-08-02T15:13:20+03:00 ims_registrar_pcscf: reconfig ipsec in save pending - Reconfig ipsec tunnels for each new pending contact. If there are no registered contacts remove all SAs/Policies. --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/b34d06ffbee58d51f4ab01c394bdcf6… Patch: https://github.com/kamailio/kamailio/commit/b34d06ffbee58d51f4ab01c394bdcf6… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 50d1fb2333..4a930a55c3 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -363,6 +363,8 @@ int save_pending(struct sip_msg* _m, udomain_t* _d) { ul.lock_udomain(_d, &ci.via_host, ci.via_port, ci.via_prot); if (ul.get_pcontact(_d, &ci, &pcontact) != 0) { //need to insert new contact + ipsec_pcscf.ipsec_reconfig(); // try to clean all ipsec SAs/Policies if there is no registered contacts + LM_DBG("Adding pending pcontact: <%.*s>\n", c->uri.len, c->uri.s); ci.reg_state=PCONTACT_REG_PENDING; if (ul.insert_pcontact(_d, &c->uri, &ci, &pcontact) != 0) {

1 0

git:master:91c5ca75: ims_usrloc_pcscf: Fix problems with double mem free
by Aleksandar Yosifov 10 Aug '19

10 Aug '19

Module: kamailio Branch: master Commit: 91c5ca751799db4f25a28a495350cc97f7c2f390 URL: https://github.com/kamailio/kamailio/commit/91c5ca751799db4f25a28a495350cc9… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-08-02T15:13:20+03:00 ims_usrloc_pcscf: Fix problems with double mem free - Add checks to avoid double memory free in free_security() method. Add api to get number of registered contacts. --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/usrloc.c Modified: src/modules/ims_usrloc_pcscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/91c5ca751799db4f25a28a495350cc9… Patch: https://github.com/kamailio/kamailio/commit/91c5ca751799db4f25a28a495350cc9… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 76297bf1d9..0d156d39c4 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -122,25 +122,29 @@ void free_security(security_t* _p) if (!_p) return; - shm_free(_p->sec_header.s); + if(_p->sec_header.s) + shm_free(_p->sec_header.s); switch (_p->type) { case SECURITY_IPSEC: - shm_free(_p->data.ipsec->ealg.s); - shm_free(_p->data.ipsec->r_ealg.s); - shm_free(_p->data.ipsec->ck.s); - shm_free(_p->data.ipsec->alg.s); - shm_free(_p->data.ipsec->r_alg.s); - shm_free(_p->data.ipsec->ik.s); - shm_free(_p->data.ipsec->prot.s); - shm_free(_p->data.ipsec->mod.s); - - shm_free(_p->data.ipsec); + if(_p->data.ipsec){ + if(_p->data.ipsec->ealg.s) shm_free(_p->data.ipsec->ealg.s); + if(_p->data.ipsec->r_ealg.s) shm_free(_p->data.ipsec->r_ealg.s); + if(_p->data.ipsec->ck.s) shm_free(_p->data.ipsec->ck.s); + if(_p->data.ipsec->alg.s) shm_free(_p->data.ipsec->alg.s); + if(_p->data.ipsec->r_alg.s) shm_free(_p->data.ipsec->r_alg.s); + if(_p->data.ipsec->ik.s) shm_free(_p->data.ipsec->ik.s); + if(_p->data.ipsec->prot.s) shm_free(_p->data.ipsec->prot.s); + if(_p->data.ipsec->mod.s) shm_free(_p->data.ipsec->mod.s); + + shm_free(_p->data.ipsec); + } break; case SECURITY_TLS: - shm_free(_p->data.tls); + if(_p->data.tls) + shm_free(_p->data.tls); break; case SECURITY_NONE: diff --git a/src/modules/ims_usrloc_pcscf/usrloc.c b/src/modules/ims_usrloc_pcscf/usrloc.c index c32f84e641..66c37ffe5f 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc.c +++ b/src/modules/ims_usrloc_pcscf/usrloc.c @@ -79,6 +79,7 @@ int bind_usrloc(usrloc_api_t* api) { api->update_security = update_security; api->update_temp_security = update_temp_security; api->register_ulcb = register_ulcb; + api->get_number_of_contacts = get_number_of_contacts; return 0; } diff --git a/src/modules/ims_usrloc_pcscf/usrloc.h b/src/modules/ims_usrloc_pcscf/usrloc.h index 2eaa2e76b7..4de653dd70 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc.h +++ b/src/modules/ims_usrloc_pcscf/usrloc.h @@ -257,6 +257,9 @@ typedef int (*get_all_ucontacts_t)(void* buf, int len, unsigned int flags, unsig typedef int (*update_security_t)(struct udomain* _d, security_type _t, security_t* _s, struct pcontact* _c); typedef int (*update_temp_security_t)(struct udomain* _d, security_type _t, security_t* _s, struct pcontact* _c); +/* statistic APIs */ +typedef unsigned long(*get_number_of_contacts_t)(); + /*! usrloc API export structure */ typedef struct usrloc_api { int use_domain; /*! use_domain module parameter */ @@ -281,6 +284,8 @@ typedef struct usrloc_api { update_temp_security_t update_temp_security; register_ulcb_t register_ulcb; + + get_number_of_contacts_t get_number_of_contacts; } usrloc_api_t; /*! usrloc API export bind function */

1 0

git:master:7628a2c8: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: 7628a2c8bf5473bcb6810d38a2551fe95b77b116 URL: https://github.com/kamailio/kamailio/commit/7628a2c8bf5473bcb6810d38a2551fe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-09T16:46:49+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/7628a2c8bf5473bcb6810d38a2551fe… Patch: https://github.com/kamailio/kamailio/commit/7628a2c8bf5473bcb6810d38a2551fe… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 533d7b4183..72722e0cc4 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -412,7 +412,7 @@ modparam("uac","credential","username:domain:password") advance. If you define it, you also need to define “auth_username_avp” - (Section 3.10, “auth_username_avp (string)”) and “auth_username_avp” + (Section 3.10, “auth_username_avp (string)”) and “auth_password_avp” (Section 3.11, “auth_password_avp (string)”). Example 1.9. Set auth_realm_avp parameter @@ -426,7 +426,7 @@ modparam("uac","auth_realm_avp","$avp(i:10)") perform authentication. If you define it, you also need to define “auth_realm_avp” - (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” + (Section 3.9, “auth_realm_avp (string)”) and “auth_password_avp” (Section 3.11, “auth_password_avp (string)”). Example 1.10. Set auth_username_avp parameter @@ -439,7 +439,7 @@ modparam("uac","auth_username_avp","$avp(i:11)") The definition of an AVP that might contain the password to be used to perform authentication. - If you define it, you also need to define “auth_password_avp” + If you define it, you also need to define “auth_realm_avp” (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” (Section 3.10, “auth_username_avp (string)”).

1 0

git:5.2:82bbbd44: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Aug '19

09 Aug '19

Module: kamailio Branch: 5.2 Commit: 82bbbd443977ee45c87958265ef064c94689c17c URL: https://github.com/kamailio/kamailio/commit/82bbbd443977ee45c87958265ef064c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-09T16:46:36+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/82bbbd443977ee45c87958265ef064c… Patch: https://github.com/kamailio/kamailio/commit/82bbbd443977ee45c87958265ef064c… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 552353e17e..4ea666a9de 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -403,8 +403,9 @@ modparam("uac","credential","username:domain:password") This can be used if the realm upstream will be using is not known in advance. - If you define it, you also need to define “auth_username_avp” (???) and - “auth_username_avp” (???). + If you define it, you also need to define “auth_username_avp” + (Section 3.10, “auth_username_avp (string)”) and “auth_password_avp” + (Section 3.11, “auth_password_avp (string)”). Example 1.9. Set auth_realm_avp parameter ... @@ -416,8 +417,9 @@ modparam("uac","auth_realm_avp","$avp(i:10)") The definition of an AVP that might contain the username to be used to perform authentication. - If you define it, you also need to define “auth_realm_avp” (???) and - “auth_username_avp” (???). + If you define it, you also need to define “auth_realm_avp” + (Section 3.9, “auth_realm_avp (string)”) and “auth_password_avp” + (Section 3.11, “auth_password_avp (string)”). Example 1.10. Set auth_username_avp parameter ... @@ -429,8 +431,9 @@ modparam("uac","auth_username_avp","$avp(i:11)") The definition of an AVP that might contain the password to be used to perform authentication. - If you define it, you also need to define “auth_password_avp” (???) and - “auth_username_avp” (???). + If you define it, you also need to define “auth_realm_avp” + (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” + (Section 3.10, “auth_username_avp (string)”). Example 1.11. Set auth_password_avp parameter ...

1 0

git:5.2:1681a5b2: uac: fix references in docs for AVPs
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: 5.2 Commit: 1681a5b22270e1dfcbad8edea2881c24d49e847d URL: https://github.com/kamailio/kamailio/commit/1681a5b22270e1dfcbad8edea2881c2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T16:37:16+02:00 uac: fix references in docs for AVPs (cherry picked from commit a5360fa28d8394bf420915645ecd0658dcd1c7b8) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1681a5b22270e1dfcbad8edea2881c2… Patch: https://github.com/kamailio/kamailio/commit/1681a5b22270e1dfcbad8edea2881c2… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 3964c9afc5..4ff984d7bf 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -326,9 +326,9 @@ modparam("uac","credential","username:domain:password") <para><emphasis> If you define it, you also need to define <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-username-avp-id"/>) and + (<xref linkend="uac.p.auth_username_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_realm_avp</varname> parameter</title> @@ -348,9 +348,9 @@ modparam("uac","auth_realm_avp","$avp(i:10)") <para><emphasis> If you define it, you also need to define <quote>auth_realm_avp</quote> - (<xref linkend="uac.p.auth-realm-avp-id"/>) and + (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_username_avp</varname> parameter</title> @@ -370,9 +370,9 @@ modparam("uac","auth_username_avp","$avp(i:11)") <para><emphasis> If you define it, you also need to define <quote>auth_password_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>) and + (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_username_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_password_avp</varname> parameter</title>

1 0

git:5.2:06d60096: uac: fix another copy and paste error in docs
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: 5.2 Commit: 06d6009624ec5f537838e23afc491043e6edae75 URL: https://github.com/kamailio/kamailio/commit/06d6009624ec5f537838e23afc49104… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T16:37:44+02:00 uac: fix another copy and paste error in docs (cherry picked from commit 85994cda0a9413836386d595aab1657d1412ec8b) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/06d6009624ec5f537838e23afc49104… Patch: https://github.com/kamailio/kamailio/commit/06d6009624ec5f537838e23afc49104… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 4ff984d7bf..b9caf288ac 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -327,7 +327,7 @@ modparam("uac","credential","username:domain:password") If you define it, you also need to define <quote>auth_username_avp</quote> (<xref linkend="uac.p.auth_username_avp"/>) and - <quote>auth_username_avp</quote> + <quote>auth_password_avp</quote> (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> @@ -349,7 +349,7 @@ modparam("uac","auth_realm_avp","$avp(i:10)") If you define it, you also need to define <quote>auth_realm_avp</quote> (<xref linkend="uac.p.auth_realm_avp"/>) and - <quote>auth_username_avp</quote> + <quote>auth_password_avp</quote> (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> @@ -369,7 +369,7 @@ modparam("uac","auth_username_avp","$avp(i:11)") </para> <para><emphasis> If you define it, you also need to define - <quote>auth_password_avp</quote> + <quote>auth_realm_avp</quote> (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> (<xref linkend="uac.p.auth_username_avp"/>).

1 0

git:master:85994cda: uac: fix another copy and paste error in docs
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: 85994cda0a9413836386d595aab1657d1412ec8b URL: https://github.com/kamailio/kamailio/commit/85994cda0a9413836386d595aab1657… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T16:36:49+02:00 uac: fix another copy and paste error in docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/85994cda0a9413836386d595aab1657… Patch: https://github.com/kamailio/kamailio/commit/85994cda0a9413836386d595aab1657… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 1967dcb91c..31072325db 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -327,7 +327,7 @@ modparam("uac","credential","username:domain:password") If you define it, you also need to define <quote>auth_username_avp</quote> (<xref linkend="uac.p.auth_username_avp"/>) and - <quote>auth_username_avp</quote> + <quote>auth_password_avp</quote> (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> @@ -349,7 +349,7 @@ modparam("uac","auth_realm_avp","$avp(i:10)") If you define it, you also need to define <quote>auth_realm_avp</quote> (<xref linkend="uac.p.auth_realm_avp"/>) and - <quote>auth_username_avp</quote> + <quote>auth_password_avp</quote> (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> @@ -369,7 +369,7 @@ modparam("uac","auth_username_avp","$avp(i:11)") </para> <para><emphasis> If you define it, you also need to define - <quote>auth_password_avp</quote> + <quote>auth_realm_avp</quote> (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> (<xref linkend="uac.p.auth_username_avp"/>).

1 0

git:master:6dd0f878: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: 6dd0f878cf066fd91a03d76b8d6248efb6370c22 URL: https://github.com/kamailio/kamailio/commit/6dd0f878cf066fd91a03d76b8d6248e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-09T16:31:39+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/6dd0f878cf066fd91a03d76b8d6248e… Patch: https://github.com/kamailio/kamailio/commit/6dd0f878cf066fd91a03d76b8d6248e… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 9e688b3010..533d7b4183 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -411,8 +411,9 @@ modparam("uac","credential","username:domain:password") This can be used if the realm upstream will be using is not known in advance. - If you define it, you also need to define “auth_username_avp” (???) and - “auth_username_avp” (???). + If you define it, you also need to define “auth_username_avp” + (Section 3.10, “auth_username_avp (string)”) and “auth_username_avp” + (Section 3.11, “auth_password_avp (string)”). Example 1.9. Set auth_realm_avp parameter ... @@ -424,8 +425,9 @@ modparam("uac","auth_realm_avp","$avp(i:10)") The definition of an AVP that might contain the username to be used to perform authentication. - If you define it, you also need to define “auth_realm_avp” (???) and - “auth_username_avp” (???). + If you define it, you also need to define “auth_realm_avp” + (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” + (Section 3.11, “auth_password_avp (string)”). Example 1.10. Set auth_username_avp parameter ... @@ -437,8 +439,9 @@ modparam("uac","auth_username_avp","$avp(i:11)") The definition of an AVP that might contain the password to be used to perform authentication. - If you define it, you also need to define “auth_password_avp” (???) and - “auth_username_avp” (???). + If you define it, you also need to define “auth_password_avp” + (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” + (Section 3.10, “auth_username_avp (string)”). Example 1.11. Set auth_password_avp parameter ... @@ -564,12 +567,15 @@ modparam("uac", "reg_gc_interval", 60) Default socket to be used for generating registration requests and sending requests with the function uac_req_send(). Useful e.g. when - several public interfaces are available. + several public interfaces are available. A send socket in the $uac_reg + variable used together with the uac_req_send() function will override + this parameter. By default no default socket is defined, the send socket is choosen - from the tm module when the requests is send out. A send socket in the - $uac_reg variable used together with the uac_req_send() function will - override this parameter. + from the “tm” module when the requests is send out. + + If you want to force a certain TCP port (e.g. 5060), you will need to + set the tcp_reuse_port=yes core parameter as well. Example 1.21. Set the “default_socket” parameter ...

1 0

git:master:a5360fa2: uac: fix references in docs for AVPs
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: a5360fa28d8394bf420915645ecd0658dcd1c7b8 URL: https://github.com/kamailio/kamailio/commit/a5360fa28d8394bf420915645ecd065… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T16:25:56+02:00 uac: fix references in docs for AVPs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a5360fa28d8394bf420915645ecd065… Patch: https://github.com/kamailio/kamailio/commit/a5360fa28d8394bf420915645ecd065… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index c4f5d82126..1967dcb91c 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -326,9 +326,9 @@ modparam("uac","credential","username:domain:password") <para><emphasis> If you define it, you also need to define <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-username-avp-id"/>) and + (<xref linkend="uac.p.auth_username_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_realm_avp</varname> parameter</title> @@ -348,9 +348,9 @@ modparam("uac","auth_realm_avp","$avp(i:10)") <para><emphasis> If you define it, you also need to define <quote>auth_realm_avp</quote> - (<xref linkend="uac.p.auth-realm-avp-id"/>) and + (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_username_avp</varname> parameter</title> @@ -370,9 +370,9 @@ modparam("uac","auth_username_avp","$avp(i:11)") <para><emphasis> If you define it, you also need to define <quote>auth_password_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>) and + (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_username_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_password_avp</varname> parameter</title>

1 0

git:master:c9758786: uac: extend docs for default_socket with a note about tcp_reuse_port
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: c975878648b7c34f6631a941555eb62f0506d638 URL: https://github.com/kamailio/kamailio/commit/c975878648b7c34f6631a941555eb62… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T16:25:56+02:00 uac: extend docs for default_socket with a note about tcp_reuse_port --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c975878648b7c34f6631a941555eb62… Patch: https://github.com/kamailio/kamailio/commit/c975878648b7c34f6631a941555eb62… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 91b8787870..c4f5d82126 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -567,16 +567,18 @@ modparam("uac", "reg_gc_interval", 60) <para> Default socket to be used for generating registration requests and sending requests with the function uac_req_send(). Useful e.g. when several public - interfaces are available. + interfaces are available. A send socket in the $uac_reg variable used + together with the uac_req_send() function will override this parameter. </para> <para> <emphasis> By default no default socket is defined, the send socket is choosen from the - <emphasis>tm</emphasis> module when the requests is send out. A send socket - in the $uac_reg variable used together with the uac_req_send() function will - override this parameter. + <quote>tm</quote> module when the requests is send out. </emphasis> </para> + <para>If you want to force a certain TCP port (e.g. 5060), you will need to set + the <emphasis>tcp_reuse_port=yes</emphasis> core parameter as well. + </para> <example> <title>Set the <quote>default_socket</quote> parameter</title> <programlisting format="linespecific">

1 0

[kamailio/kamailio] Sipt Redirection Number Retrieves old values (#2030)
by duarterocha91 09 Aug '19

09 Aug '19

Greetings, I'm doing VoiceMail detection using $sipt(redirection_number) from SIPT module and i've been having some false positives on the detection. I inspected further and noticed that in some cases $sipt(redirection_number) returns old values from previous messages, which makes me think that it's value is not being correctly refreshed. I'm using this variable on a on_reply_route. As far as i know, $sipt(redirection_number) is read only and can't be refreshed by me in the code. Here is an example : Aug 7 16:51:49 dev_sbc_a_vts01 /usr/local/kamailio-5.2/sbin/kamailio[4746]: ERROR: <script>: VMD2 : Reply Code : 180 ; Sipt Redir = 9610050000 and Call ID = 00158FED-98B7-E911-8B3B-4DA50AE2ED72 at 192.168.24.86 and Cseq = 83 Here is the JSON from the 180 message : https://pastebin.com/zFHKxyav As you can see, there isn't any 9610050000 in the message. What can be causing this issue ? Best Regards, Duarte Rocha -- 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/2030

2 5

git:master:885fdc85: kemix: exported functions to return message body
by Daniel-Constantin Mierla 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: 885fdc8521a7d2f78e195eaef447f01daf7ad800 URL: https://github.com/kamailio/kamailio/commit/885fdc8521a7d2f78e195eaef447f01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-09T15:02:40+02:00 kemix: exported functions to return message body --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/885fdc8521a7d2f78e195eaef447f01… Patch: https://github.com/kamailio/kamailio/commit/885fdc8521a7d2f78e195eaef447f01… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 9265d36890..91ad99dea9 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -617,6 +617,59 @@ static sr_kemi_xval_t* ki_kx_gets_status(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_body_mode(sip_msg_t *msg, int rmode) +{ + str s; + 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; + } + + s.s = get_body(msg); + + if(s.s == NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, rmode); + return &_sr_kemi_kx_xval; + } + s.len = msg->buf + msg->len - s.s; + if(s.len <=0) { + 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 = s; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_body(sip_msg_t *msg) +{ + return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_body(sip_msg_t *msg) +{ + return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_body(sip_msg_t *msg) +{ + return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -777,6 +830,22 @@ 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_body"), + SR_KEMIP_XVAL, ki_kx_get_body, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_body"), + SR_KEMIP_XVAL, ki_kx_getw_body, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_body"), + SR_KEMIP_XVAL, ki_kx_gete_body, + { 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:b038de70: uac: remove old unused #ifdef UAC_OLD_AUTH, related to extension in 2011
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: b038de70ffdde8d2179f49edc574afca62e41638 URL: https://github.com/kamailio/kamailio/commit/b038de70ffdde8d2179f49edc574afc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T14:54:23+02:00 uac: remove old unused #ifdef UAC_OLD_AUTH, related to extension in 2011 --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/b038de70ffdde8d2179f49edc574afc… Patch: https://github.com/kamailio/kamailio/commit/b038de70ffdde8d2179f49edc574afc… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 0e3cc65165..c19d758630 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -808,11 +808,6 @@ int uac_reg_tmdlg(dlg_t *tmdlg, sip_msg_t *rpl) if (get_from(rpl)->tag_value.len) { tmdlg->id.loc_tag = get_from(rpl)->tag_value; } -#if 0 - if (get_to(rpl)->tag_value.len) { - tmdlg->id.rem_tag = get_to(rpl)->tag_value; - } -#endif tmdlg->loc_uri = get_from(rpl)->uri; tmdlg->rem_uri = get_to(rpl)->uri; tmdlg->state= DLG_CONFIRMED; @@ -834,10 +829,6 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) struct uac_credential cred; char b_ruri[MAX_URI_SIZE]; str s_ruri; -#ifdef UAC_OLD_AUTH - char b_turi[MAX_URI_SIZE]; - str s_turi; -#endif char b_hdrs[MAX_UACH_SIZE]; str s_hdrs; uac_req_t uac_r; @@ -979,12 +970,6 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) goto error; } -#ifdef UAC_OLD_AUTH - snprintf(b_turi, MAX_URI_SIZE, "sip:%.*s@%.*s", - ri->r_username.len, ri->r_username.s, - ri->r_domain.len, ri->r_domain.s); - s_turi.s = b_turi; s_turi.len = strlen(s_turi.s); -#endif snprintf(b_hdrs, MAX_UACH_SIZE, "Contact: <sip:%.*s@%.*s>\r\n" "Expires: %d\r\n" @@ -1013,18 +998,6 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; -#ifdef UAC_OLD_AUTH - /* default socket */ - if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { - uac_r.ssock = &uac_default_socket; - } - ret = uac_tmb.t_request(&uac_r, /* UAC Req */ - &s_ruri, /* Request-URI */ - &s_turi, /* To */ - &s_turi, /* From */ - (ri->auth_proxy.len)?&ri->auth_proxy:NULL /* outbound uri */ - ); -#endif ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

1 0

git:master:dd6b8d28: uac: fix error related to UAC_OLD_AUTH #define and default_socket addition
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: dd6b8d282289bbaf02adb5a9f341800ca17a0bfd URL: https://github.com/kamailio/kamailio/commit/dd6b8d282289bbaf02adb5a9f341800… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:31:40+02:00 uac: fix error related to UAC_OLD_AUTH #define and default_socket addition --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/dd6b8d282289bbaf02adb5a9f341800… Patch: https://github.com/kamailio/kamailio/commit/dd6b8d282289bbaf02adb5a9f341800… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index f7f62e0d9c..0e3cc65165 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1013,11 +1013,11 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; +#ifdef UAC_OLD_AUTH /* default socket */ if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { uac_r.ssock = &uac_default_socket; } -#ifdef UAC_OLD_AUTH ret = uac_tmb.t_request(&uac_r, /* UAC Req */ &s_ruri, /* Request-URI */ &s_turi, /* To */

1 0

git:5.1:7219170e: domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list)
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: 5.1 Commit: 7219170e7def71eeb6a63ec7e278adf5a795886c URL: https://github.com/kamailio/kamailio/commit/7219170e7def71eeb6a63ec7e278adf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:23:49+02:00 domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list) - fix memory leak on domain reload, reported by Mack Hendricks - related to domain_attr table, structure domain_list (cherry picked from commit f50177003c21f53564be6349c0bb4935be184e2d) --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/7219170e7def71eeb6a63ec7e278adf… Patch: https://github.com/kamailio/kamailio/commit/7219170e7def71eeb6a63ec7e278adf… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 257d374dba..b093dbc3e4 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,6 +204,7 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + shm_free(np); np = np->next; }

1 0

git:5.2:24e32728: sipt: reset the static buffer for returning the number
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: 5.2 Commit: 24e327280b1790ed15e16f6fd251c5596728abd8 URL: https://github.com/kamailio/kamailio/commit/24e327280b1790ed15e16f6fd251c55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:22:33+02:00 sipt: reset the static buffer for returning the number - GH #2030 (cherry picked from commit 2c052974263c0785eb5280a935162673ac82dc6b) --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/24e327280b1790ed15e16f6fd251c55… Patch: https://github.com/kamailio/kamailio/commit/24e327280b1790ed15e16f6fd251c55… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index e75ecdc5b4..f64686dbc7 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -339,6 +339,7 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p str body; body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); + sb_s_buf[0] = '\0'; if(body.s == NULL) { LM_INFO("No ISUP Message Found"); @@ -350,9 +351,9 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p LM_DBG("message not an ACM or CPG\n"); return -1; } - + isup_get_redirection_number((unsigned char*)body.s, body.len, sb_s_buf); - + if (strlen(sb_s_buf) > 0) { pv_get_strzval(msg, param, res, sb_s_buf);

1 0

git:5.2:643faf56: domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list)
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: 5.2 Commit: 643faf56274d6432b9884a062a669d0920d04bd4 URL: https://github.com/kamailio/kamailio/commit/643faf56274d6432b9884a062a669d0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:23:45+02:00 domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list) - fix memory leak on domain reload, reported by Mack Hendricks - related to domain_attr table, structure domain_list (cherry picked from commit f50177003c21f53564be6349c0bb4935be184e2d) --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/643faf56274d6432b9884a062a669d0… Patch: https://github.com/kamailio/kamailio/commit/643faf56274d6432b9884a062a669d0… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 257d374dba..b093dbc3e4 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,6 +204,7 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + shm_free(np); np = np->next; }

1 0

git:master:abea963c: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: abea963c666fb39f263de7f9d5ff7ea97fb04529 URL: https://github.com/kamailio/kamailio/commit/abea963c666fb39f263de7f9d5ff7ea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-09T11:02:23+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/abea963c666fb39f263de7f9d5ff7ea… Patch: https://github.com/kamailio/kamailio/commit/abea963c666fb39f263de7f9d5ff7ea…

1 0

git:master:27b6f0ab: uac: new functionality to force a default socket for register and request sending
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: 27b6f0aba06796f0c52e32fad809d3781b17ce6b URL: https://github.com/kamailio/kamailio/commit/27b6f0aba06796f0c52e32fad809d37… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T10:45:53+02:00 uac: new functionality to force a default socket for register and request sending - add new functionality to force a default socket with parameter "default_socket" - works for uac REGISTER requests and also uac_send_req - if used with uac_send_req an eventual specified socket takes priority over the default socket --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/27b6f0aba06796f0c52e32fad809d37… Patch: https://github.com/kamailio/kamailio/commit/27b6f0aba06796f0c52e32fad809d37…

1 0

git:master:ee91829d: dispatcher: module load error because of wrong default socket should be logges as LM_ERR
by Henning Westerholt 09 Aug '19

09 Aug '19

Module: kamailio Branch: master Commit: ee91829dc65d7062e1aba5069bcd37e0b62a8795 URL: https://github.com/kamailio/kamailio/commit/ee91829dc65d7062e1aba5069bcd37e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T09:29:41+02:00 dispatcher: module load error because of wrong default socket should be logges as LM_ERR --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/ee91829dc65d7062e1aba5069bcd37e… Patch: https://github.com/kamailio/kamailio/commit/ee91829dc65d7062e1aba5069bcd37e… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 101927099a..6c7588d7a9 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -347,7 +347,7 @@ static int mod_init(void) ds_default_sockinfo = grep_sock_info(&host, (unsigned short)port, proto); if(ds_default_sockinfo == 0) { - LM_WARN("non-local socket <%.*s>\n", ds_default_socket.len, + LM_ERR("non-local socket <%.*s>\n", ds_default_socket.len, ds_default_socket.s); return -1; }

1 0

git:5.1:bb2668b0: corex: fix parser for alias_subdomain modparam, extend debugging output
by Henning Westerholt 08 Aug '19

08 Aug '19

Module: kamailio Branch: 5.1 Commit: bb2668b0d25c0f8096e5838065816cd5245694d6 URL: https://github.com/kamailio/kamailio/commit/bb2668b0d25c0f8096e5838065816cd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-08T21:20:37+02:00 corex: fix parser for alias_subdomain modparam, extend debugging output - fix parser for alias_subdomain modparam, it was not working correctly for all proto:hostname:port combinations (e.g. hostname/proto mixed up) - extend debugging output for alias adding and also alias matching (cherry picked from commit 36ef1bf77f9df7bc5022c1dc350e54df2d168cf3) --- Modified: src/modules/corex/corex_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/bb2668b0d25c0f8096e5838065816cd… Patch: https://github.com/kamailio/kamailio/commit/bb2668b0d25c0f8096e5838065816cd… --- diff --git a/src/modules/corex/corex_lib.c b/src/modules/corex/corex_lib.c index d8cfc60881..4d05939d88 100644 --- a/src/modules/corex/corex_lib.c +++ b/src/modules/corex/corex_lib.c @@ -114,6 +114,7 @@ int corex_add_alias_subdomains(char* aliasval) corex_alias_t ta; corex_alias_t *na; + LM_DBG("try to add alias: %s\n", aliasval); memset(&ta, 0, sizeof(corex_alias_t)); p = strchr(aliasval, ':'); @@ -134,27 +135,38 @@ int corex_add_alias_subdomains(char* aliasval) } else if((p-aliasval)==4 && strncasecmp(aliasval, "sctp", 4)==0) { ta.proto = PROTO_SCTP; } else { - /* use hostname */ - ta.alias.s = aliasval; - ta.alias.len = p - aliasval; + /* invalid protocol */ + LM_ERR("invalid protocol %.*s", (int) (p-aliasval), aliasval); + goto error; } - } - if(ta.alias.len==0) { + /* hostname */ p++; - if(p>=aliasval+strlen(aliasval)) + ta.alias.s = aliasval + (p-aliasval); + + if(p>=aliasval+strlen(aliasval)) { goto error; - ta.alias.s = p; + } + /* port */ p = strchr(ta.alias.s, ':'); if(p==NULL) { ta.alias.len = strlen(ta.alias.s); goto done; } + ta.alias.len = p - ta.alias.s; + p++; + ta.port = str2s(p, strlen(p), NULL); + + } else { + /* hostname */ + ta.alias.s = aliasval; + ta.alias.len = p - ta.alias.s; + /* port */ + p++; + if(p>=aliasval+strlen(aliasval)) { + goto error; + } + ta.port = str2s(p, strlen(p), NULL); } - /* port */ - p++; - if(p>=aliasval+strlen(aliasval)) - goto error; - ta.port = str2s(p, strlen(p), NULL); done: if(ta.alias.len==0) @@ -169,6 +181,8 @@ int corex_add_alias_subdomains(char* aliasval) na->next = _corex_alias_list; _corex_alias_list = na; + LM_DBG("alias: %d:%.*s:%d from value: %s added\n", ta.proto, + ta.alias.len, ta.alias.s, ta.port, aliasval); return 0; error: @@ -181,6 +195,8 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) { corex_alias_t *ta; + LM_DBG("check self for: %d:%.*s:%d\n", (int) proto, host->len, + host->s, (int)port); for(ta=_corex_alias_list; ta; ta=ta->next) { if(host->len<ta->alias.len) continue; @@ -191,21 +207,22 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) if(host->len==ta->alias.len && strncasecmp(host->s, ta->alias.s, host->len)==0) { /* match domain */ - LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->proto, + ta->alias.len, ta->alias.s, (int)ta->port); return 1; } if(strncasecmp(ta->alias.s, host->s + host->len - ta->alias.len, ta->alias.len)==0) { if(host->s[host->len - ta->alias.len - 1]=='.') { /* match sub-domain */ - LM_DBG("check self sub-domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self sub-domain match: %d:%.*s:%d\n", + (int)ta->proto, ta->alias.len, ta->alias.s, + (int)ta->port); return 1; } } } - + LM_DBG("no match found\n"); return 0; /* no match */ }

1 0

git:5.2:b88e04ee: corex: fix parser for alias_subdomain modparam, extend debugging output
by Henning Westerholt 08 Aug '19

08 Aug '19

Module: kamailio Branch: 5.2 Commit: b88e04ee3d873a1d9c09b504e62174c0e1aaa02b URL: https://github.com/kamailio/kamailio/commit/b88e04ee3d873a1d9c09b504e62174c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-08T21:20:31+02:00 corex: fix parser for alias_subdomain modparam, extend debugging output - fix parser for alias_subdomain modparam, it was not working correctly for all proto:hostname:port combinations (e.g. hostname/proto mixed up) - extend debugging output for alias adding and also alias matching (cherry picked from commit 36ef1bf77f9df7bc5022c1dc350e54df2d168cf3) --- Modified: src/modules/corex/corex_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/b88e04ee3d873a1d9c09b504e62174c… Patch: https://github.com/kamailio/kamailio/commit/b88e04ee3d873a1d9c09b504e62174c… --- diff --git a/src/modules/corex/corex_lib.c b/src/modules/corex/corex_lib.c index 377654158d..ec5334cb2e 100644 --- a/src/modules/corex/corex_lib.c +++ b/src/modules/corex/corex_lib.c @@ -114,6 +114,7 @@ int corex_add_alias_subdomains(char* aliasval) corex_alias_t ta; corex_alias_t *na; + LM_DBG("try to add alias: %s\n", aliasval); memset(&ta, 0, sizeof(corex_alias_t)); p = strchr(aliasval, ':'); @@ -134,27 +135,38 @@ int corex_add_alias_subdomains(char* aliasval) } else if((p-aliasval)==4 && strncasecmp(aliasval, "sctp", 4)==0) { ta.proto = PROTO_SCTP; } else { - /* use hostname */ - ta.alias.s = aliasval; - ta.alias.len = p - aliasval; + /* invalid protocol */ + LM_ERR("invalid protocol %.*s", (int) (p-aliasval), aliasval); + goto error; } - } - if(ta.alias.len==0) { + /* hostname */ p++; - if(p>=aliasval+strlen(aliasval)) + ta.alias.s = aliasval + (p-aliasval); + + if(p>=aliasval+strlen(aliasval)) { goto error; - ta.alias.s = p; + } + /* port */ p = strchr(ta.alias.s, ':'); if(p==NULL) { ta.alias.len = strlen(ta.alias.s); goto done; } + ta.alias.len = p - ta.alias.s; + p++; + ta.port = str2s(p, strlen(p), NULL); + + } else { + /* hostname */ + ta.alias.s = aliasval; + ta.alias.len = p - ta.alias.s; + /* port */ + p++; + if(p>=aliasval+strlen(aliasval)) { + goto error; + } + ta.port = str2s(p, strlen(p), NULL); } - /* port */ - p++; - if(p>=aliasval+strlen(aliasval)) - goto error; - ta.port = str2s(p, strlen(p), NULL); done: if(ta.alias.len==0) @@ -169,6 +181,8 @@ int corex_add_alias_subdomains(char* aliasval) na->next = _corex_alias_list; _corex_alias_list = na; + LM_DBG("alias: %d:%.*s:%d from value: %s added\n", ta.proto, + ta.alias.len, ta.alias.s, ta.port, aliasval); return 0; error: @@ -181,6 +195,8 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) { corex_alias_t *ta; + LM_DBG("check self for: %d:%.*s:%d\n", (int) proto, host->len, + host->s, (int)port); for(ta=_corex_alias_list; ta; ta=ta->next) { if(host->len<ta->alias.len) continue; @@ -191,21 +207,22 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) if(host->len==ta->alias.len && strncasecmp(host->s, ta->alias.s, host->len)==0) { /* match domain */ - LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->proto, + ta->alias.len, ta->alias.s, (int)ta->port); return 1; } if(strncasecmp(ta->alias.s, host->s + host->len - ta->alias.len, ta->alias.len)==0) { if(host->s[host->len - ta->alias.len - 1]=='.') { /* match sub-domain */ - LM_DBG("check self sub-domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self sub-domain match: %d:%.*s:%d\n", + (int)ta->proto, ta->alias.len, ta->alias.s, + (int)ta->port); return 1; } } } - + LM_DBG("no match found\n"); return 0; /* no match */ }

1 0

git:master:849763ae: sipt: set whole static buffer to 0
by Henning Westerholt 08 Aug '19

08 Aug '19

Module: kamailio Branch: master Commit: 849763ae85e50e838e26c7b107bcc29556c0e052 URL: https://github.com/kamailio/kamailio/commit/849763ae85e50e838e26c7b107bcc29… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-08T21:06:42+02:00 sipt: set whole static buffer to 0 --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/849763ae85e50e838e26c7b107bcc29… Patch: https://github.com/kamailio/kamailio/commit/849763ae85e50e838e26c7b107bcc29… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index f64686dbc7..58b92fd985 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -339,7 +339,7 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p str body; body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); - sb_s_buf[0] = '\0'; + memset(sb_s_buf, 0, 26); if(body.s == NULL) { LM_INFO("No ISUP Message Found");

1 0

git:master:2c052974: sipt: reset the static buffer for returning the number
by Daniel-Constantin Mierla 08 Aug '19

08 Aug '19

Module: kamailio Branch: master Commit: 2c052974263c0785eb5280a935162673ac82dc6b URL: https://github.com/kamailio/kamailio/commit/2c052974263c0785eb5280a93516267… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-08T18:31:06+02:00 sipt: reset the static buffer for returning the number - GH #2030 --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/2c052974263c0785eb5280a93516267… Patch: https://github.com/kamailio/kamailio/commit/2c052974263c0785eb5280a93516267… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index e75ecdc5b4..f64686dbc7 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -339,6 +339,7 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p str body; body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); + sb_s_buf[0] = '\0'; if(body.s == NULL) { LM_INFO("No ISUP Message Found"); @@ -350,9 +351,9 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p LM_DBG("message not an ACM or CPG\n"); return -1; } - + isup_get_redirection_number((unsigned char*)body.s, body.len, sb_s_buf); - + if (strlen(sb_s_buf) > 0) { pv_get_strzval(msg, param, res, sb_s_buf);

1 0

git:master:faaf599c: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 08 Aug '19

08 Aug '19

Module: kamailio Branch: master Commit: faaf599c0def2d36fb4d41f91d1fbecaf9732905 URL: https://github.com/kamailio/kamailio/commit/faaf599c0def2d36fb4d41f91d1fbec… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-08T17:16:51+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/faaf599c0def2d36fb4d41f91d1fbec… Patch: https://github.com/kamailio/kamailio/commit/faaf599c0def2d36fb4d41f91d1fbec… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 2228d61d02..a6999eb23f 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -67,7 +67,9 @@ Ovidiu Sas 4.11. sht_iterator_end(iname) 4.12. sht_iterator_next(iname) 4.13. sht_match_name(htable, op, mval) - 4.14. sht_match_str_value(htable, op, mval) + 4.14. sht_has_name(htable, op, mval) + 4.15. sht_match_str_value(htable, op, mval) + 4.16. sht_has_str_value(htable, op, mval) 5. Exported pseudo-variables 6. RPC Commands @@ -168,7 +170,9 @@ Chapter 1. Admin Guide 4.11. sht_iterator_end(iname) 4.12. sht_iterator_next(iname) 4.13. sht_match_name(htable, op, mval) - 4.14. sht_match_str_value(htable, op, mval) + 4.14. sht_has_name(htable, op, mval) + 4.15. sht_match_str_value(htable, op, mval) + 4.16. sht_has_str_value(htable, op, mval) 5. Exported pseudo-variables 6. RPC Commands @@ -707,7 +711,9 @@ modparam("htable", "event_callback_mode", 1) 4.11. sht_iterator_end(iname) 4.12. sht_iterator_next(iname) 4.13. sht_match_name(htable, op, mval) - 4.14. sht_match_str_value(htable, op, mval) + 4.14. sht_has_name(htable, op, mval) + 4.15. sht_match_str_value(htable, op, mval) + 4.16. sht_has_str_value(htable, op, mval) 4.1. sht_print() @@ -919,7 +925,11 @@ if(sht_match_name("ha", "eq", "alice")) { } ... -4.14. sht_match_str_value(htable, op, mval) +4.14. sht_has_name(htable, op, mval) + + Alias for sht_match_name(). + +4.15. sht_match_str_value(htable, op, mval) Return greater than 0 (true) if the htable has an item that matches the string value against the mval parameter. @@ -941,6 +951,10 @@ if(sht_match_str_value("ha", "eq", "alice")) { } ... +4.16. sht_has_str_value(htable, op, mval) + + Alias for sht_match_str_value(). + 5. Exported pseudo-variables * $sht(htable=>key)

1 0

git:master:6d84ede1: htable: added alias function sht_has_name() and sht_has_str_value()
by Daniel-Constantin Mierla 08 Aug '19

08 Aug '19

Module: kamailio Branch: master Commit: 6d84ede1c54cfa138733e74d40f1c9a0cac4dfc2 URL: https://github.com/kamailio/kamailio/commit/6d84ede1c54cfa138733e74d40f1c9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-08T16:29:01+02:00 htable: added alias function sht_has_name() and sht_has_str_value() - corresponding to the match functions, following a rename that broke compatibility with last stable version --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/6d84ede1c54cfa138733e74d40f1c9a… Patch: https://github.com/kamailio/kamailio/commit/6d84ede1c54cfa138733e74d40f1c9a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 0fea3cb796..7f03a5925b 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -122,8 +122,12 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"sht_match_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, 0, ANY_ROUTE}, + {"sht_has_name", (cmd_function)w_ht_match_name, 3, fixup_spve_all, 0, + ANY_ROUTE}, {"sht_match_str_value", (cmd_function)w_ht_match_str_value, 3, fixup_spve_all, 0, ANY_ROUTE}, + {"sht_has_str_value", (cmd_function)w_ht_match_str_value, 3, fixup_spve_all, 0, + ANY_ROUTE}, {"sht_lock", (cmd_function)w_ht_slot_lock, 1, fixup_ht_key, 0, ANY_ROUTE}, {"sht_unlock", (cmd_function)w_ht_slot_unlock, 1, fixup_ht_key, 0,

1 0

git:master:737e21fe: htable: docs updated with sth_has_name() and sht_has_str_value()
by Daniel-Constantin Mierla 08 Aug '19

08 Aug '19

Module: kamailio Branch: master Commit: 737e21fe03130476aea617449f8dc8f4e428d866 URL: https://github.com/kamailio/kamailio/commit/737e21fe03130476aea617449f8dc8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-08T16:35:52+02:00 htable: docs updated with sth_has_name() and sht_has_str_value() --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/737e21fe03130476aea617449f8dc8f… Patch: https://github.com/kamailio/kamailio/commit/737e21fe03130476aea617449f8dc8f… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 2d0d7a1f58..154f1f0c5a 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1132,6 +1132,14 @@ if(sht_match_name("ha", "eq", "alice")) { </programlisting> </example> </section> + <section id="htable.f.sht_has_name"> + <title> + <function moreinfo="none">sht_has_name(htable, op, mval)</function> + </title> + <para> + Alias for sht_match_name(). + </para> + </section> <section id="htable.f.sht_match_str_value"> <title> <function moreinfo="none">sht_match_str_value(htable, op, mval)</function> @@ -1186,6 +1194,14 @@ if(sht_match_str_value("ha", "eq", "alice")) { </programlisting> </example> </section> + <section id="htable.f.sht_has_str_value"> + <title> + <function moreinfo="none">sht_has_str_value(htable, op, mval)</function> + </title> + <para> + Alias for sht_match_str_value(). + </para> + </section> </section> <section> <title>Exported pseudo-variables</title>

1 0

git:master:10f116e7: dialog: export dlg_bridge() to kemi framework
by Daniel-Constantin Mierla 08 Aug '19

08 Aug '19

Module: kamailio Branch: master Commit: 10f116e726533f91467d90a38101d5b16a5801a5 URL: https://github.com/kamailio/kamailio/commit/10f116e726533f91467d90a38101d5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-08T16:16:40+02:00 dialog: export dlg_bridge() to kemi framework --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/10f116e726533f91467d90a38101d5b… Patch: https://github.com/kamailio/kamailio/commit/10f116e726533f91467d90a38101d5b… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5df35de40a..8f5a186e40 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1211,6 +1211,14 @@ static int w_dlg_bridge(struct sip_msg *msg, char *from, char *to, char *op) return 1; } +static int ki_dlg_bridge(sip_msg_t *msg, str *sfrom, str *sto, str *soproxy) +{ + if(dlg_bridge(sfrom, sto, soproxy, NULL)!=0) + return -1; + return 1; + +} + /** * */ @@ -2101,6 +2109,11 @@ 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("dlg_bridge"), + SR_KEMIP_INT, ki_dlg_bridge, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + 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] Radius misc MAX_EXTRA (#2025)
by alexey-khabulyak 06 Aug '19

06 Aug '19

Radius extra parameter are limited by MAX_EXTRA (only 4) Can u make it configurable by kamailio.conf or incrase? https://github.com/kamailio/kamailio/blob/master/src/modules/misc_radius/ex… -- 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/2025

3 5

git:master:df93a638: auth_radius: increase MAX_EXTRA from 4 to 8
by Daniel-Constantin Mierla 06 Aug '19

06 Aug '19

Module: kamailio Branch: master Commit: df93a638040f4c1aa4d6ed3799d6f990b0593f94 URL: https://github.com/kamailio/kamailio/commit/df93a638040f4c1aa4d6ed3799d6f99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-06T21:37:04+02:00 auth_radius: increase MAX_EXTRA from 4 to 8 - GH #2025 --- Modified: src/modules/auth_radius/extra.h --- Diff: https://github.com/kamailio/kamailio/commit/df93a638040f4c1aa4d6ed3799d6f99… Patch: https://github.com/kamailio/kamailio/commit/df93a638040f4c1aa4d6ed3799d6f99… --- diff --git a/src/modules/auth_radius/extra.h b/src/modules/auth_radius/extra.h index 0ec7fbed37..075601b81f 100644 --- a/src/modules/auth_radius/extra.h +++ b/src/modules/auth_radius/extra.h @@ -36,7 +36,7 @@ struct extra_attr struct extra_attr *next; }; -#define MAX_EXTRA 4 +#define MAX_EXTRA 32 void init_extra_engine(void);

1 0

git:master:4c537a61: misc_radius: increase MAX_EXTRA from 4 to 8
by Daniel-Constantin Mierla 06 Aug '19

06 Aug '19

Module: kamailio Branch: master Commit: 4c537a618949eb48ffed9297f3abc8cdc879b70d URL: https://github.com/kamailio/kamailio/commit/4c537a618949eb48ffed9297f3abc8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-06T21:37:56+02:00 misc_radius: increase MAX_EXTRA from 4 to 8 - GH #2025 --- Modified: src/modules/misc_radius/extra.h --- Diff: https://github.com/kamailio/kamailio/commit/4c537a618949eb48ffed9297f3abc8c… Patch: https://github.com/kamailio/kamailio/commit/4c537a618949eb48ffed9297f3abc8c… --- diff --git a/src/modules/misc_radius/extra.h b/src/modules/misc_radius/extra.h index c523df55a0..bb302fcce8 100644 --- a/src/modules/misc_radius/extra.h +++ b/src/modules/misc_radius/extra.h @@ -36,7 +36,7 @@ struct extra_attr struct extra_attr *next; }; -#define MAX_EXTRA 4 +#define MAX_EXTRA 32 void init_extra_engine(void);

1 0

[kamailio/kamailio] core: added example simple routing blocks/basic config for KEMI ruby (#2026)
by Whitey 06 Aug '19

06 Aug '19

Added new example config for KEMI ruby. Tested and functional with basic kamailio.cfg   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Another KEMI config for a supported language (app_ruby) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2026 -- Commit Summary -- * core: added example simple routing blocks/basic config for KEMI ruby -- File Changes -- A misc/examples/kemi/kamailio-basic-kemi-ruby.rb (295) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2026.patch https://github.com/kamailio/kamailio/pull/2026.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/2026

2 2

git:master:f07949b2: misc: added example simple routing blocks/basic config for KEMI ruby (GH #2026)
by Henning Westerholt 06 Aug '19

06 Aug '19

Module: kamailio Branch: master Commit: f07949b2e399ba5b0de20540d786e003675bcc15 URL: https://github.com/kamailio/kamailio/commit/f07949b2e399ba5b0de20540d786e00… Author: Andrew White <github(a)and.rew.ninja> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-06T21:26:47+02:00 misc: added example simple routing blocks/basic config for KEMI ruby (GH #2026) --- Added: misc/examples/kemi/kamailio-basic-kemi-ruby.rb --- Diff: https://github.com/kamailio/kamailio/commit/f07949b2e399ba5b0de20540d786e00… Patch: https://github.com/kamailio/kamailio/commit/f07949b2e399ba5b0de20540d786e00…

1 0

git:master:d762848d: app_python3: Makefile - get all ldflags for linking
by Daniel-Constantin Mierla 06 Aug '19

06 Aug '19

Module: kamailio Branch: master Commit: d762848d4f71014a6c6b6693b44403324a8edd15 URL: https://github.com/kamailio/kamailio/commit/d762848d4f71014a6c6b6693b444033… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-06T17:33:41+02:00 app_python3: Makefile - get all ldflags for linking --- Modified: src/modules/app_python3/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d762848d4f71014a6c6b6693b444033… Patch: https://github.com/kamailio/kamailio/commit/d762848d4f71014a6c6b6693b444033… --- diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile index b8e65cbef9..1c9ff1c6b6 100644 --- a/src/modules/app_python3/Makefile +++ b/src/modules/app_python3/Makefile @@ -16,7 +16,7 @@ PYTHON3_LIBDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils PYTHON3_LDFLAGS=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LINKFORSHARED'))"} PYTHON3_INCDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_python_inc())"} -LIBS=${shell ${PYTHON3}-config --libs} +LIBS=${shell ${PYTHON3}-config --ldflags} ifeq ($(OS), freebsd) LIBS+=-pthread

1 0

git:master:3f6e25ec: app_ruby: proper push of int values to Ruby for xval function return
by Daniel-Constantin Mierla 06 Aug '19

06 Aug '19

Module: kamailio Branch: master Commit: 3f6e25ecb0ac64f8c0d534e4390d43afc49d5ae0 URL: https://github.com/kamailio/kamailio/commit/3f6e25ecb0ac64f8c0d534e4390d43a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-06T16:44:25+02:00 app_ruby: proper push of int values to Ruby for xval function return --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3f6e25ecb0ac64f8c0d534e4390d43a… Patch: https://github.com/kamailio/kamailio/commit/3f6e25ecb0ac64f8c0d534e4390d43a… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 8a4679d775..dcc645d13c 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -236,7 +236,7 @@ int ruby_sr_initialized(void) */ int sr_kemi_ruby_return_int(sr_kemi_t *ket, int rc) { - if(ket->rtype==SR_KEMIP_INT) { + if(ket->rtype==SR_KEMIP_INT || ket->rtype==SR_KEMIP_XVAL) { return INT2NUM(rc); } if(ket->rtype==SR_KEMIP_BOOL && rc!=SR_KEMI_FALSE) { @@ -426,7 +426,7 @@ VALUE sr_kemi_ruby_return_xval(sr_kemi_t *ket, sr_kemi_xval_t *rx) case SR_KEMIP_NONE: return Qnil; case SR_KEMIP_INT: - return sr_kemi_ruby_return_int(ket, rx->v.n); + return INT2NUM(rx->v.n); case SR_KEMIP_STR: return rb_str_new(rx->v.s.s, rx->v.s.len); case SR_KEMIP_BOOL:

1 0

Re: [sr-dev] [SR-Users] The domain module in 5.1.8 has a memory leak
by Henning Westerholt 06 Aug '19

06 Aug '19

Hi Mack, did you managed to test it as well? Cheers, Henning Am 04.08.19 um 21:18 schrieb Mack Hendricks: Hey Henning, Thanks for the fast response. I will try it later tonight and let you know. On Aug 4, 2019, at 3:16 PM, Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hi Mack, looks indeed like an issue. Can you try with git master commit f50177003c21f. If your test is also ok, I will backport to stable branch Cheers, Henning Am 04.08.19 um 19:49 schrieb Mack Hendricks: Based on my tests, the memory leak is only exposed when you are using domain attributes, which are stored in the domain_attrs table. I wanted to see if anymore else is running into this issue. Reproducible use case: 1) Insert the following into the database insert into domain values (null,"aprilco.com<http://aprilco.com/>","aprilco.com<http://aprilco.com/>",now()); insert into domain_attrs values (null,"aprilco.com<http://aprilco.com/>","pbx_type",0,"0",now()); insert into domain_attrs values (null,"aprilco.com<http://aprilco.com/>","pbx_id",0,"65",now()); 2) Open a new terminal window and execute: watch "kamcmd core.shmmem" 3) Open up another terminal windows and execute: while true; do kamcmd domain.reload; done Expected Results: You will see the shared memory being allocated, but never freed. The more entries you have in the domain_attrs table, the faster it will run out of memory. Thanks, Mack Hendricks / Head of Support / dOpenSource web: http://dopensource.com<http://dopensource.com/> support: +888-907-2085 dSIPRouter<http://dsiprouter.org/> - GUI focused on implementing Kamailio to provide SIP Trunking and PBX Hosting Services _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

1 0

mysql related warning when building 5.2 on Debian Buster
by Juha Heinanen 06 Aug '19

06 Aug '19

I got this warning when building 5.2 on Debian Buster: CC (gcc) [M db_mysql.so] km_dbase.o In file included from km_dbase.c:38: /usr/include/mariadb/mysql_version.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp] #warning This file should not be included by clients, include only <mysql.h> ^~~~~~~ -- Juha

2 4

git:5.2:9db6d9cc: db_mysql: remove build warning, unneeded include (#1777)
by Henning Westerholt 06 Aug '19

06 Aug '19

Module: kamailio Branch: 5.2 Commit: 9db6d9cc7751684981c2b602b3bd6021edc3a7fb URL: https://github.com/kamailio/kamailio/commit/9db6d9cc7751684981c2b602b3bd602… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-06T09:48:52+02:00 db_mysql: remove build warning, unneeded include (#1777) db_mysql: mysql_version.h is already included at mysql.h (GH #1777) > In file included from km_dbase.c:38: > /usr/include/mariadb/mysql_version.h:3:2: warning: This file should not be included by clients, include only <mysql.h> [-W#warnings] > #warning This file should not be included by clients, include only <mysql.h> (cherry picked from commit 57263490bd1dedbb4b7fdad6046880980feea040) --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/9db6d9cc7751684981c2b602b3bd602… Patch: https://github.com/kamailio/kamailio/commit/9db6d9cc7751684981c2b602b3bd602… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index ad02746c67..581e4e14be 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -35,7 +35,6 @@ #include <string.h> #include <mysql.h> #include <errmsg.h> -#include <mysql_version.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h"

1 0

git:5.1:a40d65a8: db_mysql: remove build warning, unneeded include (#1777)
by Henning Westerholt 06 Aug '19

06 Aug '19

Module: kamailio Branch: 5.1 Commit: a40d65a8ae22d900118f92e3010e383825db9ebd URL: https://github.com/kamailio/kamailio/commit/a40d65a8ae22d900118f92e3010e383… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-06T09:48:58+02:00 db_mysql: remove build warning, unneeded include (#1777) db_mysql: mysql_version.h is already included at mysql.h (GH #1777) > In file included from km_dbase.c:38: > /usr/include/mariadb/mysql_version.h:3:2: warning: This file should not be included by clients, include only <mysql.h> [-W#warnings] > #warning This file should not be included by clients, include only <mysql.h> (cherry picked from commit 57263490bd1dedbb4b7fdad6046880980feea040) --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a40d65a8ae22d900118f92e3010e383… Patch: https://github.com/kamailio/kamailio/commit/a40d65a8ae22d900118f92e3010e383… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index aa960f4963..850dd89d9c 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -35,7 +35,6 @@ #include <string.h> #include <mysql.h> #include <errmsg.h> -#include <mysql_version.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/async_task.h"

1 0

git:master:36ef1bf7: corex: fix parser for alias_subdomain modparam, extend debugging output
by Henning Westerholt 06 Aug '19

06 Aug '19

Module: kamailio Branch: master Commit: 36ef1bf77f9df7bc5022c1dc350e54df2d168cf3 URL: https://github.com/kamailio/kamailio/commit/36ef1bf77f9df7bc5022c1dc350e54d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-06T09:44:38+02:00 corex: fix parser for alias_subdomain modparam, extend debugging output - fix parser for alias_subdomain modparam, it was not working correctly for all proto:hostname:port combinations (e.g. hostname/proto mixed up) - extend debugging output for alias adding and also alias matching --- Modified: src/modules/corex/corex_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/36ef1bf77f9df7bc5022c1dc350e54d… Patch: https://github.com/kamailio/kamailio/commit/36ef1bf77f9df7bc5022c1dc350e54d… --- diff --git a/src/modules/corex/corex_lib.c b/src/modules/corex/corex_lib.c index 377654158d..ec5334cb2e 100644 --- a/src/modules/corex/corex_lib.c +++ b/src/modules/corex/corex_lib.c @@ -114,6 +114,7 @@ int corex_add_alias_subdomains(char* aliasval) corex_alias_t ta; corex_alias_t *na; + LM_DBG("try to add alias: %s\n", aliasval); memset(&ta, 0, sizeof(corex_alias_t)); p = strchr(aliasval, ':'); @@ -134,27 +135,38 @@ int corex_add_alias_subdomains(char* aliasval) } else if((p-aliasval)==4 && strncasecmp(aliasval, "sctp", 4)==0) { ta.proto = PROTO_SCTP; } else { - /* use hostname */ - ta.alias.s = aliasval; - ta.alias.len = p - aliasval; + /* invalid protocol */ + LM_ERR("invalid protocol %.*s", (int) (p-aliasval), aliasval); + goto error; } - } - if(ta.alias.len==0) { + /* hostname */ p++; - if(p>=aliasval+strlen(aliasval)) + ta.alias.s = aliasval + (p-aliasval); + + if(p>=aliasval+strlen(aliasval)) { goto error; - ta.alias.s = p; + } + /* port */ p = strchr(ta.alias.s, ':'); if(p==NULL) { ta.alias.len = strlen(ta.alias.s); goto done; } + ta.alias.len = p - ta.alias.s; + p++; + ta.port = str2s(p, strlen(p), NULL); + + } else { + /* hostname */ + ta.alias.s = aliasval; + ta.alias.len = p - ta.alias.s; + /* port */ + p++; + if(p>=aliasval+strlen(aliasval)) { + goto error; + } + ta.port = str2s(p, strlen(p), NULL); } - /* port */ - p++; - if(p>=aliasval+strlen(aliasval)) - goto error; - ta.port = str2s(p, strlen(p), NULL); done: if(ta.alias.len==0) @@ -169,6 +181,8 @@ int corex_add_alias_subdomains(char* aliasval) na->next = _corex_alias_list; _corex_alias_list = na; + LM_DBG("alias: %d:%.*s:%d from value: %s added\n", ta.proto, + ta.alias.len, ta.alias.s, ta.port, aliasval); return 0; error: @@ -181,6 +195,8 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) { corex_alias_t *ta; + LM_DBG("check self for: %d:%.*s:%d\n", (int) proto, host->len, + host->s, (int)port); for(ta=_corex_alias_list; ta; ta=ta->next) { if(host->len<ta->alias.len) continue; @@ -191,21 +207,22 @@ int corex_check_self(str* host, unsigned short port, unsigned short proto) if(host->len==ta->alias.len && strncasecmp(host->s, ta->alias.s, host->len)==0) { /* match domain */ - LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self domain match: %d:%.*s:%d\n", (int)ta->proto, + ta->alias.len, ta->alias.s, (int)ta->port); return 1; } if(strncasecmp(ta->alias.s, host->s + host->len - ta->alias.len, ta->alias.len)==0) { if(host->s[host->len - ta->alias.len - 1]=='.') { /* match sub-domain */ - LM_DBG("check self sub-domain match: %d:%.*s:%d\n", (int)ta->port, - ta->alias.len, ta->alias.s, (int)ta->proto); + LM_DBG("check self sub-domain match: %d:%.*s:%d\n", + (int)ta->proto, ta->alias.len, ta->alias.s, + (int)ta->port); return 1; } } } - + LM_DBG("no match found\n"); return 0; /* no match */ }

1 0

git:master:b2814a12: modules: readme files regenerated - app_ruby ... [skip ci]
by Kamailio Dev 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: b2814a12119c4419dfea8fae68cbec73bf788eb1 URL: https://github.com/kamailio/kamailio/commit/b2814a12119c4419dfea8fae68cbec7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-05T18:31:42+02:00 modules: readme files regenerated - app_ruby ... [skip ci] --- Modified: src/modules/app_ruby/README --- Diff: https://github.com/kamailio/kamailio/commit/b2814a12119c4419dfea8fae68cbec7… Patch: https://github.com/kamailio/kamailio/commit/b2814a12119c4419dfea8fae68cbec7… --- diff --git a/src/modules/app_ruby/README b/src/modules/app_ruby/README index 56b7731e4a..cf1ba153b0 100644 --- a/src/modules/app_ruby/README +++ b/src/modules/app_ruby/README @@ -34,7 +34,7 @@ Daniel-Constantin Mierla 5. RPC Commands 5.1. app_ruby.reload - 5.2. ruby_jsdt.api_list + 5.2. app_ruby.api_list 6. Example of usage @@ -64,7 +64,7 @@ Chapter 1. Admin Guide 5. RPC Commands 5.1. app_ruby.reload - 5.2. ruby_jsdt.api_list + 5.2. app_ruby.api_list 6. Example of usage @@ -140,7 +140,7 @@ ruby_run("rb_funcx", "$rU", "2"); 5. RPC Commands 5.1. app_ruby.reload - 5.2. ruby_jsdt.api_list + 5.2. app_ruby.api_list 5.1. app_ruby.reload @@ -157,11 +157,11 @@ ruby_run("rb_funcx", "$rU", "2"); kamcmd app_ruby.reload ... -5.2. ruby_jsdt.api_list +5.2. app_ruby.api_list List the functions available via Kemi framework. - Name: ruby_jsdt.api_list + Name: app_ruby.api_list Parameters: none

1 0

git:master:5773fba2: app_ruby: docs - fix rpc command name for listing the api
by Daniel-Constantin Mierla 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: 5773fba2765c8a08be7016e82a6ec02579b49215 URL: https://github.com/kamailio/kamailio/commit/5773fba2765c8a08be7016e82a6ec02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-05T18:29:42+02:00 app_ruby: docs - fix rpc command name for listing the api --- Modified: src/modules/app_ruby/doc/app_ruby_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5773fba2765c8a08be7016e82a6ec02… Patch: https://github.com/kamailio/kamailio/commit/5773fba2765c8a08be7016e82a6ec02… --- diff --git a/src/modules/app_ruby/doc/app_ruby_admin.xml b/src/modules/app_ruby/doc/app_ruby_admin.xml index 8a2c311bc2..d69d4d880a 100644 --- a/src/modules/app_ruby/doc/app_ruby_admin.xml +++ b/src/modules/app_ruby/doc/app_ruby_admin.xml @@ -143,13 +143,13 @@ ruby_run("rb_funcx", "$rU", "2"); </section> <section id="app_ruby.r.api_list"> <title> - <function moreinfo="none">ruby_jsdt.api_list</function> + <function moreinfo="none">app_ruby.api_list</function> </title> <para> List the functions available via Kemi framework. </para> <para> - Name: <emphasis>ruby_jsdt.api_list</emphasis> + Name: <emphasis>app_ruby.api_list</emphasis> </para> <para>Parameters: <emphasis>none</emphasis></para> <para>

1 0

git:master:ea526a8d: app_ruby: print pointers in error log message
by Daniel-Constantin Mierla 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: ea526a8de9c961a57858ecc4c47ce4ba24e03908 URL: https://github.com/kamailio/kamailio/commit/ea526a8de9c961a57858ecc4c47ce4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-05T18:11:00+02:00 app_ruby: print pointers in error log message --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/ea526a8de9c961a57858ecc4c47ce4b… Patch: https://github.com/kamailio/kamailio/commit/ea526a8de9c961a57858ecc4c47ce4b… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index a346ceeb2f..8a4679d775 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -462,7 +462,8 @@ VALUE sr_kemi_ruby_exec_func_ex(ksr_ruby_context_t *R, sr_kemi_t *ket, int argc, env_R = app_ruby_sr_env_get(); if(env_R==NULL || env_R->msg==NULL || ket==NULL) { - LM_ERR("invalid ruby environment attributes or parameters\n"); + LM_ERR("invalid ruby environment attributes or parameters (%p/%p/%p)\n", + env_R, env_R->msg, ket); return Qfalse; }

1 0

git:master:7a4c490a: uac: debug messages when restoring from/to headers
by Daniel-Constantin Mierla 05 Aug '19

05 Aug '19

Module: kamailio Branch: master Commit: 7a4c490a63cd3fa924b6921fcd20ba77a6d661fb URL: https://github.com/kamailio/kamailio/commit/7a4c490a63cd3fa924b6921fcd20ba7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-05T18:04:08+02:00 uac: debug messages when restoring from/to headers --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/7a4c490a63cd3fa924b6921fcd20ba7… Patch: https://github.com/kamailio/kamailio/commit/7a4c490a63cd3fa924b6921fcd20ba7… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 6231b5a7ae..8da8fc7441 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -622,6 +622,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, } old_body = (struct to_body*) msg->to->parsed; flag = FL_USE_UAC_TO; + LM_DBG("replacing in To header\n"); } else { /* replace the FROM URI */ if ( parse_from_header(msg)<0 ) { @@ -630,6 +631,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, } old_body = (struct to_body*) msg->from->parsed; flag = FL_USE_UAC_FROM; + LM_DBG("replacing in From header\n"); } if(restore_avp->s) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev