- sr-dev - kamailio.org

git:master:e052fd85: dispatcher: extend documentation about default behaviour with missing match mode
by Henning Westerholt 10 Jun '22

10 Jun '22

Module: kamailio Branch: master Commit: e052fd8507115065b566912a6146dce329b19408 URL: https://github.com/kamailio/kamailio/commit/e052fd8507115065b566912a6146dce… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-06-10T07:08:24Z dispatcher: extend documentation about default behaviour with missing match mode --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e052fd8507115065b566912a6146dce… Patch: https://github.com/kamailio/kamailio/commit/e052fd8507115065b566912a6146dce… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index a910b8480c5..1c9de29ba78 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1764,8 +1764,10 @@ if(ds_list_exists("10")) { </listitem> <listitem> <para><emphasis>mode</emphasis> - (optional) - a bitmask to specify - how the matching should be done. If parameter is 0, all ip, port and - proto are matched and active status is ignored. + how the matching should be done. If the parameter is missing, + the matching is done with ignoring the protocol (value 2). + If parameter is 0, all ip, port and proto are matched and + active status is ignored. If bit one is set, then port is ignored. If bit two is set, then protocol is ignored. If bit three is set, then state must be active. The parameter

1 0

git:5.6:1dfca366: app_python3: call PyOS_AfterFork_Child() only in child processes
by Anthony Alba 09 Jun '22

09 Jun '22

Module: kamailio Branch: 5.6 Commit: 1dfca366a8eb781bfd178e01378d2f7333c67956 URL: https://github.com/kamailio/kamailio/commit/1dfca366a8eb781bfd178e01378d2f7… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-10T00:02:02+08:00 app_python3: call PyOS_AfterFork_Child() only in child processes - GH #3125: we should not call PyOS_AfterFork_Child() in the main process. (cherry picked from commit 69b4b6222e) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1dfca366a8eb781bfd178e01378d2f7… Patch: https://github.com/kamailio/kamailio/commit/1dfca366a8eb781bfd178e01378d2f7… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index eb46f54f50..d250640e0c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,19 +200,19 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 - /* this is causing abort on Python 3.8+ GH#3125 - * skip for now PyOS_AfterFork_Parent() ; - */ #endif return 0; } _apy_process_rank = rank; + + if (rank > 0) { #if PY_VERSION_HEX >= 0x03070000 - PyOS_AfterFork_Child(); + PyOS_AfterFork_Child(); #else - PyOS_AfterFork(); + PyOS_AfterFork(); #endif + } if (cfg_child_init()) { return -1; }

1 0

git:master:251bb745: app_python3: call PyOS_AfterFork_Child() only in child processes
by Anthony Alba 09 Jun '22

09 Jun '22

Module: kamailio Branch: master Commit: 251bb74535594629499dfd2bb2cebfb4d728a260 URL: https://github.com/kamailio/kamailio/commit/251bb74535594629499dfd2bb2cebfb… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-09T23:53:48+08:00 app_python3: call PyOS_AfterFork_Child() only in child processes - GH #3125: we should not call PyOS_AfterFork_Child() in the main process. --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/251bb74535594629499dfd2bb2cebfb… Patch: https://github.com/kamailio/kamailio/commit/251bb74535594629499dfd2bb2cebfb… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index eb46f54f50..d250640e0c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,19 +200,19 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 - /* this is causing abort on Python 3.8+ GH#3125 - * skip for now PyOS_AfterFork_Parent() ; - */ #endif return 0; } _apy_process_rank = rank; + + if (rank > 0) { #if PY_VERSION_HEX >= 0x03070000 - PyOS_AfterFork_Child(); + PyOS_AfterFork_Child(); #else - PyOS_AfterFork(); + PyOS_AfterFork(); #endif + } if (cfg_child_init()) { return -1; }

1 0

git:5.6:b7162ce2: app_python3: workaround for abort in Python 3.8+
by Anthony Alba 09 Jun '22

09 Jun '22

Module: kamailio Branch: 5.6 Commit: b7162ce2eb239cb9e9f4152440951e3aade411d3 URL: https://github.com/kamailio/kamailio/commit/b7162ce2eb239cb9e9f4152440951e3… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-09T21:32:02+08:00 app_python3: workaround for abort in Python 3.8+ - GH #3125 (cherry picked from commit 73db408a4a) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b7162ce2eb239cb9e9f4152440951e3… Patch: https://github.com/kamailio/kamailio/commit/b7162ce2eb239cb9e9f4152440951e3… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index f710694d755..eb46f54f505 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,7 +200,10 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 + /* this is causing abort on Python 3.8+ GH#3125 + * skip for now PyOS_AfterFork_Parent() ; + */ #endif return 0; }

1 0

git:master:73db408a: app_python3: workaround for abort in Python 3.8+
by Anthony Alba 09 Jun '22

09 Jun '22

Module: kamailio Branch: master Commit: 73db408a4a1d58d8fd4c7950ede7ac3a18f3355c URL: https://github.com/kamailio/kamailio/commit/73db408a4a1d58d8fd4c7950ede7ac3… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-09T21:24:44+08:00 app_python3: workaround for abort in Python 3.8+ --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/73db408a4a1d58d8fd4c7950ede7ac3… Patch: https://github.com/kamailio/kamailio/commit/73db408a4a1d58d8fd4c7950ede7ac3… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index f710694d755..eb46f54f505 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,7 +200,10 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 + /* this is causing abort on Python 3.8+ GH#3125 + * skip for now PyOS_AfterFork_Parent() ; + */ #endif return 0; }

1 0

git:master:75bdb84c: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 08 Jun '22

08 Jun '22

Module: kamailio Branch: master Commit: 75bdb84c8eff081f74cee383307769861c8e4500 URL: https://github.com/kamailio/kamailio/commit/75bdb84c8eff081f74cee3833077698… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-08T23:31:21+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/75bdb84c8eff081f74cee3833077698… Patch: https://github.com/kamailio/kamailio/commit/75bdb84c8eff081f74cee3833077698… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index 8b03c3849f..e5ba03d8fb 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -320,7 +320,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ...

1 0

git:master:2a744a58: sipdump: docs - sync example with description
by Daniel-Constantin Mierla 08 Jun '22

08 Jun '22

Module: kamailio Branch: master Commit: 2a744a58c57542520e4ff4c73b1419a083b17076 URL: https://github.com/kamailio/kamailio/commit/2a744a58c57542520e4ff4c73b1419a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-08T23:23:09+02:00 sipdump: docs - sync example with description --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2a744a58c57542520e4ff4c73b1419a… Patch: https://github.com/kamailio/kamailio/commit/2a744a58c57542520e4ff4c73b1419a… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index f0dd9fc1b4b..3bcdc31fc46 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -346,7 +346,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ... </programlisting>

1 0

[kamailio/kamailio] Crash when length($uac_req(callid)) > 128 (Issue #3135)
by hance2010 07 Jun '22

07 Jun '22

### Description Crash when length($uac_req(callid)) > 128 ### Troubleshooting #### Reproduction ``` function send_options() local KAM_DOMAIN = "192.168.100.131" -- length(callid) is 129 local callid = "0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0000000" local tu = "sip:1001@" .. KAM_DOMAIN local sut = "sip:192.168.100.132:5080" KSR.pv.sets("$uac_req(method)", "OPTIONS") KSR.pv.sets("$uac_req(callid)", callid) KSR.pv.sets("$uac_req(furi)", "sip:" .. "kamailio" .. "@" .. KAM_DOMAIN) KSR.pv.sets("$uac_req(ruri)", tu) KSR.pv.sets("$uac_req(turi)", tu) KSR.pv.sets("$uac_req(ouri)", sut) KSR.pv.seti("$uac_req(evroute)", 1) KSR.uac.uac_req_send() end ``` #### Debugging Data  #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions https://github.com/kamailio/kamailio/blob/5.5/src/modules/uac/uac_send.c#L4… check len ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` Kamailio5.5.4 ``` * **Operating System**:  ``` Debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3135 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3135(a)github.com>

2 2

git:5.4:fb20b043: uac: check new callid value for setting $uac_req() field
by Daniel-Constantin Mierla 07 Jun '22

07 Jun '22

Module: kamailio Branch: 5.4 Commit: fb20b043862b5146f4e4ea34e921a334783ad03d URL: https://github.com/kamailio/kamailio/commit/fb20b043862b5146f4e4ea34e921a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-07T09:19:41+02:00 uac: check new callid value for setting $uac_req() field - GH #3135 (cherry picked from commit 0eeb4cc61f4a340ef5f8d4acf1d4ea20eb711f73) (cherry picked from commit 69b4b6222edd43a935524e69497c1e7ab1148488) (cherry picked from commit 4694656f12179f9bdc6a5d608c45487d67a3aee0) --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/fb20b043862b5146f4e4ea34e921a33… Patch: https://github.com/kamailio/kamailio/commit/fb20b043862b5146f4e4ea34e921a33… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index d906a1c27f..0161f667ed 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -422,6 +422,11 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, LM_ERR("Invalid value type\n"); return -1; } + if(tval->rs.len>=128) + { + LM_ERR("Value size too big\n"); + return -1; + } memcpy(_uac_req.s_callid.s, tval->rs.s, tval->rs.len); _uac_req.s_callid.s[tval->rs.len] = '\0'; _uac_req.s_callid.len = tval->rs.len;

1 0

git:5.5:4694656f: uac: check new callid value for setting $uac_req() field
by Daniel-Constantin Mierla 07 Jun '22

07 Jun '22

Module: kamailio Branch: 5.5 Commit: 4694656f12179f9bdc6a5d608c45487d67a3aee0 URL: https://github.com/kamailio/kamailio/commit/4694656f12179f9bdc6a5d608c45487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-07T09:19:00+02:00 uac: check new callid value for setting $uac_req() field - GH #3135 (cherry picked from commit 0eeb4cc61f4a340ef5f8d4acf1d4ea20eb711f73) (cherry picked from commit 69b4b6222edd43a935524e69497c1e7ab1148488) --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/4694656f12179f9bdc6a5d608c45487… Patch: https://github.com/kamailio/kamailio/commit/4694656f12179f9bdc6a5d608c45487… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index d906a1c27f..0161f667ed 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -422,6 +422,11 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, LM_ERR("Invalid value type\n"); return -1; } + if(tval->rs.len>=128) + { + LM_ERR("Value size too big\n"); + return -1; + } memcpy(_uac_req.s_callid.s, tval->rs.s, tval->rs.len); _uac_req.s_callid.s[tval->rs.len] = '\0'; _uac_req.s_callid.len = tval->rs.len;

1 0

git:5.6:69b4b622: uac: check new callid value for setting $uac_req() field
by Daniel-Constantin Mierla 07 Jun '22

07 Jun '22

Module: kamailio Branch: 5.6 Commit: 69b4b6222edd43a935524e69497c1e7ab1148488 URL: https://github.com/kamailio/kamailio/commit/69b4b6222edd43a935524e69497c1e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-07T09:18:20+02:00 uac: check new callid value for setting $uac_req() field - GH #3135 (cherry picked from commit 0eeb4cc61f4a340ef5f8d4acf1d4ea20eb711f73) --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/69b4b6222edd43a935524e69497c1e7… Patch: https://github.com/kamailio/kamailio/commit/69b4b6222edd43a935524e69497c1e7… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index be04464cae..7a43cdcc4d 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -424,6 +424,11 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, LM_ERR("Invalid value type\n"); return -1; } + if(tval->rs.len>=128) + { + LM_ERR("Value size too big\n"); + return -1; + } memcpy(_uac_req.s_callid.s, tval->rs.s, tval->rs.len); _uac_req.s_callid.s[tval->rs.len] = '\0'; _uac_req.s_callid.len = tval->rs.len;

1 0

git:master:0eeb4cc6: uac: check new callid value for setting $uac_req() field
by Daniel-Constantin Mierla 07 Jun '22

07 Jun '22

Module: kamailio Branch: master Commit: 0eeb4cc61f4a340ef5f8d4acf1d4ea20eb711f73 URL: https://github.com/kamailio/kamailio/commit/0eeb4cc61f4a340ef5f8d4acf1d4ea2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-07T09:15:35+02:00 uac: check new callid value for setting $uac_req() field - GH #3135 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/0eeb4cc61f4a340ef5f8d4acf1d4ea2… Patch: https://github.com/kamailio/kamailio/commit/0eeb4cc61f4a340ef5f8d4acf1d4ea2… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index be04464cae..7a43cdcc4d 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -424,6 +424,11 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, LM_ERR("Invalid value type\n"); return -1; } + if(tval->rs.len>=128) + { + LM_ERR("Value size too big\n"); + return -1; + } memcpy(_uac_req.s_callid.s, tval->rs.s, tval->rs.len); _uac_req.s_callid.s[tval->rs.len] = '\0'; _uac_req.s_callid.len = tval->rs.len;

1 0

[kamailio/kamailio] auth: Add pv_auth_check overload with second passwd parameter (PR #3126)
by Jon Bergli Heier 03 Jun '22

03 Jun '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This change modifies the `pv_auth_check` function to take an optional second password argument `passwd2`. The motivation for this change is to allow authenticating against two passwords, which is useful if you want to eg. rotate passwords periodically and still allow using the previous password during a transition period. You can technically do this with two calls to `pv_auth_check`, but with `nonce_count` enabled the first call will invalidate nc which will always cause the second call to fail. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3126 -- Commit Summary -- * auth: Add pv_auth_check overload with second passwd parameter -- File Changes -- M src/modules/auth/auth_mod.c (143) M src/modules/auth/doc/auth_functions.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3126.patch https://github.com/kamailio/kamailio/pull/3126.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3126 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3126(a)github.com>

2 4

git:5.5:acdf0729: pkg/kamailio/deb: update Maintainer and Vcs fields [skip ci]
by Victor Seva 03 Jun '22

03 Jun '22

Module: kamailio Branch: 5.5 Commit: acdf07299ed28bc867b25de9f538d20faddac62c URL: https://github.com/kamailio/kamailio/commit/acdf07299ed28bc867b25de9f538d20… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-03T11:48:28+02:00 pkg/kamailio/deb: update Maintainer and Vcs fields [skip ci] In order to be more clear of who is the origin of the packages (cherry picked from commit 1225d7fda1d8c3eb82c403dcd0cd38d57fc4ad2a) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/acdf07299ed28bc867b25de9f538d20… Patch: https://github.com/kamailio/kamailio/commit/acdf07299ed28bc867b25de9f538d20…

1 0

git:5.6:30c14ac9: pkg/kamailio/deb: update Maintainer and Vcs fields [skip ci]
by Victor Seva 03 Jun '22

03 Jun '22

Module: kamailio Branch: 5.6 Commit: 30c14ac9d71414f11a7c4a48c292496cd5d0145f URL: https://github.com/kamailio/kamailio/commit/30c14ac9d71414f11a7c4a48c292496… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-03T11:45:30+02:00 pkg/kamailio/deb: update Maintainer and Vcs fields [skip ci] In order to be more clear of who is the origin of the packages (cherry picked from commit 1225d7fda1d8c3eb82c403dcd0cd38d57fc4ad2a) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/30c14ac9d71414f11a7c4a48c292496… Patch: https://github.com/kamailio/kamailio/commit/30c14ac9d71414f11a7c4a48c292496…

1 0

[kamailio/kamailio] tm: try next ip on receiving code other than 503 if dns failover (PR #3129)
by Mvondo Eric 03 Jun '22

03 Jun '22

#### Pre-Submission Checklist    - [ ] 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  By default when doing dns failover the tm module will try next ips only when receiving 503 code or no response. the new failover_reply_codes provides a way to try next ip when receiving specific codes or class code. for example try next ip even if the previous one returned 408 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3129 -- Commit Summary -- * Enable tm dns failover to try next ip on receiving code other than 503 -- File Changes -- M src/modules/tm/doc/params.xml (25) M src/modules/tm/t_funcs.c (11) M src/modules/tm/t_reply.c (12) M src/modules/tm/t_reply.h (4) M src/modules/tm/tm.c (139) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3129.patch https://github.com/kamailio/kamailio/pull/3129.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3129 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3129(a)github.com>

3 5

git:master:1225d7fd: pkg/kamailio/deb: update Maintainer and Vcs fields [skip ci]
by Victor Seva 03 Jun '22

03 Jun '22

Module: kamailio Branch: master Commit: 1225d7fda1d8c3eb82c403dcd0cd38d57fc4ad2a URL: https://github.com/kamailio/kamailio/commit/1225d7fda1d8c3eb82c403dcd0cd38d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-03T11:40:46+02:00 pkg/kamailio/deb: update Maintainer and Vcs fields [skip ci] In order to be more clear of who is the origin of the packages --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/1225d7fda1d8c3eb82c403dcd0cd38d… Patch: https://github.com/kamailio/kamailio/commit/1225d7fda1d8c3eb82c403dcd0cd38d…

1 0

git:master:3b136547: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 03 Jun '22

03 Jun '22

Module: kamailio Branch: master Commit: 3b136547467b5e9fa6b39da9b078946b07fb94cc URL: https://github.com/kamailio/kamailio/commit/3b136547467b5e9fa6b39da9b078946… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-03T11:31:28+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/3b136547467b5e9fa6b39da9b078946… Patch: https://github.com/kamailio/kamailio/commit/3b136547467b5e9fa6b39da9b078946…

1 0

git:master:1ac02d9f: dispatcher: fix for checking reply code class rule
by Daniel-Constantin Mierla 03 Jun '22

03 Jun '22

Module: kamailio Branch: master Commit: 1ac02d9f0b436602cfc8bf72037ca7f84be3d67f URL: https://github.com/kamailio/kamailio/commit/1ac02d9f0b436602cfc8bf72037ca7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-03T11:21:14+02:00 dispatcher: fix for checking reply code class rule --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/1ac02d9f0b436602cfc8bf72037ca7f… Patch: https://github.com/kamailio/kamailio/commit/1ac02d9f0b436602cfc8bf72037ca7f… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 827d925ed8..30620553a4 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1247,7 +1247,7 @@ int ds_ping_check_rplcode(int code) } } else { /* reply class */ - if(((*ds_ping_reply_codes)[i] / 100) == code) { + if((*ds_ping_reply_codes)[i] == code / 100) { return 1; } }

1 0

git:master:062e6daa: tm: new param to specify reply codes for dns srv failover
by Daniel-Constantin Mierla 03 Jun '22

03 Jun '22

Module: kamailio Branch: master Commit: 062e6daa0f149e01674667f77608afb35b6e099a URL: https://github.com/kamailio/kamailio/commit/062e6daa0f149e01674667f77608afb… Author: emvondo <eric.mvondo(a)orange.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-03T11:28:16+02:00 tm: new param to specify reply codes for dns srv failover --- Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/062e6daa0f149e01674667f77608afb… Patch: https://github.com/kamailio/kamailio/commit/062e6daa0f149e01674667f77608afb…

1 0

[kamailio/kamailio] ims_qos: fix compilation warning (PR #3127)
by Atanas Bakalov 02 Jun '22

02 Jun '22

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3127 -- Commit Summary -- * ims_qos: fix compilation warning -- File Changes -- M src/modules/ims_qos/rx_aar.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3127.patch https://github.com/kamailio/kamailio/pull/3127.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3127 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3127(a)github.com>

2 2

git:master:0550a3d4: Merge pull request #3127 from atanasdb/ims_qos_fix
by GitHub 02 Jun '22

02 Jun '22

Module: kamailio Branch: master Commit: 0550a3d44b2addc160b6a20bd2c9bf2831187400 URL: https://github.com/kamailio/kamailio/commit/0550a3d44b2addc160b6a20bd2c9bf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-06-02T21:17:11+02:00 Merge pull request #3127 from atanasdb/ims_qos_fix ims_qos: fix module loading crash --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/0550a3d44b2addc160b6a20bd2c9bf2… Patch: https://github.com/kamailio/kamailio/commit/0550a3d44b2addc160b6a20bd2c9bf2… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index afd7ba3e74..da4a0e42dd 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,6 +53,7 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" +#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h"

1 0

git:master:bd4cc486: ims_qos: fix compilation warning
by Atanas Bakalov 02 Jun '22

02 Jun '22

Module: kamailio Branch: master Commit: bd4cc486879616d502362dd464b04d7d3c2865c4 URL: https://github.com/kamailio/kamailio/commit/bd4cc486879616d502362dd464b04d7… Author: Atanas Bakalov <atanas(a)wgtwo.com> Committer: Atanas Bakalov <atanas(a)wgtwo.com> Date: 2022-05-31T12:52:49+02:00 ims_qos: fix compilation warning --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/bd4cc486879616d502362dd464b04d7… Patch: https://github.com/kamailio/kamailio/commit/bd4cc486879616d502362dd464b04d7… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index afd7ba3e74..da4a0e42dd 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,6 +53,7 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" +#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h"

1 0

[kamailio/kamailio] DNS Failover try next destinations on receiving code other than 503 (Issue #3122)
by patrickarton 02 Jun '22

02 Jun '22

### Description All ips destination of DNS Failover are tried only if either no response or 503 response. I woud like to try others ips when receiving code other than 503 response (example when receiving 408 from a previous one).  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` None ``` #### Log Messages  ``` None ``` #### SIP Traffic  ``` obvious ``` ### Possible Solutions A possible solution will be to modify the reply_received function of tm's t_reply.c file. ``` int reply_received( struct sip_msg *p_msg ) { } ```  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3122 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3122(a)github.com>

1 1

[kamailio/kamailio] 'kamcmd ul.dump' error on 5.6 (Issue #3123)
by MayamaTakeshi 02 Jun '22

02 Jun '22

### Description If there are no usrloc registrations, all is good: ``` [root@lab002194-flip-server install]$ kamcmd ul.dump { Domains: { Domain: { Domain: devflip_location Size: 1024 AoRs: { } Stats: { Records: 0 Max-Slots: 0 } } } } ```` But if there are registered SIP endpoints, we get: ``` [root@lab002194-flip-server install]$ kamcmd ul.dump { Domains: { Domain: { Domain: devflip_location Size: 1024 AoRs: { Info: { AoR: oweruaodsiflwosdfjoe(a)lsjfoasjdfosaodfsdfafolekodc.com HashID: -2013386516 Contacts: { Contact: { Address: sip:oweruaodsiflwosdfjoe@10.255.255.195:6060 Expires: 96 Q: 0 ERROR:: while parsing the record 14, @140: ff : bad record ``` #### Reproduction Just register some SIP endpoints against kamailio and issue 'kamcmd ul.dump' ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.0 (x86_64/linux) 61e86a 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: 61e86a compiled on 06:54:55 May 26 2022 with gcc 10.2.1 ``` * **Operating System**:  ``` [root@lab002194-flip-server kamailio-5.6]$ lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye [root@lab002194-flip-server kamailio-5.6]$ uname -a Linux lab002194-flip-server 5.10.0-14-amd64 #1 SMP Debian 5.10.113-1 (2022-04-29) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3123 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3123(a)github.com>

2 4

git:5.6:92e0dc0c: ctl: skip checking end tag for BINRPC_T_DOUBLE values
by Daniel-Constantin Mierla 02 Jun '22

02 Jun '22

Module: kamailio Branch: 5.6 Commit: 92e0dc0c3a8fe17d18fad944bfeb3d9102c2ca6c URL: https://github.com/kamailio/kamailio/commit/92e0dc0c3a8fe17d18fad944bfeb3d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-02T13:49:05+02:00 ctl: skip checking end tag for BINRPC_T_DOUBLE values - related to GH #3123 (cherry picked from commit 72901b7822c5684f8a10faa91118f3fd6de6c01a) --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/92e0dc0c3a8fe17d18fad944bfeb3d9… Patch: https://github.com/kamailio/kamailio/commit/92e0dc0c3a8fe17d18fad944bfeb3d9… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index da4524878c..94ced22ea2 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -730,7 +730,7 @@ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, type=*p & 0xf; len=*p>>4; p++; - if (len & 8){ + if ((type!=BINRPC_T_DOUBLE) && (len & 8)){ end_tag=1; /* possible end mark for array or structs */ /* we have to read len bytes and use them as the new len */ p=binrpc_read_int(&len, len&7, p, end, err);

1 0

git:master:72901b78: ctl: skip checking end tag for BINRPC_T_DOUBLE values
by Daniel-Constantin Mierla 02 Jun '22

02 Jun '22

Module: kamailio Branch: master Commit: 72901b7822c5684f8a10faa91118f3fd6de6c01a URL: https://github.com/kamailio/kamailio/commit/72901b7822c5684f8a10faa91118f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-02T12:48:38+02:00 ctl: skip checking end tag for BINRPC_T_DOUBLE values - related to GH #3123 --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/72901b7822c5684f8a10faa91118f3f… Patch: https://github.com/kamailio/kamailio/commit/72901b7822c5684f8a10faa91118f3f… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index da4524878c..94ced22ea2 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -730,7 +730,7 @@ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, type=*p & 0xf; len=*p>>4; p++; - if (len & 8){ + if ((type!=BINRPC_T_DOUBLE) && (len & 8)){ end_tag=1; /* possible end mark for array or structs */ /* we have to read len bytes and use them as the new len */ p=binrpc_read_int(&len, len&7, p, end, err);

1 0

git:master:a81266d3: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: a81266d38d500dfc7f7fda4c3903d375fabe8d24 URL: https://github.com/kamailio/kamailio/commit/a81266d38d500dfc7f7fda4c3903d37… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-01T18:16:21+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/a81266d38d500dfc7f7fda4c3903d37… Patch: https://github.com/kamailio/kamailio/commit/a81266d38d500dfc7f7fda4c3903d37… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 4a1aba9a15..d895e972a5 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -314,6 +314,8 @@ ipsec_create("location", "1"); + 0x20 (32) - do not reset the destination URI. + 0x40 (64) - use user equipment client port as target for TCP requests. + + 0x80 (128) - set transport parameter in the new dst uri for + TCP requests. This is an optional parameter, default value - 0. Example 1.12. ipsec_forward

1 0

git:master:a6a3bd08: ims_ipsec_pcscf: new option for ipsec_forward() to set trasport for tcp dst uri
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: a6a3bd088368fbf65c283ae27e999d315db0844b URL: https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T18:15:43+02:00 ims_ipsec_pcscf: new option for ipsec_forward() to set trasport for tcp dst uri --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… Patch: https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5aa208d334..6f6c15e21b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -90,6 +90,8 @@ extern struct tm_binds tmb; #define IPSEC_NODSTURI_RESET (1<<5) /* if set - use user equipment client port as target for requests over TCP */ #define IPSEC_TCPPORT_UEC (1<<6) +/* if set - build new dst uri with transport parameter for TCP */ +#define IPSEC_SETDSTURI_FULL (1<<7) /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -947,8 +949,14 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) if(!(_cflags & IPSEC_NODSTURI_RESET)) { char buf[1024]; - int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, - ci.via_host.s, dst_port); + int buf_len; + if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TCP)) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", + ci.via_host.len, ci.via_host.s, dst_port); + } else { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, + ci.via_host.s, dst_port); + } if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { LM_ERR("Error allocating memory for dst_uri\n");

1 0

git:master:f3bdccdf: ims_ipsec_pcscf: docs for the ipsec_forward() flag to set tcp transport parameter
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: f3bdccdf08acde773aaa5731bcf47b8ec7fa798b URL: https://github.com/kamailio/kamailio/commit/f3bdccdf08acde773aaa5731bcf47b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T18:15:43+02:00 ims_ipsec_pcscf: docs for the ipsec_forward() flag to set tcp transport parameter --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f3bdccdf08acde773aaa5731bcf47b8… Patch: https://github.com/kamailio/kamailio/commit/f3bdccdf08acde773aaa5731bcf47b8… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index e602275960..ea1fc34ca9 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -319,6 +319,11 @@ ipsec_create("location", "1"); <emphasis>0x40</emphasis> (64) - use user equipment client port as target for TCP requests. </para> </listitem> + <listitem> + <para> + <emphasis>0x80</emphasis> (128) - set transport parameter in the new dst uri for TCP requests. + </para> + </listitem> </itemizedlist> </para> <para>

1 0

[kamailio/kamailio] Fix LOST for build on FreeBSD (PR #3131)
by Boris Korzun 01 Jun '22

01 Jun '22

#### 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) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description `lost` is not build on FreeBSD environment. The proposed patch fixes it and makes the module is consistent with the rest of modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3131 -- Commit Summary -- * lost: Makefile - support for FreeBSD build -- File Changes -- M src/modules/lost/Makefile (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3131.patch https://github.com/kamailio/kamailio/pull/3131.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3131 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3131(a)github.com>

2 2

git:master:881e3e1e: lost: Makefile - support for FreeBSD build
by Henning Westerholt 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 881e3e1e195858d36d863a32f3c40f1cb83c8d9d URL: https://github.com/kamailio/kamailio/commit/881e3e1e195858d36d863a32f3c40f1… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-06-01T15:31:13+02:00 lost: Makefile - support for FreeBSD build - added libcurl deps. --- Modified: src/modules/lost/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/881e3e1e195858d36d863a32f3c40f1… Patch: https://github.com/kamailio/kamailio/commit/881e3e1e195858d36d863a32f3c40f1… --- diff --git a/src/modules/lost/Makefile b/src/modules/lost/Makefile index 30c12ce655..b847094e1c 100755 --- a/src/modules/lost/Makefile +++ b/src/modules/lost/Makefile @@ -16,6 +16,12 @@ XML2CFG=$(shell \ echo 'pkg-config libxml-2.0'; \ fi) endif +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) endif ifneq ($(XML2CFG),) @@ -26,4 +32,12 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(CURL_BUILDER),) + DEFS += $(shell $(CURL_BUILDER) --cflags ) + LIBS += $(shell $(CURL_BUILDER) --libs) +else + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lcurl +endif + include ../../Makefile.modules

1 0

git:master:f1634883: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: f1634883e64587e28df629fa902c7f4116338f2c URL: https://github.com/kamailio/kamailio/commit/f1634883e64587e28df629fa902c7f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-01T14:16:40+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/f1634883e64587e28df629fa902c7f4… Patch: https://github.com/kamailio/kamailio/commit/f1634883e64587e28df629fa902c7f4… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index dbbf9c55d5..4a1aba9a15 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -311,6 +311,9 @@ ipsec_create("location", "1"); + 0x08 (8) - use new R-URI for IPSec tunnel search. + 0x10 (16) - do not look for alias parameter to set received details. + + 0x20 (32) - do not reset the destination URI. + + 0x40 (64) - use user equipment client port as target for TCP + requests. This is an optional parameter, default value - 0. Example 1.12. ipsec_forward

1 0

git:master:3c885a2a: ims_ipsec_pcscf: docs for the ipsec_forward() flag to use UE client port for TCP requests
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 3c885a2a1052373b5998ada2793e31362cd64818 URL: https://github.com/kamailio/kamailio/commit/3c885a2a1052373b5998ada2793e313… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T13:52:15+02:00 ims_ipsec_pcscf: docs for the ipsec_forward() flag to use UE client port for TCP requests --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c885a2a1052373b5998ada2793e313… Patch: https://github.com/kamailio/kamailio/commit/3c885a2a1052373b5998ada2793e313… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index c220e39063..e602275960 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -314,6 +314,11 @@ ipsec_create("location", "1"); <emphasis>0x20</emphasis> (32) - do not reset the destination URI. </para> </listitem> + <listitem> + <para> + <emphasis>0x40</emphasis> (64) - use user equipment client port as target for TCP requests. + </para> + </listitem> </itemizedlist> </para> <para>

1 0

git:master:9ce0f4ae: ims_ipsec_pcscf: removed shadowing (sub-scope) variables
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 9ce0f4ae1aca95380729b1717c6b7658270034bc URL: https://github.com/kamailio/kamailio/commit/9ce0f4ae1aca95380729b1717c6b765… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T14:10:10+02:00 ims_ipsec_pcscf: removed shadowing (sub-scope) variables --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/9ce0f4ae1aca95380729b1717c6b765… Patch: https://github.com/kamailio/kamailio/commit/9ce0f4ae1aca95380729b1717c6b765… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 35bcaa28fb..5aa208d334 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -838,6 +838,9 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) ip_addr_t via_host; struct sip_msg *req = NULL; struct cell *t = NULL; + struct socket_info *client_sock = NULL; + + LM_DBG("processing with flags: 0x%x\n", _cflags); if(m->first_line.type == SIP_REPLY) { // Get request from reply @@ -915,8 +918,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; // Check send socket - struct socket_info *client_sock = - grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr + client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { @@ -960,7 +962,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } // Set send socket - struct socket_info *client_sock = grep_sock_info( + client_sock = grep_sock_info( via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { @@ -990,10 +992,12 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // Update dst_info in message if(m->first_line.type == SIP_REPLY) { - struct cell *t = tmb.t_gett(); if(!t) { - LM_ERR("Error getting transaction\n"); - goto cleanup; + t = tmb.t_gett(); + if(!t) { + LM_ERR("Error getting transaction\n"); + goto cleanup; + } } t->uas.response.dst = dst_info; }

1 0

git:master:21f3b485: ims_ipsec_pcscf: docs for flag to not reset dst uri
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 21f3b485a4fa5cadd84962020a54a63db742e667 URL: https://github.com/kamailio/kamailio/commit/21f3b485a4fa5cadd84962020a54a63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T13:00:42+02:00 ims_ipsec_pcscf: docs for flag to not reset dst uri --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/21f3b485a4fa5cadd84962020a54a63… Patch: https://github.com/kamailio/kamailio/commit/21f3b485a4fa5cadd84962020a54a63… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 0715da7fae..c220e39063 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -309,6 +309,11 @@ ipsec_create("location", "1"); <emphasis>0x10</emphasis> (16) - do not look for alias parameter to set received details. </para> </listitem> + <listitem> + <para> + <emphasis>0x20</emphasis> (32) - do not reset the destination URI. + </para> + </listitem> </itemizedlist> </para> <para>

1 0

git:master:762fc606: ims_ipsec_pcscf: ipsec_forward() option to use UE client port for requests over TCP
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 762fc6068a23e7afd3251be58732d054a9dadab0 URL: https://github.com/kamailio/kamailio/commit/762fc6068a23e7afd3251be58732d05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T13:11:37+02:00 ims_ipsec_pcscf: ipsec_forward() option to use UE client port for requests over TCP --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/762fc6068a23e7afd3251be58732d05… Patch: https://github.com/kamailio/kamailio/commit/762fc6068a23e7afd3251be58732d05… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 8fa4d9cf23..35bcaa28fb 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -88,6 +88,8 @@ extern struct tm_binds tmb; #define IPSEC_NOALIAS_SEARCH (1<<4) /* if set - do not reset dst uri for IPsec forward */ #define IPSEC_NODSTURI_RESET (1<<5) +/* if set - use user equipment client port as target for requests over TCP */ +#define IPSEC_TCPPORT_UEC (1<<6) /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -925,11 +927,20 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // for Request get the dest proto from the saved contact dst_proto = pcontact->received_proto; - // for Request sends from P-CSCF client port - src_port = s->port_pc; + if(_cflags & IPSEC_TCPPORT_UEC) { + // for Request and TCP sends from P-CSCF server port, for Request and UDP sends from P-CSCF client port + src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; - // for Request sends to UE server port - dst_port = s->port_us; + // for Request and TCP sends to UE client port, for Request and UDP sends to UE server port + dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + + } else { + // for Request sends from P-CSCF client port + src_port = s->port_pc; + + // for Request sends to UE server port + dst_port = s->port_us; + } } if(!(_cflags & IPSEC_NODSTURI_RESET)) {

1 0

git:master:0bc56bd1: ims_ipsec_pcscf: new option to skip resetting the dst uri in ipsec_forward()
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 0bc56bd13b343057a62177b1b77e9aa82ae00155 URL: https://github.com/kamailio/kamailio/commit/0bc56bd13b343057a62177b1b77e9aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T12:58:07+02:00 ims_ipsec_pcscf: new option to skip resetting the dst uri in ipsec_forward() --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/0bc56bd13b343057a62177b1b77e9aa… Patch: https://github.com/kamailio/kamailio/commit/0bc56bd13b343057a62177b1b77e9aa… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 480191cb44..8fa4d9cf23 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -86,6 +86,8 @@ extern struct tm_binds tmb; #define IPSEC_RURIADDR_SEARCH (1<<3) /* if set - do not use alias for IPSec tunnel received details */ #define IPSEC_NOALIAS_SEARCH (1<<4) +/* if set - do not reset dst uri for IPsec forward */ +#define IPSEC_NODSTURI_RESET (1<<5) /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -893,14 +895,13 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // from URI //int uri_len = 4 /* strlen("sip:") */ + ci.via_host.len + 5 /* max len of port number */ ; - if(m->dst_uri.s) { - LM_DBG("resetting dst uri\n"); + if(!(_cflags & IPSEC_NODSTURI_RESET) && (m->dst_uri.s!=NULL)) { + LM_DBG("resetting dst uri [%.*s]\n", m->dst_uri.len, m->dst_uri.s); pkg_free(m->dst_uri.s); m->dst_uri.s = NULL; m->dst_uri.len = 0; } - char buf[1024]; if(m->first_line.type == SIP_REPLY) { // for Reply get the dest proto from the received request dst_proto = req->rcv.proto; @@ -931,18 +932,21 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) dst_port = s->port_us; } - int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, - ci.via_host.s, dst_port); + if(!(_cflags & IPSEC_NODSTURI_RESET)) { + char buf[1024]; + int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, + ci.via_host.s, dst_port); - if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { - LM_ERR("Error allocating memory for dst_uri\n"); - goto cleanup; - } + if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { + LM_ERR("Error allocating memory for dst_uri\n"); + goto cleanup; + } - memcpy(m->dst_uri.s, buf, buf_len); - m->dst_uri.len = buf_len; - m->dst_uri.s[m->dst_uri.len] = '\0'; - LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); + memcpy(m->dst_uri.s, buf, buf_len); + m->dst_uri.len = buf_len; + m->dst_uri.s[m->dst_uri.len] = '\0'; + LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); + } // Set send socket struct socket_info *client_sock = grep_sock_info(

1 0

git:master:2234a18e: core: new socket global parameter to set listen attributes with a structure style
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 2234a18e9031a634ba43655779c644ce549af505 URL: https://github.com/kamailio/kamailio/commit/2234a18e9031a634ba43655779c644c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T08:28:43+02:00 core: new socket global parameter to set listen attributes with a structure style - alternative to listen when a usual bind address is provided - example: socket = { bind = udp:127.0.0.1:5060; advertise = 1.2.3.4:5080; name = "udp0"; } --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/2234a18e9031a634ba43655779c644c… Patch: https://github.com/kamailio/kamailio/commit/2234a18e9031a634ba43655779c644c…

1 0

[kamailio/kamailio] Fix Makefile.groups and SLACK for build on FreeBSD (PR #3130)
by Boris Korzun 31 May '22

31 May '22

#### 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) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [X] Related to issue #3091 #### Description `module_group_standard` and `slack` are not build on FreeBSD environment. The proposed patch fixes it and makes the module is consistent with the rest of modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3130 -- Commit Summary -- * Makefile.groups: renamed malloc_test to misctest * slack: Makefile - support for FreeBSD build -- File Changes -- M src/Makefile.groups (2) M src/modules/slack/Makefile (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3130.patch https://github.com/kamailio/kamailio/pull/3130.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3130 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3130(a)github.com>

2 2

git:master:afcab24d: Merge pull request #3130 from drTr0jan/fix-freebsd
by GitHub 31 May '22

31 May '22

Module: kamailio Branch: master Commit: afcab24d999fa999fbc99cda607423cde9fa8714 URL: https://github.com/kamailio/kamailio/commit/afcab24d999fa999fbc99cda607423c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-31T18:43:31+02:00 Merge pull request #3130 from drTr0jan/fix-freebsd Fix Makefile.groups and SLACK for build on FreeBSD --- Modified: src/Makefile.groups Modified: src/modules/slack/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/afcab24d999fa999fbc99cda607423c… Patch: https://github.com/kamailio/kamailio/commit/afcab24d999fa999fbc99cda607423c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index c388489a66..bd111ca7b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -38,7 +38,7 @@ mod_list_dbuid=db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db # - modules for devel purposes -mod_list_devel=malloc_test print print_lib +mod_list_devel=misctest print print_lib # - modules depending on pcre3 library mod_list_pcre=dialplan lcr regex diff --git a/src/modules/slack/Makefile b/src/modules/slack/Makefile index 9bc748a2e5..a4f0c1ff81 100644 --- a/src/modules/slack/Makefile +++ b/src/modules/slack/Makefile @@ -8,5 +8,21 @@ include ../../Makefile.defs auto_gen= NAME=slack.so +ifeq ($(CROSS_COMPILE),) +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) +endif + +ifneq ($(CURL_BUILDER),) + DEFS += $(shell $(CURL_BUILDER) --cflags ) + LIBS += $(shell $(CURL_BUILDER) --libs) +else + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lcurl +endif include ../../Makefile.modules

1 0

git:master:5910c818: Makefile.groups: renamed malloc_test to misctest
by drTr0jan 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 5910c8184f42e9564711a07959d410aa2d483b43 URL: https://github.com/kamailio/kamailio/commit/5910c8184f42e9564711a07959d410a… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-05-31T19:08:28+03:00 Makefile.groups: renamed malloc_test to misctest - building module_group_standard fail due to rename of malloc_test module. --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/5910c8184f42e9564711a07959d410a… Patch: https://github.com/kamailio/kamailio/commit/5910c8184f42e9564711a07959d410a… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index c388489a66..bd111ca7b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -38,7 +38,7 @@ mod_list_dbuid=db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db # - modules for devel purposes -mod_list_devel=malloc_test print print_lib +mod_list_devel=misctest print print_lib # - modules depending on pcre3 library mod_list_pcre=dialplan lcr regex

1 0

git:master:36baa8cd: slack: Makefile - support for FreeBSD build
by drTr0jan 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 36baa8cda606e107308303c33c5b98cbb513c653 URL: https://github.com/kamailio/kamailio/commit/36baa8cda606e107308303c33c5b98c… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-05-31T19:08:29+03:00 slack: Makefile - support for FreeBSD build - added LIBS and DEFS variables, making them consistent with the rest of modules. --- Modified: src/modules/slack/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/36baa8cda606e107308303c33c5b98c… Patch: https://github.com/kamailio/kamailio/commit/36baa8cda606e107308303c33c5b98c… --- diff --git a/src/modules/slack/Makefile b/src/modules/slack/Makefile index 9bc748a2e5..a4f0c1ff81 100644 --- a/src/modules/slack/Makefile +++ b/src/modules/slack/Makefile @@ -8,5 +8,21 @@ include ../../Makefile.defs auto_gen= NAME=slack.so +ifeq ($(CROSS_COMPILE),) +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) +endif + +ifneq ($(CURL_BUILDER),) + DEFS += $(shell $(CURL_BUILDER) --cflags ) + LIBS += $(shell $(CURL_BUILDER) --libs) +else + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lcurl +endif include ../../Makefile.modules

1 0

[kamailio/kamailio] outbound build warning (Issue #3128)
by sergey-safarov 31 May '22

31 May '22

``` [root@logan-0a kamailio]# make -C src/modules/outbound install make: Entering directory '/root/kamailio/src/modules/outbound' CC (gcc) [M outbound.so] config.o CC (gcc) [M outbound.so] outbound_mod.o outbound_mod.c: In function ‘mod_init’: outbound_mod.c:112:25: warning: pointer targets in passing argument 1 of ‘SHA1’ differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~~~~~~~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected ‘const unsigned char *’ but argument is of type ‘char *’ unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ outbound_mod.c:112:58: warning: pointer targets in passing argument 3 of ‘SHA1’ differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected ‘unsigned char *’ but argument is of type ‘char *’ unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ LD (gcc) [M outbound.so] outbound.so touch /usr/local/lib64/kamailio//modules/outbound.so install -m 755 outbound.so /usr/local/lib64/kamailio//modules make: Leaving directory '/root/kamailio/src/modules/outbound' ``` Build on CentOS 8 Stream -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3128 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3128(a)github.com>

1 2

[kamailio/kamailio] rx_aar: unreference dialog in case of aar update (PR #3104)
by Atanas Bakalov 31 May '22

31 May '22

- release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3104 -- Commit Summary -- * rx_aar: unreference dialog in case of aar update -- File Changes -- M src/modules/ims_qos/rx_aar.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3104.patch https://github.com/kamailio/kamailio/pull/3104.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3104 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3104(a)github.com>

4 7

git:master:80c941bd: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 80c941bd083854c4b55bd4af218cb65d06040d94 URL: https://github.com/kamailio/kamailio/commit/80c941bd083854c4b55bd4af218cb65… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-31T10:16:16+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/80c941bd083854c4b55bd4af218cb65… Patch: https://github.com/kamailio/kamailio/commit/80c941bd083854c4b55bd4af218cb65… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index f02167fb7e..dbbf9c55d5 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -302,13 +302,15 @@ ipsec_create("location", "1"); * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. flags - bitwise flag: - + 0x01 - set force socket for request messages. Useful for ipsec - and TCP. - + 0x02 - reverse search for a contact in the memory. Useful when - contact alias is disabled. - + 0x04 - use destination URI for IPSec tunnel search. Useful for - routing requests within dialog. - + 0x08 - use new R-URI for IPSec tunnel search. + + 0x01 (1) - set force socket for request messages. Useful for + ipsec and TCP. + + 0x02 (2) - reverse search for a contact in the memory. Useful + when contact alias is disabled. + + 0x04 (4) - use destination URI for IPSec tunnel search. Useful + for routing requests within dialog. + + 0x08 (8) - use new R-URI for IPSec tunnel search. + + 0x10 (16) - do not look for alias parameter to set received + details. This is an optional parameter, default value - 0. Example 1.12. ipsec_forward

1 0

git:master:f71e8e66: ims_ipsec_pcscf: option to skip use of alias for pcontact received details
by Daniel-Constantin Mierla 31 May '22

31 May '22

Module: kamailio Branch: master Commit: f71e8e66da1e4c611a7b00bb6a264ab59f279ac7 URL: https://github.com/kamailio/kamailio/commit/f71e8e66da1e4c611a7b00bb6a264ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-31T10:11:10+02:00 ims_ipsec_pcscf: option to skip use of alias for pcontact received details --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/f71e8e66da1e4c611a7b00bb6a264ab… Patch: https://github.com/kamailio/kamailio/commit/f71e8e66da1e4c611a7b00bb6a264ab… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 336395d4ca..480191cb44 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -77,13 +77,15 @@ extern usrloc_api_t ul; extern struct tm_binds tmb; /* if set - set send force socket for request messages */ -#define IPSEC_SEND_FORCE_SOCKET 0x01 +#define IPSEC_SEND_FORCE_SOCKET 1 /* if set - start searching from the last element */ -#define IPSEC_REVERSE_SEARCH 0x02 +#define IPSEC_REVERSE_SEARCH 2 /* if set - use destination address for IPSec tunnel search */ -#define IPSEC_DSTADDR_SEARCH 0x04 +#define IPSEC_DSTADDR_SEARCH (1<<2) /* if set - use new r-uri address for IPSec tunnel search */ -#define IPSEC_RURIADDR_SEARCH 0x08 +#define IPSEC_RURIADDR_SEARCH (1<<3) +/* if set - do not use alias for IPSec tunnel received details */ +#define IPSEC_NOALIAS_SEARCH (1<<4) /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -219,16 +221,16 @@ static int fill_contact( ci->via_prot = vb->proto; } - if(uri.params.len > 6 - && (alias_start = _strnistr( - uri.params.s, "alias=", uri.params.len)) - != NULL) { + alias_start = NULL; + if((!(sflags & IPSEC_NOALIAS_SEARCH)) && uri.params.len > 6) { + alias_start = _strnistr(uri.params.s, "alias=", uri.params.len); + } + if(alias_start!=NULL && *(alias_start-1)==';') { char *p, *port_s, *proto_s; char portbuf[5]; str alias_s; - LM_DBG("contact has an alias [%.*s] - we can use that as the " - "received\n", + LM_DBG("contact has an alias [%.*s] - use that as the received\n", uri.params.len, uri.params.s); alias_s.len = uri.params.len - (alias_start - uri.params.s) - 6; @@ -858,7 +860,8 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) if(ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0 || pcontact == NULL) { - LM_ERR("Contact doesn't exist\n"); + LM_ERR("contact not found [%d:%.*s:%d]\n", (int)ci.via_prot, + ci.via_host.len, ci.via_host.s, (int)ci.via_port); goto cleanup; } @@ -891,6 +894,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) //int uri_len = 4 /* strlen("sip:") */ + ci.via_host.len + 5 /* max len of port number */ ; if(m->dst_uri.s) { + LM_DBG("resetting dst uri\n"); pkg_free(m->dst_uri.s); m->dst_uri.s = NULL; m->dst_uri.len = 0; @@ -938,6 +942,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) memcpy(m->dst_uri.s, buf, buf_len); m->dst_uri.len = buf_len; m->dst_uri.s[m->dst_uri.len] = '\0'; + LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); // Set send socket struct socket_info *client_sock = grep_sock_info( @@ -951,6 +956,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // Set destination info struct dest_info dst_info; + init_dest_info(&dst_info); dst_info.send_sock = client_sock; if(m->first_line.type == SIP_REQUEST && (_cflags & IPSEC_SEND_FORCE_SOCKET)) {

1 0

git:master:07d9a772: ims_ipsec_pcscf: docs for new flag for no alias use
by Daniel-Constantin Mierla 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 07d9a77272ee0b8b3e25ee5ddb443cd3adb01890 URL: https://github.com/kamailio/kamailio/commit/07d9a77272ee0b8b3e25ee5ddb443cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-31T10:11:10+02:00 ims_ipsec_pcscf: docs for new flag for no alias use --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/07d9a77272ee0b8b3e25ee5ddb443cd… Patch: https://github.com/kamailio/kamailio/commit/07d9a77272ee0b8b3e25ee5ddb443cd… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 77a758b5c4..0715da7fae 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -284,24 +284,29 @@ ipsec_create("location", "1"); <itemizedlist> <listitem> <para> - <emphasis>0x01</emphasis> - set force socket for request messages. Useful for ipsec and TCP. + <emphasis>0x01</emphasis> (1) - set force socket for request messages. Useful for ipsec and TCP. </para> </listitem> <listitem> <para> - <emphasis>0x02</emphasis> - reverse search for a contact in the memory. + <emphasis>0x02</emphasis> (2) - reverse search for a contact in the memory. Useful when contact alias is disabled. </para> </listitem> <listitem> <para> - <emphasis>0x04</emphasis> - use destination URI for IPSec tunnel search. Useful for + <emphasis>0x04</emphasis> (4) - use destination URI for IPSec tunnel search. Useful for routing requests within dialog. </para> </listitem> <listitem> <para> - <emphasis>0x08</emphasis> - use new R-URI for IPSec tunnel search. + <emphasis>0x08</emphasis> (8) - use new R-URI for IPSec tunnel search. + </para> + </listitem> + <listitem> + <para> + <emphasis>0x10</emphasis> (16) - do not look for alias parameter to set received details. </para> </listitem> </itemizedlist>

1 0

git:master:6ab5fd21: ims_usrloc_pcscf: more debug messages in get_pcontact()
by Daniel-Constantin Mierla 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 6ab5fd2192b9151e5ecc8423d189c730cd225689 URL: https://github.com/kamailio/kamailio/commit/6ab5fd2192b9151e5ecc8423d189c73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-31T10:11:10+02:00 ims_usrloc_pcscf: more debug messages in get_pcontact() --- Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/6ab5fd2192b9151e5ecc8423d189c73… Patch: https://github.com/kamailio/kamailio/commit/6ab5fd2192b9151e5ecc8423d189c73…

1 0

git:master:c22c89d8: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 31 May '22

31 May '22

Module: kamailio Branch: master Commit: c22c89d8d72dccb7c7eaca7a84cb9c186784ca80 URL: https://github.com/kamailio/kamailio/commit/c22c89d8d72dccb7c7eaca7a84cb9c1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-31T08:46:20+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/c22c89d8d72dccb7c7eaca7a84cb9c1… Patch: https://github.com/kamailio/kamailio/commit/c22c89d8d72dccb7c7eaca7a84cb9c1… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 43c1886ba3..f02167fb7e 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -308,6 +308,7 @@ ipsec_create("location", "1"); contact alias is disabled. + 0x04 - use destination URI for IPSec tunnel search. Useful for routing requests within dialog. + + 0x08 - use new R-URI for IPSec tunnel search. This is an optional parameter, default value - 0. Example 1.12. ipsec_forward

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev