sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
389 discussions

git:master:e1d9bec0: nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657)

by Henning Westerholt

Module: kamailio Branch: master Commit: e1d9bec0e16727325330c822c21ae29237c7812a URL: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Author: Kristian Hogh <kfh(a)uni-tel.dk> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-30T06:21:25Z nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657) - add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 - similar patch is used from several large customer installations since many years - GH #3657 with small formatting change --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Patch: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… --- diff --git a/src/modules/nathelper/sip_pinger.h b/src/modules/nathelper/sip_pinger.h index 733e38f21c3..b3ee4d39f3d 100644 --- a/src/modules/nathelper/sip_pinger.h +++ b/src/modules/nathelper/sip_pinger.h @@ -151,7 +151,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, + ruid->len + 1 + 8 + 1 + 8 + s_len(CRLF "To: ") + curi->len + s_len(CRLF "Call-ID: ") + sipping_callid.len + 1 + 8 + 1 + 8 + 1 + s->address_str.len + s_len(CRLF "CSeq: 1 ") - + sipping_method.len + + sipping_method.len + s_len(CRLF "Max-Forwards: 70") + s_len(CRLF "Content-Length: 0" CRLF CRLF) > MAX_SIPPING_SIZE) { LM_ERR("len exceeds %d\n", MAX_SIPPING_SIZE); @@ -205,6 +205,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, append_str(p, s->address_str.s, s->address_str.len); append_fix(p, CRLF "CSeq: 1 "); append_str(p, sipping_method.s, sipping_method.len); + append_fix(p, CRLF "Max-Forwards: 70"); append_fix(p, CRLF "Content-Length: 0" CRLF CRLF); *len_p = p - buf;

12 months

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,stretch #2536

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

12 months

Jenkins build became unstable: kamailio57-nightly-binaries » amd64,stretch #36

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

12 months

[kamailio/kamailio] group include ktls no longer works after 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb (Issue #3660)

by Anthony Messina

After 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb, building the ktls group doesn't work as it's not included in the #else statement. I don't have a need for ktlsa at this point. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3660 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3660(a)github.com>

12 months

git:5.7:b29d5808: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set

by Victor Seva

Module: kamailio Branch: 5.7 Commit: b29d5808505aa072fd23b59adf7943fb13ea98a2 URL: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:25:05+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 (cherry picked from commit aef29af56cabaf626e2ae552ae69c3cd2f692a27) --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Patch: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 028c34da711..ee4ec90e83f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -407,6 +407,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -540,4 +543,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

12 months

git:master:aef29af5: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set

by Victor Seva

Module: kamailio Branch: master Commit: aef29af56cabaf626e2ae552ae69c3cd2f692a27 URL: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:21:59+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Patch: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index b428394d31d..48e06e0646c 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -411,6 +411,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -547,4 +550,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

12 months

git:master:2b27aba7: topos: use defined values for internal contact mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2b27aba7f4f396e4ebd894255abfa8ce20950313 URL: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T13:22:35+01:00 topos: use defined values for internal contact mode --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… Patch: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 8ea8bb39c7e..7bcb2fea3c9 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -123,7 +123,7 @@ static int _tps_eventrt_receiving = -1; static str _tps_eventrt_receiving_name = str_init("topos:msg-receiving"); str _tps_contact_host = str_init(""); -int _tps_contact_mode = 0; +int _tps_contact_mode = TPS_CONTACT_MODE_SKEYUSER; str _tps_cparam_name = str_init("tps"); str _tps_xavu_cfg = STR_NULL; @@ -310,7 +310,7 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC) < 0) return -1; - if(_tps_contact_mode == 2 + if(_tps_contact_mode == TPS_CONTACT_MODE_XAVPUSER && (_tps_xavu_cfg.len <= 0 || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 4d680e53f45..e0e1c211923 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -324,7 +324,8 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return -1; } - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(msg->parsed_uri.sip_params.len < TPS_TUUID_MIN_LEN) { LM_DBG("not an expected param format\n"); return 1; @@ -962,7 +963,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) LM_DBG("use branch for routing information, request from direction " "%d\n", direction); - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, + (direction == TPS_DIR_UPSTREAM) ? 0 : 1) + < 0) { LM_ERR("failed to reappend s-route\n"); return -1; } diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 63951386622..fc0c2835a33 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -244,7 +244,8 @@ int tps_storage_fill_contact( if(_tps_contact_host.len) contact_len = sv.len - puri.host.len + _tps_contact_host.len; - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { cparam_len = _tps_cparam_name.len; } else { cparam_len = 0; @@ -285,9 +286,10 @@ int tps_storage_fill_contact( if(sv.s[i] == ':') break; } - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { /* create new URI parameter for Contact header */ - if(ctmode == 1) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER) { if(dir == TPS_DIR_DOWNSTREAM) { /* extract the contact address */ if(parse_headers(msg, HDR_CONTACT_F, 0) < 0 @@ -332,7 +334,7 @@ int tps_storage_fill_contact( msg->parsed_uri.user.len); td->cp += msg->parsed_uri.user.len; } - } else if(ctmode == 2) { + } else if(ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(dir == TPS_DIR_DOWNSTREAM) { /* extract the a contact */ vavu = xavu_get_child_with_sval( @@ -356,8 +358,8 @@ int tps_storage_fill_contact( } } - if(!((ctmode == 1) && (dir == TPS_DIR_DOWNSTREAM) - && (curi.user.len <= 0))) { + if(!((ctmode == TPS_CONTACT_MODE_RURIUSER) + && (dir == TPS_DIR_DOWNSTREAM) && (curi.user.len <= 0))) { *td->cp = '@'; td->cp++; } diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 4c2585a1ff6..245a1595652 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -37,6 +37,10 @@ #define TPS_IFLAG_INIT 1 #define TPS_IFLAG_DLGON 2 +#define TPS_CONTACT_MODE_SKEYUSER 0 +#define TPS_CONTACT_MODE_RURIUSER 1 +#define TPS_CONTACT_MODE_XAVPUSER 2 + #define TPS_DBU_CONTACT (1 << 0) #define TPS_DBU_RPLATTRS (1 << 1) #define TPS_DBU_ARR (1 << 2)

12 months

[kamailio/kamailio] core: timer_proc don't execute timers on destroy_modules_phase (PR #3649)

by Victor Seva

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally #### Description If kamailio is in the shutdown phase proc timers should not be executed since memory objects are getting destroyed and cores could happen You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3649 -- Commit Summary -- * core: timer_proc don't execute timers on destroy_modules_phase -- File Changes -- M src/core/timer_proc.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3649.patch https://github.com/kamailio/kamailio/pull/3649.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3649 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3649(a)github.com>

12 months

git:master:1194f597: core: timer_proc don't execute timers on shutdown phase

by Victor Seva

Module: kamailio Branch: master Commit: 1194f59738e87fcbf0d61c95d1d481e5fbb46784 URL: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-28T13:03:38+01:00 core: timer_proc don't execute timers on shutdown phase --- Modified: src/core/timer_proc.c --- Diff: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Patch: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… --- diff --git a/src/core/timer_proc.c b/src/core/timer_proc.c index 0b04cf65131..55bd98dab9c 100644 --- a/src/core/timer_proc.c +++ b/src/core/timer_proc.c @@ -29,6 +29,7 @@ #include "pt.h" #include "ut.h" #include "mem/shm_mem.h" +#include "sr_module.h" #include <unistd.h> @@ -76,6 +77,9 @@ int fork_basic_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), param); /* ticks in s for compatibility with old @@ -99,6 +103,9 @@ int fork_basic_timer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), worker, @@ -141,6 +148,9 @@ int fork_basic_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -165,6 +175,9 @@ int fork_basic_utimer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -273,6 +286,9 @@ int fork_sync_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > interval) sleep_us(1000); /* 1 millisecond sleep to catch up */ else @@ -324,6 +340,9 @@ int fork_sync_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > uinterval) sleep_us(1); else

12 months

git:master:9117e5dd: modules: readme files regenerated - jansson ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9117e5ddbffe2a202d24eb39a509835f14090486 URL: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-28T10:32:15+01:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Patch: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835…

12 months

← Newer
1
...
5
6
7
8
9
10
11
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023