- sr-dev - kamailio.org

git:5.5:471dea49: acc: set again the type of db vals
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: 5.5 Commit: 471dea4941f044e4a1489bf6f1dbb7297341a3fb URL: https://github.com/kamailio/kamailio/commit/471dea4941f044e4a1489bf6f1dbb72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:12:23+01:00 acc: set again the type of db vals - work properly when nullable modparam is set and var can be null on some transactions (cherry picked from commit 908ca872bec956d5f755a1b51df781bf66ad3866) --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/471dea4941f044e4a1489bf6f1dbb72… Patch: https://github.com/kamailio/kamailio/commit/471dea4941f044e4a1489bf6f1dbb72… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index b95275853d..196aba5c7e 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -464,6 +464,9 @@ int acc_db_request( struct sip_msg *rq) LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { + LM_DBG("attr[%d] is STR len=%d\n", i, val_arr[i].len); + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i) = val_arr[i]; } } @@ -499,6 +502,8 @@ int acc_db_request( struct sip_msg *rq) if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { VAL_NULL(db_vals + i) = 1; } else { + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i)=val_arr[i]; } }

1 0

git:5.5:5e771acc: acc: debug messages to print the type of extra acc attrs
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: 5.5 Commit: 5e771acc3e4c3e8f3480cb971a5493d5c667cf5e URL: https://github.com/kamailio/kamailio/commit/5e771acc3e4c3e8f3480cb971a5493d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:09:38+01:00 acc: debug messages to print the type of extra acc attrs (cherry picked from commit 4bd77f1dae2eeacbe7384ac2838c691f76e077f1) --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/5e771acc3e4c3e8f3480cb971a5493d… Patch: https://github.com/kamailio/kamailio/commit/5e771acc3e4c3e8f3480cb971a5493d… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 81e27eb2c5..b95275853d 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -461,6 +461,7 @@ int acc_db_request( struct sip_msg *rq) for( i++ ; i<m; i++) { if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { + LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { VAL_STR(db_vals+i) = val_arr[i]; diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 5e8568535e..ac84d3f894 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -258,6 +258,7 @@ int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, type_arr[n] = TYPE_STR; } } + LM_DBG("type of the extra attr[%d] set to: %d\n", n, type_arr[n]); n++; extra = extra->next;

1 0

git:5.5:706b1ceb: core: io wait - remove log level string from debug message
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: 5.5 Commit: 706b1ceb9cb5139c4464873c8df6d99c541dda7b URL: https://github.com/kamailio/kamailio/commit/706b1ceb9cb5139c4464873c8df6d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:09:58+01:00 core: io wait - remove log level string from debug message (cherry picked from commit 4608914cf9d3878c79560730ddad8e0800c38397) --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/706b1ceb9cb5139c4464873c8df6d99… Patch: https://github.com/kamailio/kamailio/commit/706b1ceb9cb5139c4464873c8df6d99… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index d9791c3c85..5e823fb76f 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -371,7 +371,7 @@ inline static int io_watch_add( io_wait_h* h, LM_CRIT("maximum fd number exceeded: %d/%d\n", h->fd_no, h->max_fd_no); goto error; } - DBG("DBG: io_watch_add(%p, %d, %d, %p), fd_no=%d\n", + DBG("processing io_watch_add(%p, %d, %d, %p) - fd_no=%d\n", h, fd, type, data, h->fd_no); /* hash sanity check */ e=get_fd_map(h, fd);

1 0

git:master:e2cc98eb: tls: try to print sni on tls error
by Daniel-Constantin Mierla 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: e2cc98eb5aca42b82eb18c35adfa2d16ff4a3f60 URL: https://github.com/kamailio/kamailio/commit/e2cc98eb5aca42b82eb18c35adfa2d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-22T09:01:09+01:00 tls: try to print sni on tls error --- Modified: src/modules/tls/tls_server.c Modified: src/modules/tls/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/e2cc98eb5aca42b82eb18c35adfa2d1… Patch: https://github.com/kamailio/kamailio/commit/e2cc98eb5aca42b82eb18c35adfa2d1… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index f75b111168..7004096adf 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -285,7 +285,7 @@ static int tls_complete_init(struct tcp_connection* c) data->state = state; if (unlikely(data->ssl == 0 || data->rwbio == 0)) { - TLS_ERR("Failed to create SSL or BIO structure:"); + TLS_ERR_SSL("Failed to create SSL or BIO structure:", data->ssl); if (data->ssl) SSL_free(data->ssl); if (data->rwbio) @@ -446,7 +446,7 @@ EVP_PKEY * tls_lookup_private_key(SSL_CTX*); int tls_accept(struct tcp_connection *c, int* error) { int ret; - SSL *ssl; + SSL *ssl = NULL; X509* cert; struct tls_extra_data* tls_c; int tls_log; @@ -792,7 +792,7 @@ int tls_h_encode_f(struct tcp_connection *c, snd_flags_t* send_flags) { int n, offs; - SSL* ssl; + SSL* ssl = NULL; struct tls_extra_data* tls_c; static unsigned char wr_buf[TLS_WR_MBUF_SZ]; struct tls_mbuf rd, wr; @@ -929,7 +929,7 @@ int tls_h_encode_f(struct tcp_connection *c, case SSL_ERROR_SSL: /* protocol level error */ ERR("protocol level error\n"); - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); memset(ip_buf, 0, sizeof(buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); @@ -970,7 +970,7 @@ int tls_h_encode_f(struct tcp_connection *c, } goto error; default: - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); BUG("unexpected SSL error %d\n", ssl_error); goto bug; } @@ -1053,6 +1053,7 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) int x; int tls_dbg; + ssl = NULL; TLS_RD_TRACE("(%p, %p (%d)) start (%s -> %s:%d*)\n", c, flags, *flags, su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), @@ -1327,7 +1328,7 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) case SSL_ERROR_SSL: /* protocol level error */ ERR("protocol level error\n"); - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("src addr: %s:%d\n", ip_buf, c->rcv.src_port); @@ -1368,7 +1369,7 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) } goto error; default: - TLS_ERR(err_src); + TLS_ERR_SSL(err_src, ssl); BUG("unexpected SSL error %d\n", ssl_error); goto bug; } diff --git a/src/modules/tls/tls_util.h b/src/modules/tls/tls_util.h index 8ff63dd0f1..86e036cce9 100644 --- a/src/modules/tls/tls_util.h +++ b/src/modules/tls/tls_util.h @@ -26,20 +26,29 @@ #ifndef _TLS_UTIL_H #define _TLS_UTIL_H +#include <openssl/ssl.h> #include <openssl/err.h> #include "../../core/dprint.h" #include "../../core/str.h" #include "tls_domain.h" -static inline int tls_err_ret(char *s, tls_domains_cfg_t **tls_domains_cfg) { +static inline int tls_err_ret(char *s, SSL* ssl, + tls_domains_cfg_t **tls_domains_cfg) +{ long err; int ret = 0; + const char *sn = NULL; + if ((*tls_domains_cfg)->srv_default->ctx && (*tls_domains_cfg)->srv_default->ctx[0]) { + if(ssl) { + sn = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name); + } while((err = ERR_get_error())) { ret = 1; - ERR("%s%s\n", s ? s : "", ERR_error_string(err, 0)); + ERR("%s%s (sni: %s)\n", s ? s : "", ERR_error_string(err, 0), + (sn) ? sn : "unknown"); } } return ret; @@ -47,15 +56,19 @@ static inline int tls_err_ret(char *s, tls_domains_cfg_t **tls_domains_cfg) { #define TLS_ERR_RET(r, s) \ do { \ - (r) = tls_err_ret((s), tls_domains_cfg); \ + (r) = tls_err_ret((s), NULL, tls_domains_cfg); \ } while(0) #define TLS_ERR(s) \ do { \ - tls_err_ret((s), tls_domains_cfg); \ + tls_err_ret((s), NULL, tls_domains_cfg); \ } while(0) +#define TLS_ERR_SSL(s, ssl) \ +do { \ + tls_err_ret((s), (ssl), tls_domains_cfg); \ +} while(0) /* * Make a shared memory copy of ASCII zero terminated string

1 0

[kamailio/kamailio] tls module causes too many small fragments when tls connection time out (Issue #2943)
by JiangHai2011 22 Nov '21

22 Nov '21

### Description I made sipp 3000 calls test with tls connection in both caller side and callee side. After 3000calls are all established, the sipp will stay for 1min and then shut down all the network interfaces(iptables -I INPUT -j DROP) to let all tls connections timeout. And then repeat this test over and over again . But after some rounds of this kind of test, the calls can not reach 3000, only 2900calls will meet "out of mem" issue. The log is :+1: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Our reliminary analysis: 1. this is not memory leak issue, 2. tls module malloc too many small fragments, which causes shared memory pool's utility reduced (we can see core.shmmem show us the free >= 200MB and fragments >=600000. But there is no consecutive free frags for a new tls connections) ### Reproduction Settings: /opt/kamailio/sbin/kamailio -m 2048 -M 64 ----------------------cfg------------------------- enable_tls=yes tls_port_no=SIP_LISTEN_PORT_V6 tls_max_connections=102400 tcp_connection_lifetime=3605 tcp_max_connections=102400 dns_cache_min_ttl=1800 open_files_limit=102400 tcp_no_connect=no tcp_conn_wq_max=10240000 tcp_async=no tcp_rd_buf_size=256000 ----------------------------------------- Topology: sipp caller ------tls--------kamailio-----tls-------sipp callee (3000calls = 6000 tls connections) sipp and kamailio are running in the same PC Step1: start sipp 3000 call test Step2: after 3000 calls are all established, execute "iptables -I INPUT -j DROP" Step3: wait for all connections are timeout Step4: go to Step1: restart sipp scripts ### Expected Behavior 3000 calls test will always be successful #### Log Messages ------------------------------this is the log of "after 2900 calls"---------------------------- Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:416]: fm_search_defrag(): fm_search_defrag(0x7fd314a68000, 256760); Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:499]: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [tcp_main.c:1888]: tcpconn_new(): mem. allocation failure -----------------------------this is corex.shm_summary of "after 2900 calls"------------------------------ corex [corex_rpc.c:176]: corex_rpc_shm_summary(): printing shared memory summary report fm_status: summarizing all alloc'ed. fragments: fm_status: count= 2928 size= 113296 bytes from tls: tls_ct_q.h: tls_ct_q_add(58) fm_status: count= 5857 size=1504098328 bytes from core: tcp_main.c: tcpconn_new(1886) fm_status: count= 1 size= 8192 bytes from core: counters.c: counters_prefork_init(207) fm_status: count= 22 size= 688 bytes from core: cfg_parser.c: cfg_parse_str(906) fm_status: count= 8 size= 1024 bytes from tls: tls_domain.c: fix_domain(1004) fm_status: count= 5856 size= 307200 bytes from tls: tls_server.c: tls_complete_init(228) fm_status: count= 1 size= 3072 bytes from sl: sl_stats.c: init_sl_stats_child(125) fm_status: count= 1 size= 768 bytes from kex: pkg_stats.c: pkg_proc_stats_init(79) fm_status: count= 5 size= 152 bytes from core: cfg/cfg_struct.c: cfg_clone_str(130) fm_status: count= 1 size= 712 bytes from core: cfg/cfg_struct.c: cfg_shmize(217) fm_status: count= 1 size= 2240 bytes from core: pt.c: init_pt(104) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(110) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(105) fm_status: count= 3 size= 120 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(692) fm_status: count= 3 size= 48 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(684) fm_status: count= 1008 size= 40320 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(472) fm_status: count= 1008 size= 16128 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(465) fm_status: count= 1011 size= 32352 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(892) fm_status: count= 1011 size= 48528 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(883) fm_status: count= 65536 size= 3670016 bytes from gs: gs_mod.c: mod_init(267) fm_status: count= 1 size= 1048576 bytes from gs: gs_mod.c: mod_init(260) fm_status: count= 1 size= 24 bytes from outbound: ob_mod.c: mod_init(104) fm_status: count= 1 size= 24 bytes from utils: conf.c: conf_init(549) fm_status: count= 1 size= 8 bytes from utils: utils.c: init_shmlock(160) fm_status: count= 8 size= 1536 bytes from tls: tls_domain.c: tls_new_domain(160) fm_status: count= 2 size= 96 bytes from tls: tls_domain.c: tls_new_cfg(1317) fm_status: count= 1 size= 8 bytes from tls: tls_ct_wrq.c: tls_ct_wq_init(49) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(406) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(390) fm_status: count= 1 size= 8 bytes from sl: sl_funcs.c: sl_startup(83) fm_status: count= 1 size= 8 bytes from sl: sl_stats.c: init_sl_stats(110) fm_status: count= 2 size= 64 bytes from core: cfg/cfg_ctx.c: cfg_register_ctx(47) fm_status: count= 63282 size= 2975704 bytes from tls: tls_init.c: ser_realloc(292) fm_status: count= 1 size= 8192 bytes from core: tcp_main.c: init_tcp(5649) fm_status: count= 1 size= 32768 bytes from core: tcp_main.c: init_tcp(5643) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5635) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5628) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5621) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5615) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5603) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(90) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(89) fm_status: count= 1 size= 16384 bytes from core: dst_blacklist.c: init_dst_blacklist(437) fm_status: count= 1 size= 8 bytes from core: dst_blacklist.c: init_dst_blacklist(430) fm_status: count= 2 size= 96 bytes from core: timer.c: timer_alloc(514) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(369) fm_status: count= 1 size= 16384 bytes from core: dns_cache.c: init_dns_cache(361) fm_status: count= 1 size= 16 bytes from core: dns_cache.c: init_dns_cache(354) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(345) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(283) fm_status: count= 1 size= 16384 bytes from core: timer.c: init_timer(282) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(281) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(280) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(269) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(237) fm_status: count= 1 size= 278544 bytes from core: timer.c: init_timer(220) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(219) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(206) fm_status: count= 1 size= 64 bytes from core: cfg/cfg_struct.c: cfg_child_cb_new(830) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(361) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(354) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(347) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(335) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(323) fm_status: count=502731 size= 292261096 bytes from tls: tls_init.c: ser_malloc(286) fm_status: count= 1 size= 24 bytes from tls: ../../lock_alloc.h: lock_set_alloc(70) fm_status: count= 1 size= 8 bytes from core: mem/shm.c: shm_core_lock_init(153) fm_status: ----------------------------- -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2943

2 2

[kamailio/kamailio] too many fragments are generated during tls connection timeout (Issue #2942)
by JiangHai2011 22 Nov '21

22 Nov '21

### Description I made sipp 3000 calls test with tls connection in both caller side and callee side. After 3000calls are all established, the sipp will stay for 1min and then shut down all the network interfaces(iptables -I INPUT -j DROP) to let all tls connections timeout. And then repeat this test over and over again . But after some rounds of this kind of test, the calls can not reach 3000, only 2900calls will meet "out of mem" issue. The log is :+1: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Our reliminary analysis: 1. this is not memory leak issue, 2. tls module malloc too many small fragments, which causes shared memory pool's utility reduced (we can see core.shmmem show us the free >= 200MB and fragments >=600000. But there is no consecutive free frags for a new tls connections) ### Reproduction Settings: /opt/kamailio/sbin/kamailio -m 2048 -M 64 ----------------------cfg------------------------- enable_tls=yes tls_port_no=SIP_LISTEN_PORT_V6 tls_max_connections=102400 # life time of TCP connection when there is no traffic # - a bit higher than registration expires to cope with UA behind NAT tcp_connection_lifetime=3605 tcp_max_connections=102400 dns_cache_min_ttl=1800 open_files_limit=102400 #for IMS, tcp_no_connect should be set to no, there is a fixing on Thu Dec 28 10:38:59 2017 tcp_no_connect=no tcp_conn_wq_max=10240000 tcp_async=no tcp_rd_buf_size=256000 ----------------------------------------- Topology: sipp caller ------tls--------kamailio-----tls-------sipp callee (3000calls = 6000 tls connections) sipp and kamailio are running in the same PC Step1: start sipp 3000 call test Step2: after 3000 calls are all established, execute "iptables -I INPUT -j DROP" Step3: wait for all connections are timeout Step4: go to Step1: restart sipp scripts ### Expected Behavior 3000 calls test will always be successful #### Log Messages ------------------------------this is the log of "after 2900 calls"---------------------------- Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:416]: fm_search_defrag(): fm_search_defrag(0x7fd314a68000, 256760); Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [mem/f_malloc.c:499]: fm_malloc(): fm_malloc(0x7fd314a68000, 256760) called from core: tcp_main.c: tcpconn_new(1886), module: core; Free fragment not found! Nov 16 05:36:27 kamailio[3103]: ERROR: <core> [tcp_main.c:1888]: tcpconn_new(): mem. allocation failure -----------------------------this is corex.shm_summary of "after 2900 calls"------------------------------ corex [corex_rpc.c:176]: corex_rpc_shm_summary(): printing shared memory summary report fm_status: summarizing all alloc'ed. fragments: fm_status: count= 2928 size= 113296 bytes from tls: tls_ct_q.h: tls_ct_q_add(58) fm_status: count= 5857 size=1504098328 bytes from core: tcp_main.c: tcpconn_new(1886) fm_status: count= 1 size= 8192 bytes from core: counters.c: counters_prefork_init(207) fm_status: count= 22 size= 688 bytes from core: cfg_parser.c: cfg_parse_str(906) fm_status: count= 8 size= 1024 bytes from tls: tls_domain.c: fix_domain(1004) fm_status: count= 5856 size= 307200 bytes from tls: tls_server.c: tls_complete_init(228) fm_status: count= 1 size= 3072 bytes from sl: sl_stats.c: init_sl_stats_child(125) fm_status: count= 1 size= 768 bytes from kex: pkg_stats.c: pkg_proc_stats_init(79) fm_status: count= 5 size= 152 bytes from core: cfg/cfg_struct.c: cfg_clone_str(130) fm_status: count= 1 size= 712 bytes from core: cfg/cfg_struct.c: cfg_shmize(217) fm_status: count= 1 size= 2240 bytes from core: pt.c: init_pt(104) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(110) fm_status: count= 1 size= 8 bytes from core: pt.c: init_pt(105) fm_status: count= 3 size= 120 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(692) fm_status: count= 3 size= 48 bytes from gs: gs_mod.c: _append_to_blacklist_unsafe(684) fm_status: count= 1008 size= 40320 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(472) fm_status: count= 1008 size= 16128 bytes from gs: gs_mod.c: _append_to_backend_server_list_unsafe(465) fm_status: count= 1011 size= 32352 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(892) fm_status: count= 1011 size= 48528 bytes from gs: gs_mod.c: _update_one_slot_in_gs_hash_table_by_domain_dir(883) fm_status: count= 65536 size= 3670016 bytes from gs: gs_mod.c: mod_init(267) fm_status: count= 1 size= 1048576 bytes from gs: gs_mod.c: mod_init(260) fm_status: count= 1 size= 24 bytes from outbound: ob_mod.c: mod_init(104) fm_status: count= 1 size= 24 bytes from utils: conf.c: conf_init(549) fm_status: count= 1 size= 8 bytes from utils: utils.c: init_shmlock(160) fm_status: count= 8 size= 1536 bytes from tls: tls_domain.c: tls_new_domain(160) fm_status: count= 2 size= 96 bytes from tls: tls_domain.c: tls_new_cfg(1317) fm_status: count= 1 size= 8 bytes from tls: tls_ct_wrq.c: tls_ct_wq_init(49) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(406) fm_status: count= 1 size= 8 bytes from tls: tls_mod.c: mod_init(390) fm_status: count= 1 size= 8 bytes from sl: sl_funcs.c: sl_startup(83) fm_status: count= 1 size= 8 bytes from sl: sl_stats.c: init_sl_stats(110) fm_status: count= 2 size= 64 bytes from core: cfg/cfg_ctx.c: cfg_register_ctx(47) fm_status: count= 63282 size= 2975704 bytes from tls: tls_init.c: ser_realloc(292) fm_status: count= 1 size= 8192 bytes from core: tcp_main.c: init_tcp(5649) fm_status: count= 1 size= 32768 bytes from core: tcp_main.c: init_tcp(5643) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5635) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5628) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5621) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5615) fm_status: count= 1 size= 8 bytes from core: tcp_main.c: init_tcp(5603) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(90) fm_status: count= 1 size= 8 bytes from core: usr_avp.c: init_avps(89) fm_status: count= 1 size= 16384 bytes from core: dst_blacklist.c: init_dst_blacklist(437) fm_status: count= 1 size= 8 bytes from core: dst_blacklist.c: init_dst_blacklist(430) fm_status: count= 2 size= 96 bytes from core: timer.c: timer_alloc(514) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(369) fm_status: count= 1 size= 16384 bytes from core: dns_cache.c: init_dns_cache(361) fm_status: count= 1 size= 16 bytes from core: dns_cache.c: init_dns_cache(354) fm_status: count= 1 size= 8 bytes from core: dns_cache.c: init_dns_cache(345) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(283) fm_status: count= 1 size= 16384 bytes from core: timer.c: init_timer(282) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(281) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(280) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(269) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(237) fm_status: count= 1 size= 278544 bytes from core: timer.c: init_timer(220) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(219) fm_status: count= 1 size= 8 bytes from core: timer.c: init_timer(206) fm_status: count= 1 size= 64 bytes from core: cfg/cfg_struct.c: cfg_child_cb_new(830) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(361) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(354) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(347) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(335) fm_status: count= 1 size= 8 bytes from core: cfg/cfg_struct.c: sr_cfg_init(323) fm_status: count=502731 size= 292261096 bytes from tls: tls_init.c: ser_malloc(286) fm_status: count= 1 size= 24 bytes from tls: ../../lock_alloc.h: lock_set_alloc(70) fm_status: count= 1 size= 8 bytes from core: mem/shm.c: shm_core_lock_init(153) fm_status: ----------------------------- -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2942

1 1

[kamailio/kamailio] core: add a module hook for post-fork cleanup (PR #2919)
by aalba6675 22 Nov '21

22 Nov '21

#### 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 - [X] Related to issue #2285 #### Description This PR provides a hook to all into modules when all `fork_process()` is completed. This is to that the module in the main process can perform post-fork cleanup. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2919 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2919/commits/cfc8f6373d3dd4cdb09f…">core: add a module hook for post-fork cleanup</a> -- File Changes -- M src/core/sr_module.h (1) M src/main.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2919.patch https://github.com/kamailio/kamailio/pull/2919.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2919

2 10

git:master:d2c22d2b: app_python3: Python >= 3.7 call PyOS_AfterFork_Parent in main context after all forks
by Anthony Alba 22 Nov '21

22 Nov '21

Module: kamailio Branch: master Commit: d2c22d2b72d7ffd616a6aaacbabc6184a8da56e7 URL: https://github.com/kamailio/kamailio/commit/d2c22d2b72d7ffd616a6aaacbabc618… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-22T11:46:25+08:00 app_python3: Python >= 3.7 call PyOS_AfterFork_Parent in main context after all forks --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2c22d2b72d7ffd616a6aaacbabc618… Patch: https://github.com/kamailio/kamailio/commit/d2c22d2b72d7ffd616a6aaacbabc618… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 8ec252039c..f710694d75 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -104,7 +104,13 @@ static int mod_init(void) char *dname_src, *bname_src; int i; - if(apy_sr_init_mod()<0) { + /* + * register the need to be called post-fork of all children + * with the special rank PROC_POSTCHILDINIT + */ + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + + if (apy_sr_init_mod()<0) { LM_ERR("failed to init the sr mod\n"); return -1; } @@ -185,6 +191,16 @@ static int child_init(int rank) */ #if PY_VERSION_HEX >= 0x03070000 PyOS_BeforeFork() ; +#endif + return 0; + } + if(rank==PROC_POSTCHILDINIT) { + /* + * this is called after forking of all child + * processes + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_AfterFork_Parent() ; #endif return 0; }

1 0

[kamailio/kamailio] ims_usrloc_pcscf: fix on saving protocol info into DB (#2879)
by Erhan Onur Sendag 19 Nov '21

19 Nov '21

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] 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 - [*] 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  Protocol information of pcontact was not written to mysql database You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2879 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2879/commits/c7cf1937bfc9a36e7086…">Fix on saving protocol info for ims_usrloc_pcscf</a> -- File Changes -- M src/modules/ims_usrloc_pcscf/usrloc_db.c (2) M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2879.patch https://github.com/kamailio/kamailio/pull/2879.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2879

4 4

git:master:5e617b5e: modules: readme files regenerated - kazoo ... [skip ci]
by Kamailio Dev 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 5e617b5e2130ed96f624e027023329433f8814ee URL: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-19T12:46:21+01:00 modules: readme files regenerated - kazoo ... [skip ci] --- Modified: src/modules/kazoo/README --- Diff: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… Patch: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… --- diff --git a/src/modules/kazoo/README b/src/modules/kazoo/README index 7497dd20e8..572774ff2c 100644 --- a/src/modules/kazoo/README +++ b/src/modules/kazoo/README @@ -67,10 +67,10 @@ Luis Azedo 5.1. amqp related 5.1.1. kazoo_publish(exchange, routing_key, - json_payload) + json_payload [, amqp_headers]) 5.1.2. kazoo_query(exchange, routing_key, json_payload - [, target_var]) + [, target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -175,9 +175,11 @@ Chapter 1. Admin Guide 5.1. amqp related - 5.1.1. kazoo_publish(exchange, routing_key, json_payload) + 5.1.1. kazoo_publish(exchange, routing_key, json_payload [, + amqp_headers]) + 5.1.2. kazoo_query(exchange, routing_key, json_payload [, - target_var]) + target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -623,9 +625,11 @@ modparam("kazoo", "pua_mode", 0) 5.1. amqp related - 5.1.1. kazoo_publish(exchange, routing_key, json_payload) + 5.1.1. kazoo_publish(exchange, routing_key, json_payload [, + amqp_headers]) + 5.1.2. kazoo_query(exchange, routing_key, json_payload [, - target_var]) + target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -643,10 +647,11 @@ modparam("kazoo", "pua_mode", 0) 5.1. amqp related -5.1.1. kazoo_publish(exchange, routing_key, json_payload) +5.1.1. kazoo_publish(exchange, routing_key, json_payload [, amqp_headers]) The function publishes a json payload to rabbitmq. The routing_key - parameter should be encoded. + parameter should be encoded. Optional AMQP-Headers are specified in the + format key1=value1;key2=value2 This function can be used from ANY ROUTE. @@ -661,12 +666,14 @@ $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ... -5.1.2. kazoo_query(exchange, routing_key, json_payload [, target_var]) +5.1.2. kazoo_query(exchange, routing_key, json_payload [, target_var] [, +amqp_headers]) The function publishes a json payload to rabbitmq, waits for a correlated messageand puts the result in target_var. The routing_key parameter should be encoded. target_var is optional as the function - also puts the result in pseudo-variable $kzR. + also puts the result in pseudo-variable $kzR. Optional AMQP-Headers are + specified in the format key1=value1;key2=value2 This function can be used from ANY ROUTE.

1 0

[kamailio/kamailio] Allow setting AMQP-Headers when publishing messages (Issue #2895)
by mihovilkolaric 19 Nov '21

19 Nov '21

### Description I am using kazoo-module for connecting Kamailio to RabbitMQ and publishing messages to several consumers. Now I´d like to extend my setup to a more sophisticated routing based on a consistent hash-exchange (https://github.com/rabbitmq/rabbitmq-consistent-hash-exchange), while retaining also existing topology based on routing keys. This can be achieved by using ["Routing on a Header" (hash-header)](https://github.com/rabbitmq/rabbitmq-consistent-hash-exchange…). However, [kazoo_publish](https://kamailio.org/docs/modules/5.0.x/modules/kazoo.html#i… does not allow setting such header. ### Expected behavior Please extend publish-functions of the kazoo-module with the possibility to (optionally) supply AMQP-headers. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2895

3 4

[kamailio/kamailio] kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish (PR #2925)
by mihovilkolaric 19 Nov '21

19 Nov '21

- implements GH #2895   #### 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 - [x] Related to issue #2895 #### Description Allows adding additional AMQP-headers in the format header1=value1;header2=value2;... Remark: I decided to re-use the definition `{"kazoo_publish", (cmd_function) kz_amqp_publish_ex, 4, fixup_kz_amqp, fixup_kz_amqp_free, ANY_ROUTE},` resp. to modify the existing method signature `int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* _pub_flags)` to `int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* _pub_flags)` as the param _pub_flags is neither described in the docs, nor it was evaluated/used, and thus was useless anyhow. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2925 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2925/commits/0aee8fc2c486f19a20c9…">kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish</a> -- File Changes -- M src/modules/kazoo/doc/kazoo_admin.xml (8) M src/modules/kazoo/kazoo.c (1) M src/modules/kazoo/kz_amqp.c (117) M src/modules/kazoo/kz_amqp.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2925.patch https://github.com/kamailio/kamailio/pull/2925.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2925

3 4

git:master:dcb8e165: kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish
by Henning Westerholt 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: dcb8e1650204c9453457871515ab5c7ec2d497f1 URL: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7… Author: mihovilkolaric <mihovilkolaric(a)github.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-11-19T12:43:16+01:00 kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish - implements GH #2895 --- Modified: src/modules/kazoo/doc/kazoo_admin.xml Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7… Patch: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7…

1 0

[kamailio/kamailio] Possible deadlock bug in the method acquire_spi and release_spi? (Issue #2939)
by ryancaicse 19 Nov '21

19 Nov '21

In the method `acquire_spi`, the condition of acquiring and releasing is not aligned. It seems the lock would be acquired but released only when `spi_data->spi_val == initial_val`, Would it lead to missing lock release? https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… In the method `release_spi`, the lock may be re-acquired so missing lock release in the method `acquire_spi` could lead to a deadlock. https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2939

3 3

git:master:b5cf0796: Merge pull request #2879 from ErhanOnur/fix_ims_usrloc_pcscf_protocol
by GitHub 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: b5cf0796ffc308fdd8bf63d1f446608d63c7cac9 URL: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… Author: carstenbock <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-19T10:26:20+01:00 Merge pull request #2879 from ErhanOnur/fix_ims_usrloc_pcscf_protocol ims_usrloc_pcscf: fix on saving protocol info into DB --- Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… Patch: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… --- diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ca57a2b4b3..5f0df126fa 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -341,7 +341,7 @@ int db_insert_pcontact(struct pcontact* _c) return -1; } - if (ul_dbf.insert(ul_dbh, keys, values, 15) < 0) { + if (ul_dbf.insert(ul_dbh, keys, values, 16) < 0) { LM_ERR("inserting contact in db failed\n"); return -1; } diff --git a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql index cf978df1f5..2a18c59601 100644 --- a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql @@ -17,7 +17,7 @@ CREATE TABLE `location` ( `socket` varchar(64) DEFAULT NULL, `public_ids` varchar(2048) DEFAULT NULL, `security_type` int(11) DEFAULT NULL, - `protocol` char(5) DEFAULT NULL, + `protocol` int(10) DEFAULT NULL, `mode` char(10) DEFAULT NULL, `ck` varchar(100) DEFAULT NULL, `ik` varchar(100) DEFAULT NULL,

1 0

git:master:c7cf1937: Fix on saving protocol info for ims_usrloc_pcscf
by 67456745 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: c7cf1937bfc9a36e70865fed8cf704f34f17685f URL: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… Author: 67456745 <erhan.sendag(a)i2i-systems.com> Committer: 67456745 <erhan.sendag(a)i2i-systems.com> Date: 2021-10-11T11:51:33+03:00 Fix on saving protocol info for ims_usrloc_pcscf --- Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… Patch: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… --- diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ca57a2b4b33..5f0df126fa2 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -341,7 +341,7 @@ int db_insert_pcontact(struct pcontact* _c) return -1; } - if (ul_dbf.insert(ul_dbh, keys, values, 15) < 0) { + if (ul_dbf.insert(ul_dbh, keys, values, 16) < 0) { LM_ERR("inserting contact in db failed\n"); return -1; } diff --git a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql index cf978df1f58..2a18c59601b 100644 --- a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql @@ -17,7 +17,7 @@ CREATE TABLE `location` ( `socket` varchar(64) DEFAULT NULL, `public_ids` varchar(2048) DEFAULT NULL, `security_type` int(11) DEFAULT NULL, - `protocol` char(5) DEFAULT NULL, + `protocol` int(10) DEFAULT NULL, `mode` char(10) DEFAULT NULL, `ck` varchar(100) DEFAULT NULL, `ik` varchar(100) DEFAULT NULL,

1 0

[kamailio/kamailio] Fix a possible deadlock bug due to unreleased lock (PR #2941)
by ryancaicse 19 Nov '21

19 Nov '21

In acquire_spi, making condition of acquiring the releasing lock aligned. Fixes #2939 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2941 -- Commit Summary -- * Fix a possible deadlock bug due to unreleased lock -- File Changes -- M src/modules/ims_ipsec_pcscf/spi_gen.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2941.patch https://github.com/kamailio/kamailio/pull/2941.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2941

2 6

git:master:5affee3b: modules: readme files regenerated - tsilo ... [skip ci]
by Kamailio Dev 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 5affee3bcbf5b4a4cad5acfee1c24c0def1ad58c URL: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-19T09:31:15+01:00 modules: readme files regenerated - tsilo ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… Patch: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 47c14ce1bb..c93fa0ebef 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -10,6 +10,10 @@ Federico Cabiddu <federico.cabiddu(a)gmail.com> +Donat Zenichev + + <dzenichev(a)sipwise.com> + Copyright © 2015 Federico Cabiddu __________________________________________________________________ @@ -32,7 +36,8 @@ Federico Cabiddu 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 5. RPC Commands @@ -53,7 +58,8 @@ Federico Cabiddu 1.2. Set use_domain parameter 1.3. ts_store usage 1.4. ts_append usage - 1.5. ts_append_to usage + 1.5. ts_append_by_contact usage + 1.6. ts_append_to usage Chapter 1. Admin Guide @@ -74,7 +80,8 @@ Chapter 1. Admin Guide 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 5. RPC Commands @@ -157,7 +164,8 @@ modparam("tsilo", "use_domain", 1) 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 4.1. ts_store([uri]) @@ -200,7 +208,40 @@ if (is_method("REGISTER")) { } ... -4.3. ts_append_to(tindex, tlabel, domain, [uri]) +4.3. ts_append_by_contact(domain, ruri [, contact]) + + Has almost the same intention as the ts_append(), but gives a + possibility to append branches only for a specific location record + (Contact URI). The contact's URI value can be either taken from the + currently processed REGISTER or (optionally) given as a third + parameter. If the Contact URI for a lookup is given as the parameter, + it is possible to provide it as a pseudo-variable. The contact lookup + is performed on the table specified by the domain parameter. The method + should be called when a REGISTER request is received. + + Meaning of the parameters is as follows: + * domain - Name of table that should be used for looking up new + contacts for r-uri. + * ruri - The r-uri for which we want to check existing transactions + and add them new branches. Can be a static string value or a + dynamic string with pseudo-variables. + * contact - Optional, a value of the location record (contact URI) + based on which to perform the branch appending. If not given, the + value will be taken from the currently processed REGISTER. If a + location lookup based on this Contact URI fails (no location record + found), then the branch append will not happen. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + + Example 1.5. ts_append_by_contact usage +... +if (is_method("REGISTER")) { + $var(formated_ct) = $(x_hdr(Contact){nameaddr.uri}); + ts_append_by_contact("location", "$tu", "$var(formated_ct)"); +} +... + +4.4. ts_append_to(tindex, tlabel, domain, [uri]) The method add branches to the transaction identified by tindex and tlabel, performing a contacts lookup on the table specified by the @@ -218,7 +259,7 @@ if (is_method("REGISTER")) { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.5. ts_append_to usage + Example 1.6. ts_append_to usage ... if (is_method("REGISTER")) { $var(tindex) = ...

1 0

[kamailio/kamailio] TSILO / TM. Lookup and branch creating by contact (location record). (PR #2931)
by zenichev 19 Nov '21

19 Nov '21

#### 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 Two separate commits per component: TSILO and TM. Important, this implementation has been tested internally and is in use by us already. Contributions to both TSILO and TM are made so, that they save full back-compatibility and do not affect existing implementation. --- TSILO: Add support of a lookup and branch creating by contact Improvement of the TSILO module, which allows to run a lookup using the provided RURI, but only to create a new branch for the Contact, which is set in the currently processed REGISTER. Or optionally a Contact URI value given as a parameter to the function. If the Contact URI for a lookup, is given as a parameter, it is possible to provide it as a pseudo-variable. Hence it is now possible to append new branch(es) for only UAC(s) getting REGISTERED at the moment of calling 'ts_append_by_contact()'. Previously it was only possible to call 'ts_append()' and create new branches for all previously present location records (for this specific URI), which was in some circumstsances undersired. New script functions introduced: - ts_append_by_contact(table, ruri [, contact]) New module functions introduced: - w_ts_append_by_contact2() / ki_ts_append_by_contact() - w_ts_append_by_contact3 / ki_ts_append_by_contact_uri() - ts_append_by_contact() / ts_append_by_contact_to() Backwards compatibility is saved, the new functionality is not overlapping with the previously existing implementation, hence it only acts when the new script function ts_append_by_contact() is used. The documentation has been updated accordingly. --- TM: API improvement, new function introduced: t_append_branch_by_contact() New module functions introduced: - t_append_branch_by_contact() This commit introduces a possibility of TM's API to append a branch based on specific location (Contact's URI). Indeed the 't_append_branch_by_contact()' is a corrected copy of the 't_append_branches()', which instead takes Contact as a parameter of str type and takes care to append a branch only for it. The separate function has been introduced, in order to save full back-compatibility, and not affect existing implementation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2931 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2931/commits/6bdb1dbdd9726b1b45c0…">tsilo: Add support of a lookup and branch creating by contact</a> * <a href="https://github.com/kamailio/kamailio/pull/2931/commits/7d0f21edde6a816a75fd…">tm: API improvement, new function introduced: t_append_branch_by_contact()</a> -- File Changes -- M src/modules/tm/t_append_branches.c (206) M src/modules/tm/t_append_branches.h (4) M src/modules/tm/tm_load.c (1) M src/modules/tm/tm_load.h (1) M src/modules/tsilo/doc/tsilo.xml (5) M src/modules/tsilo/doc/tsilo_admin.xml (54) M src/modules/tsilo/ts_append.c (116) M src/modules/tsilo/ts_append.h (2) M src/modules/tsilo/tsilo.c (269) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2931.patch https://github.com/kamailio/kamailio/pull/2931.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2931

5 15

git:master:c1fd9eba: tsilo: Merge similar functions in ts_append.c
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: c1fd9ebaa0fe0eb7457ea74e8a22444b855af9cd URL: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Merge similar functions in ts_append.c We need to merge similar functions in ts_append.c implementation to give less work for maintaining similar code. Furthermore the purpose of them is quite the same, but differes just in some details (usage of TM's API). Merged functions are: - ts_append() and ts_append_by_contact() - ts_append_to() and ts_append_by_contact_to() Now all appending in TSILO happens only through ts_append() / ts_append_to() An implementation in tsilo.c has been updated accordingly. Usage. In case we do not want to append based on specific Contact (location), the contact parameter being passed to either ts_append() or ts_append_to() must be set to zero. In case we do want to append by a specific Contact, then we must set the Contact parameter of str type beforehand calling ts_append() / ts_append_to(). --- Modified: src/modules/tsilo/ts_append.c Modified: src/modules/tsilo/ts_append.h Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444… Patch: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444…

1 0

git:master:cb1b78e7: tm: merge t_append_branches() and t_append_branch_by_contact()
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: cb1b78e7bc8d61261e429664c6deb8bb1b4b53d0 URL: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tm: merge t_append_branches() and t_append_branch_by_contact() Because the implementation of the functions 't_append_branches()' and 't_append_branch_by_contact()' is pretty much the same, it's proposed to merge them into one: 't_append_branches()' The way how the function acts now depends on if the contact parameter of str type is given or not (empty or not). If the contact parameter is given, then only a desired location is meant for appending. If not found in the location table, an append will not happen for this AOR. Otherwise create branches for all existing location records of this particular AOR. Search for locations is done in the location table. --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_append_branches.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b… Patch: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b…

1 0

git:master:47464917: tsilo: Be compliant with changes in TM, now only t_append_branches()
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 474649171d3c269e2fcfb00c7b1dbd318a952f51 URL: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Be compliant with changes in TM, now only t_append_branches() Since of changes in TM's module, where 't_append_branches()' and 't_append_branch_by_contact()' have been merged into one function, we need to edit all the occurences where TM's API is called in TSILO. No logic changes. --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… Patch: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 1847ac1c1b..e4967f8167 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -89,6 +89,10 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * int ret; str stable; + str contact; /* needed for usage of TM's API, t_append_branches() */ + contact.s = NULL; /* must be emptied */ + contact.len = 0; + orig_t = _tmb.t_gett(); if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) @@ -129,7 +133,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * goto done; } - ret = _tmb.t_append_branches(); + ret = _tmb.t_append_branches(&contact); done: /* unref the transaction which had been referred by t_lookup_ident() call. @@ -245,7 +249,7 @@ int ts_append_by_contact_to(struct sip_msg* msg, int tindex, int tlabel, char *t /* start the transaction only for the desired contact contact must be of syntax: sip:<user>@<host>:<port> with no parameters list*/ - ret = _tmb.t_append_branch_by_contact(contact); + ret = _tmb.t_append_branches(contact); done: /* unref the transaction which had been referred by t_lookup_ident() call.

1 0

git:master:f564c0d3: tm: API improvement, new function introduced: t_append_branch_by_contact()
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: f564c0d33974eeaa1833abeb7972f5d207c5663f URL: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tm: API improvement, new function introduced: t_append_branch_by_contact() New module functions introduced: - t_append_branch_by_contact() This commit introduces a possibility of TM's API to append a branch based on specific location (Contact's URI). Indeed the 't_append_branch_by_contact()' is a corrected copy of the 't_append_branches()', which instead takes Contact as a parameter of str type. The separate function has been introduced, in order to save full back-compatibility, and not affect existing implementation. --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_append_branches.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d… Patch: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d…

1 0

git:master:7265f1cf: tsilo: Add support of a lookup and branch creating by contact
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 7265f1cf7c57d258538119bc0d41146a04183eec URL: https://github.com/kamailio/kamailio/commit/7265f1cf7c57d258538119bc0d41146… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Add support of a lookup and branch creating by contact Improvement of the TSILO module, which allows to run a lookup using the provided RURI, but only to create a new branch for the Contact, which is set in the currently processed REGISTER. Or optionally a Contact URI value given as a parameter to the function. If the Contact URI for a lookup, is given as a parameter, it is possible to provide it as a pseudo-variable. Hence it is now possible to append new branch(es) for only UAC(s) getting REGISTERED at the moment of calling 'ts_append_by_contact()'. Previously it was only possible to call 'ts_append()' and create new branches for all previously present location records (for this specific URI), which was in some circumstsances undersired. New script functions introduced: - ts_append_by_contact(table, ruri [, contact]) New module functions introduced: - w_ts_append_by_contact2() / ki_ts_append_by_contact() - w_ts_append_by_contact3 / ki_ts_append_by_contact_uri() - ts_append_by_contact() / ts_append_by_contact_to() Backwards compatibility is saved, the new functionality is not overlapping with the previously existing implementation, hence it only acts when the new script function ts_append_by_contact() is used. The documentation has been updated accordingly. --- Modified: src/modules/tsilo/doc/tsilo.xml Modified: src/modules/tsilo/doc/tsilo_admin.xml Modified: src/modules/tsilo/ts_append.c Modified: src/modules/tsilo/ts_append.h Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/7265f1cf7c57d258538119bc0d41146… Patch: https://github.com/kamailio/kamailio/commit/7265f1cf7c57d258538119bc0d41146…

1 0

[kamailio/kamailio] A problem appeared after the latest changes in pv set_var_value function (Issue #2928)
by alexyosifov 19 Nov '21

19 Nov '21

### Description With the latest master, I am trying to register UE in the IMS core. In the S-CSCF Diameter MAR message Authentication scheme is sent as 'unknown". With Kamailio 5.5.1 works fine. What I see the problem appears because of the following commits: 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc pv: handle case when var value ha flag str but null pointer ffe311939ebf58e7418940ec6c71bfaf9b21afad pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit Check the log messages below for detailed debug data. pv $aa is empty but after line 711 $var(alg) is with len=1 and printed value '0'. #### Reproduction Try to Register UE to the IMS core with the latest master. Check MAR message AVP 612->avp 608 3GPP-SIP-Authentication-Scheme: unknown #### Log Messages In s-cscf kamailio.cfg route[REGISTER] I have the following code: 709 route[REGISTER] { 710 xlog("ALGORITHM IS [$aa] and User-Agent is [$ua]\n"); 711 $var(alg) = $aa; 712 xlog("ALGORITHM IS [$var(alg)] and User-Agent is [$ua]\n"); 733 #user has not been authenticated. Lets send a challenge via 401 Unauthorized 734 xlog("L_DBG","About to challenge! auth_ims\n"); 735 ims_www_challenge("REG_MAR_REPLY", "$td", "$var(alg)"); 736 exit; **LOG from master branch:** Log output for lines 710 and 712: Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=710 a=25 n=xlog Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=711 a=63 n=assign Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=712 a=25 n=xlog Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: <script>: ALGORITHM IS [0] and User-Agent is [EE VOLTE] Added and debug log into authorize.c:356 file: ... LM_DBG(" #################### Sending MAR - 0, algo.len=%d algo[%.*s]\n", algo.len, algo.len, algo.s); .... Log output: Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) DEBUG: ims_auth [authorize.c:356]: challenge(): #################### Sending MAR - 0, algo.len=1 algo[0] **LOG from Kamailio 5.5.1:** 117528 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] 117529 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=711 a=63 n=assign 117530 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=712 a=25 n=xlog 117531 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] Nov 11 14:43:53 mnc234 kamailio_scscf[19016]: 1(19060) DEBUG: ims_auth [authorize.c:356]: challenge(): #################### Sending MAR - 0, algo.len=0 algo[]] #### SIP Traffic ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.6.0-dev2 (x86_64/linux) ffe311-dirty 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: ffe311 -dirty compiled on 14:44:53 Nov 11 2021 with gcc 7.4.0 * **Operating System**: DISTRIB_ID=Ubuntu DISTRIB_RELEASE=18.04 DISTRIB_CODENAME=bionic DISTRIB_DESCRIPTION="Ubuntu 18.04.2 LTS" -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2928

2 6

git:master:bd206729: Revert "pv: handle case when var value ha flag str but null pointer"
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: bd206729cf46bc32b3a92f870d6b77105ab35902 URL: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:45:09+01:00 Revert "pv: handle case when var value ha flag str but null pointer" This reverts commit 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… Patch: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..255f9f2040 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if(value==NULL) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:e85f33d7: pv: check source for memcpy
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: e85f33d7c827b85634f6fe0377ff9f30b3bc4e84 URL: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:57:25+01:00 pv: check source for memcpy --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… Patch: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..f04fa9818b 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -134,7 +134,9 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) } var->v.flags |= VAR_VAL_STR; } - memcpy(var->v.value.s.s, value->s.s, value->s.len); + if(value->s.s) { + memcpy(var->v.value.s.s, value->s.s, value->s.len); + } var->v.value.s.len = value->s.len; var->v.value.s.s[value->s.len] = '\0'; } else {

1 0

git:master:f19cff46: Revert "pv: fix condition in detecting the null string value when setting $var(...)"
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: f19cff46ae1f27a456e276ea891154aeb0a51e08 URL: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:44:49+01:00 Revert "pv: fix condition in detecting the null string value when setting $var(...)" This reverts commit ffe311939ebf58e7418940ec6c71bfaf9b21afad. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… Patch: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 5f4626b8d6..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

[kamailio/kamailio] ASAN: (Issue #2932)
by sergey-safarov 19 Nov '21

19 Nov '21

I have compiled Kamailio with ASAN When I start Kamailio I this error ``` core/re.c:390:2: runtime error: null pointer passed as argument 2, which is declared to never be null ``` [Link to code](https://github.com/kamailio/kamailio/blob/master/src/core/re.c#L390) ``` Breakpoint 1, replace_build (match=0xffffb0140fc0 "KZQ_CHECK_MEDIA_SERVER_INSERT", nmatch=1, pmatch=0xffffb01410a8, se=0xffffb00b9bc0, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0141120) at core/re.c:390 390 RBUF_APPEND(dest, p, end-p); (gdb) Continuing. Breakpoint 1, replace_build (match=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", nmatch=1, pmatch=0xffffb0162b60, se=0xffffb0162730, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0162bd8) at core/re.c:390 390 RBUF_APPEND(dest, p, end-p); (gdb) p p $4 = 0x0 (gdb) list 385 default: 386 LM_CRIT("unknown type %d\n", se->replace[r].type); 387 /* ignore it */ 388 } 389 } 390 RBUF_APPEND(dest, p, end-p); 391 rpl->len = dest - rbuf; 392 if ((rpl->s = pkg_malloc(rpl->len)) == NULL) { 393 PKG_MEM_ERROR; 394 goto error; (gdb) bt #0 replace_build (match=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", nmatch=1, pmatch=0xffffb0162b60, se=0xffffb0162730, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0162bd8) at core/re.c:390 #1 0x0000000000f91dc4 in subst_run (se=0xffffb0162730, input=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", msg=0x332ebe0 <_faked_msg>, count=0x0) at core/re.c:460 #2 0x0000000000f926a0 in subst_str (input=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", msg=0x332ebe0 <_faked_msg>, se=0xffffb0162730, count=0x0) at core/re.c:502 #3 0x00000000011e7d0c in pp_subst_run (data=0x338ba20 <s_buf>) at core/ppcfg.c:216 #4 0x00000000018b1f98 in yylex () at core/cfg.lex:1278 #5 0x0000000001900660 in yyparse () at core/cfg.tab.c:5160 #6 0x000000000048c4e4 in main (argc=11, argv=0xfffffffff3b8) at main.c:2487 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2932

2 2

git:master:136071c4: core: re - check source of memcpy
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 136071c4a3cd306ef1043b02d1b61ce7d37efa52 URL: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:25:45+01:00 core: re - check source of memcpy --- Modified: src/core/re.c --- Diff: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… Patch: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… --- diff --git a/src/core/re.c b/src/core/re.c index 4ce18d8c4d..47322284b6 100644 --- a/src/core/re.c +++ b/src/core/re.c @@ -339,8 +339,10 @@ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch, LM_ERR("Buffer too small\n"); \ goto error; \ } \ - memcpy((dst), (src), (size)); \ - (dst) += (size); + if(likely(src)) { \ + memcpy((dst), (src), (size)); \ + (dst) += (size); \ + } p=se->replacement.s; end=p+se->replacement.len;

1 0

git:master:7f89e4cc: core: mechanism to execute child_init() for special ranks on demand
by Daniel-Constantin Mierla 18 Nov '21

18 Nov '21

Module: kamailio Branch: master Commit: 7f89e4cc5c84b720928c2936c9e2e0630aebec9e URL: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-18T14:33:28+01:00 core: mechanism to execute child_init() for special ranks on demand - new special rank PROC_POSTCHILDINIT, to execute child_init() for main process only when ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT) is executed in mod_init() --- Modified: src/core/sr_module.c Modified: src/core/sr_module.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06… Patch: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06…

1 0

[kamailio/kamailio] pv: new variable $xavp_count (PR #2936)
by Nicolas C 18 Nov '21

18 Nov '21

Retrieve the number of rows stored in an xavp As discussed on the mailing list, this is useful to at least two people. #### 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 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2936 -- Commit Summary -- * pv: new variable $xavp_count -- File Changes -- M src/modules/pv/pv.c (3) M src/modules/pv/pv_xavp.c (33) M src/modules/pv/pv_xavp.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2936.patch https://github.com/kamailio/kamailio/pull/2936.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2936

2 5

git:5.4:52c6c54e: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted
by Victor Seva 18 Nov '21

18 Nov '21

Module: kamailio Branch: 5.4 Commit: 52c6c54ecefaad4d0fab514b0e11169bdd99e25e URL: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:42:21+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 (cherry picked from commit fa6038172c0095287096c7021ca5dadad728cfaa) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… Patch: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 81b89b46c7..3acb2937f7 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1609,13 +1609,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1631,10 +1630,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1652,13 +1658,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1737,15 +1738,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1753,7 +1753,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1800,7 +1800,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -1835,7 +1835,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

1 0

git:5.5:a9889437: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted
by Victor Seva 18 Nov '21

18 Nov '21

Module: kamailio Branch: 5.5 Commit: a988943760ffecd07c10a45bd8be5bf0165057b2 URL: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:40:18+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 (cherry picked from commit fa6038172c0095287096c7021ca5dadad728cfaa) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… Patch: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 1392a0af2a..9e45a61079 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1609,13 +1609,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1631,10 +1630,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1652,13 +1658,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1737,15 +1738,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1753,7 +1753,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1800,7 +1800,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -1835,7 +1835,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

1 0

git:master:fa603817: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted
by Victor Seva 18 Nov '21

18 Nov '21

Module: kamailio Branch: master Commit: fa6038172c0095287096c7021ca5dadad728cfaa URL: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:16:31+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… Patch: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index bd71eaafc4..ed81edf691 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1777,13 +1777,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1799,10 +1798,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1820,13 +1826,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1905,15 +1906,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1921,7 +1921,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1968,7 +1968,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -2003,7 +2003,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

1 0

[kamailio/kamailio] nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted (#2784)
by Dmitry Wagin 18 Nov '21

18 Nov '21

#### 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 - [x] Tested changes locally - [x] Related to issue #2459, #2768 #### Description There's a small regression after #2497. If SDP didn't have an "a=rtcp" header (RFC1889 behavior), Kamailio had thrown an Error `can't extract 'a=rtcp' IP from the SDP` on every INVITE. After the PR Kamailio does not flood into log. Also refactored #2769. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2784 -- Commit Summary -- * nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted -- File Changes -- M src/modules/nathelper/nathelper.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2784.patch https://github.com/kamailio/kamailio/pull/2784.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2784

4 14

git:master:1a68ddfc: pv: new transformation class {val}
by Daniel-Constantin Mierla 17 Nov '21

17 Nov '21

Module: kamailio Branch: master Commit: 1a68ddfcbe46cfa4d956a1541f17517d9ba94381 URL: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-17T17:16:17+01:00 pv: new transformation class {val} - {val.n0} - return int 0 instead of $null value, or existing value - {val.json} - if value is $null, return empty string; if value is string, then it is escaped for use as json value (without surrounding quotes) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517… Patch: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517…

1 0

[kamailio/kamailio] presence: add option to return 200 instead of 202 on subscriptions (PR #2937)
by Laurențiu Nicola 17 Nov '21

17 Nov '21

Backport of #2930 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2937 -- Commit Summary -- * presence: add option to return 200 instead of 202 on subscriptions -- File Changes -- M src/modules/presence/doc/presence_admin.xml (25) M src/modules/presence/presence.c (2) M src/modules/presence/presence.h (1) M src/modules/presence/subscribe.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2937.patch https://github.com/kamailio/kamailio/pull/2937.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2937

2 2

git:master:08ce00c4: core: relocate str json escape function to strutils
by Daniel-Constantin Mierla 17 Nov '21

17 Nov '21

Module: kamailio Branch: master Commit: 08ce00c43409e9ee7c0797413ce17b68da9a2ed8 URL: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-17T12:49:56+01:00 core: relocate str json escape function to strutils --- Modified: src/core/dprint.c Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6… Patch: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6…

1 0

ki_jsonrpcs_dispatch(): invalid json doc
by Patrick Karton 16 Nov '21

16 Nov '21

hello , im using kamailio and rtpengine. i use rtpengine with rtp timeout as follows rtpengine --timeout=240 --silent-timeout=600 -b2b-url=http://kamailioip:5060/RPC --xmlrpc-format=2 and in kamailio modparam("jsonrpcs", "pretty_format", 1) modparam("jsonrpcs", "transport", 7) event_route[xhttp:request] { if ($hu =~ "^/RPC") { jsonrpc_dispatch(); xhttp_reply("200", "OK", "text/xml", "<methodResponse><params><param><value><string>OK</string></value></param></params></methodResponse>"); exit; } } rtpengine successfully reaches the rpc endpoint but i have an error on the jsonrpcs module 43(50) ERROR: jsonrpcs [jsonrpcs_mod.c:1275]: ki_jsonrpcs_dispatch(): invalid json doc [[<?xml version="1.0" encoding="UTF-8"?> <methodCall> <methodName>dlg.terminate_dlg</methodName> <params> <param><value><string>1-10(a)172.22.244.139</string></value></param> <param><value><string>10SIPpTag091</string></value></param> <param><value><string>8U173ymKpc1pp</string></value></param> </params> </methodCall> ]] and so the dialog module can not ends the call Kamailio 5.5.2 on debian bullseye rtpengine 10.0.1.8 on debian bullseye Thanks.

2 2

git:master:adb4d30a: pv: new variable $rsi - return status code for replies and 0 for requests
by Daniel-Constantin Mierla 16 Nov '21

16 Nov '21

Module: kamailio Branch: master Commit: adb4d30a985b8f1425934f5bf22295b7ad62c249 URL: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-16T09:10:38+01:00 pv: new variable $rsi - return status code for replies and 0 for requests --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… Patch: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 65108bdc8c..9de6bc49af 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -379,6 +379,9 @@ static pv_export_t mod_pvs[] = { {{"rs", (sizeof("rs")-1)}, /* */ PVT_OTHER, pv_get_status, 0, 0, 0, 0, 0}, + {{"rsi", (sizeof("rsi")-1)}, /* */ + PVT_OTHER, pv_get_statusi, 0, + 0, 0, 0, 0}, {{"rt", (sizeof("rt")-1)}, /* */ PVT_OTHER, pv_get_refer_to, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 352114d259..ac15bfac2b 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -248,6 +248,20 @@ int pv_get_status(struct sip_msg *msg, pv_param_t *param, &msg->first_line.u.reply.status); } +int pv_get_statusi(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type != SIP_REPLY) + return pv_get_sintval(msg, param, res, 0); + + return pv_get_intstrval(msg, param, res, + (int)msg->first_line.u.reply.statuscode, + &msg->first_line.u.reply.status); +} + int pv_get_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 6406d9054a..5e0f6860b5 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -55,6 +55,9 @@ int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_statusi(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:03050d70: core: new flag p for json logging
by Daniel-Constantin Mierla 16 Nov '21

16 Nov '21

Module: kamailio Branch: master Commit: 03050d7046a7a356cd5fdd31d32003dbac73fb0a URL: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-16T08:40:49+01:00 core: new flag p for json logging - prefix is printed as it is in the root json, expected to be a list of json field starting with comma --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d… Patch: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d…

1 0

git:master:7c7f967e: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 7c7f967e6c66a119c5aa9e64fbd447b48ecd8875 URL: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-15T19:16:14+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b… Patch: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b…

1 0

git:master:33db4765: presence: add option to return 200 instead of 202 on subscriptions
by Henning Westerholt 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 33db47652628b299c96a591ec939ca2ea9f6e268 URL: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2… Author: LaurenÈiu Nicola <lnicola(a)dend.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-11-15T19:04:26+01:00 presence: add option to return 200 instead of 202 on subscriptions RFC6665 mandates 200 return codes, although 202 seems mandated by RFC3265. We add a new parameter, `subs_respond_200`, to control this. --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2… Patch: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2…

1 0

git:master:34300dd8: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 34300dd8db7d52c639307f4121f8e61619a53f99 URL: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-15T10:46:22+01:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61… Patch: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61…

1 0

[kamailio/kamailio] permissions: crash during a RPC reload of trusted (Issue #2909)
by Victor Seva 15 Nov '21

15 Nov '21

### Description We are having several customers with crashes during calls to RPC `permissions.trustedReload` even after introducing the basic safety for concurrent RPC reload https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c… ### Possible solution It seems that we need to implement locking in order to be sure the memory is not gone in the middle of a read. #### Reproduction It's quite difficult to reproduce since `match_hash_table` call has to happen during a RPC reload #### Debugging Data ``` (gdb) bt full #0 match_hash_table (table=<optimized out>, msg=msg@entry=0x7fc3d800a808, src_ip_c_str=src_ip_c_str@entry=0x7fc3d7f217b8 "A.A.A.A", proto=proto@entry=1, from_uri=from_uri@entry=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at hash.c:280 __func__ = "match_hash_table" ruri = <optimized out> ruri_string = "sip:41584006001@B.B.B.B:5060\000\264{\224\377\177\000\000\000\240\200\331\302\177\000\000\300\000\000\000\000\000\000\000\332\003\000\000\000\000\000\000\300\067~\372PV\000\000\000\220 \324m,\233߁\260\341D\334\302\177\000\000\260go\372PV\000\000P\343!\332\302\177\000\000\004\340{\372PV\000\000`;~\372PV\000\000\300\067~\372PV\000\000@\024\000\000\000\000\000\000`\342!\332\302\177\000\000\001\00 0\000\000\000\000\000\000\310\066\204\331\302\177\000\000\000\240\200\331\302\177\000\000\300\000\000\000\000\000\000\000\300\067~\372PV\000\000`;~\372PV\000\000\332\003\000\000\000\000\000\000\000"... preg = {__buffer = 0x0, __allocated = 0, __used = 224, __syntax = 16843462, __fastmap = 0x0, __translate = 0x0, re_nsub = 0, __can_be_null = 0, __regs_allocated = 0, __fastmap_accurate = 1, __no_sub = 1, __not_bol = 0, __not_eol = 0, __newline_anchor = 0} np = 0x455449564e492035 src_ip = {s = 0x7fc3d7f217b8 "A.A.A.A", len = <optimized out>} val = <optimized out> count = 0 #1 0x00007fc3d2362765 in allow_trusted (msg=msg@entry=0x7fc3d800a808, src_ip=0x7fc3d7f217b8 "A.A.A.A", proto=proto@entry=1, from_uri=from_uri@entry=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at trusted.c:499 __func__ = "allow_trusted" result = <optimized out> res = 0x0 keys = {0x7fc3d7f1b750} vals = {{type = 3595139888, nul = 32707, free = -671045624, val = {int_val = -1803829520, ll_val = 140735684525808, double_val = 6.9532666868153257e-310, time_val = 140735684525808, string_val = 0x7fff947bbef0 "\001", str_val = {s = 0x7fff947bbef0 "\001", len = -94468017}, blob_val = {s = 0x7fff947bbef0 "\001", len = -94468017}, bitmap_val = 2491137776, uint_val = 2491137776, ull_val = 140735684525808}}} cols = {0x0, 0x5650fa650c25 <pv_printf+229>, 0x7fff947bb670, 0x0} #2 0x00007fc3d2363ef3 in allow_trusted_furi (_msg=_msg@entry=0x7fc3d800a808, _src_ip_sp=_src_ip_sp@entry=0x7fc3d6494340 "xEI\326\303\177", _proto_sp=_proto_sp@entry=0x7fc3d64925e0 "\330\375H\326\303\177", from_uri=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at trusted.c:590 src_ip = {s = 0x7fc3d7f217b8 "A.A.A.A", len = 11} proto = {s = 0x7fc3d7f27820 "udp", len = 3} proto_int = 1 __func__ = "allow_trusted_furi" #3 0x00007fc3d23647d0 in allow_trusted_3 (_msg=0x7fc3d800a808, _src_ip_sp=0x7fc3d6494340 "xEI\326\303\177", _proto_sp=0x7fc3d64925e0 "\330\375H\326\303\177", _from_uri=<optimized out>) at trusted.c:634 from_uri = {s = 0x7fc3d7f1b750 "sip:fake@B.B.B.B", len = 34} __func__ = "allow_trusted_3" #4 0x00005650fa513319 in do_action (h=h@entry=0x7fff947bbef0, a=a@entry=0x7fc3d6497b30, msg=msg@entry=0x7fc3d800a808) at core/action.c:1085 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2909

1 1

[kamailio/kamailio] permissions: implement lock for trusted hash (PR #2910)
by Victor Seva 15 Nov '21

15 Nov '21

#### 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 - [ ] Related to issue #2909 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2910 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2910/commits/0b424ca7b7a8ac7f2e3e…">permissions: implement lock for trusted hash</a> -- File Changes -- M src/modules/permissions/permissions.c (6) M src/modules/permissions/rpc.c (6) M src/modules/permissions/trusted.c (16) M src/modules/permissions/trusted.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2910.patch https://github.com/kamailio/kamailio/pull/2910.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2910

2 12

git:master:ea4c09d8: permissions: add trusted_cleanup_interval documentation [skip ci]
by Victor Seva 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: ea4c09d8a93cf7f79901628573a62e2571781d88 URL: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: add trusted_cleanup_interval documentation [skip ci] --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… Patch: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index e3b65816e5..2c55f246c7 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -869,6 +869,27 @@ modparam("permissions", "load_backends", 1) <programlisting format="linespecific"> ... modparam("permissions", "reload_delta", 1) +... + </programlisting> + </example> + </section> + <section id ="permissions.p.trusted_cleanup_interval"> + <title><varname>trusted_cleanup_interval</varname> (int)</title> + <para> + If module parameter <varname>db_mode</varname> is set to 1 a cleanup timer + is set to the trusted_cleanup_interval value in seconds. + This process will cleanup the previous values from memory after a RPC reload. + </para> + <para> + <emphasis> + Default value is <quote>60</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>trusted_cleanup_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "trusted_cleanup_interval", 120) ... </programlisting> </example>

1 0

git:master:fae3611c: permissions: don't remove old data at the end of the reload process
by Victor Seva 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: fae3611c873738d42a979d96e0d0b47af726bc47 URL: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: don't remove old data at the end of the reload process --- Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… Patch: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… --- diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 2f9c7d42a4..7714a32461 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -59,7 +59,6 @@ int reload_trusted_table(void) db_val_t* val; struct trusted_list **new_hash_table; - struct trusted_list **old_hash_table; int i; int priority; @@ -160,9 +159,7 @@ int reload_trusted_table(void) perm_dbf.free_result(perm_db_handle, res); - old_hash_table = *perm_trust_table; *perm_trust_table = new_hash_table; - empty_hash_table(old_hash_table); LM_DBG("trusted table reloaded successfully.\n");

1 0

git:master:0a6a750a: permissions: trusted_cleanup_interval
by Victor Seva 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 0a6a750a96b620b3024acd391436a94def3133e1 URL: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: trusted_cleanup_interval cleanup old data of trusted hash_table by timer function. --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… Patch: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 12ab2d889a..d5655206e4 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -61,6 +61,7 @@ static char* perm_deny_suffix = ".deny"; /* for allow_trusted and allow_address function */ str perm_db_url = {NULL, 0}; /* Don't connect to the database by default */ int perm_reload_delta = 5; +int perm_trusted_table_interval = 60; /* for allow_trusted function */ int perm_db_mode = DISABLE_CACHE; /* Database usage mode: 0=no cache, 1=cache */ @@ -188,6 +189,7 @@ static param_export_t params[] = { {"max_subnets", PARAM_INT, &_perm_max_subnets }, {"load_backends", PARAM_INT, &_perm_load_backends }, {"reload_delta", PARAM_INT, &perm_reload_delta }, + {"trusted_cleanup_interval", PARAM_INT, &perm_trusted_table_interval }, {0, 0, 0} }; diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 2a417ffd58..c08666a1c0 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -60,6 +60,7 @@ extern str perm_mask_col; /* Name of mask column */ extern str perm_port_col; /* Name of port column */ extern int perm_peer_tag_mode; /* Matching mode */ extern int perm_reload_delta; /* seconds between RPC reloads */ +extern int perm_trusted_table_interval; /* interval of timer to clean old trusted data */ /* backends to be loaded */ #define PERM_LOAD_ADDRESSDB (1<<0) diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 7714a32461..49e871a125 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -166,6 +166,7 @@ int reload_trusted_table(void) return 1; } +void perm_ht_timer(unsigned int ticks, void *); /* * Initialize data structures @@ -224,6 +225,9 @@ int init_trusted(void) goto error; } + if(register_timer(perm_ht_timer, NULL, perm_trusted_table_interval) < 0) + goto error; + perm_dbf.close(perm_db_handle); perm_db_handle = 0; } @@ -280,6 +284,22 @@ int init_child_trusted(int rank) } +void perm_ht_timer(unsigned int ticks, void *param) { + if(perm_rpc_reload_time == NULL) + return; + + if(*perm_rpc_reload_time != 0 + && *perm_rpc_reload_time > time(NULL) - perm_trusted_table_interval) + return; + + LM_DBG("cleaning old trusted table\n"); + if (*perm_trust_table == perm_trust_table_1) { + empty_hash_table(perm_trust_table_2); + } else { + empty_hash_table(perm_trust_table_1); + } +} + /* * Close connections and release memory */

1 0

[kamailio/kamailio] nats module subscriber issue when connected to more "nats_urls" (Issue #2916)
by Stefan Mititelu 14 Nov '21

14 Nov '21

### Description, Troubleshooting, Reproduction I have 3 go nats servers running and the following kamailio config for nats: ``` modparam("nats", "nats_url", "nats://127.0.0.1:4222") modparam("nats", "nats_url", "nats://127.0.0.2:4222") modparam("nats", "nats_url", "nats://127.0.0.3:4222") modparam("nats", "subject_queue_group", "foo:2020") ... event_route[nats:foo] { xlog("L_ERR", "==============> received $natsData"); } ``` I try to publish using some nats publisher (e.g. nats.c example/libuv-pub.c), and nothing gets printed in event route: ``` ./pub -s nats://127.0.0.1:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log NOT printed ./pub -s nats://127.0.0.2:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log NOT printed ``` However, if I try to publish on the last server "127.0.0.3", log *is* printed: ``` ./pub -s nats://127.0.0.3:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log IS printed ``` I expected to see 1 log message for each of the above publish(es). Found this while implementing and testing #2915 Thanks, Stefan -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2916

2 3

[kamailio/kamailio] asan: left shift of 255 by 24 places cannot be represented in type 'int' (Issue #2926)
by sergey-safarov 14 Nov '21

14 Nov '21

``` [root@sbc-stage config]# kamcmd cfg.seti core debug 2 ../../src/modules/ctl/binrpc.h:219:34: runtime error: left shift of 255 by 24 places cannot be represented in type 'int' ``` Daniel @miconda could you look. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2926

2 6

[kamailio/kamailio] Selective tracing of locally generated messages (Issue #2933)
by xaled1 14 Nov '21

14 Nov '21

For selectively tracing sip messages *sent* by kamailio, we successfully use onsend_route: but this works for forwarded requests/responses only. For locally generated messages, there does not seem to be a reliable method: – tm:local-request: message is usually not final, not executed for locally generated ACK and CANCEL – tm:local-response: works for responses only (triggered *after* sending) – sl:local-response: works for responses only (triggered *after* sending) We also tried event_route[network:msg], but sip_trace() does not work there (msg not parsed/available?). Might it be possible to add a core option "onsend_route_localsrc", that can be enabled to make kamailio trigger onsend_route also for locally generated requests (and also locally generated responses, if "onsend_route_reply" is enabled)? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2933

2 2

git:master:908ca872: acc: set again the type of db vals
by Daniel-Constantin Mierla 14 Nov '21

14 Nov '21

Module: kamailio Branch: master Commit: 908ca872bec956d5f755a1b51df781bf66ad3866 URL: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-14T10:31:38+01:00 acc: set again the type of db vals - work properly when nullable modparam is set and var can be null on some transactions --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… Patch: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index b75e155743..dce7ee0a8b 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -466,7 +466,9 @@ int acc_db_request( struct sip_msg *rq) LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { - LM_DBG("attr[%d] is STR\n", i); + LM_DBG("attr[%d] is STR len=%d\n", i, val_arr[i].len); + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i) = val_arr[i]; } } @@ -502,6 +504,8 @@ int acc_db_request( struct sip_msg *rq) if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { VAL_NULL(db_vals + i) = 1; } else { + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i)=val_arr[i]; } }

1 0

git:master:b3e8d030: ctl: use unsigned int for bit left shifting
by Daniel-Constantin Mierla 14 Nov '21

14 Nov '21

Module: kamailio Branch: master Commit: b3e8d03038402dec78b4845255f34862407983c9 URL: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-14T20:23:08+01:00 ctl: use unsigned int for bit left shifting - deal with runtime error: left shift of X by N places cannot be represented in type 'int' --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Patch: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index bd7e2cb9c5..cb7204fffd 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -215,12 +215,15 @@ inline static unsigned char* binrpc_write_int( unsigned char* p, int i, int *len) { int size; + unsigned int u; - for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); + u = (unsigned int)i; + + for (size=4; size && ((u & (0xffu<<24))==0); u<<=8, size--); *len=size; for(; (p<end) && (size); p++, size--){ - *p=(unsigned char)(i>>24); - i<<=8; + *p=(unsigned char)(u>>24); + u<<=8; } return p; } @@ -515,24 +518,28 @@ static inline int binrpc_addfault( struct binrpc_pkt* pkt, static inline unsigned char* binrpc_read_int( int* i, int len, - unsigned char* s, + unsigned char* s, unsigned char* end, int *err ) { unsigned char* start; - + unsigned int u; + start=s; *i=0; + u = 0; *err=0; for(;len>0; len--, s++){ if (s>=end){ *err=E_BINRPC_MORE_DATA; + *i = (int)u; return start; } - *i<<=8; - *i|=*s; + u<<=8; + u|=*s; }; + *i = (int)u; return s; }

1 0

git:master:c4c9e6f5: core: json logging - apply j flag for prefix field
by Daniel-Constantin Mierla 12 Nov '21

12 Nov '21

Module: kamailio Branch: master Commit: c4c9e6f50306addd12ccf9fa03743c664e5442f1 URL: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-12T14:17:18+01:00 core: json logging - apply j flag for prefix field --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6… Patch: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6…

1 0

get Received interface name
by Patrick Karton 12 Nov '21

12 Nov '21

Hello, i declare my interfaces like that in configuration listen=udp:SIP_EXTERNAL_IP:5060 name "external" listen=udp:SIP_INTERNAL_IP:5060 name "internal" how do i get the inferface name where the request was received ? i saw some pseudo variables that deals with received interface but it is always about ip or port or proto but not the interface name ( external or internal like mentioned in the configuration file ). Thanks

1 0

match e2e proxied ACK Request when INVITE Transaction is still in memory
by Patrick Karton 12 Nov '21

12 Nov '21

Hello , i want to know how can i match e2e ACK when the INVITE TRansaction is still in memory. t_check_trans() normally return 1 if we receive e2e ACK but i always get 0 even when the INVITE transaction is still in memory ( wt_timer param of tm module ). Thanks.

2 6

git:master:4608914c: core: io wait - remove log level string from debug message
by Daniel-Constantin Mierla 12 Nov '21

12 Nov '21

Module: kamailio Branch: master Commit: 4608914cf9d3878c79560730ddad8e0800c38397 URL: https://github.com/kamailio/kamailio/commit/4608914cf9d3878c79560730ddad8e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-12T10:15:07+01:00 core: io wait - remove log level string from debug message --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/4608914cf9d3878c79560730ddad8e0… Patch: https://github.com/kamailio/kamailio/commit/4608914cf9d3878c79560730ddad8e0… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index d9791c3c85..5e823fb76f 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -371,7 +371,7 @@ inline static int io_watch_add( io_wait_h* h, LM_CRIT("maximum fd number exceeded: %d/%d\n", h->fd_no, h->max_fd_no); goto error; } - DBG("DBG: io_watch_add(%p, %d, %d, %p), fd_no=%d\n", + DBG("processing io_watch_add(%p, %d, %d, %p) - fd_no=%d\n", h, fd, type, data, h->fd_no); /* hash sanity check */ e=get_fd_map(h, fd);

1 0

git:master:9775841f: core: new option for json logging to print message in json format
by Daniel-Constantin Mierla 12 Nov '21

12 Nov '21

Module: kamailio Branch: master Commit: 9775841f5f821b37395504a5d2a9026eaceacb61 URL: https://github.com/kamailio/kamailio/commit/9775841f5f821b37395504a5d2a9026… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-12T10:38:04+01:00 core: new option for json logging to print message in json format - option 'j' - if the log message starts with '{' and ends with '}', then it is expected to be a json document, printed as it is in the message value, otherwise it is printed as field "text" --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/9775841f5f821b37395504a5d2a9026… Patch: https://github.com/kamailio/kamailio/commit/9775841f5f821b37395504a5d2a9026…

1 0

git:master:9b7bfb32: acc: simplify index shifting for adding time variants in db accounting
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: master Commit: 9b7bfb3243a2e372b266e993647162767f3edcf5 URL: https://github.com/kamailio/kamailio/commit/9b7bfb3243a2e372b266e9936471627… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T20:39:10+01:00 acc: simplify index shifting for adding time variants in db accounting --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/9b7bfb3243a2e372b266e9936471627… Patch: https://github.com/kamailio/kamailio/commit/9b7bfb3243a2e372b266e9936471627… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index d1e8bf1480..b75e155743 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -429,18 +429,19 @@ int acc_db_request( struct sip_msg *rq) for(i=0; i<m; i++) VAL_STR(db_vals+i) = val_arr[i]; /* time value */ - VAL_TIME(db_vals+(m++)) = acc_env.ts; + VAL_TIME(db_vals+m) = acc_env.ts; + m++; /* extra time value */ if(acc_time_mode==1) { - VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_sec; - i++; - VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_usec; - i++; + VAL_INT(db_vals+m) = (int)acc_env.tv.tv_sec; + m++; + VAL_INT(db_vals+m) = (int)acc_env.tv.tv_usec; + m++; } else if(acc_time_mode==2) { dtime = (double)acc_env.tv.tv_usec; dtime = (dtime / 1000000) + (double)acc_env.tv.tv_sec; - VAL_DOUBLE(db_vals+(m++)) = dtime; - i++; + VAL_DOUBLE(db_vals+m) = dtime; + m++; } else if(acc_time_mode==3 || acc_time_mode==4) { if(acc_time_mode==3) { localtime_r(&acc_env.ts, &t); @@ -451,19 +452,21 @@ int acc_db_request( struct sip_msg *rq) acc_time_format, &t)<=0) { acc_time_format_buf[0] = '\0'; } - VAL_STRING(db_vals+(m++)) = acc_time_format_buf; - i++; + VAL_STRING(db_vals+m) = acc_time_format_buf; + m++; } + i = m; /* extra columns */ o = extra2strar( db_extra, rq, val_arr+m, int_arr+m, type_arr+m); m += o; - for( i++ ; i<m; i++) { + for( ; i<m; i++) { if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { + LM_DBG("attr[%d] is STR\n", i); VAL_STR(db_vals+i) = val_arr[i]; } }

1 0

git:master:4bd77f1d: acc: debug messages to print the type of extra acc attrs
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: master Commit: 4bd77f1dae2eeacbe7384ac2838c691f76e077f1 URL: https://github.com/kamailio/kamailio/commit/4bd77f1dae2eeacbe7384ac2838c691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T18:59:11+01:00 acc: debug messages to print the type of extra acc attrs --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/4bd77f1dae2eeacbe7384ac2838c691… Patch: https://github.com/kamailio/kamailio/commit/4bd77f1dae2eeacbe7384ac2838c691… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 9d3ba67359..d1e8bf1480 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -461,6 +461,7 @@ int acc_db_request( struct sip_msg *rq) for( i++ ; i<m; i++) { if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { + LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { VAL_STR(db_vals+i) = val_arr[i]; diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index d6fff91fde..5c29cc7a04 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -252,6 +252,7 @@ int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, type_arr[n] = TYPE_STR; } } + LM_DBG("type of the extra attr[%d] set to: %d\n", n, type_arr[n]); n++; extra = extra->next;

1 0

git:5.5:8c71683d: Revert "pv: handle case when var value ha flag str but null pointer"
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: 5.5 Commit: 8c71683d21498669a79515aad8e2565a6e081754 URL: https://github.com/kamailio/kamailio/commit/8c71683d21498669a79515aad8e2565… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T18:17:42+01:00 Revert "pv: handle case when var value ha flag str but null pointer" This reverts commit 2b432d35f0691d9ef6b12908909d809dbb1fa57b. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/8c71683d21498669a79515aad8e2565… Patch: https://github.com/kamailio/kamailio/commit/8c71683d21498669a79515aad8e2565… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..255f9f2040 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if(value==NULL) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:5.5:6f6b469b: Revert "pv: fix condition in detecting the null string value when setting $var(...)"
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: 5.5 Commit: 6f6b469b257fa41d78c3fe006d3dd3b19b7296e5 URL: https://github.com/kamailio/kamailio/commit/6f6b469b257fa41d78c3fe006d3dd3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T18:17:31+01:00 Revert "pv: fix condition in detecting the null string value when setting $var(...)" This reverts commit 2532b5f5fc71d3828e1185c55ad6a6546df312d3. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/6f6b469b257fa41d78c3fe006d3dd3b… Patch: https://github.com/kamailio/kamailio/commit/6f6b469b257fa41d78c3fe006d3dd3b… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 5f4626b8d6..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

[kamailio/kamailio] device keeps deregister (Issue #2929)
by Riccardo Speggiorin 11 Nov '21

11 Nov '21

I have a Kazoo installation with Kamailio. I have to VM, one with +700 devices regged and the other with +300 devices. The problem is that the devices registered on the first machine keeps randomly unregistered. I have 3 unregistrations happening every minute. If I reboot the machine the problem get solve fora couples of days and after that starts again. What I should check? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2929

2 2

DMQ userloc data not replicated after restarting the receiver service.
by Hardik Patel 11 Nov '21

11 Nov '21

Hello Team, We are using Kamailio 5.5.2 (DMQ + usrloc) modules. We want to replicate all users from server-2(Registration) to server-1(Proxy) . Replication worked perfectly fine but we noticed that after restarting the receiver (Proxy node) data has not been replicated automatically. If we re-register the users it is replicating to the receiver side but the old data is not replicated. Can you please guide us where we made the mistake? Please find the configuration SERVER-1 (Proxy) ======================== #--- dmq db param ---- modparam("dmq","server_address","sip:10.128.77.187:5060") modparam("dmq", "notification_address", "sip:10.128.77.188:5060") modparam("dmq", "num_workers", 6) modparam("dmq", "multi_notify", 1) #modparam("dmq", "worker_usleep", 0) modparam("dmq", "ping_interval", 60) #--- dmq usrloc db param ---- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_size", 2000) modparam("dmq_usrloc", "batch_usleep", 1000) route[KMDQ_SAVE_LOCATION] { if(is_method("KDMQ")) { dmq_handle_message(); } if (dmq_is_from_node()) { if(!save("location")) xlogl("L_ERR", "Error saving contact\n"); } } SERVER-2 (Registration) ====================== #--- dmq db param ---- modparam("dmq","server_address","sip:10.128.77.188:5060") modparam("dmq", "notification_address", "sip:10.128.77.187:5060") modparam("dmq", "num_workers", 6) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) #--- dmq usrloc db param ---- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_size", 2000) modparam("dmq_usrloc", "batch_usleep", 1000) route[SAVE_LOCATION]{ save("location"); } version: kamailio 5.5.2 (x86_64/linux) e2b6cc 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: e2b6cc -- Hardik Patel

2 4

[kamailio/kamailio] Get log formatting a way to add metadata into it's JSON (Issue #2927)
by Fernando H. E. Bellincanta 11 Nov '21

11 Nov '21

We currently can output our logs in a JSON format which gives us the ability to pump that into ELK just fine. The thing is those logs would be a lot more useful if we were able to inject more context metadata into it, i.e.: - Request original IP - Request original User Agent - Other request/response miscellaneous headers This would be appliable to get a dashboard built for Pike rate limiting and it's blocked IPs, or mapping out geolocations based on general requests IPs. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2927

2 2

git:master:378a2dc9: ctl: use unsigned literals for left bit shifting
by Daniel-Constantin Mierla 10 Nov '21

10 Nov '21

Module: kamailio Branch: master Commit: 378a2dc98beddaa08e192c0854f43929ed7076a7 URL: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-10T20:09:24+01:00 ctl: use unsigned literals for left bit shifting --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… Patch: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index 3642a0015b..bd7e2cb9c5 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -188,7 +188,7 @@ struct binrpc_val{ inline static int binrpc_get_int_len(int i) { int size; - for (size=4; size && ((i & (0xff<<24))==0); i<<=8, size--); + for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); return size; } @@ -216,7 +216,7 @@ inline static unsigned char* binrpc_write_int( unsigned char* p, { int size; - for (size=4; size && ((i & (0xff<<24))==0); i<<=8, size--); + for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); *len=size; for(; (p<end) && (size); p++, size--){ *p=(unsigned char)(i>>24);

1 0

[kamailio/kamailio] working with a file. (Issue #2924)
by ihsinme 09 Nov '21

09 Nov '21

Good afternoon. Do I understand correctly that the file is opened without restricting access rights (0666). https://github.com/kamailio/kamailio/blob/4e827b30dfc393caf17e2fce28b5eea46… it might be worth limiting them to at least 0644. thanks for taking the time to answer -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2924

3 3

git:5.5:2532b5f5: pv: fix condition in detecting the null string value when setting $var(...)
by Daniel-Constantin Mierla 09 Nov '21

09 Nov '21

Module: kamailio Branch: 5.5 Commit: 2532b5f5fc71d3828e1185c55ad6a6546df312d3 URL: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-09T19:11:15+01:00 pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit (cherry picked from commit ffe311939ebf58e7418940ec6c71bfaf9b21afad) --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… Patch: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..5f4626b8d6 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:ffe31193: pv: fix condition in detecting the null string value when setting $var(...)
by Daniel-Constantin Mierla 09 Nov '21

09 Nov '21

Module: kamailio Branch: master Commit: ffe311939ebf58e7418940ec6c71bfaf9b21afad URL: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-09T19:04:16+01:00 pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… Patch: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..5f4626b8d6 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:4e827b30: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 4e827b30dfc393caf17e2fce28b5eea460aa51f7 URL: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-08T13:01:18+01:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea… Patch: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea…

1 0

git:master:b9e8e09f: posops: docs for pos_set_char()
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: b9e8e09fd56b9cd2f1bd926edb6faf421b2893a1 URL: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-08T12:46:53+01:00 posops: docs for pos_set_char() --- Modified: src/modules/posops/doc/posops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… Patch: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index fcfd23ac12..1a38b85c67 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -156,6 +156,32 @@ pos_insert("100", "kamailio-$si"); <programlisting format="linespecific"> ... pos_insert("100", "10"); +... + </programlisting> + </example> + </section> + <section id="posops.f.pos_set_char"> + <title> + <function moreinfo="none">pos_set_char(idx, val)</function> + </title> + <para> + Set the char at position index to first character in val. + </para> + <para> + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. + </para> + <para> + The val can be a static string or variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pos_set_char()</function> usage</title> + <programlisting format="linespecific"> +... +pos_set_char("100", "x"); ... </programlisting> </example>

1 0

git:master:531c78c4: posops: added posops_set_char() function
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 531c78c455ef679050c0ae8103a9b1913c2c225a URL: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-08T09:17:21+01:00 posops: added posops_set_char() function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… Patch: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 465d6490ed..d71368cfc0 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -41,6 +41,7 @@ static void mod_destroy(void); static int w_posops_pos_append(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_insert(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_rm(sip_msg_t* msg, char* p1idx, char* p2len); +static int w_posops_pos_set_char(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_headers_start(sip_msg_t* msg, char* p1, char* p2); static int w_posops_pos_headers_end(sip_msg_t* msg, char* p1, char* p2); static int w_posops_pos_body_start(sip_msg_t* msg, char* p1, char* p2); @@ -83,6 +84,8 @@ static cmd_export_t cmds[]={ fixup_free_igp_spve, ANY_ROUTE}, {"pos_rm", (cmd_function)w_posops_pos_rm, 2, fixup_igp_igp, fixup_free_igp_igp, ANY_ROUTE}, + {"pos_set_char", (cmd_function)w_posops_pos_set_char, 2, fixup_igp_spve, + fixup_free_igp_spve, ANY_ROUTE}, {"pos_headers_start", (cmd_function)w_posops_pos_headers_start, 0, 0, 0, ANY_ROUTE}, {"pos_headers_end", (cmd_function)w_posops_pos_headers_end, 0, 0, @@ -342,6 +345,56 @@ static int w_posops_pos_rm(sip_msg_t* msg, char* p1idx, char* p2len) return ki_posops_pos_rm(msg, idx, len); } +/** + * + */ +static int ki_posops_pos_set_char(sip_msg_t *msg, int idx, str *val) +{ + int offset; + + posops_data_init(); + if(val==NULL || val->s==NULL || val->len<=0) { + LM_ERR("invalid val parameter\n"); + return -1; + } + + if(idx<0) { + offset = msg->len + idx; + } else { + offset = idx; + } + if(offset>msg->len) { + LM_ERR("offset invalid: %d (msg-len: %d)\n", offset, msg->len); + return -1; + } + + msg->buf[offset] = val->s[0]; + + return 1; +} + +/** + * + */ +static int w_posops_pos_set_char(sip_msg_t* msg, char* p1idx, char* p2val) +{ + int idx = 0; + str val = STR_NULL; + + posops_data_init(); + if(fixup_get_ivalue(msg, (gparam_t*)p1idx, &idx)!=0) { + LM_ERR("unable to get idx parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)p2val, &val)!=0) { + LM_ERR("unable to get val parameter\n"); + return -1; + } + + return ki_posops_pos_set_char(msg, idx, &val); +} + /** * */ @@ -878,6 +931,11 @@ static sr_kemi_t sr_kemi_posops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("posops"), str_init("pos_set_char"), + SR_KEMIP_INT, ki_posops_pos_set_char, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("posops"), str_init("pos_headers_start"), SR_KEMIP_INT, ki_posops_pos_headers_start, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:6f401a7a: kamctl: srv modules subcommand
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 6f401a7aab1bc846aaebe50e0f451d7c16e2c55e URL: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-06T22:11:37+01:00 kamctl: srv modules subcommand - list the loaded modules --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… Patch: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a5a1d34714..a83720fcde 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1799,6 +1799,11 @@ ksr_srv() { ctl_cmd_run corex.debug $2 fi ;; + modules) + require_ctlengine + mecho "list loaded modules" + ctl_cmd_run core.modules + ;; version) require_ctlengine mecho "list server version" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 47747be85a..f3b9e1f667 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -556,6 +556,7 @@ cat <<EOF srv aliases ................... show the list of server aliases srv rpclist ................... show the list of server rpc commands srv debug [<level>] ........... control the server debug level + srv modules ................... show the list of loaded modules srv version ................... show the server version EOF }

1 0

[kamailio/kamailio] asan: load of misaligned address (Issue #2914)
by sergey-safarov 07 Nov '21

07 Nov '21

### Description I fave compiled Kamailio with ASAN and enabled alignment checks (`-fno-sanitize=alignment` do not used). And get error ``` core/cfg/cfg_script.c:120:10: runtime error: load of misaligned address 0xffff96900cdc for type 'struct cfg_script_var_t *', which requires 8 byte alignment 0xffff96900cdc: note: pointer points here 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 ``` I do not aware this is important or not. Leave it for your review. ### Additional Information Compiled 375f86b69e11cf835ae919873d3cd56f32d589c8 Arch aarch64 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2914

2 3

Packaging NATS module
by Olle E. Johansson 06 Nov '21

06 Nov '21

Hi! The NATS module which is getting a publisher update soon, depends on libuv and the nats.c library. Question for our heroes - the packagers! Will it be possible to package this module in your distro? I see that debian has libuv1, but fail to find nats.c libs. Cheers, /O

2 1

git:master:dd1b3ccb: pkg/kamailio/obs: packaged nats module
by Sergey Safarov 06 Nov '21

06 Nov '21

Module: kamailio Branch: master Commit: dd1b3ccbc9e4674b28e420d97fe96bbe028fa009 URL: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-11-06T18:43:39+03:00 pkg/kamailio/obs: packaged nats module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… Patch: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5e15376879..5b87a501bc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -18,6 +18,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_without nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -51,6 +52,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_with mongodb +%bcond_with nats %bcond_without perl %bcond_with phonenum %bcond_with python3 @@ -85,6 +87,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_with nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -129,6 +132,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_without nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -156,6 +160,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_with mongodb +%bcond_with nats %bcond_without perl %bcond_with phonenum %bcond_without python3 @@ -216,8 +221,9 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-http_client < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver -Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver +Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver +Conflicts: kamailio-nats < %ver Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver @@ -687,6 +693,18 @@ BuildRequires: mysql-devel MySQL database connectivity for Kamailio. +%if %{with nats} +%package nats +Summary: NATS consumer for Kamailio +Group: %{PKGGROUP} +Requires: libnats, kamailio = %ver +BuildRequires: libnats-devel + +%description nats +The module provides an NATS consumer for Kamailio. NATS is a real time distributed messaging platform, more details about it can be found at nats.io. +%endif + + %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} @@ -1210,6 +1228,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kmongodb \ %endif kmysql koutbound \ +%if %{with nats} + knats \ +%endif %if %{with perl} kperl \ %endif @@ -1308,6 +1329,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kmongodb \ %endif kmysql koutbound \ +%if %{with nats} + knats \ +%endif %if %{with perl} kperl \ %endif @@ -1997,6 +2021,14 @@ fi %{_datadir}/kamailio/mysql/* +%if %{with nats} +%files nats +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.nats +%{_libdir}/kamailio/modules/nats.so +%endif + + %files outbound %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.outbound

1 0

[kamailio/kamailio] cannot pase IPv6 Via (Issue #2898)
by sergey-safarov 05 Nov '21

05 Nov '21

### Description Kamailio cannot parse Via header with full IPv6 address. And generate errors like ``` ERROR: <core> [core/parser/msg_parser.c:340]: parse_headers(): bad header field [Via: SIP/2.0/TCP [2a00:1370:8131:ffdf:4398:8903:f613:58b6];branch=z9hG4bK02cc.edc691e200000000000000] ``` #### SIP Traffic OPTIONS messages cannot be parsed ``` OPTIONS sip:example.com:5080;transport=tcp SIP/2.0 Via: SIP/2.0/TCP [2a00:1370:8131:ffdf:4398:8903:f613:58b6];branch=z9hG4bK0241.2e5db116000000000000000000000000.0 To: <sip:example.com:5080;transport=tcp> From: <sip:proxy@example.com>;tag=ecfe220eb77cee2ab0369a33b85d6b69-54b37dee CSeq: 10 OPTIONS Call-ID: 0d2146aa2a479f0d-2232(a)192.168.1.6 Max-Forwards: 70 Content-Length: 0 ``` OPTIONS messages parsed successfully. ``` OPTIONS sip:example.com.com:5080;transport=tcp SIP/2.0 Via: SIP/2.0/TCP [2600:1f1c:6d5:aa00::6];branch=z9hG4bK67a6.b0578ab2000000000000000000000000.0 To: <sip:example.com:5080;transport=tcp> From: <sip:proxy@example.com>;tag=c9c2897ae0601f24edc14b3f5f65b7e4-02fff025 CSeq: 10 OPTIONS Call-ID: 3555c29958953393-581752(a)3.101.84.6 Max-Forwards: 70 Content-Length: 0 ``` ### Additional Information compiled commit 1483ddb735c3fa3ea77b6e2d54ec67584e56e15b * **Operating System**: lsb_release -a ``` [safarov@safarov-dell config]$ lsb_release -a LSB Version: :core-4.1-amd64:core-4.1-noarch Distributor ID: Fedora Description: Fedora release 33 (Thirty Three) Release: 33 Codename: ThirtyThree ``` uname -a ``` [root@safarov-dell kamailio]# uname -a Linux safarov-dell.home 5.14.9-100.fc33.x86_64 #1 SMP Thu Sep 30 12:45:49 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2898

2 4

git:master:63a34963: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 63a34963c8376a2c17b7919847f7723fde6434f5 URL: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-05T11:46:16+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… Patch: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 540bd20d4d..7c31188ac7 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1331,10 +1331,11 @@ modparam("acc", "cdr_on_failed", 0) 6.49. acc_extra_size (int) - This parameter is meant to replace MAX_ACC_EXTRA fixed size with - desired size. + Set the maximum number of extra attributes that can be stored in the + accounting record (event accounting record). It is related to log_extra + and db_extra module parameters. - Default value is 64 (MAX_ACC_EXTRA). + Default value is 64. Example 1.49. acc_extra_size ... @@ -1343,10 +1344,11 @@ modparam("acc", "acc_extra_size", 100) 6.50. cdr_extra_size (int) - This parameter is meant to replace MAX_CDR_EXTRA fixed size with - desired size. + Set the maximum number of extra attributes that can be stored in the + call data record (cdr by dialog module). It is related to cdr_extra + module parameter. - Default value is 64 (MAX_CDR_EXTRA). + Default value is 64. Example 1.50. cdr_extra_size ...

1 0

git:master:9d65e090: acc: updated docs for acc_extra_size and cdr_extra_size
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 9d65e09056c89d5a1391a2c29458005929516ce0 URL: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T11:37:41+01:00 acc: updated docs for acc_extra_size and cdr_extra_size --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… Patch: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 0fd643c7a7..036163da14 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1447,10 +1447,12 @@ modparam("acc", "cdr_on_failed", 0) <section id="acc.p.acc_extra_size"> <title><varname>acc_extra_size</varname> (int)</title> <para> - This parameter is meant to replace MAX_ACC_EXTRA fixed size with desired size. + Set the maximum number of extra attributes that can be stored in the + accounting record (event accounting record). It is related to log_extra + and db_extra module parameters. </para> <para> - Default value is 64 (MAX_ACC_EXTRA). + Default value is 64. </para> <example> <title>acc_extra_size</title> @@ -1465,10 +1467,12 @@ modparam("acc", "acc_extra_size", 100) <section id="acc.p.cdr_extra_size"> <title><varname>cdr_extra_size</varname> (int)</title> <para> - This parameter is meant to replace MAX_CDR_EXTRA fixed size with desired size. + Set the maximum number of extra attributes that can be stored in the + call data record (cdr by dialog module). It is related to cdr_extra + module parameter. </para> <para> - Default value is 64 (MAX_CDR_EXTRA). + Default value is 64. </para> <example> <title>cdr_extra_size</title>

1 0

[kamailio/kamailio] build: detect GCC 11 (PR #2917)
by aalba6675 05 Nov '21

05 Nov '21

#### 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 Increase largest version of GCC detected to 11 from 10. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2917 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2917/commits/4d11948402ae315c94ff…">build: detect GCC 11</a> -- File Changes -- M src/Makefile.defs (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2917.patch https://github.com/kamailio/kamailio/pull/2917.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2917

2 2

git:master:bf8a989f: build: detect GCC 11
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: bf8a989f54b1006cae6c764f4064998daa6fe0c0 URL: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T11:23:40+01:00 build: detect GCC 11 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… Patch: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5d76fbe2cc..cde1faa6df 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -308,7 +308,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/9\.[0-9]\..*/9.0+/' \ -e 's/9\.[0-9]$$/9.0+/' \ -e 's/10\.[0-9]\..*/9.0+/' \ - -e 's/10\.[0-9]$$/9.0+/') + -e 's/10\.[0-9]$$/9.0+/' \ + -e 's/11\.[0-9]\..*/9.0+/' \ + -e 's/11\.[0-9]$$/9.0+/') ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP

1 0

git:5.4:d84a89db: app_python3: for Python >= 3.7 call pre-fork hook
by Anthony Alba 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.4 Commit: d84a89dba261d7a75ec35125174fe6723cf13295 URL: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-05T18:17:36+08:00 app_python3: for Python >= 3.7 call pre-fork hook (cherry picked from commit 138ef5630402448ea2643097a3d25d4dcead6d70) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… Patch: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 0ce93b71cd..8ec252039c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -175,6 +175,17 @@ static int mod_init(void) static int child_init(int rank) { if(rank==PROC_INIT) { + /* + * this is called before any process is forked + * so the Python internal state handler + * should be called now. + * + * TODO: is PyOS_AfterFork_Parent() necesary + * in the main process? + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_BeforeFork() ; +#endif return 0; } _apy_process_rank = rank;

1 0

git:5.5:2b10b505: app_python3: for Python >= 3.7 call pre-fork hook
by Anthony Alba 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 2b10b50518950246ad3a224b13e9817b00877a90 URL: https://github.com/kamailio/kamailio/commit/2b10b50518950246ad3a224b13e9817… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-05T18:13:36+08:00 app_python3: for Python >= 3.7 call pre-fork hook (cherry picked from commit 138ef5630402448ea2643097a3d25d4dcead6d70) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2b10b50518950246ad3a224b13e9817… Patch: https://github.com/kamailio/kamailio/commit/2b10b50518950246ad3a224b13e9817… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 0ce93b71cd..8ec252039c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -175,6 +175,17 @@ static int mod_init(void) static int child_init(int rank) { if(rank==PROC_INIT) { + /* + * this is called before any process is forked + * so the Python internal state handler + * should be called now. + * + * TODO: is PyOS_AfterFork_Parent() necesary + * in the main process? + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_BeforeFork() ; +#endif return 0; } _apy_process_rank = rank;

1 0

git:master:138ef563: app_python3: for Python >= 3.7 call pre-fork hook
by Anthony Alba 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 138ef5630402448ea2643097a3d25d4dcead6d70 URL: https://github.com/kamailio/kamailio/commit/138ef5630402448ea2643097a3d25d4… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-05T17:31:34+08:00 app_python3: for Python >= 3.7 call pre-fork hook --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/138ef5630402448ea2643097a3d25d4… Patch: https://github.com/kamailio/kamailio/commit/138ef5630402448ea2643097a3d25d4… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 0ce93b71cd..8ec252039c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -175,6 +175,17 @@ static int mod_init(void) static int child_init(int rank) { if(rank==PROC_INIT) { + /* + * this is called before any process is forked + * so the Python internal state handler + * should be called now. + * + * TODO: is PyOS_AfterFork_Parent() necesary + * in the main process? + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_BeforeFork() ; +#endif return 0; } _apy_process_rank = rank;

1 0

git:5.5:5ad04534: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 5ad0453472411d1a958023944340fab6c2b841fa URL: https://github.com/kamailio/kamailio/commit/5ad0453472411d1a958023944340fab… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-05T09:01:53+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/acc_json/README Modified: src/modules/rtpengine/README Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/5ad0453472411d1a958023944340fab… Patch: https://github.com/kamailio/kamailio/commit/5ad0453472411d1a958023944340fab… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index baff8e8b32..af9c65037e 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1074,9 +1074,12 @@ modparam("acc", "db_insert_mode", 1) 6.30. cdr_enable (integer) - Should CDR-based logging be enabled? + Enable CDR reporting - one record per call reported to "acc_cdrs" + table, relying on dialog module. - 0 - off (default). 1 - on. + The value can be: + * 0 - off (default). + 1 - on. Example 1.30. cdr_enable example ... diff --git a/src/modules/acc_json/README b/src/modules/acc_json/README index 8897fe609a..e2192ec375 100644 --- a/src/modules/acc_json/README +++ b/src/modules/acc_json/README @@ -41,7 +41,7 @@ Julien Chavanton 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -92,7 +92,7 @@ Chapter 1. Admin Guide 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -142,7 +142,7 @@ Chapter 1. Admin Guide 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -325,11 +325,14 @@ modparam("acc_json", "acc_log_facility", "LOG_LOCAL0") modparam("acc_json", "acc_log_level", 2) # Set acc_log_level to 2 (L_INFO) ... -3.11. cdr_enable (str) +3.11. cdr_enable (int) - Enable Call Data Record generation. + Enable CDR reporting - one record per call is reported, relying on + dialog module. - Default value is 0 (disabled). + The value can be: + * 0 - off (default). + 1 - on. Example 1.11. cdr_enable example ... diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 6f962d4aed..103e397c77 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -478,6 +478,7 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * tm module - (optional) if you want to have rtpengine_manage() fully functional + lwsc module - (optional) if you plan to use “wsapi” parameter 3.2. External Libraries or Applications diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index a699336f53..fc57366006 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -296,8 +296,8 @@ event_route[sipdump:msg] { examples shows how to delete the files older than 2 days using Kamailio modules. ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

[kamailio/kamailio] rtpengine -> send_rtpp_command(): mismatched cookie in websocket response (#2862)
by marcinkowalczyk 05 Nov '21

05 Nov '21

### Description Hi, I've pushed some production traffic over latest 5.5.2 release on top of rtpengine connected over websocket ( jus ws://xxx.xx.xx.xx) . `modparam("rtpengine", "wsapi", "lwsc")` but from time to time I can see following error and rtpengine_manage fails ``` Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> lwsc [lwsc_mod.c:367]: ksr_lwsc_callback(): losing read buffer of 4096 bytes Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:3008]: send_rtpp_command(): mismatched cookie in websocket response Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies ``` RTT towards rtpengine ~100-150ms #### Debugging Data #### Log Messages ``` Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=INVITE R=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Add to rr sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain => c2lwOmNiMmU5NjRmLTFlYjctNDFmZS1hN2QzLTVmYWZlYmY0ZjNjOUBiZ2ZteC5jcmF6eWNhbGwuY29t Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPEngineID bgfmx.localdomain set from header to 3 ID=bgfmx.localdomain_654888 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Generated MOS A label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Generated MOS B label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: SIP > WebRTC Sep 24 19:42:58 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTP Selected ws://xx.xx.xx.xx:22222 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Fix SDP BUNDLE for iOS devices Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15905]: INFO: [INVITE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: stored transaction [36958:1549764233] sip:+XXXXX@172.31.12.244 => sip:474tnvd1@15j11kooqfes.invalid;transport=ws Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=100 - Trying M=INVITE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 100 M=INVITE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=180 - Ringing M=INVITE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 180 M=INVITE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=200 - OK M=INVITE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15922]: INFO: [INVITE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 200 M=INVITE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=ACK R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Desination WS - lookup sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:42:59 kamailio5 /usr/sbin/kamailio[15907]: INFO: [ACK bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: stored transaction [<null>:<null>] sip:+XXXXX@172.31.12.244 => sip:474tnvd1@15j11kooqfes.invalid;transport=ws Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=INFO R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Desination WS - lookup sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: SIP-INFO received start recording ID=bgfmx.localdomain_654888 Sep 24 19:43:13 kamailio5 /usr/sbin/kamailio[15908]: INFO: [INFO bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPENGINE STATS: mos_average/mos_average_packetloss/mos_average_jitter/mos_average_roundtrip 4.3/0/0/143763 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: New request - M=BYE R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws F=sip:+XXXXX@172.31.12.244 T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.136.115:5060) ID=bgfmx.localdomain_654888 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:44:16 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> lwsc [lwsc_mod.c:367]: ksr_lwsc_callback(): losing read buffer of 4096 bytes Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:3008]: send_rtpp_command(): mismatched cookie in websocket response Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPENGINE STATS: mos_average/mos_average_packetloss/mos_average_jitter/mos_average_roundtrip <null>/<null>/<null>/<null> Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Stop mediaproxy for all branches - R=sip:474tnvd1@15j11kooqfes.invalid;alias=10.23.245.162~29794~5;transport=ws ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Desination WS - lookup sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Restored from RR header 15j11kooqfes.invalid -RTPEngineID 3 inst:<null> ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists A label for bgfmx.localdomain_654888 - 8882300b-c07e-4f45-a864-1158b8412b60 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: Exists B label for bgfmx.localdomain_654888 - a324492e-ea41-44c1-982e-8397799a08b1 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: SIP > WebRTC Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: ERROR: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> rtpengine [rtpengine.c:2678]: rtpp_function_call(): no available proxies Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTPEngine Failover no X-RTPEngineID-failover header failing to 1 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: post RTP Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: RTP Selected ws://52.209.63.240:22222 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15906]: INFO: [BYE bgfmx.localdomain_654888 10.23.136.115:5060@udp]--> <script>: stored transaction [36971:163653632] sip:+XXXXX@172.31.12.244 => sip:474tnvd1@15j11kooqfes.invalid;transport=ws Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15922]: INFO: [BYE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply - S=200 - OK M=BYE IP=<null>:<null> (10.23.245.162:29794) ID=bgfmx.localdomain_654888 Sep 24 19:44:17 kamailio5 /usr/sbin/kamailio[15922]: INFO: [BYE bgfmx.localdomain_654888 10.23.245.162:29794@ws]--> <script>: Reply from websocket to SIP: 200 M=BYE R=<null> F=sip:+XXXXX@bgfmx.localdomain T=sip:cb2e964f-1eb7-41fe-a7d3-5fafebf4f3c9@bgfmx.localdomain IP=10.23.136.115:5060 (10.23.245.162:29794) ID=bgfmx.localdomain_654888 ``` RTPEngine log ``` Sep 24 19:42:58 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'offer' from 52.49.87.3:1816 Sep 24 19:42:58 ip-172-28-11-189 rtpengine[18874]: NOTICE: [bgfmx.localdomain_654888]: [core] Creating new call Sep 24 19:42:58 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'offer' from 52.49.87.3:1816 (elapsed time 0.001349 sec) Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32358]: [crypto] DTLS-SRTP successfully negotiated using AEAD_AES_256_GCM Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32358]: [crypto] DTLS-SRTP successfully negotiated using AEAD_AES_256_GCM Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'answer' from 52.49.87.3:2192 Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [core] Received answer SDP with media ID ('audio') when no media ID was offered Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [crypto] DTLS: Peer certificate accepted Sep 24 19:42:59 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'answer' from 52.49.87.3:2192 (elapsed time 0.000811 sec) Sep 24 19:43:03 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32358]: [core] Confirmed peer address as 103.102.144.211:52093 Sep 24 19:43:03 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32380]: [core] Confirmed peer address as 52.209.63.245:56876 Sep 24 19:43:03 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888 port 32381]: [core] Confirmed peer address as 52.209.63.245:56877 Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'start recording' from 52.49.87.3:30337 Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: ERR: [bgfmx.localdomain_654888]: [core] Call recording requested, but no spool directory configured Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'start recording' from 52.49.87.3:30337 (elapsed time 0.000009 sec) Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'query' from 52.49.87.3:30337 Sep 24 19:43:13 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'query' from 52.49.87.3:30337 (elapsed time 0.000131 sec) Sep 24 19:44:16 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Received command 'query' from 52.49.87.3:43726 Sep 24 19:44:16 ip-172-28-11-189 rtpengine[18874]: INFO: [bgfmx.localdomain_654888]: [control] Replying to 'query' from 52.49.87.3:43726 (elapsed time 0.000156 sec) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.2 (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, 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: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` root@kamailio5:~# kamailio -v version: kamailio 5.5.2 (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, 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: unknown compiled with gcc 10.2.1 root@kamailio5:~# uname -a Linux kamailio5 5.10.0-8-cloud-amd64 #1 SMP Debian 5.10.46-4 (2021-08-03) x86_64 GNU/Linux root@kamailio5:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye root@kamailio5:~# ``` rtpengine version on media proxy ``` ii ngcp-rtpengine 10.0.1.4+0~mr10.0.1.4 all NGCP RTP/media proxy - meta package ii ngcp-rtpengine-daemon 10.0.1.4+0~mr10.0.1.4 amd64 proxy for RTP and media streams used in NGCP, userspace part ii ngcp-rtpengine-iptables 10.0.1.4+0~mr10.0.1.4 amd64 IPtables extension module for the kernel-space NGCP media proxy ii ngcp-rtpengine-kernel-dkms 10.0.1.4+0~mr10.0.1.4 all IPtables kernel module for the NGCP media proxy - DKMS ii ngcp-rtpengine-kernel-source 10.0.1.4+0~mr10.0.1.4 all IPtables kernel module for the NGCP media proxy - source ii ngcp-rtpengine-recording-daemon 10.0.1.4+0~mr10.0.1.4 amd64 recording daemon for RTP and media streams ii ngcp-rtpengine-utils 10.0.1.4+0~mr10.0.1.4 all scripts and Perl modules for NGCP rtpengine ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2862

5 15

git:5.5:0b0e1352: drouting: remove unused trim function
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 0b0e13527059e6d3ae96235430e585203082dcc2 URL: https://github.com/kamailio/kamailio/commit/0b0e13527059e6d3ae96235430e5852… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:47:06+01:00 drouting: remove unused trim function (cherry picked from commit 38ae44336e8478c10e1a558997669850c5d7b297) --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/0b0e13527059e6d3ae96235430e5852… Patch: https://github.com/kamailio/kamailio/commit/0b0e13527059e6d3ae96235430e5852… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 0988bccbb7..55d09a57ca 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -45,34 +45,6 @@ static inline int strz2int(char *_bp) } -static inline char *trim(char *_s) -{ - int len; - char *end; - - /* Null pointer, there is nothing to do */ - if(!_s) - return _s; - - /* Remove spaces and tabs from the beginning of string */ - while((*_s == ' ') || (*_s == '\t')) - _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while((*end == ' ') || (*end == '\t')) - end--; - if(end != (_s + len - 1)) { - *(end + 1) = '\0'; - } - - return _s; -} - - /************************ imported from "ac_tm.c" ***************************/ /* #define USE_YWEEK_U // Sunday system

1 0

git:5.5:2b432d35: pv: handle case when var value ha flag str but null pointer
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 2b432d35f0691d9ef6b12908909d809dbb1fa57b URL: https://github.com/kamailio/kamailio/commit/2b432d35f0691d9ef6b12908909d809… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:47:23+01:00 pv: handle case when var value ha flag str but null pointer (cherry picked from commit 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc) --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/2b432d35f0691d9ef6b12908909d809… Patch: https://github.com/kamailio/kamailio/commit/2b432d35f0691d9ef6b12908909d809… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if(value==NULL) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:5.5:280a1650: lwsc: wait to read more data if not last ws fragment
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 280a165086b5c45ae4c0310d889c5df927fff058 URL: https://github.com/kamailio/kamailio/commit/280a165086b5c45ae4c0310d889c5df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:47:54+01:00 lwsc: wait to read more data if not last ws fragment - GH #2862 (cherry picked from commit 1ea717032d90fcc98a5de07e746ec367eaeed3be) --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/280a165086b5c45ae4c0310d889c5df… Patch: https://github.com/kamailio/kamailio/commit/280a165086b5c45ae4c0310d889c5df… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index a6985acb6dc..7eb1f4285ea 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -144,6 +144,7 @@ typedef struct lwsc_endpoint { /* first LWS_PRE bytes must preserved for headers */ str wbuf; str rbuf; + int rdone; int tlson; struct lws_protocols protocols[2]; struct lws_context_creation_info crtinfo; @@ -226,6 +227,7 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, lwsc_endpoint_t *ep = NULL; str rbuf = STR_NULL; str wbuf = STR_NULL; + int blen = 0; if(_lwsc_verbosity>1) { LM_DBG("callback called with reason %d\n", reason); @@ -349,28 +351,35 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, LM_DBG("LWS_CALLBACK_RECEIVE - wsi: %p len: %lu\n", wsi, (unsigned long)len); #endif + ep = lwsc_get_endpoint_by_wsi(wsi); + if(ep==NULL) { + LM_ERR("no endpoint for wsi %p\n", wsi); + goto done; + } + pthread_mutex_lock(&ep->wslock); if(len>0) { - ep = lwsc_get_endpoint_by_wsi(wsi); - if(ep==NULL) { - LM_ERR("no endpoint for wsi %p\n", wsi); - goto done; - } - rbuf.s = (char*)pkg_malloc(len + 1); + blen = ep->rbuf.len + len; + rbuf.s = (char*)pkg_malloc(blen + 1); if(rbuf.s==NULL) { PKG_MEM_ERROR; } else { - memcpy(rbuf.s, in, len); - rbuf.len = len; - rbuf.s[rbuf.len] = '\0'; - pthread_mutex_lock(&ep->wslock); if(ep->rbuf.s!=NULL) { - LM_ERR("losing read buffer of %d bytes\n", ep->rbuf.len); + LM_DBG("append to read buffer of %d bytes more %d bytes\n", + ep->rbuf.len, (int)len); + memcpy(rbuf.s, ep->rbuf.s, ep->rbuf.len); pkg_free(ep->rbuf.s); + ep->rbuf.s = NULL; } + memcpy(rbuf.s + ep->rbuf.len, in, len); + rbuf.len = blen; + rbuf.s[rbuf.len] = '\0'; ep->rbuf = rbuf; - pthread_mutex_unlock(&ep->wslock); } } + if (lws_is_final_fragment(wsi)) { + ep->rdone = 1; + } + pthread_mutex_unlock(&ep->wslock); break; case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE: @@ -646,6 +655,7 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, ep->rbuf.s = NULL; ep->rbuf.len = 0; } + ep->rdone = 0; if(ep->wbuf.s!=NULL) { LM_ERR("losing write buffer content of %d bytes\n", ep->wbuf.len); pkg_free(ep->wbuf.s); @@ -659,10 +669,13 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, do { pthread_mutex_lock(&ep->wslock); - if(ep->rbuf.s!=NULL) { - *rdata = ep->rbuf; - ep->rbuf.s = NULL; - ep->rbuf.len = 0; + if(ep->rdone==1) { + if(ep->rbuf.s!=NULL) { + *rdata = ep->rbuf; + ep->rbuf.s = NULL; + ep->rbuf.len = 0; + } + ep->rdone = 0; } pthread_mutex_unlock(&ep->wslock); if(rdata->s==NULL) {

1 0

git:5.5:e87193a2: rtpengine: update dependencies
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: e87193a20ed4c0419aa13762257b1d8ff355e0dc URL: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:45:16+01:00 rtpengine: update dependencies lwsc module is needed if wsapi parameter is set https://lists.kamailio.org/pipermail/sr-users/2021-October/113494.html (cherry picked from commit a602c26fe3c83a0f1b825927be145459a08730e2) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… Patch: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9e8dee5d80..11431f57fc 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -120,6 +120,10 @@ <emphasis>tm module</emphasis> - (optional) if you want to have rtpengine_manage() fully functional </para> + <para> + <emphasis>lwsc module</emphasis> - (optional) if you plan to use + <quote>wsapi</quote> parameter + </para> </listitem> </itemizedlist> </para>

1 0

git:5.5:f5f4ba99: acc: docs - more details about cdr_enable parameter
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: f5f4ba994fa80ab44db3a4ddd7e36872a29b93a2 URL: https://github.com/kamailio/kamailio/commit/f5f4ba994fa80ab44db3a4ddd7e3687… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:46:10+01:00 acc: docs - more details about cdr_enable parameter (cherry picked from commit 808e58c4e9b785a58fd5cfd084089a217d0f96c3) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f5f4ba994fa80ab44db3a4ddd7e3687… Patch: https://github.com/kamailio/kamailio/commit/f5f4ba994fa80ab44db3a4ddd7e3687… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index f88d403d2b..4fd15f5820 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1045,11 +1045,17 @@ modparam("acc", "db_insert_mode", 1) <section id="acc.p.cdr_enable"> <title><varname>cdr_enable</varname> (integer)</title> <para> - Should CDR-based logging be enabled? + Enable CDR reporting - one record per call reported to "acc_cdrs" table, + relying on dialog module. </para> <para> - 0 - off (default). - 1 - on. + The value can be: + <itemizedlist> + <listitem> + <para>0 - off (default).</para> + <para>1 - on.</para> + </listitem> + </itemizedlist> </para> <example> <title>cdr_enable example</title>

1 0

git:5.5:715e4eb3: acc_json: docs - more details about cdr_enable parameter
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 715e4eb38ca0e98b31d98a0508a0d661d58f6dfa URL: https://github.com/kamailio/kamailio/commit/715e4eb38ca0e98b31d98a0508a0d66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:46:21+01:00 acc_json: docs - more details about cdr_enable parameter (cherry picked from commit 041999bc8092d7abb42e68a5f5fb88bef09b225c) --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/715e4eb38ca0e98b31d98a0508a0d66… Patch: https://github.com/kamailio/kamailio/commit/715e4eb38ca0e98b31d98a0508a0d66… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 0f07b42e23..a794cae801 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -324,12 +324,19 @@ modparam("acc_json", "acc_log_level", 2) # Set acc_log_level to 2 (L_INFO) </section> <section id="acc.p.cdr_enable"> - <title><varname>cdr_enable</varname> (str)</title> + <title><varname>cdr_enable</varname> (int)</title> <para> - Enable Call Data Record generation. + Enable CDR reporting - one record per call is reported, + relying on dialog module. </para> <para> - Default value is 0 (disabled). + The value can be: + <itemizedlist> + <listitem> + <para>0 - off (default).</para> + <para>1 - on.</para> + </listitem> + </itemizedlist> </para> <example> <title>cdr_enable example</title>

1 0

git:5.5:f4ebe527: msrp: fix some tcpconn where memory was never cleaned up
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: f4ebe527c25ecedb3caffa8a361b5c42a2dd6b88 URL: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:43:59+01:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 (cherry picked from commit bf371ccbfa1c89fefcd9d9322ae75189d97fc862) --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… Patch: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:5.5:3e82cdbf: core: hashes - cast to unsigned int for left shifting
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 3e82cdbf2311deedb0a3cb528047b54e11d54808 URL: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:44:26+01:00 core: hashes - cast to unsigned int for left shifting (cherry picked from commit f7f9ea0f3cfb8e61a4f2f47a214cb4e89d713da4) --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… Patch: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 2afb8361c8..62708bdb35 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -273,7 +273,7 @@ static inline unsigned int core_hash(const str *s1, const str *s2, end=s1->s+s1->len; for ( p=s1->s ; p<=(end-4) ; p+=4 ){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; @@ -283,11 +283,11 @@ static inline unsigned int core_hash(const str *s1, const str *s2, if (s2) { end=s2->s+s2->len; for (p=s2->s; p<=(end-4); p+=4){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; - for (; p<end ; p++){ v<<=8; v+=*p;} + for (; p<end ; p++){ v<<=8; v+=p[0];} ch_h_inc; } h=((h)+(h>>11))+((h>>13)+(h>>23));

1 0

git:5.5:04591e08: avpops: removed unused function get_source_uri()
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 04591e08a4d74a9f57972b1552f941b86cbb6e55 URL: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:41:53+01:00 avpops: removed unused function get_source_uri() (cherry picked from commit c9b885ff791bd71fcbf40824369fc9369dcc6e48) --- Modified: src/modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… Patch: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… --- diff --git a/src/modules/avpops/avpops_impl.c b/src/modules/avpops/avpops_impl.c index c760becb43..8a6e4c2b2d 100644 --- a/src/modules/avpops/avpops_impl.c +++ b/src/modules/avpops/avpops_impl.c @@ -214,38 +214,6 @@ static int dbrow2avp(struct db_row *row, struct db_param *dbp, int_str attr, return add_avp( (unsigned short)db_flags, avp_attr, avp_val); } - -inline static str* get_source_uri(struct sip_msg* msg,int source) -{ - /* which uri will be used? */ - if (source&AVPOPS_USE_FROM) - { /* from */ - if (parse_from_header( msg )<0 ) - { - LM_ERR("failed to parse from\n"); - goto error; - } - return &(get_from(msg)->uri); - } else if (source&AVPOPS_USE_TO) - { /* to */ - if (parse_headers( msg, HDR_TO_F, 0)<0) - { - LM_ERR("failed to parse to\n"); - goto error; - } - return &(get_to(msg)->uri); - } else if (source&AVPOPS_USE_RURI) { /* RURI */ - if(msg->new_uri.s!=NULL && msg->new_uri.len>0) - return &(msg->new_uri); - return &(msg->first_line.u.request.uri); - } else { - LM_ERR("unknown source <%d>\n", source); - goto error; - } -error: - return 0; -} - static inline void int_str2db_val( int_str is_val, str *val, int is_s) { if (is_s)

1 0

git:5.5:a2043123: ctl: removed unused function safe_write()
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: a204312372bd09dcfb276e960892e14fbe2eceeb URL: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:42:26+01:00 ctl: removed unused function safe_write() (cherry picked from commit cc0cbad3660423f679fed62c42fcffb4a402081f) --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… Patch: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index b40b079a1d..50507dd03b 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -947,29 +947,6 @@ static void rpc_fault(rpc_ctx_t* ctx, int code, char* fmt, ...) } -static inline int safe_write(FILE* f, char* fmt, ...) -{ - va_list ap; - - if (!*fmt) return 0; - va_start(ap, fmt); - - retry: - /* First line containing code and reason phrase */ - if (vfprintf(f, fmt, ap) <= 0) { - ERR("fifo write error: %s\n", strerror(errno)); - if ((errno == EINTR) || (errno == EAGAIN) || (errno == EWOULDBLOCK)) { - goto retry; - } - va_end(ap); - return -1; - } - va_end(ap); - return 0; -} - - - inline static int build_iovec(rpc_ctx_t* ctx, struct iovec* v, int v_size) { struct text_chunk* p;

1 0

git:5.5:c4821bda: core: unsigned literal for 1 used in left shifting for script callbacks
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: c4821bdaa44198dce153c1764b298c8c00652463 URL: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:43:09+01:00 core: unsigned literal for 1 used in left shifting for script callbacks - GH #2897 (cherry picked from commit 6348de19626f691036fd94134be6f64fff4418ed) --- Modified: src/core/script_cb.c Modified: src/core/script_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… Patch: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… --- diff --git a/src/core/script_cb.c b/src/core/script_cb.c index 2f83608e66..266037674a 100644 --- a/src/core/script_cb.c +++ b/src/core/script_cb.c @@ -78,11 +78,11 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) int i; /* type checkings */ - if ( (flags&((1<<SCRIPT_CB_NUM)-1))==0 ) { + if ( (flags&((1u<<SCRIPT_CB_NUM)-1))==0 ) { LM_BUG("callback flag not specified\n"); return -1; } - if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1<<SCRIPT_CB_NUM ) { + if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1u<<SCRIPT_CB_NUM ) { LM_BUG("unsupported callback flags: %u\n", flags); return -1; @@ -102,7 +102,7 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) * (as many times as many flags are set) */ for (i=0; i<SCRIPT_CB_NUM; i++) { - if ((flags&(1<<i)) == 0) + if ((flags&(1u<<i)) == 0) continue; if (add_callback(&cb_array[i], f, param) < 0) goto add_error; @@ -155,7 +155,7 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) return 0; } - flags = PRE_SCRIPT_CB | (1<<(type-1)); + flags = PRE_SCRIPT_CB | (1u<<(type-1)); for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ if (cb->cbf(msg, flags, cb->param)==0) @@ -177,7 +177,7 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) return 1; } - flags = POST_SCRIPT_CB | (1<<(type-1)); + flags = POST_SCRIPT_CB | (1u<<(type-1)); for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); } diff --git a/src/core/script_cb.h b/src/core/script_cb.h index ece69b8e41..650bf053fa 100644 --- a/src/core/script_cb.h +++ b/src/core/script_cb.h @@ -33,8 +33,8 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); -#define PRE_SCRIPT_CB (1<<30) -#define POST_SCRIPT_CB (1<<31) +#define PRE_SCRIPT_CB (1u<<30) +#define POST_SCRIPT_CB (1u<<31) /* Pre- and post-script callback flags. Use these flags to register * for the callbacks, and to check the type of the callback from the

1 0

git:5.5:992c5a34: core: parse main headers after updating msg buffer
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 992c5a349454e40c87c8918283ffde7302da9d8e URL: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:39:39+01:00 core: parse main headers after updating msg buffer - same group of headers as for the case of receiving the message - applies for msg_apply_changes() as well - related to GH #2877 (cherry picked from commit d5c1b4693b6e47b4123b5f9417b5fd88d4dafd1f) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… Patch: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 9fd5635655..bc1b9736df 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3328,7 +3328,13 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) * valid/safe for config */ return 0; } - + if(parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } return 1; }

1 0

git:5.5:8df8974b: sipdump: docs - fix example config snippet
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 8df8974bb0f9754b126cac75eed76360e12d8a22 URL: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:40:09+01:00 sipdump: docs - fix example config snippet (cherry picked from commit f202cfe647c6a1ac92a3c2b8e2ee056d678fb802) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… Patch: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 7e642f6010..e728ebf3b0 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -318,8 +318,8 @@ event_route[sipdump:msg] { </para> <programlisting format="linespecific"> ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

1 0

git:5.5:058ed2e1: tls: print src/dst port in error message
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.5 Commit: 058ed2e1e4fdaf4ff99cd6db5a96793d6b420483 URL: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:40:47+01:00 tls: print src/dst port in error message - related to GH #2872 (cherry picked from commit daedf1201c2776ccc1040e03f8f63d256e75a43a) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… Patch: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 2af43b9eb9..f75b111168 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1330,10 +1330,10 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); - ERR("source IP: %s\n", ip_buf); + ERR("src addr: %s:%d\n", ip_buf, c->rcv.src_port); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); - ERR("destination IP: %s\n", ip_buf); + ERR("dst addr: %s:%d\n", ip_buf, c->rcv.dst_port); goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/

1 0

[kamailio/kamailio] ims_usrloc_pcscf: new callbacks and some fixes (#2882)
by Erhan Onur Sendag 05 Nov '21

05 Nov '21

### Description  Other modules use ims_usrloc_pcscf's callback calls for following operations: #define PCSCF_CONTACT_INSERT (1<<0) #define PCSCF_CONTACT_UPDATE (1<<1) #define PCSCF_CONTACT_DELETE (1<<2) #define PCSCF_CONTACT_EXPIRE (1<<3) ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2882

2 2

[kamailio/kamailio] Topos not working correctly with loos_route() on a leg (Issue #2905)
by Anis Bedhiafi 05 Nov '21

05 Nov '21

### Description I noticed an issue regarding loose_route() when using Topos module. My architecture is the following: ``` Client (behind NAT or not) ------> Kamailio (Access SBC) -----------> Kamailio (Interconnect SBC) -----------> Carrier ``` Kamailio Access SBC is listening on 2 interfaces: ``` Public interface : udp:A.A.A.A:5060 Core interface : udp:B.B.B.B:5060 ``` Kamailio Interconnect SBC is listening on 2 interfaces: ``` Core interface : udp:C.C.C.C:5060 Carrier-side interface : udp:D.D.D.D:5060 ``` TOPOS is configured only on second kamailio box (Interconnect SBC). Record routing is used on both kamailios. TOPOS module is configured as follows: ``` modparam("ndb_redis", "server", "name=srv1;addr=127.0.0.1;port=6379") modparam("topos_redis", "serverid", "srv1") modparam("topos", "storage", "redis") modparam("topos", "contact_mode", 1) modparam("topos", "cparam_name", "id") modparam("topos", "rr_update", 1) ``` RR module is configured as follows: ``` modparam("rr", "enable_full_lr", 1) modparam("rr", "append_fromtag", 1) modparam("rr", "enable_double_rr", 1) ``` For an incomoing INVITE (direction: client to carrier) all is fine and topos can strip headers on bleg and insert the cookie on bleg contact as a param. When Callee sends a BYE or re-INVITE, topos inserts route headers in aleg as shown in the next trace: (BYE as received from the carrier on the carrier-side interface D.D.D.D) ``` BYE sip:D.D.D.D:5060 SIP/2.0 Via: SIP/2.0/UDP x.x.x.x:5060;branch=z9hG4bKrdhsvc001omkvssqvfk0sd0185mt1.1 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 64 Content-Length: 0 Route: <sip:D.D.D.D;r2=on;lr=on;ftag=3ab10616>,<sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2>,<sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> P-SR-XUID: atpsh-617925e5-82a5-1 ``` Topos on the kamailio interconnect handles the BYE/re-INVITE and forward it to the second interface C.C.C.C as shown in the following trace: ``` BYE sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2 SIP/2.0 Via: SIP/2.0/UDP 185.164.213.110;branch=z9hG4bKbd7.ab692eeb60369aa3a5e07f6b63cc9dd7.0 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 63 Content-Length: 0 Route: <sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Contact: <sip:+33123456789@10.3.60.45;id=atpsh-617925e5-82a5-1> ``` When the BYE/re-INVITE request reaches the C.C.C.C interface, it is then forwarded directly to the ruri sip:A.A.A.A. Or what I expect to receive in C.C.C.C interface is the following : ``` BYE <HERE SHOULD BE THE CALLER CONTACT URI> SIP/2.0 Via: SIP/2.0/UDP 80.10.231.173:5060;branch=z9hG4bKrdhsvc001omkvssqvfk0sd0185mt1.1 From: <sip:+33123456789@my-carrier-domain;transport=UDP;user=phone>;tag=SD69ao497-1472568650-1635329820043 To: <sip:+33987654321@my-own-domain;transport=UDP;user=phone>;tag=3ab10616 Call-ID: NjZjMDgyMGMxNzdkN2FhYmJlYzQyYjA5YWIzZThmZmI. CSeq: 547381883 BYE Max-Forwards: 64 Content-Length: 0 Route: <sip:D.D.D.D;r2=on;lr=on;ftag=3ab10616> Route: <sip:C.C.C.C;r2=on;lr=on;ftag=3ab10616> Route: <sip:B.B.B.B;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Route: <sip:A.A.A.A;r2=on;lr=on;ftag=3ab10616;dlg_id=426.26c2> Contact: <sip:+33123456789@10.3.60.45;id=atpsh-617925e5-82a5-1> ``` I could work around this issue by doing the following : 1. When receiving the BYE/re-INVITE on interface D.D.D.D, I explode the Route headers, delete old route headers and create new ones in order from the result of explode 2. I update the ru with the contact uri which I stored in a htable when the initial INVITE was received ``` # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); # TOPOS FIX if (is_method("INVITE")) { $sht(tpsindlg=>$ci) = $ci; $sht(tpsindlg=>$ci:ft) = $ft; $sht(tpsindlg=>$ci:ct) = $ct; } } route[WITHINDLG] { if (!has_totag()) return; # Fix bad Route Headers caused by TOPOS module if ($Ri == "D.D.D.D") { $var(rh0) = $(hdr(Route)[0]{s.select,0,,}); $var(rh1) = $(hdr(Route)[0]{s.select,1,,}); $var(rh2) = $(hdr(Route)[1]{s.select,0,,}); $var(rh3) = $(hdr(Route)[1]{s.select,1,,}); remove_hf_re("^Route$"); append_hf("Route: $var(rh0)\r\n"); append_hf("Route: $var(rh1)\r\n"); append_hf("Route: $var(rh2)\r\n"); append_hf("Route: $var(rh3)\r\n"); } # sequential request within a dialog should # take the path determined by record-routing if (loose_route()) { # Fix R-URI caused by TOPOS module if ($Ri == "D.D.D.D") { if ($ci == $sht(tpsindlg=>$ci) && $tt == $sht(tpsindlg=>$ci:ft)) { $ru = $(sht(tpsindlg=>$ci:ct){s.strip,1}{s.striptail,1}); if (is_method("BYE")) { $sht(tpsindlg=>$ci) = $null; $sht(tpsindlg=>$ci:ft) = $null; $sht(tpsindlg=>$ci:ct) = $null; } } } route(RELAY); exit; } if (is_method("ACK")) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); exit; } ``` Could you please tell if this is a normal behavior by TOPOS module or is it a bug? Thank you. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2905

2 2

[kamailio/kamailio] runtime error: null pointer passed as argument 2, which is declared to never be null (Issue #2913)
by sergey-safarov 05 Nov '21

05 Nov '21

### Description I have compiled Kamailio with google ASAN module and faced issue where the string PV with NULL value cannot be copied. Using GDB I found this function call triggers error when Google ASAN is used, `value->s.s = NULL`, `value->s.len = 0` ``` memcpy(var->v.value.s.s, value->s.s, value->s.len); ``` [Link](https://github.com/kamailio/kamailio/blob/caccb13e29ee12166c8101efa0d… This happens only when ASAN is used. Without ASAN same function call with the same values does not trigger an error. In my test case this function called from [`lost/functions.c:1285`](https://github.com/kamailio/kamailio/blob/caccb13e29ee12166c8101efa0d5ab2745876413/src/modules/lost/functions.c#L1285) To compile with asan used extra flags ``` -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment ``` ### Troubleshooting #### Log Messages ``` 0(913407) INFO: {1 1 INVITE 1-455779(a)172.21.0.84} lost [functions.c:891]: lost_function(): ### LOST urn [urn:sip:911@3.236.25.254:5060] 0(913407) INFO: {1 1 INVITE 1-455779(a)172.21.0.84} lost [functions.c:983]: lost_function(): ### LOST loc [<112233445566(a)jim.com>] 0(913407) ERROR: {1 1 INVITE 1-455779(a)172.21.0.84} lost [utilities.c:336]: lost_get_content(): could not get XML node content pv_svar.c:137:3: runtime error: null pointer passed as argument 2, which is declared to never be null ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` current master, test 375f86b69e11cf835ae919873d3cd56f32d589c8 * **Operating System**: Centos 8 -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2913

2 6

git:master:6857234c: core: reorder fields of struct _cfg_group for better alignment
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 6857234c321faf33573e1a034ab666dc158eb549 URL: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T17:15:49+01:00 core: reorder fields of struct _cfg_group for better alignment --- Modified: src/core/cfg/cfg_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… Patch: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… --- diff --git a/src/core/cfg/cfg_struct.h b/src/core/cfg/cfg_struct.h index e03024e700..03f38f322d 100644 --- a/src/core/cfg/cfg_struct.h +++ b/src/core/cfg/cfg_struct.h @@ -76,7 +76,6 @@ enum { CFG_GROUP_UNKNOWN = 0, CFG_GROUP_DYNAMIC, CFG_GROUP_STATIC }; /*! \brief linked list of registered groups */ #pragma pack(push, 1) typedef struct _cfg_group { - int num; /*!< number of variables within the group */ cfg_mapping_t *mapping; /*!< describes the mapping betweeen the cfg variable definition and the memory block */ char *vars; /*!< pointer to the memory block where the values @@ -85,6 +84,7 @@ typedef struct _cfg_group { cfg_add_var_t *add_var; /*!< Additional instances of the variables. This linked list is used only before the config is shmized. */ + int num; /*!< number of variables within the group */ int size; /*!< size of the memory block that has to be allocated to store the values */ int meta_offset; /*!< offset of the group within the @@ -100,9 +100,9 @@ typedef struct _cfg_group { to temporary set the handle in the main process and restore it later to its original value. */ - unsigned char dynamic; /*!< indicates whether the variables within the group - are dynamically allocated or not */ struct _cfg_group *next; + unsigned int dynamic; /*!< indicates whether the variables within the group + are dynamically allocated or not */ int name_len; char name[1]; } cfg_group_t;

1 0

[kamailio/kamailio] mqueue: add two new module parameters (#2825)
by Stefan Mititelu 04 Nov '21

04 Nov '21

Add mqueue_name and mqueue_size to define queues. Updated doc.   #### 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  Add 2 new mqueue module parameters to simplify config queue definition. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2825 -- Commit Summary -- * mqueue: add two new module parameters -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (58) M src/modules/mqueue/mqueue_mod.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2825.patch https://github.com/kamailio/kamailio/pull/2825.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2825

3 5

Re: [sr-dev] [kamailio/kamailio] nats: Add publish function (e736af9)
by Olle E. Johansson 04 Nov '21

04 Nov '21

Nice! Missing docs update. :-) Thank you - will try this out. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/e736af98038663cbbb2abf0a3c16c42…

1 0

git:master:2c68066d: pkg/kamailio/deb: version set 5.6.0~dev2
by Victor Seva 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 2c68066dc8aa5f75de79cad1f4bea973db18bed7 URL: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:31:41+01:00 pkg/kamailio/deb: version set 5.6.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97… Patch: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97…

1 0

git:master:a48e1a9b: pua_dialoginfo: fix memory corruption
by Victor Seva 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: a48e1a9baf16752c49f7de68700659b947e9f3d8 URL: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:07:49+01:00 pua_dialoginfo: fix memory corruption * don't use SRUID_SIZE, just reserve the proper generated size * call sruid_init() at child_init too --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Patch: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… --- diff --git a/src/modules/pua_dialoginfo/dialog_publish.c b/src/modules/pua_dialoginfo/dialog_publish.c index 7f2751ffca..137823c21b 100644 --- a/src/modules/pua_dialoginfo/dialog_publish.c +++ b/src/modules/pua_dialoginfo/dialog_publish.c @@ -363,7 +363,7 @@ void dialog_publish(char *state, str* ruri, str *entity, str *peer, str *callid, } publ->id.s= (char*)publ+ size; memcpy(publ->id.s, "DIALOG_PUBLISH.", 15); - memcpy(publ->id.s+15, uuid->s, callid->len); + memcpy(publ->id.s+15, uuid->s, uuid->len); publ->id.len= 15+ uuid->len; size+= publ->id.len; diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 9af25b4b1d..0385ed90dd 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -108,7 +108,7 @@ send_publish_t pua_send_publish; /** module functions */ static int mod_init(void); - +static int child_init(int rank); static cmd_export_t cmds[]={ {0, 0, 0, 0, 0, 0} @@ -146,7 +146,7 @@ struct module_exports exports= { 0, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ - 0, /* per-child init function */ + child_init, /* per-child init function */ 0 /* module destroy function */ }; @@ -490,6 +490,13 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable int len; str* s=NULL; + // generate new random uuid + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } + LM_DBG("uuid generated: '%.*s'\n", + _puadi_sruid.uid.len, _puadi_sruid.uid.s); + /* create dlginfo structure to store important data inside the module*/ len = sizeof(struct dlginfo_cell) + dlg->from_uri.len @@ -498,7 +505,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable + dlg->tag[0].len + dlg->req_uri.len + dlg->contact[0].len - + SRUID_SIZE; + + _puadi_sruid.uid.len; dlginfo = (struct dlginfo_cell*)shm_malloc( len ); if (dlginfo==0) { @@ -524,7 +531,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable dlginfo->from_contact.s = dlginfo->req_uri.s + dlginfo->req_uri.len; dlginfo->from_contact.len = dlg->contact[0].len; dlginfo->uuid.s = dlginfo->from_contact.s + dlginfo->from_contact.len; - dlginfo->uuid.len = SRUID_SIZE; + dlginfo->uuid.len = _puadi_sruid.uid.len; memcpy(dlginfo->from_uri.s, dlg->from_uri.s, dlg->from_uri.len); memcpy(dlginfo->to_uri.s, dlg->to_uri.s, dlg->to_uri.len); @@ -532,13 +539,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memcpy(dlginfo->from_tag.s, dlg->tag[0].s, dlg->tag[0].len); memcpy(dlginfo->req_uri.s, dlg->req_uri.s, dlg->req_uri.len); memcpy(dlginfo->from_contact.s, dlg->contact[0].s, dlg->contact[0].len); - - // generate new random uuid - sruid_next_safe(&_puadi_sruid); - strcpy(dlginfo->uuid.s, _puadi_sruid.uid.s); - dlginfo->uuid.len = _puadi_sruid.uid.len; - LM_DBG("uuid generated: '%.*s'\n", - dlginfo->uuid.len, dlginfo->uuid.s); + memcpy(dlginfo->uuid.s, _puadi_sruid.uid.s, _puadi_sruid.uid.len); if (use_pubruri_avps) { if(type==DLGCB_CREATED) { @@ -858,6 +859,22 @@ static int mod_init(void) return 0; } +/** + * @brief Initialize module children + */ +static int child_init(int rank) +{ + if(sruid_init(&_puadi_sruid, (char)'-', "padi", SRUID_INC)<0) { + return -1; + } + + if(rank != PROC_MAIN) { + return 0; + } + + return 0; +} + void free_dlginfo_cell(void *param) { struct dlginfo_cell *cell = NULL;

1 0

git:master:6eb67eaa: pv: handle case when var value ha flag str but null pointer
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc URL: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:24:06+01:00 pv: handle case when var value ha flag str but null pointer --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… Patch: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if(value==NULL) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:fc3010cc: Makefile.defs: version set to 5.6.0-dev2
by Daniel-Constantin Mierla 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: fc3010cc2643d5398db12d92707d849cdc1d7d78 URL: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:06:31+01:00 Makefile.defs: version set to 5.6.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Patch: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 51a14f5ab4..5d76fbe2cc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:b1e0d418: Merge pull request #2891 from smititelu/increase_defines
by GitHub 04 Nov '21

04 Nov '21

Module: kamailio Branch: master Commit: b1e0d41875f224da5bd5c511cbafd0f5e395d0b6 URL: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-03T12:59:34+01:00 Merge pull request #2891 from smititelu/increase_defines acc: increase extra and cdr variables --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_cdr.h Modified: src/modules/acc/acc_extra.c Modified: src/modules/acc/acc_extra.h Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f… Patch: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f…

2 1

git:master:38ae4433: drouting: remove unused trim function
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 38ae44336e8478c10e1a558997669850c5d7b297 URL: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:27:20+01:00 drouting: remove unused trim function --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Patch: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 0988bccbb7..55d09a57ca 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -45,34 +45,6 @@ static inline int strz2int(char *_bp) } -static inline char *trim(char *_s) -{ - int len; - char *end; - - /* Null pointer, there is nothing to do */ - if(!_s) - return _s; - - /* Remove spaces and tabs from the beginning of string */ - while((*_s == ' ') || (*_s == '\t')) - _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while((*end == ' ') || (*end == '\t')) - end--; - if(end != (_s + len - 1)) { - *(end + 1) = '\0'; - } - - return _s; -} - - /************************ imported from "ac_tm.c" ***************************/ /* #define USE_YWEEK_U // Sunday system

1 0

[kamailio/kamailio] time: add support for time64 libc (PR #2894)
by micmac1 03 Nov '21

03 Nov '21

libcs are implementing changes to fix the year 2038 issue on 32 bit platforms (see [1]). musl libc already went ahead and implemented it, starting with musl-1.2.0 (see [2]). This commit adds a new definition to src/core/dprint.h: TIME_T_INT_FMT If __USE_TIME_BITS64 is defined (by a time64 libc, see [1]), it is set to the proper conversion for type int64_t, PRId64. If __USE_TIME_BITS64 is not defined, the status quo remains unchanged ("%ld" is used). Note: In some places kamailio uses "%li" instead of "%ld". But in the context of printf etc. there is no difference, so this commit replaces "%li" with "%ld". The new definition is used in the different parts of kamailio, where appropriate. These changes get rid of the new warnings that appeared with musl-1.2.0. Below an example warning: In file included from auth_identity.c:50: auth_identity.c: In function 'check_date': ../../core/dprint.h:316:73: warning: format '%ld' expects argument of type 'long int', but argument 11 has type 'time_t' {aka 'long long int'} [-Wformat=] 316 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/dprint.h:340:25: note: in expansion of macro 'LOG_FX' 340 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/dprint.h:346:25: note: in expansion of macro 'LOG_FL' 346 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:349:25: note: in expansion of macro 'LOG_FP' 349 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ auth_identity.c:594:17: note: in expansion of macro 'LOG' 594 | LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%ld sec)\n", tnow - tmsg + glb_iauthval); | ^~~ [1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign [2] https://musl.libc.org/time64.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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  Hi all, This adds time64 libc support. Should be non-breaking, status quo remains. I hope you don't mind a made up a new patch category, "time". I did not run-test this (pretty busy right now). But the warnings go away. If absolutely run-testing is needed for this, let me know. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2894 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2894/commits/27175614787f6b05795f…">time: add support for time64 libc</a> -- File Changes -- M src/core/dprint.h (8) M src/modules/auth_identity/auth_identity.c (2) M src/modules/cdp/routing.c (4) M src/modules/db_redis/redis_dbase.c (2) M src/modules/ims_charging/ims_ro.c (2) M src/modules/ims_dialog/dlg_handlers.c (2) M src/modules/ims_icscf/scscf_list.c (4) M src/modules/ims_registrar_pcscf/notify.c (2) M src/modules/ims_registrar_pcscf/save.c (2) M src/modules/ims_registrar_scscf/registrar_notify.c (3) M src/modules/ims_registrar_scscf/save.c (2) M src/modules/ims_usrloc_scscf/impurecord.c (4) M src/modules/nat_traversal/nat_traversal.c (2) M src/modules/xhttp_pi/xhttp_pi_fnc.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2894.patch https://github.com/kamailio/kamailio/pull/2894.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2894

3 9

git:master:a7bcf5bc: xhttp_pi: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: a7bcf5bc2dafe797c0479d34df5e07d44d8dd438 URL: https://github.com/kamailio/kamailio/commit/a7bcf5bc2dafe797c0479d34df5e07d… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 xhttp_pi: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/a7bcf5bc2dafe797c0479d34df5e07d… Patch: https://github.com/kamailio/kamailio/commit/a7bcf5bc2dafe797c0479d34df5e07d… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index 5610e319bb..a11b3f40a2 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -3186,18 +3186,18 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) val_str.len = max_page_len - ctx->reply.body.len; if(db_time2str(values[j].val.time_val, val_str.s, &val_str.len)!=0){ - LM_ERR("Unable to convert double [%ld]\n", - values[j].val.time_val); + LM_ERR("Unable to convert double [%" TIME_T_FMT "]\n", + TIME_T_CAST(values[j].val.time_val)); goto error; } p += val_str.len; ctx->reply.body.len += val_str.len; if(link_on) XHTTP_PI_COPY_2(p,XHTTP_PI_SQUOT_GT,val_str); LM_DBG(" got %.*s[%d]=>" - "[%ld][%.*s]\n", + "[%" TIME_T_FMT "][%.*s]\n", command->q_keys[j]->len, command->q_keys[j]->s, i, - values[j].val.time_val, + TIME_T_CAST(values[j].val.time_val), val_str.len, val_str.s); break; default:

1 0

git:master:fe68c9ae: nat_traversal: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: fe68c9aeb06f114afdc6c0b076b5163e34deeea5 URL: https://github.com/kamailio/kamailio/commit/fe68c9aeb06f114afdc6c0b076b5163… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 nat_traversal: use TIME_T_FMT The size of the time_t destination is unknown as it is depending on the platform. So we "read into a known-size integer (either int or long long) and then assign the value to a time_t as a second step" (quote from [1]). [1] https://stackoverflow.com/questions/4171478/how-to-read-data-into-a-time-t-… Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/fe68c9aeb06f114afdc6c0b076b5163… Patch: https://github.com/kamailio/kamailio/commit/fe68c9aeb06f114afdc6c0b076b5163… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 4cfe8d4018..edaa6dfe3d 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1707,6 +1707,7 @@ static void restore_keepalive_state(void) unsigned h; str host; FILE *f; + long long ll_1, ll_2; if(!keepalive_state_file) return; @@ -1724,7 +1725,9 @@ static void restore_keepalive_state(void) res = fscanf(f, STATE_FILE_HEADER); // skip header while(true) { - res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime); + res = fscanf(f, "%63s %63s %" TIME_T_FMT " %" TIME_T_FMT, uri, socket, &ll_1, &ll_2); + rtime = ll_1; + stime = ll_2; if(res == EOF) { if(ferror(f)) LM_ERR("error while reading keepalive state file: %s\n",

1 0

git:master:eec965c1: ims_registrar_scscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: eec965c1eb561ab636fa385111f2f1a7885c438c URL: https://github.com/kamailio/kamailio/commit/eec965c1eb561ab636fa385111f2f1a… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_registrar_scscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/eec965c1eb561ab636fa385111f2f1a… Patch: https://github.com/kamailio/kamailio/commit/eec965c1eb561ab636fa385111f2f1a… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index b2da75af19..761b014624 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -54,6 +54,7 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_content.h" #include "../../core/parser/parse_uri.h" +#include "../../core/dprint.h" /* TIME_T_FMT */ #include <libxml/parser.h> #include "../../lib/ims/useful_defs.h" @@ -1517,8 +1518,8 @@ void create_notifications(udomain_t* _t, impurecord_t* r_passed, ucontact_t* c_p subscription_state.len = 0; if (subscription_state.s) { - sprintf(subscription_state.s, "%.*s%ld", subs_active.len, - subs_active.s, s->expires - act_time); + sprintf(subscription_state.s, "%.*s%" TIME_T_FMT, subs_active.len, + subs_active.s, TIME_T_CAST(s->expires - act_time)); subscription_state.len = strlen(subscription_state.s); } diff --git a/src/modules/ims_registrar_scscf/save.c b/src/modules/ims_registrar_scscf/save.c index e625cb25e3..6c8127d289 100644 --- a/src/modules/ims_registrar_scscf/save.c +++ b/src/modules/ims_registrar_scscf/save.c @@ -547,7 +547,7 @@ static inline int update_contacts_helper(struct sip_msg* msg, impurecord_t* impu LM_DBG("Need to update contact: <%.*s>: " "q_value [%d]," "sos: [%d]," - "expires [%ld]\n", chi->uri.len, chi->uri.s, qvalue, sos, expires - time(NULL)); + "expires [%" TIME_T_FMT "]\n", chi->uri.len, chi->uri.s, qvalue, sos, TIME_T_CAST(expires - time(NULL))); LM_DBG("packing contact information\n"); if ((ci = pack_ci(msg, chi, expires, 0)) == 0) {

1 0

git:master:58b99201: ims_usrloc_scscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 58b992011044bb3547e3aea15eb6712947daae0f URL: https://github.com/kamailio/kamailio/commit/58b992011044bb3547e3aea15eb6712… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_usrloc_scscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/58b992011044bb3547e3aea15eb6712… Patch: https://github.com/kamailio/kamailio/commit/58b992011044bb3547e3aea15eb6712… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index e0ad1f7ef9..a1cfd19833 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -244,7 +244,7 @@ void print_impurecord(FILE* _f, impurecord_t* _r) { header = 1; } fprintf(_f, "\t\twatcher uri: <%.*s> and presentity uri: <%.*s>\n", subscriber->watcher_uri.len, subscriber->watcher_uri.s, subscriber->presentity_uri.len, subscriber->presentity_uri.s); - fprintf(_f, "\t\tExpires: %ld\n", subscriber->expires); + fprintf(_f, "\t\tExpires: %" TIME_T_FMT "\n", TIME_T_CAST(subscriber->expires)); subscriber = subscriber->next; } @@ -405,8 +405,9 @@ static inline void process_impurecord(impurecord_t* _r) { hascontacts = 1; } } else { - LM_DBG("\t\tContact #%i - %.*s, Ref [%d] (expires in %ld seconds) (State: %d)\n", - k, ptr->c.len, ptr->c.s, ptr->ref_count, ptr->expires - act_time, ptr->state); + LM_DBG("\t\tContact #%i - %.*s, Ref [%d] (expires in %" TIME_T_FMT " seconds) (State: %d)\n", + k, ptr->c.len, ptr->c.s, ptr->ref_count, + TIME_T_CAST(ptr->expires - act_time), ptr->state); mustdeleteimpu = 0; hascontacts = 1; }

1 0

git:master:e4b280ec: ims_icscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: e4b280ec340135199e1c98e2e8b63042538c9aaa URL: https://github.com/kamailio/kamailio/commit/e4b280ec340135199e1c98e2e8b6304… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_icscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_icscf/scscf_list.c --- Diff: https://github.com/kamailio/kamailio/commit/e4b280ec340135199e1c98e2e8b6304… Patch: https://github.com/kamailio/kamailio/commit/e4b280ec340135199e1c98e2e8b6304… --- diff --git a/src/modules/ims_icscf/scscf_list.c b/src/modules/ims_icscf/scscf_list.c index fae8dc3201..1bb7cb5f8c 100644 --- a/src/modules/ims_icscf/scscf_list.c +++ b/src/modules/ims_icscf/scscf_list.c @@ -586,15 +586,16 @@ void ims_icscf_timer_routine() { sl = l->list; while (sl) { - LM_DBG("INF: Score:[%4d] Start_time [%ld] S-CSCF: <%.*s> \n", + LM_DBG("INF: Score:[%4d] Start_time [%" TIME_T_FMT "] S-CSCF: <%.*s> \n", sl->score, - sl->start_time, + TIME_T_CAST(sl->start_time), sl->scscf_name.len, sl->scscf_name.s); time_t now = time(0); time_t time_elapsed = now - sl->start_time; if (time_elapsed > scscf_entry_expiry) { - LM_DBG("Scscf entry expired: Time now %ld Start time %ld - elapsed %ld\n", now, sl->start_time, time_elapsed); + LM_DBG("Scscf entry expired: Time now %" TIME_T_FMT " Start time %" TIME_T_FMT " - elapsed %" TIME_T_FMT "\n", + TIME_T_CAST(now), TIME_T_CAST(sl->start_time), TIME_T_CAST(time_elapsed)); delete_list = 1; //if any of the entries in this list have expired remove the whole list! }

1 0

git:master:5d17337a: ims_registrar_pcscf: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 5d17337af532a03d3a36751c5d085dd542478e41 URL: https://github.com/kamailio/kamailio/commit/5d17337af532a03d3a36751c5d085dd… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_registrar_pcscf: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/5d17337af532a03d3a36751c5d085dd… Patch: https://github.com/kamailio/kamailio/commit/5d17337af532a03d3a36751c5d085dd… --- diff --git a/src/modules/ims_registrar_pcscf/notify.c b/src/modules/ims_registrar_pcscf/notify.c index 83c7a5c377..d8830fd2d5 100644 --- a/src/modules/ims_registrar_pcscf/notify.c +++ b/src/modules/ims_registrar_pcscf/notify.c @@ -209,8 +209,8 @@ int process_contact(udomain_t * _d, int expires, str contact_uri, int contact_st /*TODO_LATEST - put this back */ } else {//state is active //update this contact - LM_DBG("This contact: <%.*s> is in state active and is in usrloc so just updating - old expires: %li, new expires: %i which is in %i seconds\n", contact_uri.len, contact_uri.s, - pcontact->expires, + LM_DBG("This contact: <%.*s> is in state active and is in usrloc so just updating - old expires: %" TIME_T_FMT ", new expires: %i which is in %i seconds\n", contact_uri.len, contact_uri.s, + TIME_T_CAST(pcontact->expires), expires, expires - local_time_now); if (ul.update_pcontact(_d, &ci, pcontact) != 0) { diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 9432574005..b33a596cd2 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -223,8 +223,9 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma } //TODO_LATEST replace above } else { //update contact - LM_DBG("Updating contact: <%.*s>, old expires: %li, new expires: %i which is in %i seconds\n", c->uri.len, c->uri.s, - pcontact->expires-local_time_now, + LM_DBG("Updating contact: <%.*s>, old expires: %" TIME_T_FMT ", new expires: %i which is in %i seconds\n", + c->uri.len, c->uri.s, + TIME_T_CAST(pcontact->expires-local_time_now), expires, expires-local_time_now); ci.reg_state = PCONTACT_REGISTERED;

1 0

git:master:71d92b26: ims_charging: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 71d92b26105a4e88f4fba3986a0ba306e89adc4f URL: https://github.com/kamailio/kamailio/commit/71d92b26105a4e88f4fba3986a0ba30… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_charging: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/71d92b26105a4e88f4fba3986a0ba30… Patch: https://github.com/kamailio/kamailio/commit/71d92b26105a4e88f4fba3986a0ba30… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 0a8c53f9d9..d93d565a65 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -858,7 +858,8 @@ void send_ccr_stop_with_param(struct ro_session *ro_session, unsigned int code, LM_DBG("Final used number of seconds for session is %ld\n", used); } - LM_DBG("Call started at %ld and ended at %ld and lasted %d seconds and so far we have billed for %ld seconds\n", ro_session->start_time, stop_time, + LM_DBG("Call started at %" TIME_T_FMT " and ended at %" TIME_T_FMT " and lasted %d seconds and so far we have billed for %ld seconds\n", + TIME_T_CAST(ro_session->start_time), TIME_T_CAST(stop_time), actual_time_seconds, ro_session->billed + used); if (ro_session->billed + used < actual_time_seconds) { LM_DBG("Making adjustment by adding %ld seconds\n", actual_time_seconds - (ro_session->billed + used));

1 0

git:master:ee039a91: ims_dialog: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: ee039a91dd41a5780105305f6b787e95297da1d0 URL: https://github.com/kamailio/kamailio/commit/ee039a91dd41a5780105305f6b787e9… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 ims_dialog: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/ee039a91dd41a5780105305f6b787e9… Patch: https://github.com/kamailio/kamailio/commit/ee039a91dd41a5780105305f6b787e9… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 3d8dee7ff3..55f523b9a2 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -1867,7 +1867,7 @@ void internal_print_all_dlg(struct dlg_cell *dlg) { LM_DBG("----------------------------"); LM_DBG("Dialog h_entry:h_id = [%u : %u]\n", dlg->h_entry, dlg->h_id); - LM_DBG("Dialog age: %ld\n", act_time - dlg->init_ts); + LM_DBG("Dialog age: %" TIME_T_FMT "\n", TIME_T_CAST(act_time - dlg->init_ts)); LM_DBG("Dialog call-id: %.*s\n", dlg->callid.len, dlg->callid.s); LM_DBG("Dialog state: %d\n", dlg->state); LM_DBG("Dialog ref counter: %d\n", dlg->ref);

1 0

git:master:db16bd05: cdp: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: db16bd057342cb043b07913f89918fa09ff8632a URL: https://github.com/kamailio/kamailio/commit/db16bd057342cb043b07913f89918fa… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 cdp: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/cdp/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/db16bd057342cb043b07913f89918fa… Patch: https://github.com/kamailio/kamailio/commit/db16bd057342cb043b07913f89918fa… --- diff --git a/src/modules/cdp/routing.c b/src/modules/cdp/routing.c index 34347caa26..7dc97f1758 100644 --- a/src/modules/cdp/routing.c +++ b/src/modules/cdp/routing.c @@ -121,10 +121,10 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in } least_recent_time = peers[0]->last_selected; - LM_DBG("peer [%.*s] was last used @ %ld\n", peers[0]->fqdn.len, peers[0]->fqdn.s, peers[0]->last_selected); + LM_DBG("peer [%.*s] was last used @ %" TIME_T_FMT "\n", peers[0]->fqdn.len, peers[0]->fqdn.s, TIME_T_CAST(peers[0]->last_selected)); p = peers[0]; for (j = 1; j < peer_count; j++) { - LM_DBG("Peer [%.*s] was last used at [%ld]\n", peers[j]->fqdn.len, peers[j]->fqdn.s, peers[j]->last_selected); + LM_DBG("Peer [%.*s] was last used at [%" TIME_T_FMT "]\n", peers[j]->fqdn.len, peers[j]->fqdn.s, TIME_T_CAST(peers[j]->last_selected)); if (peers[j]->last_selected < least_recent_time) { least_recent_time = peers[j]->last_selected; p = peers[j];

1 0

git:master:e006a5b9: db_redis: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: e006a5b9ad0f47bfbc280de3b381d5b2dce6a4ce URL: https://github.com/kamailio/kamailio/commit/e006a5b9ad0f47bfbc280de3b381d5b… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 db_redis: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/e006a5b9ad0f47bfbc280de3b381d5b… Patch: https://github.com/kamailio/kamailio/commit/e006a5b9ad0f47bfbc280de3b381d5b… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c9a25adf36..f7e26e693e 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -142,7 +142,7 @@ static int db_redis_val2str(const db_val_t *v, str *_str) { _str->s[_str->len] = '\0'; break; case DB1_DATETIME: - LM_DBG("converting datetime value %ld to str\n", VAL_TIME(v)); + LM_DBG("converting datetime value %" TIME_T_FMT " to str\n", TIME_T_CAST(VAL_TIME(v))); _str->s = (char*)pkg_malloc(_str->len); if (!_str->s) goto memerr; localtime_r(&(VAL_TIME(v)), &_time);

1 0

git:master:bfe95c90: core: add support for time64 libcs
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: bfe95c90e91a0bc33a769967a5841a4ab43a6553 URL: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 core: add support for time64 libcs libcs are implementing changes to fix the year 2038 issue on 32 bit platforms (see [1]). musl libc already went ahead and implemented it, starting with musl-1.2.0 (see [2]). This commit adds the groundwork for always using the "lld" format when dealing with time_t and casting the values to be formatted to (long long). The aim is to be future proof and portable. Example warning when not using TIME_T_FMT while compiling for a 32 bit target using a time64 libc: In file included from auth_identity.c:50: auth_identity.c: In function 'check_date': ../../core/dprint.h:316:73: warning: format '%ld' expects argument of type 'long int', but argument 11 has type 'time_t' {aka 'long long int'} [-Wformat=] 316 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/dprint.h:340:25: note: in expansion of macro 'LOG_FX' 340 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/dprint.h:346:25: note: in expansion of macro 'LOG_FL' 346 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:349:25: note: in expansion of macro 'LOG_FP' 349 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ auth_identity.c:594:17: note: in expansion of macro 'LOG' 594 | LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%ld sec)\n", tnow - tmsg + glb_iauthval); | ^~~ [1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign [2] https://musl.libc.org/time64.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… Patch: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 65fcc6fc3c..fbdd349acb 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -35,6 +35,8 @@ #include "compiler_opt.h" #include "cfg_core.h" +#define TIME_T_FMT "lld" +#define TIME_T_CAST(x) ((long long)(x)) /** dicover the function name */ /* C >= 99 has __func__, older gcc versions have __FUNCTION__ */

1 0

git:master:e7571418: auth_identity: use TIME_T_FMT
by Daniel-Constantin Mierla 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: e75714181c907758d1793abb85258020337249d4 URL: https://github.com/kamailio/kamailio/commit/e75714181c907758d1793abb8525802… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 auth_identity: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/auth_identity/auth_identity.c --- Diff: https://github.com/kamailio/kamailio/commit/e75714181c907758d1793abb8525802… Patch: https://github.com/kamailio/kamailio/commit/e75714181c907758d1793abb8525802… --- diff --git a/src/modules/auth_identity/auth_identity.c b/src/modules/auth_identity/auth_identity.c index 63aae1620b..4b4bb4bb08 100644 --- a/src/modules/auth_identity/auth_identity.c +++ b/src/modules/auth_identity/auth_identity.c @@ -591,7 +591,7 @@ static int check_date(struct sip_msg* msg, char* srt1, char* str2) } if (tnow > tmsg + glb_iauthval) { - LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%ld sec)\n", tnow - tmsg + glb_iauthval); + LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%" TIME_T_FMT " sec)\n", TIME_T_CAST(tnow - tmsg + glb_iauthval)); return -4; } else LOG(AUTH_DBG_LEVEL, "AUTH_IDENTITY VERIFIER: Date header value OK\n");

1 0

git:master:98fde133: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 98fde133f6f00ec50ba2c287b798f6a062b10ac4 URL: https://github.com/kamailio/kamailio/commit/98fde133f6f00ec50ba2c287b798f6a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-03T13:01:41+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/98fde133f6f00ec50ba2c287b798f6a… Patch: https://github.com/kamailio/kamailio/commit/98fde133f6f00ec50ba2c287b798f6a… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index ac912c4921..540bd20d4d 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -125,6 +125,8 @@ Sven Knoblich 6.46. reason_from_hf (int) 6.47. clone_msg (int) 6.48. cdr_on_failed (int) + 6.49. acc_extra_size (int) + 6.50. cdr_extra_size (int) 7. Functions @@ -184,9 +186,11 @@ Sven Knoblich 1.46. reason_from_hf 1.47. clone_msg 1.48. cdr_on_failed - 1.49. acc_log_request usage - 1.50. acc_db_request usage - 1.51. acc_db_request usage + 1.49. acc_extra_size + 1.50. cdr_extra_size + 1.51. acc_log_request usage + 1.52. acc_db_request usage + 1.53. acc_db_request usage Chapter 1. Admin Guide @@ -279,6 +283,8 @@ Chapter 1. Admin Guide 6.46. reason_from_hf (int) 6.47. clone_msg (int) 6.48. cdr_on_failed (int) + 6.49. acc_extra_size (int) + 6.50. cdr_extra_size (int) 7. Functions @@ -674,6 +680,8 @@ $dlg_var(callee) = $avp(callee); #callee='C' 6.46. reason_from_hf (int) 6.47. clone_msg (int) 6.48. cdr_on_failed (int) + 6.49. acc_extra_size (int) + 6.50. cdr_extra_size (int) 6.1. early_media (integer) @@ -1321,6 +1329,30 @@ modparam("acc", "clone_msg", 0) modparam("acc", "cdr_on_failed", 0) ... +6.49. acc_extra_size (int) + + This parameter is meant to replace MAX_ACC_EXTRA fixed size with + desired size. + + Default value is 64 (MAX_ACC_EXTRA). + + Example 1.49. acc_extra_size +... +modparam("acc", "acc_extra_size", 100) +... + +6.50. cdr_extra_size (int) + + This parameter is meant to replace MAX_CDR_EXTRA fixed size with + desired size. + + Default value is 64 (MAX_CDR_EXTRA). + + Example 1.50. cdr_extra_size +... +modparam("acc", "cdr_extra_size", 100) +... + 7. Functions 7.1. acc_log_request(comment) @@ -1340,7 +1372,7 @@ modparam("acc", "cdr_on_failed", 0) This function can be used from ANY_ROUTE. - Example 1.49. acc_log_request usage + Example 1.51. acc_log_request usage ... acc_log_request("Some comment"); $var(code) = 404; @@ -1362,7 +1394,7 @@ acc_log_request("$var(code) Error: $avp(reason)"); This function can be used from ANY_ROUTE. - Example 1.50. acc_db_request usage + Example 1.52. acc_db_request usage ... acc_db_request("Some comment", "SomeTable"); acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); @@ -1386,7 +1418,7 @@ acc_db_request("$var(code) Error: $avp(reason)", "SomeTable"); This function can be used from ANY_ROUTE. - Example 1.51. acc_db_request usage + Example 1.53. acc_db_request usage ... acc_request("100 Received", "acc"); acc_request("100 Received", "acc_$time(year)_$time(mon)");

1 0

[kamailio/kamailio] core, acc: increase define values (PR #2891)
by Stefan Mititelu 03 Nov '21

03 Nov '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [ ] 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  Hello. I want to ask if increasing this #define(s) are feasible to commit upstream? We've come to the case where need at least +16 more for acc module and at least +8 more for core branches. Not sure if other people would need this. 1. If yes, let me know if i should split it in 2 commits, one for core and one for acc module 2. If no, please close this PR Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2891 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2891/commits/378cfd7d02243544807a…">core, acc: increase define values</a> -- File Changes -- M src/core/config.h (2) M src/modules/acc/acc_api.h (2) M src/modules/acc/acc_cdr.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2891.patch https://github.com/kamailio/kamailio/pull/2891.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2891

2 14

git:master:d30d7e19: acc: increase acc and cdr extra values
by Stefan Mititelu 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: d30d7e19e57f3b9645da7235389ea43f823d5562 URL: https://github.com/kamailio/kamailio/commit/d30d7e19e57f3b9645da7235389ea43… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-28T13:41:10+03:00 acc: increase acc and cdr extra values --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_cdr.h Modified: src/modules/acc/acc_extra.c Modified: src/modules/acc/acc_extra.h Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d30d7e19e57f3b9645da7235389ea43… Patch: https://github.com/kamailio/kamailio/commit/d30d7e19e57f3b9645da7235389ea43…

1 0

[kamailio/kamailio] core: fixed route hash table cleanup (PR #2896)
by sergey-safarov 03 Nov '21

03 Nov '21

#### 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 - [x] Tested changes locally - [x] Related to issue #2892 #### Description When Kamailio goes to shutdown then routing hash table cleaned properly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2896 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2896/commits/ce6453920f4a28d79e0d…">core: fixed route hash table cleanup</a> -- File Changes -- M src/core/route.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2896.patch https://github.com/kamailio/kamailio/pull/2896.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2896

2 2

git:master:8d22d827: core: fixed route hash table cleanup
by Sergey Safarov 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 8d22d827d93f7fd5a9a29ee83d30c3b297c02241 URL: https://github.com/kamailio/kamailio/commit/8d22d827d93f7fd5a9a29ee83d30c3b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-23T19:44:57+03:00 core: fixed route hash table cleanup --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/8d22d827d93f7fd5a9a29ee83d30c3b… Patch: https://github.com/kamailio/kamailio/commit/8d22d827d93f7fd5a9a29ee83d30c3b… --- diff --git a/src/core/route.c b/src/core/route.c index ad2fa66e64..f520804312 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -91,8 +91,11 @@ inline static void destroy_rlist(struct route_list* rt) rt->entries=0; } if (rt->names.table){ - clist_foreach_safe(rt->names.table, e, tmp, next){ - pkg_free(e); + int i; + for(i = 0; i < RT_HASH_SIZE; i++) { + clist_foreach_safe(&rt->names.table[i], e, tmp, next) { + pkg_free(e); + } } pkg_free(rt->names.table); rt->names.table=0;

1 0

git:master:579853ec: Merge pull request #2896 from sergey-safarov/GH2892
by GitHub 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 579853ec6d6f2237641da7d80099f3ba996d6806 URL: https://github.com/kamailio/kamailio/commit/579853ec6d6f2237641da7d80099f3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-03T12:58:14+01:00 Merge pull request #2896 from sergey-safarov/GH2892 core: fixed route hash table cleanup --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/579853ec6d6f2237641da7d80099f3b… Patch: https://github.com/kamailio/kamailio/commit/579853ec6d6f2237641da7d80099f3b… --- diff --git a/src/core/route.c b/src/core/route.c index ad2fa66e64..f520804312 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -91,8 +91,11 @@ inline static void destroy_rlist(struct route_list* rt) rt->entries=0; } if (rt->names.table){ - clist_foreach_safe(rt->names.table, e, tmp, next){ - pkg_free(e); + int i; + for(i = 0; i < RT_HASH_SIZE; i++) { + clist_foreach_safe(&rt->names.table[i], e, tmp, next) { + pkg_free(e); + } } pkg_free(rt->names.table); rt->names.table=0;

1 0

[kamailio/kamailio] core: add new param sip_parser_oneline (PR #2904)
by Stefan Mititelu 03 Nov '21

03 Nov '21

#### 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  If this param is enabled, will log SIP headers with comma instead of \r\n, when some error happens. Default is disabled. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2904 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2904/commits/901ddcf7c1eef3e7e2eb…">core: add new param sip_parser_oneline</a> -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (3) M src/core/cfg_core.c (3) M src/core/cfg_core.h (1) M src/core/parser/msg_parser.c (28) M src/core/parser/msg_parser.h (5) M src/core/parser/parse_via.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2904.patch https://github.com/kamailio/kamailio/pull/2904.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2904

2 9

git:master:060a0937: core: add new param sip_parser_log_oneline
by Stefan Mititelu 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: 060a09377d3ab5f8ab62ec408a1fc2b87bf91c81 URL: https://github.com/kamailio/kamailio/commit/060a09377d3ab5f8ab62ec408a1fc2b… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-11-01T13:34:52+02:00 core: add new param sip_parser_log_oneline To log SIP headers with . instead of \r\n. --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/060a09377d3ab5f8ab62ec408a1fc2b… Patch: https://github.com/kamailio/kamailio/commit/060a09377d3ab5f8ab62ec408a1fc2b…

1 0

git:master:a5c96e80: Merge pull request #2904 from smititelu/parser_crlf_log
by GitHub 03 Nov '21

03 Nov '21

Module: kamailio Branch: master Commit: a5c96e8008ba7aa19ff61ae4661eb0be7df334fb URL: https://github.com/kamailio/kamailio/commit/a5c96e8008ba7aa19ff61ae4661eb0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-03T12:57:18+01:00 Merge pull request #2904 from smititelu/parser_crlf_log core: add new param sip_parser_oneline --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c96e8008ba7aa19ff61ae4661eb0b… Patch: https://github.com/kamailio/kamailio/commit/a5c96e8008ba7aa19ff61ae4661eb0b…

1 0

git:master:426ea853: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: 426ea8532dfef7db4831e850086ea426aa57a490 URL: https://github.com/kamailio/kamailio/commit/426ea8532dfef7db4831e850086ea42… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-01T14:16:10+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/426ea8532dfef7db4831e850086ea42… Patch: https://github.com/kamailio/kamailio/commit/426ea8532dfef7db4831e850086ea42… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index da1da0331c..ac912c4921 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1071,9 +1071,12 @@ modparam("acc", "db_insert_mode", 1) 6.30. cdr_enable (integer) - Should CDR-based logging be enabled? + Enable CDR reporting - one record per call reported to "acc_cdrs" + table, relying on dialog module. - 0 - off (default). 1 - on. + The value can be: + * 0 - off (default). + 1 - on. Example 1.30. cdr_enable example ... diff --git a/src/modules/acc_json/README b/src/modules/acc_json/README index 8897fe609a..e2192ec375 100644 --- a/src/modules/acc_json/README +++ b/src/modules/acc_json/README @@ -41,7 +41,7 @@ Julien Chavanton 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -92,7 +92,7 @@ Chapter 1. Admin Guide 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -142,7 +142,7 @@ Chapter 1. Admin Guide 3.8. acc_output_syslog (integer) 3.9. acc_log_facility (integer) 3.10. acc_log_level (integer) - 3.11. cdr_enable (str) + 3.11. cdr_enable (int) 3.12. cdr_extra (str) 3.13. cdr_json_pre_encoded_prefix (string) 3.14. cdr_expired_dlg_enable (str) @@ -325,11 +325,14 @@ modparam("acc_json", "acc_log_facility", "LOG_LOCAL0") modparam("acc_json", "acc_log_level", 2) # Set acc_log_level to 2 (L_INFO) ... -3.11. cdr_enable (str) +3.11. cdr_enable (int) - Enable Call Data Record generation. + Enable CDR reporting - one record per call is reported, relying on + dialog module. - Default value is 0 (disabled). + The value can be: + * 0 - off (default). + 1 - on. Example 1.11. cdr_enable example ...

1 0

git:master:041999bc: acc_json: docs - more details about cdr_enable parameter
by Daniel-Constantin Mierla 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: 041999bc8092d7abb42e68a5f5fb88bef09b225c URL: https://github.com/kamailio/kamailio/commit/041999bc8092d7abb42e68a5f5fb88b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-01T14:12:02+01:00 acc_json: docs - more details about cdr_enable parameter --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/041999bc8092d7abb42e68a5f5fb88b… Patch: https://github.com/kamailio/kamailio/commit/041999bc8092d7abb42e68a5f5fb88b… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 0f07b42e23..a794cae801 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -324,12 +324,19 @@ modparam("acc_json", "acc_log_level", 2) # Set acc_log_level to 2 (L_INFO) </section> <section id="acc.p.cdr_enable"> - <title><varname>cdr_enable</varname> (str)</title> + <title><varname>cdr_enable</varname> (int)</title> <para> - Enable Call Data Record generation. + Enable CDR reporting - one record per call is reported, + relying on dialog module. </para> <para> - Default value is 0 (disabled). + The value can be: + <itemizedlist> + <listitem> + <para>0 - off (default).</para> + <para>1 - on.</para> + </listitem> + </itemizedlist> </para> <example> <title>cdr_enable example</title>

1 0

git:master:808e58c4: acc: docs - more details about cdr_enable parameter
by Daniel-Constantin Mierla 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: 808e58c4e9b785a58fd5cfd084089a217d0f96c3 URL: https://github.com/kamailio/kamailio/commit/808e58c4e9b785a58fd5cfd084089a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-01T14:05:46+01:00 acc: docs - more details about cdr_enable parameter --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/808e58c4e9b785a58fd5cfd084089a2… Patch: https://github.com/kamailio/kamailio/commit/808e58c4e9b785a58fd5cfd084089a2… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 41935c8dae..93628f4166 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1044,11 +1044,17 @@ modparam("acc", "db_insert_mode", 1) <section id="acc.p.cdr_enable"> <title><varname>cdr_enable</varname> (integer)</title> <para> - Should CDR-based logging be enabled? + Enable CDR reporting - one record per call reported to "acc_cdrs" table, + relying on dialog module. </para> <para> - 0 - off (default). - 1 - on. + The value can be: + <itemizedlist> + <listitem> + <para>0 - off (default).</para> + <para>1 - on.</para> + </listitem> + </itemizedlist> </para> <example> <title>cdr_enable example</title>

1 0

git:master:5265ae27: modules: readme files regenerated - ims_registrar_scscf ... [skip ci]
by Kamailio Dev 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: 5265ae27f1acd82bfebd56ea765b2ad6f22d734b URL: https://github.com/kamailio/kamailio/commit/5265ae27f1acd82bfebd56ea765b2ad… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-01T10:16:21+01:00 modules: readme files regenerated - ims_registrar_scscf ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/5265ae27f1acd82bfebd56ea765b2ad… Patch: https://github.com/kamailio/kamailio/commit/5265ae27f1acd82bfebd56ea765b2ad… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index e5bd47f275..74bf059d4d 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -47,7 +47,7 @@ Richard Good 4. Functions - 4.1. save(async_reply_route, domain) + 4.1. save(async_reply_route, domain, mode, flags) 4.2. lookup(domain) 4.3. lookup_path_to_contact(uri) 4.4. unregister(domain) @@ -143,7 +143,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. save(async_reply_route, domain) + 4.1. save(async_reply_route, domain, mode, flags) 4.2. lookup(domain) 4.3. lookup_path_to_contact(uri) 4.4. unregister(domain) @@ -487,7 +487,7 @@ om") 4. Functions - 4.1. save(async_reply_route, domain) + 4.1. save(async_reply_route, domain, mode, flags) 4.2. lookup(domain) 4.3. lookup_path_to_contact(uri) 4.4. unregister(domain) @@ -501,7 +501,7 @@ om") 4.12. can_publish_reg(domain) 4.13. publish_reg(domain) -4.1. save(async_reply_route, domain) +4.1. save(async_reply_route, domain, mode, flags) The function processes a REGISTER message. It can add, remove or modify usrloc records depending on Contact and Expires HFs in the REGISTER @@ -517,6 +517,9 @@ om") completed. This is required because the save function is executed asynchronously (Diameter). * domain- Logical domain within registrar. + * mode- Optional and unused legacy parameter. + * flags- Optional parameter. Valid values: 0x01 - Realm is not used + when extracting Private Identity from the Authorization header. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE

1 0

[kamailio/kamailio] ims_registrar_scscf: Extend save() with optional flag (PR #2907)
by alexyosifov 01 Nov '21

01 Nov '21

Add a new flag as optional parameter for save() method. The flag contains one value: DO_NOT_USE_REALM_FOR_PRIVATE_IDENTITY 0x01. No changes save() when parameter is not present.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2907 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2907/commits/85f4de73ff4dcbbe8d13…">ims_registrar_scscf: Extend save() with optional flag</a> -- File Changes -- M src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c (72) M src/modules/ims_registrar_scscf/save.c (21) M src/modules/ims_registrar_scscf/save.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2907.patch https://github.com/kamailio/kamailio/pull/2907.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2907

2 5

git:master:be8bfc31: Merge pull request #2907 from alexyosifov/extend_ims_reg_scscf_save
by GitHub 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: be8bfc3107934fae30eaf48434e6dab9be5fbfb8 URL: https://github.com/kamailio/kamailio/commit/be8bfc3107934fae30eaf48434e6dab… Author: carstenbock <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-01T10:02:21+01:00 Merge pull request #2907 from alexyosifov/extend_ims_reg_scscf_save ims_registrar_scscf: Extend save() with optional flag --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/save.c Modified: src/modules/ims_registrar_scscf/save.h --- Diff: https://github.com/kamailio/kamailio/commit/be8bfc3107934fae30eaf48434e6dab… Patch: https://github.com/kamailio/kamailio/commit/be8bfc3107934fae30eaf48434e6dab…

1 0

git:master:a627c9a0: ims_registrar_scscf: Extend save() with optional flag
by Aleksandar Yosifov 01 Nov '21

01 Nov '21

Module: kamailio Branch: master Commit: a627c9a04a74b48760441be3411f75325f1cb2f2 URL: https://github.com/kamailio/kamailio/commit/a627c9a04a74b48760441be3411f753… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2021-11-01T10:07:10+02:00 ims_registrar_scscf: Extend save() with optional flag Add a new flag as optional parameter for save() method. The flag contains one value: DO_NOT_USE_REALM_FOR_PRIVATE_IDENTITY 0x01. No changes save() when parameter is not present. --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/save.c Modified: src/modules/ims_registrar_scscf/save.h --- Diff: https://github.com/kamailio/kamailio/commit/a627c9a04a74b48760441be3411f753… Patch: https://github.com/kamailio/kamailio/commit/a627c9a04a74b48760441be3411f753…

1 0

[kamailio/kamailio] statsd: remove '\r\n' from xlog messages (PR #2911)
by Victor Seva 29 Oct '21

29 Oct '21

#### 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 #### Description When the module is loaded the messages have '\r\n' > INFO: statsd [statsd.c:87]: mod_init(): Statsd init ip value 127.0.0.1 #015 > INFO: statsd [statsd.c:93]: mod_init(): Statsd init port value 8125#015 > INFO: statsd [statsd.c:101]: mod_init(): Statsd: success connection to statsd server while at it, format the code with our clang-format definition You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2911 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2911/commits/fd9409e70401d31b16af…">statsd: clang-format</a> * <a href="https://github.com/kamailio/kamailio/pull/2911/commits/8fca0fb9bf4f83ba67fc…">statsd: remove '\r\n' from xlog messages</a> -- File Changes -- M src/modules/statsd/lib_statsd.c (209) M src/modules/statsd/lib_statsd.h (9) M src/modules/statsd/statsd.c (217) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2911.patch https://github.com/kamailio/kamailio/pull/2911.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2911

2 2

git:master:c9b6d3c6: pkg/kamailio/obs: updated modules list
by Sergey Safarov 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: c9b6d3c62636bfc654227f97b5ce54d0b1b909e4 URL: https://github.com/kamailio/kamailio/commit/c9b6d3c62636bfc654227f97b5ce54d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-29T18:28:39+03:00 pkg/kamailio/obs: updated modules list --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c9b6d3c62636bfc654227f97b5ce54d… Patch: https://github.com/kamailio/kamailio/commit/c9b6d3c62636bfc654227f97b5ce54d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index b68df0eef5..5e15376879 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -214,6 +214,7 @@ Conflicts: kamailio-auth-ephemeral < %ver, kamailio-bdb < %ver Conflicts: kamailio-carrierroute < %ver, kamailio-cpl < %ver Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver +Conflicts: kamailio-http_client < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver @@ -225,6 +226,7 @@ Conflicts: kamailio-python < %ver Conflicts: kamailio-radius < %ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-ruby < %ver Conflicts: kamailio-sctp < %ver, kamailio-secfilter < %ver, kamailio-sipdump < %ver +Conflicts: kamailio-slack < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver Conflicts: kamailio-tls < %ver, kamailio-unixodbc < %ver Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver @@ -906,6 +908,23 @@ Requires: kamailio = %ver This module serializes SIP message attributes into a JSON document +%package slack +Summary: Slack integration module for Kamailio +Group: %{PKGGROUP} + +Requires: kamailio = %ver, kamailio-http_client = %ver +%if 0%{?suse_version} +Requires: libcurl4 +BuildRequires: libcurl-devel +%else +Requires: libcurl +BuildRequires: libcurl-devel +%endif + +%description slack +This module provides integration with Slack over webhooks. + + %package smsops Summary: Tools for handling SMS packets in SIP messages Group: %{PKGGROUP} @@ -1458,11 +1477,11 @@ fi %doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.lrkproxy -%doc %{_docdir}/kamailio/modules/README.malloc_test %doc %{_docdir}/kamailio/modules/README.mangler %doc %{_docdir}/kamailio/modules/README.matrix %doc %{_docdir}/kamailio/modules/README.maxfwd %doc %{_docdir}/kamailio/modules/README.mediaproxy +%doc %{_docdir}/kamailio/modules/README.misctest %doc %{_docdir}/kamailio/modules/README.mohqueue %doc %{_docdir}/kamailio/modules/README.mqueue %doc %{_docdir}/kamailio/modules/README.msilo @@ -1477,6 +1496,7 @@ fi %doc %{_docdir}/kamailio/modules/README.permissions %doc %{_docdir}/kamailio/modules/README.pike %doc %{_docdir}/kamailio/modules/README.pipelimit +%doc %{_docdir}/kamailio/modules/README.posops %doc %{_docdir}/kamailio/modules/README.prefix_route %doc %{_docdir}/kamailio/modules/README.print %doc %{_docdir}/kamailio/modules/README.print_lib @@ -1617,11 +1637,11 @@ fi %{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/lrkproxy.so -%{_libdir}/kamailio/modules/malloc_test.so %{_libdir}/kamailio/modules/mangler.so %{_libdir}/kamailio/modules/matrix.so %{_libdir}/kamailio/modules/maxfwd.so %{_libdir}/kamailio/modules/mediaproxy.so +%{_libdir}/kamailio/modules/misctest.so %{_libdir}/kamailio/modules/mohqueue.so %{_libdir}/kamailio/modules/mqueue.so %{_libdir}/kamailio/modules/msilo.so @@ -1636,6 +1656,7 @@ fi %{_libdir}/kamailio/modules/permissions.so %{_libdir}/kamailio/modules/pike.so %{_libdir}/kamailio/modules/pipelimit.so +%{_libdir}/kamailio/modules/posops.so %{_libdir}/kamailio/modules/prefix_route.so %{_libdir}/kamailio/modules/print.so %{_libdir}/kamailio/modules/print_lib.so @@ -2182,6 +2203,12 @@ fi %{_libdir}/kamailio/modules/sipjson.so +%files slack +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.slack +%{_libdir}/kamailio/modules/slack.so + + %files snmpstats %defattr(-,root,root) %{_docdir}/kamailio/modules/README.snmpstats

1 0

git:5.4:106997d1: pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1
by Sergey Safarov 29 Oct '21

29 Oct '21

Module: kamailio Branch: 5.4 Commit: 106997d1d1924c987f7e6d2ff32c4d40d7ee0e10 URL: https://github.com/kamailio/kamailio/commit/106997d1d1924c987f7e6d2ff32c4d4… Author: SPChan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-29T18:20:25+03:00 pkg: enable RHEL7-like distros to build with OpenSSL 1.1.1 (cherry picked from commit ecc2cc69b08e797ca954af233c229ed44475ce33) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/106997d1d1924c987f7e6d2ff32c4d4… Patch: https://github.com/kamailio/kamailio/commit/106997d1d1924c987f7e6d2ff32c4d4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 695c46797c..f99f13696d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -217,6 +217,11 @@ %define _rundir %{_localstatedir}/run %endif +# build with openssl 1.1.1 on RHEL 7 based dists +%if 0%{?rhel} == 7 +%bcond_with openssl11 +%endif + # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370 %if 0%{?suse_version} == 1315 %define _sharedstatedir /var/lib @@ -324,8 +329,13 @@ Account transaction information in a JSON dictionary. %package auth-ephemeral Summary: Functions for authentication using ephemeral credentials Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description auth-ephemeral Functions for authentication using ephemeral credentials. @@ -410,9 +420,14 @@ Requires: openssl BuildRequires: openssl-devel %endif %if 0%{?rhel} == 7 +%if %{with openssl11} +Requires: openssl11-libs +BuildRequires: openssl11-devel +%else Requires: openssl-libs BuildRequires: openssl-devel %endif +%endif %if 0%{?fedora} Requires: openssl-libs BuildRequires: openssl-devel @@ -706,8 +721,13 @@ MySQL database connectivity for Kamailio. %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description outbound RFC 5626, "Managing Client-Initiated Connections in the Session Initiation @@ -985,8 +1005,13 @@ SQLite database connectivity for Kamailio. %package tls Summary: TLS transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: openssl11, kamailio = %ver +BuildRequires: openssl11-devel +%else Requires: openssl, kamailio = %ver BuildRequires: openssl-devel +%endif %description tls TLS transport for Kamailio. @@ -1041,8 +1066,13 @@ Non-SIP utitility functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio Group: %{PKGGROUP} +%if 0%{?rhel} == 7 && %{with openssl11} +Requires: libunistring, openssl11, kamailio = %ver +BuildRequires: libunistring-devel, openssl11-devel +%else Requires: libunistring, openssl, kamailio = %ver BuildRequires: libunistring-devel, openssl-devel +%endif %description websocket WebSocket transport for Kamailio. @@ -1139,6 +1169,9 @@ make cfg prefix=/usr \ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif @@ -1231,6 +1264,9 @@ rm -rf %{buildroot} make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ +%if %{with openssl11} + SSL_BUILDER="pkg-config libssl11" \ +%endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ %endif

1 0

git:master:375f86b6: posops: safety check for change anchor
by Daniel-Constantin Mierla 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 375f86b69e11cf835ae919873d3cd56f32d589c8 URL: https://github.com/kamailio/kamailio/commit/375f86b69e11cf835ae919873d3cd56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-29T13:28:07+02:00 posops: safety check for change anchor --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/375f86b69e11cf835ae919873d3cd56… Patch: https://github.com/kamailio/kamailio/commit/375f86b69e11cf835ae919873d3cd56… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 5710b83da2..465d6490ed 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -186,6 +186,10 @@ static int ki_posops_pos_append(sip_msg_t *msg, int idx, str *val) } anchor = anchor_lump(msg, offset, 0, 0); + if(anchor == NULL) { + LM_ERR("failed to create the anchor\n"); + return -1; + } if (insert_new_lump_after(anchor, val->s, val->len, 0) == 0) { LM_ERR("unable to add lump\n"); return -1; @@ -241,6 +245,10 @@ static int ki_posops_pos_insert(sip_msg_t *msg, int idx, str *val) } anchor = anchor_lump(msg, offset, 0, 0); + if(anchor == NULL) { + LM_ERR("failed to create the anchor\n"); + return -1; + } if (insert_new_lump_before(anchor, val->s, val->len, 0) == 0) { LM_ERR("unable to add lump\n"); return -1;

1 0

git:master:6cd61dfa: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 6cd61dfa949ae6288f480efcb72fdb8bb344d93f URL: https://github.com/kamailio/kamailio/commit/6cd61dfa949ae6288f480efcb72fdb8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-29T12:46:23+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/6cd61dfa949ae6288f480efcb72fdb8… Patch: https://github.com/kamailio/kamailio/commit/6cd61dfa949ae6288f480efcb72fdb8… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index a9caf8951f..4944f8abaa 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -489,6 +489,7 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * tm module - (optional) if you want to have rtpengine_manage() fully functional + lwsc module - (optional) if you plan to use “wsapi” parameter 3.2. External Libraries or Applications

1 0

git:master:a602c26f: rtpengine: update dependencies
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: a602c26fe3c83a0f1b825927be145459a08730e2 URL: https://github.com/kamailio/kamailio/commit/a602c26fe3c83a0f1b825927be14545… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T12:35:25+02:00 rtpengine: update dependencies lwsc module is needed if wsapi parameter is set https://lists.kamailio.org/pipermail/sr-users/2021-October/113494.html --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a602c26fe3c83a0f1b825927be14545… Patch: https://github.com/kamailio/kamailio/commit/a602c26fe3c83a0f1b825927be14545… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index c3201bbf37..234fd1fa21 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -120,6 +120,10 @@ <emphasis>tm module</emphasis> - (optional) if you want to have rtpengine_manage() fully functional </para> + <para> + <emphasis>lwsc module</emphasis> - (optional) if you plan to use + <quote>wsapi</quote> parameter + </para> </listitem> </itemizedlist> </para>

1 0

[kamailio/kamailio] Memory leak in tcpconn_new() kamailio 5.5.2 (#2880)
by Nacho G. 29 Oct '21

29 Oct '21

### Description  I found a memory leak which is causing some issues for us in our production. I think I was able to reproduce it and determine that this is happening when we set up an MSRP connection, and that connection is closed due to inactivity (for example when `tcp_connection_lifetime` is triggered). This issue is the same one than #2875 but with latest supported Kamailio version. ### Troubleshooting #### Reproduction  In this environment we have a WebRTC SIP client, connected to Kamailio and a second party using SIP, both sending messages each via MSRP protocol. Web Client and SIP client establish a session normally, all fine here, they can communicate. At this point we have this status: ``` TESTER|centos8.4|tester21 [2021-10-11][12:49:24] [/home/vagrant]$ sudo netstat -natp | grep 10.22.22 tcp 0 0 10.22.22.21:5060 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10000 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:8080 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10001 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10002 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:8080 10.22.22.1:58530 ESTABLISHED 14653/kamailio tcp 0 0 10.22.22.21:10000 10.22.22.190:42530 ESTABLISHED 14714/kamailio tcp 0 0 10.22.22.21:8080 10.22.22.1:58532 ESTABLISHED 14704/kamailio TESTER|centos8.4|tester21 [2021-10-11][12:49:39] [/home/vagrant]$ kamcmd -s udp:127.0.0.1:2046 mod.stats core all | grep tcp tcpconn_new(1134): 199392 init_tcp(4962): 8192 init_tcp(4956): 32768 init_tcp(4947): 8 init_tcp(4940): 8 init_tcp(4933): 8 init_tcp(4927): 8 init_tcp(4915): 8 ``` In order to trigger this failure much faster, I set `tcp_connection_lifetime=60`. Then we just wait 60 seconds to let the TCP connections closed. Then we finish the session, and stop our WebClient registering, so all connections are cleaned up. ``` TESTER|centos8.4|tester21 [2021-10-11][12:50:33] [/home/vagrant]$ sudo netstat -natp | grep 10.22.22 tcp 0 0 10.22.22.21:5060 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10000 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:8080 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10001 0.0.0.0:* LISTEN 14714/kamailio tcp 0 0 10.22.22.21:10002 0.0.0.0:* LISTEN 14714/kamailio TESTER|centos8.4|tester21 [2021-10-11][12:51:34] [/home/vagrant]$ kamcmd -s udp:127.0.0.1:2046 mod.stats core all | grep tcp tcpconn_new(1134): 66464 init_tcp(4962): 8192 init_tcp(4956): 32768 init_tcp(4947): 8 init_tcp(4940): 8 init_tcp(4933): 8 init_tcp(4927): 8 init_tcp(4915): 8 ``` As you can see there are no connections but there is memory allocated by `tcpconn_new`. I know this is related to the MSRP because we noticed our SIP Web Client is not closing the socket, so we just wait for Kamailio to close it. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 2021-07-25T23:54:41Z ERROR ERROR: <core> [mem/f_malloc.c:415]: fm_search_defrag(): fm_search_defrag(0x7f39a284c000, 66288); Free fragment not found! 2021-07-25T23:54:41Z ERROR ERROR: <core> [mem/f_malloc.c:498]: fm_malloc(): fm_malloc(0x7f39a284c000, 66288) called from core: tcp_main.c: tcpconn_new(957), module: core; Free fragment not found! 2021-07-25T23:54:41Z ERROR ERROR: <core> [tcp_main.c:959]: tcpconn_new(): mem. allocation failure 2021-07-25T23:54:41Z ERROR ERROR: <core> [tcp_main.c:3985]: handle_new_connect(): tcpconn_new failed, closing socket ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: intcc 5.5.2 (x86_64/linux) 55e232 flags: , EXTRA_DEBUGUSE_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, DBG_QM_MALLOC, 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: 55e232 compiled on 12:15:14 Oct 11 2021 with gcc 8.4.1 ``` * **Operating System**:  ``` TESTER|centos8.4|tester21 [2021-10-11][13:52:47] [/home/vagrant]$ uname -a Linux tester21 4.18.0-305.19.1.el8_4.x86_64 #1 SMP Wed Sep 15 15:39:39 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux centos 8 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2880

3 3

git:5.4:9ed21cd1: pv_headers: don't try to replace header
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: 5.4 Commit: 9ed21cd119739bb2768518d15fef98b65f5eaa45 URL: https://github.com/kamailio/kamailio/commit/9ed21cd119739bb2768518d15fef98b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T12:06:13+02:00 pv_headers: don't try to replace header Multiple headers where not removed if new value was just one header. (cherry picked from commit 09981c41cb6685fa18f61b9e7d66339917c4f097) --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h --- Diff: https://github.com/kamailio/kamailio/commit/9ed21cd119739bb2768518d15fef98b… Patch: https://github.com/kamailio/kamailio/commit/9ed21cd119739bb2768518d15fef98b… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 90feddeefde..fcc5b6a00b9 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -272,12 +272,6 @@ int pvh_apply_headers(struct sip_msg *msg) } if(!str_hash_case_get(&rm_hdrs, sub->name.s, sub->name.len)) { - if(!pvh_avp_is_null(sub) && xavi_count(&sub->name, &sub) == 1) { - LM_DBG("replace header[%s]: %s\n", sub->name.s, sub->val.v.s.s); - pvh_real_hdr_replace(msg, &sub->name, &sub->val.v.s); - pvh_str_hash_add_key(&rm_hdrs, &sub->name); - continue; - } LM_DBG("remove header[%s]: %s\n", sub->name.s, sub->val.v.s.s); pvh_real_hdr_del_by_name(msg, &sub->name); pvh_str_hash_add_key(&rm_hdrs, &sub->name); diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index d83a646c0db..31c09b4b5da 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,80 +131,6 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue) -{ - struct lump *anchor = NULL; - hdr_field_t *hf = NULL; - str new_h = STR_NULL; - int new = 1; - - if(hname->s == NULL || hvalue->s == NULL) { - LM_ERR("header name/value cannot be empty"); - return -1; - } - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - if(hf->body.len == hvalue->len - && strncasecmp(hf->body.s, hvalue->s, hvalue->len) == 0) { - return 1; - } - new = 0; - break; - } - if(!hf->next) - break; - } - - if(hf == NULL) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(new == 0) { - if((anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0)) == 0) { - LM_ERR("unable to delete header lump\n"); - return -1; - } - } else { - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); - } - - if(anchor == 0) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(pvh_create_hdr_str(hname, hvalue, &new_h) <= 0) - return -1; - - if(insert_new_lump_after(anchor, new_h.s, new_h.len, 0) == 0) { - LM_ERR("cannot insert header lump\n"); - pkg_free(new_h.s); - return -1; - } - - LM_DBG("%s header: %.*s\n", new ? "append" : "replace", new_h.len, new_h.s); - - return 1; -} - -int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) -{ - hdr_field_t *hf = NULL; - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, - hf->body.len, hf->body.s); - del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - } - } - return 1; -} - int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL; diff --git a/src/modules/pv_headers/pvh_hdr.h b/src/modules/pv_headers/pvh_hdr.h index 4f869538238..a5ad4157f9d 100644 --- a/src/modules/pv_headers/pvh_hdr.h +++ b/src/modules/pv_headers/pvh_hdr.h @@ -38,7 +38,6 @@ void pvh_hdrs_set_applied(struct sip_msg *msg); void pvh_hdrs_reset_flags(struct sip_msg *msg); int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue); -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue); int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname); int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname); int pvh_real_replace_reply_reason(struct sip_msg *msg, str *value);

1 0

git:5.5:e2b6cc87: pv_headers: don't try to replace header
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: 5.5 Commit: e2b6cc878088b0af2d76a2bce87c341946c36cbf URL: https://github.com/kamailio/kamailio/commit/e2b6cc878088b0af2d76a2bce87c341… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T12:02:18+02:00 pv_headers: don't try to replace header Multiple headers where not removed if new value was just one header. (cherry picked from commit 09981c41cb6685fa18f61b9e7d66339917c4f097) --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h --- Diff: https://github.com/kamailio/kamailio/commit/e2b6cc878088b0af2d76a2bce87c341… Patch: https://github.com/kamailio/kamailio/commit/e2b6cc878088b0af2d76a2bce87c341… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 7afc39d1a8..01a7d3d211 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -276,12 +276,6 @@ int pvh_apply_headers(struct sip_msg *msg) } if(!str_hash_case_get(&rm_hdrs, sub->name.s, sub->name.len)) { - if(!pvh_avp_is_null(sub) && xavi_count(&sub->name, &sub) == 1) { - LM_DBG("replace header[%s]: %s\n", sub->name.s, sub->val.v.s.s); - pvh_real_hdr_replace(msg, &sub->name, &sub->val.v.s); - pvh_str_hash_add_key(&rm_hdrs, &sub->name); - continue; - } LM_DBG("remove header[%s]: %s\n", sub->name.s, sub->val.v.s.s); pvh_real_hdr_del_by_name(msg, &sub->name); pvh_str_hash_add_key(&rm_hdrs, &sub->name); diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index d83a646c0d..31c09b4b5d 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,80 +131,6 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue) -{ - struct lump *anchor = NULL; - hdr_field_t *hf = NULL; - str new_h = STR_NULL; - int new = 1; - - if(hname->s == NULL || hvalue->s == NULL) { - LM_ERR("header name/value cannot be empty"); - return -1; - } - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - if(hf->body.len == hvalue->len - && strncasecmp(hf->body.s, hvalue->s, hvalue->len) == 0) { - return 1; - } - new = 0; - break; - } - if(!hf->next) - break; - } - - if(hf == NULL) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(new == 0) { - if((anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0)) == 0) { - LM_ERR("unable to delete header lump\n"); - return -1; - } - } else { - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); - } - - if(anchor == 0) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(pvh_create_hdr_str(hname, hvalue, &new_h) <= 0) - return -1; - - if(insert_new_lump_after(anchor, new_h.s, new_h.len, 0) == 0) { - LM_ERR("cannot insert header lump\n"); - pkg_free(new_h.s); - return -1; - } - - LM_DBG("%s header: %.*s\n", new ? "append" : "replace", new_h.len, new_h.s); - - return 1; -} - -int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) -{ - hdr_field_t *hf = NULL; - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, - hf->body.len, hf->body.s); - del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - } - } - return 1; -} - int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL; diff --git a/src/modules/pv_headers/pvh_hdr.h b/src/modules/pv_headers/pvh_hdr.h index 4f86953823..a5ad4157f9 100644 --- a/src/modules/pv_headers/pvh_hdr.h +++ b/src/modules/pv_headers/pvh_hdr.h @@ -38,7 +38,6 @@ void pvh_hdrs_set_applied(struct sip_msg *msg); void pvh_hdrs_reset_flags(struct sip_msg *msg); int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue); -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue); int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname); int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname); int pvh_real_replace_reply_reason(struct sip_msg *msg, str *value);

1 0

git:master:09981c41: pv_headers: don't try to replace header
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 09981c41cb6685fa18f61b9e7d66339917c4f097 URL: https://github.com/kamailio/kamailio/commit/09981c41cb6685fa18f61b9e7d66339… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T08:43:45+02:00 pv_headers: don't try to replace header Multiple headers where not removed if new value was just one header. --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h --- Diff: https://github.com/kamailio/kamailio/commit/09981c41cb6685fa18f61b9e7d66339… Patch: https://github.com/kamailio/kamailio/commit/09981c41cb6685fa18f61b9e7d66339… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 7afc39d1a8..01a7d3d211 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -276,12 +276,6 @@ int pvh_apply_headers(struct sip_msg *msg) } if(!str_hash_case_get(&rm_hdrs, sub->name.s, sub->name.len)) { - if(!pvh_avp_is_null(sub) && xavi_count(&sub->name, &sub) == 1) { - LM_DBG("replace header[%s]: %s\n", sub->name.s, sub->val.v.s.s); - pvh_real_hdr_replace(msg, &sub->name, &sub->val.v.s); - pvh_str_hash_add_key(&rm_hdrs, &sub->name); - continue; - } LM_DBG("remove header[%s]: %s\n", sub->name.s, sub->val.v.s.s); pvh_real_hdr_del_by_name(msg, &sub->name); pvh_str_hash_add_key(&rm_hdrs, &sub->name); diff --git a/src/modules/pv_headers/pvh_hdr.c b/src/modules/pv_headers/pvh_hdr.c index d83a646c0d..31c09b4b5d 100644 --- a/src/modules/pv_headers/pvh_hdr.c +++ b/src/modules/pv_headers/pvh_hdr.c @@ -131,80 +131,6 @@ int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue) return 1; } -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue) -{ - struct lump *anchor = NULL; - hdr_field_t *hf = NULL; - str new_h = STR_NULL; - int new = 1; - - if(hname->s == NULL || hvalue->s == NULL) { - LM_ERR("header name/value cannot be empty"); - return -1; - } - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - if(hf->body.len == hvalue->len - && strncasecmp(hf->body.s, hvalue->s, hvalue->len) == 0) { - return 1; - } - new = 0; - break; - } - if(!hf->next) - break; - } - - if(hf == NULL) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(new == 0) { - if((anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0)) == 0) { - LM_ERR("unable to delete header lump\n"); - return -1; - } - } else { - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); - } - - if(anchor == 0) { - LM_ERR("unable to find header lump\n"); - return -1; - } - - if(pvh_create_hdr_str(hname, hvalue, &new_h) <= 0) - return -1; - - if(insert_new_lump_after(anchor, new_h.s, new_h.len, 0) == 0) { - LM_ERR("cannot insert header lump\n"); - pkg_free(new_h.s); - return -1; - } - - LM_DBG("%s header: %.*s\n", new ? "append" : "replace", new_h.len, new_h.s); - - return 1; -} - -int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname) -{ - hdr_field_t *hf = NULL; - - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->name.len == hname->len - && strncasecmp(hf->name.s, hname->s, hname->len) == 0) { - LM_DBG("remove header[%.*s]: %.*s\n", hf->name.len, hf->name.s, - hf->body.len, hf->body.s); - del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - } - } - return 1; -} - int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname) { hdr_field_t *hf = NULL; diff --git a/src/modules/pv_headers/pvh_hdr.h b/src/modules/pv_headers/pvh_hdr.h index 4f86953823..a5ad4157f9 100644 --- a/src/modules/pv_headers/pvh_hdr.h +++ b/src/modules/pv_headers/pvh_hdr.h @@ -38,7 +38,6 @@ void pvh_hdrs_set_applied(struct sip_msg *msg); void pvh_hdrs_reset_flags(struct sip_msg *msg); int pvh_real_hdr_append(struct sip_msg *msg, str *hname, str *hvalue); -int pvh_real_hdr_replace(struct sip_msg *msg, str *hname, str *hvalue); int pvh_real_hdr_del_by_name(struct sip_msg *msg, str *hname); int pvh_real_hdr_remove_display(struct sip_msg *msg, str *hname); int pvh_real_replace_reply_reason(struct sip_msg *msg, str *value);

1 0

[kamailio/kamailio] pua_dialoginfo + forking proxy results in wrong blf (Issue #2906)
by Alessio Garzi 29 Oct '21

29 Oct '21

### Description I have a problem with publish/notify messages generated from Kamailio towards a monitoring device after multiple branches has been created. When the call is forked by kamailio, invites are generated towards each callee user agent depending on how many branches we have in the call. When one of the callee user agents sends back 200 ok to enter the conversation, kamailio automatically sends a CANCEL towards the user agents that lost the race condition and didnt take the call. When this happens, a notify is set to the monitoring user agent with the state "terminated" but this is wrong since the call is up and we are in conversation. #### Reproduction 1. set up a monitoring device that subscribes to B events. 2. Register more than one device to B to make kamailio behave like a forking proxy 3. Call B and observe the notify message sent to the monitoring device, in particular the <dialog id="xxx" value ### Possible Solutions I think this can be solved just adding some random uuid inside the xml field sent inside the xml of the NOTIFY message: The random uuid must be different for each branch. ### Additional Information version: kamailio 5.5.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, 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: unknown compiled with gcc 10.2.1 * **Operating System**: No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux sp1 5.10.0-9-amd64 #1 SMP Debian 5.10.70-1 (2021-09-30) x86_64 GNU/Linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2906

2 1

[kamailio/kamailio] pua_dialoginfo: generate uuid as id instead of use callid value (PR #2908)
by Victor Seva 29 Oct '21

29 Oct '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2906 #### Description This change solves the issue of parallel forking, subscriber was receiving NOTIFY messages with the same id for different branches fixes #2906 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2908 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2908/commits/8a924ee177b4764cd5da…">pua_dialoginfo: generate uuid as id instead of use callid value</a> -- File Changes -- M src/modules/pua_dialoginfo/Makefile (11) M src/modules/pua_dialoginfo/dialog_publish.c (18) M src/modules/pua_dialoginfo/pua_dialoginfo.c (47) M src/modules/pua_dialoginfo/pua_dialoginfo.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2908.patch https://github.com/kamailio/kamailio/pull/2908.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2908

2 5

git:master:6b6fb023: pua_dialoginfo: generate uuid as id instead of use callid value
by Victor Seva 29 Oct '21

29 Oct '21

Module: kamailio Branch: master Commit: 6b6fb023e1a7cbd83a60b788af6d4dec97b7fcfd URL: https://github.com/kamailio/kamailio/commit/6b6fb023e1a7cbd83a60b788af6d4de… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-29T08:17:31+02:00 pua_dialoginfo: generate uuid as id instead of use callid value This change solves the issue of parallel forking, subscriber was receiving NOTIFY messages with the same id for different branches fixes #2906 --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/6b6fb023e1a7cbd83a60b788af6d4de… Patch: https://github.com/kamailio/kamailio/commit/6b6fb023e1a7cbd83a60b788af6d4de…

1 0

git:master:1a30e472: ims_charging: include kemi.h to fix compile warning
by Daniel-Constantin Mierla 28 Oct '21

28 Oct '21

Module: kamailio Branch: master Commit: 1a30e472321c338987575bcc9feb73ad0150afd6 URL: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-28T20:25:48+02:00 ims_charging: include kemi.h to fix compile warning --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… Patch: https://github.com/kamailio/kamailio/commit/1a30e472321c338987575bcc9feb73a… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 6458a8070f..0a8c53f9d9 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -7,6 +7,7 @@ #include "../../core/socket_info.h" #include "../../core/timer.h" #include "../../core/locking.h" +#include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" #include "../../modules/ims_dialog/dlg_hash.h"

1 0

[kamailio/kamailio] cannot start on aarch64 with Google ASAN (Issue #2897)
by sergey-safarov 28 Oct '21

28 Oct '21

### Description I have compiled Kamailio on aarch64 hosts with Google ASAN. Also used system memory manager ("make MEMPKG=sys cfg"). During compilation used flags ``` -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment ``` When Kamailio is started with the default config file I get an error ``` core/script_cb.c:85:31: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' ``` As used 64 bit CPU, looks like a strange this error ### Additional Information compiled commit 102d5dab4f45cab238ffeb72e7ddf378c8daa17d * **Operating System**: ``` [root@logger-west kamailio]# uname -a Linux example.com 4.18.0-305.7.1.el8_4.aarch64 #1 SMP Tue Jun 29 21:32:00 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@logger-west kamailio]# lsb_release -a LSB Version: :core-4.1-aarch64:core-4.1-noarch Distributor ID: CentOS Description: CentOS Linux release 8.4.2105 Release: 8.4.2105 Codename: n/a ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2897

2 7

git:master:f7f9ea0f: core: hashes - cast to unsigned int for left shifting
by Daniel-Constantin Mierla 28 Oct '21

28 Oct '21

Module: kamailio Branch: master Commit: f7f9ea0f3cfb8e61a4f2f47a214cb4e89d713da4 URL: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-28T17:54:19+02:00 core: hashes - cast to unsigned int for left shifting --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… Patch: https://github.com/kamailio/kamailio/commit/f7f9ea0f3cfb8e61a4f2f47a214cb4e… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 2afb8361c8..62708bdb35 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -273,7 +273,7 @@ static inline unsigned int core_hash(const str *s1, const str *s2, end=s1->s+s1->len; for ( p=s1->s ; p<=(end-4) ; p+=4 ){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; @@ -283,11 +283,11 @@ static inline unsigned int core_hash(const str *s1, const str *s2, if (s2) { end=s2->s+s2->len; for (p=s2->s; p<=(end-4); p+=4){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; - for (; p<end ; p++){ v<<=8; v+=*p;} + for (; p<end ; p++){ v<<=8; v+=p[0];} ch_h_inc; } h=((h)+(h>>11))+((h>>13)+(h>>23));

1 0

[kamailio/kamailio] msrp: fix some tcpconn where memory was never cleaned up (PR #2890)
by Nacho G. 27 Oct '21

27 Oct '21

Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2880 (replace XXXX with an open issue number) #### Description  Just do some missing `tcpconn_put` calls on MSRP module after a tcpconn_get. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2890 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2890/commits/19714ebaa0f653f65d83…">msrp: fix some tcpconn where memory was never cleaned up</a> -- File Changes -- M src/modules/msrp/msrp_netio.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2890.patch https://github.com/kamailio/kamailio/pull/2890.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2890

2 5

git:master:77bc4c6c: Merge pull request #2890 from NGSegovia/msrp_tcp_mem_leak
by GitHub 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: 77bc4c6c96cfb2ce5b7086ccfffd19750b085d74 URL: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T15:18:49+02:00 Merge pull request #2890 from NGSegovia/msrp_tcp_mem_leak msrp: fix some tcpconn where memory was never cleaned up --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… Patch: https://github.com/kamailio/kamailio/commit/77bc4c6c96cfb2ce5b7086ccfffd197… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:master:bf371ccb: msrp: fix some tcpconn where memory was never cleaned up
by Nacho Garcia Segovia 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: bf371ccbfa1c89fefcd9d9322ae75189d97fc862 URL: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2021-10-22T10:38:48+02:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… Patch: https://github.com/kamailio/kamailio/commit/bf371ccbfa1c89fefcd9d9322ae7518… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

1 0

git:master:f8c484d4: modules: readme files regenerated - db_cluster ... [skip ci]
by Kamailio Dev 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: f8c484d464fd1de074da334eff5165c38d4c8ebd URL: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-27T15:01:17+02:00 modules: readme files regenerated - db_cluster ... [skip ci] --- Modified: src/modules/db_cluster/README --- Diff: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… Patch: https://github.com/kamailio/kamailio/commit/f8c484d464fd1de074da334eff5165c… --- diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 4e52d0ab24..7260f0f1aa 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -10,6 +10,10 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> +Frits Wiersma + + <frits.wiersma(a)isp.solcon.nl> + Copyright © 2012 asipto.com __________________________________________________________________ @@ -31,6 +35,12 @@ Daniel-Constantin Mierla 3.4. max_query_length (int) 4. Usage + 5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection List of Examples @@ -58,6 +68,12 @@ Chapter 1. Admin Guide 3.4. max_query_length (int) 4. Usage + 5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection 1. Overview @@ -204,3 +220,58 @@ modparam("acc", "db_url", "cluster://k1") modparam("sqlops", "sqlcon", "ca=>cluster://k1") ... + +5. RPC Commands + + 5.1. dbcl.list_clusters + 5.2. dbcl.list_connections + 5.3. dbcl.disable_connection + 5.4. dbcl.enable_connection + +5.1. dbcl.list_clusters + + Lists all database clusters. + + Name: dbcl.list_clusters + + RPC Command Format: +... +kamcmd dbcl.list_clusters +... + +5.2. dbcl.list_connections + + Lists all database connections of a specific cluster. + + Name: dbcl.list_connections + + RPC Command Format: +... +kamcmd dbcl.list_connections clustername +... + +5.3. dbcl.disable_connection + + Disable a database connection of a specific cluster for a period. The + database connection remains open but will not be used for the specified + period (seconds). The command does not allow to close all database + connections of the specific cluster. If the database connection is + already disabled than the new period will overwrite the old period. + + Name: dbcl.disable_connection + + RPC Command Format: +... +kamcmd dbcl.disable_connection clustername connectionname period +... + +5.4. dbcl.enable_connection + + Enable a database connection of a specific cluster. + + Name: dbcl.enable_connection + + RPC Command Format: +... +kamcmd dbcl.enable_connection clustername connectionname +...

1 0

[kamailio/kamailio] db_cluster: RPC commands to control database connections (PR #2893)
by Frits Wiersma 27 Oct '21

27 Oct '21

#### 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  The database cluster modules (db_cluster) does not allow manual controle over database connections in the cluster. This change adds some rpc commands to allow this. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2893 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2893/commits/a58e7a235c1300cfbdaf…">db_cluster: RPC commands to control database connections</a> -- File Changes -- M src/modules/db_cluster/db_cluster_mod.c (249) M src/modules/db_cluster/dbcl_data.c (33) M src/modules/db_cluster/dbcl_data.h (5) M src/modules/db_cluster/doc/db_cluster.xml (5) M src/modules/db_cluster/doc/db_cluster_admin.xml (61) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2893.patch https://github.com/kamailio/kamailio/pull/2893.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2893

2 2

git:master:2c2dbcb1: Merge pull request #2893 from CFrits/master
by GitHub 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: 2c2dbcb1336b447322bb74fcbd5303d9acde842c URL: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T14:52:20+02:00 Merge pull request #2893 from CFrits/master db_cluster: RPC commands to control database connections --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h Modified: src/modules/db_cluster/doc/db_cluster.xml Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d… Patch: https://github.com/kamailio/kamailio/commit/2c2dbcb1336b447322bb74fcbd5303d…

1 0

git:master:a58e7a23: db_cluster: RPC commands to control database connections
by CFrits 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: a58e7a235c1300cfbdafe22e5c3c830a678d3d26 URL: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830… Author: CFrits <frits.wiersma(a)isp.solcon.nl> Committer: CFrits <frits.wiersma(a)isp.solcon.nl> Date: 2021-10-21T19:44:18+02:00 db_cluster: RPC commands to control database connections - Add rpc commands to list, enable or disable database connections of a cluster. --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h Modified: src/modules/db_cluster/doc/db_cluster.xml Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830… Patch: https://github.com/kamailio/kamailio/commit/a58e7a235c1300cfbdafe22e5c3c830…

1 0

[kamailio/kamailio] github/workflow: add CIFuzz integration (PR #2903)
by DavidKorczynski 27 Oct '21

27 Oct '21

Add CIFuzz workflow action to have fuzzers build and run on each PR. This is a service offered by OSS-Fuzz, on which Kamailio already runs. Signed-off-by: David Korczynski <david(a)adalogics.com>   #### 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  Add CIFuzz Github action to build and run fuzzers on pull requests. This will run the fuzzers for 600 seconds (split between all the fuzzers) in the CI when a pull request is made and is a service by OSS-fuzz. It can help with catching bugs early and catch regressions. Documentation for CIFuzz can be found here: https://google.github.io/oss-fuzz/getting-started/continuous-integration/ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2903 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2903/commits/f10ba5c9e81f0ae0f2f6…">github/workflow: add CIFuzz integration</a> -- File Changes -- A .github/workflows/cifuzz.yml (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2903.patch https://github.com/kamailio/kamailio/pull/2903.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2903

2 2

git:master:88af7f7f: Merge pull request #2903 from DavidKorczynski/cifuzz
by GitHub 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: 88af7f7fa91eb864ed57c2331bff05a9062f630e URL: https://github.com/kamailio/kamailio/commit/88af7f7fa91eb864ed57c2331bff05a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-27T14:29:35+02:00 Merge pull request #2903 from DavidKorczynski/cifuzz github/workflow: add CIFuzz integration --- Added: .github/workflows/cifuzz.yml --- Diff: https://github.com/kamailio/kamailio/commit/88af7f7fa91eb864ed57c2331bff05a… Patch: https://github.com/kamailio/kamailio/commit/88af7f7fa91eb864ed57c2331bff05a… --- diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml new file mode 100644 index 0000000000..948ab18b88 --- /dev/null +++ b/.github/workflows/cifuzz.yml @@ -0,0 +1,26 @@ +name: CIFuzz +on: [pull_request] +jobs: + Fuzzing: + runs-on: ubuntu-latest + steps: + - name: Build Fuzzers + id: build + uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + dry-run: false + language: c + - name: Run Fuzzers + uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + fuzz-seconds: 600 + dry-run: false + language: c + - name: Upload Crash + uses: actions/upload-artifact@v1 + if: failure() && steps.build.outcome == 'success' + with: + name: artifacts + path: ./out/artifacts

1 0

git:master:f10ba5c9: github/workflow: add CIFuzz integration
by David Korczynski 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: f10ba5c9e81f0ae0f2f6efc9c721ced5ce5207c0 URL: https://github.com/kamailio/kamailio/commit/f10ba5c9e81f0ae0f2f6efc9c721ced… Author: David Korczynski <david(a)adalogics.com> Committer: David Korczynski <david(a)adalogics.com> Date: 2021-10-27T11:26:15+01:00 github/workflow: add CIFuzz integration Add CIFuzz workflow action to have fuzzers build and run on each PR. This is a service offered by OSS-Fuzz, on which Kamailio already runs. Signed-off-by: David Korczynski <david(a)adalogics.com> --- Added: .github/workflows/cifuzz.yml --- Diff: https://github.com/kamailio/kamailio/commit/f10ba5c9e81f0ae0f2f6efc9c721ced… Patch: https://github.com/kamailio/kamailio/commit/f10ba5c9e81f0ae0f2f6efc9c721ced… --- diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml new file mode 100644 index 0000000000..948ab18b88 --- /dev/null +++ b/.github/workflows/cifuzz.yml @@ -0,0 +1,26 @@ +name: CIFuzz +on: [pull_request] +jobs: + Fuzzing: + runs-on: ubuntu-latest + steps: + - name: Build Fuzzers + id: build + uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + dry-run: false + language: c + - name: Run Fuzzers + uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master + with: + oss-fuzz-project-name: 'kamailio' + fuzz-seconds: 600 + dry-run: false + language: c + - name: Upload Crash + uses: actions/upload-artifact@v1 + if: failure() && steps.build.outcome == 'success' + with: + name: artifacts + path: ./out/artifacts

1 0

git:master:a4b88342: etc: kamailio.cfg - updated version in comments
by Daniel-Constantin Mierla 27 Oct '21

27 Oct '21

Module: kamailio Branch: master Commit: a4b88342d2c715a151ef032996d1b71a482be00b URL: https://github.com/kamailio/kamailio/commit/a4b88342d2c715a151ef032996d1b71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-27T13:24:59+02:00 etc: kamailio.cfg - updated version in comments --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/a4b88342d2c715a151ef032996d1b71… Patch: https://github.com/kamailio/kamailio/commit/a4b88342d2c715a151ef032996d1b71… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c349fcf65c..56c1ea791e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio SIP Server v5.5 - default configuration script +# Kamailio SIP Server v5.6 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio #

1 0

TLS trouble
by Lorenzo Campo 26 Oct '21

26 Oct '21

Hi guys, We are quite newby about Kamailio and we are trying to use it as a load balancer. While installing certificates we started having problems. We use Kamailio (vers. 5.5) deployed on a VM (Ubuntu, 20.04 LTS). We cannot connect via TLS Kamailio VM with clients or other TCP VM. Our Kamailio currently exposes only port 5060 in UDP and TCP. Even doing a port scan on localhost, port 5061, used for the TLS protocol, is instead closed. There are 3 things worth noting: - All ports for all protocols are open on the firewall; - Before we set the disable_tcp option to "no", the 5060 was only reachable in UDP; - Even if you put a non-existent certificate, the system does not return an error so we cannot understand if the goodness of the certificates affects the opening of the door. Furthermore, we did not find any different behavior when switching from crt format (key for the private key) to PEM. If someone can help us would be very appreciated. Thank you very much Here is our tls configuration: kamailio.cfg #!define WITH_TLS 1 ... disable_tcp=no auto_aliases=no …. loadmodule "sl.so" loadmodule "tls.so" ... modparam("tls", "private_key", "/etc/kamailio/key.pem") modparam("tls", "certificate", "/etc/kamailio/crt.pem") modparam("tls", "ca_list", "/etc/kamailio/ca.pem") enable_tls=yes tls.config [server:default] method = TLSv1.2+ verify_certificate = no require_certificate = no private_key = /etc/kamailio/kamailio-selfsigned.key certificate = /etc/kamailio/kamailio-selfsigned.pem #ca_list = /etc/kamailio/tls/cacert.pem #crl = /etc/kamailio/tls/crl.pem [client:default] #method = TLSv1.2+ verify_certificate = no require_certificate = no *Sent with Shift <https://tryshift.com/?utm_source=SentWithShift&utm_campaign=Sent+with+Shift…>*

2 1

git:master:b11a9835: etc: kamailio.cfg - added pplsip to user-agent list to drop
by Daniel-Constantin Mierla 26 Oct '21

26 Oct '21

Module: kamailio Branch: master Commit: b11a9835778cd2ddb60e743b8b8b2f1ff54ccdcc URL: https://github.com/kamailio/kamailio/commit/b11a9835778cd2ddb60e743b8b8b2f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-26T08:23:59+02:00 etc: kamailio.cfg - added pplsip to user-agent list to drop --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b11a9835778cd2ddb60e743b8b8b2f1… Patch: https://github.com/kamailio/kamailio/commit/b11a9835778cd2ddb60e743b8b8b2f1… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index be71dbb54a..c349fcf65c 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -615,7 +615,7 @@ route[REQINIT] { } } #!endif - if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent") { + if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent|pplsip") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit;

1 0

git:master:dfafbf6d: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: dfafbf6dc1269a059b4d7f90274288070cc5e9c9 URL: https://github.com/kamailio/kamailio/commit/dfafbf6dc1269a059b4d7f902742880… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-25T19:31:14+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/dfafbf6dc1269a059b4d7f902742880… Patch: https://github.com/kamailio/kamailio/commit/dfafbf6dc1269a059b4d7f902742880… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 411653a92a..6216f40e19 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -37,14 +37,14 @@ Daniel-Constantin Mierla 2.16. hf_value_exists(hf, hvalue) 2.17. hf_iterator_start(iname) 2.18. hf_iterator_end(iname) - 2.19. textopsx.f.hf_iterator_next(iname) - 2.20. textopsx.f.hf_iterator_prev(iname) + 2.19. hf_iterator_next(iname) + 2.20. hf_iterator_prev(iname) 2.21. hf_iterator_rm(iname) 2.22. hf_iterator_append(iname, htext) 2.23. hf_iterator_insert(iname, htext) 2.24. bl_iterator_start(iname) 2.25. bl_iterator_end(iname) - 2.26. textopsx.f.bl_iterator_next(iname) + 2.26. bl_iterator_next(iname) 2.27. bl_iterator_rm(iname) 2.28. bl_iterator_append(iname, text) 2.29. bl_iterator_insert(iname, text) @@ -113,14 +113,14 @@ Chapter 1. Admin Guide 2.16. hf_value_exists(hf, hvalue) 2.17. hf_iterator_start(iname) 2.18. hf_iterator_end(iname) - 2.19. textopsx.f.hf_iterator_next(iname) - 2.20. textopsx.f.hf_iterator_prev(iname) + 2.19. hf_iterator_next(iname) + 2.20. hf_iterator_prev(iname) 2.21. hf_iterator_rm(iname) 2.22. hf_iterator_append(iname, htext) 2.23. hf_iterator_insert(iname, htext) 2.24. bl_iterator_start(iname) 2.25. bl_iterator_end(iname) - 2.26. textopsx.f.bl_iterator_next(iname) + 2.26. bl_iterator_next(iname) 2.27. bl_iterator_rm(iname) 2.28. bl_iterator_append(iname, text) 2.29. bl_iterator_insert(iname, text) @@ -161,14 +161,14 @@ Chapter 1. Admin Guide 2.16. hf_value_exists(hf, hvalue) 2.17. hf_iterator_start(iname) 2.18. hf_iterator_end(iname) - 2.19. textopsx.f.hf_iterator_next(iname) - 2.20. textopsx.f.hf_iterator_prev(iname) + 2.19. hf_iterator_next(iname) + 2.20. hf_iterator_prev(iname) 2.21. hf_iterator_rm(iname) 2.22. hf_iterator_append(iname, htext) 2.23. hf_iterator_insert(iname, htext) 2.24. bl_iterator_start(iname) 2.25. bl_iterator_end(iname) - 2.26. textopsx.f.bl_iterator_next(iname) + 2.26. bl_iterator_next(iname) 2.27. bl_iterator_rm(iname) 2.28. bl_iterator_append(iname, text) 2.29. bl_iterator_insert(iname, text) @@ -509,10 +509,10 @@ hf_iterator_start("i1"); hf_iterator_end("i1"); ... -2.19. textopsx.f.hf_iterator_next(iname) +2.19. hf_iterator_next(iname) Move the iterator to the next header. It must be called also after - bl_iterator_start() to get the first header. + hf_iterator_start() to get the first header. The return code is false when there is no other header in the list. @@ -532,7 +532,7 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... -2.20. textopsx.f.hf_iterator_prev(iname) +2.20. hf_iterator_prev(iname) Move the iterator to the previous header. It must be called also after hf_iterator_start() and hf_iterator_next(). @@ -641,7 +641,7 @@ bl_iterator_start("b1"); bl_iterator_end("b1"); ... -2.26. textopsx.f.bl_iterator_next(iname) +2.26. bl_iterator_next(iname) Move the iterator to the next line in the body. It must be called also after bl_iterator_start() to get the first header.

1 0

git:master:01434fa8: textopsx: docs - fixed title for sections
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: 01434fa89bac3174ff68c08cf776dc73abb2eb2d URL: https://github.com/kamailio/kamailio/commit/01434fa89bac3174ff68c08cf776dc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T19:23:08+02:00 textopsx: docs - fixed title for sections --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/01434fa89bac3174ff68c08cf776dc7… Patch: https://github.com/kamailio/kamailio/commit/01434fa89bac3174ff68c08cf776dc7… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 3de3a6c8e6..7500cbaa85 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -559,11 +559,11 @@ hf_iterator_end("i1"); </section> <section id="textopsx.f.hf_iterator_next"> <title> - <function moreinfo="none">textopsx.f.hf_iterator_next(iname)</function> + <function moreinfo="none">hf_iterator_next(iname)</function> </title> <para> Move the iterator to the next header. It must - be called also after bl_iterator_start() to get the first + be called also after hf_iterator_start() to get the first header. </para> <para> @@ -594,7 +594,7 @@ hf_iterator_end("i1"); </section> <section id="textopsx.f.hf_iterator_prev"> <title> - <function moreinfo="none">textopsx.f.hf_iterator_prev(iname)</function> + <function moreinfo="none">hf_iterator_prev(iname)</function> </title> <para> Move the iterator to the previous header. It must @@ -757,7 +757,7 @@ bl_iterator_end("b1"); </section> <section id="textopsx.f.bl_iterator_next"> <title> - <function moreinfo="none">textopsx.f.bl_iterator_next(iname)</function> + <function moreinfo="none">bl_iterator_next(iname)</function> </title> <para> Move the iterator to the next line in the body. It must

1 0

SIPtrace: Blocking processes
by Olle E. Johansson 25 Oct '21

25 Oct '21

Hi! I just stumbled into a hard-to-find problem with Kamailio. The symtom was that Kamailio simply did not read a lot of incoming messages, so they did not get any response. We saw traffic coming in on the interface with tcpdump, but not in the kamailio logs. Restarting Kamailio solved the problem for a while, then it started again. I noticed there was something related to the DB, so for testing I disabled all db-based functions, but missed siptrace that connected and operated in the background by the config settings, nothing in the routing script. I finally traced the problem to the siptrace module. The db table had grown way too big (due to attacks) and adding new records to it took way too much time. During that time, with SIPtrace waiting for confirmation, the process locked and packets where dropped. Kamailio still handled calls, but a lot of calls was dropped. I will solve this shortly by setting up a parallell smaller Kamailio that logs to database instead of running siptrace with DB in a production server. But in order for others not to find themselves in this very hard to find situation, is there something that can be done to the siptrace code so it doesn’t execute in the same process that listens for incoming SIP messages? It would be a huge improvement to just block a background process so that siptrace doesn’t work, instead of blocking a listen process and drop traffic. I don’t think I can write that code. Sorry. Otherwise it would have been a high priority, because these problems in production drove me almost insane. Restarting - all works fine. After a few hours the first packets are lost. Calls getting through for some customers all of the time. Sorry for a long post, but I want this in the archives to help others. Regards, /O

2 1

[kamailio/kamailio] CDP / IMS Diameter Server Module- event_route[diameter:response] fails to receive/forward response (Issue #2900)
by w415384914 25 Oct '21

25 Oct '21

I config ims_diameter_server as below: ``` #!ifdef WITH_DIAMETER_SERVER # IMS_DIAMETER_SERVER event_route[diameter:request]{ xlog("L_INFO","ims Got diameter message"); # diameter_request("hss.ims.mnc001.mcc001.3gppnetwork.org", $diameter_application, $diameter_command, $diameter_request); diameter_request_async("hss.ims.mnc001.mcc001.3gppnetwork.org", $diameter_application, $diameter_command, $diameter_request); xlog("L_INFO","ims Forwarded Diameter Request"); } event_route[diameter:response] { xlog("L_INFO","ims Reply to Diameter request is $diameter_response\n"); } #!endif ``` And got a response from hss: ![image](https://user-images.githubusercontent.com/10116705/138629415-dd7f6266-7801-4ed3-8922-a0b9cba4089a.png) but got <null> response in log: > 90(124) INFO: <script>: ims Got diameter message90(124) DEBUG: ims_diameter_server [avp_helper.c:59]: avp2json(): AVP((nil) < 0x7f44c2ad16f0 >0x7f44c2ad0c08);code=263,flags=40; > 89(123) INFO: <script>: ims Reply to Diameter request is <null> $diameter_response is <null>, why, how to fix it? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2900

2 2

git:master:6348de19: core: unsigned literal for 1 used in left shifting for script callbacks
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: 6348de19626f691036fd94134be6f64fff4418ed URL: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T15:11:29+02:00 core: unsigned literal for 1 used in left shifting for script callbacks - GH #2897 --- Modified: src/core/script_cb.c Modified: src/core/script_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… Patch: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… --- diff --git a/src/core/script_cb.c b/src/core/script_cb.c index 2f83608e66..266037674a 100644 --- a/src/core/script_cb.c +++ b/src/core/script_cb.c @@ -78,11 +78,11 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) int i; /* type checkings */ - if ( (flags&((1<<SCRIPT_CB_NUM)-1))==0 ) { + if ( (flags&((1u<<SCRIPT_CB_NUM)-1))==0 ) { LM_BUG("callback flag not specified\n"); return -1; } - if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1<<SCRIPT_CB_NUM ) { + if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1u<<SCRIPT_CB_NUM ) { LM_BUG("unsupported callback flags: %u\n", flags); return -1; @@ -102,7 +102,7 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) * (as many times as many flags are set) */ for (i=0; i<SCRIPT_CB_NUM; i++) { - if ((flags&(1<<i)) == 0) + if ((flags&(1u<<i)) == 0) continue; if (add_callback(&cb_array[i], f, param) < 0) goto add_error; @@ -155,7 +155,7 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) return 0; } - flags = PRE_SCRIPT_CB | (1<<(type-1)); + flags = PRE_SCRIPT_CB | (1u<<(type-1)); for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ if (cb->cbf(msg, flags, cb->param)==0) @@ -177,7 +177,7 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) return 1; } - flags = POST_SCRIPT_CB | (1<<(type-1)); + flags = POST_SCRIPT_CB | (1u<<(type-1)); for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); } diff --git a/src/core/script_cb.h b/src/core/script_cb.h index ece69b8e41..650bf053fa 100644 --- a/src/core/script_cb.h +++ b/src/core/script_cb.h @@ -33,8 +33,8 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); -#define PRE_SCRIPT_CB (1<<30) -#define POST_SCRIPT_CB (1<<31) +#define PRE_SCRIPT_CB (1u<<30) +#define POST_SCRIPT_CB (1u<<31) /* Pre- and post-script callback flags. Use these flags to register * for the callbacks, and to check the type of the callback from the

1 0

git:5.5:158f794d: uac: fixing REGISTER to use custom socket after 401/407
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: 5.5 Commit: 158f794d07890f0f237683ece880dd123be7dbbf URL: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:49:36+02:00 uac: fixing REGISTER to use custom socket after 401/407 - After receiving 401/407 uac does not use configured custom socket, second register send from first available address. (cherry picked from commit ea4d7fee43269ed50a55c444a0efdcc0dd64a95c) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… Patch: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c36ee8ac822..f96f1ca0614 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

1 0

git:master:cc0cbad3: ctl: removed unused function safe_write()
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: cc0cbad3660423f679fed62c42fcffb4a402081f URL: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:45:28+02:00 ctl: removed unused function safe_write() --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… Patch: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index b40b079a1d..50507dd03b 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -947,29 +947,6 @@ static void rpc_fault(rpc_ctx_t* ctx, int code, char* fmt, ...) } -static inline int safe_write(FILE* f, char* fmt, ...) -{ - va_list ap; - - if (!*fmt) return 0; - va_start(ap, fmt); - - retry: - /* First line containing code and reason phrase */ - if (vfprintf(f, fmt, ap) <= 0) { - ERR("fifo write error: %s\n", strerror(errno)); - if ((errno == EINTR) || (errno == EAGAIN) || (errno == EWOULDBLOCK)) { - goto retry; - } - va_end(ap); - return -1; - } - va_end(ap); - return 0; -} - - - inline static int build_iovec(rpc_ctx_t* ctx, struct iovec* v, int v_size) { struct text_chunk* p;

1 0

git:master:c9b885ff: avpops: removed unused function get_source_uri()
by Daniel-Constantin Mierla 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: c9b885ff791bd71fcbf40824369fc9369dcc6e48 URL: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:43:17+02:00 avpops: removed unused function get_source_uri() --- Modified: src/modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… Patch: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… --- diff --git a/src/modules/avpops/avpops_impl.c b/src/modules/avpops/avpops_impl.c index c760becb43..8a6e4c2b2d 100644 --- a/src/modules/avpops/avpops_impl.c +++ b/src/modules/avpops/avpops_impl.c @@ -214,38 +214,6 @@ static int dbrow2avp(struct db_row *row, struct db_param *dbp, int_str attr, return add_avp( (unsigned short)db_flags, avp_attr, avp_val); } - -inline static str* get_source_uri(struct sip_msg* msg,int source) -{ - /* which uri will be used? */ - if (source&AVPOPS_USE_FROM) - { /* from */ - if (parse_from_header( msg )<0 ) - { - LM_ERR("failed to parse from\n"); - goto error; - } - return &(get_from(msg)->uri); - } else if (source&AVPOPS_USE_TO) - { /* to */ - if (parse_headers( msg, HDR_TO_F, 0)<0) - { - LM_ERR("failed to parse to\n"); - goto error; - } - return &(get_to(msg)->uri); - } else if (source&AVPOPS_USE_RURI) { /* RURI */ - if(msg->new_uri.s!=NULL && msg->new_uri.len>0) - return &(msg->new_uri); - return &(msg->first_line.u.request.uri); - } else { - LM_ERR("unknown source <%d>\n", source); - goto error; - } -error: - return 0; -} - static inline void int_str2db_val( int_str is_val, str *val, int is_s) { if (is_s)

1 0

[kamailio/kamailio] i want write smpp server module (Issue #2899)
by tarikogut 25 Oct '21

25 Oct '21

hello i want write smpp module do you have any documentation ?* -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2899

2 2

[kamailio/kamailio] uac: fixing REGISTER to use custom socket after 401/407 (PR #2902)
by Dennis 25 Oct '21

25 Oct '21

- After receiving 401/407 uac does not use configured custom socket, second register send from first available address.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 - [ ] 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 uac module does not use configured custom socket when send second REGISTER after receiving 401/407, so packet send via first suitable socket in config with wrong source address, some carriers drops this packets because they have configured ACLs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2902 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2902/commits/ea4d7fee43269ed50a55…">uac: fixing REGISTER to use custom socket after 401/407</a> -- File Changes -- M src/modules/uac/uac_reg.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2902.patch https://github.com/kamailio/kamailio/pull/2902.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2902

2 2

git:master:306489e8: Merge pull request #2902 from Den4t/master
by GitHub 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: 306489e82ae37ab3788808745a465ef438fb929f URL: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-25T14:31:24+02:00 Merge pull request #2902 from Den4t/master uac: fixing REGISTER to use custom socket after 401/407 --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… Patch: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 1ea1b62135..85fe266c92 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

1 0

git:master:ea4d7fee: uac: fixing REGISTER to use custom socket after 401/407
by Dennis Yurasov 25 Oct '21

25 Oct '21

Module: kamailio Branch: master Commit: ea4d7fee43269ed50a55c444a0efdcc0dd64a95c URL: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2021-10-25T13:34:14+03:00 uac: fixing REGISTER to use custom socket after 401/407 - After receiving 401/407 uac does not use configured custom socket, second register send from first available address. --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… Patch: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 1ea1b62135..85fe266c92 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

1 0

[kamailio/kamailio] presence: fix build (PR #2901)
by Stefan Mititelu 25 Oct '21

25 Oct '21

#### 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  Fix build for 5.3 branch, presence module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2901 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2901/commits/420173265bbcd484deeb…">presence: fix build</a> -- File Changes -- M src/modules/presence/presence_dmq.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2901.patch https://github.com/kamailio/kamailio/pull/2901.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2901

3 3

git:5.3:42017326: presence: fix build
by Stefan Mititelu 25 Oct '21

25 Oct '21

Module: kamailio Branch: 5.3 Commit: 420173265bbcd484deeb289f2d7009c3a6bb3294 URL: https://github.com/kamailio/kamailio/commit/420173265bbcd484deeb289f2d7009c… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-25T10:00:21+03:00 presence: fix build --- Modified: src/modules/presence/presence_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/420173265bbcd484deeb289f2d7009c… Patch: https://github.com/kamailio/kamailio/commit/420173265bbcd484deeb289f2d7009c… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..a9ed2f2f4e 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -102,7 +102,7 @@ static int pres_dmq_init_proc() } } - if(publ_cache_mode==PS_PCACHE_RECORD && pres_subs_dbmode==NO_DB) { + if(publ_cache_enabled && subs_dbmode==NO_DB) { goto finish; }

1 0

git:5.3:eee27448: Merge pull request #2901 from smititelu/5.3
by GitHub 25 Oct '21

25 Oct '21

Module: kamailio Branch: 5.3 Commit: eee27448e603d554b1486376909947995c94d207 URL: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-25T09:11:46+02:00 Merge pull request #2901 from smititelu/5.3 presence: fix build --- Modified: src/modules/presence/presence_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… Patch: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..a9ed2f2f4e 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -102,7 +102,7 @@ static int pres_dmq_init_proc() } } - if(publ_cache_mode==PS_PCACHE_RECORD && pres_subs_dbmode==NO_DB) { + if(publ_cache_enabled && subs_dbmode==NO_DB) { goto finish; }

1 0

git:5.4:c09e6453: core: tcp - add alias for cinfo dst IP
by Federico Cabiddu 24 Oct '21

24 Oct '21

Module: kamailio Branch: 5.4 Commit: c09e6453db91cc71b1d853b05601a53869718550 URL: https://github.com/kamailio/kamailio/commit/c09e6453db91cc71b1d853b05601a53… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2021-10-24T11:12:17+02:00 core: tcp - add alias for cinfo dst IP (cherry picked from commit 110200ce8e5c4cf7500e57e27a23f76e18044ad5) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/c09e6453db91cc71b1d853b05601a53… Patch: https://github.com/kamailio/kamailio/commit/c09e6453db91cc71b1d853b05601a53… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 84fec376a3..f657b05571 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1478,7 +1478,12 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) * the second alias is for (peer_ip, peer_port, local_addr, 0) -- for * finding any conenction to peer_ip, peer_port from local_addr * the third alias is for (peer_ip, peer_port, local_addr, local_port) - * -- for finding if a fully specified connection exists */ + * -- for finding if a fully specified connection exists + * the fourth alias is for (peer_ip, peer_port, cinfo_addr, 0) -- for + * finding any connection to peer_ip, peer_port from address stored into cinfo (e.g. when proxy protocol is used) + * the fifth alias is for (peer_ip, peer_port, cinfo_addr, cinfo_port) + * -- for finding if a fully specified connection exists using address + * and port stored into cinfo*/ _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &zero_ip, 0, new_conn_alias_flags); if (likely(c->rcv.dst_ip.af && ! ip_addr_any(&c->rcv.dst_ip))){ @@ -1487,6 +1492,14 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->rcv.dst_ip, c->rcv.dst_port, new_conn_alias_flags); } + if (unlikely(c->cinfo.dst_ip.af && ! ip_addr_any(&c->cinfo.dst_ip) && + ! ip_addr_cmp(&c->rcv.dst_ip, &c->cinfo.dst_ip))){ + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, 0, + new_conn_alias_flags); + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, c->cinfo.dst_port, + new_conn_alias_flags); + } + /* ignore add_alias errors, there are some valid cases when one * of the add_alias would fail (e.g. first add_alias for 2 connections * with the same destination but different src. ip*/ @@ -1604,7 +1617,8 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, ((l_port==0) || (l_port==a->parent->rcv.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || - ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)) + ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip) || + ip_addr_cmp(l_ip, &a->parent->cinfo.dst_ip)) ) { LM_DBG("found connection by peer address (id: %d)\n", a->parent->id);

1 0

git:5.5:e43ea4b3: core: tcp - add alias for cinfo dst IP
by Federico Cabiddu 24 Oct '21

24 Oct '21

Module: kamailio Branch: 5.5 Commit: e43ea4b3e011e410ec36bb470889170f836e93b5 URL: https://github.com/kamailio/kamailio/commit/e43ea4b3e011e410ec36bb470889170… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2021-10-24T11:12:03+02:00 core: tcp - add alias for cinfo dst IP (cherry picked from commit 110200ce8e5c4cf7500e57e27a23f76e18044ad5) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/e43ea4b3e011e410ec36bb470889170… Patch: https://github.com/kamailio/kamailio/commit/e43ea4b3e011e410ec36bb470889170… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 3b46026027..4338806ce6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1478,7 +1478,12 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) * the second alias is for (peer_ip, peer_port, local_addr, 0) -- for * finding any conenction to peer_ip, peer_port from local_addr * the third alias is for (peer_ip, peer_port, local_addr, local_port) - * -- for finding if a fully specified connection exists */ + * -- for finding if a fully specified connection exists + * the fourth alias is for (peer_ip, peer_port, cinfo_addr, 0) -- for + * finding any connection to peer_ip, peer_port from address stored into cinfo (e.g. when proxy protocol is used) + * the fifth alias is for (peer_ip, peer_port, cinfo_addr, cinfo_port) + * -- for finding if a fully specified connection exists using address + * and port stored into cinfo*/ _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &zero_ip, 0, new_conn_alias_flags); if (likely(c->rcv.dst_ip.af && ! ip_addr_any(&c->rcv.dst_ip))){ @@ -1487,6 +1492,14 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->rcv.dst_ip, c->rcv.dst_port, new_conn_alias_flags); } + if (unlikely(c->cinfo.dst_ip.af && ! ip_addr_any(&c->cinfo.dst_ip) && + ! ip_addr_cmp(&c->rcv.dst_ip, &c->cinfo.dst_ip))){ + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, 0, + new_conn_alias_flags); + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, c->cinfo.dst_port, + new_conn_alias_flags); + } + /* ignore add_alias errors, there are some valid cases when one * of the add_alias would fail (e.g. first add_alias for 2 connections * with the same destination but different src. ip*/ @@ -1604,7 +1617,8 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, ((l_port==0) || (l_port==a->parent->rcv.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || - ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)) + ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip) || + ip_addr_cmp(l_ip, &a->parent->cinfo.dst_ip)) ) { LM_DBG("found connection by peer address (id: %d)\n", a->parent->id);

1 0

git:master:394d7822: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 23 Oct '21

23 Oct '21

Module: kamailio Branch: master Commit: 394d78229ff26b44666efb021f84ec891b59b5ee URL: https://github.com/kamailio/kamailio/commit/394d78229ff26b44666efb021f84ec8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-23T20:31:21+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/394d78229ff26b44666efb021f84ec8… Patch: https://github.com/kamailio/kamailio/commit/394d78229ff26b44666efb021f84ec8…

1 0

git:master:5ce7fb6e: htable: added iterator function to set expire of current item
by Daniel-Constantin Mierla 23 Oct '21

23 Oct '21

Module: kamailio Branch: master Commit: 5ce7fb6e158aed8744449e7e6f89a9f6da270e3c URL: https://github.com/kamailio/kamailio/commit/5ce7fb6e158aed8744449e7e6f89a9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T20:44:30+02:00 htable: added iterator function to set expire of current item --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/5ce7fb6e158aed8744449e7e6f89a9f… Patch: https://github.com/kamailio/kamailio/commit/5ce7fb6e158aed8744449e7e6f89a9f…

1 0

[kamailio/kamailio] Crash in Kamailio 5.3.7 and onward (#2803)
by Ivan Aponte 22 Oct '21

22 Oct '21

### Description There is a Segmentation Fault that occurs with Kamailio 5.3.7 and onward. It does not occurs always. I am using alpine version 3.12 and it happens after lot of traffic. This does not happens with previous versions. After it crash it keeps crashing for about 5-10 times (something with the dialogs I believe). ### Troubleshooting #### Reproduction  Is difficult to reproduce the issue it happens after some hours runnning. I have not been able to reproduce it out of prod environment #### Debugging Data  I was able to have a core dump. BT ``` #0 0x00007fbcae3d01fa in dlg_onroute (req=0x7fbcae9fd408, route_params=<optimized out>, param=<optimized out>) at dlg_handlers.c:1322 #1 0x00007fbcae71e6b5 in run_rr_callbacks (req=req@entry=0x7fbcae9fd408, rr_param=rr_param@entry=0x7ffe08bf50d0) at rr_cb.c:96 #2 0x00007fbcae714e7a in after_loose (_m=0x7fbcae9fd408, preloaded=<optimized out>) at loose.c:951 #3 0x0000558669815d5e in do_action (h=h@entry=0x7ffe08bf58c0, a=a@entry=0x7fbcae964878, msg=msg@entry=0x7fbcae9fd408) at core/action.c:1077 #4 0x0000558669810bbf in run_actions (h=h@entry=0x7ffe08bf58c0, a=0x7fbcae964878, msg=0x7fbcae9fd408) at core/action.c:1576 #5 0x000055866981c5f3 in run_actions_safe (h=h@entry=0x7ffe08bf6770, a=<optimized out>, msg=<optimized out>) at core/action.c:1640 #6 0x00005586698e8b5a in rval_get_int (h=0x7ffe08bf6770, msg=<optimized out>, i=i@entry=0x7ffe08bf5b98, rv=rv@entry=0x7fbcae9649d0, cache=cache@entry=0x0) at core/rvalue.c:915 #7 0x00005586698ed9b7 in rval_expr_eval_int (h=h@entry=0x7ffe08bf6770, msg=msg@entry=0x7fbcae9fd408, res=res@entry=0x7ffe08bf5b98, rve=rve@entry=0x7fbcae9649c8) at core/rvalue.c:1913 #8 0x0000558669815a51 in do_action (h=h@entry=0x7ffe08bf6770, a=a@entry=0x7fbcae967258, msg=msg@entry=0x7fbcae9fd408) at core/action.c:1047 #9 0x0000558669810bbf in run_actions (h=h@entry=0x7ffe08bf6770, a=0x7fbcae964640, msg=msg@entry=0x7fbcae9fd408) at core/action.c:1576 #10 0x0000558669813c56 in do_action (h=h@entry=0x7ffe08bf6770, a=a@entry=0x7fbcae941968, msg=msg@entry=0x7fbcae9fd408) at core/action.c:695 #11 0x0000558669810bbf in run_actions (h=h@entry=0x7ffe08bf6770, a=a@entry=0x7fbcae93c9f8, msg=msg@entry=0x7fbcae9fd408) at core/action.c:1576 #12 0x000055866981c68b in run_top_route (a=0x7fbcae93c9f8, msg=msg@entry=0x7fbcae9fd408, c=c@entry=0x0) at core/action.c:1661 #13 0x00005586698bff2f in receive_msg (buf=buf@entry=0x558669baffa0 <buf> "ACK sip:529999999@185.X.X.X:5060 SIP/2.0\r\nVia: SIP/2.0/UDP 201.X.X.X:51620;rport;branch=z9hG4bKa229em1tD95yg\r\nRoute: <sip:34.X.X.X;lr;did=d6c.7ac2>\r\nRoute: <sip:204.X.X.X;lr;ftag="..., len=<optimized out>, rcv_info=rcv_info@entry=0x7ffe08bf6ab8) at core/receive.c:423 #14 0x0000558669975ad5 in udp_rcv_loop () at core/udp_server.c:554 #15 0x000055866980f36f in main_loop () at main.c:1673 #16 0x00005586698072df in main (argc=8, argv=<optimized out>) at main.c:2802 ``` I notice that req->callid is NULL and that's what the LM_WARN instruction is trying to answer. I see that there is really a callid in the request ``` (gdb) p req->callid $2 = (struct hdr_field *) 0x0 ``` buf with address sanitized ``` (gdb) p req->buf $3 = 0x558669baffa0 <buf> "ACK sip:52999999999@185.X.X.X:5060 SIP/2.0\r\nVia: SIP/2.0/UDP 201.X.X.X:51620;rport;branch=z9hG4bKa229em1tD95yg\r\nRoute: <sip:34.X.X.X;lr;did=d6c.7ac2>\r\nRoute: <sip:204.44.138.145;lr;ftag=6Ua3gyNtjcNZg;did=d6c.a82f0ab6>\r\nMax-Forwards: 69\r\nFrom: \"V7211038140XXXXX\" <sip:3325040318@201.X.X.X>;tag=6Ua3gyNtjcNZg\r\nTo: <sip:0XXXXX#529999999@34.X.X.X:5060>;tag=yTTrUSrh-D1\r\nCall-ID: 80f064e6-64dc-123a-55b9-d4bed9f99694\r\nCSeq: 38887155 ACK\r\nContact: <sip:gw+1-XXXXXX-XXXXX@201.X.X.X:51620;transport=udp;gw=1-XXXXX-XXXX>\r\nContent-Length: 0\r\n\r\n" ``` #### Log Messages  ``` {"log":" 8(20) NOTICE: {2 1 INVITE 91a0458-d564a8c0-13c4-65014-325a3-60f3462f-325a3} acc [acc.c:279]: acc_log_request(): ACC: transaction answered: timestamp=1626827218;method=INVITE;from_tag=a8f3938-d564a8c0-13c4-65014-325a3-504c0745-325a3;to_tag=00mTqYrLtU7;call_id=91a0458-d564a8c0-13c4-65014-325a3-60f3462f-325a3;code=200;reason=OK;src_user=99999999;src_domain=34.X.X.X;src_ip=201.X.X.X;dst_ouser=9999999#529999999;dst_user=9999999#529999999;dst_domain=200.X.X.X.145\n","stream":"stderr","time":"2021-07-21T00:26:58.667367489Z"} {"log":" 7(19) NOTICE: {2 102 INVITE 2e0da1634918d23662e1ad786be4f5ee(a)34.X.X.X} acc [acc.c:279]: acc_log_request(): ACC: transaction answered: timestamp=1626827218;method=INVITE;from_tag=as751a378e;to_tag=rdsCYaseahb;call_id=2e0da1634918d23662e1ad786be4f5ee@34.X.X.X;code=200;reason=OK;src_user=asterisk;src_domain=34.X.X.X;src_ip=200.X.X.X.46;dst_ouser=888888#529999999;dst_user=888888#529999999;dst_domain=200.X.X.X.145\n","stream":"stderr","time":"2021-07-21T00:26:58.969958529999999Z"} {"log":" 1(13) NOTICE: {2 1 INVITE 919e958-d564a8c0-13c4-65014-325a1-7577499e-325a1} acc [acc.c:279]: acc_log_request(): ACC: transaction answered: timestamp=1626827219;method=INVITE;from_tag=a8e0a78-d564a8c0-13c4-65014-325a1-7a5b131c-325a1;to_tag=maap2JSSk82;call_id=919e958-d564a8c0-13c4-65014-325a1-7577499e-325a1;code=200;reason=OK;src_user=99999999;src_domain=34.X.X.X;src_ip=201.X.X.X;dst_ouser=9999999#529999999;dst_user=9999999#529999999;dst_domain=200.X.X.X.145\n","stream":"stderr","time":"2021-07-21T00:26:59.067200485Z"} {"log":" 1(13) NOTICE: {2 102 INVITE 1f5bbcfa4052aa7c0b9e6def3529999999d7b(a)34.X.X.X} acc [acc.c:279]: acc_log_request(): ACC: transaction answered: timestamp=1626827219;method=INVITE;from_tag=as27988b45;to_tag=2ugyneFdK-6;call_id=1f5bbcfa4052aa7c0b9e6def3529999999d7b@34.X.X.X;code=200;reason=OK;src_user=asterisk;src_domain=34.X.X.X;src_ip=200.X.X.X.46;dst_ouser=888888#529999999;dst_user=888888#529999999;dst_domain=200.X.X.X.145\n","stream":"stderr","time":"2021-07-21T00:26:59.790695092Z"} {"log":"15(27) CRITICAL: \u003ccore\u003e [core/pass_fd.c:277]: receive_fd(): EOF on 11\n","stream":"stderr","time":"2021-07-21T00:27:00.21590784Z"} {"log":" 0(12) ALERT: \u003ccore\u003e [main.c:766]: handle_sigs(): child process 16 exited by a signal 11\n","stream":"stderr","time":"2021-07-21T00:27:00.21832504Z"} {"log":" 0(12) ALERT: \u003ccore\u003e [main.c:769]: handle_sigs(): core was generated\n","stream":"stderr","time":"2021-07-21T00:27:00.218383311Z"} {"log":" 0(12) INFO: \u003ccore\u003e [main.c:792]: handle_sigs(): terminating due to SIGCHLD\n","stream":"stderr","time":"2021-07-21T00:27:00.21839027Z"} {"log":" 7(19) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218395693Z"} {"log":"10(22) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218401306Z"} {"log":"11(23) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218406783Z"} {"log":"12(24) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218479042Z"} {"log":" 9(21) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218598805Z"} {"log":"15(27) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218610128Z"} {"log":"13(25) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218629146Z"} {"log":"14(26) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218768686Z"} {"log":" 8(20) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.218918555Z"} {"log":" 2(14) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.22114204Z"} {"log":" 3(15) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.222683081Z"} {"log":" 5(17) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.2228392Z"} {"log":" 1(13) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.224429948Z"} {"log":" 6(18) INFO: \u003ccore\u003e [main.c:847]: sig_usr(): signal 15 received\n","stream":"stderr","time":"2021-07-21T00:27:00.225537387Z"} {"log":" 0(12) INFO: \u003ccore\u003e [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized\n","stream":"stderr","time":"2021-07-21T00:27:00.240625585Z"} ``` #### SIP Traffic  Unfortunately I couldn't capture traffic ### Possible Solutions  I went back to alpine 3.10 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.7 (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, 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_BLACKLIST, 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: unknown compiled on 12:42:10 Jul 15 2021 with gcc 9.3.0 ``` * **Operating System**: alpine 3.12 running on a container ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2803

3 4

[kamailio/kamailio] core: tcp - add alias for cinfo dst IP (PR #2888)
by Federico Cabiddu 22 Oct '21

22 Oct '21

#### 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  As I reported to developers' mailing list (https://lists.kamailio.org/pipermail/sr-dev/2021-October/064243.html) if support for proxy protocol is enabled, kamailio is not able to match a tcp DEST_IP/DEST_PORT to an alias of an already existing tcp connection. This beacause the (local) destination ip on which the connection was initiated is overwritten by the destination IP and port carried by the proxy protocol header. Since the original connection info is saved when parsing the ortocol we can use that information to build a new alias and to use it to match outgoing tcp connection later. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2888 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2888/commits/3bd59bb17a575a4d3697…">core: tcp - add alias for cinfo dst IP</a> -- File Changes -- M src/core/tcp_main.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2888.patch https://github.com/kamailio/kamailio/pull/2888.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2888

5 12

git:5.3:67f40d2f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Oct '21

22 Oct '21

Module: kamailio Branch: 5.3 Commit: 67f40d2f7e59820e8527cd8457e70741caf0c2da URL: https://github.com/kamailio/kamailio/commit/67f40d2f7e59820e8527cd8457e7074… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-22T14:32:49+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_client/README Modified: src/modules/pv/README Modified: src/modules/rr/README Modified: src/modules/textopsx/README Modified: src/modules/tls/README Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/67f40d2f7e59820e8527cd8457e7074… Patch: https://github.com/kamailio/kamailio/commit/67f40d2f7e59820e8527cd8457e7074…

1 0

git: new commits in branch 5.3
by Henning Westerholt 22 Oct '21

22 Oct '21

- URL: https://github.com/kamailio/kamailio/commit/3bcbc75ffd69818ca6ce2491fc7aa7f… Author: Theo <theodor.scherney(a)kapsch.net> Date: 2021-10-22T08:48:48Z tm: 200 OK not processed correctly by Proxy after final non-2xx Description: Problem: Forwarding of 200 OK while sent 488 waits for ACK, destroys the UAS send buffer Scenario: During suspension of 200 OK by ims_qos module function Rx_AAR() at terminating PCSCF, The PCRF sends an AA Answer with result code DIAMETER_TOO_BUSY (3004), which triggers the PCSCF to send a 488 âSorry no QoS availableâ to the originating side (ims_dialog module function dlg_terminate()). Afterwards neither the 200 OK nor the ACK(488) is processed correctly by the PCSCF. Solution: The UAS send buffer should not be overwritten during processing of 200 OK, because non-2xx is needed to associate the ACK message in a correct way. 200 OK must be forwarded statelessly. Side-Effect (potentially breaks existing function): Some callbacks cannot be called for the 200 OK, to avoid messing the stored 488. (cherry picked from commit 18410da04c7f7bbc9628820427fedb92cf893526) (cherry picked from commit 31f8466f1d493db8baaa215d34d4ed4545d4ff79) - URL: https://github.com/kamailio/kamailio/commit/f7f85a97ec0f0b5f9c0f8486cfb13f1… Author: dvillaume <david.villaume(a)gmail.com> Date: 2021-10-22T08:52:31Z rtpengine : add node fallback if node out of port When rtpengine answers with error-reason 'Ran out of ports' adopt the same behavor that when node answers 'Parallel session limit reached' (cherry picked from commit 853068a26c34deff86e17b63f49abea2c8f4403c) (cherry picked from commit ee7838842a175ffb4898dade606377c91cc8ecb8) - URL: https://github.com/kamailio/kamailio/commit/32d5f65ad2bcf8c27f2abcf321ab289… Author: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-10-22T08:53:58Z http_client: http_client_request to include default clientcert, clientkey,... - the lost module uses http_client API functions and in the course of NG112 client certificates are used for authentication when querying LIS or ECRF, the fix allows these to be read out via http_client module parameters. (cherry picked from commit 7d5868ab1242eb8166e6af1bb8a21b39001df663) (cherry picked from commit 95e7399481e61ec54bb226c122c5617f03553b5d) - URL: https://github.com/kamailio/kamailio/commit/ec4c507f32f691b0abed128c5d08036… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2021-10-22T11:15:52Z Improved README. (cherry picked from commit 857e9deb4c2455ee2ea0c05446da54f97e1f0a63) (cherry picked from commit 0f4eecdca36e9fc3311175a354a2404367b1e2fb) - URL: https://github.com/kamailio/kamailio/commit/44cf58293816bd802aed2725a15acbe… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-22T11:16:48Z pkg/kamailio/deb: restore python3 dependency of kamailio package (cherry picked from commit ab8e680e0dd3a8078d40b72c50d41db55d442240) (cherry picked from commit 864238f68588923ca60758251bd5f5ab3ac838fd) - URL: https://github.com/kamailio/kamailio/commit/7a000808522c1b0da9b3bb247239004… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-22T11:19:55Z ndb_redis: add result check when reconnecting Reported and provided solution by @kritarthh follow-up #2461 (cherry picked from commit f82a2563000361b6b1b12b4bb72b9a8ee4c62292) (cherry picked from commit 3945ea2b7e59a6d6385344967a24b7bcdfd5f307) - URL: https://github.com/kamailio/kamailio/commit/9b6d076e70ccd1b7b313c123081cae2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:20:39Z core: typedef for str_list struct (cherry picked from commit e1dc6dd6d9b206168f6da2929560ca6a64e1b41e) (cherry picked from commit 9de2eb8c4ef9d815be062d4f2c81db93129b520f) - URL: https://github.com/kamailio/kamailio/commit/e1936024dd606d92520d3a26fc34abc… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-10-22T11:22:03Z ims_diameter_server: check response is not null before json conversion (cherry picked from commit 6968f1df9e9d3d66810df910d290f3d9368255fe) (cherry picked from commit beb59d4bf335c927d1224e02a67e81d2f530ca14) - URL: https://github.com/kamailio/kamailio/commit/43485620bd3751a559718e25a278111… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-10-22T11:22:10Z ims_diameter_server: fix initialization of s_message (cherry picked from commit faf1edabf732af5a24ad0399098ad11e27b3a1ab) (cherry picked from commit 9fb04eb982ef4903801970981faff9b547258c32) - URL: https://github.com/kamailio/kamailio/commit/aa74795864d1846704caa113dcb9d8a… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-10-22T11:22:17Z ims_diameter_server: drop cdp session to avoid deadlock (cherry picked from commit 84c342277f2a73196cb377476f2b80e6b4085e7b) (cherry picked from commit 0d4e6c8b7450823dfb8caa6baaa6ce08328b1af3) - URL: https://github.com/kamailio/kamailio/commit/1943d3e47da73638d6341695e26805a… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-10-22T11:22:27Z ims_diameter_server: fix check for addAVPsfromJSON return code (cherry picked from commit 88d38bd306f595585af6e972ac529b40d7a93b58) (cherry picked from commit 532eedac63d0bd2b0c4c6b4f9557ac243b008376) - URL: https://github.com/kamailio/kamailio/commit/50eab0e12219ad1928428818ee8ab16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:22:49Z pv: handle missing fields (otcid, instance) for $banch() and $sbranch() (cherry picked from commit 0c4becd70428ef15be76fb0aa53932e5803c6bd0) (cherry picked from commit 50e9db0cd53381cec5e522777556adbb6bf1a039) - URL: https://github.com/kamailio/kamailio/commit/a6c5f6916016d4952cbae7fdecb9512… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:27:47Z rtp_media_server: Makefile - removed unnecessary DEFS+=-DKAMAILIO_MOD_INTERFACE (cherry picked from commit 7532f864cb9698aff95b9023bc9ff6959a41fd3f) (cherry picked from commit 8248442af0d32ee4045590dbb8b083bad5416933) - URL: https://github.com/kamailio/kamailio/commit/0b61cceecb9c257edadfec534976891… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:29:08Z presence: do not init db in dmq worker for in-memory only mode - GH #2642 (cherry picked from commit 2b475553ef77f63cb444c34ad6c2df0ea237c88b) (cherry picked from commit 293e161fb8828310954ea37f522c2e0b526ac827) - URL: https://github.com/kamailio/kamailio/commit/05a45ed1f82df89a468d1e9a97ebd64… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2021-10-22T11:29:25Z smsops: fix parsing of validity period - Validity period is present only for SUBMIT msg type and it is an optional parameter. For now supports only Relative VP format. (cherry picked from commit c4b1d0ab700ea03869114d08daa78ab6a6a56b96) (cherry picked from commit 5d47465d6791f6213994ae77089d1569a2ea0bf4) - URL: https://github.com/kamailio/kamailio/commit/72e7f024f6eb860e741751078bbc5f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:29:58Z core: comments updated for msg_send_buffer() (cherry picked from commit 9c2c4bafa0f0cd980b5867e7d4c0995255730f87) (cherry picked from commit d23aef79e6ecd6149b9a6db7a09dd467e92a5e4c) - URL: https://github.com/kamailio/kamailio/commit/8aac70eb047266d6f5897e047eca026… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:31:36Z pv: docs - note about use of $shv() in kemi scripts for shvset param [skip ci] (cherry picked from commit bcc6370cdc00f25ce3d0f29e168c20ca880dcda2) (cherry picked from commit 0c0d833aeeaf6a4fed91300189e2c4fea3f9afdb) - URL: https://github.com/kamailio/kamailio/commit/7fa2b0b1978e309c6826a963a2f9570… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:31:49Z pv: docs - relocated shvset note outside of param definition details [skip ci] (cherry picked from commit c959a3c5f5efa1158bd53a31476f33d080793928) (cherry picked from commit 9a8002541773108a3a9dcb8a2f31a917e8b14bc4) - URL: https://github.com/kamailio/kamailio/commit/f137fb393e1d2f4e0c31b21aa62b629… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:32:35Z path: set dst udp uri length for decoding received value in alias format (cherry picked from commit f90640f7cec45a359e996493ae91b1a45d2603e7) (cherry picked from commit 8d6c2b96e83fc58f7159957ea86d5f91c00808ba) - URL: https://github.com/kamailio/kamailio/commit/805fd7e04f300b49fac6ebcf955cbcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:32:51Z path: removed svn id header (cherry picked from commit 0f0a56ad5c97a611fab64fc9b9eba304643dcec8) (cherry picked from commit 7c9ea2bf08ae3c481548b27fd4a793a9aee03155) - URL: https://github.com/kamailio/kamailio/commit/025d6cb8593853fb347edc6352049dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:33:01Z textopsx: docs - notes about 1-based indexing for hf value functions - GH #2387 (cherry picked from commit 6379f1280ba41e87ddb34fa1705ffe4231dcac9c) (cherry picked from commit f5334a57ae5159f1a37b3f25b9db220a9a860fc2) - URL: https://github.com/kamailio/kamailio/commit/c5449c7806064e5aaa07c04bbc61bbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:33:18Z core: parse uri - cast to unsigned for left shifting (cherry picked from commit d4e31e6ae494836c49e50f463517a576b18c5611) (cherry picked from commit 8622811124f641b6a4b09a802758a354556850b0) - URL: https://github.com/kamailio/kamailio/commit/f5ad8d2afc73a906d0b4866e640839d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:33:31Z core: parse uri - check for invalid port values (cherry picked from commit b7f753ddc727e1d7ab42e7abe607059e03976f8d) (cherry picked from commit 3dca9d6bff8e08677a02e3bb0f47b4c0889f2cca) - URL: https://github.com/kamailio/kamailio/commit/0d3ff19ec3ce7c628f3fb4f007556c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:33:42Z pua_dialoginfo: skip requests that do not control call state - GH #2700 (cherry picked from commit 1b47452cebb1b7866cbbabd5068a9ff4a39c86d2) (cherry picked from commit 8b112fbb5e362931b5c684fd4a6c3fdcbb9103e3) - URL: https://github.com/kamailio/kamailio/commit/4fa11c5d98d5972c175be23a84e8e1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:33:51Z core: init allocated memory in str_hash_alloc() - removed unused pointer shifting in dset.c - small reworking of lval_assign() (cherry picked from commit ba9f2b5af9cabd61f67ceedb8feab6bd7bc6526d) (cherry picked from commit 8cd3b40aa7e618226b0137f5e758bc7a634ed0c2) - URL: https://github.com/kamailio/kamailio/commit/36bba66fb493d744aa01259b00d5eaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:34:00Z .gitignore: ignore files that can be generated by compiling tools (cherry picked from commit 1536f4bb3d4e654c8169afb6599c47c26df12ef6) (cherry picked from commit 2d091fa67133e49d23e81007820900ceef91f503) - URL: https://github.com/kamailio/kamailio/commit/792a25a6d025d806466c772f8c130ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:34:09Z core: fixed condition for 0 ID or NULL NAME AVP - avoid null in memcpy for AVP_NAME_STR (cherry picked from commit ca1821837dfe7dd6630f628d968ed4d1178c7040) (cherry picked from commit aa285587c015e03a105442b1964ac0dd1dc52f1f) - URL: https://github.com/kamailio/kamailio/commit/519a2e1676beb127e16bede8db632c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:35:55Z core: usr avp - fix detection of invalid name and ids - use the fields designated for str name or int id, code analyzers can follow properly the execution path - regression introduced in ca1821837dfe7dd6630f628d968ed4d1178c7040 (cherry picked from commit e4506385ca5a56d4861f36e85c1049599cba398f) (cherry picked from commit 967dd294ba424bf66e27bebe4d6261e0c8a66471) - URL: https://github.com/kamailio/kamailio/commit/2a6ef42a3635c570182474bd6e87ce9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:40:54Z imc: expect the second param only if first is set - bits of formatting for imc_handle_create() (cherry picked from commit c08620f6427d59749396fe2762e340328ce69c41) (cherry picked from commit bdd0da206d115e93383899463ad5f726ac34230c) - URL: https://github.com/kamailio/kamailio/commit/b6225105448397984f1d9a51b3abac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:41:29Z core: main - several optarg safety checks (cherry picked from commit 4f7b5537688293d196669dd5a7d0124f7656cf2d) (cherry picked from commit 6e38b6e81e8cdb656b28e221a59aaf7a38b76ef3) - URL: https://github.com/kamailio/kamailio/commit/93ae43dbd027db360ebf6b611c63da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:41:38Z core: rvalue - function to destroy content of rval without freeing it - needed in case of rval reuse in rve_replace_with_val() (cherry picked from commit e770e0aa6889f001a3f7f2644202bf106f6559da) (cherry picked from commit b1b91fe1969f65a94516baddc94738f72b587773) - URL: https://github.com/kamailio/kamailio/commit/04f37177079ba2497437b682b143049… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:42:15Z core: rvalue - link to free at end of rve_opt_01() instead on replace - debug mode messages print fields (cherry picked from commit 7652f79640b3e792baa77531e697fd74a1ab4584) (cherry picked from commit 05f60d4d4a20d127a23bf6e42853060a757434a6) - URL: https://github.com/kamailio/kamailio/commit/517ff885f643edbfe552a639458f14d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:42:28Z core: use same condition for extra_params in create_via_hf() (cherry picked from commit 62e822ce25e93a8183dd9e5e1fee517143849a6a) (cherry picked from commit 9d8b937f832334be2660f95c9886ae3da6b60968) - URL: https://github.com/kamailio/kamailio/commit/833a8ad93708228e9decb876049c6b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:42:54Z ctl: free send_buf in case of error - disabled unused function (cherry picked from commit 3bb1a30dda3b40ba2f188a4baab94ebda41f4a74) (cherry picked from commit bb1102a9366992b885100960000c9e589971b9ec) - URL: https://github.com/kamailio/kamailio/commit/552734a622ccb2060c1d8aae3f57696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:43:06Z app_jsdt: init timeval structures (cherry picked from commit cad5cc37c63477fbcf429af34e516b523c74132e) (cherry picked from commit 3aa2bfd98e6b647eda8f8a27f2da3f5b9f645feb) - URL: https://github.com/kamailio/kamailio/commit/d2472d083f5bc23ce0ebf7f6af93bc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:43:16Z app_lua: init timeval structures (cherry picked from commit e1369a4cf0c668a0ee40d3b84b9c6382c2168e49) (cherry picked from commit c13836bd9feeb27878810cd469d839d2717c8425) - URL: https://github.com/kamailio/kamailio/commit/53b1be8281f31aa5750dae8ee677dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:43:21Z app_python: init timeval structures (cherry picked from commit 97991c9cf56ca034df914ae499053e597582ef80) (cherry picked from commit fa571b6f79f9a2a9c06ccb3494ed2ad0e14b529d) - URL: https://github.com/kamailio/kamailio/commit/b5b829a1bfd6c5129dd20530b72de1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:43:26Z app_python3: init timeval structures (cherry picked from commit 7457b3cefd08595c054291398de0f9a4e62691b7) (cherry picked from commit 8341025d73c0911683f8bb461d5b5b2594683871) - URL: https://github.com/kamailio/kamailio/commit/651776e0a004eb324193a6e1b1d9742… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:43:32Z app_ruby: init timeval structures (cherry picked from commit 50f92131ac0a9f5dd1e19fb6e3636657ad996e37) (cherry picked from commit 50e3e3761804dd71a615f95eeb67c2d6e1462829) - URL: https://github.com/kamailio/kamailio/commit/fe2789dad9909ca10843f94e9d8d073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:43:39Z app_sqlang: init timeval structures (cherry picked from commit e8583372cb1078a29bb6526c11f838e30811b94a) (cherry picked from commit 7d5ab8071aef32d2c59f6acc7e93923fb76eec04) - URL: https://github.com/kamailio/kamailio/commit/2443cf0abf649de7bb1f16b147a56e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:43:59Z core: cfg.lex - free after log message (cherry picked from commit 563c6f69aef22a90fc7870398fcfbd4242e33779) (cherry picked from commit d9eb361ebc07a84f5a36fdad4c0a576b341d351c) - URL: https://github.com/kamailio/kamailio/commit/2f2f0cdb6530edbd488fcdb960a6521… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:48:54Z core: main - coherent behaviour for fix_cfg_file() - duplicate to build the output always, safer not to try to change the static string defined via macro at runtime (cherry picked from commit 74fa6c5570d6394af8c5352bd37e21e970f1575c) (cherry picked from commit 7ec5c6ec53f333b7a65a02d46ee8a3757c264e2e) - URL: https://github.com/kamailio/kamailio/commit/8e6cfe02e85485466ca18435cfcecb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:49:21Z core: dns cache - safety checks for rdata field (cherry picked from commit 7ea3b97c8acf8b623563b7a9fbf4ba23ea3e9170) (cherry picked from commit e2d4ab36df274e92e9e04fc8b1973a49c3489b9b) - URL: https://github.com/kamailio/kamailio/commit/98f99ac732dd4acb9668bb8db74aefe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:49:29Z rtpengine: reworked condition around locking for easier pairing - inside rtpengine_hash_table_insert() (cherry picked from commit c200d2e9109a5581491bebd91c30162716b0f4fa) (cherry picked from commit 5e431ebf2d2986be962373dc9adba904bb714f0d) - URL: https://github.com/kamailio/kamailio/commit/ebe9db5f8888f74376c7841815d6b35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:50:03Z nat_traversal: check parameter for send_keepalive() (cherry picked from commit f33abd5e2d5978ba9e6e8a48066b0daff70c0b3b) (cherry picked from commit e0948071566a8d978dc2c57a21a7448b953a11e1) - URL: https://github.com/kamailio/kamailio/commit/a9b885eb8051263784b36fe96990f0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:50:25Z core: cfg ctx - checks for valid variable offset (cherry picked from commit 303be6a94be40dbe7c26c96e768627e8e9d0f860) (cherry picked from commit 335b40a417ff457f290ab6e963344ffc7839776e) - URL: https://github.com/kamailio/kamailio/commit/246daa4f42b080a2dd7bf7ccb214446… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:50:45Z dialog: safety check for prev field (cherry picked from commit 80beb29ac0204697a8964231b441ac37866a4a1c) (cherry picked from commit f5e8a6042f141fd32f611c5ddc8232d793448b7a) - URL: https://github.com/kamailio/kamailio/commit/4eaecde9da9924727a5f4a01ae8ffea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:50:51Z pua_dialoginfo: check request to cover cases of callbacks without it - updates the previous commit (cherry picked from commit 912e2ef41533e961bc55ca80619305af8e474469) (cherry picked from commit 2e16763a9c261cec47bd429a1dc0bee39f9c46d8) - URL: https://github.com/kamailio/kamailio/commit/78fd3d230962cb0b30d90bc7cf37c74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:51:25Z db_text: safety check for lres (cherry picked from commit 8a5b764e77d009eb6f236e74d3462bfce0d57f07) (cherry picked from commit 782aae708701eaf8bfc97d72263d1e2e08569515) - URL: https://github.com/kamailio/kamailio/commit/83c9f15b166cb5275cb5a9c731e3b4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:51:34Z pike: safety check for ll variable (cherry picked from commit b123dec934769522407dad619bbb6c2074719884) (cherry picked from commit ce30413e6e60c1674d7200c32469779398860c40) - URL: https://github.com/kamailio/kamailio/commit/01b6d5626a0168ef098e54a08181530… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:51:48Z sca: return on rpc fault (cherry picked from commit 005f4468bc5873ea02b6c0d3d75baa49067e17c9) (cherry picked from commit 681952d1f1fc5d0226f4a7adb99e7cfefef8727b) - URL: https://github.com/kamailio/kamailio/commit/06da5918154ac0ede8ee4cc47634246… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:51:54Z group: check if credentials are parsed (cherry picked from commit e84c1985f1c3ed7a791660702b398b9ac1eb1f4a) (cherry picked from commit 95bbb4f0b1784a20db5c76fdbdd4fc58a2250b6d) - URL: https://github.com/kamailio/kamailio/commit/7e043c7299e5652ec4227f93dbf9835… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:51:59Z imc: safety checks for function parameters (cherry picked from commit 6c8d61850aa662016d952f25dc510ed4d602e10c) (cherry picked from commit cbe81cd6941c277893958d5be45655ac21c6890e) - URL: https://github.com/kamailio/kamailio/commit/5d7eba3a53dbb224ca3be55f77be1b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:52:05Z avp: check for null string (cherry picked from commit c30cd3db7587a3c875770fbc558f4a5ad38b58bd) (cherry picked from commit e5de8af690af460f086c6191a7502c903ca55699) - URL: https://github.com/kamailio/kamailio/commit/94c9af869b3613a0105e41e40187482… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:52:10Z seas: check when walking the list (cherry picked from commit 7231be0785009cb17581822f0765985eb7bdb243) (cherry picked from commit 98b091d16072bc767affde805c30c7ec4911b9ec) - URL: https://github.com/kamailio/kamailio/commit/545f9f62f01169d6b7142454617ca98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:52:42Z core: resolve - safety check for setting port (cherry picked from commit 703d6202e73e4e3778a2c66f4e29ae87dc6ac211) (cherry picked from commit 1e6561f86d4a139834952ff21b74ecca0b508966) - URL: https://github.com/kamailio/kamailio/commit/5dbddb10fb628fc79fb40d7e8797782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:52:54Z core: main - set ending 0 in allocated cfg file path (cherry picked from commit 15f57ceae26b967ad92dd3a97ebcd869d1197244) (cherry picked from commit 38d72250f4c9c77bee71262b6c340503cc9a92a2) - URL: https://github.com/kamailio/kamailio/commit/151cc160f4d5235fff6cd637628a108… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:53:19Z tm: lw parser - fix matching To header in lw_get_hf_name() (cherry picked from commit 4ab6e05df56afb7802a2cd125e89b9282a1c6c85) (cherry picked from commit 33db4ffc558b7a9d4c291c929b9e73b3cf8b16f0) (cherry picked from commit 0572c8192d26702fc0ac21ae76cbf81fbad91126) - URL: https://github.com/kamailio/kamailio/commit/0d4cda4697a8c62c7d9f10b9cb54e78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:53:43Z core/mem: q_malloc - use #else with DBG_QM_MALLOC for debug on freed fragments (cherry picked from commit 764d5be0c44036bb4b86f841588fb0df3b4bb834) (cherry picked from commit fc90e4c06c5df8c8a9d5cd615923c09a93b5a810) (cherry picked from commit b95e319d006a38fcc6385d704de82e553f7c2236) - URL: https://github.com/kamailio/kamailio/commit/bbd2e0df5480317013b223c3c6810c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:53:53Z msrp: check return code for str explode (cherry picked from commit addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e) (cherry picked from commit e55ecc6412997b55569f3b626a681eae0ca312df) (cherry picked from commit bde591dc9507eaea0b744112d49ea01fbdf8f555) - URL: https://github.com/kamailio/kamailio/commit/ab6d2d4dedd23ad75e34b4a41ea6313… Author: SPChan <shihping.chan(a)gmail.com> Date: 2021-10-22T11:54:01Z [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. (cherry picked from commit 27904530d1f8efd26e2b96fa5f18a3aad887919b) (cherry picked from commit 1c7a8459f1a5b0f4d96f3908a301b599d5e24dc3) (cherry picked from commit 1142d5470d40801743af2fd9e27213bae6c394f4) - URL: https://github.com/kamailio/kamailio/commit/345a3ef9c9bc8c8f8796f2003835187… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:54:26Z msrp: destroy str array on error - some code reformatting (cherry picked from commit 4695b48b23e22135049f67a6ef362e933a0cf337) (cherry picked from commit 33cf417e59b4c7f0e45b6258644bae364ad2e912) (cherry picked from commit cd8a871c5a4c6446eddc48bd89bfe5cde89a6c21) - URL: https://github.com/kamailio/kamailio/commit/5d85ec7e1e08fb711c19f9953ff59a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:54:34Z tls: declare variable based on SSL_CTX_set_ecdh_auto - fix unused variable warning introduced in previous commit (cherry picked from commit 41b5e9473d79409712d46fdbb5a0b943ab880aa7) (cherry picked from commit 52c7d2f4d6704c7ea232808110fc09c17c90c4db) (cherry picked from commit 078c6f861fc52c28546dae5ce335002e5d5df99f) - URL: https://github.com/kamailio/kamailio/commit/f35671cd797fd63daddd264843c1967… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:54:40Z dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all (cherry picked from commit 7aa8056a5e3a9804133cb9ff79640d8116be63da) (cherry picked from commit 6d71c9399027f2ed41cd6eae576d862440bd4fd4) (cherry picked from commit 1b517a7e560f20331aa94accca813825e0e0ff0b) - URL: https://github.com/kamailio/kamailio/commit/45de452009a026b6deb66a2379d31ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:54:46Z presence: set correct type for local_log_facility modparam (cherry picked from commit 5f4662a95a97d5224bf03745a9a354a41925706c) (cherry picked from commit 5bc7e1d636b617839f697838e326347b19cb0fcc) (cherry picked from commit 0675c3eb0fa95e19532cf812585f1eb021829dbc) - URL: https://github.com/kamailio/kamailio/commit/ce676802926fe9d705c9d86e97f471c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:55:17Z pv: more details in err log message for s.select parsing (cherry picked from commit 02ad9e1b87f89b9456d0d85e16c2fe0cda67ab64) (cherry picked from commit 2273d7d856b5c1fca1ec24fbb6ee249793ea6719) (cherry picked from commit 34ee120ab555b9aab364af4570033c3a08451fda) - URL: https://github.com/kamailio/kamailio/commit/a3eaa9ca535b5b4e5a5d6fd44b05995… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2021-10-22T11:55:23Z snmpstats: Fix typo in MIB Reported by arkadiam on Github (cherry picked from commit 7f017707c91659641ce9ca87ee4149b2e39379f7) (cherry picked from commit dbd8e3899335eb8795763fd52b1f91aebfad1c92) (cherry picked from commit 2c501f4d7b9678f0cfad3afec5e3095fd61e1763) - URL: https://github.com/kamailio/kamailio/commit/901d1ae833617e27a94c93771fde487… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2021-10-22T11:55:29Z mtree: Fix some typos, adjust some formatting (cherry picked from commit 316c80607243387015e35ac423238c5a32401a44) (cherry picked from commit 3bfb1773c01731177824b907180a7eeb7e43d3af) (cherry picked from commit 00d7187532b87507367b00110f22bd8e0e14db7c) - URL: https://github.com/kamailio/kamailio/commit/659a8d30e0711e2944f6d7274fb6b70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:55:34Z mtree: check if pv_count var is r/w - reported by GH #2750 (cherry picked from commit 63b0345207ba67fcc6290d6dfc55f99ba58b13c9) (cherry picked from commit 7323d812dc4a39c0e60f11668e09a50ef586a8f7) (cherry picked from commit df8fb404c1f3d016f97872d78fe07d604de6ef8b) - URL: https://github.com/kamailio/kamailio/commit/3b659508cbca7ba485699b96d0ca9ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:55:40Z core: parse via - fixed whitespacing (cherry picked from commit 01664d1d82dcfe952fce29033b4fcd5e44cf2319) (cherry picked from commit 19901d0cdb6cf06a84315c19a27986bca7a05025) (cherry picked from commit b5ae51af479d4e54e5d8c3f5e85908e68183e9d4) - URL: https://github.com/kamailio/kamailio/commit/f672c96ddd5cc4997bd7e0e76fc108e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:55:45Z async: safety check for async ms list (cherry picked from commit 5b0e74c1832d2d09fe36424e1e1aaaacde920b31) (cherry picked from commit 93dc038f3f1f854b1e0987ec28e49d8a70293e19) (cherry picked from commit 30b33f772739c593f1b58a2b871e127effd12f58) - URL: https://github.com/kamailio/kamailio/commit/27db219c90b230b6c8821709e38f3d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:56:32Z dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 (cherry picked from commit 490ae559d2b77b13b3f3831e7ff1aa58980e4086) (cherry picked from commit b6428ca86c821ddf74fd4ea8a17aecdce39934f4) (cherry picked from commit 465fbace1586874b60b98ab04caddd1c76b2810c) - URL: https://github.com/kamailio/kamailio/commit/fc7d780ee0e59d399edd8a89b35f7be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:56:46Z pv: test for HDR_ERROR_T after header name parsing (cherry picked from commit c264fbc66a4690b073c72ffa8fc095227ce0ae8b) (cherry picked from commit 18e85c98bb6eebf9afe83aaa0a832d1c4af46e62) (cherry picked from commit 5e39061818a0d52ac3a692c6357a497a09207e87) - URL: https://github.com/kamailio/kamailio/commit/783b75d167f94ade3043ce47b5e8087… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Date: 2021-10-22T11:57:06Z app_perl change to ignore "die" signals from eval blocks (cherry picked from commit 50557b8433e137a9095b4d48df8ac9b8c3fd8807) (cherry picked from commit 7192139d77f844cd927c326ce16cadfc63378b35) (cherry picked from commit 5b849659b23c1fad9161d51c1e7aac5a96d8850c) - URL: https://github.com/kamailio/kamailio/commit/96475bbbeb26bdc6583c5a2f93ca673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T11:57:13Z pv: added missing WS and WSS to $K(key) variable (cherry picked from commit a8c9d0ae4fbafba89ef12737419037d141eed1d3) (cherry picked from commit 7b89c5e6abe5f4ae3ee55d9c938c865806f29dec) (cherry picked from commit e1fb94f5c258038527f8f8df90135d6a4c2a4391) - URL: https://github.com/kamailio/kamailio/commit/e9e7db26b50d1de46f880f58140ca1d… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-22T12:01:35Z siptrace: fixed IPv6 without brackets more details GH #2775 (cherry picked from commit 417eb2a7052a9354712663cca9e3bc075a3f69c0) (cherry picked from commit 903e41468a00edeff52cbf1e3c0053c82860c92c) (cherry picked from commit 4f02ec387cf9f46cc83ec6fea0df0a17ab7f08a5) - URL: https://github.com/kamailio/kamailio/commit/7f287005f5bb186ca2227876299bc07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:01:57Z xhttp: extended example for event_route[xhttp:request] (cherry picked from commit 195de260f102f1a016ad7bd1021571c1dd8a983f) (cherry picked from commit 42df0f0b58a2b5780a9bf613a5a29d4af27b4f67) (cherry picked from commit 198753a49da7ff81965d4eeac1d96e53dbe901a6) - URL: https://github.com/kamailio/kamailio/commit/76781176e19b689716d3e50ee6bb4a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:02:04Z websocket: docs - added tcp_accept_no_cl=yes to example (cherry picked from commit a05b4d7c2e413032b1a63f3d017243446a0bc6ec) (cherry picked from commit 9d7301652ca7f051df4a23b6be3a83d3f21baa5d) (cherry picked from commit ca97ee946df51fe8b2ceff5ea0ec890ebbdfac0c) - URL: https://github.com/kamailio/kamailio/commit/b850f2dafe897f6a13ee9dbd0c37c77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:02:40Z http_client: docs - fixed small typo (cherry picked from commit 1f67ac5a62b58b35df52aedbd1a3d2234a72817e) (cherry picked from commit 6a527503a653d554ffb38f8bd7a40fd75441ff4d) (cherry picked from commit e9e190302f397b4d133fc5ca3a20168e93e51cd0) - URL: https://github.com/kamailio/kamailio/commit/7aa17d7618b721fd461382911ab1c0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:02:53Z http_client: check if shm is initialized in curl_parse_param() (cherry picked from commit 7741ad7979d54fb4ee1247760d8d5c3666353a96) (cherry picked from commit b27dc141ccddfb3e0f77399ead8b2b158942de69) (cherry picked from commit 2ab8cb38f9ddf01e174c3525ebdec35d6c83406e) - URL: https://github.com/kamailio/kamailio/commit/c35c12b613b75d9e03eef2852f0c384… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:02:59Z http_client: clone name in http connection structures - use name to lookup private memory structure, hash id is not unique, can be collisions for different names (cherry picked from commit 9429083c87b1323e31983cc71551676c199bf640) (cherry picked from commit 459f40b52a8a6f8b2ef70a6986c686448ea572a8) (cherry picked from commit 810ea55bcbd557f4544dd1a1ee21bcff558ae553) - URL: https://github.com/kamailio/kamailio/commit/18a0b6f3fa0346157ff0e2952155b41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:03:05Z http_client: removed function names from logs (cherry picked from commit 84d245fb4eda7690a89b4057301f81685a9452d8) (cherry picked from commit 2dbf48822451433f4ee8863a954a4c40da0eb2bf) (cherry picked from commit be8bb14a48c3797d4884c7f8a33fa3edf172942a) - URL: https://github.com/kamailio/kamailio/commit/aacc6797709706c1be2da2be6e8f45d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:03:11Z core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 (cherry picked from commit 0d06e164efa720d91d49995585e80c9082ce3b21) (cherry picked from commit 1f9f6fff6e0ab21e460538ffd1e54b6c60f54f7e) (cherry picked from commit 5d30b9111e1e80553ba260767521b9132b82d6a7) - URL: https://github.com/kamailio/kamailio/commit/4dca9f84d0531c62fe41c0b3dfa92c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:03:20Z core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots - GH #2798 (cherry picked from commit 61cbb5e861aeb9b7f69ebb8d284e3ded0ede9cd8) (cherry picked from commit 75571e1739470877365e7c25548ef282e81283a1) (cherry picked from commit f5c81022fdc769f306cf720bece29f1d265bfe61) - URL: https://github.com/kamailio/kamailio/commit/47eaf5aeb03d5fbb204e9381d4e8e4a… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-22T12:03:43Z core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 (cherry picked from commit ed46adad82e7b6569eb42704c5460263d2af75f7) (cherry picked from commit ba8a06d2988e41b09947d3ae3386a13e3d8415b9) (cherry picked from commit 69819531b532fdec7956c0c28e1ea1aadcc2bc2e) - URL: https://github.com/kamailio/kamailio/commit/bd8e3d7a8a9741ddc4be1ce1acee050… Author: FredWH <wh720(a)139.com> Date: 2021-10-22T12:04:01Z db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 (cherry picked from commit 7cec977f8e12bbeb0309d903e02461d1ccbf41a8) (cherry picked from commit 48eb41654859e6130c82c46400b529f2af9ce908) (cherry picked from commit e9272d8d67b9f8f9e04ad511ae014573b0aeb227) - URL: https://github.com/kamailio/kamailio/commit/d56fa4557facecc121ee02f78224681… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:04:10Z core: parser sdp - shorten debug message with sdp line - was printing the rest of the body, print now max 20 chars (cherry picked from commit 4191a8193025499df64f13d59f5716563e573161) (cherry picked from commit ede5a8399662903c2aa081b7010603398a598e94) (cherry picked from commit e5785361cad74949bde08386b857c1307822eac2) - URL: https://github.com/kamailio/kamailio/commit/6c282a9acf843066c8abc1aae5210a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:04:16Z sdpops: refactored sdp_remove_str_codec_id_attrs() - line oriented matching of codec addributes - support to remove a=rtcp-fb per codec, GH #2755 (cherry picked from commit 1a15a18eacd5764e9ba6240acbe37e645368f825) (cherry picked from commit 96f24caed768b1b382b166eea835e555eac5e933) (cherry picked from commit 7fd662c98aa14d9b2fb730cfce0f6391ab756ed4) - URL: https://github.com/kamailio/kamailio/commit/f463e54908fdbcc4f2be38f0963610c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:04:24Z misc/tools/protoshoot: removed svn id and history (cherry picked from commit e3875c01adf576f179374a926e69e99c0094e5b4) (cherry picked from commit 105b15422f611ba1dcc59be30f7f4d474b294d03) (cherry picked from commit fa2c7c16881b25bb99a33f69b67bda97c3092fe0) - URL: https://github.com/kamailio/kamailio/commit/7fbbdd0279c294d63b0aeed0c80c280… Author: Alan Evans <alan(a)kageds.com> Date: 2021-10-22T12:09:30Z kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] (cherry picked from commit fb2eee3e175040fef5e76cbed11430976f62df32) (cherry picked from commit d8ff1845c34a7f9d8e6911ae3d2055b122eb3b79) (cherry picked from commit 4ce1fc01f916a0ee45aff75a18de67f318b14925) - URL: https://github.com/kamailio/kamailio/commit/9a175e53bbefff7258284a9f7910936… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:09:46Z cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 (cherry picked from commit 431544864c97d1848db1c0c42a03251a214f04cd) (cherry picked from commit 7e3e0a81bf458bd90bc1454c81bf21d64ed9212c) (cherry picked from commit 9825c3da237394fb2b856e41a593b8e85b47abb6) - URL: https://github.com/kamailio/kamailio/commit/9655ae3e263fbe31eb8aa05d58adc8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:09:54Z core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports (cherry picked from commit 871f8113612148a49e69218e70ed7f475fb665db) (cherry picked from commit 52978a0873eb068be31ca0688e64c88e4872efac) (cherry picked from commit b0a7811ef60d8fee47db4535cdc84c8483e4fede) - URL: https://github.com/kamailio/kamailio/commit/1389d825fd23dc77819454d2b5e6b65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:10:01Z core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets (cherry picked from commit 31377b160df563a222bec5a1bf92590635429240) (cherry picked from commit de84b32eb42e19f8626947da1c567eea2d0869fb) (cherry picked from commit 565b43d1d0572a8b68188cacf5b8248f37d352be) - URL: https://github.com/kamailio/kamailio/commit/4003771570ccd0f3d932515362b8420… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-10-22T12:10:11Z tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 (cherry picked from commit 238ef139bfbe145fb93e5c4b0730de58040d2265) (cherry picked from commit ad5af6d3acd648e6bd57b923083cc26d3a3d0f57) (cherry picked from commit a564c8d2e88b58948f2e1ea01008ec89e3c7d225) - URL: https://github.com/kamailio/kamailio/commit/a8dbbace5c7c5c1bfc914450ace8c4e… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2021-10-22T12:10:20Z ndb_redis: fix SIGSEGV in redisc_check_auth - Added the check for NULL pointer. When TCP session to redis reset, redisCommand function can return NULL pointer. (cherry picked from commit c32a0be89cc92a0649277774d1e7aebf349b8b49) (cherry picked from commit 5dbf99eb03aba76905aa926a55aedd3caa0fcd05) (cherry picked from commit f3d7a0f52152adf2b3a0da8b44b615486a7f579f) - URL: https://github.com/kamailio/kamailio/commit/4dcc9cb2cb9e88c8baf855cce8089f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:10:48Z sca: call unsafe find entry function to avoid infinite recursion (cherry picked from commit bd92fb59cce183008956ff060911cc14d3dfb160) (cherry picked from commit b6380374f310a26c8a36f807d97ff0f415204be4) (cherry picked from commit 6061def6d5550c9686f1b76d4d09400fecd43d9e) - URL: https://github.com/kamailio/kamailio/commit/5f7301a654fbb772697a4da728ea53f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:10:54Z tm: skip body operation on empty string for uac building (cherry picked from commit 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7) (cherry picked from commit d96e3527c20791cb2291aa91685d5bc85606eb56) (cherry picked from commit 0f9141a4ac722e1c33fbd597ef85c928ffc2cd6e) - URL: https://github.com/kamailio/kamailio/commit/25e688cde98d38cc10113fd1cb23c83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:11:08Z usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam (cherry picked from commit a0a97119bef7671f33734399dc9de4562abae39c) (cherry picked from commit 1685ebd5917e763c347b6d4201b19b72e2ee274e) (cherry picked from commit bbd5a5ce5b2269e6e29f63a8cd73838502d35b06) - URL: https://github.com/kamailio/kamailio/commit/9ed35471b92908c59b9767d06bfc1ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:11:14Z core: print char code on error in parse_addr_spec() (cherry picked from commit 031fd46980b34a570385f49f168b13af43d84b87) (cherry picked from commit 86c5d807ceb896dcc554bf8f1b7fb93c68e69a73) (cherry picked from commit 0ea368063362c090485dddaacf03a6f9ed7f8702) - URL: https://github.com/kamailio/kamailio/commit/973e3067ce00e8dca93c9193b91c463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:11:25Z core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer (cherry picked from commit baed515e8aed8e5b505ff716eb57d0c60e582632) (cherry picked from commit c19e43e7bfa7d88b49312f1e83c3aae0756e4ae5) (cherry picked from commit 28251b9233b5011b36423717c0540933410a57a9) - URL: https://github.com/kamailio/kamailio/commit/825cca57e1a14b5844a651135eb8f74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:11:31Z core: parser - free local unused param structure (cherry picked from commit 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7) (cherry picked from commit 479a6669da3bd03a9bd54ea4612192ee0b31f86a) (cherry picked from commit 99dd461fb14c2eb3803d7708c229bb4a1ffe9d08) - URL: https://github.com/kamailio/kamailio/commit/4a2d2e1c86d7d5821a5f406d3878c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:11:36Z core: parser - ensure content lenght value does not exceed max int (cherry picked from commit f769011743feccde0fbca8531ab4e1b3563bf155) (cherry picked from commit cd4c6ef6022fa6b4453c9e2feb091d3dd7776311) (cherry picked from commit 61d80860ead2adf93ffecb1318048bb04768bf51) - URL: https://github.com/kamailio/kamailio/commit/69f87c46d4e72fd0d9fba301f4f4ae6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:11:42Z core: catch empty string on parsing params (cherry picked from commit 76e6033ff14fec0f2db0b387803b4c5815a91163) (cherry picked from commit d40de01737781f12cb2383a2891c8590cfb7deba) (cherry picked from commit 307f429ec4c1512018540cf58885b2c51ae0bd2b) - URL: https://github.com/kamailio/kamailio/commit/4e5c5cd441bcf80e66dca8adbccb56a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:12:10Z core: parser contact - link structure once finishing current one (cherry picked from commit d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4) (cherry picked from commit 9ed8820aaf307a756f1f08ccff4459884f62b9a8) (cherry picked from commit f0d7b3a3d6c2aa27e47c87ec58b31c1527e1f6ff) - URL: https://github.com/kamailio/kamailio/commit/66adf27b0e85f22300e70901fc01423… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:12:16Z core: parser contact - proper update of length in skip_name() - stop walking name also for unquoted ;, being special char - small typo (cherry picked from commit 20db418f1e35f31d7a90d7cabbd22ae989b7266c) (cherry picked from commit a0d7837c934df7f4c2223ca7f90f7c439628caf4) (cherry picked from commit 6120013b0821e9420254b083d6eb4f79f428c15f) - URL: https://github.com/kamailio/kamailio/commit/781f934b2fc40a817bc531ef11e96c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:12:21Z core: log unexpected char in parse_param2() (cherry picked from commit a2511df29adc83544f047cbbdba7a8ba88272930) (cherry picked from commit c6bfa8d8ee14ea27158f09f3b0a04015a1252e1a) (cherry picked from commit a7143e95b407d53714ed0113e243032c19422c98) - URL: https://github.com/kamailio/kamailio/commit/7b76edb75806af92cde1eb8d9900c30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:12:27Z core: parser - free unlinked local param structure in parse_to_param() (cherry picked from commit f624e1701088a94465a06f36a2ef27804b16ec0e) (cherry picked from commit 04c7d84874bf60dabede57adb1fc64ebe2260420) (cherry picked from commit 4f438e01d4e6c6042026e9c5f673e1e2f02bf496) - URL: https://github.com/kamailio/kamailio/commit/72cb9bec93c7c71c6ed35f42d842d02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:12:33Z core: parse_to_param() check for end of data on escape or start of value (cherry picked from commit 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8) (cherry picked from commit 92083402b2768b0ab81072feefd94bf754730e7f) (cherry picked from commit d94bed817ffd389b5e528c124e2a8417aed1cfef) - URL: https://github.com/kamailio/kamailio/commit/32f71e8058ba62e18dd0959aaba77bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:12:41Z core: parse content - group operation to avoid overflow (cherry picked from commit 685817088ff9c72c055e72091fa6f923b824c206) (cherry picked from commit 796e2b203bbe09c6eb30321c579651d96c9b5de5) (cherry picked from commit 816f7b42b8527a2edc621143d2f1fae97df353c7) - URL: https://github.com/kamailio/kamailio/commit/2b424fdc10c26d7eb58bfc932385c20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:12:52Z core: parse via - safe check for end of buffer - just in case it is needed to be used for non-zero-terminated strings (cherry picked from commit 1d3fde1205440296c1d6a54feee5a9d637055bee) (cherry picked from commit 5a73c4b2363a533f8a9ed67aff3413223815c52c) (cherry picked from commit 0daa378326ea967bda8e302ac183463027b0c0c6) - URL: https://github.com/kamailio/kamailio/commit/61c4e8d91d8e8f41b1309b90f08f5d8… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-22T12:12:58Z kazoo: fixed crash when json body is NULL fixes GH #2794 (cherry picked from commit d8955fc350b48d0c4ca359d03cb9954a48998658) (cherry picked from commit abbf1fde2efd02f24c806a5be296e4648060b0af) (cherry picked from commit 0616c676ca0e0e6e013ce26a53e951bfda72e1b7) - URL: https://github.com/kamailio/kamailio/commit/833ebb4d66963346a9ac72387c48e20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:13:03Z core: free params list at end on error state inside parse_addr_spec (cherry picked from commit f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31) (cherry picked from commit b44879a17af848c3acb5524fe1058854c59c95fd) (cherry picked from commit d8ef550a4e7181f7fce1a4982c5da10b6ae6e8a7) - URL: https://github.com/kamailio/kamailio/commit/8320cc8db43d8e713a1e25478677550… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:13:27Z core: parser - print what is left in buffer if no EoH in get_body() (cherry picked from commit 63ecb827631189d27da6a85d41149985d95fc479) (cherry picked from commit 4578fb676177e16324c2241820cf5f8042503a37) (cherry picked from commit 730167bf4e26ba44bf69275730efbf81e541ad1a) - URL: https://github.com/kamailio/kamailio/commit/a7881e06d2f2b4d5937bc9c3e3cbeed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:13:32Z sqlops: return 1 on success for kemi sql_xquery() - GH #2856 (cherry picked from commit 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829) (cherry picked from commit c1f5595eaf0b1f98cb5dcc00ab68c0e57bc4b053) (cherry picked from commit a5340f49d21cb4dede9c84fe099561dd4bf21bc0) - URL: https://github.com/kamailio/kamailio/commit/1b2d1cb0242495504cbb18b4d58b92d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:13:40Z core: parser - additioal check for content lenght spanning next line (cherry picked from commit bf6bd11a9b969c02a106f94ebf40cefbe8028456) (cherry picked from commit ecfcab9af6f3927c9dfe170826f1cbae5d28a447) (cherry picked from commit 296ff8b988386ebc5b083e1a1d0ecca7380a6304) - URL: https://github.com/kamailio/kamailio/commit/5abb00278ee1292fb869c1cbf636799… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-22T12:13:46Z core: parse identityinfo - log message on end of buffer (cherry picked from commit 1e212088091183aac8fcd418656beea523950870) (cherry picked from commit 8a6c44d2f0504f81b2ef1d97732499b5f721b4a7) (cherry picked from commit 81d8e4cfbb991f046ea2123c9dfa431f407aa5f1)

1 0

git:master:102d5dab: kamctl: tls - converted chained if block to case statement
by Daniel-Constantin Mierla 21 Oct '21

21 Oct '21

Module: kamailio Branch: master Commit: 102d5dab4f45cab238ffeb72e7ddf378c8daa17d URL: https://github.com/kamailio/kamailio/commit/102d5dab4f45cab238ffeb72e7ddf37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-21T21:38:11+02:00 kamctl: tls - converted chained if block to case statement --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/102d5dab4f45cab238ffeb72e7ddf37… Patch: https://github.com/kamailio/kamailio/commit/102d5dab4f45cab238ffeb72e7ddf37…

1 0

git:master:110200ce: core: tcp - add alias for cinfo dst IP
by Henning Westerholt 21 Oct '21

21 Oct '21

Module: kamailio Branch: master Commit: 110200ce8e5c4cf7500e57e27a23f76e18044ad5 URL: https://github.com/kamailio/kamailio/commit/110200ce8e5c4cf7500e57e27a23f76… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-10-21T17:26:44+02:00 core: tcp - add alias for cinfo dst IP --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/110200ce8e5c4cf7500e57e27a23f76… Patch: https://github.com/kamailio/kamailio/commit/110200ce8e5c4cf7500e57e27a23f76… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index f8ff8dea45..d708ac63fe 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1478,7 +1478,12 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) * the second alias is for (peer_ip, peer_port, local_addr, 0) -- for * finding any conenction to peer_ip, peer_port from local_addr * the third alias is for (peer_ip, peer_port, local_addr, local_port) - * -- for finding if a fully specified connection exists */ + * -- for finding if a fully specified connection exists + * the fourth alias is for (peer_ip, peer_port, cinfo_addr, 0) -- for + * finding any connection to peer_ip, peer_port from address stored into cinfo (e.g. when proxy protocol is used) + * the fifth alias is for (peer_ip, peer_port, cinfo_addr, cinfo_port) + * -- for finding if a fully specified connection exists using address + * and port stored into cinfo*/ _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &zero_ip, 0, new_conn_alias_flags); if (likely(c->rcv.dst_ip.af && ! ip_addr_any(&c->rcv.dst_ip))){ @@ -1487,6 +1492,14 @@ inline static struct tcp_connection* tcpconn_add(struct tcp_connection *c) _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->rcv.dst_ip, c->rcv.dst_port, new_conn_alias_flags); } + if (unlikely(c->cinfo.dst_ip.af && ! ip_addr_any(&c->cinfo.dst_ip) && + ! ip_addr_cmp(&c->rcv.dst_ip, &c->cinfo.dst_ip))){ + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, 0, + new_conn_alias_flags); + _tcpconn_add_alias_unsafe(c, c->rcv.src_port, &c->cinfo.dst_ip, c->cinfo.dst_port, + new_conn_alias_flags); + } + /* ignore add_alias errors, there are some valid cases when one * of the add_alias would fail (e.g. first add_alias for 2 connections * with the same destination but different src. ip*/ @@ -1604,7 +1617,8 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, ((l_port==0) || (l_port==a->parent->rcv.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || - ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)) + ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip) || + ip_addr_cmp(l_ip, &a->parent->cinfo.dst_ip)) ) { LM_DBG("found connection by peer address (id: %d)\n", a->parent->id);

1 0

[kamailio/kamailio] Google Sanitizers: possible memory leaks (Issue #2892)
by sergey-safarov 21 Oct '21

21 Oct '21

### Description I have compiled Kamailio with `MEMPKG=sys` param and Google Sanitizers. Then started/stopped Kamailio with default config. After Kamailio stopped the produced report below. ``` ==8042==ERROR: LeakSanitizer: detected memory leaks Direct leak of 15872 byte(s) in 124 object(s) allocated from: #0 0x7f01775ed36f in __interceptor_malloc (/lib64/libasan.so.6+0xab36f) #1 0x1296835 in addstr core/cfg.lex:1605 #2 0x129660e in addchar core/cfg.lex:1589 #3 0x1287356 in yylex core/cfg.lex:1266 #4 0x12be8c2 in yyparse core/cfg.tab.c:5508 #5 0x466c2d in main /tmp/kamailio/src/main.c:2487 #6 0x7f01768a91e1 in __libc_start_main (/lib64/libc.so.6+0x281e1) Direct leak of 6784 byte(s) in 53 object(s) allocated from: #0 0x7f01775ed36f in __interceptor_malloc (/lib64/libasan.so.6+0xab36f) #1 0x1296835 in addstr core/cfg.lex:1605 #2 0x12894c7 in yylex core/cfg.lex:1395 #3 0x12be8c2 in yyparse core/cfg.tab.c:5508 #4 0x466c2d in main /tmp/kamailio/src/main.c:2487 #5 0x7f01768a91e1 in __libc_start_main (/lib64/libc.so.6+0x281e1) Direct leak of 6104 byte(s) in 9 object(s) allocated from: #0 0x7f01775ed36f in __interceptor_malloc (/lib64/libasan.so.6+0xab36f) #1 0xbf1e09 in register_module core/sr_module.c:257 #2 0xc0c31c in load_module core/sr_module.c:641 #3 0x12d3b70 in yyparse core/cfg.y:1861 #4 0x466c2d in main /tmp/kamailio/src/main.c:2487 #5 0x7f01768a91e1 in __libc_start_main (/lib64/libc.so.6+0x281e1) ``` Full report [kamailio-sanitizer.log](https://github.com/kamailio/kamailio/files/7387628/… ### Additional Information Compiled 1483ddb735c3fa3ea77b6e2d54ec67584e56e15b -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2892

3 7

[kamailio/kamailio] uac: registration refresh should in half time of expire (#2765)
by Surendra Tiwari 21 Oct '21

21 Oct '21

#### 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Currently re-registration is not happening in half of expire time. sometime its reaching near to expire time then sending re-registration. usually sip servers expect re-registration to happen in half of expire time.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2765 -- Commit Summary -- * uac: registration refresh should in half time of expire -- File Changes -- M src/modules/uac/uac_reg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2765.patch https://github.com/kamailio/kamailio/pull/2765.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2765

3 10

[kamailio/kamailio] Add ports for SSL_ERROR_SSL (#2872)
by Todd 21 Oct '21

21 Oct '21

While troubleshooting a certificate issue we found it helpful to understand the port as well as the address for source and destination. I shortened source to src and destination to dst to avoid increasing the message output length also it's helpful for the two words to be equal length while reading... hope this is helpful to someone else...   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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:  - [ ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description While troubleshooting a certificate issue we found it helpful to understand the port as well as the address for source and destination. I shortened source to src and destination to dst to avoid increasing the message output length also it's helpful for the two words to be equal length while reading... hope this is helpful to someone else... You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2872 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2872/commits/f3bbed75ef2f5d793288…">Add ports for SSL_ERROR_SSL </a> -- File Changes -- M src/modules/tls/tls_server.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2872.patch https://github.com/kamailio/kamailio/pull/2872.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2872

2 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev