- sr-dev - kamailio.org

git:master:94068d2e: dmq: skip removing local node via rpc command
by Daniel-Constantin Mierla 22 Apr '21

22 Apr '21

Module: kamailio Branch: master Commit: 94068d2e40eb867a5d6da44868d5edb52949f817 URL: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T08:36:11+02:00 dmq: skip removing local node via rpc command --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Patch: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 631dce11d5..4300f80b54 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -328,9 +328,12 @@ void pkg_free_node(dmq_node_t *node) } /** - * @brief delete dmq node + * @brief delete dmq node with filter rules + * - list - the list of nodes + * - node - the structure with characteristics of the node to be deleted + * - filter - if 0: delete node always; if 1: delete node if not local */ -int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +int dmq_node_del_filter(dmq_node_list_t *list, dmq_node_t *node, int filter) { dmq_node_t *cur, **prev; lock_get(&list->lock); @@ -338,8 +341,10 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) prev = &list->nodes; while(cur) { if(cmp_dmq_node(cur, node)) { - *prev = cur->next; - destroy_dmq_node(cur, 1); + if(filter==0 || cur->local==0) { + *prev = cur->next; + destroy_dmq_node(cur, 1); + } lock_release(&list->lock); return 1; } @@ -350,6 +355,14 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node + */ +int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +{ + return dmq_node_del_filter(list, node, 0); +} + /** * @brief delete dmq node by uri */ @@ -363,7 +376,7 @@ int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) return -1; } - return del_dmq_node(list, &dnode); + return dmq_node_del_filter(list, &dnode, 1); } /**

1 0

git:master:0fa5455d: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 0fa5455d9bc1d603c142cd9a767df5b248eba64a URL: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T19:31:12+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Patch: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 78196f8ce1..1e7d6ff375 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -56,6 +56,7 @@ Charles Chance 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 2. Developer Guide @@ -87,6 +88,7 @@ Charles Chance 1.14. dmq_t_replicate usage 1.15. dmq_is_from_node usage 1.16. dmq.list_nodes usage + 1.17. dmq.remove usage 2.1. dmq_api_t structure 2.2. register_dmq_peer usage 2.3. bcast_message usage @@ -125,6 +127,7 @@ Chapter 1. Admin Guide 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 1. Overview @@ -464,6 +467,7 @@ ext/plain"); 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 5.1. dmq.list_nodes @@ -474,6 +478,18 @@ ext/plain"); kamcmd dmq.list_nodes ... +5.2. dmq.remove + + Remove a DMQ node by address. + + Parameters: + * address - the SIP address of the DMQ node to remove. + + Example 1.17. dmq.remove usage +... +kamctl rpc dmq.remove sip:1.2.3.4:5060 +... + Chapter 2. Developer Guide Table of Contents

1 0

Branching 5.5 on git repo for 5.5.x releases
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Hello, since freezing the development for 5.5 series, I did quite a lot of code analyzing with a bunch of tools as well as run various tests, no major issue being in my list at this moment, therefore I think we can plan branching 5.5 on git repo in the near future. If there is no other suggestion or argument against it, I propose to create the branch 5.5 on Thursday next week (April 22, 2021). After that, master branch will be open for new features (to become part of 5.6 or what ever version will be decided to be next), testing will continue for branch 5.5 for another 1-2 weeks, then we will release 5.5.0 as first stable version in the 5.5.x series. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:955152db: dmq: added dmq.remove rpc command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 955152dbe5d1f05bf24d6ba23b091fe91a202cc3 URL: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:09:21+02:00 dmq: added dmq.remove rpc command - make it possible to remove a node that still is reachable by old address without having to shut dowm all nodes --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h --- Diff: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Patch: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index fea60e0cc4..1db7cdd1f4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -430,8 +430,29 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) static const char *dmq_rpc_list_nodes_doc[2] = {"Print all nodes", 0}; +void rpc_dmq_remove(rpc_t* rpc, void* ctx) +{ + str taddr = STR_NULL; + + if (rpc->scan(ctx, ".S", &taddr) < 1) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(dmq_node_del_by_uri(dmq_node_list, &taddr)<0) { + rpc->fault(ctx, 500, "Failure"); + return; + } +} + +static const char* rpc_dmq_remove_doc[3] = { + "Remove a DMQ node", + "address - the DMQ node address", + 0 +}; + static rpc_export_t rpc_methods[] = { {"dmq.list_nodes", dmq_rpc_list_nodes, dmq_rpc_list_nodes_doc, RET_ARRAY}, + {"dmq.remove", rpc_dmq_remove, rpc_dmq_remove_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 7e6ef93bdf..631dce11d5 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -350,6 +350,22 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node by uri + */ +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) +{ + dmq_node_t dnode; + + memset(&dnode, 0, sizeof(dmq_node_t)); + if(parse_uri(suri->s, suri->len, &dnode.uri) < 0) { + LM_ERR("error parsing uri [%.*s]\n", suri->len, suri->s); + return -1; + } + + return del_dmq_node(list, &dnode); +} + /** * @brief add dmq node */ diff --git a/src/modules/dmq/dmqnode.h b/src/modules/dmq/dmqnode.h index 45cac604a4..22c5c6fb1d 100644 --- a/src/modules/dmq/dmqnode.h +++ b/src/modules/dmq/dmqnode.h @@ -69,6 +69,7 @@ dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node); dmq_node_t *find_dmq_node_uri(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node_uri2(str *uri); int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node); +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri); int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode); int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status); dmq_node_t *shm_dup_node(dmq_node_t *node);

1 0

git:master:adf8919f: dmq: docs for rpc dmq.remove command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: adf8919f52841800f0cd4528c33679c7ef80f2c5 URL: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:16:21+02:00 dmq: docs for rpc dmq.remove command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Patch: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0e749e901e..ebc6f44e1a 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -518,6 +518,30 @@ modparam("dmq", "ping_interval", 90) <programlisting format="linespecific"> ... &kamcmd; dmq.list_nodes +... + </programlisting> + </example> + </section> + <section id="dmq.r.list_nodes"> + <title>dmq.remove</title> + <para> + Remove a DMQ node by address. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>address</emphasis> - the SIP address + of the DMQ node to remove. + </para> + </listitem> + </itemizedlist> + + <example> + <title>dmq.remove usage</title> + <programlisting format="linespecific"> +... +&kamctl; rpc dmq.remove sip:1.2.3.4:5060 ... </programlisting> </example>

1 0

Crashes because of mixed shm and pkg in kamailio
by Rick Barenthin 21 Apr '21

21 Apr '21

Hi everyone, We have seen some crashes in kamailio version 5.3 which happens in some modules who are getting the request for a reply from the transaction by the tm module export and try to parse extra header in this request by the parser functions. This seems to create a mix of shm with pkg which lead to a crash in retransmission. My question is, is there a way to make sure that there is no mix of shm and pkg or is the parsing on the message from the transaction not a planned way of usage? Best regards Rick

3 2

git:master:1b956d74: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 1b956d74b25c9f80f01a6aa0bc7a6ff8f3d0f712 URL: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T11:31:26+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Patch: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff…

1 0

git:master:17e757c9: dmq: docs for server_socket address
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 17e757c91e6e96f6711d9251979d81a792aaef08 URL: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:55:18+02:00 dmq: docs for server_socket address --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Patch: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 20a2e647b3..0e749e901e 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -121,7 +121,12 @@ sip:192.168.40.17:5060;status=active <section id="dmq.p.server_address"> <title><varname>server_address</varname>(str)</title> <para> - The local server address. This is the interface over which the DMQ engine will send/receive messages. + The local server address. This is the addres with which the local DMQ + node joins the servers group to send/receive messages. + </para> + <para> + Note: if server_socket is not set, then this address has to match a + local socket, which will be used to send/receive messages. </para> <para> <emphasis>Default value is <quote>NULL</quote>.</emphasis> @@ -134,6 +139,28 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") ... +</programlisting> + </example> + </section> + <section id="dmq.p.server_socket"> + <title><varname>server_socket</varname>(str)</title> + <para> + The local listen address. This is the interface over which the DMQ + engine will send/receive messages. + </para> + <para> + Note: if this parameter is not set, the socket to send/receice + messages is built from server_address parameter. + </para> + <para> + <emphasis>Default value is <quote>NULL</quote>.</emphasis> + </para> + <example> + <title>Set <varname>server_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq", "server_socket", "udp:10.0.0.20:5060") +... </programlisting> </example> </section>

1 0

git:master:a9a8bb31: dmq: exposed the server socket to modparam list
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: a9a8bb31ed8f3d08579fc1d8b4e3b598c77c93be URL: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:49:39+02:00 dmq: exposed the server socket to modparam list --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Patch: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 27e950e472..fea60e0cc4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -118,6 +118,7 @@ static param_export_t params[] = { {"num_workers", INT_PARAM, &dmq_num_workers}, {"ping_interval", INT_PARAM, &dmq_ping_interval}, {"server_address", PARAM_STR, &dmq_server_address}, + {"server_socket", PARAM_STR, &dmq_server_socket}, {"notification_address", PARAM_STR|USE_FUNC_PARAM, dmq_add_notification_address}, {"notification_channel", PARAM_STR, &dmq_notification_channel}, {"multi_notify", INT_PARAM, &dmq_multi_notify}, @@ -229,10 +230,12 @@ static int mod_init(void) return -1; } - /* create socket string out of the server_uri */ - if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { - LM_ERR("failed to create socket out of server_uri\n"); - return -1; + if(dmq_server_socket.s==NULL || dmq_server_socket.len<=0) { + /* create socket string out of the server_uri */ + if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { + LM_ERR("failed to create socket out of server_uri\n"); + return -1; + } } if(lookup_local_socket(&dmq_server_socket) == NULL) { LM_ERR("server_uri is not a socket the proxy is listening on\n"); @@ -354,9 +357,6 @@ static void destroy(void) dmq_self_node->status = DMQ_NODE_DISABLED; request_nodelist(dmq_notification_node, 1); } - if(dmq_server_socket.s) { - pkg_free(dmq_server_socket.s); - } if(dmq_init_callback_done) { shm_free(dmq_init_callback_done); }

1 0

[kamailio/kamailio] export functions of ims_charging and ims_diameter_server to kemi (#2704)
by Riccardo-78 20 Apr '21

20 Apr '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  export functions of ims_charging and ims_diameter_server to kemi You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2704 -- Commit Summary -- * Merge pull request #1 from kamailio/master * ims_charging: export functions to kemi * ims_diameter_server: export functions to kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (27) M src/modules/ims_diameter_server/ims_diameter_server.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2704.patch https://github.com/kamailio/kamailio/pull/2704.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/2704

2 5

git:master:4436fb7d: ims_charging: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 4436fb7dc6bf868f30e9c7bcfd1ad57e49d6be0d URL: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_charging: export functions to kemi --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Patch: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57…

1 0

git:master:1ddc27f1: ims_diameter_server: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 1ddc27f199061025a6a43da3e8a1388fcaddfe19 URL: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_diameter_server: export functions to kemi --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Patch: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388…

1 0

[kamailio/kamailio] smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() (#2702)
by alexyosifov 20 Apr '21

20 Apr '21

- Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags.   #### 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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2702 -- Commit Summary -- * smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() -- File Changes -- M src/modules/smsops/smsops_impl.c (343) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2702.patch https://github.com/kamailio/kamailio/pull/2702.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/2702

2 3

git:master:e2b8bdda: smsops: Imrovements in decode_3gpp_sms() and pv_sms_body()
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: e2b8bddad08f12f7eb48db199fad6ed184c58bac URL: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:38:51+02:00 smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() - Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Patch: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed…

1 0

[kamailio/kamailio] pkg/kamailio/obs: used more recent gcc for RHEL and CentOS dists (#2711)
by sergey-safarov 20 Apr '21

20 Apr '21

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description PR upgraded GCC for RPM packaging. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2711 -- Commit Summary -- * pkg/kamailio/obs: used more recent gcc for RHEL and CentOS dists -- File Changes -- M pkg/kamailio/obs/kamailio.spec (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2711.patch https://github.com/kamailio/kamailio/pull/2711.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/2711

3 9

[kamailio/kamailio] rtpengine: session refresh, do not try use other rtpengine node on rtpengine node failure (#2713)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description I want to use Session timers to refresh SDP on RTPengine node failure. If call RTP streams established via first RTPengine node, and then this RTPengine node is stopped, then rtpengine Kamailio module do not try to use other RTPengine nodes. ### Troubleshooting #### Reproduction Update /etc/kamailio/kamailio.cfg using patch like ```diff diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..1a6788f79f 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,4 +1,7 @@ #!KAMAILIO +#!define WITH_DEBUG +#!define WITH_NAT +#!define WITH_RTPENGINE # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org @@ -195,6 +198,8 @@ children=8 * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 +listen=tcp:3.236.25.6:5060 +listen=tcp:[2600:1f18:578:5700::6]:5060 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ @@ -456,7 +461,7 @@ modparam("presence_xml", "force_active", 1) #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- -modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +modparam("rtpengine", "rtpengine_sock", "udp6:rtp-us-east-1a-6.nga911.com:2223 udp6:rtp-us-east-1a-7.nga911.com:2223") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") @@ -528,6 +533,11 @@ request_route { # handle requests within SIP dialogs route(WITHINDLG); + if (loose_route()) { + route(NATMANAGE); + record_route(); + route(RELAY); + } ### only initial requests (no To tag) # authentication @@ -850,10 +860,11 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE - if(nat_uac_test("8")) { - rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); + if($avp(rtpengine_offer) == "done") { + rtpengine_answer("ICE=remove address-family=IP4 SDES=off"); } else { - rtpengine_manage("replace-origin replace-session-connection"); + rtpengine_offer("ICE=remove address-family=IP6 SDES=off"); + $avp(rtpengine_offer) = "done"; } #!else if(nat_uac_test("8")) { ``` Establish call via this Kamailio. In my case used `Route` header in initial INVITE. When a call is established, then need stop RTPengine daemon on node used for media proxing. Wait when the caller sends a session refresh. According to Kamailio logs not attempt to reach another RTPengine node if the first node not available more. #### Log Messages In [kam.log](https://github.com/kamailio/kamailio/files/6330914/kam.log) please check messages related to ``` Call-ID: 6aac81b6-a028-11eb-8bf8-870daa274dfe CSeq: 34815260 INVITE ``` In log you will find at string 3437 ``` 11(31837) exec: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} *** cfgtrace:dbg_cfg_trace(): branch_route=[NATMANAGE] c=[/root/kamailio/etc/kamailio.cfg] l=866 a=25 n=rtpengine_offer 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine_funcs.c:144]: check_content_type(): type <application/sdp> found valid 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:1834]: build_rtpp_socks(): same rtpengines list version: 1 (1618738091) 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3266]: select_rtpp_node_old(): rtpengine hash table lookup find node=udp6:rtp-us-east-1a-7.nga911.com:2223 for calllen=36 callid=6aac81b6-a028-11eb-8bf8-870daa274dfe viabranch= 11(31837) ERROR: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3027]: send_rtpp_command(): can't send command "offer" to RTPEngine <udp6:rtp-us-east-1a-7.nga911.com:2223> 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:1834]: build_rtpp_socks(): same rtpengines list version: 1 (1618738091) 11(31837) DEBUG: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:3266]: select_rtpp_node_old(): rtpengine hash table lookup find node=udp6:rtp-us-east-1a-7.nga911.com:2223 for calllen=36 callid=6aac81b6-a028-11eb-8bf8-870daa274dfe viabranch= 11(31837) ERROR: {1 34815260 INVITE 6aac81b6-a028-11eb-8bf8-870daa274dfe} rtpengine [rtpengine.c:2664]: rtpp_function_call(): no available proxies ``` At this moment one other RTPengine node is available, but rtpengine Kamailio module does not try to reach this node. #### SIP Traffic [no-rtpengine-swithover.pcap.gz](https://github.com/kamailio/kamailio/files/… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@sbc-a2 ~]$ kamailio -v version: kamailio 5.5.0-pre0 (x86_64/linux) 9413fc flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9413fc compiled on 04:03:33 Apr 3 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@sbc-a2 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/2713

2 4

git:master:14019c67: topos: set downstream rr set for replies
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 14019c67d7fcf8f4d027fa1552ae15cb42d31bdb URL: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:16:31+02:00 topos: set downstream rr set for replies --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… Patch: https://github.com/kamailio/kamailio/commit/14019c67d7fcf8f4d027fa1552ae15c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 384ae1750e..2389026d14 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -548,6 +548,14 @@ int tps_pack_message(sip_msg_t *msg, tps_data_t *ptsd) ptsd->as_contact.len, ZSW(ptsd->as_contact.s), ptsd->as_contact.len, ptsd->bs_contact.len, ZSW(ptsd->bs_contact.s), ptsd->bs_contact.len); ptsd->x_rr = ptsd->a_rr; + if(isreq==0) { + if(msg->first_line.u.reply.statuscode >= 180 + && msg->first_line.u.reply.statuscode < 199) { + /* provisional replies that create early dialogs + * - skip 199 Early Dialog Terminated */ + ptsd->y_rr = ptsd->b_rr; + } + } ptsd->s_method_id = get_cseq(msg)->method_id; if(_tps_context_value.len>0) { ptsd->x_context = _tps_context_value;

1 0

[kamailio/kamailio] absolute dns names trigger error (#2706)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description To avoid extra DNS requests I want to use absolute DNS names instead of relative. To do this I configured ``` modparam("siptrace", "duplicate_uri", "sip:sip-trace6.example.com.:9060" ``` And now I can see errors ``` CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri CRITICAL: <core> [core/proxy.c:264]: mk_proxy(): could not resolve hostname: "sip-trace6.example.com." ERROR: siptrace [siptrace_hep.c:178]: trace_send_hep3_duplicate(): bad host name in uri ``` I am expecting "sip-trace6.example.com." DNS name resolution without errors in Kamailio log. used current master. -- 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/2706

2 8

[kamailio/kamailio] rtpengine_manage: send SDP two times (#2715)
by sergey-safarov 20 Apr '21

20 Apr '21

### Description When used `rtpengine_manage` function then `RTPengine` node returns the correct response but in the outbound SIP message, SDP is duplicated. ### Troubleshooting #### Reproduction Updated /etc/kamailio/kamailio.cfg like in this patch. ```diff diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..89960b38d8 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,4 +1,7 @@ #!KAMAILIO +#!define WITH_DEBUG +#!define WITH_NAT +#!define WITH_RTPENGINE # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org @@ -195,6 +198,8 @@ children=8 * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 +listen=tcp:3.236.25.6:5060 +listen=tcp:[2600:1f18:578:5700::6]:5060 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ @@ -456,7 +461,7 @@ modparam("presence_xml", "force_active", 1) #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- -modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") +modparam("rtpengine", "rtpengine_sock", "udp6:rtp-us-east-1a-6.nga911.com:2223 udp6:rtp-us-east-1a-7.nga911.com:2223") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") @@ -528,6 +533,11 @@ request_route { # handle requests within SIP dialogs route(WITHINDLG); + if (loose_route()) { + route(NATMANAGE); + record_route(); + route(RELAY); + } ### only initial requests (no To tag) # authentication @@ -850,10 +860,11 @@ route[NATMANAGE] { if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE - if(nat_uac_test("8")) { - rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); + if($avp(rtpengine_offer) == "done") { + rtpengine_manage("ICE=remove address-family=IP4 SDES=off"); } else { - rtpengine_manage("replace-origin replace-session-connection"); + rtpengine_manage("ICE=remove address-family=IP6 SDES=off"); + $avp(rtpengine_offer) = "done"; } #!else if(nat_uac_test("8")) { ``` Make a call via Kamailio node. In my case used a call with "Route" headers. #### Log Messages In Kamailio [rtpengine_manage.log](https://github.com/kamailio/kamailio/files/6331086/rt…, you will find the correct RTPengine response, like: ``` 9(32302) DEBUG: {1 34817407 INVITE 6b2a7c4c-a032-11eb-8c29-870daa274dfe} rtpengine [rtpengine.c:2677]: rtpp_function_call(): proxy reply: d3:sdp599:v=0^M o=2600hz 1618708279 1618708280 IN IP4 192.168.2.10^M s=2600hz^M c=IN IP6 2600:1f18:578:5700::1:e^M t=0 0^M m=audio 16476 RTP/AVP 0 8 102 9 3 103 101 13 104 105^M a=rtpmap:0 PCMU/8000^M a=rtpmap:8 PCMA/8000^M a=rtpmap:102 opus/48000/2^M a=fmtp:102 useinbandfec=1; maxaveragebitrate=30000; maxplaybackrate=48000; ptime=20; minptime=10; maxptime=40^M a=rtpmap:9 G722/8000^M a=rtpmap:3 GSM/8000^M a=rtpmap:103 SPEEX/8000^M a=rtpmap:101 telephone-event/8000^M a=fmtp:101 0-16^M a=rtpmap:13 CN/8000^M a=rtpmap:104 telephone-event/48000^M a=fmtp:104 0-16^M a=rtpmap:105 CN/48000^M a=sendrecv^M a=rtcp:16477^M a=ptime:20^M ``` But SIP message will have duplicated SDP. #### SIP Traffic [rtpengine_manage.pcap.gz](https://github.com/kamailio/kamailio/files/633108… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@sbc-a2 ~]$ kamailio -v version: kamailio 5.5.0-pre0 (x86_64/linux) 9413fc flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9413fc compiled on 04:03:33 Apr 3 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@sbc-a2 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/2715

2 2

git:master:6d05333a: secsipid: propagate return code from lib functions
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 6d05333adee28da347e56d71a8e309698ec9c6a3 URL: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T10:35:50+02:00 secsipid: propagate return code from lib functions --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… Patch: https://github.com/kamailio/kamailio/commit/6d05333adee28da347e56d71a8e3096… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 4390e73fae..7553e8ede7 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -223,7 +223,7 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) } LM_DBG("identity check: failed\n"); - return -1; + return ret; } /** @@ -281,7 +281,7 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) } LM_DBG("identity check: failed\n"); - return -1; + return ret; } /** @@ -466,7 +466,7 @@ static sr_kemi_xval_t* ki_secsipid_get_url(sip_msg_t *msg, str *surl) */ static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) { - int r; + int ret; pv_spec_t *ovar; pv_value_t val; str surl = {NULL, 0}; @@ -484,10 +484,10 @@ static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, secsipid_cache_expire); } - r = _secsipid_papi.SecSIPIDGetURLContent(surl.s, secsipid_timeout, + ret = _secsipid_papi.SecSIPIDGetURLContent(surl.s, secsipid_timeout, &_secsipid_get_url_val.s, &_secsipid_get_url_val.len); - if(r!=0) { - return -1; + if(ret!=0) { + return ret; } ovar = (pv_spec_t *)povar;

1 0

git:master:d80abf80: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: d80abf806a1643a704057ea383d47004cdb2ba9b URL: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-20T08:46:21+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… Patch: https://github.com/kamailio/kamailio/commit/d80abf806a1643a704057ea383d4700… --- diff --git a/src/modules/lcr/README b/src/modules/lcr/README index 2ac22a3f4a..56a9ee4658 100644 --- a/src/modules/lcr/README +++ b/src/modules/lcr/README @@ -725,7 +725,7 @@ modparam("lcr", "lcr_count", 10) Example 1.29. Setting gw_uri_avp module parameter ... -modparam("lcr", "gw_uri_avp", "$avp(i:709)") +modparam("lcr", "gw_uri_avp", "$avp(lcr_gwuri)") ... 3.30. ruri_user_avp (AVP string) @@ -738,7 +738,7 @@ modparam("lcr", "gw_uri_avp", "$avp(i:709)") Example 1.30. Setting ruri_user_avp module parameter ... -modparam("lcr", "ruri_user_avp", "$avp(i:500)") +modparam("lcr", "ruri_user_avp", "$avp(lcr_ruri_user)") ... 3.31. tag_avp (AVP string) @@ -764,7 +764,7 @@ modparam("lcr", "tag_avp", "$avp(lcr_tag)") Example 1.32. Setting flags_avp module parameter ... -modparam("lcr", "flags_avp", "$avp(i:712)") +modparam("lcr", "flags_avp", "$avp(lcr_flags)") ... 3.33. rule_id_avp (AVP string) @@ -776,9 +776,9 @@ modparam("lcr", "flags_avp", "$avp(i:712)") not stored anywhere. Example 1.33. Setting rule_id_avp module parameter - ... - modparam("lcr", "rule_id_avp", "$avp(i:712)") - ... +... +modparam("lcr", "rule_id_avp", "$avp(lcr_ruleid)") +... 3.34. mt_pv_values (AVP string) @@ -792,7 +792,7 @@ modparam("lcr", "flags_avp", "$avp(i:712)") Example 1.34. Setting tag_avp module parameter ... -modparam("lcr", "mt_pv_values", "$avp(mt_values)") +modparam("lcr", "mt_pv_values", "$avp(lcr_mt_values)") ... 3.35. mtree (string) @@ -828,7 +828,7 @@ modparam("lcr", "defunct_capability", 1) Example 1.37. Setting lcr_id_avp module parameter ... -modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") +modparam("lcr", "lcr_id_avp", "$avp(lcr_id)") ... 3.38. defunct_gw_avp (AVP string) @@ -841,7 +841,7 @@ modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") Example 1.38. Setting defunct_gw_avp module parameter ... -modparam("lcr", "defunct_gw_avp", "$avp(s:defunct_gw_avp)") +modparam("lcr", "defunct_gw_avp", "$avp(lcr_defunct_gw)") ... 3.39. lcr_rule_hash_size (integer) @@ -1122,7 +1122,7 @@ defunct_gw(60); Example 1.54. from_gw usage ... -if (from_gw(1, $avp(s:real_source_addr), 2) { +if (from_gw(1, $avp(real_source_addr), 2) { ... }; ...

1 0

git:master:053a727a: lcr: docs - use string avps in examples
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 053a727aa5d41cfbb0800b8ab532aa3f3f7689ec URL: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T08:35:13+02:00 lcr: docs - use string avps in examples - more coherent examples, one example was also conflicting by using same id - removed trailing white spaces and aligned examples --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3… Patch: https://github.com/kamailio/kamailio/commit/053a727aa5d41cfbb0800b8ab532aa3…

1 0

DMQ design issues and incurring problems
by Daniel-Constantin Mierla 19 Apr '21

19 Apr '21

Hello, as I added support for other transports (tcp, tls, ...) to DMQ inter-nodes communications and trying to configure it for a few testing scenarios, I ended up in some design issues/limitations. Two of them seem to prevent usual operations, therefore I want to get more opinions and see what would be the best way to go further. 1) there is no decoupling between server_address and server socket. The server socket is kept internally, but it is built from server_address parameter. The actual problem appears when trying to use FQDN as notification_address, because it ends up to have duplicate peer addresses for the same node. For example: - server1 with ip 1.2.3.4 and domain server1.sip.com - server2 with ip 5.6.7.8 and domain server2.sip.com On server1: modparam("dmq", "server_address", "sip:1.2.3.4:5060") modparam("dmq", "notification_address", "sip:server2.sip.com:5060") On server2: modparam("dmq", "server_address", "sip:5.6.7.8:5060") modparam("dmq", "notification_address", "sip:server1.sip.com:5060") Then each node end ups with 4 peer nodes. On server1: - sip:1.2.3.4:5060 (local=1) - sip:server1.sip.com:5060 (local=0) - sip:5.6.7.8:5060 (local=0) - sip:server2.sip.com:5060 (local=0) On server2: - sip:1.2.3.4:5060 (local=0) - sip:server1.sip.com:5060 (local=0) - sip:5.6.7.8:5060 (local=1) - sip:server2.sip.com:5060 (local=0) Practically each server considers the local FQDN being a remote peer. There are KDMQ requests sent to itself, but a real problematic issue is that presence replication (as I tested, could be for the other modules as well) is broken, because instead of an update it happens a replace. The case was a PUBLISH with body having state open, then in 30sec there is an PUBLISH to refresh using same ETag and empty body (as per spec), but instead of just updating the expires value, it also updates the body to empty string. If notification_address is using IP address instead of FQDN of the other server, everything works as expected, with body being kept on refresh and only expires being updated. The looping/spiralling is overwriting the purpose of the KDMQ replication action. Use of FQDN is needed for TLS transport in order to be able to validate the domain against the attributes in certificate. Currently it does not work to have server_address with FQDN (maybe it would work with advertise address to listen, but that will force to use for SIP headers, which is not wanted). To solve it I would introduce server_socket modparam, which if it is not set, then it is computed from server_address like for now. This keeps backward compatibility. 2) The second issue is a bit related. As there was a need to remove the FQDN and change the notification_address to be with the IP of the other node, I restarted each node, but the FQDNs stayed there, because after the restart of the server 1, it got the list with FQDNs from the server 2. Then restarting the server 2, ended up by sync'ing with server 1 and receiving again all the addresses. Practically the solution was to shut down all the nodes, which is something one is likely not wanting to do, because the entire platform is down with no active node, and even if it is for short time, for cases when data is only in memory (e.g., htable items, or in-memory only presence) everything is lost. In other words, there is no way to remove a peer address that still points to an active node but it is no longer wanted, because it persists in the other running nodes. Could be also the case of changing the domain to be used for notification address. This issue leads to the 1), because one node then appears many times (old FQDN and new FQDN), leading to loops/spirals with unwanted/broken side effects. I haven't thought much of it, but one solution could be an RPC command to be able to remove unwanted addresses from list of peers. It still can be a race of sync'ing immediately after removing via rpc, before being able to remove from the other node, but then one can check with rpc dmq.list_nodes and re-run the rpc command if it is the case. Given that Kamailio is in testing phase for 5.5, I want to see if anyone thinks of other solutions to fix this issues without introducing a new parameter (again, with backward compatibility) and a new rpc command (which does not have effect in breaking existing behaviour). Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:38692da8: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 38692da8abff093b45f5a50994b7a95e5aa515f9 URL: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-19T10:16:20+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… Patch: https://github.com/kamailio/kamailio/commit/38692da8abff093b45f5a50994b7a95… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index e92e50ada6..14cf3b36a6 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -239,7 +239,7 @@ Chapter 1. Admin Guide findService contains only one location, which is selected via this parameter as follows: * 0 - takes the first location of any type - * 1 - takes the last last of any type + * 1 - takes the last location of any type * 2 - takes the first geodetic location * 3 - takes the first civic location

1 0

git:master:b0ee86a7: lost: doc - typo removed
by Wolfgang Kampichler 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: b0ee86a7b8ab6866b40320c1141bf95aec5d2071 URL: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-19T10:13:13+02:00 lost: doc - typo removed --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… Patch: https://github.com/kamailio/kamailio/commit/b0ee86a7b8ab6866b40320c1141bf95… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 1df4aefd21..7f4597632b 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -211,7 +211,7 @@ <emphasis>0</emphasis> - takes the first location of any type </para></listitem> <listitem><para> - <emphasis>1</emphasis> - takes the last last of any type + <emphasis>1</emphasis> - takes the last location of any type </para></listitem> <listitem><para> <emphasis>2</emphasis> - takes the first geodetic location

1 0

[kamailio/kamailio] domain: fix use after free on domain reload (#2712)
by Mancaș George 19 Apr '21

19 Apr '21

#### 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 I observed this when glancing over commit https://github.com/kamailio/kamailio/commit/f50177003c21f53564be6349c0bb493… The invalid access is pretty clear, and so is the fix. Cheers! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2712 -- Commit Summary -- * domain: fix use after free on domain reload -- File Changes -- M src/modules/domain/hash.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2712.patch https://github.com/kamailio/kamailio/pull/2712.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/2712

2 2

git:master:62d981da: Merge pull request #2712 from mancasg/patch-1
by GitHub 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 62d981daa5d8d61f3f4f72996a613b8ad8e88f26 URL: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: GitHub <noreply(a)github.com> Date: 2021-04-19T08:20:20+02:00 Merge pull request #2712 from mancasg/patch-1 domain: fix use after free on domain reload --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… Patch: https://github.com/kamailio/kamailio/commit/62d981daa5d8d61f3f4f72996a613b8… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 4cb968e458..b085d8f9cb 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,8 +204,9 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + next = np->next; shm_free(np); - np = np->next; + np = next; } hash_table[DOM_HASH_SIZE] = NULL;

1 0

git:master:207d7ada: domain: fix use after free on domain reload
by GitHub 19 Apr '21

19 Apr '21

Module: kamailio Branch: master Commit: 207d7adae4ca5d9a197c38ae333ff98124c01b47 URL: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… Author: MancaÈ George <mancasg(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-16T19:26:35+03:00 domain: fix use after free on domain reload --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… Patch: https://github.com/kamailio/kamailio/commit/207d7adae4ca5d9a197c38ae333ff98… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 4cb968e458..b085d8f9cb 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,8 +204,9 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + next = np->next; shm_free(np); - np = np->next; + np = next; } hash_table[DOM_HASH_SIZE] = NULL;

1 0

git:master:d02c0422: lost: fixing a memory leak and minor code refactoring and improvements
by Wolfgang Kampichler 18 Apr '21

18 Apr '21

Module: kamailio Branch: master Commit: d02c042259a5a0e7bdcc359f5de20c68af6b4211 URL: https://github.com/kamailio/kamailio/commit/d02c042259a5a0e7bdcc359f5de20c6… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-18T18:08:13+02:00 lost: fixing a memory leak and minor code refactoring and improvements --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/lost.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/d02c042259a5a0e7bdcc359f5de20c6… Patch: https://github.com/kamailio/kamailio/commit/d02c042259a5a0e7bdcc359f5de20c6…

1 0

Info: regression for AVP with integer ID on v5.4.5
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Hello, a notification to inform about a regression to the AVPs with the integer IDs that was introduced in the v5.4.5 release when trying to fix an issue reported from a static code analyzer/fuzzer. The workaround is to use string names for AVPs, so if you have AVPs like $avp(i:123), they can be changed to $avp(s:123) in the kamailio.cfg (ie., replace i: with s: ). Regression is already fixed in the git branch 5.4, so if you install it from there, all should be ok. For Debian packages, you can wait till tomorrow and use the nightly builds of 5.4.x series from the repos listed at: * http://deb.kamailio.org/#dev54 Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

RHEL 6 and CentOS 6 deprecated
by Sergey Safarov 16 Apr '21

16 Apr '21

I try to refresh the build image for CentOS 6 and can't do it now. This directory (and version of CentOS) is deprecated. Please see this FAQ concerning the CentOS release scheme: https://wiki.centos.org/FAQ/General Please keep in mind that 6.0, 6.1, 6.2, 6.3, 6.4 , 6.5, 6.6, 6.7, 6.8 , 6.9 and 6.10 no longer get any updates, nor any security fix's. The whole CentOS 6 is *dead* and *shouldn't* be used anywhere at *all* http://mirror.centos.org/centos/6/readme What our plans about Kamailio releases for RHEL 6 and Cent 6 dists?

2 1

git:master:2df6f9d6: pkg/kamailio/obs: added lwsc module packaging
by Sergey Safarov 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: 2df6f9d6cb74bc115206e8b200af7234267f74d5 URL: https://github.com/kamailio/kamailio/commit/2df6f9d6cb74bc115206e8b200af723… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-16T15:28:43+03:00 pkg/kamailio/obs: added lwsc module packaging --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2df6f9d6cb74bc115206e8b200af723… Patch: https://github.com/kamailio/kamailio/commit/2df6f9d6cb74bc115206e8b200af723… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 29d074cac4..4f5a833a57 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -661,6 +661,16 @@ Lua extensions for Kamailio. %endif +%package lwsc +Summary: Websocket client implementation to interact with external systems, similar to http client +Group: %{PKGGROUP} +Requires: libwebsockets, kamailio = %ver +BuildRequires: libwebsockets-devel + +%description lwsc +Websocket client implementation to interact with external systems, similar to http client. + + %if %{with memcached} %package memcached Summary: Memcached configuration file support for Kamailio @@ -1178,6 +1188,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with lua} klua \ %endif + klwsc \ %if %{with memcached} kmemcached \ %endif @@ -1270,6 +1281,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with lua} klua \ %endif + klwsc \ %if %{with memcached} kmemcached \ %endif @@ -1932,6 +1944,11 @@ fi %endif +%files lwsc +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.lwsc +%{_libdir}/kamailio/modules/lwsc.so + %if %{with memcached} %files memcached %defattr(-,root,root)

1 0

[kamailio/kamailio] kamailio 5.4.5: "0 ID or NULL NAME AVP!" in lcr module (#2709)
by mdyrna 16 Apr '21

16 Apr '21

### Description  After upgrading kamailio from 5.4.4 to 5.4.5, the lcr module logs an error for outgoing calls. load_gws returns success (1), but does not populate the avps. Consequently, next_gw fails. ### Troubleshooting #### Reproduction  kamailio.cfg: ``` loadmodule "lcr.so" ... modparam("lcr", "db_url", "cluster://cls1") modparam("lcr", "gw_uri_avp", "$avp(i:709)") modparam("lcr", "ruri_user_avp", "$avp(i:500)") modparam("lcr", "tag_avp", "$avp(lcr_tag)") modparam("lcr", "flags_avp", "$avp(i:712)") modparam("lcr", "defunct_capability", 1) modparam("lcr", "lcr_id_avp", "$avp(s:lcr_id_avp)") modparam("lcr", "defunct_gw_avp", "$avp(s:defunct_gw_avp)") modparam("lcr", "ping_interval", 60) ... route[LCR] { if(!($rU=~"^[+0-9]")) return; if(is_method("INVITE")) { if (!($fU=~"^[+0-9]+$")) { append_hf("P-Asserted-Identity: <sip:+49xxxxxxxxxxx@xxxxx.de>\n"); append_hf("Privacy: id\n"); $fn = "Anonymous"; $fu = "sip:+49xxxxxxxxxxx@xxxxx.de"; } if(load_gws(1, $rU, $var(caller_uri)) != 1) { xlog("L_ERROR", "Couldn't load gateways\n"); sl_send_reply("500", "Server Internal Error - Cannot load gateways"); exit; } else { xlog("L_INFO", "GW Selected '$avp(i:709)'\n"); xlog("L_INFO", "Domain of destination: $dd\n"); xlog("L_INFO", "To URI: $tu\n"); } if(!next_gw()) { xlog("L_WARN", "No gateway configured for $rU\n"); sl_send_reply("503", "Service not available, no gateways found"); exit; } else { xlog("L_INFO", "Calling the first matched gateway\n"); xlog("L_INFO", "ruri_user_avp: '$avp(i:500)'\n"); xlog("L_INFO", "To URI after next_gw: $tu\n"); xlog("L_INFO", "Request URI: $ru\n"); } t_on_failure("MANAGE_FAILURE_LCR"); route(RELAY); exit; } } ``` #### Debugging Data  #### Log Messages  ``` Apr 15 20:59:27 x /usr/sbin/kamailio[879]: ERROR: <core> [core/usr_avp.c:152]: create_avp(): 0 ID or NULL NAME AVP! Apr 15 20:59:27 x /usr/sbin/kamailio[879]: ERROR: <core> [core/usr_avp.c:152]: create_avp(): 0 ID or NULL NAME AVP! Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: GW Selected '<null>' Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: Domain of destination: <null> Apr 15 20:59:27 x /usr/sbin/kamailio[879]: INFO: <script>: To URI: sip:+49177xxxxxxx@xx.xxx.x.xxx:5060 Apr 15 20:59:27 x /usr/sbin/kamailio[879]: WARNING: <script>: No gateway configured for +49177xxxxxxx ``` #### SIP Traffic  SIP request: ``` INVITE sip:+49177xxxxxxx@xx.xx.xx.xxx:5060 SIP/2.0 Via: SIP/2.0/UDP xxx.xx.xx.xxx:xxxxx;branch=z9hG4bK5d833a50 Max-Forwards: 70 From: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx>;tag=as18ff0d47 To: <sip:+49177xxxxxxx@xx.xx.xx.xxx:5060> Contact: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx> Call-ID: 7489c50703b43b2f03980574181a2f81@xxx.xx.xx.xxx:xxxxx CSeq: 102 INVITE User-Agent: Asterisk PBX 13.18.3~dfsg-1ubuntu4 Date: Thu, 15 Apr 2021 21:52:42 GMT Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer Content-Type: application/sdp Content-Length: 952 ... ``` SIP reply: ``` SIP/2.0 503 Service not available, no gateways found Via: SIP/2.0/UDP xxx.xx.xx.xxx:xxxxx;branch=z9hG4bK5d833a50;rport=50060;received=xx.xx.xx.xxx From: <sip:+xxxxxxxxxxx@xxx.xx.xx.xxx:xxxxx>;tag=as18ff0d47 To: <sip:+49177xxxxxxx@xx.xx.xx.xxx:5060>;tag=6a823999ce344a0b461cf8d85d526103.51611a36 Call-ID: 7489c50703b43b2f03980574181a2f81@xxx.xx.xx.xxx:xxxxx CSeq: 102 INVITE Server: kamailio (5.4.5 (x86_64/linux)) Content-Length: 0 ``` ### Possible Solutions  As a workaround, I downgraded to kamailio 5.3.8 because the previous Ubuntu release 5.4.4 is not available anymore at http://deb.kamailio.org/kamailio54/pool/main/k/kamailio/ (why actually?) ### Additional Information * **Kamailio Version** 5.4.5 * **Operating System**: Ubuntu 18.04  ### Root Cause Assumption https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… might be involved in the issue. -- 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/2709

2 5

fresh GCC
by Sergey Safarov 16 Apr '21

16 Apr '21

I have created a pull request that allows the use of fresh GCC for the FreeSwitch project. https://github.com/signalwire/freeswitch/pull/1161 Think we can use the same approach to use fresh GCC for the Kamailio project. For RHEL based dist and old Debian dest. Is it a useful approach to use fresh GCC to build a master branch? Sergey

2 2

git:5.4:967dd294: core: usr avp - fix detection of invalid name and ids
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Module: kamailio Branch: 5.4 Commit: 967dd294ba424bf66e27bebe4d6261e0c8a66471 URL: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-16T09:58:16+02:00 core: usr avp - fix detection of invalid name and ids - use the fields designated for str name or int id, code analyzers can follow properly the execution path - regression introduced in ca1821837dfe7dd6630f628d968ed4d1178c7040 (cherry picked from commit e4506385ca5a56d4861f36e85c1049599cba398f) --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… Patch: https://github.com/kamailio/kamailio/commit/967dd294ba424bf66e27bebe4d6261e… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index e80e52d79d..8d8fa34603 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,16 +148,11 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == NULL || name.s.len == 0) { - LM_ERR("0 ID or NULL NAME AVP!"); - goto error; - } - /* compute the required mem size */ len = sizeof(struct usr_avp); if (flags&AVP_NAME_STR) { if ( name.s.s==0 || name.s.len==0) { - LM_ERR("EMPTY NAME AVP!"); + LM_ERR("NULL or EMPTY NAME AVP!"); goto error; } if (flags&AVP_VAL_STR) { @@ -168,8 +163,14 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) len += sizeof(struct str_int_data)-sizeof(union usr_avp_data) + name.s.len + 1; /* Terminating zero for regex search */ } - } else if (flags&AVP_VAL_STR) { - len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } else { + if(name.n==0) { + LM_ERR("0 ID AVP!"); + goto error; + } + if (flags&AVP_VAL_STR) { + len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } } avp = (struct usr_avp*)shm_malloc( len );

1 0

git:master:e4506385: core: usr avp - fix detection of invalid name and ids
by Daniel-Constantin Mierla 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: e4506385ca5a56d4861f36e85c1049599cba398f URL: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-16T09:56:11+02:00 core: usr avp - fix detection of invalid name and ids - use the fields designated for str name or int id, code analyzers can follow properly the execution path - regression introduced in ca1821837dfe7dd6630f628d968ed4d1178c7040 --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… Patch: https://github.com/kamailio/kamailio/commit/e4506385ca5a56d4861f36e85c10495… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index e80e52d79d..8d8fa34603 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,16 +148,11 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == NULL || name.s.len == 0) { - LM_ERR("0 ID or NULL NAME AVP!"); - goto error; - } - /* compute the required mem size */ len = sizeof(struct usr_avp); if (flags&AVP_NAME_STR) { if ( name.s.s==0 || name.s.len==0) { - LM_ERR("EMPTY NAME AVP!"); + LM_ERR("NULL or EMPTY NAME AVP!"); goto error; } if (flags&AVP_VAL_STR) { @@ -168,8 +163,14 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) len += sizeof(struct str_int_data)-sizeof(union usr_avp_data) + name.s.len + 1; /* Terminating zero for regex search */ } - } else if (flags&AVP_VAL_STR) { - len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } else { + if(name.n==0) { + LM_ERR("0 ID AVP!"); + goto error; + } + if (flags&AVP_VAL_STR) { + len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; + } } avp = (struct usr_avp*)shm_malloc( len );

1 0

git:master:e016cb1b: pkg/kamailio/deb: add lwcs module
by Victor Seva 16 Apr '21

16 Apr '21

Module: kamailio Branch: master Commit: e016cb1bdb2837437663a4c24b104b40e9191eba URL: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T13:46:50+02:00 pkg/kamailio/deb: add lwcs module * enable only the ones with libwebsockets >= 3.1 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4… Patch: https://github.com/kamailio/kamailio/commit/e016cb1bdb2837437663a4c24b104b4…

1 0

[CRON] Errored: dbank888/kamailio#132 (master - 491e19e)
by Travis CI 15 Apr '21

15 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #132 Status: Errored Duration: 5 mins and 20 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/767207396?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Kamailio v5.4.5 Released
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Hello, Kamailio SIP Server v5.4.5 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.5. For more details about version 5.4.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/04/kamailio-v5-4-5-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.4:c4634265: ChangeLog: content updated for v5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: c46342653c6a1c614d43ce31e791bffe30237be8 URL: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T12:23:40+02:00 ChangeLog: content updated for v5.4.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff… Patch: https://github.com/kamailio/kamailio/commit/c46342653c6a1c614d43ce31e791bff…

1 0

git:5.4:30a0d84d: Makefile.defs: version set to 5.4.5
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 30a0d84d1aae953bca79d38a5bda3523e896c59a URL: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T11:57:50+02:00 Makefile.defs: version set to 5.4.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… Patch: https://github.com/kamailio/kamailio/commit/30a0d84d1aae953bca79d38a5bda352… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c51796568d..621f646b23 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:master:80689e22: pv_headers: safety check for xavi key count
by Victor Seva 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 80689e22bc83aff78d8fd53d4a33bcb68c913c19 URL: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T11:41:20+02:00 pv_headers: safety check for xavi key count * check that we have keys to put into the hash before allocating anything * check table field instead of size just to make analyzer happy --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… Patch: https://github.com/kamailio/kamailio/commit/80689e22bc83aff78d8fd53d4a33bcb… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 90feddeefd..7afc39d1a8 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -174,6 +174,10 @@ int pvh_apply_headers(struct sip_msg *msg) return -1; } keys_count = pvh_xavi_keys_count(&sub); + if(keys_count <= 0) { + LM_ERR("no keys found: %.*s\n", xavi_name.len, xavi_name.s); + return -1; + } if(str_hash_alloc(&rm_hdrs, keys_count) < 0) { PKG_MEM_ERROR; return -1; @@ -294,7 +298,7 @@ int pvh_apply_headers(struct sip_msg *msg) res = 1; err: - if(rm_hdrs.size) + if(rm_hdrs.table) pvh_str_hash_free(&rm_hdrs); return res; }

1 0

git:5.4:38d72250: core: main - set ending 0 in allocated cfg file path
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 38d72250f4c9c77bee71262b6c340503cc9a92a2 URL: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T10:29:43+02:00 core: main - set ending 0 in allocated cfg file path (cherry picked from commit 15f57ceae26b967ad92dd3a97ebcd869d1197244) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… Patch: https://github.com/kamailio/kamailio/commit/38d72250f4c9c77bee71262b6c34050… --- diff --git a/src/main.c b/src/main.c index ad83cff3a8..3a67f841e6 100644 --- a/src/main.c +++ b/src/main.c @@ -1281,7 +1281,7 @@ int fix_cfg_file(void) } if ((res = malloc(cfg_len + 1)) == NULL) goto error; memcpy(res, cfg_file, cfg_len); - cfg_file[cfg_len] = 0; + res[cfg_len] = 0; cfg_file = res; return 0; }

1 0

git:master:15f57cea: core: main - set ending 0 in allocated cfg file path
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: master Commit: 15f57ceae26b967ad92dd3a97ebcd869d1197244 URL: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T10:28:24+02:00 core: main - set ending 0 in allocated cfg file path --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… Patch: https://github.com/kamailio/kamailio/commit/15f57ceae26b967ad92dd3a97ebcd86… --- diff --git a/src/main.c b/src/main.c index 405b442158..71a024d5bb 100644 --- a/src/main.c +++ b/src/main.c @@ -1288,7 +1288,7 @@ int fix_cfg_file(void) } if ((res = malloc(cfg_len + 1)) == NULL) goto error; memcpy(res, cfg_file, cfg_len); - cfg_file[cfg_len] = 0; + res[cfg_len] = 0; cfg_file = res; return 0; }

1 0

git:5.4:3a9cf652: pkg/kamailio/deb: version set 5.4.5
by Victor Seva 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 3a9cf652716fdc3f5a679cf79c704daf43ac8783 URL: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-04-15T09:51:16+02:00 pkg/kamailio/deb: version set 5.4.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/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/3a9cf652716fdc3f5a679cf79c704da… Patch: https://github.com/kamailio/kamailio/commit/3a9cf652716fdc3f5a679cf79c704da…

1 0

git:5.4:9e6d4182: pkg/kamailio: version set to 5.4.5 for rpm specs and alpine
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 9e6d418212171f84236af4d537bae973de879fa9 URL: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T09:41:16+02:00 pkg/kamailio: version set to 5.4.5 for rpm specs and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… Patch: https://github.com/kamailio/kamailio/commit/9e6d418212171f84236af4d537bae97… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 913168c652..e6576c616a 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.4.4 +pkgver=5.4.5 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 0bd9c0238a..ba4cb80618 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.4 +%define ver 5.4.5 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.4:1e6561f8: core: resolve - safety check for setting port
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 1e6561f86d4a139834952ff21b74ecca0b508966 URL: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:40+02:00 core: resolve - safety check for setting port (cherry picked from commit 703d6202e73e4e3778a2c66f4e29ae87dc6ac211) --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… Patch: https://github.com/kamailio/kamailio/commit/1e6561f86d4a139834952ff21b74ecc… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index 3796f05ceb..cfed6b5e1d 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1211,7 +1211,7 @@ int naptr_choose (struct naptr_rdata** crt, char* crt_proto, * and *proto!=0 or port==0 && proto==0) * when performing SRV lookup (*port==0) it will use *proto to look for * tcp or udp hosts, otherwise proto is unused; if proto==0 => no SRV lookup - * If zt is set, name will be assumed to be 0 terminated and some copy + * If zt is set, name will be assumed to be 0 terminated and some copy * operations will be avoided. * If is_srv is set it will assume name has the srv prefixes for sip already * appended and it's already 0-term'ed; if not it will append them internally. @@ -1299,7 +1299,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, do_srv: /* try to find the SRV records inside previous ARs first*/ for (l=ars; l; l=l->next){ - if (l->type!=T_SRV) continue; + if (l->type!=T_SRV) continue; srv=(struct srv_rdata*) l->rdata; if (srv==0){ LM_CRIT("null rdata\n"); @@ -1311,7 +1311,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("found SRV(%s) = %s:%d in AR\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1330,7 +1330,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, /* we found it*/ LM_DBG("SRV(%s) = %s:%d\n", srv_target, srv->name, srv->port); - *port=srv->port; + if(port) *port=srv->port; /* cleanup on exit */ goto end; } @@ -1342,7 +1342,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, goto end; } /* cleanup on exit */ - LM_DBG("no SRV record found for %.*s," + LM_DBG("no SRV record found for %.*s," " trying 'normal' lookup...\n", name->len, name->s); } }

1 0

git:5.4:e5de8af6: avp: check for null string
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: e5de8af690af460f086c6191a7502c903ca55699 URL: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:14+02:00 avp: check for null string (cherry picked from commit c30cd3db7587a3c875770fbc558f4a5ad38b58bd) --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… Patch: https://github.com/kamailio/kamailio/commit/e5de8af690af460f086c6191a7502c9… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f11d56baeb..63ce537d7a 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1359,7 +1359,7 @@ static int attr_hdr_body2attrs(struct sip_msg* m, char* header_, char* prefix_) } }; } - if (s.len && s.s[0] == header->field_delimiter) { + if (s.len && s.s && s.s[0] == header->field_delimiter) { s.s++; s.len--; }

1 0

git:5.4:98b091d1: seas: check when walking the list
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: 98b091d16072bc767affde805c30c7ec4911b9ec URL: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:23+02:00 seas: check when walking the list (cherry picked from commit 7231be0785009cb17581822f0765985eb7bdb243) --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… Patch: https://github.com/kamailio/kamailio/commit/98b091d16072bc767affde805c30c7e… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index cd62848ab0..83be6307d0 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -1329,8 +1329,12 @@ int extract_allowed_headers(struct sip_msg *my_msg,int strip_top_vias,int allow_ }else{ assert(rtcnt>0); rb=hf->parsed; - while(--rtcnt) + while(rb && --rtcnt) rb=rb->next; + if(!rb) { + LM_ERR("no rr\n"); + goto error; + } k= (((rb->nameaddr.name.s) + rb->len)-hf->name.s) ; if(len+k+CRLF_LEN<headers_len){ memcpy(headers+len,hf->name.s,k);

1 0

git:5.4:a10a7b5b: core: updated onsend_route_enabled() macro condtition
by Daniel-Constantin Mierla 15 Apr '21

15 Apr '21

Module: kamailio Branch: 5.4 Commit: a10a7b5ba0cba5c268ff04a71bdf318e05dd0068 URL: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-15T08:35:32+02:00 core: updated onsend_route_enabled() macro condtition - detect when the kemi callbacks need to be executed for tm replies (cherry picked from commit 0640645efdbc1f7ce36750d5a784a4cfedc3f02f) --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… Patch: https://github.com/kamailio/kamailio/commit/a10a7b5ba0cba5c268ff04a71bdf318… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index 744becedce..a78927c190 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -57,7 +57,9 @@ extern onsend_info_t* p_onsend; * WARNING: buf must be 0 terminated (to allow regex matches on it) */ int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, char* buf, int len); -#define onsend_route_enabled(rtype) (onsend_rt.rlist[DEFAULT_RT]?((rtype==SIP_REPLY)?onsend_route_reply:1):0) +#define onsend_route_enabled(rtype) ((onsend_rt.rlist[DEFAULT_RT]? \ + ((rtype==SIP_REPLY)?onsend_route_reply:1):0) \ + || (kemi_onsend_route_callback.len>0 && sr_kemi_eng_get())) int run_onsend_evroute(onsend_info_t *sndinfo, int evrt, str *evcb, str *evname);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev