sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
310 discussions

git:master:e2cc98eb: tls: try to print sni on tls error

by Daniel-Constantin Mierla

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

3 years

[kamailio/kamailio] tls module causes too many small fragments when tls connection time out (Issue #2943)

by JiangHai2011

### 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

3 years

[kamailio/kamailio] too many fragments are generated during tls connection timeout (Issue #2942)

by JiangHai2011

### 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

3 years

[kamailio/kamailio] core: add a module hook for post-fork cleanup (PR #2919)

by aalba6675

#### 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

3 years

git:master:d2c22d2b: app_python3: Python >= 3.7 call PyOS_AfterFork_Parent in main context after all forks

by Anthony Alba

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; }

3 years

[kamailio/kamailio] ims_usrloc_pcscf: fix on saving protocol info into DB (#2879)

by Erhan Onur Sendag

#### 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

3 years

git:master:5e617b5e: modules: readme files regenerated - kazoo ... [skip ci]

by Kamailio Dev

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.

3 years

[kamailio/kamailio] Allow setting AMQP-Headers when publishing messages (Issue #2895)

by mihovilkolaric

### 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 years

[kamailio/kamailio] kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish (PR #2925)

by mihovilkolaric

- 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 years

git:master:dcb8e165: kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish

by Henning Westerholt

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…

3 years

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021