- sr-dev - kamailio.org

git:master:82c786fd: corex: functions to manage iflags can get 0..63 parameter value
by Daniel-Constantin Mierla 31 Jul '24

31 Jul '24

Module: kamailio Branch: master Commit: 82c786fde7a635738c905899fb6edc9b7d1a2b67 URL: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T07:41:43+02:00 corex: functions to manage iflags can get 0..63 parameter value --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… Patch: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index e853032cd7f..de2fb03b5fd 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -587,6 +587,7 @@ static msg_iflag_name_t _msg_iflag_list[] = { static unsigned long long msg_lookup_flag(str *fname) { int i; + for(i = 0; _msg_iflag_list[i].name.len > 0; i++) { if(fname->len == _msg_iflag_list[i].name.len && strncasecmp(_msg_iflag_list[i].name.s, fname->s, fname->len) @@ -594,7 +595,22 @@ static unsigned long long msg_lookup_flag(str *fname) return _msg_iflag_list[i].value; } } - return 0; + if(fname->len < 1 || fname->len > 2) { + return 0; + } + if(!(fname->s[0] >= '0' && fname->s[0] <= '9')) { + return 0; + } + if(fname->len == 1) { + return 1ULL << (fname->s[0] - '0'); + } + if(!(fname->s[1] >= '0' && fname->s[1] <= '9')) { + return 0; + } + if((10 * (fname->s[0] - '0') - (fname->s[1] - '0')) > 63) { + return 0; + } + return 1ULL << (10 * (fname->s[0] - '0') - (fname->s[1] - '0')); } /**

1 0

[kamailio/kamailio] Kamailio crash with DMQ!? (Issue #3905)
by Benjamin 30 Jul '24

30 Jul '24

### Description Kamailio version 5.7.4 crashed with a core file. Maybe it's related to the dmq module. #### Debugging Data ``` (gdb) bt full #0 atomic_inc_int (var=0x7f5700000000) at ../../core/parser/../mem/../atomic/atomic_x86.h:236 No locals. #1 cfg_update_local (no_cbs=<optimized out>) at ../../core/cfg/cfg_struct.h:381 group = <optimized out> last_cb = 0x7f57c99545e0 prev_cb = <optimized out> group = <optimized out> last_cb = <optimized out> prev_cb = <optimized out> __func__ = "cfg_update_local" #2 worker_loop (id=id@entry=2) at worker.c:57 worker = <optimized out> current_job = <optimized out> peer_response = {resp_code = 1, content_type = {s = 0x55ea7b42cfca <init_mod_child+90> "\205\300\017\210\r\002", len = 15}, reason = {s = 0x0, len = 2}, body = { s = 0x7ffcf6347c30 "\001", len = 2069833640}} ret_value = <optimized out> not_parsed = <optimized out> dmq_node = 0x0 __func__ = "worker_loop" #3 0x00007f57d9426a11 in child_init (rank=<optimized out>) at dmq.c:321 i = 2 newpid = <optimized out> __func__ = "child_init" #4 0x000055ea7b42cfca in init_mod_child (m=0x7f57dd005640, rank=rank@entry=0) at core/sr_module.c:911 ret = 0 __func__ = "init_mod_child" #5 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd005b90, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #6 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd006910, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #7 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd006e70, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #8 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd008660, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #9 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd0089d0, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #10 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd008d70, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #11 0x000055ea7b43239e in init_child (rank=rank@entry=0) at core/sr_module.c:990 ret = <optimized out> type = <optimized out> __func__ = "init_child" #12 0x000055ea7b288365 in main_loop () at main.c:1929 i = <optimized out> pid = <optimized out> si = 0x0 si_desc = "udp receiver child=15 sock=172.20.21.4:5060\000\000\000\000\000H\211\064\366\374\177\000\000\301'C{\352U\000\000\276\000\000\000\002\000\000\000\017\247`{\352U\000\000\062\323b{\352U\000\000U\024\000\000\000\000\000\000\004\000_{\352U\000\000\000\272\030D\344\223ԃ\270Rc{\352U\000\000\004\000\000\000\000\000\000" nrprocs = <optimized out> woneinit = 1 __func__ = "main_loop" error = <optimized out> #13 0x000055ea7b27be9e in main (argc=<optimized out>, argv=<optimized out>) at main.c:3213 cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0x7ffcf6349e4e "" tmp_len = -554008000 port = 32599 proto = 0 ahost = 0x0 aport = 0 options = 0x55ea7b5f2cc8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1892320457 rfd = <optimized out> debug_save = <optimized out> debug_flag = <optimized out> dont_fork_cnt = <optimized out> n_lst = <optimized out> p = <optimized out> st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = {tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 20 times>, " ", '\000' <repeats 35 times>, "\006\000\000\000\000\000\000\200", '\000' <repeats 56 times>, "\006\000\000\000\000\000\000\200", '\000' <repeats 168 times>... option_index = 9 long_options = {{name = 0x55ea7b5f12ea "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55ea7b5fa98e "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x55ea7b60a690 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55ea7b5f12ef "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55ea7b5f12f5 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55ea7b5f12fe "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55ea7b5f1308 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55ea7b5f1312 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55ea7b5f131d "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x55ea7b5f1326 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55ea7b5faaab "debug", has_arg = 1, flag = 0x0, val = 1032}, { name = 0x55ea7b5f1331 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55ea7b5f133b "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x55ea7b5f1342 "all-errors", has_arg = 0, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals No locals. (gdb) list 231 in ../../core/parser/../mem/../atomic/atomic_x86.h ``` #### Log Messages ``` Jul 2 15:24:44 hostname kernel: kamailio[1098]: segfault at 7f5700000000 ip 00007f57d94467a0 sp 00007ffcf6347b00 error 6 in dmq.so[7f57d9426000+23000] ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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: compiled with gcc 10.2.1 ``` * **Operating System**: ``` Debian: 11.10 - Bullseye Linux 5.10.0-30-amd64 #1 SMP Debian 5.10.218-1 (2024-06-01) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3905 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3905(a)github.com>

3 14

[kamailio/kamailio] Suspected mem leak in the pua and request for ideas (Issue #3928)
by Andrew Pogrebennyk 30 Jul '24

30 Jul '24

Hi! it seems the pua module in send_subscribe ( ) is leaking some memory because the hentity is not released. According to memory allocations the shmem allocated for hentity is not cleaned. ``` 1454582 file = 0x70e59fd30209 "usrloc: ../../core/ut.h", func = 0x70e59fd326c8 <__func__.16> "shm_str_dup", mname = 0x70e59fd2fdf0 "usrloc", line = 722 698090 file = 0x604218f2fcd5 "core: core/xavp.c", func = 0x604218f31988 <__func__.9> "xavp_new_value", mname = 0x604218f2fcd0 "core", line = 100 360187 file = 0x70e59fd30663 "usrloc: ucontact.c", func = 0x70e59fd326b8 <__func__.17> "new_ucontact", mname = 0x70e59fd2fdf0 "usrloc", line = 94 34208 file = 0x70e59fc91ae9 "pua: send_subscribe.c", func = 0x70e59fc94c80 <__func__.2> "subscribe_cbparam", mname = 0x70e59fc917e0 "pua", line = 773 5569 file = 0x70e59fc91ae9 "pua: send_subscribe.c", func = 0x70e59fc94ca0 <__func__.1> "subs_cbparam_indlg", mname = 0x70e59fc917e0 "pua", line = 861 64 file = 0x70e5a231f424 "tmx: tmx_pretran.c", func = 0x70e5a2320230 <__func__.0> "tmx_check_pretran", mname = 0x70e5a231f420 "tmx", line = 271 64 file = 0x70e5a231f424 "tmx: tmx_pretran.c", func = 0x70e5a2320230 <__func__.0> "tmx_check_pretran", mname = 0x70e5a231f420 "tmx", line = 250 7 file = 0x70e59fc86854 "pua: event_list.c", func = 0x70e59fc86ad0 <__func__.1> "add_pua_event", mname = 0x70e59fc86850 "pua", line = 72 3 file = 0x70e5a297c249 "license: ../../core/ut.h", func = 0x70e5a297d4f8 <__func__.3> "shm_str_dup", mname = 0x70e5a297c000 "license", line = 722 3 file = 0x70e59fd329d4 "usrloc: udomain.c", func = 0x70e59fd35660 <__func__.22> "build_stat_name", mname = 0x70e59fd328a0 "usrloc", line = 56 ``` According to mod_stats for shmem over RPC the pua module was taking double as much memory as usrloc on the busy system. I have tried to address the issue shown on lines 773 and 861 and added clearing of hentity at the end of send_subscribe () : but it had caused the subscribe_200 outside of dialog to crash kamailio because of running the tm callback that accesses the hentity which is already free'd So I thought perhaps another approach is required and the tm callback should clean it, while I must say i do not 100% clear understand why this needs to be so complicated compared to other modules. Perhaps i have missed another bug and overcomplicated things because the uac_r seems to be cleaned just fine. The issue around the hentity does not seem to be solved in the latest releases while this is 5.3-something custom build. Anyway my last resort that could help is convert to use tm to clear memory once it is done, in tm/uac.c : t_uac_prepare() is registering a callback with release function ``` if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, *(uac_r->cb), uac_r->cbp, NULL)!=1){ ret=E_OUT_OF_MEM; LM_ERR("short of tmcb shmem\n"); goto error1; } int insert_tmcb(struct tmcb_head_list *cb_list, int types, transaction_cb f, void *param, release_tmcb_param rel_func) { ``` is there any example of using such a relfunc in the other modules? Or anyone else has see the pua causing a mem leak when it is subscribed to reginfo from the config? I would appreciate some ideas what could be the issue and the solution. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3928 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3928(a)github.com>

4 8

git:master:fe56aa38: tls_wolfssl: legacy clean-up
by S-P Chan 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: fe56aa38a88a9961141bbcc2fc26d384af63734e URL: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-30T19:47:06+08:00 tls_wolfssl: legacy clean-up --- Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… Patch: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… --- diff --git a/src/modules/tls_wolfssl/tls_init.c b/src/modules/tls_wolfssl/tls_init.c index 2c8c4a4965c..8f2f994e961 100644 --- a/src/modules/tls_wolfssl/tls_init.c +++ b/src/modules/tls_wolfssl/tls_init.c @@ -221,7 +221,6 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) #endif return p; } - #else /*TLS_MALLOC_DBG */ static void *ser_malloc(size_t size) { @@ -234,6 +233,7 @@ static void *ser_realloc(void *ptr, size_t size) } #endif + static void ser_free(void *ptr) { if(ptr) { @@ -241,45 +241,6 @@ static void ser_free(void *ptr) } } -#if 0 -// up align memory allocations to 16 bytes for -// wolfSSL --enable-aligndata=yes (the default) -static const int MAX_ALIGN = __alignof__(max_align_t); - -static void* ser_malloc(size_t size) -{ - char* ptr = shm_malloc(size + MAX_ALIGN); - int pad = MAX_ALIGN - ((long) ptr % MAX_ALIGN); // 8 or 16 bytes - - memset(ptr, pad, pad); - return ptr + pad; -} - -static void* ser_realloc(void *ptr, size_t new_size) -{ - if(!ptr) return ser_malloc(new_size); - - int pad = *((char*)ptr - 1); // 8 or 16 bytes - char *real_ptr = (char*)ptr - pad; - - char *new_ptr = shm_realloc(real_ptr, new_size+MAX_ALIGN); - int new_pad = MAX_ALIGN - ((long) new_ptr % MAX_ALIGN); - if (new_pad != pad) { - memmove(new_ptr + new_pad, new_ptr + pad, new_size); - memset(new_ptr, new_pad, new_pad); - } - - return new_ptr + new_pad; -} - -static void ser_free(void *ptr) -{ - if (ptr) { - int pad = *((unsigned char *)ptr - 1); - shm_free((unsigned char*)ptr - pad); - } -} -#endif /* * Initialize TLS socket diff --git a/src/modules/tls_wolfssl/tls_wolfssl_mod.c b/src/modules/tls_wolfssl/tls_wolfssl_mod.c index e95cecb7be5..9a195b76b39 100644 --- a/src/modules/tls_wolfssl/tls_wolfssl_mod.c +++ b/src/modules/tls_wolfssl/tls_wolfssl_mod.c @@ -262,22 +262,6 @@ static struct tls_hooks tls_h = { }; -#if 0 -/* - * Create TLS configuration from modparams - */ -static tls_domains_cfg_t* tls_use_modparams(void) -{ - tls_domains_cfg_t* ret; - - ret = tls_new_cfg(); - if (!ret) return; - - -} -#endif - - static int mod_init(void) { int method;

1 0

git:master:072c4433: corex: switch to unsigned long long for iflag lookup
by Daniel-Constantin Mierla 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: 072c44330297c653675b5078fb0facdc399a5ab4 URL: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T09:07:36+02:00 corex: switch to unsigned long long for iflag lookup --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… Patch: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index f055af88c8d..e853032cd7f 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -584,7 +584,7 @@ static msg_iflag_name_t _msg_iflag_list[] = { /** * */ -static int msg_lookup_flag(str *fname) +static unsigned long long msg_lookup_flag(str *fname) { int i; for(i = 0; _msg_iflag_list[i].name.len > 0; i++) { @@ -594,21 +594,22 @@ static int msg_lookup_flag(str *fname) return _msg_iflag_list[i].value; } } - return -1; + return 0; } + /** * */ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -621,14 +622,14 @@ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) */ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -641,14 +642,14 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) */ static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; }

1 0

git:master:fdb0ef98: corex: proper check for iflag lookup return code
by Daniel-Constantin Mierla 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: fdb0ef987ca2b013104b06ece006f67bf8ae07d3 URL: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T08:55:08+02:00 corex: proper check for iflag lookup return code --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… Patch: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 4f3214049b6..f055af88c8d 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -608,7 +608,7 @@ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv == 1) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -628,7 +628,7 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv < 0) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -648,7 +648,7 @@ static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv < 0) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; }

1 0

git:master:70606e3e: corex: small formatting of iflag list
by Daniel-Constantin Mierla 30 Jul '24

30 Jul '24

Module: kamailio Branch: master Commit: 70606e3ea575228b3ccc662d6f9048aa0eb899ce URL: https://github.com/kamailio/kamailio/commit/70606e3ea575228b3ccc662d6f9048a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T08:44:03+02:00 corex: small formatting of iflag list --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70606e3ea575228b3ccc662d6f9048a… Patch: https://github.com/kamailio/kamailio/commit/70606e3ea575228b3ccc662d6f9048a… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 6739e4cee16..4f3214049b6 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -571,10 +571,14 @@ typedef struct _msg_iflag_name int value; } msg_iflag_name_t; +/* clang-format off */ static msg_iflag_name_t _msg_iflag_list[] = { - {str_init("USE_UAC_FROM"), FL_USE_UAC_FROM}, - {str_init("USE_UAC_TO"), FL_USE_UAC_TO}, - {str_init("UAC_AUTH"), FL_UAC_AUTH}, {{0, 0}, 0}}; + {str_init("USE_UAC_FROM"), FL_USE_UAC_FROM}, + {str_init("USE_UAC_TO"), FL_USE_UAC_TO}, + {str_init("UAC_AUTH"), FL_UAC_AUTH}, + {{0, 0}, 0} +}; +/* clang-format on */ /**

1 0

git:master:f4e14a94: tls_wolfssl: upstream v5.7.2-stable
by S-P Chan 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: f4e14a945d69e1555aa76431202693f0c855c916 URL: https://github.com/kamailio/kamailio/commit/f4e14a945d69e1555aa76431202693f… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-30T07:43:14+08:00 tls_wolfssl: upstream v5.7.2-stable --- Modified: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/f4e14a945d69e1555aa76431202693f… Patch: https://github.com/kamailio/kamailio/commit/f4e14a945d69e1555aa76431202693f… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index 66596ad9e1d..00e42151ca0 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 66596ad9e1d7efa8479656872cf09c9c1870a02e +Subproject commit 00e42151ca061463ba6a95adb2290f678cbca472

1 0

git:master:280c6cd0: tls_wolfssl: Makefile logging: reduce to info level
by S-P Chan 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: 280c6cd0fac7be75dede54c8e4a96ccf03312371 URL: https://github.com/kamailio/kamailio/commit/280c6cd0fac7be75dede54c8e4a96cc… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-30T07:39:57+08:00 tls_wolfssl: Makefile logging: reduce to info level --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/280c6cd0fac7be75dede54c8e4a96cc… Patch: https://github.com/kamailio/kamailio/commit/280c6cd0fac7be75dede54c8e4a96cc… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index dda5ad4779e..e327def77c1 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -62,4 +62,4 @@ clean-all: clean-wolfssl clean-module .PHONY: clean-wolfssl clean-module clean-all # debugging for dependency on lib/wolfssl -$(warning sources = $(sources), auto_gen = $(auto_gen), objs = $(objs)) +$(info sources = $(sources), auto_gen = $(auto_gen), objs = $(objs))

1 0

[kamailio/kamailio] pkg: Add systemd template for starting multiple kamailio services (PR #3904)
by Xenofon Karamanos 29 Jul '24

29 Jul '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR aims to allow multiple kamailio instances with different configs to be managed by systemd. The new `kamailio@.service` is the systemd template file, where one can provide an instance name after `systemctl start kamailio@dev`, to start a new kamailio instance with name `kamailio-dev` and use config file found in `/etc/kamailio/kamailio-dev.cfg`. I tested that this file and its content can work by placing the file in `/etc/systemd/system/kamailio@.service` and using the above `dev` instance name as an example. Kamailio loads and handles any new messages along with the default kamailio service. My question right now, as I am not really familiar with the packaging workflow, is this an appropriate way to accomplish it. If yes what should be modified to install this alongside the normal `kamailio.service`. Any feedback and review is appreciated and greatly needed! Thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3904 -- Commit Summary -- * pkg: Add systemd template for starting multiple kamailio services -- File Changes -- A pkg/kamailio/deb/debian/kamailio@.service (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3904.patch https://github.com/kamailio/kamailio/pull/3904.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3904 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3904(a)github.com>

3 21

git:master:097cd735: pkg/kamailio/deb: refresh after service template added
by Victor Seva 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: 097cd7353efc251fb764e6f7c88e3330c794d369 URL: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-29T12:31:10+02:00 pkg/kamailio/deb: refresh after service template added at a8cb23903b271a1b78456fed5da8e10474aee405 --- Added: pkg/kamailio/deb/bionic/kamailio@.service Added: pkg/kamailio/deb/bookworm/kamailio@.service Added: pkg/kamailio/deb/bullseye/kamailio@.service Added: pkg/kamailio/deb/buster/kamailio@.service Added: pkg/kamailio/deb/focal/kamailio@.service Added: pkg/kamailio/deb/jammy/kamailio@.service Added: pkg/kamailio/deb/jessie/kamailio@.service Added: pkg/kamailio/deb/precise/kamailio@.service Added: pkg/kamailio/deb/sid/kamailio@.service Added: pkg/kamailio/deb/stretch/kamailio@.service Added: pkg/kamailio/deb/trusty/kamailio@.service Added: pkg/kamailio/deb/wheezy/kamailio@.service Added: pkg/kamailio/deb/xenial/kamailio@.service --- Diff: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333… Patch: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333…

1 0

git:master:add65a47: sdpops: use proper include guard for the file
by Daniel-Constantin Mierla 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: add65a4799c1650ea36c657d190fa0027e798404 URL: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T11:24:00+02:00 sdpops: use proper include guard for the file --- Modified: src/modules/sdpops/sdpops_path.h --- Diff: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… Patch: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… --- diff --git a/src/modules/sdpops/sdpops_path.h b/src/modules/sdpops/sdpops_path.h index 0e7d7088a97..620d9981a00 100644 --- a/src/modules/sdpops/sdpops_path.h +++ b/src/modules/sdpops/sdpops_path.h @@ -20,8 +20,8 @@ */ -#ifndef _SDPOPS_DATA_H_ -#define _SDPOPS_DATA_H_ +#ifndef _SDPOPS_PATH_H_ +#define _SDPOPS_PATH_H_ #include "../../core/str.h" #include "../../core/parser/sdp/sdp.h"

1 0

git:master:49a9c0a0: cplc: use long long constants for operations
by Daniel-Constantin Mierla 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: 49a9c0a0f391c2e9fc45dff7c37a087dde0f7ba3 URL: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T10:07:43+02:00 cplc: use long long constants for operations --- Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… Patch: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… --- diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index b22fe5e8cf9..aea3265d8e8 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -264,8 +264,9 @@ int cpl_ac_print(cpl_ac_tm_p _atp) return -1; } - printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (unsigned long long)_atp->time, - _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); + printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", + (unsigned long long)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, + _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year + 1900, _atp->t.tm_mon + 1, _atp->t.tm_mday); printf("Year day: %d\nYear week-day: %d\nYear week: %d\n", _atp->t.tm_yday, @@ -994,8 +995,8 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) ? REC_MATCH : REC_NOMATCH; #ifdef USE_YWEEK_U - _t0 -= _trp->ts.tm_wday * 24 * 3600; - _t1 -= _atp->t.tm_wday * 24 * 3600; + _t0 -= 24ULL * _trp->ts.tm_wday * 3600; + _t1 -= 24ULL * _atp->t.tm_wday * 3600; #else _t0 -= ((_trp->ts.tm_wday + 6) % 7) * 24 * 3600; _t1 -= ((_atp->t.tm_wday + 6) % 7) * 24 * 3600; @@ -1004,7 +1005,7 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) ? REC_MATCH : REC_NOMATCH; case FREQ_MONTHLY: - _t0 = (_atp->t.tm_year - _trp->ts.tm_year) * 12 + _atp->t.tm_mon + _t0 = 12ULL * (_atp->t.tm_year - _trp->ts.tm_year) + _atp->t.tm_mon - _trp->ts.tm_mon; return (_t0 % _trp->interval == 0) ? REC_MATCH : REC_NOMATCH; case FREQ_YEARLY:

1 0

git:master:fc2f34e8: core: tcp - use long long constants for operations
by Daniel-Constantin Mierla 29 Jul '24

29 Jul '24

Module: kamailio Branch: master Commit: fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52 URL: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T09:44:47+02:00 core: tcp - use long long constants for operations --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… Patch: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8fa6566c14b..fd60918fe34 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -449,9 +449,9 @@ int tcp_read_headers(struct tcp_connection *c, rd_conn_flags_t *read_flags) if(bytes <= 0) return bytes; gettimeofday(&tvnow, NULL); - tvdiff = 1000000 * (tvnow.tv_sec - r->tvrstart.tv_sec) + tvdiff = 1000000LL * (tvnow.tv_sec - r->tvrstart.tv_sec) + (tvnow.tv_usec - r->tvrstart.tv_usec); - if(tvdiff >= ksr_tcp_msg_read_timeout * 1000000) { + if(tvdiff >= 1000000LL * ksr_tcp_msg_read_timeout) { LM_ERR("message reading timeout after %lld usec\n", tvdiff); r->parsed = r->buf; r->content_len = 0;

1 0

Contribute with AUR package
by Nikos Toutountzoglou 29 Jul '24

29 Jul '24

Dear Sirs, I have adopted an orphaned AUR package and tried to fine tune it to be used with Your great Kamailio open source project. I can continue to maintain it in the AUR space. If anything needs to be modified in the package please let me know. Link to the package: https://aur.archlinux.org/packages/kamailio or web search !aur kamailio Regards, Nikos

2 1

git:master:e86d6ee3: db_berkeley: buffer size set to the argument of strftime()
by Daniel-Constantin Mierla 27 Jul '24

27 Jul '24

Module: kamailio Branch: master Commit: e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b URL: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-27T18:16:40+02:00 db_berkeley: buffer size set to the argument of strftime() --- Modified: src/modules/db_berkeley/km_bdb_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… Patch: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… --- diff --git a/src/modules/db_berkeley/km_bdb_lib.c b/src/modules/db_berkeley/km_bdb_lib.c index 06feb6e4bac..4761084c974 100644 --- a/src/modules/db_berkeley/km_bdb_lib.c +++ b/src/modules/db_berkeley/km_bdb_lib.c @@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp) { char *s; char fn[1024]; - char d[64]; + char d[128]; FILE *fp = NULL; struct tm *t; int bl;

1 0

git:master:3333611a: core: cfg select - check res when getting the variable
by Daniel-Constantin Mierla 26 Jul '24

26 Jul '24

Module: kamailio Branch: master Commit: 3333611a3ef9078cbcb9867db88921f0c48fce1b URL: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 core: cfg select - check res when getting the variable --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Patch: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index e6c599a204e..b4e9e6ebef7 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -212,7 +212,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) group = (cfg_group_t *)s->params[1].v.p; var = (cfg_mapping_t *)s->params[2].v.p; - if(!group || !var) + if(!group || !var || !res) return -1; /* use the module's handle to access the variable, so the variables

1 0

git:master:660a0192: xprint: return on mod init error case
by Daniel-Constantin Mierla 26 Jul '24

26 Jul '24

Module: kamailio Branch: master Commit: 660a019263b81d318700c205531bf4e042c912cf URL: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 xprint: return on mod init error case --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Patch: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index b6fc5066556..fda12a82fc3 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1899,6 +1899,7 @@ int xl_mod_init() s = NULL; str_ipaddr.len = 0; PKG_MEM_ERROR_FMT("for str_ipaddr\n"); + return -1; } } else if(strncmp(str_ipaddr.s, s, str_ipaddr.len) != 0) {

1 0

[kamailio/kamailio] Advertise in listen directive doesn't let to use hostname without port (Issue #3932)
by Evgenii Buchnev 26 Jul '24

26 Jul '24

Hey Team, Thank you for the awesome software ### Description Neither option work: `listen=... advertise some.custom.hostname.io` `listen=... advertise some.custom.hostname.io:0` to make Kamailio present only hostname(without port) in Record-Route headers, affects NAPTR/SRV. ### Troubleshooting ============ _Hostname without port - still gives port 5081 in Record-Route_ **kamailio.cfg** ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io name "provider_socket_tls"` ... **sngrep, 200 OK for INVITE** ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=494.6e51>` ... **kamcmd corex.list_sockets** ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ======== _Hostname with port 0 - still gives port 5081 in Record-Route_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:0 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=042.7721>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ============ _Hostname with explicit different port 8888 - gives that port 8888 in Record-Route (to confirm config works)_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:8888 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:8888;transport=tls;r2=on;lr;did=dae.ac31>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:8888 } ``` ... #### Reproduction Please see Troubleshooting section #### Debugging Data Please see Troubleshooting section #### Log Messages N/A #### SIP Traffic Please see Troubleshooting section ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) dbe51d flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_SEND_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: dbe51d compiled on 07:13:22 Jul 17 2024 with gcc 12.2.0) ``` * **Operating System**: ``` [dev]root@[voiceproxy]:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm [dev]root@[voiceproxy]:~# uname -a Linux i-0875d7720d6152612 6.1.0-23-cloud-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.99-1 (2024-07-15) x86_64 GNU/Linux [dev]root@[voiceproxy]:~# cat /etc/*relea* ID=ec2 VERSION="20240702-1796" PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` * **Might be related** : https://github.com/kamailio/kamailio/issues/1884 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3932 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3932(a)github.com>

2 4

[kamailio/kamailio] cdp: fix use after free in transaction call backs (PR #3931)
by Rick Barenthin 25 Jul '24

25 Jul '24

If the traction is set to auto drop, the memory will be freed and with it the next pointer.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The use after free caused on a Load tested system crashes. Now the next pointer is saved before executing the callback and handle the auto drop. Then the stored next pointer is used to continue the iteration over the callbacks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3931 -- Commit Summary -- * cdp: fix use after free in transaction call backs -- File Changes -- M src/modules/cdp/transaction.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3931.patch https://github.com/kamailio/kamailio/pull/3931.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3931 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3931(a)github.com>

3 2

git:master:a71bd9d9: cdp: fix use after free in transaction call backs
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a71bd9d9424456ef1167468c5bbbfd38b1099e89 URL: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T12:20:59+02:00 cdp: fix use after free in transaction call backs If the traction is set to auto drop, the memory will be freed and with it the next pointer. --- Modified: src/modules/cdp/transaction.c --- Diff: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… Patch: https://github.com/kamailio/kamailio/commit/a71bd9d9424456ef1167468c5bbbfd3… --- diff --git a/src/modules/cdp/transaction.c b/src/modules/cdp/transaction.c index f1445ff15be..a2b97654dd0 100644 --- a/src/modules/cdp/transaction.c +++ b/src/modules/cdp/transaction.c @@ -256,10 +256,11 @@ int cdp_trans_timer(time_t now, void *ptr) /* do all queued callbacks */ x = cb_queue->head; while(x) { + n = x->next; (x->cb)(1, *(x->ptr), 0, (now - x->expires)); if(x->auto_drop) cdp_free_trans(x); - x = x->next; + x = n; } pkg_free(cb_queue);

1 0

[kamailio/kamailio] ims_qos_npn: fixed issues discovered by coverity (PR #3926)
by Dragos Vingarzan 25 Jul '24

25 Jul '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fixing issues discovered by Coverity You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3926 -- Commit Summary -- * ims_qos_npn: fixed issues discovered by coverity -- File Changes -- M src/modules/ims_qos_npn/rx_aar.c (12) M src/modules/ims_qos_npn/rx_avp.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3926.patch https://github.com/kamailio/kamailio/pull/3926.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3926 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3926(a)github.com>

2 2

git:master:79433959: ims_qos_npn: fixed missing breaks in switch and checks for null pointers
by Dragos Vingarzan 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: 7943395957c070a16553b16536e5be59b4719d9b URL: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-07-25T11:47:24+02:00 ims_qos_npn: fixed missing breaks in switch and checks for null pointers --- Modified: src/modules/ims_qos_npn/rx_aar.c Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… Patch: https://github.com/kamailio/kamailio/commit/7943395957c070a16553b16536e5be5… --- diff --git a/src/modules/ims_qos_npn/rx_aar.c b/src/modules/ims_qos_npn/rx_aar.c index fc99344c2c6..4423a0561b2 100644 --- a/src/modules/ims_qos_npn/rx_aar.c +++ b/src/modules/ims_qos_npn/rx_aar.c @@ -615,7 +615,7 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, //check if the src or dst port is 0 and if so then don't add to rx intportA = atoi(req_sdp_stream->port.s); - if(rpl) { + if(rpl_sdp_stream) { intportB = atoi(rpl_sdp_stream->port.s); } if(intportA != 0 && (rpl && intportB != 0)) { @@ -719,18 +719,20 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, auth->u.auth.generic_data, sdp_stream_num + 1, &req_sdp_stream->media, &ipA, &portA, &ipB, &portB, - rpl ? &rpl_sdp_stream->transport : 0, + rpl_sdp_stream ? &rpl_sdp_stream->transport : 0, &req_sdp_stream->raw_stream, - rpl ? &rpl_sdp_stream->raw_stream : 0, + rpl_sdp_stream ? &rpl_sdp_stream->raw_stream + : 0, direction, 0 /*This is a new mcd, we are not setting it as active*/); rx_add_media_component_description_avp(aar, sdp_stream_num + 1, &req_sdp_stream->media, &ipA, &portA, &ipB, &portB, - rpl ? &rpl_sdp_stream->transport : 0, + rpl_sdp_stream ? &rpl_sdp_stream->transport : 0, &req_sdp_stream->raw_stream, - rpl ? &rpl_sdp_stream->raw_stream : 0, + rpl_sdp_stream ? &rpl_sdp_stream->raw_stream + : 0, direction, AVP_EPC_Flow_Usage_No_Information); } add_flow = 1; diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index a0053138b4f..a2fd3188efe 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -1402,7 +1402,7 @@ int rx_mcc_mnc_to_sip_visited(str *dst, str src) } mcc = (100 * (src.s[0] - '0') + (10 * (src.s[1] - '0')) + ((src.s[2] - '0'))); - if(mcc < 0 || mcc >= 999) { + if(mcc >= 999) { LOG(L_ERR, "Invalid MCC value\n"); return 0; } @@ -1699,6 +1699,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 1: // SAI if(length >= 7) { @@ -1707,6 +1708,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 2: // RAI if(length >= 7) { @@ -1715,6 +1717,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) p += 7; length -= 7; } + break; case 3 ... 127: // spare for future use break;

1 0

git:master:b4efe772: janssonrpcc: free new servers list on error
by Daniel-Constantin Mierla 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: b4efe7725728392d0c8921c006d6fbc6455e9b8f URL: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-25T10:59:15+02:00 janssonrpcc: free new servers list on error --- Modified: src/modules/janssonrpcc/janssonrpc_srv.c --- Diff: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… Patch: https://github.com/kamailio/kamailio/commit/b4efe7725728392d0c8921c006d6fbc… --- diff --git a/src/modules/janssonrpcc/janssonrpc_srv.c b/src/modules/janssonrpcc/janssonrpc_srv.c index 73eb25ce62d..9b7ac31c084 100644 --- a/src/modules/janssonrpcc/janssonrpc_srv.c +++ b/src/modules/janssonrpcc/janssonrpc_srv.c @@ -90,6 +90,7 @@ int refresh_srv(jsonrpc_srv_t *srv_obj) srv_record = (struct srv_rdata *)l->rdata; if(srv_record == NULL) { free_rdata_list(head); + free_server_list(new_servers); ERR("BUG: null rdata\n"); return -1; }

1 0

git:master:a8cb2390: pkg: Add systemd template for starting multiple kamailio services
by Xenofon Karamanos 25 Jul '24

25 Jul '24

Module: kamailio Branch: master Commit: a8cb23903b271a1b78456fed5da8e10474aee405 URL: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-07-25T11:11:36+03:00 pkg: Add systemd template for starting multiple kamailio services --- Added: pkg/kamailio/deb/debian/kamailio@.service --- Diff: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… Patch: https://github.com/kamailio/kamailio/commit/a8cb23903b271a1b78456fed5da8e10… --- diff --git a/pkg/kamailio/deb/debian/kamailio@.service b/pkg/kamailio/deb/debian/kamailio@.service new file mode 100644 index 00000000000..81c06394d17 --- /dev/null +++ b/pkg/kamailio/deb/debian/kamailio@.service @@ -0,0 +1,26 @@ +[Unit] +Description=Kamailio - the Open Source SIP Server (instance %i) +Documentation=man:kamailio(8) +Wants=network-online.target +After=network-online.target + +[Service] +Type=forking +User=kamailio +Group=kamailio +Environment='CFGFILE=/etc/kamailio/kamailio-%i.cfg' +Environment='SHM_MEMORY=64' +Environment='PKG_MEMORY=8' +EnvironmentFile=-/etc/default/kamailio-%i +EnvironmentFile=-/etc/default/kamailio-%i.d/* +# PIDFile requires a full absolute path +PIDFile=/run/kamailio-%i/kamailio.pid +# ExecStart requires a full absolute path +ExecStart=/usr/sbin/kamailio -P /run/kamailio-%i/kamailio.pid -Y /run/kamailio-%i -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY +Restart=on-failure +# /run/kamailio in tmpfs +RuntimeDirectory=kamailio-%i +RuntimeDirectoryMode=0770 + +[Install] +WantedBy=multi-user.target

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev