sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
165 discussions

git: new commits in branch 5.8
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

- URL: https://github.com/kamailio/kamailio/commit/e11c132cbf57ea1ae6289e734f60110… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:52:15+02:00 stun: check message len for response (cherry picked from commit 87e1a4a7f5d565a59a362f22e9372697f2f2f2af) - URL: https://github.com/kamailio/kamailio/commit/a3f40f3c407d34b25717416b3ac500e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:52:51+02:00 rls: remove unnecessary assignment (cherry picked from commit c97145862119e9001874cd07de9b20ad8e96ff54) - URL: https://github.com/kamailio/kamailio/commit/ffa4eeded62507f15e4e9b26aa5b3ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:53:05+02:00 pua: use long for time value diff operation (cherry picked from commit fc8bee5b87e95e43bda2635e65457b2025eab6f9) - URL: https://github.com/kamailio/kamailio/commit/743ebe918b89a42ce94b10fb9dc2fe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:53:38+02:00 evrexec: remove unnecessary safety exit loop (cherry picked from commit d5076b557728b3f9d80df391ae71e2eab2c896dc) - URL: https://github.com/kamailio/kamailio/commit/89339b1fa6f08024a44d898ed9877f0… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-08-27T12:54:11+02:00 nathelper: fixed handle_ruri_alias() for alias being an IPv6 (cherry picked from commit 52ab6f3dcf5ad8d967be8bdecaa64ef31cbfbe33) - URL: https://github.com/kamailio/kamailio/commit/fc29c81bbc6e3fb0709e3367e2f1d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:54:43+02:00 core: remove unnecessary cleanup when locating a module (cherry picked from commit eda03789f693bb72ec4ee05a8b2b4723e5080504) - URL: https://github.com/kamailio/kamailio/commit/0ffd281b77ac48f24c04655cd962b48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:55:43+02:00 dispatcher: remove reference to MI in comments (cherry picked from commit 8c3b5ab3818c86b90b02e20aa4631654e0b51745) - URL: https://github.com/kamailio/kamailio/commit/b307c7eb8e58b43dca41deb3493b088… Author: emvondo <106535097+emvondo(a)users.noreply.github.com> Date: 2024-08-27T12:56:17+02:00 siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919) * siprepo: fix int params and wrong copy data in siprepo_msg_async_pull --------- Co-authored-by: emvondo <bycl2332(a)orange.com> (cherry picked from commit a3a63655dbcbf1bc8067f34c36f4a7295b2a1745) - URL: https://github.com/kamailio/kamailio/commit/92a3cc4549073d70b1b229149b29017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:56:27+02:00 core: init res inside select_cfg_var() (cherry picked from commit a471d34d6162387a1427f5d0c5b3c6079a2b0bdc) - URL: https://github.com/kamailio/kamailio/commit/d69e65fa4e9448701729ac8f41b069d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:56:42+02:00 core: set digit 0 in the md5 buffer in case of error inside char_msg_val() (cherry picked from commit 15b2a5467f11e009ae4efad1ee29af860326095f) - URL: https://github.com/kamailio/kamailio/commit/7ca33c475b52703216f7d8d4e6c7853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:57:11+02:00 core: remove unnecessary check after using the structure (cherry picked from commit 84ea36b4b79c07c4fc0a8c9e119184433353764e) - URL: https://github.com/kamailio/kamailio/commit/445659c38bd54e26d085d8c5b07bfb8… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2024-08-27T12:57:27+02:00 tcpops: fix memory leak in $tcp(conid) - reference counter to tcp session not decremented, so shm for session never free (cherry picked from commit acf50d86b502af36e3635d61745feaa5c577231d) - URL: https://github.com/kamailio/kamailio/commit/39d4d48abf9e3e2e1edd2f22780fb1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:09+02:00 core: removed unnecessary destroy (cherry picked from commit 20f2096d314253e7e74688da664de2830289a276) - URL: https://github.com/kamailio/kamailio/commit/fa8f0a401980f5dccdfe35983fb5b55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:26+02:00 topoh: 0-init alocated structures (cherry picked from commit dc71c0a5791ebc1306648b5ed338613050e32f5c) - URL: https://github.com/kamailio/kamailio/commit/e006c2c53d6b013253f6a95b96c0f81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:33+02:00 xprint: check to avoid double free (cherry picked from commit 5a1f80f266069dbc453b44a856f225c254e7c050) - URL: https://github.com/kamailio/kamailio/commit/4732a4a88df9f4cbd2260564b942691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:53+02:00 tls: remove uselss pv format parsing in pv_parse_alt_name() (cherry picked from commit 7c06997a1b6e77ae0642d369f532219dc35ef8e0) - URL: https://github.com/kamailio/kamailio/commit/dd4d5e44a60a658772e8288d9419359… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:02+02:00 tls: check lenght when parsing pv alt name (cherry picked from commit 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4) - URL: https://github.com/kamailio/kamailio/commit/e016d1ada08edca0adacd42ffa67ffd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:11+02:00 utils: jump to error on pkg allocation failure (cherry picked from commit 34749ab13b31504358761c964f794b283931394c) - URL: https://github.com/kamailio/kamailio/commit/f57accd1820b26b40f14d4204654021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:20+02:00 erlang: init xavps for safety destroy on error (cherry picked from commit 29510872607deb3238411b358c422d004fb307b7) - URL: https://github.com/kamailio/kamailio/commit/c447bf60d528d8fdc1f5aee52a796ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:31+02:00 jsonrpcc: free allocated pkg buffer on error (cherry picked from commit 796bcc038d7885e01dbad34abc68bf612062c533) - URL: https://github.com/kamailio/kamailio/commit/5baf49a179194ba0eaa5e7f4caba613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:38+02:00 jsonrpcc: declare variables are the beginning of function (cherry picked from commit 7ba313f6f96ffa6042c163027c0c7bb65106fef7) - URL: https://github.com/kamailio/kamailio/commit/61eb4fe44e66a952ba14e39e1c66487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:50+02:00 core: cfg select - check res before initializing (cherry picked from commit a6c415713bb209b03ff110d4ae891173d04ac471) - URL: https://github.com/kamailio/kamailio/commit/f8201e6d4848081a2dd564e0d5b216f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:10+02:00 janssonrpcc: free new servers list on error (cherry picked from commit b4efe7725728392d0c8921c006d6fbc6455e9b8f) - URL: https://github.com/kamailio/kamailio/commit/bbfb24d3cb841b37e6e1b84892b68da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:21+02:00 xprint: return on mod init error case (cherry picked from commit 660a019263b81d318700c205531bf4e042c912cf) - URL: https://github.com/kamailio/kamailio/commit/dfc2531cf7db70e315613b3242d1b5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:33+02:00 core: cfg select - check res when getting the variable (cherry picked from commit 3333611a3ef9078cbcb9867db88921f0c48fce1b) - URL: https://github.com/kamailio/kamailio/commit/1eb7db2f18724b91d18c6b30b529b51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:40+02:00 db_berkeley: buffer size set to the argument of strftime() (cherry picked from commit e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b) - URL: https://github.com/kamailio/kamailio/commit/bc8ea1022718c94fbdf9bb93c35759e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:58+02:00 core: tcp - use long long constants for operations (cherry picked from commit fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52) - URL: https://github.com/kamailio/kamailio/commit/2e4920fd292b6f1d064a75503dd3be3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:06+02:00 cplc: use long long constants for operations (cherry picked from commit 49a9c0a0f391c2e9fc45dff7c37a087dde0f7ba3) - URL: https://github.com/kamailio/kamailio/commit/e14522cab01eba9c5fa636a7c0f6ed4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:31+02:00 corex: small formatting of iflag list (cherry picked from commit 70606e3ea575228b3ccc662d6f9048aa0eb899ce) - URL: https://github.com/kamailio/kamailio/commit/d102f40856512d2c51707bf5ec5a6c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:41+02:00 corex: proper check for iflag lookup return code (cherry picked from commit fdb0ef987ca2b013104b06ece006f67bf8ae07d3) - URL: https://github.com/kamailio/kamailio/commit/a024fb3c028b8df18a9b855fff99bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:52+02:00 corex: switch to unsigned long long for iflag lookup (cherry picked from commit 072c44330297c653675b5078fb0facdc399a5ab4) - URL: https://github.com/kamailio/kamailio/commit/57b9c66cb7811c045caceb2f61047e0… Author: Morten Tryfoss <morten(a)tryfoss.no> Date: 2024-08-27T14:22:30+02:00 cdp: Error log caused crash (cherry picked from commit 4aaaca60ef2207100dd3f4e16ae63428aadc7dc5) - URL: https://github.com/kamailio/kamailio/commit/92e999228eb75856911386d280ab483… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:22:53+02:00 phonenum: export match_cn() to kemi (cherry picked from commit e9dd041ce6af9ee4b9cc2e29b4417787a8056776) - URL: https://github.com/kamailio/kamailio/commit/e9d5d37271e03cdec6cf87647e488c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:03+02:00 phonenum: add fixup free functions to exports structure (cherry picked from commit 7d2fd09103680454aaaba30f5e46f83b362513eb) - URL: https://github.com/kamailio/kamailio/commit/ee5853b4eab6553821113ff64e9eed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:36+02:00 msilo: added fixup free functions to exports structure (cherry picked from commit b6dea98ada293a3bbad004aa1b194d4bf44a60ab) - URL: https://github.com/kamailio/kamailio/commit/f32d67f1b4b08a8cc8dbae917e1a2d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:45+02:00 msilo: removed duplicatred exported function (cherry picked from commit b712ddc4db9a9c1bb30b236a0a86082108b23f07) - URL: https://github.com/kamailio/kamailio/commit/b2bfdd8eb6b40b1e70a2876cee46890… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T14:24:27+02:00 pua_dialoginfo: add section ID's to documentation (cherry picked from commit aba56a5aa3b8fa4f07d0c52cd7fd2d56103ca56c) - URL: https://github.com/kamailio/kamailio/commit/6a22677e281de00dc0088ad23d7c7a5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T14:24:46+02:00 pua_dialoginfo: reformat exported structures more human friendly (cherry picked from commit 748da56717800c36c43bb6fe3739011f3d3105e0) - URL: https://github.com/kamailio/kamailio/commit/a9769ca3692f11fe36e86b29af37d94… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Date: 2024-08-27T14:29:05+02:00 pua_reginfo: free pkg memory after getting the content of each XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs. (cherry picked from commit ed6730aa64e0e7c1580584d6f808e76a665e5882) - URL: https://github.com/kamailio/kamailio/commit/2dbc8b5bf3353fdd3b05f265075e6a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:30:17+02:00 core: use defined type for flags inside build_req_buf_from_sip_req() - partial backport from 9ff1080cc6452343e6bc2de00350b2f7bcecf6d2

1 0

git:master:7a390e0a: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 7a390e0a297278b6d319c78f74b8179ed6a25c3b URL: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T12:46:11+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… Patch: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 35c2e5d0ec0..dbeff43d002 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1631,8 +1631,12 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) 3.44. headers_mode (int) - Control if headers from incoming CANCEL should be propagated to - hop-by-hop generated CANCEL. + Control how headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. If bit (flag) 1 is set (value 1), + propagate the headers that are not branch specific (e.g., From, To). If + bit (flag) 2 is set, in case processing ends in stateless forwarding by + tm, forward CANCEL with a single Via header (the one added by + Kamailio). Default value: 0 (do not propagate).

1 0

git:master:b67bb7a1: tm: docs for header_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: b67bb7a1bc4c710d33e242cea94a192297660c75 URL: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:42:13+02:00 tm: docs for header_mode flag 2 --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Patch: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ffef9a4eec3..e8a16182e42 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1377,8 +1377,12 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) <section id="headers_mode"> <title><varname>headers_mode</varname> (int)</title> <para> - Control if headers from incoming CANCEL should be propagated to - hop-by-hop generated CANCEL. + Control how headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. If bit (flag) 1 is set (value 1), + propagate the headers that are not branch specific (e.g., From, To). + If bit (flag) 2 is set, in case processing ends in stateless + forwarding by tm, forward CANCEL with a single Via header (the one + added by &kamailio;). </para> <para> Default value: 0 (do not propagate).

1 0

git:master:f409ffa0: corex: handle return code from core functions for uac forwarding
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: f409ffa05fcefc11dbfaef0cfedcc7cee0911b2a URL: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: handle return code from core functions for uac forwarding --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… Patch: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 585b65b0836..021ed586253 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -279,7 +279,13 @@ static void mod_destroy(void) */ static int ki_forward_uac(sip_msg_t *msg, str *vuri) { - return forward_uac_uri(msg, NULL); + int ret; + + ret = forward_uac_uri(msg, NULL); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -287,7 +293,13 @@ static int ki_forward_uac(sip_msg_t *msg, str *vuri) */ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { - return forward_uac_uri(msg, vuri); + int ret; + + ret = forward_uac_uri(msg, vuri); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -295,7 +307,13 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) */ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) { - return forward_uac_uri(msg, NULL); + int ret; + + ret = forward_uac_uri(msg, NULL); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -303,6 +321,7 @@ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) */ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) { + int ret; str vuri = STR_NULL; if(fixup_get_svalue(msg, (gparam_t *)puri, &vuri)) { @@ -310,7 +329,11 @@ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) return -1; } - return forward_uac_uri(msg, &vuri); + ret = forward_uac_uri(msg, &vuri); + if(ret >= 0) { + return 1; + } + return -1; } /**

1 0

git:master:31c77b2f: core: propagate return code for forward uac helpers
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 31c77b2f81e23666fbd8d6d249d6b8ddce06483a URL: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: propagate return code for forward uac helpers --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… Patch: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… --- diff --git a/src/core/forward.c b/src/core/forward.c index 97953ee7b85..ff73d957642 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -688,6 +688,9 @@ int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request in stateless mode + */ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info) { @@ -695,6 +698,9 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request like initial uac sender, with only one via + */ int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info) { @@ -723,11 +729,8 @@ int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode(msg, dst, port, send_info, BUILD_NO_VIA1_UPDATE); msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - return -1; + return ret; } /** @@ -787,11 +790,8 @@ int forward_uac_uri(sip_msg_t *msg, str *vuri) ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - return -1; + return ret; } int update_sock_struct_from_via(

1 0

git:master:efcb697e: corex: export to kemi the forward uac functions
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: efcb697e34f767ccb243c181c9d557d136eada2e URL: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: export to kemi the forward uac functions --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… Patch: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index a5d05dbaea2..585b65b0836 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -274,6 +274,14 @@ static void mod_destroy(void) { } +/** + * forward request like initial uac sender, with only one via + */ +static int ki_forward_uac(sip_msg_t *msg, str *vuri) +{ + return forward_uac_uri(msg, NULL); +} + /** * forward request like initial uac sender, with only one via */ @@ -1528,6 +1536,16 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("forward_uac"), + SR_KEMIP_INT, ki_forward_uac, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("forward_uac_uri"), + SR_KEMIP_INT, ki_forward_uac_uri, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:69b43802: tm: new headers_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 69b4380222121321412afc70dfafe39961551f41 URL: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 tm: new headers_mode flag 2 - statelss uac-style forwarding of CANCEL --- Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Patch: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index cf30afedfa7..9568b6adb1b 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -61,6 +61,7 @@ extern int tm_failure_exec_mode; extern int tm_dns_reuse_rcv_socket; +extern int tm_headers_mode; static int goto_on_branch = 0, branch_route = 0; /* E2E_CANCEL_HOP_BY_HOP - cancel hop by hop */ @@ -1902,7 +1903,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, #endif /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, &host, port, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, &host, port, &dst); + } goto end; } else { init_dest_info(&dst); @@ -1910,7 +1915,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, proxy2su(&dst.to, proxy); /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, 0, 0, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, 0, 0, &dst); + } goto end; } } diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 49c801d2e8f..9adc4613421 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -70,7 +70,6 @@ (_d) += (_len); \ } while(0) -#define TM_CANCEL_HEADERS_COPY 1 extern int tm_headers_mode; /* Build a local request based on a previous request; main diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index c06d1e6adf6..f6ad810d377 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -28,6 +28,9 @@ #include "h_table.h" #include "t_reply.h" +#define TM_CANCEL_HEADERS_COPY (1) +#define TM_CANCEL_FORWARD_UAC (1 << 1) + char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to, sip_msg_t *imsg, struct cancel_reason *reason);

1 0

git:master:233dda7b: core: helper function to forward uac style with dst attributes
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 233dda7b9a1ca6954c35f2f0b271cb9bc4c813d9 URL: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: helper function to forward uac style with dst attributes --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Patch: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 3d2e743cdbd..97953ee7b85 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -695,6 +695,41 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info) +{ + int ret; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode(msg, dst, port, send_info, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + /** * forward request like initial uac sender, with only one via */ diff --git a/src/core/forward.h b/src/core/forward.h index 5b414a7a64b..31086c6512b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,8 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info); int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

git:master:f58c1a0b: corex: updates to forward-uac functions after code relocation
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: f58c1a0b74cce2f3abca540d0d6cb826d3d7b637 URL: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: updates to forward-uac functions after code relocation --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Patch: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c6852759114..a5d05dbaea2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -279,63 +279,7 @@ static void mod_destroy(void) */ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { - int ret; - dest_info_t dst; - sip_uri_t *u; - sip_uri_t next_hop; - sr_lump_t *anchor; - hdr_field_t *hf; - msg_flags_t msg_flags_bk; - - if(msg == NULL) { - LM_WARN("invalid msg parameter\n"); - return -1; - } - - if(parse_headers(msg, HDR_EOH_F, 0) == -1) { - LM_ERR("error while parsing message\n"); - return -1; - } - /* remove incoming Via headers */ - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->type != HDR_VIA_T) { - continue; - } - anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - if(anchor == 0) { - LM_ERR("cannot remove Via header\n"); - return -1; - } - } - - init_dest_info(&dst); - if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { - if(msg->dst_uri.len) { - ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); - u = &next_hop; - } else { - ret = parse_sip_msg_uri(msg); - u = &msg->parsed_uri; - } - } else { - ret = parse_uri(vuri->s, vuri->len, &next_hop); - u = &next_hop; - } - if(ret < 0) { - LM_ERR("forward - bad uri dropping packet\n"); - return -1; - } - dst.proto = u->proto; - msg_flags_bk = msg->msg_flags; - msg->msg_flags |= FL_VIA_NORECEIVED; - ret = forward_request_mode( - msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); - msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - - return -1; + return forward_uac_uri(msg, vuri); } /** @@ -343,7 +287,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) */ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) { - return ki_forward_uac_uri(msg, NULL); + return forward_uac_uri(msg, NULL); } /** @@ -358,7 +302,7 @@ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) return -1; } - return ki_forward_uac_uri(msg, &vuri); + return forward_uac_uri(msg, &vuri); } /**

1 0

git:master:a8162b51: core: relocated function for stateless forwarding uac style
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: a8162b513443fd688ab66e470748cc948c811a6a URL: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: relocated function for stateless forwarding uac style --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Patch: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 1d2b1d5d650..3d2e743cdbd 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -40,6 +40,7 @@ #include "hash_func.h" #include "config.h" #include "parser/msg_parser.h" +#include "parser/parse_uri.h" #include "char_msg_val.h" #include "route.h" #include "events.h" @@ -694,6 +695,70 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request like initial uac sender, with only one via + */ +int forward_uac_uri(sip_msg_t *msg, str *vuri) +{ + int ret; + dest_info_t dst; + sip_uri_t *u; + sip_uri_t next_hop; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(msg == NULL) { + LM_WARN("invalid msg parameter\n"); + return -1; + } + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + init_dest_info(&dst); + if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + } else { + ret = parse_uri(vuri->s, vuri->len, &next_hop); + u = &next_hop; + } + if(ret < 0) { + LM_ERR("forward - bad uri dropping packet\n"); + return -1; + } + dst.proto = u->proto; + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode( + msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via) { diff --git a/src/core/forward.h b/src/core/forward.h index a90ce3446ce..5b414a7a64b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,7 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024