sr-dev September 2020

sr-dev@lists.kamailio.org

12 participants
270 discussions

git:master:68f93d27: sipdump: init checksum filed
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

Module: kamailio Branch: master Commit: 68f93d27b9ee40cfce8c52304eac4ad9c83ee4b1 URL: https://github.com/kamailio/kamailio/commit/68f93d27b9ee40cfce8c52304eac4ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T12:48:15+02:00 sipdump: init checksum filed - silent analyzer --- Modified: src/modules/sipdump/sipdump_pcap.c --- Diff: https://github.com/kamailio/kamailio/commit/68f93d27b9ee40cfce8c52304eac4ad… Patch: https://github.com/kamailio/kamailio/commit/68f93d27b9ee40cfce8c52304eac4ad… --- diff --git a/src/modules/sipdump/sipdump_pcap.c b/src/modules/sipdump/sipdump_pcap.c index 1a559cea59..52ef7b3b92 100644 --- a/src/modules/sipdump/sipdump_pcap.c +++ b/src/modules/sipdump/sipdump_pcap.c @@ -182,6 +182,7 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) v_pcap_udp_header.src = ntohs(spd->src_port); v_pcap_udp_header.dst = ntohs(spd->dst_port); v_pcap_udp_header.length = ntohs(sizeof(struct pcap_udp_header) + data.len); + v_pcap_udp_header.checksum = 0; /* IP header */ if (spd->afid == AF_INET6) { @@ -243,4 +244,4 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) LM_ERR("writing UDP payload to pcap failed: %s\n", strerror(errno)); } fflush(fs); -} \ No newline at end of file +}

1 0

git:5.3:e1dc051e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 08 Sep '20

08 Sep '20

Module: kamailio Branch: 5.3 Commit: e1dc051e4171cb7a441987d0c184fc210fa57063 URL: https://github.com/kamailio/kamailio/commit/e1dc051e4171cb7a441987d0c184fc2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-08T12:47:01+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/pike/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/e1dc051e4171cb7a441987d0c184fc2… Patch: https://github.com/kamailio/kamailio/commit/e1dc051e4171cb7a441987d0c184fc2… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index a1f0c05984..545fb78f14 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -94,6 +94,9 @@ Chapter 1. Admin Guide To read more about KEMI exports and available KSR submodules, see: * http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/ + Note: to have the old Lua module 'sr' available, load the 'app_lua_sr' + Kamailio module. + Lua (http://www.lua.org) is a fast and easy to embed scripting language. Exported API from SIP router to Lua is documented in the dokuwiki. @@ -203,7 +206,7 @@ lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua"); Example 1.6. lua_dostring usage ... -if(!lua_dostring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_dostring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -237,7 +240,7 @@ lua_run("lua_func3", "$rU", "2", "$si"); Example 1.8. lua_runstring usage ... -if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_runstring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -297,7 +300,7 @@ if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) '/usr/local/etc/kamailio/lua/myscript.lua'. ... function sr_append_fu_to_reply() - sr.hdr.append_to_reply("P-From: " .. sr.pv.get("$fu") .. "\r\n"); + KSR.hdr.append_to_reply("P-From: " .. KSR.pv.get("$fu") .. "\r\n"); end ... diff --git a/src/modules/pike/README b/src/modules/pike/README index a7f66697e7..beea746f45 100644 --- a/src/modules/pike/README +++ b/src/modules/pike/README @@ -39,6 +39,7 @@ Bogdan-Andrei Iancu 2. RPC calls 1. pike.top + 2. pike.list 3. Developer Guide @@ -49,6 +50,7 @@ Bogdan-Andrei Iancu 1.3. Set remove_latency parameter 1.4. Set pike_log_level parameter 1.5. pike_check_req usage + 2.1. Using pike.top 3.1. Tree of IP addresses Chapter 1. Admin Guide @@ -219,6 +221,7 @@ Chapter 2. RPC calls Table of Contents 1. pike.top + 2. pike.list 1. pike.top @@ -230,9 +233,9 @@ Chapter 2. RPC calls Some IPs could be marked as HOT depending on theirs request rates. - pike.top command takes one string parameter which specifies what kind - of nodes you are interested in. Possible values are HOT or ALL. If no - argument is given, it behaves as HOT was used. + pike.top command can take one string parameter which specifies what + kind of nodes you are interested in. Possible values are HOT or ALL. If + no argument is given, it behaves as HOT was used. Marking nodes HOT is done on server side, client only presents given data and make some postprocessing like sorting. @@ -240,6 +243,15 @@ Chapter 2. RPC calls Output of this command is a simple dump of ip_tree nodes marked as ip-leafs. + Example 2.1. Using pike.top +... +kamcli rpc pike.top ALL +... + +2. pike.list + + Alias for "pike.top" command. + Chapter 3. Developer Guide One single tree (for both IPv4 and IPv6) is used. Each node contains a diff --git a/src/modules/tls/README b/src/modules/tls/README index 0a0e6650d7..99f05e22c5 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1426,7 +1426,7 @@ end 10.34. rand_engine (str) - Set the ranondom number generator engine for libssl. + Set the random number generator engine for libssl. Note: the default random number generator (PRNG) engine of libssl v1.1.x is not designed for multi-process applications and can result in

1 0

git: new commits in branch 5.3
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

- URL: https://github.com/kamailio/kamailio/commit/fa7042676c0dc2ea8760c928ef70fd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:52:35+02:00 kamctl: added pstrap command - use ps to get list of PIDs for Kamailio instance, instead of RPC core.psx (cherry picked from commit 97ec85559f1e33405fff2320443dc86d2df13456) - URL: https://github.com/kamailio/kamailio/commit/12aecb27779637b90ef83efea4dfaf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:52:44+02:00 kamctl: print process details in pstrap output (cherry picked from commit 904a1590dbcdbb0fda9f676b4768596f797e9e27) - URL: https://github.com/kamailio/kamailio/commit/7ac48ca1a6bd0462199ebb6cf1be61b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:52:57+02:00 kamctl: skip tracing kamctl itself in pstrap (cherry picked from commit 626c0dee863fa517e473148ca8010d737a8f7ffe) - URL: https://github.com/kamailio/kamailio/commit/c79cc69ac27bd1d6b506634e8a9d768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:56:49+02:00 tls: docs - fixed typo - GH #2410 (cherry picked from commit a12064696ac37cadf954a89b58daa1e05e182180) (cherry picked from commit eb2abae40b36ad123528cddb25e0ddd217b68b22) - URL: https://github.com/kamailio/kamailio/commit/5896f8e31078ff9b5d704c7393d7a7a… Author: Luis Martin Gil <luismartingil(a)zaleos.net> Date: 2020-09-08T09:57:08+02:00 tm - remove not used route_mode var (cherry picked from commit 6619be46249dfe0b2f2cbc863cb8b2f44716122b) - URL: https://github.com/kamailio/kamailio/commit/6474444f12b15b443f9f0ed96e509b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:57:50+02:00 log_custom: print to stderror if sending log message fails - help troubleshooting while avoiding looping to same function in case the log engine is set to log custom module (cherry picked from commit f16d046f6330f897b374d9bb7dab3b2ce8eab3a7) (cherry picked from commit 1ecade5cbd323e1ab45ec6f83236e1d389739d3b) - URL: https://github.com/kamailio/kamailio/commit/9db407d0ad2a2e48725ddc2fd370269… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:58:18+02:00 app_lua: docs - note about availability of 'sr' Lua module - use KSR in the examples (cherry picked from commit 34efa83569bedb1f36c3661ee063ff6334633e4a) (cherry picked from commit c98d9e8c6687f2311f51016ed9cc2e089d4eb242) - URL: https://github.com/kamailio/kamailio/commit/4f9a5cdefb8d6baf9c069e277012d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:58:30+02:00 xcap_server: check before going to the end of the buffer - use marcros to set and restore char for ending 0 (cherry picked from commit 6ce5c0bdf136ecffd7917f2d60093e1b2c49fa54) (cherry picked from commit 4aeb071b26df08e1dfc902340475c077e468c661) - URL: https://github.com/kamailio/kamailio/commit/2d581622496e2141401a00a47011cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:58:58+02:00 db_text: free pointer in case of error (cherry picked from commit bddf16db74ea779bb01805fc2cbabfdaf8f4d62b) (cherry picked from commit aabb2b2cfab6dc664ebc4b3d15db0d2ecb3cafd5) - URL: https://github.com/kamailio/kamailio/commit/0f8528d4705e0e7060708f6108c47bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:07+02:00 Makefile.defs: get clang version only from --version output - the full version with stderr output included has a different first line on MacOS, making head -n 1 not extract the version number line (cherry picked from commit bff689cfedca70149e17b6ec3584ca9ecab71418) (cherry picked from commit b14b0a116791b85f2048e5fc863e50b7f7d93405) - URL: https://github.com/kamailio/kamailio/commit/148cf4bb35cb94e111cf8ade1294519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:17+02:00 Makefile.defs: map gcc v10.x to 9.0+ options - detect properly the 10.x gcc version number, GH #2425 (cherry picked from commit 79e7738027a40affa4c7f606bf55a3ad0fe31bc4) (cherry picked from commit 6d79c954469082aeb8518fdcca80217ce4826992) - URL: https://github.com/kamailio/kamailio/commit/58043293132efa043a1d9ebfb2473d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:27+02:00 pike: docs - section for pike.list rpc command (cherry picked from commit 720e929a87c6d3ee29c316ca63886c7142320f43) (cherry picked from commit c783f19708bfd1d8c2334f739c8960b2de5f4fb3) - URL: https://github.com/kamailio/kamailio/commit/0567c42a324deaa8dfe60cf1d8281aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:39+02:00 topoh: check if via param has the expected prefix, otherwise skip - GH #2437 (cherry picked from commit 046126b4a90090bf5b8f9b517ba5218793e6b973) (cherry picked from commit c8c884c4db353d4fac83752a494989e699fc36ff) - URL: https://github.com/kamailio/kamailio/commit/e956b3c7dbb931f719e11a44887c5ee… Author: Dmitry <dmitry.wagin(a)ya.ru> Date: 2020-09-08T09:59:55+02:00 Makefile.defs: Fixed libs option for FreeBSD (cherry picked from commit f490c4e0f5888963a01fa99fe94a464d44223199) (cherry picked from commit 0efd0d63a8f8d7b644d0eba13552778d3b746c67) - URL: https://github.com/kamailio/kamailio/commit/659edfc219c850ac464869589d11fb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T10:00:18+02:00 topoh: remove the Via cookie when skipping topoh via event route - event route is now executed with parsed sip message to be sent out - GH #2437 (cherry picked from commit 06a1d20fdcae42c8f2130c547c6c6cf5fb6dce26) (cherry picked from commit b5176749605808af737aca00992f549152f9c38a) - URL: https://github.com/kamailio/kamailio/commit/4c80e4c71a44fbe26761bee730e423f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T10:00:37+02:00 usrloc: get_udomain() - safety checks for location table name parameter (cherry picked from commit 29dde9fea1eb21b4bb484286f7443dd32f611bd2) (cherry picked from commit ac56dfde20c5e689fb911debdd33a6155f7b130c)

1 0

git:5.3:8079c537: uac: restore first display name then uri with dialog callback
by Daniel-Constantin Mierla 07 Sep '20

07 Sep '20

Module: kamailio Branch: 5.3 Commit: 8079c537fa34be1ca075617d2b79143cd932e719 URL: https://github.com/kamailio/kamailio/commit/8079c537fa34be1ca075617d2b79143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-07T20:35:28+02:00 uac: restore first display name then uri with dialog callback - same as for rr callback, otherwise the new header can be malformed: the case of initial INVITE with From URI having no angle brackets and goes out with display name and angle brackets, the ACK for 200ok results with >From broken when forwarded - backport of commit efa6c6a9bf13c430d5be5146168d1ded4c39dba7 (master) - backport of commit 1a49cc015609c8701057d5a9cf50f68db61870c1 (5.4) --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/8079c537fa34be1ca075617d2b79143… Patch: https://github.com/kamailio/kamailio/commit/8079c537fa34be1ca075617d2b79143… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 8da8fc7441..ebde602595 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -936,26 +936,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, old_uri.len, old_uri.s, new_display->len, new_display->s, new_uri->len, new_uri->s); - /* duplicate the decoded value */ - p = pkg_malloc( new_uri->len); - if (!p) { - LM_ERR("no more pkg mem\n"); - return; - } - memcpy( p, new_uri->s, new_uri->len); - - /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); - if (l==0) { - LM_ERR("del lump failed\n"); - goto free; - } - - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { - LM_ERR("insert new lump failed\n"); - goto free; - } - /* deal with display name */ l = 0; /* first remove the existing display */ @@ -966,8 +946,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, l = del_lump(msg, body->display.s-msg->buf, body->display.len, 0); if (l==0) { LM_ERR("display del lump failed\n"); - goto free; - } + return; + } } if (new_display->s && new_display->len > 0) { LM_DBG("inserting display [%.*s]\n", @@ -976,20 +956,40 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.s = pkg_malloc(new_display->len + 2); if (buf.s==0) { LM_ERR("no more pkg mem\n"); - goto free; + return; } memcpy( buf.s, new_display->s, new_display->len); buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free2; + goto free1; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free2; + goto free1; } } + /* uri - duplicate the decoded value */ + p = pkg_malloc( new_uri->len); + if (!p) { + LM_ERR("no more pkg mem\n"); + return; + } + memcpy( p, new_uri->s, new_uri->len); + + /* build del/add lumps */ + l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + if (l==0) { + LM_ERR("del lump failed\n"); + goto free2; + } + + if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + LM_ERR("insert new lump failed\n"); + goto free2; + } + /* register tm callback to change replies, * but only if not registered earlier */ if (!(msg->msg_flags & (FL_USE_UAC_FROM|FL_USE_UAC_TO)) && @@ -1003,10 +1003,10 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; free2: - pkg_free(buf.s); - -free: pkg_free(p); + +free1: + pkg_free(buf.s); }

1 0

git:5.4:1a49cc01: uac: restore first display name then uri with dialog callback
by Daniel-Constantin Mierla 07 Sep '20

07 Sep '20

Module: kamailio Branch: 5.4 Commit: 1a49cc015609c8701057d5a9cf50f68db61870c1 URL: https://github.com/kamailio/kamailio/commit/1a49cc015609c8701057d5a9cf50f68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-07T19:48:29+02:00 uac: restore first display name then uri with dialog callback - same as for rr callback, otherwise the new header can be malformed: the case of initial INVITE with From URI having no angle brackets and goes out with display name and angle brackets, the ACK for 200ok results with >From broken when forwarded (cherry picked from commit efa6c6a9bf13c430d5be5146168d1ded4c39dba7) --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/1a49cc015609c8701057d5a9cf50f68… Patch: https://github.com/kamailio/kamailio/commit/1a49cc015609c8701057d5a9cf50f68… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index c64af52999..3a476a3d82 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -942,26 +942,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, old_uri.len, old_uri.s, new_display->len, new_display->s, new_uri->len, new_uri->s); - /* duplicate the decoded value */ - p = pkg_malloc( new_uri->len); - if (!p) { - PKG_MEM_ERROR; - return; - } - memcpy( p, new_uri->s, new_uri->len); - - /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); - if (l==0) { - LM_ERR("del lump failed\n"); - goto free; - } - - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { - LM_ERR("insert new lump failed\n"); - goto free; - } - /* deal with display name */ l = 0; /* first remove the existing display */ @@ -972,8 +952,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, l = del_lump(msg, body->display.s-msg->buf, body->display.len, 0); if (l==0) { LM_ERR("display del lump failed\n"); - goto free; - } + return; + } } if (new_display->s && new_display->len > 0) { LM_DBG("inserting display [%.*s]\n", @@ -982,20 +962,40 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.s = pkg_malloc(new_display->len + 2); if (buf.s==0) { PKG_MEM_ERROR; - goto free; + return; } memcpy( buf.s, new_display->s, new_display->len); buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free2; + goto free1; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free2; + goto free1; } } + /* uri update - duplicate the decoded value */ + p = pkg_malloc( new_uri->len); + if (!p) { + PKG_MEM_ERROR; + goto free1; + } + memcpy( p, new_uri->s, new_uri->len); + + /* build del/add lumps */ + l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + if (l==0) { + LM_ERR("del lump failed\n"); + goto free2; + } + + if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + LM_ERR("insert new lump failed\n"); + goto free2; + } + /* register tm callback to change replies, * but only if not registered earlier */ if (!(msg->msg_flags & (FL_USE_UAC_FROM|FL_USE_UAC_TO)) && @@ -1009,10 +1009,10 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; free2: - pkg_free(buf.s); - -free: pkg_free(p); + +free1: + pkg_free(buf.s); }

1 0

git:master:efa6c6a9: uac: restore first display name then uri with dialog callback
by Daniel-Constantin Mierla 07 Sep '20

07 Sep '20

Module: kamailio Branch: master Commit: efa6c6a9bf13c430d5be5146168d1ded4c39dba7 URL: https://github.com/kamailio/kamailio/commit/efa6c6a9bf13c430d5be5146168d1de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-07T19:35:04+02:00 uac: restore first display name then uri with dialog callback - same as for rr callback, otherwise the new header can be malformed: the case of initial INVITE with From URI having no angle brackets and goes out with display name and angle brackets, the ACK for 200ok results with >From broken when forwarded --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/efa6c6a9bf13c430d5be5146168d1de… Patch: https://github.com/kamailio/kamailio/commit/efa6c6a9bf13c430d5be5146168d1de… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index c64af52999..3a476a3d82 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -942,26 +942,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, old_uri.len, old_uri.s, new_display->len, new_display->s, new_uri->len, new_uri->s); - /* duplicate the decoded value */ - p = pkg_malloc( new_uri->len); - if (!p) { - PKG_MEM_ERROR; - return; - } - memcpy( p, new_uri->s, new_uri->len); - - /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); - if (l==0) { - LM_ERR("del lump failed\n"); - goto free; - } - - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { - LM_ERR("insert new lump failed\n"); - goto free; - } - /* deal with display name */ l = 0; /* first remove the existing display */ @@ -972,8 +952,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, l = del_lump(msg, body->display.s-msg->buf, body->display.len, 0); if (l==0) { LM_ERR("display del lump failed\n"); - goto free; - } + return; + } } if (new_display->s && new_display->len > 0) { LM_DBG("inserting display [%.*s]\n", @@ -982,20 +962,40 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.s = pkg_malloc(new_display->len + 2); if (buf.s==0) { PKG_MEM_ERROR; - goto free; + return; } memcpy( buf.s, new_display->s, new_display->len); buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free2; + goto free1; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free2; + goto free1; } } + /* uri update - duplicate the decoded value */ + p = pkg_malloc( new_uri->len); + if (!p) { + PKG_MEM_ERROR; + goto free1; + } + memcpy( p, new_uri->s, new_uri->len); + + /* build del/add lumps */ + l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + if (l==0) { + LM_ERR("del lump failed\n"); + goto free2; + } + + if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + LM_ERR("insert new lump failed\n"); + goto free2; + } + /* register tm callback to change replies, * but only if not registered earlier */ if (!(msg->msg_flags & (FL_USE_UAC_FROM|FL_USE_UAC_TO)) && @@ -1009,10 +1009,10 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; free2: - pkg_free(buf.s); - -free: pkg_free(p); + +free1: + pkg_free(buf.s); }

1 0

[kamailio/kamailio] SIP Header 'Replaces' Support in Module RTPENGINE for 3GPP SRVCC functionality (#2473)
by Hamid R. Hashmi 07 Sep '20

07 Sep '20

Do Module RTPENGINE Supports 'Replaces' header (RFC 3891), if yes then how to use this feature, if no then will module RTPEngine will have support for 'Replaces' in the near future? I have been using Freeswitch for this functionality but facing many difficulties in it. -- 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/2473

2 2

git:5.4:e1d4ddcb: pv_headers: fix $x_hdr index on get
by Victor Seva 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.4 Commit: e1d4ddcb6c517f8fc3d688728f4d1310c5149352 URL: https://github.com/kamailio/kamailio/commit/e1d4ddcb6c517f8fc3d688728f4d131… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-04T16:11:54+02:00 pv_headers: fix $x_hdr index on get * previously we where not supporting pseudo-variables as index (cherry picked from commit 492c99e8065baa510f55154593122e33d3a61d73) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/e1d4ddcb6c517f8fc3d688728f4d131… Patch: https://github.com/kamailio/kamailio/commit/e1d4ddcb6c517f8fc3d688728f4d131… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index ad5ba9ddac..7cba757456 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -539,38 +539,33 @@ int pvh_get_header(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) sr_xavp_t *xavi = NULL; sr_xval_t *xval = NULL; pv_value_t tv; - str hname = STR_NULL; - int idx = 0; + str *hname = NULL; + int idx, idxf; int cnt = 0; - idx = param->pvi.u.ival; + if(pv_get_spec_name(msg, param, &tv) != 0 || (!(tv.flags & PV_VAL_STR))) { + LM_ERR("invalid header name, must be a string\n"); + return -1; + } + hname = &tv.rs; - if(param->pvn.type == PV_NAME_PVAR) { - if(pv_get_spec_value(msg, (pv_spec_p)(param->pvn.u.dname), &tv) != 0) { - LM_ERR("cannot get avp value\n"); - return -1; - } - if(!(tv.flags & PV_VAL_STR)) { - return pv_get_null(msg, param, res); - } - hname = tv.rs; - } else if(param->pvn.u.isname.type == AVP_NAME_STR) { - hname = param->pvn.u.isname.name.s; - } else { - return pv_get_null(msg, param, res); + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf) != 0) { + LM_ERR("invalid index\n"); + return -1; } if(idx < 0) { - if((xavi = pvh_xavi_get_child(msg, &xavi_name, &hname)) == NULL) + if((xavi = pvh_xavi_get_child(msg, &xavi_name, hname)) == NULL) cnt = 0; else - cnt = xavi_count(&hname, &xavi); + cnt = xavi_count(hname, &xavi); idx = idx + cnt; if(idx < 0) - pv_get_null(msg, param, res); + return pv_get_null(msg, param, res); } - xval = pvh_xavi_get_value(msg, &xavi_name, &hname, idx); + xval = pvh_xavi_get_value(msg, &xavi_name, hname, idx); if(xval == NULL || !xval->v.s.s) return pv_get_null(msg, param, res);

1 0

git:master:492c99e8: pv_headers: fix $x_hdr index on get
by Victor Seva 04 Sep '20

04 Sep '20

Module: kamailio Branch: master Commit: 492c99e8065baa510f55154593122e33d3a61d73 URL: https://github.com/kamailio/kamailio/commit/492c99e8065baa510f55154593122e3… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-04T16:11:03+02:00 pv_headers: fix $x_hdr index on get * previously we where not supporting pseudo-variables as index --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/492c99e8065baa510f55154593122e3… Patch: https://github.com/kamailio/kamailio/commit/492c99e8065baa510f55154593122e3… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index ad5ba9ddac..7cba757456 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -539,38 +539,33 @@ int pvh_get_header(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) sr_xavp_t *xavi = NULL; sr_xval_t *xval = NULL; pv_value_t tv; - str hname = STR_NULL; - int idx = 0; + str *hname = NULL; + int idx, idxf; int cnt = 0; - idx = param->pvi.u.ival; + if(pv_get_spec_name(msg, param, &tv) != 0 || (!(tv.flags & PV_VAL_STR))) { + LM_ERR("invalid header name, must be a string\n"); + return -1; + } + hname = &tv.rs; - if(param->pvn.type == PV_NAME_PVAR) { - if(pv_get_spec_value(msg, (pv_spec_p)(param->pvn.u.dname), &tv) != 0) { - LM_ERR("cannot get avp value\n"); - return -1; - } - if(!(tv.flags & PV_VAL_STR)) { - return pv_get_null(msg, param, res); - } - hname = tv.rs; - } else if(param->pvn.u.isname.type == AVP_NAME_STR) { - hname = param->pvn.u.isname.name.s; - } else { - return pv_get_null(msg, param, res); + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf) != 0) { + LM_ERR("invalid index\n"); + return -1; } if(idx < 0) { - if((xavi = pvh_xavi_get_child(msg, &xavi_name, &hname)) == NULL) + if((xavi = pvh_xavi_get_child(msg, &xavi_name, hname)) == NULL) cnt = 0; else - cnt = xavi_count(&hname, &xavi); + cnt = xavi_count(hname, &xavi); idx = idx + cnt; if(idx < 0) - pv_get_null(msg, param, res); + return pv_get_null(msg, param, res); } - xval = pvh_xavi_get_value(msg, &xavi_name, &hname, idx); + xval = pvh_xavi_get_value(msg, &xavi_name, hname, idx); if(xval == NULL || !xval->v.s.s) return pv_get_null(msg, param, res);

1 0

[kamailio/kamailio] keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm (#2462)
by Nacho G. 04 Sep '20

04 Sep '20

- This avoids a race condition that may happen processing tm_request callbacl - Allows to identify uniquely a ka_dest record   #### 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 - [x] Related to issue #2448 #### Description  Check issue You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2462 -- Commit Summary -- * keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm -- File Changes -- M src/modules/keepalive/keepalive.h (5) M src/modules/keepalive/keepalive_api.c (39) M src/modules/keepalive/keepalive_core.c (15) M src/modules/keepalive/keepalive_mod.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2462.patch https://github.com/kamailio/kamailio/pull/2462.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/2462

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2020