- sr-dev - kamailio.org

[kamailio/kamailio] bad BYE message from endpoint when using topoh in kamailio 5.5.1 (Issue #3853)
by descartin 02 Jun '24

02 Jun '24

### Description we are using version: kamailio 5.5.1 (x86_64/linux) 8aa8df-dirty and we have a setup with 2 kamailio instances. First one is doing topoh, and the second one is supposed to not do it Despite this we do see that some replies the second instance is masking some headers like record route and contact in the 200ok (not in the 180) Besides, seems that when the b-side sends a BYE, kamailio show an error, see in logs part However, in the sip pcap we do see thre BYE like it should be. At least that's what it seems to me i attach you the trace [topoh_bye_bad_message.txt](https://github.com/kamailio/kamailio/files/15324… do you have any idea of what can be the issue?  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` May 15 13:19:42 vqbert-2 /usr/local/kamailio/sbin/kamailio[31824]: ERROR: <core> [core/parser/parse_fline.c:272]: parse_first_line(): parse_first_line: bad message (offset: 54) ��%��QI:19:42 vqbert-2 /usr/local/kamailio/sbin/kamailio[31824]: ERROR: <core> [core/parser/msg_parser.c:748]: parse_msg(): ERROR: parse_msg: message=<BYE �ͥ��ĸ��Ը��ĸ��Ʌ��Ց��!��ᕈ�|�� SIP/2.0 Via: SIP/2.0/UDP 199.244.96.39:5060;TH=ucv;branch=z9hG4bK-524287-1---513df3f6b3057f235eef63c542634016;rport Via: SIP/2.0/UDP 199.244.96.46:5071;rport=5071;branch=z9hG4bK-mx5umw4feykudkd5 Max-Forwards: 69 Route: <sip:79.170.71.169;lr;ftag=11002597000844;did=7842.5393> Route: <sip:79.170.71.168;lr=on;ftag=11002597000844;did=b09.3b49> ��%��QI��ĸ��Ը��ĸ��Ʌ��Ց��!��ᕈ�|�� >��`�!ɉU� Contact: sip:199.244.96.46:5071 To: +233240979290 <sip:+233240979290@79.170.71.168;user=phone>;tag=11002597000844 From: +233307000929 <sip:+233307000929@199.244.96.39.SBC1;user=phone>;tag=W7OXULJ726L2OYQEVKNA____.i Call-ID: Sonoc2Did!!:C9WJ3uq4gtNwMlcfzxFlM.jAkx0J34pvaRgtCt0vPl0EPxFwMJZfWJZfMBy7MP** CSeq: 905 BYE Allow: INVITE, ACK, BYE, CANCEL, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS, UPDATE User-Agent: PortaSIP cisco-GUID: 3592442246-2620412195-1372314391-1317599184 h323-conf-id: 3592442246-2620412195-1372314391-1317599184 Content-Length: 0 TH: uch > May 15 13:19:42 vqbert-2 /usr/local/kamailio/sbin/kamailio[31824]: ERROR: <core> [core/receive.c:377]: receive_msg(): core parsing of SIP message failed (199.244.96.39:5060/1) ``` #### SIP Traffic  ``` No. Time Source Destination Protocol Length Info 17 62.116377 19.24.9.39 10.100.10.169 SIP 1273 Request: BYE sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgE | Frame 17: 1273 bytes on wire (10184 bits), 1273 bytes captured (10184 bits) Linux cooked capture Internet Protocol Version 4, Src: 19.24.9.39, Dst: 10.100.10.169 User Datagram Protocol, Src Port: 5060, Dst Port: 5060 Session Initiation Protocol (BYE) Request-Line: BYE sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgE SIP/2.0 Method: BYE Request-URI: sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgE [Resent Packet: False] Message Header Via: SIP/2.0/UDP 19.24.9.39:5060;branch=z9hG4bK-524287-1---513df3f6b3057f235eef63c542634016;rport Via: SIP/2.0/UDP 19.24.9.46:5071;rport=5071;branch=z9hG4bK-mx5umw4feykudkd5 Max-Forwards: 69 Route: <sip:10.100.10.169;lr;ftag=11002597000844;did=7842.5393> Route: <sip:10.100.10.168;lr=on;ftag=11002597000844;did=b09.3b49> Route: <sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz6fLz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgEzuc1mUpGMEeK3jW5o61Yg.4fWBMLWc**> Contact: sip:19.24.9.46:5071 To: +233240979290 <sip:+233240979290@10.100.10.168;user=phone>;tag=11002597000844 From: +233307000929 <sip:+233307000929@19.24.9.39.SBC1;user=phone>;tag=W7OXULJ726L2OYQEVKNA____.i Call-ID: Sonoc2Did!!:C9WJ3uq4gtNwMlcfzxFlM.jAkx0J34pvaRgtCt0vPl0EPxFwMJZfWJZfMBy7MP** [Generated Call-ID: Sonoc2Did!!:C9WJ3uq4gtNwMlcfzxFlM.jAkx0J34pvaRgtCt0vPl0EPxFwMJZfWJZfMBy7MP**] CSeq: 905 BYE Allow: INVITE, ACK, BYE, CANCEL, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS, UPDATE User-Agent: PortaSIP cisco-GUID: 3592442246-2620412195-1372314391-1317599184 h323-conf-id: 3592442246-2620412195-1372314391-1317599184 Content-Length: 0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3853 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3853(a)github.com>

3 3

[kamailio/kamailio] Possible memory leak in siputils module (Issue #3857)
by giupand 02 Jun '24

02 Jun '24

### Description I think that a memory leak accur when call **get_uri_params** function to get the params in Invite RURI. If RURI haven't params I don't see memory leaking, but yes if RURI have one or more params.  ### Troubleshooting #### Reproduction 1. In kamailio script load siputils module; 2. Invoke get_uri_params in request_route; 3. Make call traffic with params in Invite RURI; 4. Check memory using pkg_stat kamcmd command during call traffic.  ### Possible Solutions Looking the source code, it seems that the function doesn't free the memory allocated during parsing params (parse_params function), infact invoke the free procedure always with null value in params pointer. I trying a simple modify saving the params poiter after parsing e use it in free function, than the memory don't accur! ``` int get_uri_param(struct sip_msg* _msg, char* _param, char* _value) { str *param, t; pv_spec_t* dst; pv_value_t val; param_hooks_t hooks; param_t* params; param_t* parsed_params; // ----------------------> pointer declaretion param = (str*)_param; dst = (pv_spec_t *) _value; if (parse_sip_msg_uri(_msg) < 0) { LM_ERR("ruri parsing failed\n"); return -1; } t = _msg->parsed_uri.params; if (parse_params(&t, CLASS_ANY, &hooks, &params) < 0) { LM_ERR("ruri parameter parsing failed\n"); return -1; } parsed_params = params; // ---------------------> pointer assignment while (params) { if ((params->name.len == param->len) && (strncmp(params->name.s, param->s, param->len) == 0)) { memset(&val, 0, sizeof(pv_value_t)); val.rs.s = params->body.s; val.rs.len = params->body.len; val.flags = PV_VAL_STR; dst->setf(_msg, &dst->pvp, (int)EQ_T, &val); goto found; } else { params = params->next; } } free_params(parsed_params); // -----------------------> use parsed_pointer to free memory return -1; found: free_params(parsed_params); // --------------------> use parsed_pointer to free memory return 1; } ```  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.1 (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, DBG_QM_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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. ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3857 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3857(a)github.com>

2 2

git:master:293193c5: geoip2: clang format module file
by Daniel-Constantin Mierla 02 Jun '24

02 Jun '24

Module: kamailio Branch: master Commit: 293193c55caaf5d0c39dc456babe92f574b58b3b URL: https://github.com/kamailio/kamailio/commit/293193c55caaf5d0c39dc456babe92f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-02T04:58:23+02:00 geoip2: clang format module file --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/293193c55caaf5d0c39dc456babe92f… Patch: https://github.com/kamailio/kamailio/commit/293193c55caaf5d0c39dc456babe92f… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 1131bba906a..7d22b3890d2 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -50,7 +50,8 @@ static int geoip2_rpc_init(void); static int w_geoip2_match(struct sip_msg *msg, char *str1, char *str2); static int geoip2_resid_param(modparam_t type, void *val); -static int w_geoip2_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); +static int w_geoip2_distance( + struct sip_msg *msg, char *str1, char *str2, char *str3); /* clang-format off */ static pv_export_t mod_pvs[] = { @@ -164,7 +165,8 @@ static int w_geoip2_match(sip_msg_t *msg, char *target, char *pvname) return ki_geoip2_match(msg, &tomatch, &pvclass); } -static int geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) +static int geoip2_distance( + sip_msg_t *msg, str *_ip_addr, double lat, double lon) { char ip_addr[MAX_GEO_STR_SIZE] = {0}; double lat1, lon1, lat2, lon2, orig_lat2, orig_lon2; @@ -253,7 +255,8 @@ static int geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon return dist; } -static int ki_geoip2_distance(sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon) +static int ki_geoip2_distance( + sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon) { double lat = 0; double lon = 0; @@ -262,8 +265,7 @@ static int ki_geoip2_distance(sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon strncpy(buf, _lat->s, _lat->len); lat = atof(buf); if(!lat && errno == ERANGE) { - LM_ERR("cannot convert string to double: %.*s\n", _lat->len, - _lat->s); + LM_ERR("cannot convert string to double: %.*s\n", _lat->len, _lat->s); return -1; } @@ -271,17 +273,15 @@ static int ki_geoip2_distance(sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon strncpy(buf, _lon->s, _lon->len); lon = atof(buf); if(!lon && errno == ERANGE) { - LM_ERR("cannot convert string to double: %.*s\n", _lon->len, - _lon->s); + LM_ERR("cannot convert string to double: %.*s\n", _lon->len, _lon->s); return -1; } return geoip2_distance(msg, _ipaddr, lat, lon); - } -static int w_geoip2_distance(sip_msg_t *msg, char *ip_addr_param, char *lat_param, - char *lon_param) +static int w_geoip2_distance( + sip_msg_t *msg, char *ip_addr_param, char *lat_param, char *lon_param) { str ip_addr_str = STR_NULL; str lat_str = STR_NULL; @@ -304,7 +304,7 @@ static int w_geoip2_distance(sip_msg_t *msg, char *ip_addr_param, char *lat_para static void geoip2_rpc_reload(rpc_t *rpc, void *ctx) { - if(geoip2_reload_pv(geoip2_path) != 0) { + if(geoip2_reload_set() < 0) { rpc->fault(ctx, 500, "Reload failed"); return; }

1 0

git:master:baccbe02: geoip2: keep global structure per process
by Daniel-Constantin Mierla 02 Jun '24

02 Jun '24

Module: kamailio Branch: master Commit: baccbe0298f9fa46db285505bc4386f997de5a47 URL: https://github.com/kamailio/kamailio/commit/baccbe0298f9fa46db285505bc4386f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-02T04:51:33+02:00 geoip2: keep global structure per process - parsing db file allocates private memory - reworked reload to rely on a global counter - GH #3861 --- Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/baccbe0298f9fa46db285505bc4386f… Patch: https://github.com/kamailio/kamailio/commit/baccbe0298f9fa46db285505bc4386f… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index 03a5b181242..a3d67e6e9d8 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -70,6 +70,9 @@ static gen_lock_t *_sr_geoip2_lock = NULL; static sr_geoip2_item_t *_sr_geoip2_list = NULL; +static int *_sr_geoip2_reloadG = NULL; +static int _sr_geoip2_reloadL = 0; + MMDB_s *get_geoip_handle(void) { return _handle_GeoIP; @@ -493,6 +496,12 @@ int pv_get_geoip2(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) static int init_shmlock(void) { + _sr_geoip2_reloadG = (int *)shm_malloc(sizeof(int)); + if(_sr_geoip2_reloadG == NULL) { + LM_CRIT("cannot allocate memory for reload step\n"); + return -1; + } + *_sr_geoip2_reloadG = 1; _sr_geoip2_lock = lock_alloc(); if(!_sr_geoip2_lock) { LM_CRIT("cannot allocate memory for lock\n"); @@ -513,18 +522,23 @@ static void destroy_shmlock(void) lock_dealloc((void *)_sr_geoip2_lock); _sr_geoip2_lock = NULL; } + if(_sr_geoip2_reloadG != NULL) { + shm_free(_sr_geoip2_reloadG); + _sr_geoip2_reloadG = NULL; + } } int geoip2_init_pv(char *path) { int status; - _handle_GeoIP = shm_mallocxz(sizeof(struct MMDB_s)); + _handle_GeoIP = (struct MMDB_s *)malloc(sizeof(struct MMDB_s)); if(_handle_GeoIP == NULL) { - SHM_MEM_ERROR; + SYS_MEM_ERROR; return -1; } + memset(_handle_GeoIP, 0, sizeof(struct MMDB_s)); status = MMDB_open(path, MMDB_MODE_MMAP, _handle_GeoIP); if(MMDB_SUCCESS != status) { @@ -539,18 +553,35 @@ int geoip2_init_pv(char *path) return 0; } +int geoip2_reload_set(void) +{ + if(_sr_geoip2_reloadG == NULL) { + LM_ERR("not initialized\n"); + return -1; + } + lock_get(_sr_geoip2_lock); + *_sr_geoip2_reloadG = *_sr_geoip2_reloadG + 1; + lock_release(_sr_geoip2_lock); + + return 0; +} + int geoip2_reload_pv(char *path) { int status = 0; lock_get(_sr_geoip2_lock); + if(*_sr_geoip2_reloadG == _sr_geoip2_reloadL) { + lock_release(_sr_geoip2_lock); + return MMDB_SUCCESS; + } MMDB_close(_handle_GeoIP); status = MMDB_open(path, MMDB_MODE_MMAP, _handle_GeoIP); if(MMDB_SUCCESS != status) { LM_ERR("cannot reload GeoIP database file at: %s\n", path); - } else { LM_INFO("reloaded GeoIP database file at: %s\n", path); + _sr_geoip2_reloadL = *_sr_geoip2_reloadG; } lock_release(_sr_geoip2_lock); @@ -563,10 +594,6 @@ void geoip2_destroy_list(void) void geoip2_destroy_pv(void) { - if(_handle_GeoIP != NULL) { - shm_free(_handle_GeoIP); - _handle_GeoIP = NULL; - } destroy_shmlock(); } diff --git a/src/modules/geoip2/geoip2_pv.h b/src/modules/geoip2/geoip2_pv.h index e50579f92c1..ff54f6d92df 100644 --- a/src/modules/geoip2/geoip2_pv.h +++ b/src/modules/geoip2/geoip2_pv.h @@ -37,5 +37,6 @@ int geoip2_update_pv(str *tomatch, str *pvclass); int sr_geoip2_add_resid(str *rname); MMDB_s *get_geoip_handle(void); gen_lock_t *get_gen_lock(void); +int geoip2_reload_set(void); #endif

1 0

git:master:4bd619d3: geoip2: rename global lock variable
by Daniel-Constantin Mierla 02 Jun '24

02 Jun '24

Module: kamailio Branch: master Commit: 4bd619d3517f129362de3ce50eed2620d5002b42 URL: https://github.com/kamailio/kamailio/commit/4bd619d3517f129362de3ce50eed262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-01T07:50:45+02:00 geoip2: rename global lock variable --- Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/4bd619d3517f129362de3ce50eed262… Patch: https://github.com/kamailio/kamailio/commit/4bd619d3517f129362de3ce50eed262… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index de017da1f65..03a5b181242 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -66,7 +66,7 @@ typedef struct _geoip2_pv } geoip2_pv_t; static MMDB_s *_handle_GeoIP = NULL; -static gen_lock_t *lock = NULL; +static gen_lock_t *_sr_geoip2_lock = NULL; static sr_geoip2_item_t *_sr_geoip2_list = NULL; @@ -77,7 +77,7 @@ MMDB_s *get_geoip_handle(void) gen_lock_t *get_gen_lock(void) { - return lock; + return _sr_geoip2_lock; } sr_geoip2_record_t *sr_geoip2_get_record(str *name) @@ -264,9 +264,9 @@ static int get_mmdb_value2(MMDB_entry_s *entry, MMDB_entry_data_s *data, { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); status = MMDB_get_value(entry, data, first, second, NULL); - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -276,9 +276,9 @@ static int get_mmdb_value3(MMDB_entry_s *entry, MMDB_entry_data_s *data, { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); status = MMDB_get_value(entry, data, first, second, third, NULL); - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -289,9 +289,9 @@ static int get_mmdb_value4(MMDB_entry_s *entry, MMDB_entry_data_s *data, { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); status = MMDB_get_value(entry, data, first, second, third, fourth, NULL); - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -493,12 +493,12 @@ int pv_get_geoip2(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) static int init_shmlock(void) { - lock = lock_alloc(); - if(!lock) { + _sr_geoip2_lock = lock_alloc(); + if(!_sr_geoip2_lock) { LM_CRIT("cannot allocate memory for lock\n"); return -1; } - if(lock_init(lock) == 0) { + if(lock_init(_sr_geoip2_lock) == 0) { LM_CRIT("cannot initialize lock\n"); return -1; } @@ -508,10 +508,10 @@ static int init_shmlock(void) static void destroy_shmlock(void) { - if(lock) { - lock_destroy(lock); - lock_dealloc((void *)lock); - lock = NULL; + if(_sr_geoip2_lock) { + lock_destroy(_sr_geoip2_lock); + lock_dealloc((void *)_sr_geoip2_lock); + _sr_geoip2_lock = NULL; } } @@ -543,7 +543,7 @@ int geoip2_reload_pv(char *path) { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); MMDB_close(_handle_GeoIP); status = MMDB_open(path, MMDB_MODE_MMAP, _handle_GeoIP); if(MMDB_SUCCESS != status) { @@ -552,7 +552,7 @@ int geoip2_reload_pv(char *path) } else { LM_INFO("reloaded GeoIP database file at: %s\n", path); } - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -599,10 +599,10 @@ int geoip2_update_pv(str *tomatch, str *name) strncpy(gr->tomatch, tomatch->s, tomatch->len); tomatch->s[tomatch->len] = '\0'; - lock_get(lock); + lock_get(_sr_geoip2_lock); gr->record = MMDB_lookup_string( _handle_GeoIP, (const char *)gr->tomatch, &gai_error, &mmdb_error); - lock_release(lock); + lock_release(_sr_geoip2_lock); LM_DBG("attempt to match: %s\n", gr->tomatch); if(gai_error || MMDB_SUCCESS != mmdb_error || !gr->record.found_entry) { LM_DBG("no match for: %s\n", gr->tomatch);

1 0

git:master:e066613c: geoip2: do not close global MMDB_s on destroy
by Daniel-Constantin Mierla 01 Jun '24

01 Jun '24

Module: kamailio Branch: master Commit: e066613cac308d1129baebc47d7c245b36eba4b0 URL: https://github.com/kamailio/kamailio/commit/e066613cac308d1129baebc47d7c245… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-01T07:39:54+02:00 geoip2: do not close global MMDB_s on destroy - GH #3861 --- Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/e066613cac308d1129baebc47d7c245… Patch: https://github.com/kamailio/kamailio/commit/e066613cac308d1129baebc47d7c245… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index d5b16351754..de017da1f65 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -564,7 +564,6 @@ void geoip2_destroy_list(void) void geoip2_destroy_pv(void) { if(_handle_GeoIP != NULL) { - MMDB_close(_handle_GeoIP); shm_free(_handle_GeoIP); _handle_GeoIP = NULL; }

1 0

git:master:8ba4ee4e: geoip2: init MMDB_s global pointer and check on destroy
by Daniel-Constantin Mierla 01 Jun '24

01 Jun '24

Module: kamailio Branch: master Commit: 8ba4ee4e00798ca015adc48542d0e4de8ed9daad URL: https://github.com/kamailio/kamailio/commit/8ba4ee4e00798ca015adc48542d0e4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-01T07:23:43+02:00 geoip2: init MMDB_s global pointer and check on destroy --- Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/8ba4ee4e00798ca015adc48542d0e4d… Patch: https://github.com/kamailio/kamailio/commit/8ba4ee4e00798ca015adc48542d0e4d… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index 22789941d80..d5b16351754 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -65,7 +65,7 @@ typedef struct _geoip2_pv int type; } geoip2_pv_t; -static MMDB_s *_handle_GeoIP; +static MMDB_s *_handle_GeoIP = NULL; static gen_lock_t *lock = NULL; static sr_geoip2_item_t *_sr_geoip2_list = NULL; @@ -518,8 +518,7 @@ static void destroy_shmlock(void) int geoip2_init_pv(char *path) { int status; - _handle_GeoIP = shm_malloc(sizeof(struct MMDB_s)); - memset(_handle_GeoIP, 0, sizeof(struct MMDB_s)); + _handle_GeoIP = shm_mallocxz(sizeof(struct MMDB_s)); if(_handle_GeoIP == NULL) { SHM_MEM_ERROR; @@ -564,9 +563,11 @@ void geoip2_destroy_list(void) void geoip2_destroy_pv(void) { - MMDB_close(_handle_GeoIP); - shm_free(_handle_GeoIP); - _handle_GeoIP = NULL; + if(_handle_GeoIP != NULL) { + MMDB_close(_handle_GeoIP); + shm_free(_handle_GeoIP); + _handle_GeoIP = NULL; + } destroy_shmlock(); }

1 0

[kamailio/kamailio] kamailio tls connection uses too much shared memory (Issue #3803)
by JiangHai2011 01 Jun '24

01 Jun '24

### Description a tls connection uses 52104 bytes. Among these memory, tcp_connection structure use 776 bytes and tcp_rd_buf use 6000 bytes, and the left part (45328 bytes) are all about SSL session with crypto. ### Expected behavior kamailio does some optimization for self defined BIO_TYPE_SOURCE_SINK bio type, to save more memory #### Actual observed behavior among this 45328 bytes, the biggest parts are BIO read buffer(16KB) and BIO write buffer(16KB). currently kamailio uses BIO_TYPE_SOURCE_SINK type bio, which needs kamailio manage the buffer by itself (there is no optimization). While nginx uses BIO_TYPE_MEM type bio, which is a openssl's internal bio type with memory optimization. As a result, nginx use less memory to accept more TLS connections than kamailio #### Debugging Data None #### Log Messages Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1219]: tlsf_sums(): pool (0x7f1a3eec1000) summarizing all alloc'ed. fragments: Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 2 size= 336 bytes from tls: tls_init.c: crypto/evp/evp_enc.c(43) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 80 bytes from tls: tls_init.c: crypto/bn/bn_blind.c(36) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 3 size= 360 bytes from tls: tls_init.c: crypto/bn/bn_mont.c(232) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 2 size= 1456 bytes from tls: tls_init.c: crypto/evp/evp_enc.c(129) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 120 bytes from tls: tls_init.c: ssl/t1_lib.c(1784) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 56 bytes from tls: tls_init.c: ssl/statem/extensions.c(959) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 2 size= 112 bytes from tls: tls_init.c: ssl/t1_lib.c(1811) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 56 bytes from tls: tls_init.c: ssl/statem/../packet_local.h(462) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 56 bytes from tls: tls_init.c: ssl/statem/../packet_local.h(485) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 640 bytes from tls: tls_init.c: ssl/ssl_sess.c(72) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 144 bytes from tls: tls_init.c: ssl/packet_local.h(462) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 224 bytes from tls: tls_init.c: crypto/evp/digest.c(139) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 3 size= 168 bytes from tls: tls_init.c: crypto/evp/digest.c(62) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 16496 bytes from tls: tls_init.c: ssl/record/ssl3_buffer.c(124) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 16712 bytes from tls: tls_init.c: ssl/record/ssl3_buffer.c(63) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 6280 bytes from tls: tls_init.c: ssl/ssl_lib.c(691) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 6776 bytes from core: tcp_main.c: tcpconn_new(1148) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 56 bytes from tls: tls_init.c: tls_bio.c(184) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 120 bytes from tls: tls_init.c: crypto/bio/bio_lib.c(73) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 536 bytes from tls: tls_init.c: ssl/ssl_cert.c(76) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 56 bytes from tls: tls_init.c: ssl/ssl_lib.c(793) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 72 bytes from tls: tls_init.c: crypto/bio/bio_meth.c(41) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 96 bytes from tls: tls_init.c: crypto/bio/bio_meth.c(38) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 1040 bytes from tls: tls_init.c: ssl/s3_lib.c(3296) Mar 30 19:46:46 localhost.localdomain sipproxy[2273]: INFO: <core> [mem/tlsf_malloc.c:1235]: tlsf_sums(): count= 1 size= 56 bytes from tls: tls_server.c: tls_complete_init(229) #### SIP Traffic None ### Possible Solutions None ### Additional Information [root@ip-10-23-0-191 ec2-user]# /opt/kamailio/sbin/kamailio -v version: kamailio 4.4.7 (aarch64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT-NOSMP, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, 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:18:05 Mar 28 2024 with gcc 7.3.1 * **Operating System**: Linux localhost.localdomain 4.18.0-425.3.1.el8.x86_64 #1 SMP Tue Nov 8 14:08:25 EST 2022 x86_64 x86_64 x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3803 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3803(a)github.com>

3 3

[kamailio/kamailio] Kamailio 5.8 core dumps with regex module (Issue #3812)
by Odorik.cz 31 May '24

31 May '24

### Description I tried to update to a new version of kamailio and it didn't start with the old configuration file, I found out that the regex module is responsible. Log after start: ` 0(713737) INFO: regex [regex_mod.c:417]: load_pcres(): num groups = 1 0(713737) INFO: regex [regex_mod.c:419]: load_pcres(): <group[0]>((^[1-9]\d{5}$)|(^ukrb[12]$)) </group[0]> (size = 29) 0(713735) ERROR: <core> [core/daemonize.c:302]: daemonize(): Main process exited before writing to pipe`  ### Troubleshooting #### Reproduction  grep regex /usr/local/etc/kamailio/kamailio.cfg loadmodule "regex.so" modparam("regex", "file", "/usr/local/etc/kamailio/regex_groups") cat /usr/local/etc/kamailio/regex_groups [0] #cislo linky (^[1-9]\d{5}$) (^ukrb[12]$) #### Debugging Data  ``` gdb /usr/local/sbin/kamailio /core GNU gdb (Debian 10.1-1.7) 10.1.90.20210103-git Copyright (C) 2021 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/local/sbin/kamailio... warning: Can't open file /dev/zero (deleted) during file-backed mapping note processing [New LWP 713740] warning: Section `.reg-xstate/713740' in core file too small. [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -S -P /run/kamailio/kamailio.pid -f /usr/local/etc/kam'. Program terminated with signal SIGSEGV, Segmentation fault. warning: Section `.reg-xstate/713740' in core file too small. #0 load_pcres (action=0) at regex_mod.c:466 466 *pcres = *pcres_tmp; (gdb) bt full #0 load_pcres (action=0) at regex_mod.c:466 i = 1 j = 32 f = 0x55c5775ea6b0 line = '\000' <repeats 499 times> patterns = 0x7f7e7ad3a230 pcre_error_num = 100 pcre_error = '\000' <repeats 16 times>, "\277Fou\305U\000\000\000\000\000\000m\000\000\000(Hou\305U\000\000\332Gou\305U\000\000\220\000\000\000\000\000\000\000\020\240\303z~\177\000\000 \274$u\305U\000\000\037\000\000\000\004\000\000\000\001\000\000\000%\000\000\000\n\344\n\000\000\000\000\000 \274$u\305U\000\000\000\000\000\000\000\000\000\000\n\344\n\000\000\000\000\000\360\212\355\255\374\177\000" pcre_erroffset = 0 num_pcres_tmp = 1 pcres_tmp = 0x7f7e7ad62c00 llen = 19 __func__ = "load_pcres" #1 0x00007f7e79f62c92 in mod_init () at regex_mod.c:245 __func__ = "mod_init" #2 0x000055c5754a99f7 in init_mod (m=0x7f7e7adeb1f0) at core/sr_module.c:1036 ret = -2097389668 __func__ = "init_mod" #3 0x000055c5754a9687 in init_mod (m=0x7f7e7adeb6c0) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #4 0x000055c5754a9687 in init_mod (m=0x7f7e7adebda0) at core/sr_module.c:1031 ret = -2097386271 __func__ = "init_mod" #5 0x000055c5754a9687 in init_mod (m=0x7f7e7adec3b0) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #6 0x000055c5754a9687 in init_mod (m=0x7f7e7adec910) at core/sr_module.c:1031 ret = -1376937648 __func__ = "init_mod" #7 0x000055c5754a9687 in init_mod (m=0x7f7e7adece70) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #8 0x000055c5754a9687 in init_mod (m=0x7f7e7aded520) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #9 0x000055c5754a9687 in init_mod (m=0x7f7e7adedc10) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #10 0x000055c5754a9687 in init_mod (m=0x7f7e7adee1f0) at core/sr_module.c:1031 ret = -1376937902 __func__ = "init_mod" #11 0x000055c5754a9687 in init_mod (m=0x7f7e7adeeaf0) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #12 0x000055c5754a9687 in init_mod (m=0x7f7e7adef4d0) at core/sr_module.c:1031 ret = 16 __func__ = "init_mod" #13 0x000055c5754a9687 in init_mod (m=0x7f7e7adef8e0) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #14 0x000055c5754a9687 in init_mod (m=0x7f7e7adefdd0) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #15 0x000055c5754a9687 in init_mod (m=0x7f7e7adf3320) at core/sr_module.c:1031 ret = 2053729903 __func__ = "init_mod" #16 0x000055c5754a9687 in init_mod (m=0x7f7e7adf3770) at core/sr_module.c:1031 ret = -1 __func__ = "init_mod" #17 0x000055c5754a9687 in init_mod (m=0x7f7e7adf3ba0) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #18 0x000055c5754a9687 in init_mod (m=0x7f7e7adf4140) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #19 0x000055c5754a9687 in init_mod (m=0x7f7e7adf4550) at core/sr_module.c:1031 ret = 0 __func__ = "init_mod" #20 0x000055c5754a9687 in init_mod (m=0x7f7e7adf6140) at core/sr_module.c:1031 ret = 713738 __func__ = "init_mod" #21 0x000055c5754a9dc4 in init_modules () at core/sr_module.c:1067 t = 0xae40a i = -1 __func__ = "init_modules" #22 0x000055c57526927c in main (argc=12, argv=0x7ffcaded9fd8) at main.c:3202 cfg_stream = 0x55c57746a2a0 c = -1 r = 0 tmp = 0x7ffcadedae88 "" tmp_len = 832 port = 5060 proto = 0 aproto = 0 ahost = 0x0 aport = 0 options = 0x55c5756b8368 ":f:cm:M:dVIhEeb:B:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4165046025 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x98000000980 p = 0x180000000 <error: Cannot access memory at address 0x180000000> st = {st_dev = 115, st_ino = 321140, st_nlink = 2, st_mode = 16888, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1712844094, tv_nsec = 899597355}, st_mtim = {tv_sec = 1712844094, tv_nsec = 899597355}, st_ctim = {tv_sec = 1712844094, tv_nsec = 899597355}, __glibc_reserved = {0, 0, 0}} --Type <RET> for more, q to quit, c to continue without paging-- l1 = 2048 tbuf = "p\233\355\255\374\177\000\000\310%ǂ~\177\000\000\020D\373\202~\177\000\000\000\000\000\000\000\000\000\000\360\233\355\255\374\177\000\000\000\000\000\000\000\000\000\000\360\233\355\255\374\177", '\000' <repeats 18 times>, "`\307\373\202~\177\000\000\350\204\376\202~\177\000\000\204\311\373\202~\177\000\000\060\304\373\202~\177\000\000Hp\376\202~\177\000\000\000\300\373\202~\177\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000@\342ł~\177", '\000' <repeats 66 times>... option_index = 12 long_options = {{name = 0x55c5756ba886 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55c5756b554c "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55c5756ba88b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55c5756ba891 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55c5756ba897 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55c5756ba8a0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55c5756ba8aa "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55c5756ba8b4 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55c5756ba8bf "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55c5756ba8c8 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55c5756ba8d3 "debug", has_arg = 1, flag = 0x0, val = 1032}, { name = 0x55c5756ba8d9 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55c5756ba8e3 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x55c5756ba8ea "all-errors", has_arg = 0, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` #### Log Messages  ``` 0(713842) WARNING: tls [tls_mod.c:747]: mod_register(): OpenSSL 1.1.1 setting cryptorand random engine 0(713842) INFO: rtimer [rtimer_mod.c:298]: stm_t_param(): created rtimer name=iptables interval=60 mode=1 0(713842) INFO: <core> [core/tcp_main.c:5205]: init_tcp(): using epoll_lt as the io watch method (auto detected) loading modules under config path: /usr/local/lib64/kamailio/modules/ Listening on udp: 81.31.45.42 [81.31.45.42]:5060 udp: 81.31.45.42 [81.31.45.42]:6688 udp: 81.31.45.42 [81.31.45.42]:443 udp: 81.31.45.42 [81.31.45.42]:6699 tcp: 81.31.45.42 [81.31.45.42]:5060 tcp: 81.31.45.42 [81.31.45.42]:443 tcp: 81.31.45.42 [81.31.45.42]:6688 tcp: 81.31.45.42 [81.31.45.42]:6699 tls: 81.31.45.42 [81.31.45.42]:5061 tls: 81.31.45.42 [81.31.45.42]:6689 tls: 81.31.45.42 [81.31.45.42]:6670 Aliases: *: sip2.gope.cz:* *: sipo.smartel.cz:* *: sipi.smartel.cz:* *: siptest.odorik.cz:* *: *.odorik.cz:* 0(713844) INFO: rr [../outbound/api.h:53]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(713844) INFO: rr [rr_mod.c:185]: mod_init(): outbound module not available 0(713844) INFO: geoip2 [geoip2_mod.c:96]: mod_init(): using GeoIP database path /var/kamailio/GeoLite2-City-17.06.22.mmdb, library version 1.5.2 0(713844) INFO: cfgutils [cfgutils.c:829]: mod_init(): no hash_file given, disable hash functionality 0(713844) INFO: regex [regex_mod.c:417]: load_pcres(): num groups = 1 0(713844) INFO: regex [regex_mod.c:419]: load_pcres(): <group[0]>(((^[1-9]\d{5}$))|((^ukrb[12]$)))</group[0]> (size = 33) 0(713842) ERROR: <core> [core/daemonize.c:302]: daemonize(): Main process exited before writing to pipe ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.8.1 (x86_64/linux) 215af5-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 215af5 -dirty compiled on 15:32:24 Apr 11 2024 with gcc 10.2.1 ``` * **Operating System**:  ``` lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye uname -a Linux serZT 6.1.0-18-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.76-1 (2024-02-01) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3812 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3812(a)github.com>

4 8

core dump on AWS with ~4000 TCP sockets
by David Villasmil 31 May '24

31 May '24

Hello all, I'm seeing core dumps (can't find them!) on AWS with lots of TCP sockets open (not related to load), kamailio dies randomly with: *May 30 14:31:03 sip-proxy /usr/sbin/kamailio[743739]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 142 May 30 14:31:03 sip-proxy /usr/sbin/kamailio[743542]: ALERT: <core> [main.c:788]: handle_sigs(): child process 743672 exited by a signal 11 May 30 14:31:03 sip-proxy /usr/sbin/kamailio[743542]: ALERT: <core> [main.c:791]: handle_sigs(): core was generated May 30 14:32:03 sip-proxy /usr/sbin/kamailio[743542]: CRITICAL: <core> [main.c:698]: sig_alarm_abort(): shutdown timeout triggered, dying...* before this happens, there's a ton of May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 172.56.51.197:34846 failed (timeout) May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 98.196.165.187:38593 failed (timeout) May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 10.241.49.185:49372 failed (timeout) May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 97.101.162.40:45248 failed (timeout) May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 172.59.213.36:57074 failed (timeout) May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 207.195.63.14:2521 failed (timeout) May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 10.241.49.185:22155 failed (timeout) May 26 00:32:01 sip-proxy /usr/sbin/kamailio[74966]: ERROR: <core> [core/tcp_main.c:4591]: tcpconn_main_timeout(): connect 10.241.49.185:10339 failed (timeout) Regards, David Villasmil email: david.villasmil.work(a)gmail.com phone: +34669448337

2 1

Re: RPM Build Toolchain
by tyler moore 30 May '24

30 May '24

Sergey, Any chance we could generate a new build of the RPM including the updated version of openssl? Regards, Tyler Moore Full Stack Software Engineer dOpenSource Office: 888-907-2085, ext: 34 Cell: 248-909-2769 Email:tmoore@dopensource.com

2 3

git:master:d8933374: regex: fix pcre2 migration
by Victor Seva 30 May '24

30 May '24

Module: kamailio Branch: master Commit: d89333748662c0e7c72e3579d41fd14ef05c0fee URL: https://github.com/kamailio/kamailio/commit/d89333748662c0e7c72e3579d41fd14… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-30T16:36:30+02:00 regex: fix pcre2 migration instead of reserving an array in pkg_mem and later copy the pointers to shm_mem just use shm_mem in the first place. fixes #3812 --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d89333748662c0e7c72e3579d41fd14… Patch: https://github.com/kamailio/kamailio/commit/d89333748662c0e7c72e3579d41fd14… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 292af692136..52ed60b295c 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -427,7 +427,7 @@ static int load_pcres(int action) } /* Temporal pointer of pcres */ - if((pcres_tmp = pkg_malloc(sizeof(pcre2_code *) * num_pcres_tmp)) == 0) { + if((pcres_tmp = shm_malloc(sizeof(pcre2_code *) * num_pcres_tmp)) == 0) { LM_ERR("no more memory for pcres_tmp\n"); goto err; } @@ -469,19 +469,10 @@ static int load_pcres(int action) shm_free(pcres); } - if(pcres == NULL) { - if((pcres = shm_malloc(sizeof(pcre2_code *) * num_pcres_tmp)) == 0) { - LM_ERR("no more memory for pcres\n"); - goto err; - } - memset(pcres, 0, sizeof(pcre2_code *) * num_pcres_tmp); - } - *num_pcres = num_pcres_tmp; - *pcres = *pcres_tmp; + pcres = pcres_tmp; *pcres_addr = pcres; - pkg_free(pcres_tmp); /* Free allocated slots for unused patterns */ for(i = num_pcres_tmp; i < max_groups; i++) { pkg_free(patterns[i]);

1 0

git:5.8:c8e4fe87: dialplan: don't call free on empty pcre pointer
by Victor Seva 30 May '24

30 May '24

Module: kamailio Branch: 5.8 Commit: c8e4fe87985a413dfe6871463c31375750d3a6f2 URL: https://github.com/kamailio/kamailio/commit/c8e4fe87985a413dfe6871463c31375… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-30T15:42:01+02:00 dialplan: don't call free on empty pcre pointer fixes #3851 (cherry picked from commit 630a6f2c11c10c4f3be3570553d86486942d60fe) --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/c8e4fe87985a413dfe6871463c31375… Patch: https://github.com/kamailio/kamailio/commit/c8e4fe87985a413dfe6871463c31375… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 42ba3b4abe6..51cab404710 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -648,7 +648,8 @@ int dp_translate_helper( LM_DBG("match check skipped: [%.*s] %d\n", re_list->expr.len, re_list->expr.s, rez); rt = re_list->next; - pcre2_match_data_free(pcre_md); + if(pcre_md) + pcre2_match_data_free(pcre_md); pcre2_code_free(re_list->re); pkg_free(re_list); re_list = rt;

1 0

git:master:630a6f2c: dialplan: don't call free on empty pcre pointer
by Victor Seva 30 May '24

30 May '24

Module: kamailio Branch: master Commit: 630a6f2c11c10c4f3be3570553d86486942d60fe URL: https://github.com/kamailio/kamailio/commit/630a6f2c11c10c4f3be3570553d8648… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-30T14:59:05+02:00 dialplan: don't call free on empty pcre pointer fixes #3851 --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/630a6f2c11c10c4f3be3570553d8648… Patch: https://github.com/kamailio/kamailio/commit/630a6f2c11c10c4f3be3570553d8648… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 42ba3b4abe6..51cab404710 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -648,7 +648,8 @@ int dp_translate_helper( LM_DBG("match check skipped: [%.*s] %d\n", re_list->expr.len, re_list->expr.s, rez); rt = re_list->next; - pcre2_match_data_free(pcre_md); + if(pcre_md) + pcre2_match_data_free(pcre_md); pcre2_code_free(re_list->re); pkg_free(re_list); re_list = rt;

1 0

git:master:8363208f: siputils: free head of params list for get_uri_param()
by Daniel-Constantin Mierla 29 May '24

29 May '24

Module: kamailio Branch: master Commit: 8363208fff7c101a2779ff64783e5b7dbf8ffd7c URL: https://github.com/kamailio/kamailio/commit/8363208fff7c101a2779ff64783e5b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-29T10:18:44+02:00 siputils: free head of params list for get_uri_param() - GH #3857 --- Modified: src/modules/siputils/checks.c --- Diff: https://github.com/kamailio/kamailio/commit/8363208fff7c101a2779ff64783e5b7… Patch: https://github.com/kamailio/kamailio/commit/8363208fff7c101a2779ff64783e5b7… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 4e28aef8e8d..2822e24b7c8 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -1165,7 +1165,7 @@ int get_uri_param(struct sip_msg *_msg, char *_param, char *_value) pv_value_t val; param_hooks_t hooks; - param_t *list = NULL; + param_t *plist = NULL; param_t *params; param = (str *)_param; @@ -1178,12 +1178,12 @@ int get_uri_param(struct sip_msg *_msg, char *_param, char *_value) t = _msg->parsed_uri.params; - if(parse_params(&t, CLASS_ANY, &hooks, &list) < 0) { + if(parse_params(&t, CLASS_ANY, &hooks, &plist) < 0) { LM_ERR("ruri parameter parsing failed\n"); return -1; } - params = list; + params = plist; while(params) { if((params->name.len == param->len) && (strncmp(params->name.s, param->s, param->len) == 0)) { @@ -1198,11 +1198,11 @@ int get_uri_param(struct sip_msg *_msg, char *_param, char *_value) } } - free_params(list); + free_params(plist); return -1; found: - free_params(list); + free_params(plist); return 1; }

1 0

git:master:d72a3fbc: siputils: free head of params list for get_uri_param()
by Daniel-Constantin Mierla 29 May '24

29 May '24

Module: kamailio Branch: master Commit: d72a3fbc903da02ae3b26f3aae2ea228c9f8b255 URL: https://github.com/kamailio/kamailio/commit/d72a3fbc903da02ae3b26f3aae2ea22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-29T10:15:21+02:00 siputils: free head of params list for get_uri_param() - GH #3857 --- Modified: src/modules/siputils/checks.c --- Diff: https://github.com/kamailio/kamailio/commit/d72a3fbc903da02ae3b26f3aae2ea22… Patch: https://github.com/kamailio/kamailio/commit/d72a3fbc903da02ae3b26f3aae2ea22… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 6cc977197fb..4e28aef8e8d 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -1165,6 +1165,7 @@ int get_uri_param(struct sip_msg *_msg, char *_param, char *_value) pv_value_t val; param_hooks_t hooks; + param_t *list = NULL; param_t *params; param = (str *)_param; @@ -1177,11 +1178,12 @@ int get_uri_param(struct sip_msg *_msg, char *_param, char *_value) t = _msg->parsed_uri.params; - if(parse_params(&t, CLASS_ANY, &hooks, &params) < 0) { + if(parse_params(&t, CLASS_ANY, &hooks, &list) < 0) { LM_ERR("ruri parameter parsing failed\n"); return -1; } + params = list; while(params) { if((params->name.len == param->len) && (strncmp(params->name.s, param->s, param->len) == 0)) { @@ -1196,11 +1198,11 @@ int get_uri_param(struct sip_msg *_msg, char *_param, char *_value) } } - free_params(params); + free_params(list); return -1; found: - free_params(params); + free_params(list); return 1; }

1 0

[kamailio/kamailio] Problem loadmodule secsipid on kamailio 5.6.5 (Issue #3860)
by sondesbough 29 May '24

29 May '24

failed to find command secsipid_build_identity (params 6) parse error in config file /etc/kamailio/kamailio.cfg, line 799, column 125: unknown command, missing loadmodule? parser: failed to find command secsipid_add_identity (params 6) May 24 11:26:36 vps-3471ad99 kamailio: CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 802, column 125: unknown command, missing loadmodule?https://github.com/asipto/secsipidx/issues/12 May 24 11:26:36 vps-3471ad99 kamailio[70519]: ERROR: bad config file (2 errors) May 24 11:26:36 vps-3471ad99 kamailio: INFO: [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized May 24 11:26:36 vps-3471ad99 systemd[1]: kamailio.service: Control process exited, code=exited, status=255/EXCEPTION May 24 11:26:36 vps-3471ad99 systemd[1]: kamailio.service: Failed with result 'exit-code'. May 24 11:26:36 vps-3471ad99 systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. May 24 11:26:36 vps-3471ad99 systemd[1]: kamailio.service: Scheduled restart job, restart counter is at 3. May 24 11:26:36 vps-3471ad99 systemd[1]: Stopped Kamailio (OpenSER) - the Open Source SIP Server. May 24 11:26:36 vps-3471ad99 systemd[1]: Starting Kamailio (OpenSER) - the Open Source SIP Server... May 24 11:26:36 vps-3471ad99 kamailio: ERROR: [core/cfg.y:3399]: yyparse(): cfg. parser: failed to find command secsipid_build_identity (params 6) May 24 11:26:36 vps-3471ad99 kamailio: CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 799, column 125: unknown command, missing loadmodule?https://github.com/asipto/secsipidx/issues/12 May 24 11:26:36 vps-3471ad99 kamailio: ERROR: [core/cfg.y:3399]: yyparse(): cfg. parser: failed to find command secsipid_add_identity (params 6) May 24 11:26:36 vps-3471ad99 kamailio[70521]: ERROR: bad config file (2 errors) May 24 11:26:36 vps-3471ad99 kamailio: CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 802, column 125: unknown command, missing loadmodule?https://github.com/asipto/secsipidx/issues/12 May 24 11:26:36 vps-3471ad99 kamailio: INFO: [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized May 24 11:26:36 vps-3471ad99 systemd[1]: kamailio.service: Control process exited, code=exited, status=255/EXCEPTION May 24 11:26:36 vps-3471ad99 systemd[1]: kamailio.service: Failed with result 'exit-code'. May 24 11:26:36 vps-3471ad99 systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. May 24 11:26:37 vps-3471ad99 systemd[1]: kamailio.service: Scheduled restart job, restart counter is at 4. May 24 11:26:37 vps-3471ad99 systemd[1]: Stopped Kamailio (OpenSER) - the Open Source SIP Server. May 24 11:26:37 vps-3471ad99 systemd[1]: Starting Kamailio (OpenSER) - the Open Source SIP Server... May 24 11:26:37 vps-3471ad99 kamailio: ERROR: [core/cfg.y:3399]: yyparse(): cfg. parser: failed to find command secsipid_build_identity (params 6) May 24 11:26:37 vps-3471ad99 kamailio: CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 799, column 125: unknown command, missing loadmodule?https://github.com/asipto/secsipidx/issues/12 May 24 11:26:37 vps-3471ad99 kamailio[70522]: ERROR: bad config file (2 errors) May 24 11:26:37 vps-3471ad99 kamailio: ERROR: [core/cfg.y:3399]: yyparse(): cfg. parser: failed to find command secsipid_add_identity (params 6) May 24 11:26:37 vps-3471ad99 kamailio: CRITICAL: [core/cfg.y:3539]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 802, column 125: unknown command, missing loadmodule?https://github.com/asipto/secsipidx/issues/12 May 24 11:26:37 vps-3471ad99 kamailio: INFO: [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized May 24 11:26:37 vps-3471ad99 systemd[1]: kamailio.service: Control process exited, code=exited, status=255/EXCEPTION May 24 11:26:37 vps-3471ad99 systemd[1]: kamailio.service: Failed with result 'exit-code'. May 24 11:26:37 vps-3471ad99 systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. May 24 11:26:37 vps-3471ad99 systemd[1]: kamailio.service: Scheduled restart job, restart counter is at 5. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3860 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3860(a)github.com>

2 3

[kamailio/kamailio] dispatcher not proxy sip on websocket (Issue #3864)
by liaoxingang 29 May '24

29 May '24

I want to proxy a sip server on websocket. but it's not working. I set dispatcher destination "sip:10.100.67.95:5066;transport=ws", it has some error . logs: 2024-05-29T02:49:15.436088156Z 11(22) WARNING: <core> [core/msg_translator.c:3007]: via_builder(): TCP/TLS connection (id: 0) for WebSocket could not be found 2024-05-29T02:49:15.436124584Z 11(22) ERROR: tm [t_msgbuilder.c:1420]: assemble_via(): via building failed 2024-05-29T02:49:15.436132262Z 11(22) ERROR: tm [t_msgbuilder.c:1611]: build_uac_req(): error while assembling Via 2024-05-29T02:49:15.436138638Z 11(22) ERROR: tm [uac.c:552]: t_uac_prepare(): Error while building message 2024-05-29T02:49:15.436145000Z 11(22) ERROR: dispatcher [dispatch.c:3981]: ds_ping_set(): unable to ping [sip:10.100.67.95:5066;transport=ws] in group [3] -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3864 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3864(a)github.com>

2 2

[kamailio/kamailio] rtpengine: Fix extra process in pkg.stats (PR #3862)
by Bastian Triller 28 May '24

28 May '24

#### 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  When DTMF events socket is not configured, pkg.stats RPC method returns an empty entry. { entry: 13 pid: 0 rank: -128 used: 0 free: 0 real_used: 0 total_size: 67108864 total_frags: 0 desc: } Fixes: 26f6e57c8f ("Register a new worker process for dtmf event listener") You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3862 -- Commit Summary -- * rtpengine: Fix extra process in pkg.stats -- File Changes -- M src/modules/rtpengine/rtpengine.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3862.patch https://github.com/kamailio/kamailio/pull/3862.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3862 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3862(a)github.com>

2 1

git:master:e67f6048: rtpengine: Fix extra process in pkg.stats
by Victor Seva 28 May '24

28 May '24

Module: kamailio Branch: master Commit: e67f6048f4883d446df2d88fe7a7d7f2ff6daf8c URL: https://github.com/kamailio/kamailio/commit/e67f6048f4883d446df2d88fe7a7d7f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-28T19:55:35+02:00 rtpengine: Fix extra process in pkg.stats When DTMF events socket is not configured, pkg.stats RPC method returns an empty entry. { entry: 13 pid: 0 rank: -128 used: 0 free: 0 real_used: 0 total_size: 67108864 total_frags: 0 desc: } Fixes: 26f6e57c8f ("Register a new worker process for dtmf event listener") --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e67f6048f4883d446df2d88fe7a7d7f… Patch: https://github.com/kamailio/kamailio/commit/e67f6048f4883d446df2d88fe7a7d7f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6d62b92900d..c26f61e2483 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2234,8 +2234,10 @@ static int mod_init(void) } } - register_procs(1); - cfg_register_child(1); + if(rtpengine_dtmf_event_sock.len > 0) { + register_procs(1); + cfg_register_child(1); + } } return 0;

1 0

git:master:24b27214: htable: error on not finding htable in pv get
by Daniel-Constantin Mierla 28 May '24

28 May '24

Module: kamailio Branch: master Commit: 24b27214231166366cceb88fcb3724298cc53b32 URL: https://github.com/kamailio/kamailio/commit/24b27214231166366cceb88fcb37242… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-28T11:45:37+02:00 htable: error on not finding htable in pv get --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/24b27214231166366cceb88fcb37242… Patch: https://github.com/kamailio/kamailio/commit/24b27214231166366cceb88fcb37242… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 9770e51fd19..e79c7869ee5 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -37,8 +37,11 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(hpv->ht == NULL) { hpv->ht = ht_get_table(&hpv->htname); - if(hpv->ht == NULL) + if(hpv->ht == NULL) { + LM_ERR("htable not found for getting $sht(%.*s=>%.*s)\n", + hpv->htname.len, hpv->htname.s, htname.len, htname.s); return pv_get_null(msg, param, res); + } } if(pv_printf_s(msg, hpv->pve, &htname) != 0) { LM_ERR("cannot get $sht name\n");

1 0

git:master:6a8eb982: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 27 May '24

27 May '24

Module: kamailio Branch: master Commit: 6a8eb982be8d8f0c731dd423827480a1a27c2d8f URL: https://github.com/kamailio/kamailio/commit/6a8eb982be8d8f0c731dd423827480a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-27T15:31:11+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/6a8eb982be8d8f0c731dd423827480a… Patch: https://github.com/kamailio/kamailio/commit/6a8eb982be8d8f0c731dd423827480a…

1 0

[kamailio/kamailio] permissions: introduce func `allow_register_include_port()` (PR #3846)
by Donat Zenichev 27 May '24

27 May '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Introduce new function: `allow_register_include_port()` to be able to check the whole Contact header including port. Example, register.deny content is: ``` ALL : "^sip:.*192.168.0.101:5062" ``` If the Contact is: "Contact: <sip:testuser1004@192.168.0.101:5062>" then this will check the Contact hf including port of it. Otherwise if usual `allow_register()` function is used, then only the "testuser1004(a)192.168.0.101" will be taken into account, which will lead the regex to be failing and letting the check to pass through. The func `allow_register_include_port()` works similarly as `allow_register()` except it checks Contact's port. A separate function was created in order to not complicate things by introducing one more parameter to the existing function `allow_register()`, which already takes a variable amount of parameters, so 1 or 2 parameters (depending on if it is a "basename" or "allow-file, deny-file"). Documentation updated accordingly. Additionally, "Register File Format" section has been added to the doc (to provide allow/deny file examples). Full backwards compatibility is kept in place, no need for users of the module to change anything in their configuration or kamailio script itself. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3846 -- Commit Summary -- * permissions: introduce func `allow_register_include_port()` -- File Changes -- M src/modules/permissions/doc/permissions.xml (7) M src/modules/permissions/doc/permissions_admin.xml (142) M src/modules/permissions/permissions.c (56) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3846.patch https://github.com/kamailio/kamailio/pull/3846.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3846 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3846(a)github.com>

2 3

git:master:534a3595: permissions: introduce func `allow_register_include_port()`
by Victor Seva 27 May '24

27 May '24

Module: kamailio Branch: master Commit: 534a35956b1a79598dcd2436248c5d7ce4e92da8 URL: https://github.com/kamailio/kamailio/commit/534a35956b1a79598dcd2436248c5d7… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-27T15:21:24+02:00 permissions: introduce func `allow_register_include_port()` Introduce new function: `allow_register_include_port()` to be able to check the whole Contact header including port. Example, register.deny content is: ALL : "^sip:.*192.168.0.101:5062" If the Contact is: "Contact: <sip:testuser1004@192.168.0.101:5062>" then this will check the Contact hf including port of it. Otherwise if usual `allow_register()` function is used, then only the "testuser1004(a)192.168.0.101" will be taken into account, which will lead the regex to be failing and letting the check to pass through. The func `allow_register_include_port()` works similarly as `allow_register()` except it checks Contact's port. Full backwards compatibility is kept in place, no need for users of the module to change anything in their configuration or kamailio script itself. --- Modified: src/modules/permissions/doc/permissions.xml Modified: src/modules/permissions/doc/permissions_admin.xml Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/534a35956b1a79598dcd2436248c5d7… Patch: https://github.com/kamailio/kamailio/commit/534a35956b1a79598dcd2436248c5d7…

1 0

Re: [kamailio/kamailio] core: dns cache - warn messages on safety checks for items (d8a35b3)
by Alex Hermann 27 May '24

27 May '24

Care to explain why this is wrong? Some DNS records that are fully in spec and have functioned for years without any problem now trigger filling the logs with these warnings. Also, actually logging which record(s) are causing the issue and what would be needed to be done to fix them would be helpful, the hex address and message doesn't provide any useful info for the admin. ``` 2024-05-27T10:01:04.263247+02:00 pc1 proxy1[335503]: WARNING: <core> [core/dns_cache.c:1700]: dns_get_related(): record not alone: 0x7f714ee28250 - type: 33 2024-05-27T10:01:04.269368+02:00 pc1 proxy1[335503]: WARNING: <core> [core/dns_cache.c:1700]: dns_get_related(): record not alone: 0x7f714ee28380 - type: 1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/d8a35b3b6c837b36779e232b65fce61… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/d8a35b3b6c837b36779e232b65fce61c3aa93387/142421279(a)github.com>

1 0

git:master:82cfea31: htable: error on not finding htable in pv set
by Daniel-Constantin Mierla 27 May '24

27 May '24

Module: kamailio Branch: master Commit: 82cfea317fd8d02a6c94347bc1be18c8a06e580f URL: https://github.com/kamailio/kamailio/commit/82cfea317fd8d02a6c94347bc1be18c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-27T09:11:48+02:00 htable: error on not finding htable in pv set --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/82cfea317fd8d02a6c94347bc1be18c… Patch: https://github.com/kamailio/kamailio/commit/82cfea317fd8d02a6c94347bc1be18c… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index fc37234f5ba..9770e51fd19 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -73,8 +73,11 @@ int pv_set_ht_cell( if(hpv->ht == NULL) hpv->ht = ht_get_table(&hpv->htname); - if(hpv->ht == NULL) + if(hpv->ht == NULL) { + LM_ERR("htable not found for setting $sht(%.*s=>%.*s)\n", + hpv->htname.len, hpv->htname.s, htname.len, htname.s); return -1; + } if(pv_printf_s(msg, hpv->pve, &htname) != 0) { LM_ERR("cannot get $sht name\n");

1 0

[kamailio/kamailio] PKG Memory Leak with RTPEngine Module with WebSocket (Issue #3777)
by vijaykumar-exotel 25 May '24

25 May '24

### Description  ### Troubleshooting - as checked further we particulartly tcp reciever process was consuming pkg memory , then further we checked from corex pkg_sumary for that process id, and found that rtpengine: rtpengine.c: send_rtpp_command was consuming highest memory. #### Reproduction console rtpengine url with ws endpoint.  this is reproducible, we can configure websocket in rtpengine module and then we can initate calls. and increase the number of calls over the period of time #### Debugging Data <img width="1399" alt="Screenshot 2024-03-06 at 4 30 16 PM" src="https://github.com/kamailio/kamailio/assets/115363081/0904892e-6a6e-4dc1-85…"> kamcmd pkg.stats entry: 24 pid: 378355 rank: 17 used: 7467640 free: 24348320 real_used: 9206112 total_size: 33554432 total_frags: 66 desc: tcp receiver (generic) child=0 kamcmd corex.pkg_summary pid 378355 Mar 6 16:31:52 coreproxy-4 /usr/local/sbin/kamailio[378355]: ALERT: qm_sums: qm_sums(): count= 8075 size= 4638760 bytes from rtpengine: rtpengine.c: send_rtpp_command(3040) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) version: kamailio 5.7.0 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 01:04:28 Jan 25 2024 with gcc 9.4.0 ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal Linux coreproxy-4 5.15.0-1045-oracle #51~20.04.1-Ubuntu SMP Fri Sep 22 14:25:26 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3777 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3777(a)github.com>

4 7

git:5.8:c1c8c066: db_cluster: Update log levels
by Xenofon Karamanos 24 May '24

24 May '24

Module: kamailio Branch: 5.8 Commit: c1c8c066b29798189a50dd9b4f27c5af574d991d URL: https://github.com/kamailio/kamailio/commit/c1c8c066b29798189a50dd9b4f27c5a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-05-24T14:24:48Z db_cluster: Update log levels (cherry picked from commit 467dbf3e1be16d5a760178d0801834ac67bad888) --- Modified: src/modules/db_cluster/dbcl_api.c --- Diff: https://github.com/kamailio/kamailio/commit/c1c8c066b29798189a50dd9b4f27c5a… Patch: https://github.com/kamailio/kamailio/commit/c1c8c066b29798189a50dd9b4f27c5a…

1 0

git:5.7:afa4e92b: db_cluster: Update log levels
by Xenofon Karamanos 24 May '24

24 May '24

Module: kamailio Branch: 5.7 Commit: afa4e92bbdc30bc76f0a27f73ef8c57802be99bf URL: https://github.com/kamailio/kamailio/commit/afa4e92bbdc30bc76f0a27f73ef8c57… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-05-24T14:18:35Z db_cluster: Update log levels (cherry picked from commit 467dbf3e1be16d5a760178d0801834ac67bad888) --- Modified: src/modules/db_cluster/dbcl_api.c --- Diff: https://github.com/kamailio/kamailio/commit/afa4e92bbdc30bc76f0a27f73ef8c57… Patch: https://github.com/kamailio/kamailio/commit/afa4e92bbdc30bc76f0a27f73ef8c57…

1 0

RPM Build Toolchain
by tyler moore 23 May '24

23 May '24

Sergey, Is the build toolchain for the RPM packages using an old version of openssl? I am seeing incompatibility errors when testing with 5.8.1 RPM and openssl-devel from system, or appstream repos. These are the version differences I see in the logs: |CRITICAL: tls [tls_init.c:870]: tls_h_mod_init_f(): installed openssl library version is too different from the library the kamailio tls module was compiled with: installed "OpenSSL 3.2.1 30 Jan 2024" (0x30200010), compiled "OpenSSL 3.0.7 1 Nov 2022" (0x30000070).#012 Please make sure a compatible version is used (tls_force_run in kamailio.cfg will override this check) | Here is what I see in the system RPMs for openssl on centos9: |[root@cent9-v075 ~]# dnf info openssl-devel Last metadata expiration check: 0:03:11 ago on Tue 21 May 2024 08:31:12 PM UTC. Installed Packages Name : openssl-devel Epoch : 1 Version : 3.2.1 Release : 1.el9 Architecture : x86_64 Size : 4.9 M Source : openssl-3.2.1-1.el9.src.rpm Repository : @System From repo : appstream Summary : Files for development of applications which will use OpenSSL URL : http://www.openssl.org/ License : ASL 2.0 Description : OpenSSL is a toolkit for supporting cryptography. The openssl-devel : package contains include files needed to develop applications which : support various cryptographic algorithms and protocols. | Regards, Tyler Moore Full Stack Software Engineer dOpenSource Office: 888-907-2085, ext: 34 Cell: 248-909-2769 Email:tmoore@dopensource.com

3 2

[kamailio/kamailio] Segfault in pua_dialoginfo.c when starting up with a dialog in the database (Issue #3743)
by Gianluca Nitti 22 May '24

22 May '24

### Description Kamailio segfaults on startup. After a bit of digging, it looks like the issue is caused by trying to publish something related to an expired dalog which is present in the database: ``` kamailio=# select * from dialog; id | hash_entry | hash_id | callid | from_uri | from_tag | to_uri | to_tag | caller_cseq | callee_cseq | caller_route_set | callee_route_set | caller_contact | callee_contact | caller_sock | callee_sock | state | start_time | timeout | sflags | iflags | toroute_name | req_ur i | xdata ----+------------+---------+---------------------------+------------------------------+----------+-------------------------------------------+---------------+-------------+- ------------+--------------------------------------------+------------------+---------------------------------------------------------------------------+-------------------- -----------------------------------+----------------------+----------------------+-------+------------+------------+--------+--------+--------------+------------------------ -------------------+------- 90 | 3720 | 11295 | msowdcchfzrlapg@localhost | sip:101@example.voismart.com | msfvz | sip:*9001*0039123456@example.voismart.com | HBQj442BFrH0N | 131 | 0 | <sip:172.23.42.1;lr=on;ftag=msfvz;nat=yes> | | sip:101_example_voismart_com@172.23.42.1:5065;alias=192.168.1.201~32878~1 | sip:*9001*003912345 6@172.23.42.211:5060;transport=udp | udp:172.23.42.3:5060 | udp:172.23.42.3:5060 | 4 | 1706715542 | 1706801943 | 0 | 1 | | sip:*9001*0039123456@ex ample.voismart.com | (1 row) ``` ### Troubleshooting #### Debugging Data  ``` (gdb) bt full #0 0x00007f193de1bc93 in free_str_list_all (del_current=0x2e656c706d617865) at /usr/local/src/pkg/src/modules/pua_dialoginfo/pua_dialoginfo.c:1109 del_next = <optimized out> __func__ = "free_str_list_all" #1 0x00007f193de1ebc6 in free_dlginfo_cell (param=0x7f1942265dc8) at /usr/local/src/pkg/src/modules/pua_dialoginfo/pua_dialoginfo.c:1079 cell = 0x7f1942265dc8 cell = <optimized out> __func__ = <optimized out> #2 free_dlginfo_cell (param=0x7f1942265dc8) at /usr/local/src/pkg/src/modules/pua_dialoginfo/pua_dialoginfo.c:1070 cell = 0x0 __func__ = "free_dlginfo_cell" #3 0x00007f1940b7120b in destroy_dlg_callbacks_list (cb=0x0) at /usr/local/src/pkg/src/modules/dialog/dlg_cb.c:74 cb_t = 0x7f1942266050 __func__ = "destroy_dlg_callbacks_list" #4 0x00007f1940ba5229 in destroy_dlg (dlg=0x7f1941b1a8a0) at /usr/local/src/pkg/src/modules/dialog/dlg_hash.c:369 ret = <optimized out> var = <optimized out> __func__ = "destroy_dlg" #5 0x00007f1940ba6b08 in destroy_dlg_table () at /usr/local/src/pkg/src/modules/dialog/dlg_hash.c:436 dlg = 0x0 l_dlg = <optimized out> i = 3720 __func__ = <optimized out> #6 destroy_dlg_table () at /usr/local/src/pkg/src/modules/dialog/dlg_hash.c:422 dlg = <optimized out> l_dlg = <optimized out> i = <optimized out> __func__ = "destroy_dlg_table" #7 0x00007f1940b57b06 in mod_destroy () at /usr/local/src/pkg/src/modules/dialog/dialog.c:871 No locals. #8 0x000055dd96a6d1e2 in destroy_modules () at core/sr_module.c:872 t = 0x7f1949d9d5f0 foo = 0x7f1949d94710 __func__ = "destroy_modules" #9 0x000055dd96864d01 in cleanup (show_status=1) at /usr/local/src/pkg/src/main.c:573 memlog = <optimized out> --Type <RET> for more, q to quit, c to continue without paging-- __func__ = "cleanup" #10 0x000055dd96c92a4d in shutdown_children.constprop.0 (show_status=show_status@entry=1, sig=15) at /usr/local/src/pkg/src/main.c:721 __func__ = <optimized out> #11 0x000055dd9685fcd5 in handle_sigs () at /usr/local/src/pkg/src/main.c:821 chld = <optimized out> chld_status = 139 any_chld_stopped = <optimized out> memlog = <optimized out> __func__ = "handle_sigs" #12 0x000055dd96868aa4 in main_loop () at /usr/local/src/pkg/src/main.c:1988 i = <optimized out> pid = <optimized out> si = <optimized out> si_desc = "udp receiver child=31 sock=172.23.42.3:9999\000\335U\000\000\000\260\312I\031\177\000\000\003\000\000\000\377\377\377\377\004\220\312\226\335U\000\000\004\000\000\000\031\177\000\000\003\000\000\000\000\000\000\000\t\000\000\000\000\000\000\000Tue Feb \000\023&\252U\314\342\207:34 2024\005\000\000\000\000\000\000" nrprocs = <optimized out> woneinit = 1 error = <optimized out> __func__ = "main_loop" #13 0x000055dd96859ffc in main (argc=<optimized out>, argv=<optimized out>) at /usr/local/src/pkg/src/main.c:3212 cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0x7ffe9d9b7db4 "" tmp_len = 1274056464 port = 32537 proto = 1275323104 ahost = 0x0 aport = 0 options = 0x55dd96cac300 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 3377142042 rfd = <optimized out> debug_save = <optimized out> debug_flag = <optimized out> --Type <RET> for more, q to quit, c to continue without paging-- dont_fork_cnt = <optimized out> n_lst = <optimized out> p = <optimized out> st = {st_dev = 194, st_ino = 570312884, st_nlink = 2, st_mode = 16872, st_uid = 101, st_gid = 101, __pad0 = 0, st_rdev = 0, st_size = 6, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1707216241, tv_nsec = 46870706}, st_mtim = {tv_sec = 1707216227, tv_nsec = 573144090}, st_ctim = {tv_sec = 1707216227, tv_nsec = 573144090}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 16 times>, '/' <repeats 16 times>, "\230\r", '\000' <repeats 14 times>, "`", '\000' <repeats 15 times>, "\001", '\000' <repeats 143 times>... option_index = 12 __func__ = "main" long_options = {{name = 0x55dd96cabfe2 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55dd96cb3dc8 "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x55dd96cc3731 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55dd96cabfe7 "subst", has_arg = 1, flag = 0x0, val = 1025}, { name = 0x55dd96cabfed "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55dd96cabff6 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x55dd96cac000 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55dd96cac00a "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, { name = 0x55dd96cac015 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55dd96cac01e "log-engine", has_arg = 1, flag = 0x0, val = 1031}, { name = 0x55dd96cb3ee5 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55dd96cac029 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, { name = 0x55dd96cac033 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x55dd96cac03a "all-errors", has_arg = 0, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} (gdb) info locals del_next = <optimized out> __func__ = "free_str_list_all" (gdb) list 1104 in /usr/local/src/pkg/src/modules/pua_dialoginfo/pua_dialoginfo.c ``` #### Log Messages  ``` 65(75) DEBUG: dialog [dlg_timer.c:232]: get_expired_dlgs(): start with tl=0x7f1941b1a900 tl->prev=0x7f1941a084d8 tl->next=0x7f1941a084d8 (45536602) at 45536603 and end with end=0x7f1941a084d8 end->prev=0x7f1941b1a900 end->next=0x7f1941b1a900 65(75) DEBUG: dialog [dlg_timer.c:237]: get_expired_dlgs(): getting tl=0x7f1941b1a900 tl->prev=0x7f1941a084d8 tl->next=0x7f1941a084d8 with 45536602 65(75) DEBUG: dialog [dlg_timer.c:243]: get_expired_dlgs(): end with tl=0x7f1941a084d8 tl->prev=0x7f1941b1a900 tl->next=0x7f1941b1a900 and d_timer->first.next->prev=(nil) 65(75) DEBUG: dialog [dlg_timer.c:280]: dlg_timer_routine(): tl=0x7f1941b1a900 next=(nil) 65(75) DEBUG: dialog [dlg_cb.c:267]: run_dlg_callbacks(): dialog=0x7f1941b1a8a0, type=64 65(75) DEBUG: pua_dialoginfo [pua_dialoginfo.c:395]: __dialog_sendpublish(): dialog over, from=sip:101@example.voismart.com 65(75) DEBUG: pua_dialoginfo [dialog_publish.c:410]: dialog_publish_multi(): CALLING dialog_publish for URI 65(75) DEBUG: <core> [core/parser/parse_uri.c:1389]: parse_uri(): bad uri, state 0 parsed: <> (4) / <> (28) 65(75) ERROR: pua_dialoginfo [dialog_publish.c:303]: dialog_publish(): failed to parse the PUBLISH R-URI 123(133) CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 133 123(133) DEBUG: <core> [core/tcp_main.c:3955]: handle_ser_child(): dead child 65, pid 75 (shutting down?) 123(133) DEBUG: <core> [core/io_wait.h:597]: io_watch_del(): DBG: io_watch_del (0x55dd96e1fba0, 133, -1, 0x0) fd_no=157 called 0(1) ALERT: <core> [main.c:791]: handle_sigs(): child process 75 exited by a signal 11 0(1) ALERT: <core> [main.c:795]: handle_sigs(): core was generated 0(1) INFO: <core> [main.c:818]: handle_sigs(): terminating due to SIGCHLD 2(12) INFO: <core> [main.c:874]: sig_usr(): signal 15 received 3(13) INFO: <core> [main.c:874]: sig_usr(): signal 15 received ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (x86_64/linux) dc393e flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: dc393e compiled with gcc 11.4.0 ``` * **Operating System**:  ``` Linux c7a9e0ef942e 6.6.13-200.fc39.x86_64 #1 SMP PREEMPT_DYNAMIC Sat Jan 20 18:03:28 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux ``` Running in a Docker container based on Ubuntu Jammy which builds kamailio from git tag 5.7.4. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3743 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3743(a)github.com>

5 9

CPU 100% with TLS
by David Villasmil 21 May '24

21 May '24

Hello, I'm in a situation where i have 5 proxies (5.5.7) deployed on AWS on 6cni.xlarge instances (4 cpu/8gb), all they're doing is taking TLS connections and forwarding everything to the proxy-dialogs (5.5.2). We opened traffic on these 5 proxies for about 20k clients. CPU just goes to 100% and stays there... (actually moving from core to core 100%). We were doing tls offloading on AWS but routing was a bit of a mess (receiving tls traffic on a non-tls, etc) and we never saw a problem CPU-wise there. config looks like #!define WORKERS 32 #!define MAX_TCP_TLS_CONNECTIONS 30000 #!define OPEN_FILES 65535 #!define TCP_CHILDREN_PROCESS 16 tcp_accept_no_cl=no # Needed for HTTP ( https://www.kamailio.org/wiki/cookbooks/devel/core#tcp_accept_no_cl) enable_tls=yes tls_port_no=TLS_PORT auto_aliases=no tcp_children=32 # socket_workers=WORKERS listen=EXTERNAL_LISTEN_SOCKET listen=EXTERNAL_LISTEN_SOCKET_TLS # socket_workers=WORKERS listen=INTERNAL_UDP_SOCKET I even attached gdb and all i see is: (gdb) bt #0 0x00001499de9e9853 in __libc_pause () at ../sysdeps/unix/sysv/linux/pause.c:29 #1 0x000055a58c1a8e6f in main_loop () #2 0x000055a58c1b29a1 in main () (gdb) #0 0x00001499de9e9853 in __libc_pause () at ../sysdeps/unix/sysv/linux/pause.c:29 #1 0x000055a58c1a8e6f in main_loop () #2 0x000055a58c1b29a1 in main () (gdb) #0 0x00001499de9e9853 in __libc_pause () at ../sysdeps/unix/sysv/linux/pause.c:29 #1 0x000055a58c1a8e6f in main_loop () #2 0x000055a58c1b29a1 in main () (gdb) #0 0x00001499de9e9853 in __libc_pause () at ../sysdeps/unix/sysv/linux/pause.c:29 #1 0x000055a58c1a8e6f in main_loop () #2 0x000055a58c1b29a1 in main () which doesn't seem like it's doing much, and stats look ok: kamcmd> stats.fetch all { core.bad_URIs_rcvd: 0 core.bad_msg_hdr: 0 core.drop_replies: 0 core.drop_requests: 0 core.err_replies: 0 core.err_requests: 0 core.fwd_replies: 0 core.fwd_requests: 72 core.rcv_replies: 4134 core.rcv_replies_18x: 159 core.rcv_replies_1xx: 279 core.rcv_replies_1xx_bye: 0 core.rcv_replies_1xx_cancel: 0 core.rcv_replies_1xx_invite: 279 core.rcv_replies_1xx_message: 0 core.rcv_replies_1xx_prack: 0 core.rcv_replies_1xx_refer: 0 core.rcv_replies_1xx_reg: 0 core.rcv_replies_1xx_update: 0 core.rcv_replies_2xx: 3068 core.rcv_replies_2xx_bye: 68 core.rcv_replies_2xx_cancel: 39 core.rcv_replies_2xx_invite: 72 core.rcv_replies_2xx_message: 0 core.rcv_replies_2xx_prack: 0 core.rcv_replies_2xx_refer: 0 core.rcv_replies_2xx_reg: 975 core.rcv_replies_2xx_update: 0 core.rcv_replies_3xx: 0 core.rcv_replies_3xx_bye: 0 core.rcv_replies_3xx_cancel: 0 core.rcv_replies_3xx_invite: 0 core.rcv_replies_3xx_message: 0 core.rcv_replies_3xx_prack: 0 core.rcv_replies_3xx_refer: 0 core.rcv_replies_3xx_reg: 0 core.rcv_replies_3xx_update: 0 core.rcv_replies_401: 658 core.rcv_replies_404: 0 core.rcv_replies_407: 72 core.rcv_replies_480: 4 core.rcv_replies_486: 0 core.rcv_replies_4xx: 776 core.rcv_replies_4xx_bye: 2 core.rcv_replies_4xx_cancel: 1 core.rcv_replies_4xx_invite: 115 core.rcv_replies_4xx_message: 0 core.rcv_replies_4xx_prack: 0 core.rcv_replies_4xx_refer: 0 core.rcv_replies_4xx_reg: 658 core.rcv_replies_4xx_update: 0 core.rcv_replies_5xx: 0 core.rcv_replies_5xx_bye: 0 core.rcv_replies_5xx_cancel: 0 core.rcv_replies_5xx_invite: 0 core.rcv_replies_5xx_message: 0 core.rcv_replies_5xx_prack: 0 core.rcv_replies_5xx_refer: 0 core.rcv_replies_5xx_reg: 0 core.rcv_replies_5xx_update: 0 core.rcv_replies_6xx: 11 core.rcv_replies_6xx_bye: 0 core.rcv_replies_6xx_cancel: 0 core.rcv_replies_6xx_invite: 11 core.rcv_replies_6xx_message: 0 core.rcv_replies_6xx_prack: 0 core.rcv_replies_6xx_refer: 0 core.rcv_replies_6xx_reg: 0 core.rcv_replies_6xx_update: 0 core.rcv_requests: 2170 core.rcv_requests_ack: 210 core.rcv_requests_bye: 83 core.rcv_requests_cancel: 45 core.rcv_requests_info: 0 core.rcv_requests_invite: 196 core.rcv_requests_message: 0 core.rcv_requests_notify: 0 core.rcv_requests_options: 0 core.rcv_requests_prack: 0 core.rcv_requests_publish: 0 core.rcv_requests_refer: 0 core.rcv_requests_register: 1636 core.rcv_requests_subscribe: 0 core.rcv_requests_update: 0 core.unsupported_methods: 0 dns.failed_dns_request: 0 dns.slow_dns_request: 0 shmem.fragments: 270 shmem.free_size: 4283453736 shmem.max_used_size: 13711272 shmem.real_used_size: 11513560 shmem.total_size: 4294967296 shmem.used_size: 8167352 sl.1xx_replies: 0 sl.200_replies: 0 sl.202_replies: 0 sl.2xx_replies: 0 sl.300_replies: 0 sl.301_replies: 0 sl.302_replies: 0 sl.3xx_replies: 0 sl.400_replies: 0 sl.401_replies: 0 sl.403_replies: 0 sl.404_replies: 0 sl.407_replies: 0 sl.408_replies: 0 sl.483_replies: 0 sl.4xx_replies: 0 sl.500_replies: 0 sl.5xx_replies: 0 sl.6xx_replies: 0 sl.failures: 0 sl.received_ACKs: 0 sl.sent_err_replies: 0 sl.sent_replies: 0 sl.xxx_replies: 0 tcp.con_reset: 5 tcp.con_timeout: 54 tcp.connect_failed: 3 tcp.connect_success: 0 tcp.current_opened_connections: 44 tcp.current_write_queue_size: 0 tcp.established: 295 tcp.local_reject: 0 tcp.passive_open: 295 tcp.send_timeout: 0 tcp.sendq_full: 0 tmx.2xx_transactions: 3074 tmx.3xx_transactions: 0 tmx.4xx_transactions: 780 tmx.5xx_transactions: 0 tmx.6xx_transactions: 11 tmx.UAC_transactions: 1914 tmx.UAS_transactions: 3860 tmx.active_transactions: 1 tmx.inuse_transactions: 12 tmx.rpl_absorbed: 162 tmx.rpl_generated: 247 tmx.rpl_received: 4134 tmx.rpl_relayed: 3972 tmx.rpl_sent: 4219 } any ideas? thanks!, David Villasmil email: david.villasmil.work(a)gmail.com phone: +34669448337

1 0

Re: [kamailio/kamailio] tm: add mandatory Max-Forwards header to local AC (3a34b46)
by Victor Seva 20 May '24

20 May '24

@juha-h please use ``cherry-pick -x <SHA>`` when back-porting -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b25321807f/142208292(a)github.com>

2 1

[kamailio/kamailio] Add mandatory Max-Forwards header to local ACK (PR #3856)
by juha-h 20 May '24

20 May '24

#### Type Of Change - [ x] 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 Add mandatory Max-Forwards header to local ACK You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3856 -- Commit Summary -- * Add mandatory Max-Forwards header to local AC -- File Changes -- M src/modules/tm/t_msgbuilder.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3856.patch https://github.com/kamailio/kamailio/pull/3856.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3856 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3856(a)github.com>

3 12

git:5.8:3a34b468: tm: add mandatory Max-Forwards header to local AC
by Juha Heinanen 20 May '24

20 May '24

Module: kamailio Branch: 5.8 Commit: 3a34b468ad93904c507bd0fc7ef592b25321807f URL: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-05-20T19:54:45+03:00 tm: add mandatory Max-Forwards header to local AC --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… Patch: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 362ff6c5eb5..1aa680aa9a4 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1246,7 +1246,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + CRLF_LEN; + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + CRLF_LEN; /* copy'n'paste Route headers */ @@ -1291,6 +1292,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, append_str(p, Trans->callid_hdr.s, Trans->callid_hdr.len); append_str(p, to->s, to->len); + append_str(p, MAXFWD_HEADER, MAXFWD_HEADER_LEN); + append_str(p, Trans->cseq_hdr_n.s, Trans->cseq_hdr_n.len); append_str(p, " ", 1); append_str(p, ACK, ACK_LEN);

1 0

git:master:d4629be2: tm: add mandatory Max-Forwards header to local AC
by Victor Seva 20 May '24

20 May '24

Module: kamailio Branch: master Commit: d4629be286fc6d3cf61574e34ee877b2c5e9ee4a URL: https://github.com/kamailio/kamailio/commit/d4629be286fc6d3cf61574e34ee877b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-20T12:18:38+02:00 tm: add mandatory Max-Forwards header to local AC --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/d4629be286fc6d3cf61574e34ee877b… Patch: https://github.com/kamailio/kamailio/commit/d4629be286fc6d3cf61574e34ee877b… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 362ff6c5eb5..1aa680aa9a4 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1246,7 +1246,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + CRLF_LEN; + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + CRLF_LEN; /* copy'n'paste Route headers */ @@ -1291,6 +1292,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, append_str(p, Trans->callid_hdr.s, Trans->callid_hdr.len); append_str(p, to->s, to->len); + append_str(p, MAXFWD_HEADER, MAXFWD_HEADER_LEN); + append_str(p, Trans->cseq_hdr_n.s, Trans->cseq_hdr_n.len); append_str(p, " ", 1); append_str(p, ACK, ACK_LEN);

1 0

git:master:4eb39425: pv: added $cts - contact header star status
by Daniel-Constantin Mierla 17 May '24

17 May '24

Module: kamailio Branch: master Commit: 4eb39425e2bb9322e0cc4f0c013aaeab1fcfb9dd URL: https://github.com/kamailio/kamailio/commit/4eb39425e2bb9322e0cc4f0c013aaea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-17T10:40:54+02:00 pv: added $cts - contact header star status - 1 if it is *, 0 otherwise --- 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/4eb39425e2bb9322e0cc4f0c013aaea… Patch: https://github.com/kamailio/kamailio/commit/4eb39425e2bb9322e0cc4f0c013aaea… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 3226c773a2e..ec6488d1f04 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -163,6 +163,8 @@ static pv_export_t mod_pvs[] = { PVT_OTHER, pv_get_cseq_body, 0, 0, 0, 0, 0}, {{"ct", (sizeof("ct") - 1)}, /* */ PVT_OTHER, pv_get_contact, 0, 0, 0, 0, 0}, + {{"cts", (sizeof("cts") - 1)}, /* */ + PVT_OTHER, pv_get_contact_star, 0, 0, 0, 0, 0}, {{"ctu", (sizeof("ctu") - 1)}, /* */ PVT_OTHER, pv_get_contact_uri, 0, 0, 0, 0, 0}, {{"cT", (sizeof("cT") - 1)}, /* */ diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8eed3c2e019..87345490af1 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -404,6 +404,29 @@ int pv_get_contact_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &cb->contacts->uri); } +int pv_get_contact_star(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + contact_body_t *cb = NULL; + + if(msg == NULL) + return -1; + + if(msg->contact == NULL && parse_headers(msg, HDR_CONTACT_F, 0) == -1) { + LM_DBG("no contact header\n"); + return pv_get_null(msg, param, res); + } + if(parse_contact_headers(msg) < 0) { + return pv_get_null(msg, param, res); + } + + cb = (contact_body_t *)msg->contact->parsed; + + if(cb->star == 1) { + return pv_get_uintval(msg, param, res, 1); + } + return pv_get_uintval(msg, param, res, 0); +} + int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, struct to_body *xto, int type) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 7d4681dab96..53951340db1 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -67,6 +67,9 @@ int pv_get_contact(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_contact_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_contact_star( + struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, struct to_body *xto, int type);

1 0

git:master:e738bd08: pv: added $ctu - return contact header uri
by Daniel-Constantin Mierla 16 May '24

16 May '24

Module: kamailio Branch: master Commit: e738bd08b14bfc765a8317267d738a8b1b574c64 URL: https://github.com/kamailio/kamailio/commit/e738bd08b14bfc765a8317267d738a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-16T21:24:24+02:00 pv: added $ctu - return contact header uri --- 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/e738bd08b14bfc765a8317267d738a8… Patch: https://github.com/kamailio/kamailio/commit/e738bd08b14bfc765a8317267d738a8… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 5e9da2703e0..3226c773a2e 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -163,6 +163,8 @@ static pv_export_t mod_pvs[] = { PVT_OTHER, pv_get_cseq_body, 0, 0, 0, 0, 0}, {{"ct", (sizeof("ct") - 1)}, /* */ PVT_OTHER, pv_get_contact, 0, 0, 0, 0, 0}, + {{"ctu", (sizeof("ctu") - 1)}, /* */ + PVT_OTHER, pv_get_contact_uri, 0, 0, 0, 0, 0}, {{"cT", (sizeof("cT") - 1)}, /* */ PVT_OTHER, pv_get_content_type, 0, 0, 0, 0, 0}, {{"dd", (sizeof("dd") - 1)}, /* */ diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b10b7513a6f..8eed3c2e019 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -381,6 +381,29 @@ int pv_get_contact(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &msg->contact->body); } +int pv_get_contact_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + contact_body_t *cb = NULL; + + if(msg == NULL) + return -1; + + if(msg->contact == NULL && parse_headers(msg, HDR_CONTACT_F, 0) == -1) { + LM_DBG("no contact header\n"); + return pv_get_null(msg, param, res); + } + if(parse_contact_headers(msg) < 0) { + return pv_get_null(msg, param, res); + } + + cb = (contact_body_t *)msg->contact->parsed; + if(cb->star == 1 || cb->contacts == NULL) { + return pv_get_null(msg, param, res); + } + + return pv_get_strval(msg, param, res, &cb->contacts->uri); +} + int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, struct to_body *xto, int type) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index caaa12e54d1..7d4681dab96 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -65,6 +65,8 @@ int pv_get_errinfo_attr( int pv_get_contact(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_contact_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, struct to_body *xto, int type);

1 0

[kamailio/kamailio] usrloc: delete location_attrs in db_only mode on delete_urecord (PR #3827)
by Rick Barenthin 16 May '24

16 May '24

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

3 3

git:master:6b8f6d3b: usrloc: delete location_attrs in db_only mode on delete_urecord
by Henning Westerholt 16 May '24

16 May '24

Module: kamailio Branch: master Commit: 6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313 URL: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-16T15:18:54+02:00 usrloc: delete location_attrs in db_only mode on delete_urecord When calling delete_urecord in DB_ONLY mode the location_attrs are not deleted. This fix makes sure to delete location_attrs when calling db_delete_urecord is called. --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… Patch: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index f95fe987d75..8a8c1ea7895 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -1784,9 +1784,11 @@ int uldb_delete_attrs(str *_dname, str *_user, str *_domain, str *_ruid) str tname; db_key_t keys[3]; db_val_t vals[3]; + int n = 0; - if(ul_db_ops_ruid == 1) + if(ul_db_ops_ruid == 1 && _ruid) { return uldb_delete_attrs_ruid(_dname, _ruid); + } LM_DBG("trying to delete location attributes\n"); @@ -1805,22 +1807,26 @@ int uldb_delete_attrs(str *_dname, str *_user, str *_domain, str *_ruid) tname.s = tname_buf; tname.len = _dname->len + 6; - keys[0] = &ulattrs_user_col; - keys[1] = &ulattrs_ruid_col; - keys[2] = &ulattrs_domain_col; - - vals[0].type = DB1_STR; - vals[0].nul = 0; - vals[0].val.str_val = *_user; + keys[n] = &ulattrs_user_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_user; + n++; - vals[1].type = DB1_STR; - vals[1].nul = 0; - vals[1].val.str_val = *_ruid; + if(_ruid) { + keys[n] = &ulattrs_ruid_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_ruid; + n++; + } if(ul_use_domain) { - vals[2].type = DB1_STR; - vals[2].nul = 0; - vals[2].val.str_val = *_domain; + keys[n] = &ulattrs_domain_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = *_domain; + n++; } if(ul_dbf.use_table(ul_dbh, &tname) < 0) { @@ -1828,7 +1834,7 @@ int uldb_delete_attrs(str *_dname, str *_user, str *_domain, str *_ruid) return -1; } - if(ul_dbf.delete(ul_dbh, keys, 0, vals, (ul_use_domain) ? (3) : (2)) < 0) { + if(ul_dbf.delete(ul_dbh, keys, 0, vals, n) < 0) { LM_ERR("deleting from database failed\n"); return -1; } diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 3c394a24a10..d47167c0f4b 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -502,6 +502,10 @@ int db_delete_urecord(urecord_t *_r) vals[1].val.str_val.s = dom + 1; vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; } + uldb_delete_attrs( + _r->domain, &vals[0].val.str_val, &vals[1].val.str_val, NULL); + } else { + uldb_delete_attrs(_r->domain, &vals[0].val.str_val, NULL, NULL); } if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {

1 0

[kamailio/kamailio] [FEATURE] mid-call self-redirect call to new nexthop (Issue #3773)
by Jakihiko 16 May '24

16 May '24

These below is sample diagram, where kamailio/rtpengine act as an SBC <img width="1604" alt="image" src="https://github.com/kamailio/kamailio/assets/143789335/b9540fb3-c1bf-4a78-b1…"> * There is an active call carrier, kamailio/rtpngine and Asterisk1 * Asterisk1 went down (power shortage, or network ..) * What I want is kamailio self-redirect the call to Asterisk2 **Describe the solution you'd like** Ideally, kamailio provide the command line to tell which call will be self-redirect to the new destination, eg: `kamcmd -x sefl_redirect_callid <call-id> <destionation-ip>` Noted: I read the https://blog.opensips.org/2021/06/09/media-re-anchoring-using-opensips-3-2/ but re-INVITE to carrier seem not appropriate in my case due to call rate limit. I'm looking for a new solution where I don't need to use re-INVITE when Asterisk down. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3773 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3773(a)github.com>

3 4

git:master:25e409cf: pkg/kamailio/deb: version set to 6.0.0~dev2 [skip ci]
by Victor Seva 16 May '24

16 May '24

Module: kamailio Branch: master Commit: 25e409cf60a80e4e0af09bb84234af51c33755c4 URL: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-16T09:46:51+02:00 pkg/kamailio/deb: version set to 6.0.0~dev2 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/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/jammy/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/25e409cf60a80e4e0af09bb84234af5… Patch: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af5…

1 0

git:master:2e2b22a0: Makefile.defs: version set to 6.0.0-dev2
by Daniel-Constantin Mierla 16 May '24

16 May '24

Module: kamailio Branch: master Commit: 2e2b22a097139239b8493bfdd777530a9795ad66 URL: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-16T09:25:33+02:00 Makefile.defs: version set to 6.0.0-dev2 - next major release series is going to be 6.0.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530… Patch: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9feece65535..99157d2c017 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -104,10 +104,10 @@ endif INSTALL_FLAVOUR=$(FLAVOUR) # version number -VERSION = 5 -PATCHLEVEL = 9 +VERSION = 6 +PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] p_usrloc: use a global all_columns variable in db_load* functions (PR #3845)
by Lucian Balaceanu 16 May '24

16 May '24

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3845 -- Commit Summary -- * p_usrloc: use a global all_columns variable in db_load* functions -- File Changes -- M src/modules/p_usrloc/udomain.c (157) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3845.patch https://github.com/kamailio/kamailio/pull/3845.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3845(a)github.com>

3 10

git:master:ccfb5a0f: auth: point auth_algorithm to a static list values
by Daniel-Constantin Mierla 15 May '24

15 May '24

Module: kamailio Branch: master Commit: ccfb5a0f852bf101c1e2ef46f08192921a4d963f URL: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f081929… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-15T22:03:43+02:00 auth: point auth_algorithm to a static list values - function parameters can be overwritten by subsequent functions --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f081929… Patch: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f081929… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 2fcb9169f26..6517dce566a 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -135,6 +135,17 @@ static struct qp auth_qauthint = {STR_STATIC_INIT("auth-int"), QOP_AUTHINT}; /* Hash algorithm used for digest authentication, MD5 if empty */ str auth_algorithm = {"", 0}; + +#define AUTH_ALG_MD5_IDX 0 +#define AUTH_ALG_SHA256_IDX 1 +/* clang-format off */ +static str auth_algorithm_list[] = { + {"MD5", 3}, + {"SHA-256", 7}, + {NULL, 0} +}; +/* clang-format on */ + int hash_hex_len; int add_authinfo_hdr = 0; /* should an Authentication-Info header be added on 200 OK responses? */ @@ -373,10 +384,12 @@ static int mod_init(void) } if(auth_algorithm.len == 0 || strcmp(auth_algorithm.s, "MD5") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_MD5_IDX]; hash_hex_len = HASHHEXLEN; calc_HA1 = calc_HA1_md5; calc_response = calc_response_md5; } else if(strcmp(auth_algorithm.s, "SHA-256") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_SHA256_IDX]; hash_hex_len = HASHHEXLEN_SHA256; calc_HA1 = calc_HA1_sha256; calc_response = calc_response_sha256; @@ -493,10 +506,12 @@ static int ki_auth_algorithm(sip_msg_t *msg, str *alg) auth_algorithm = *alg; if(strcmp(auth_algorithm.s, "MD5") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_MD5_IDX]; hash_hex_len = HASHHEXLEN; calc_HA1 = calc_HA1_md5; calc_response = calc_response_md5; } else if(strcmp(auth_algorithm.s, "SHA-256") == 0) { + auth_algorithm = auth_algorithm_list[AUTH_ALG_SHA256_IDX]; hash_hex_len = HASHHEXLEN_SHA256; calc_HA1 = calc_HA1_sha256; calc_response = calc_response_sha256;

1 0

TLS.reload and memory usage of SSL_CTX structs
by Xenofon Karamanos 15 May '24

15 May '24

Hello all, I am currently looking into issue https://github.com/kamailio/kamailio/issues/3823 regarding the tls.reload and the constant increase in memory usage when it's called. I tried to look something up related to CRL and related functions for what causing it but nothing to obvious. The only culprit i could find was this function call in SSL_verify_load_locations in load_crl()<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…>. But the same exact function is also called in load_ca_list() with no such behaviour. Next thing i notice, is that on the first rpc call of tls.reload, there is a "significant" memory allocation. What i mean by this is that when a fresh kamailio (5.8) is started up (with -m 7, for low shared memory availability to try and replicate the issue and children=2) and then check free shared memory usage using `kamcmd core.shmmem` is around 2196096 (bytes i am assuming) for my system. On the first call of tls.reload, it drops to 539248. That's a heavy drop so i started digging why on so much allocation is caused. When loading a tls configuration, ksr_fix_domain<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> allocates a new SSL_CTX per process. From what i am seeing this SSL_CTX, is basically the same for each one, with same configuration without any difference on settings. So, what i tried is to allocated it once (see tls_reload branch in my repo<https://github.com/kamailio/kamailio/compare/master...xkaraman:kamailio:tls…>), and just share this context to all of the process and the memory used is way less and also the unbounding memory seems to fixed or at least it's slowed that's barely visible. What are your thoughts on these? Is this something we can done? Is the assumption that tls config will and be the same for every process or can one somehow differentiate from another? Thanks, Xenofon Some numbers for anyone interested: Before the patch 5.8 branch and with settings such as -m 7 (shared memory) and children=2 (with children=8 it doesn't even start, failed to load cyphers in SSL_CTX): Fresh kamailio start shared memory: total: 7340032 free: 2196096 After one tls.reload: free: 539248 After 100 tls.reload: free: 483776 After patch on master (kamailio -m 7 and children=2) (with children=8 it starts normally): Fresh kamailio start shared memory: total: 7340032 free: 3772000 After one tls.reload: free: 3690192 After 100 tls.reload: free: 3681056 [https://repository-images.githubusercontent.com/15101579/2d895000-e695-11e9…]<https://github.com/kamailio/kamailio/compare/master...xkaraman:kamailio:tls…> Comparing kamailio:master...xkaraman:tls_reload · kamailio/kamailio<https://github.com/kamailio/kamailio/compare/master...xkaraman:kamailio:tls…> Kamailio - The Open Source SIP Server for large VoIP and real-time communication platforms - - Comparing kamailio:master...xkaraman:tls_reload · kamailio/kamailio github.com [https://opengraph.githubassets.com/a209e4474f30e5fb4ce474f928991f0fba268f02…]<https://github.com/xkaraman/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> kamailio/src/modules/tls/tls_domain.c at 9c2705b566103f4fad0cad63bc1e36ba3cca621f · xkaraman/kamailio<https://github.com/xkaraman/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> Kamailio - The Open Source SIP Server for large VoIP and real-time communication platforms - - xkaraman/kamailio github.com [https://repository-images.githubusercontent.com/15101579/2d895000-e695-11e9…]<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> kamailio/src/modules/tls/tls_domain.c at 9c2705b566103f4fad0cad63bc1e36ba3cca621f · kamailio/kamailio<https://github.com/kamailio/kamailio/blob/9c2705b566103f4fad0cad63bc1e36ba3…> Kamailio - The Open Source SIP Server for large VoIP and real-time communication platforms - - kamailio/kamailio github.com [https://opengraph.githubassets.com/f4de5f69f56ea5c12c56343428618441242c2518…]<https://github.com/kamailio/kamailio/issues/3823> Memory usage increases everytime tls.reload is executed · Issue #3823 · kamailio/kamailio<https://github.com/kamailio/kamailio/issues/3823> Description We are using Kamailio 5.7.4 on Debian 12 (from http://deb.kamailio.org/kamailio57) with rtpengine as an Edgeproxy for our clients. The instance terminates SIP/TLS (with Cliencertificate... github.com

3 4

git:master:922d7dfd: p_usrloc: use a global p_usrloc_columns variable in db_load* functions
by Lucian Balaceanu 15 May '24

15 May '24

Module: kamailio Branch: master Commit: 922d7dfd9ae7d13436c23d60f22d47c9c2fa127a URL: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2024-05-15T14:09:02+03:00 p_usrloc: use a global p_usrloc_columns variable in db_load* functions --- Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c… Patch: https://github.com/kamailio/kamailio/commit/922d7dfd9ae7d13436c23d60f22d47c…

1 0

[kamailio/kamailio] db_cluster: Update log levels and failed connection id (PR #3834)
by Xenofon Karamanos 15 May '24

15 May '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR aims to update some warning levels used in `db_cluster` module to prevent silent failures. When `db_cluster` tries to do some action in a `db_connector`, it should log some kind of warning (with `conid` that failed) or error instead of debug. When iterating on db_connectors and one fails, it will log a warning with `conid` and if all of the available db are not available it will log an error indicating failure. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3834 -- Commit Summary -- * db_cluster: Update log levels -- File Changes -- M src/modules/db_cluster/dbcl_api.c (83) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3834.patch https://github.com/kamailio/kamailio/pull/3834.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3834 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3834(a)github.com>

1 2

git:master:467dbf3e: db_cluster: Update log levels
by Xenofon Karamanos 15 May '24

15 May '24

Module: kamailio Branch: master Commit: 467dbf3e1be16d5a760178d0801834ac67bad888 URL: https://github.com/kamailio/kamailio/commit/467dbf3e1be16d5a760178d0801834a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-05-15T10:39:49+03:00 db_cluster: Update log levels --- Modified: src/modules/db_cluster/dbcl_api.c --- Diff: https://github.com/kamailio/kamailio/commit/467dbf3e1be16d5a760178d0801834a… Patch: https://github.com/kamailio/kamailio/commit/467dbf3e1be16d5a760178d0801834a…

1 0

[kamailio/kamailio] Added new auth module function auth_algorithm (PR #3849)
by juha-h 14 May '24

14 May '24

#### 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 Added new Added new auth module function auth_algorithm that can be used to dynamically override algorithm parameter value. #### Note I was not able to test check README, because of this error: ``` /usr/src/orig/kamailio$ make modules-readme modules=modules/auth make -C src/ modules-readme make[1]: Entering directory '/usr/src/orig/kamailio/src' make --no-print-directory -C doc auth.txt xsltproc --novalid \ --nonet \ --novalid \ --stringparam output "auth.d" \ ../../../../doc/docbook/dep.xsl auth.xml xsltproc --novalid \ --xinclude \ ../../../../doc/docbook/txt.xsl auth.xml | lynx -nolist -stdin -dump > auth.txt error : Unknown IO error warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" compilation error: file ../../../../doc/docbook/txt.xsl line 6 element import xsl:import : unable to load http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3849 -- Commit Summary -- * Added new auth module function auth_algorithm -- File Changes -- M src/modules/auth/auth_mod.c (37) M src/modules/auth/doc/auth_functions.xml (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3849.patch https://github.com/kamailio/kamailio/pull/3849.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3849 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3849(a)github.com>

3 13

git:master:18e4d38e: auth: export auth_algorithm(...) to kemi
by Daniel-Constantin Mierla 14 May '24

14 May '24

Module: kamailio Branch: master Commit: 18e4d38e4d57ce88cbe16eec4cfb2a5a1b5554a4 URL: https://github.com/kamailio/kamailio/commit/18e4d38e4d57ce88cbe16eec4cfb2a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-14T18:13:04+02:00 auth: export auth_algorithm(...) to kemi --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18e4d38e4d57ce88cbe16eec4cfb2a5… Patch: https://github.com/kamailio/kamailio/commit/18e4d38e4d57ce88cbe16eec4cfb2a5… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index b2854d468bf..2fcb9169f26 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -488,12 +488,9 @@ int w_has_credentials(sip_msg_t *msg, char *realm, char *s2) /** * */ -int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) +static int ki_auth_algorithm(sip_msg_t *msg, str *alg) { - if(fixup_get_svalue(msg, (gparam_t *)alg, &auth_algorithm) < 0) { - LM_ERR("failed to get algorithm value\n"); - return -1; - } + auth_algorithm = *alg; if(strcmp(auth_algorithm.s, "MD5") == 0) { hash_hex_len = HASHHEXLEN; @@ -512,6 +509,21 @@ int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) return 1; } +/** + * + */ +int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) +{ + str salg = str_init(""); + + if(fixup_get_svalue(msg, (gparam_t *)alg, &salg) < 0) { + LM_ERR("failed to get algorithm value\n"); + return -1; + } + + return ki_auth_algorithm(msg, &salg); +} + #ifdef USE_NC /** * Calls auth_check_hdr_md5 with the update_nonce flag set to false. @@ -1384,6 +1396,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("auth_algorithm"), + SR_KEMIP_INT, ki_auth_algorithm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:4a7aa098: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 14 May '24

14 May '24

Module: kamailio Branch: master Commit: 4a7aa098281b608177c5da61e7a47067463267bf URL: https://github.com/kamailio/kamailio/commit/4a7aa098281b608177c5da61e7a4706… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-14T18:01:11+02:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/4a7aa098281b608177c5da61e7a4706… Patch: https://github.com/kamailio/kamailio/commit/4a7aa098281b608177c5da61e7a4706… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index 5d759fe2438..826c0b04dcc 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -57,6 +57,7 @@ Daniel-Constantin Mierla 4.7. pv_proxy_authenticate(realm, passwd, flags) 4.8. pv_auth_check(realm, passwd, flags, checks) 4.9. auth_get_www_authenticate(realm, flags, pvdest) + 4.10. auth_algorithm(algorithm) List of Examples @@ -86,6 +87,7 @@ Daniel-Constantin Mierla 1.24. pv_proxy_authenticate usage 1.25. pv_auth_check usage 1.26. auth_get_www_authenticate + 1.27. auth_algorithm example Chapter 1. Admin Guide @@ -126,6 +128,7 @@ Chapter 1. Admin Guide 4.7. pv_proxy_authenticate(realm, passwd, flags) 4.8. pv_auth_check(realm, passwd, flags, checks) 4.9. auth_get_www_authenticate(realm, flags, pvdest) + 4.10. auth_algorithm(algorithm) 1. Overview @@ -686,6 +689,7 @@ modparam("auth", "add_authinfo_hdr", yes) 4.7. pv_proxy_authenticate(realm, passwd, flags) 4.8. pv_auth_check(realm, passwd, flags, checks) 4.9. auth_get_www_authenticate(realm, flags, pvdest) + 4.10. auth_algorithm(algorithm) 4.1. consume_credentials() @@ -926,3 +930,14 @@ if (auth_get_www_authenticate("$fd", "0", "$var(wauth)")) { xlog("www authenticate header is [$var(wauth)]\n"); } ... + +4.10. auth_algorithm(algorithm) + + Set hash algorithm used for digest authentication thus overriding + algorithm parameter. Possible values are the same as those of algorithm + parameter. The parameter may be a pseudo variable. + + Example 1.27. auth_algorithm example +... +auth_algorithm("$alg"); +...

1 0

git:master:3763e9c8: auth: new function auth_algorithm(...) to dynamically override algorithm
by Daniel-Constantin Mierla 14 May '24

14 May '24

Module: kamailio Branch: master Commit: 3763e9c826640402c798d4581d0b2f1b13e4519b URL: https://github.com/kamailio/kamailio/commit/3763e9c826640402c798d4581d0b2f1… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-14T17:52:29+02:00 auth: new function auth_algorithm(...) to dynamically override algorithm - GH #3849 --- Modified: src/modules/auth/auth_mod.c Modified: src/modules/auth/doc/auth_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/3763e9c826640402c798d4581d0b2f1… Patch: https://github.com/kamailio/kamailio/commit/3763e9c826640402c798d4581d0b2f1… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 534ad9e20f7..b2854d468bf 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -70,11 +70,17 @@ static int mod_init(void); * Remove used credentials from a SIP message header */ int w_consume_credentials(struct sip_msg *msg, char *s1, char *s2); + /* * Check for credentials with given realm */ int w_has_credentials(struct sip_msg *msg, char *s1, char *s2); +/* + * Set authentication algorithm + */ +int w_auth_algorithm(struct sip_msg *msg, char *alg, char *s2); + static int pv_proxy_authenticate( struct sip_msg *msg, char *realm, char *passwd, char *flags); static int pv_www_authenticate( @@ -170,6 +176,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"pv_auth_check", (cmd_function)w_pv_auth_check, 4, fixup_pv_auth_check, 0, REQUEST_ROUTE}, + {"auth_algorithm", w_auth_algorithm, 1, fixup_spve_null, 0, + REQUEST_ROUTE}, {"bind_auth_s", (cmd_function)bind_auth_s, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -477,6 +485,33 @@ int w_has_credentials(sip_msg_t *msg, char *realm, char *s2) return ki_has_credentials(msg, &srealm); } +/** + * + */ +int w_auth_algorithm(sip_msg_t *msg, char *alg, char *s2) +{ + if(fixup_get_svalue(msg, (gparam_t *)alg, &auth_algorithm) < 0) { + LM_ERR("failed to get algorithm value\n"); + return -1; + } + + if(strcmp(auth_algorithm.s, "MD5") == 0) { + hash_hex_len = HASHHEXLEN; + calc_HA1 = calc_HA1_md5; + calc_response = calc_response_md5; + } else if(strcmp(auth_algorithm.s, "SHA-256") == 0) { + hash_hex_len = HASHHEXLEN_SHA256; + calc_HA1 = calc_HA1_sha256; + calc_response = calc_response_sha256; + } else { + LM_ERR("Invalid algorithm provided." + " Possible values are \"\", \"MD5\" or \"SHA-256\"\n"); + return -1; + } + + return 1; +} + #ifdef USE_NC /** * Calls auth_check_hdr_md5 with the update_nonce flag set to false. diff --git a/src/modules/auth/doc/auth_functions.xml b/src/modules/auth/doc/auth_functions.xml index 4b6f19ac05b..6a789e9e5b4 100644 --- a/src/modules/auth/doc/auth_functions.xml +++ b/src/modules/auth/doc/auth_functions.xml @@ -412,5 +412,21 @@ if (auth_get_www_authenticate("$fd", "0", "$var(wauth)")) { </programlisting> </example> </section> + <section id="auth.f.auth_algorithm"> + <title><function>auth_algorithm(algorithm)</function></title> + <para> + Set hash algorithm used for digest authentication thus overriding + algorithm parameter. Possible values are the same as those of + algorithm parameter. The parameter may be a pseudo variable. + </para> + <example> + <title>auth_algorithm example</title> + <programlisting> +... +auth_algorithm("$alg"); +... + </programlisting> + </example> + </section> </section>

1 0

[kamailio/kamailio] db_mysql: failed build on CentOS 7 (Issue #3809)
by sergey-safarov 13 May '24

13 May '24

### Description I can see this error during db_mysql compilation on CentOS 7 ``` CC (gcc) [M db_mysql.so] km_dbase.o CC (gcc) [M db_mysql.so] km_val.o CC (gcc) [M db_mysql.so] km_row.o CC (gcc) [M db_mysql.so] km_my_con.o km_my_con.c: In function 'db_mysql_new_connection': km_my_con.c:183:15: error: 'MYSQL_OPT_SSL_CA' undeclared (first use in this function) ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); ^ km_my_con.c:183:15: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [km_my_con.o] Error 1 make[1]: *** [modules] Error 1 make[1]: Leaving directory `/root/rpmbuild/BUILD/kamailio-5.8.1/src' make: *** [every-module] Error 2 ``` This for 5.8.1 release. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3809 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3809(a)github.com>

2 5

[kamailio/kamailio] db_mysql: fixed build on CentOS 7 (PR #3847)
by sergey-safarov 13 May '24

13 May '24

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

2 2

git:master:767b3fae: db_mysql: fixed build on CentOS 7
by Victor Seva 13 May '24

13 May '24

Module: kamailio Branch: master Commit: 767b3faee3af450d6482b919c81431ea6d707807 URL: https://github.com/kamailio/kamailio/commit/767b3faee3af450d6482b919c81431e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-13T08:36:52+02:00 db_mysql: fixed build on CentOS 7 --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/767b3faee3af450d6482b919c81431e… Patch: https://github.com/kamailio/kamailio/commit/767b3faee3af450d6482b919c81431e… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 4c756db66ff..561a0037223 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -178,9 +178,16 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) } #endif /* MYSQL_VERSION_ID */ #endif /* MARIADB_BASE_VERSION */ + +#ifdef MYSQL_OPT_SSL_CA if(db_mysql_opt_ssl_ca) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); +#else + LM_WARN("opt_ssl_ca option not supported by mysql version (value %s) - " + "ignoring\n", + db_mysql_opt_ssl_ca); +#endif /* MYSQL_OPT_SSL_CA */ #ifdef KSR_MYSQL_OPT_RECONNECT /* set reconnect flag if enabled */

1 0

git:master:d1f377ff: sipcapture: use local static buffers for ip address and port
by Daniel-Constantin Mierla 10 May '24

10 May '24

Module: kamailio Branch: master Commit: d1f377ff23f491bfd5162cb7bf510759440dd8e5 URL: https://github.com/kamailio/kamailio/commit/d1f377ff23f491bfd5162cb7bf51075… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-10T12:45:25+02:00 sipcapture: use local static buffers for ip address and port - GH #3835 --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/d1f377ff23f491bfd5162cb7bf51075… Patch: https://github.com/kamailio/kamailio/commit/d1f377ff23f491bfd5162cb7bf51075… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index cbe79698704..db7ea912e11 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -264,6 +264,8 @@ int parsing_hepv3_message(char *buf, unsigned int len) int totelem = 0; int chunk_vendor = 0, chunk_type = 0, chunk_length = 0; int total_length = 0; + static char ipbuf1[IP_ADDR_MAX_STR_SIZE]; + static char portbuf1[INT2STR_MAX_LEN]; hg = (struct hep_generic_recv *)pkg_malloc(sizeof(struct hep_generic_recv)); @@ -484,13 +486,14 @@ int parsing_hepv3_message(char *buf, unsigned int len) si->flags = 0; si->addr_info_lst = 0; - si->address_str.s = ip_addr2a(&si->address); + si->address_str.len = + ip_addr2sbuf(&si->address, ipbuf1, sizeof(ipbuf1) - 1); + ipbuf1[si->address_str.len] = 0; + si->address_str.s = ipbuf1; - si->address_str.len = strlen(si->address_str.s); - - si->port_no_str.s = int2str(si->port_no, &tmp_len); + si->port_no_str.s = + int2strbuf(si->port_no, portbuf1, INT2STR_MAX_LEN, &tmp_len); si->port_no_str.len = tmp_len; - si->address_str.len = strlen(si->address_str.s); si->name.len = si->address_str.len; si->name.s = si->address_str.s;

1 0

git:master:9b087fd6: tcpops: reformat exported structures
by Daniel-Constantin Mierla 10 May '24

10 May '24

Module: kamailio Branch: master Commit: 9b087fd618ab6c5cbd6a29c352b09c7198f1b594 URL: https://github.com/kamailio/kamailio/commit/9b087fd618ab6c5cbd6a29c352b09c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-10T08:17:17+02:00 tcpops: reformat exported structures --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9b087fd618ab6c5cbd6a29c352b09c7… Patch: https://github.com/kamailio/kamailio/commit/9b087fd618ab6c5cbd6a29c352b09c7…

1 0

Proposing 6.0.x for next stable release series
by Daniel-Constantin Mierla 09 May '24

09 May '24

Hello, I am proposing to switch the development version to target 6.0.x as next major series. I have pushed a new mode for receiving UDP traffic via a multi-threaded process, useful when having to deal with a rather large set of UDP sockets. While it is built reusing some existing components (async workers group and sworker design), it changes substantially how the core can deal with the sip traffic. Similar approach might be added for TCP (TLS), but right now this transport is already using a single pool of works for all sockets, so it doesn't faces the same issues as with UDP for large number of sockets. The old way of handling UDP traffic is not removed, it is still the default, the new one needs testing, of course. Furthermore, the socket global parameter (which is an alternative to listen) can now take a port range to the bind field, simplifying the config when Kamailio has to listen on large number on consecutive ports. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

4 3

git:5.7:4cce7e80: pkg/docker: update 5.7 [skip ci]
by Victor Seva 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: 4cce7e80b7b4e29a98da97a86ac2fc216cb01f4f URL: https://github.com/kamailio/kamailio/commit/4cce7e80b7b4e29a98da97a86ac2fc2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-08T15:47:11+02:00 pkg/docker: update 5.7 [skip ci] * pkg-config in build --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/4cce7e80b7b4e29a98da97a86ac2fc2… Patch: https://github.com/kamailio/kamailio/commit/4cce7e80b7b4e29a98da97a86ac2fc2… --- diff --git a/pkg/docker b/pkg/docker index 064be5f078d..5b8fe2ef455 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 064be5f078d679b0e44abda0e2bfea22e6c6e9ec +Subproject commit 5b8fe2ef455d976984015e8fd2eac4cb90f27192

1 0

git:5.7:b8d50a89: Revert "pkg/docker: update 5.7 [skip ci]"
by Victor Seva 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: b8d50a89d20a1b13b175358c875062d52350cef6 URL: https://github.com/kamailio/kamailio/commit/b8d50a89d20a1b13b175358c875062d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-08T15:41:45+02:00 Revert "pkg/docker: update 5.7 [skip ci]" This reverts commit e21f8667b18c978e90c978e74372b2fc1ad66574. --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/b8d50a89d20a1b13b175358c875062d… Patch: https://github.com/kamailio/kamailio/commit/b8d50a89d20a1b13b175358c875062d… --- diff --git a/pkg/docker b/pkg/docker index 587e86d5e01..064be5f078d 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 587e86d5e013957bcc835d9843df672a4515bdae +Subproject commit 064be5f078d679b0e44abda0e2bfea22e6c6e9ec

1 0

git:5.7:2f9ecdae: Revert "pkg/kamailio/alpine: switch to pcre2 [skip ci]"
by Victor Seva 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: 2f9ecdae6d6b3b49f96e8df86631c23d22396d1f URL: https://github.com/kamailio/kamailio/commit/2f9ecdae6d6b3b49f96e8df86631c23… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-08T15:40:52+02:00 Revert "pkg/kamailio/alpine: switch to pcre2 [skip ci]" This reverts commit 4aeaf7f65744d7037b9dc4fb73f1f1b2266715cc. --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/2f9ecdae6d6b3b49f96e8df86631c23… Patch: https://github.com/kamailio/kamailio/commit/2f9ecdae6d6b3b49f96e8df86631c23… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 71e8740b596..9d84ac66e74 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python3-dev - pcre2-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev + pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev @@ -79,7 +79,7 @@ _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ # - modules for devel purposes _mod_list_devel="misctest print print_lib" -# - modules depending on pcre2 library +# - modules depending on pcre3 library _mod_list_pcre="dialplan lcr regex" # - modules depending on radius client library

1 0

git:5.7:4aeaf7f6: pkg/kamailio/alpine: switch to pcre2 [skip ci]
by Victor Seva 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: 4aeaf7f65744d7037b9dc4fb73f1f1b2266715cc URL: https://github.com/kamailio/kamailio/commit/4aeaf7f65744d7037b9dc4fb73f1f1b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-08T15:30:23+02:00 pkg/kamailio/alpine: switch to pcre2 [skip ci] (cherry picked from commit 7f4fdfa61444ab38b49b74829a40d9ec6d1e050a) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/4aeaf7f65744d7037b9dc4fb73f1f1b… Patch: https://github.com/kamailio/kamailio/commit/4aeaf7f65744d7037b9dc4fb73f1f1b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 9d84ac66e74..71e8740b596 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python3-dev - pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev + pcre2-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev @@ -79,7 +79,7 @@ _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ # - modules for devel purposes _mod_list_devel="misctest print print_lib" -# - modules depending on pcre3 library +# - modules depending on pcre2 library _mod_list_pcre="dialplan lcr regex" # - modules depending on radius client library

1 0

git:5.7:e21f8667: pkg/docker: update 5.7 [skip ci]
by Victor Seva 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: e21f8667b18c978e90c978e74372b2fc1ad66574 URL: https://github.com/kamailio/kamailio/commit/e21f8667b18c978e90c978e74372b2f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-08T14:33:09+02:00 pkg/docker: update 5.7 [skip ci] * missing pre2-dev --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/e21f8667b18c978e90c978e74372b2f… Patch: https://github.com/kamailio/kamailio/commit/e21f8667b18c978e90c978e74372b2f… --- diff --git a/pkg/docker b/pkg/docker index 064be5f078d..587e86d5e01 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 064be5f078d679b0e44abda0e2bfea22e6c6e9ec +Subproject commit 587e86d5e013957bcc835d9843df672a4515bdae

1 0

Build failed in Jenkins: kamailio57-binaries » amd64,bullseye #6
by kamailio＠sipwise.com 08 May '24

08 May '24

See <https://kamailio.sipwise.com/job/kamailio57-binaries/architecture=amd64,dis…> Changes: ------------------------------------------ [...truncated 10.24 KiB...] + '[' -r /etc/jenkins/pbuilderrc ']' + echo '*** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile ***' *** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile *** + echo '# /etc/jenkins/pbuilderrc added via jenkins-debian-glue:' + cat /etc/jenkins/pbuilderrc + '[' -n '' ']' + echo '*** COMPONENTS is not set, checking whether we need to enable Ubuntu workaround ***' *** COMPONENTS is not set, checking whether we need to enable Ubuntu workaround *** + '[' -n /etc/jenkins/pbuilderrc ']' + echo '*** PBUILDER_CONFIG is set, not overwriting COMPONENTS for Ubuntu workaround ***' *** PBUILDER_CONFIG is set, not overwriting COMPONENTS for Ubuntu workaround *** + echo '*** NOTE: If you want to build for Ubuntu make sure COMPONENTS also includes '\''universe'\'' ***' *** NOTE: If you want to build for Ubuntu make sure COMPONENTS also includes 'universe' *** + grep -q Ubuntu + lsb_release --id + echo '*** Listing pbuilder configuration file as reference: ***' *** Listing pbuilder configuration file as reference: *** + cat /tmp/tmp.nNF2yQ8N6s # pbuilder config file generated by jenkins-debian-glue on Wed May 8 10:36:13 UTC 2024 ADDITIONAL_BUILDRESULTS+=('../*lintian.txt') EXTRAPACKAGES="$EXTRAPACKAGES eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" # builtin support available with pbuilder >=0.225 (otherwise ignored): EATMYDATA=yes # /etc/jenkins/pbuilderrc added via jenkins-debian-glue: # distribution specific configuration case "$distribution" in xenial|bionic|focal|jammy) MIRRORSITE="http://archive.ubuntu.com/ubuntu/" # we need key id 40976EAF437D05B5 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg") # cowdancer is in universe COMPONENTS="main universe" # security and updates OTHERMIRROR="deb http://archive.ubuntu.com/ubuntu/ ${distribution}-updates main universe|deb-src http://security.ubuntu.com/ubuntu ${distribution}-security main universe" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; trusty) # lacks eatmydata package, so explicitly configure it MIRRORSITE="http://archive.ubuntu.com/ubuntu/" # we need key id 40976EAF437D05B5 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg") # cowdancer is in universe COMPONENTS="main universe" # security and updates OTHERMIRROR="deb http://archive.ubuntu.com/ubuntu/ ${distribution}-updates main universe|deb-src http://security.ubuntu.com/ubuntu ${distribution}-security main universe" # ensure it's unset unset LD_PRELOAD ;; precise) # lacks eatmydata package, so explicitly configure it # also EOL nowadays, so need other mirror MIRRORSITE="http://old-releases.ubuntu.com/ubuntu/" # we need key id 40976EAF437D05B5 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg") # cowdancer is in universe COMPONENTS="main universe" # security and updates OTHERMIRROR="deb http://old-releases.ubuntu.com/ubuntu/ ${distribution}-updates main universe|deb-src http://old-releases.ubuntu.com/ubuntu ${distribution}-security main universe" # ensure it's unset unset LD_PRELOAD ;; wheezy) # nowadays resides on archive MIRRORSITE="http://archive.debian.org/debian/" # we need key id 6FB2A1C265FFB764 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/debian-archive-removed-keys.gpg") # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; jessie) # nowadays resides on archive MIRRORSITE="http://archive.debian.org/debian/" # security and updates OTHERMIRROR="deb http://archive.debian.org/debian-security ${distribution}/updates main" # we need key id CBF8D6FD518E17E1 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/debian-archive-removed-keys.gpg") # support bootstrapping archived repository with expired GPG key APTGETOPT=("${APTGETOPT[@]}" "-o Acquire::Check-Valid-Until=false" "-o APT::Get::AllowUnauthenticated=true" --force-yes) # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; stretch) # nowadays resides on archive MIRRORSITE="http://archive.debian.org/debian/" # archived security repository OTHERMIRROR="deb http://archive.debian.org/debian-security ${distribution}/updates main" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; buster) MIRRORSITE="http://deb.debian.org/debian" # security and updates OTHERMIRROR="deb http://security.debian.org/debian-security ${distribution}/updates main" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; bullseye|bookworm) MIRRORSITE="http://deb.debian.org/debian" # security and updates OTHERMIRROR="deb http://security.debian.org/debian-security ${distribution}-security main" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; *) MIRRORSITE="http://deb.debian.org/debian" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; esac + ls '/var/cache/pbuilder/base-bullseye-amd64.cow.building.*' + ls '/run/lock/bullseye-amd64.update*' + flock --nonblock 9 + touch /run/lock/bullseye-amd64.update.18075 + '[' '!' -d /var/cache/pbuilder/base-bullseye-amd64.cow ']' + '[' '' = true ']' + echo '*** Updating cowbuilder cow base ***' *** Updating cowbuilder cow base *** + sudo DIST=bullseye ARCH=amd64 cowbuilder --update --basepath /var/cache/pbuilder/base-bullseye-amd64.cow --configfile=/tmp/tmp.nNF2yQ8N6s I: Copying COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.18103 I: forking: cp -al /var/cache/pbuilder/base-bullseye-amd64.cow /var/cache/pbuilder/build/cow.18103 I: removed stale ilistfile /var/cache/pbuilder/build/cow.18103/.ilist I: Invoking pbuilder I: forking: pbuilder update --configfile /tmp/tmp.nNF2yQ8N6s --buildplace /var/cache/pbuilder/build/cow.18103 --mirror http://deb.debian.org/debian --distribution sid --extrapackages eatmydata --no-targz --internal-chrootexec 'chroot /var/cache/pbuilder/build/cow.18103 cow-shell' W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: Current time: Wed May 8 10:36:13 UTC 2024 I: pbuilder-time-stamp: 1715164573 I: copying local configuration W: No local /etc/mailname to copy, relying on /var/cache/pbuilder/build/cow.18103/etc/mailname to be correct W: --override-config is not set; not updating apt.conf Read the manpage for details. I: mounting /proc filesystem I: mounting /sys filesystem I: creating /{dev,run}/shm I: mounting /dev/pts filesystem I: redirecting /dev/ptmx to /dev/pts/ptmx I: policy-rc.d already exists I: using eatmydata during job I: Refreshing the base.tgz I: upgrading packages Hit:1 http://security.debian.org/debian-security bullseye-security InRelease Hit:2 http://deb.debian.org/debian bullseye InRelease Reading package lists... I: Obtaining the cached apt archive contents Reading package lists... Building dependency tree... Reading state information... Calculating upgrade... 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. Reading package lists... Building dependency tree... Reading state information... FATAL: command execution failed java.io.EOFException at java.base/java.io.ObjectInputStream$PeekInputStream.readFully(ObjectInputStream.java:2911) at java.base/java.io.ObjectInputStream$BlockDataInputStream.readShort(ObjectInputStream.java:3406) at java.base/java.io.ObjectInputStream.readStreamHeader(ObjectInputStream.java:932) at java.base/java.io.ObjectInputStream.<init>(ObjectInputStream.java:375) at hudson.remoting.ObjectInputStreamEx.<init>(ObjectInputStreamEx.java:50) at hudson.remoting.Command.readFrom(Command.java:142) at hudson.remoting.Command.readFrom(Command.java:128) at hudson.remoting.AbstractSynchronousByteArrayCommandTransport.read(AbstractSynchronousByteArrayCommandTransport.java:35) at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:61) Caused: java.io.IOException: Unexpected termination of the channel at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:75) Caused: hudson.remoting.ChannelClosedException: Channel "hudson.remoting.Channel@46b3467e:EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c)": Remote call on EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c) failed. The channel is closing down or has closed down at hudson.remoting.Channel.call(Channel.java:996) at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:285) at com.sun.proxy.$Proxy135.isAlive(Unknown Source) at hudson.Launcher$RemoteLauncher$ProcImpl.isAlive(Launcher.java:1212) at hudson.Launcher$RemoteLauncher$ProcImpl.join(Launcher.java:1204) at hudson.tasks.CommandInterpreter.join(CommandInterpreter.java:195) at hudson.tasks.CommandInterpreter.perform(CommandInterpreter.java:145) at hudson.tasks.CommandInterpreter.perform(CommandInterpreter.java:92) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:818) at hudson.model.Build$BuildExecution.build(Build.java:199) at hudson.model.Build$BuildExecution.doRun(Build.java:164) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:526) at hudson.model.Run.execute(Run.java:1895) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:101) at hudson.model.Executor.run(Executor.java:442) FATAL: Unable to delete script file /tmp/jenkins2733275163131865227.sh java.io.EOFException at java.base/java.io.ObjectInputStream$PeekInputStream.readFully(ObjectInputStream.java:2911) at java.base/java.io.ObjectInputStream$BlockDataInputStream.readShort(ObjectInputStream.java:3406) at java.base/java.io.ObjectInputStream.readStreamHeader(ObjectInputStream.java:932) at java.base/java.io.ObjectInputStream.<init>(ObjectInputStream.java:375) at hudson.remoting.ObjectInputStreamEx.<init>(ObjectInputStreamEx.java:50) at hudson.remoting.Command.readFrom(Command.java:142) at hudson.remoting.Command.readFrom(Command.java:128) at hudson.remoting.AbstractSynchronousByteArrayCommandTransport.read(AbstractSynchronousByteArrayCommandTransport.java:35) at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:61) Caused: java.io.IOException: Unexpected termination of the channel at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:75) Caused: hudson.remoting.ChannelClosedException: Channel "hudson.remoting.Channel@46b3467e:EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c)": Remote call on EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c) failed. The channel is closing down or has closed down at hudson.remoting.Channel.call(Channel.java:996) at hudson.FilePath.act(FilePath.java:1230) at hudson.FilePath.act(FilePath.java:1219) at hudson.FilePath.delete(FilePath.java:1766) at hudson.tasks.CommandInterpreter.perform(CommandInterpreter.java:163) at hudson.tasks.CommandInterpreter.perform(CommandInterpreter.java:92) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:818) at hudson.model.Build$BuildExecution.build(Build.java:199) at hudson.model.Build$BuildExecution.doRun(Build.java:164) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:526) at hudson.model.Run.execute(Run.java:1895) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:101) at hudson.model.Executor.run(Executor.java:442) Build step 'Execute shell' marked build as failure FATAL: Channel "hudson.remoting.Channel@46b3467e:EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c)": Remote call on EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c) failed. The channel is closing down or has closed down java.io.EOFException at java.base/java.io.ObjectInputStream$PeekInputStream.readFully(ObjectInputStream.java:2911) at java.base/java.io.ObjectInputStream$BlockDataInputStream.readShort(ObjectInputStream.java:3406) at java.base/java.io.ObjectInputStream.readStreamHeader(ObjectInputStream.java:932) at java.base/java.io.ObjectInputStream.<init>(ObjectInputStream.java:375) at hudson.remoting.ObjectInputStreamEx.<init>(ObjectInputStreamEx.java:50) at hudson.remoting.Command.readFrom(Command.java:142) at hudson.remoting.Command.readFrom(Command.java:128) at hudson.remoting.AbstractSynchronousByteArrayCommandTransport.read(AbstractSynchronousByteArrayCommandTransport.java:35) at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:61) Caused: java.io.IOException: Unexpected termination of the channel at hudson.remoting.SynchronousCommandTransport$ReaderThread.run(SynchronousCommandTransport.java:75) Caused: hudson.remoting.ChannelClosedException: Channel "hudson.remoting.Channel@46b3467e:EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c)": Remote call on EC2 (ec2-eu-west-1) - jenkins-debian-glue-slave bullseye (i-07f4d2bdcc03f3a7c) failed. The channel is closing down or has closed down at hudson.remoting.Channel.call(Channel.java:996) at hudson.Launcher$RemoteLauncher.kill(Launcher.java:1147) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:538) at hudson.model.Run.execute(Run.java:1895) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:101) at hudson.model.Executor.run(Executor.java:442) Archiving artifacts Agent went offline during the build ERROR: Connection was broken Build step 'Archive the artifacts' marked build as failure ERROR: Step ‘Publish TAP Results’ failed: no workspace for kamailio57-binaries/architecture=amd64,distribution=bullseye #6 ERROR: Step ‘Publish JUnit test result report’ failed: no workspace for kamailio57-binaries/architecture=amd64,distribution=bullseye #6

1 1

Kamailio v5.7.5 Released
by Daniel-Constantin Mierla 08 May '24

08 May '24

Hello, Kamailio SIP Server v5.7.5 stable release is out. This is a maintenance release of the latest stable branch, 5.7, that includes fixes since the release of v5.7.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.7.x. Deployments running previous v5.7.x versions are strongly recommended to be upgraded to v5.7.5. For more details about version 5.7.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/05/kamailio-v5-7-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note that 5.7.x is currently the previous stable release series, the latest is 5.8.x and v5.8.1 was released on April 3, 2024. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 0

[kamailio/kamailio] Possible Mem leak in Core (Issue #3841)
by paresh-panda 08 May '24

08 May '24

Hi, I am trying to run a load test of 1000 messages/sec with 3gpp-SMS #### Kamailio details > Kamailio version : 5.7.4 (downloaded from deb repo) > Ruuning under Ubuntu 18.04.6 LT > PKG Mem 32 MB > SHM Mem 1024 MB When I run the load for around half an hour the PKG mem usgae keeps on increasing and finally after the mentioned (half an hour) time Kamailio start putting Error Logs that : **_could not allocate private memory from pkg pool_** I referred to https://www.kamailio.org/wiki/tutorials/troubleshooting/memory, and when I use **kamcmd pkg.stats** I see blow out put for the udp receivers : ``` { entry: 1 pid: 11070 rank: 1 used: 3652840 free: 0 real_used: 16777216 total_size: 16777216 total_frags: 0 desc: udp receiver child=0 sock=192.168.136.151:5060 } { entry: 2 pid: 11071 rank: 2 used: 3652840 free: 0 real_used: 16777216 total_size: 16777216 total_frags: 0 desc: udp receiver child=1 sock=192.168.136.151:5060 } { entry: 3 pid: 11072 rank: 3 used: 3652912 free: 0 real_used: 16777216 total_size: 16777216 total_frags: 0 desc: udp receiver child=2 sock=192.168.136.151:5060 } ``` On further enabling **memdbg** for individual packets, I could see that for each message processing : 204 Malloc operations , 184 free operations . _Seems to be a memory leak condition_ . Am i missing something here ? On matching the allocated and freed address, I could find below source files where address is allocated but not freed : ``` May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:450]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) called from core: core/route.c: route_add(124) May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:540]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) returns address 0x7fc29f2a4188 May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:450]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) called from core: core/route.c: route_add(124) May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:540]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) returns address 0x7fc29f2a4200 May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:450]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) called from core: core/route.c: route_add(124) May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:540]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) returns address 0x7fc29f2a4278 May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:450]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) called from core: core/route.c: route_add(124) May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:540]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 48) returns address 0x7fc29f2a42f0 ``` ``` May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:540]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 64) returns address 0x7fc29f2a44f8 May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:450]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 64) called from core: core/parser/msg_parser.c: parse_heade May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:540]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 64) returns address 0x7fc29f2b2df8 May 6 15:23:48 stgn-haud-vm-ub-kamailio01 /usr/sbin/kamailio[14646]: INFO: <core> [core/mem/f_malloc.c:450]: fm_malloc(): fm_malloc(0x7fc29f1fb010, 64) called from core: core/parser/msg_parser.c: parse_heade ``` Need guidance support here how to avoid this memory leak condition and how to get more details to aid further investigation. Thank you! Regards Paresh Panda -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3841 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3841(a)github.com>

2 3

git:5.7:58499a33: ChangeLog: content updated for v5.7.5
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: 58499a330510d157d59a9103576021fd7407e860 URL: https://github.com/kamailio/kamailio/commit/58499a330510d157d59a9103576021f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T09:08:04+02:00 ChangeLog: content updated for v5.7.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/58499a330510d157d59a9103576021f… Patch: https://github.com/kamailio/kamailio/commit/58499a330510d157d59a9103576021f…

1 0

git:5.7:b0caec01: Makefile.defs: version set to 5.7.5
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: b0caec0143187f487b24d37376e93b05340db1ad URL: https://github.com/kamailio/kamailio/commit/b0caec0143187f487b24d37376e93b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T07:58:49+02:00 Makefile.defs: version set to 5.7.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b0caec0143187f487b24d37376e93b0… Patch: https://github.com/kamailio/kamailio/commit/b0caec0143187f487b24d37376e93b0… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d393653c4a0..3a73dadcce2 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 7 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:5.7:7590ff14: pkg: deb specs updated for v5.7.4
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: 7590ff14e0c9bcab17a298f806f4da8a564c83a8 URL: https://github.com/kamailio/kamailio/commit/7590ff14e0c9bcab17a298f806f4da8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T07:57:26+02:00 pkg: deb specs updated for v5.7.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/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/jammy/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/7590ff14e0c9bcab17a298f806f4da8… Patch: https://github.com/kamailio/kamailio/commit/7590ff14e0c9bcab17a298f806f4da8…

1 0

git:5.7:aab0f988: pkg: version set to 5.7.5 for rpms and alpine specs
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: aab0f988b6c69266b54dc2d92c6c9f739ef6805e URL: https://github.com/kamailio/kamailio/commit/aab0f988b6c69266b54dc2d92c6c9f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T07:56:41+02:00 pkg: version set to 5.7.5 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/aab0f988b6c69266b54dc2d92c6c9f7… Patch: https://github.com/kamailio/kamailio/commit/aab0f988b6c69266b54dc2d92c6c9f7… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 506bf79dd30..9d84ac66e74 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.7.4 +pkgver=5.7.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e3e002dfa68..7b39ad333ff 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.7.4 +%define ver 5.7.5 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing v5.7.5
by Daniel-Constantin Mierla 08 May '24

08 May '24

Hello, I am considering to release Kamailio v5.7.5 (out of branch 5.7) on Wednesday, May 8, 2024. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 1

git:5.8:ba7a4901: etc/kamailio.cfg: remove executable flag
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: 5.8 Commit: ba7a4901268493f5432d5efd59d6dbd7b422742f URL: https://github.com/kamailio/kamailio/commit/ba7a4901268493f5432d5efd59d6dbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T06:59:31+02:00 etc/kamailio.cfg: remove executable flag --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ba7a4901268493f5432d5efd59d6dbd… Patch: https://github.com/kamailio/kamailio/commit/ba7a4901268493f5432d5efd59d6dbd… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg old mode 100755 new mode 100644

1 0

git:5.7:d88542f2: etc/kamailio.cfg: remove executable flag
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: 5.7 Commit: d88542f235af01d63c555673bebbc0c64ea825e2 URL: https://github.com/kamailio/kamailio/commit/d88542f235af01d63c555673bebbc0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T06:59:08+02:00 etc/kamailio.cfg: remove executable flag --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/d88542f235af01d63c555673bebbc0c… Patch: https://github.com/kamailio/kamailio/commit/d88542f235af01d63c555673bebbc0c… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg old mode 100755 new mode 100644

1 0

git:master:1535031a: etc/kamailio.cfg: remove executable flag
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: master Commit: 1535031a6c992c23270050793b23d290a631b684 URL: https://github.com/kamailio/kamailio/commit/1535031a6c992c23270050793b23d29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T06:59:23+02:00 etc/kamailio.cfg: remove executable flag --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/1535031a6c992c23270050793b23d29… Patch: https://github.com/kamailio/kamailio/commit/1535031a6c992c23270050793b23d29… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg old mode 100755 new mode 100644

1 0

git:5.7:a49a4aef: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: a49a4aefa7c72e113d354f0e71add874fb191ec9 URL: https://github.com/kamailio/kamailio/commit/a49a4aefa7c72e113d354f0e71add87… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T21:16:27+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/a49a4aefa7c72e113d354f0e71add87… Patch: https://github.com/kamailio/kamailio/commit/a49a4aefa7c72e113d354f0e71add87… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index c9bb2daca98..c551663536f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,11 +218,12 @@ Chapter 1. Admin Guide Database URL. - Default value is ��DEFAULT_DB_URL��. + Default value is ��mysql://kamailio:kamailiorw@localhost/kamailio��. Example 1.1. Set db_url parameter ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio +") ... 3.2. table_name (str)

1 0

git:5.8:191aec6e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 191aec6ef644024741c23776c35fc712aa82a6b5 URL: https://github.com/kamailio/kamailio/commit/191aec6ef644024741c23776c35fc71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T21:16:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/191aec6ef644024741c23776c35fc71… Patch: https://github.com/kamailio/kamailio/commit/191aec6ef644024741c23776c35fc71… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index c9bb2daca98..c551663536f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,11 +218,12 @@ Chapter 1. Admin Guide Database URL. - Default value is ��DEFAULT_DB_URL��. + Default value is ��mysql://kamailio:kamailiorw@localhost/kamailio��. Example 1.1. Set db_url parameter ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio +") ... 3.2. table_name (str)

1 0

git:5.7:289ab7dd: sipcapture: fix default DB URL docs
by Henning Westerholt 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 289ab7ddceaaf923edfe15b11361f0acb16c0dde URL: https://github.com/kamailio/kamailio/commit/289ab7ddceaaf923edfe15b11361f0a… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T19:02:35Z sipcapture: fix default DB URL docs (cherry picked from commit aeeeb0c2f46c2575639dd725bef78fac64219a07) (cherry picked from commit 29ef69b8807023e082d7c9880c63bee11d4f3b30) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/289ab7ddceaaf923edfe15b11361f0a… Patch: https://github.com/kamailio/kamailio/commit/289ab7ddceaaf923edfe15b11361f0a… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 6a428133866..258e30fe237 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,14 +89,14 @@ </para> <para> <emphasis> - Default value is <quote>DEFAULT_DB_URL</quote>. + Default value is <quote>&defaultdb;</quote>. </emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "&defaultdb;") ... </programlisting> </example>

1 0

git:5.8:29ef69b8: sipcapture: fix default DB URL docs
by Henning Westerholt 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 29ef69b8807023e082d7c9880c63bee11d4f3b30 URL: https://github.com/kamailio/kamailio/commit/29ef69b8807023e082d7c9880c63bee… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T19:02:16Z sipcapture: fix default DB URL docs (cherry picked from commit aeeeb0c2f46c2575639dd725bef78fac64219a07) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/29ef69b8807023e082d7c9880c63bee… Patch: https://github.com/kamailio/kamailio/commit/29ef69b8807023e082d7c9880c63bee… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 6a428133866..258e30fe237 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,14 +89,14 @@ </para> <para> <emphasis> - Default value is <quote>DEFAULT_DB_URL</quote>. + Default value is <quote>&defaultdb;</quote>. </emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "&defaultdb;") ... </programlisting> </example>

1 0

git:5.8:c3f424bd: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: c3f424bd6c0f8b9a2557cd58a3e3f5ac586d8c99 URL: https://github.com/kamailio/kamailio/commit/c3f424bd6c0f8b9a2557cd58a3e3f5a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T19:46:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/c3f424bd6c0f8b9a2557cd58a3e3f5a… Patch: https://github.com/kamailio/kamailio/commit/c3f424bd6c0f8b9a2557cd58a3e3f5a… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index bbebe20ffb3..1897be96e1b 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -437,6 +437,14 @@ event_route[tcp:closed] { Whether these routes are always called, never, or on a per socket basis is controlled by the closed_event parameter. + Note that the event routes can be executed by TCP main process, which + manages the TCP connections but does not hande the SIP traffic over + them. It is very important not do do any time consuming operations + inside the event routes. Also, many resources might not be available in + the TCP main process (e.g., database connections), consider using async + module with async_task_data(...) or async_task_group_data() functions + for delegating task execution to async workers. + 4.1. tcp:closed Called for each "normal" TCP socket closure by the other side

1 0

git:master:29910ecc: modules: readme files regenerated - tcpops ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 29910ecc8f27cf70aa4490f8ed5188199ad8e612 URL: https://github.com/kamailio/kamailio/commit/29910ecc8f27cf70aa4490f8ed51881… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T19:46:10+02:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/29910ecc8f27cf70aa4490f8ed51881… Patch: https://github.com/kamailio/kamailio/commit/29910ecc8f27cf70aa4490f8ed51881… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index bbebe20ffb3..1897be96e1b 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -437,6 +437,14 @@ event_route[tcp:closed] { Whether these routes are always called, never, or on a per socket basis is controlled by the closed_event parameter. + Note that the event routes can be executed by TCP main process, which + manages the TCP connections but does not hande the SIP traffic over + them. It is very important not do do any time consuming operations + inside the event routes. Also, many resources might not be available in + the TCP main process (e.g., database connections), consider using async + module with async_task_data(...) or async_task_group_data() functions + for delegating task execution to async workers. + 4.1. tcp:closed Called for each "normal" TCP socket closure by the other side

1 0

git:5.8:383a81bb: tcpops: note about execution of event routes by TCP main process
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 383a81bb9d81e06ab9da99cdaa3def3b63028040 URL: https://github.com/kamailio/kamailio/commit/383a81bb9d81e06ab9da99cdaa3def3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T19:34:35+02:00 tcpops: note about execution of event routes by TCP main process (cherry picked from commit be9af338e3afdab1045cdd7c30a72a9ecddcb680) --- Modified: src/modules/tcpops/doc/eventroutes.xml --- Diff: https://github.com/kamailio/kamailio/commit/383a81bb9d81e06ab9da99cdaa3def3… Patch: https://github.com/kamailio/kamailio/commit/383a81bb9d81e06ab9da99cdaa3def3… --- diff --git a/src/modules/tcpops/doc/eventroutes.xml b/src/modules/tcpops/doc/eventroutes.xml index ff05df24cdc..1166d366f0c 100644 --- a/src/modules/tcpops/doc/eventroutes.xml +++ b/src/modules/tcpops/doc/eventroutes.xml @@ -31,6 +31,16 @@ <emphasis>closed_event</emphasis> parameter. </para> + <para> + Note that the event routes can be executed by TCP main process, + which manages the TCP connections but does not hande the SIP traffic + over them. It is very important not do do any time consuming + operations inside the event routes. Also, many resources might not + be available in the TCP main process (e.g., database connections), + consider using async module with async_task_data(...) or + async_task_group_data() functions for delegating task execution + to async workers. + </para> <section> <title> <function moreinfo="none">tcp:closed</function> @@ -77,4 +87,4 @@ event_route[tcp:reset] { </programlisting> </para> </section> -</section> \ No newline at end of file +</section>

1 0

git:master:be9af338: tcpops: note about execution of event routes by TCP main process
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: be9af338e3afdab1045cdd7c30a72a9ecddcb680 URL: https://github.com/kamailio/kamailio/commit/be9af338e3afdab1045cdd7c30a72a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T19:32:39+02:00 tcpops: note about execution of event routes by TCP main process --- Modified: src/modules/tcpops/doc/eventroutes.xml --- Diff: https://github.com/kamailio/kamailio/commit/be9af338e3afdab1045cdd7c30a72a9… Patch: https://github.com/kamailio/kamailio/commit/be9af338e3afdab1045cdd7c30a72a9… --- diff --git a/src/modules/tcpops/doc/eventroutes.xml b/src/modules/tcpops/doc/eventroutes.xml index ff05df24cdc..1166d366f0c 100644 --- a/src/modules/tcpops/doc/eventroutes.xml +++ b/src/modules/tcpops/doc/eventroutes.xml @@ -31,6 +31,16 @@ <emphasis>closed_event</emphasis> parameter. </para> + <para> + Note that the event routes can be executed by TCP main process, + which manages the TCP connections but does not hande the SIP traffic + over them. It is very important not do do any time consuming + operations inside the event routes. Also, many resources might not + be available in the TCP main process (e.g., database connections), + consider using async module with async_task_data(...) or + async_task_group_data() functions for delegating task execution + to async workers. + </para> <section> <title> <function moreinfo="none">tcp:closed</function> @@ -77,4 +87,4 @@ event_route[tcp:reset] { </programlisting> </para> </section> -</section> \ No newline at end of file +</section>

1 0

[kamailio/kamailio] sql_query fails from tcp:closed event_route (Issue #3843)
by juha-h 07 May '24

07 May '24

### Description I noticed that sql_query does not work (using latest 5.8 on Debian 12) when called from `tcp:closed` event_route: ``` event_route [tcp:closed] { # Handle TCP connection close # Delete possible leftover registration if ($conid) sql_query("sip_proxy_cache", "DELETE FROM location WHERE server_id=0 AND connection_id=$conid", "result"); } ``` The query produces errors: ``` 2024-05-07T11:30:14.785915+03:00 siika /usr/bin/sip-proxy[2848078]: CRITICAL: sqlops [sqlops.c:213]: sql_check_connection(): no database handle with reconnect disabled 2024-05-07T11:30:14.785978+03:00 siika /usr/bin/sip-proxy[2848078]: ERROR: sqlops [sqlops.c:232]: sql_query(): invalid connection to database 2024-05-07T11:30:14.786013+03:00 siika /usr/bin/sip-proxy[2848078]: ERROR: sqlops [sqlops.c:237]: sql_query(): with query [DELETE FROM location WHERE server_id=0 AND connection_id=7] ``` I added the last debug message in order to find out where the error comes from. The same query works fine when executed from regular route and earlier (but don't remember when), the same query worked fine also from `tcp:closed` event_route. This may be related to https://github.com/kamailio/kamailio/issues/3768. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3843 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3843(a)github.com>

2 11

git:master:3b7754fd: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 3b7754fd3a75f849bb7509968843817d5888b2f8 URL: https://github.com/kamailio/kamailio/commit/3b7754fd3a75f849bb7509968843817… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T18:16:09+02:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/3b7754fd3a75f849bb7509968843817… Patch: https://github.com/kamailio/kamailio/commit/3b7754fd3a75f849bb7509968843817… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index c9bb2daca98..c551663536f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,11 +218,12 @@ Chapter 1. Admin Guide Database URL. - Default value is ��DEFAULT_DB_URL��. + Default value is ��mysql://kamailio:kamailiorw@localhost/kamailio��. Example 1.1. Set db_url parameter ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio +") ... 3.2. table_name (str)

1 0

git:master:aeeeb0c2: sipcapture: fix default DB URL docs
by Henning Westerholt 07 May '24

07 May '24

Module: kamailio Branch: master Commit: aeeeb0c2f46c2575639dd725bef78fac64219a07 URL: https://github.com/kamailio/kamailio/commit/aeeeb0c2f46c2575639dd725bef78fa… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T16:14:46Z sipcapture: fix default DB URL docs --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aeeeb0c2f46c2575639dd725bef78fa… Patch: https://github.com/kamailio/kamailio/commit/aeeeb0c2f46c2575639dd725bef78fa… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 6a428133866..258e30fe237 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,14 +89,14 @@ </para> <para> <emphasis> - Default value is <quote>DEFAULT_DB_URL</quote>. + Default value is <quote>&defaultdb;</quote>. </emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "&defaultdb;") ... </programlisting> </example>

1 0

git:5.7:278e29a5: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 278e29a5750401fe5d0e7482792dbb113362103b URL: https://github.com/kamailio/kamailio/commit/278e29a5750401fe5d0e7482792dbb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T17:46:25+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/278e29a5750401fe5d0e7482792dbb1… Patch: https://github.com/kamailio/kamailio/commit/278e29a5750401fe5d0e7482792dbb1… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index dda17d994c6..c9bb2daca98 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,7 +218,7 @@ Chapter 1. Admin Guide Database URL. - Default value is "". + Default value is ��DEFAULT_DB_URL��. Example 1.1. Set db_url parameter ...

1 0

git:5.7:5566647a: ctl: info log on ECONNRESET (connection reset by peer)
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 5566647a85f23e753774fa4c87e213c2fbb7b317 URL: https://github.com/kamailio/kamailio/commit/5566647a85f23e753774fa4c87e213c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:41+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio (cherry picked from commit 446c75e0e2194b6e42d768d2e3c79b5f0222905f) (cherry picked from commit b5eb4f5ca037239f2ec1d99a16a71af0383f737e) --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/5566647a85f23e753774fa4c87e213c… Patch: https://github.com/kamailio/kamailio/commit/5566647a85f23e753774fa4c87e213c… --- diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index eb93f5f960d..4c15a6b1f21 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -486,7 +486,11 @@ static int handle_stream_read(struct stream_connection *s_c, int idx) } else if(errno == EINTR) { goto again; } - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("handle_stream read: eof on %s\n", s_c->parent->name); @@ -602,7 +606,11 @@ static int handle_fifo_read(struct ctrl_socket *cs, int idx) goto no_read; /* nothing has been read */ } else if(errno == EINTR) goto again; - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("eof on %s\n", cs->name);

1 0

git:5.7:d9e63ac9: ctl: removed level and function names from log messages
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: d9e63ac912c1f0b3ec71611516ea3e52206b6edf URL: https://github.com/kamailio/kamailio/commit/d9e63ac912c1f0b3ec71611516ea3e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:35+02:00 ctl: removed level and function names from log messages (cherry picked from commit 65bafaffd6bcfebc508b774cfbb78120e68bb3f0) (cherry picked from commit 24e43d27544bdfa1acfce7ebb8b6e3ba7841fc13) --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/d9e63ac912c1f0b3ec71611516ea3e5… Patch: https://github.com/kamailio/kamailio/commit/d9e63ac912c1f0b3ec71611516ea3e5…

1 0

git:5.7:64421e2d: core: parse/contact: jump to error on too many contacts
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 64421e2d4ed48e4a77cd997e389ae4a5225b40ab URL: https://github.com/kamailio/kamailio/commit/64421e2d4ed48e4a77cd997e389ae4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:27+02:00 core: parse/contact: jump to error on too many contacts (cherry picked from commit f69b22d44cb5abc803c2b58790dd33f2310c1c59) (cherry picked from commit 11f0cfec4d2fc6043d282cdb2258520559f0fcd1) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/64421e2d4ed48e4a77cd997e389ae4a… Patch: https://github.com/kamailio/kamailio/commit/64421e2d4ed48e4a77cd997e389ae4a… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index caf2e38d904..4b02ab608cb 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -329,7 +329,7 @@ int parse_contacts(str *_s, contact_t **_c) if(n > KSR_MAX_CONTACTS) { LM_ERR("too many contacts: %d\n", n); - return -1; + goto error; } if(_s->len == 0) { LM_ERR("text after comma missing\n");

1 0

git:5.7:45fd99f5: core: parser/contact - basic validation tests for contact uri
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 45fd99f53643b56bce65eb9d603a5b81059aa21d URL: https://github.com/kamailio/kamailio/commit/45fd99f53643b56bce65eb9d603a5b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:21+02:00 core: parser/contact - basic validation tests for contact uri (cherry picked from commit fc52a54370c085d6fa951da876eee99580677922) (cherry picked from commit d75dba611808322356fc8d1ebc9f8c30b4124a15) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/45fd99f53643b56bce65eb9d603a5b8… Patch: https://github.com/kamailio/kamailio/commit/45fd99f53643b56bce65eb9d603a5b8… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 56a37af1785..caf2e38d904 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -220,10 +220,12 @@ int parse_contacts(str *_s, contact_t **_c) param_hooks_t hooks; str sv; int n; + int star; sv = *_s; n = 0; + star = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -265,6 +267,25 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } + if(c->uri.len == 1) { + if(c->uri.s[0] == '*') { + if(star == 1) { + LM_ERR("too many star contacts - index %d\n", n); + goto error; + } else { + star = 1; + } + } else { + LM_ERR("contact uri size 1 is too short - index %d\n", n); + goto error; + } + } else if(c->uri.len < 3) { + /* minimum length 's:a' (s - schema; a - address) */ + LM_ERR("contact uri size %d is too short - index %d\n", n, + c->uri.len); + goto error; + } + if(_s->len == 0) goto ok;

1 0

git:5.7:49135f37: core: parser/contact - add limit for max number of contacts
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 49135f37d94aaf49a1c6b6a47bdc5a80bd3e5028 URL: https://github.com/kamailio/kamailio/commit/49135f37d94aaf49a1c6b6a47bdc5a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:14+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 (cherry picked from commit d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96) (cherry picked from commit 5b97d29f1bbac2656eba506c7fd94b412dfb9b7f) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/49135f37d94aaf49a1c6b6a47bdc5a8… Patch: https://github.com/kamailio/kamailio/commit/49135f37d94aaf49a1c6b6a47bdc5a8… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 3c66a2082b0..56a37af1785 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -209,6 +209,8 @@ static inline int skip_name(str *_s) } +#define KSR_MAX_CONTACTS 256 + /* * Parse contacts in a Contact HF */ @@ -217,9 +219,11 @@ int parse_contacts(str *_s, contact_t **_c) contact_t *c; param_hooks_t hooks; str sv; + int n; sv = *_s; + n = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -261,7 +265,6 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } - if(_s->len == 0) goto ok; @@ -301,7 +304,12 @@ int parse_contacts(str *_s, contact_t **_c) c->next = *_c; *_c = c; c = NULL; + n++; + if(n > KSR_MAX_CONTACTS) { + LM_ERR("too many contacts: %d\n", n); + return -1; + } if(_s->len == 0) { LM_ERR("text after comma missing\n"); goto error;

1 0

git:5.7:65c8761d: sipcapture: docs - fix default value for parameter
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 65c8761d9b04d01d0609b09c7ed75c9518f72d77 URL: https://github.com/kamailio/kamailio/commit/65c8761d9b04d01d0609b09c7ed75c9… Author: Jannik <40364587+volkland(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:30:50+02:00 sipcapture: docs - fix default value for parameter (cherry picked from commit 265c948286f2df5136179c95fbb1d7f1255e4c71) (cherry picked from commit 3aac0c7379577480fb09902bfb31b9aed49e7f88) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/65c8761d9b04d01d0609b09c7ed75c9… Patch: https://github.com/kamailio/kamailio/commit/65c8761d9b04d01d0609b09c7ed75c9… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8bca159432f..6a428133866 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,7 +89,7 @@ </para> <para> <emphasis> - Default value is "". + Default value is <quote>DEFAULT_DB_URL</quote>. </emphasis> </para> <example>

1 0

git:5.7:ac56db7f: uid_auth_db: spelling fix in documentation
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: ac56db7fab9d1157e89a6daf81915e3058f7178c URL: https://github.com/kamailio/kamailio/commit/ac56db7fab9d1157e89a6daf81915e3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:30:16+02:00 uid_auth_db: spelling fix in documentation (cherry picked from commit 9f28450312749dfbc021a8cbc23472c8a39d3fef) (cherry picked from commit b2352bc1c6f3eff3aba85a087107f4ca29cedc22) --- Modified: src/modules/uid_auth_db/auth_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/ac56db7fab9d1157e89a6daf81915e3… Patch: https://github.com/kamailio/kamailio/commit/ac56db7fab9d1157e89a6daf81915e3… --- diff --git a/src/modules/uid_auth_db/auth_db.xml b/src/modules/uid_auth_db/auth_db.xml index 25849663c54..99e5eb7c594 100644 --- a/src/modules/uid_auth_db/auth_db.xml +++ b/src/modules/uid_auth_db/auth_db.xml @@ -66,7 +66,7 @@ the <serdoc:module>textops</serdoc:module> module. </para> <para> - The reason for the failure can be determined from the interger + The reason for the failure can be determined from the integer return value stored in the <varname>$?</varname> attribute. A value of <literal>-3</literal> indicates that it was impossible to retrieve credentials from the request. A 400 (Bad Request)

1 0

git:5.7:ff5d1e73: core: spelling fix in comment and log message
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: ff5d1e73cd04ca84e423cd9efbec4014e9dbc2e4 URL: https://github.com/kamailio/kamailio/commit/ff5d1e73cd04ca84e423cd9efbec401… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:30:08+02:00 core: spelling fix in comment and log message (cherry picked from commit db176a4918c0b500f5f051cad16fd8d442450ab7) (cherry picked from commit 0bf03aa1987b9cff2fc0d776605620e26c163609) --- Modified: src/core/switch.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ff5d1e73cd04ca84e423cd9efbec401… Patch: https://github.com/kamailio/kamailio/commit/ff5d1e73cd04ca84e423cd9efbec401… --- diff --git a/src/core/switch.c b/src/core/switch.c index 79cee21c501..e12b7e5f6d1 100644 --- a/src/core/switch.c +++ b/src/core/switch.c @@ -203,7 +203,7 @@ int fix_switch(struct action *t) return E_BUG; } if(rval_expr_eval_long(0, 0, &c->label.match_int, c->ct_rve) < 0) { - LM_ERR("case expression (%d,%d) has non-interger type\n", + LM_ERR("case expression (%d,%d) has non-integer type\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); return E_BUG; } diff --git a/src/core/ut.h b/src/core/ut.h index 8e2e4f0d8f0..d7e2c64e05f 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -312,7 +312,7 @@ static inline char *int2strbuf(unsigned long l, char *r, int r_size, int *len) } extern char ut_buf_int2str[INT2STR_MAX_LEN]; -/** interger(long) to string conversion. +/** integer(long) to string conversion. * This version uses a static buffer (shared with sint2str()). * WARNING: other function calls might overwrite the static buffer, so * either always save the result immediately or use int2strbuf(...).

1 0

git:5.8:1ee553a6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 1ee553a6f406af5eb4838a8c46a992c4099dd30b URL: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T17:31:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c… Patch: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c…

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 07 May '24

07 May '24

- URL: https://github.com/kamailio/kamailio/commit/0bf03aa1987b9cff2fc0d776605620e… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T17:05:58+02:00 core: spelling fix in comment and log message (cherry picked from commit db176a4918c0b500f5f051cad16fd8d442450ab7) - URL: https://github.com/kamailio/kamailio/commit/b2352bc1c6f3eff3aba85a087107f4c… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T17:06:04+02:00 uid_auth_db: spelling fix in documentation (cherry picked from commit 9f28450312749dfbc021a8cbc23472c8a39d3fef) - URL: https://github.com/kamailio/kamailio/commit/1dd7c4038eb9a0c7eec506994a58a56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:14+02:00 ims_usrloc_scscf: reformat exported structures (cherry picked from commit 15d859e1e96552fca2708cf56047021beae29711) - URL: https://github.com/kamailio/kamailio/commit/620aa3f2a0faf3a4d54908bac0aa3ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:20+02:00 ims_usrloc_scscf: enclose examples in dotted lines for better visibility (cherry picked from commit 8506a6fe781e6e0b0b1418f4087db50480db6b57) - URL: https://github.com/kamailio/kamailio/commit/89343b6031f186c59ecd6707109bd02… Author: Ostap <ostap_mal(a)hotmail.com> Date: 2024-05-07T17:06:39+02:00 modules/statsd: ensure statsd failures do not stop execution (#3819) * modules/statsd: avoid stopping flow when sending statsd metric fails Currently statsd functions return bool: `true` or `false` depending when the function succeeds or fails respectively. This value gets implicitly converted to `int`: `true` -> `1`, `false` -> `0`. For Kamailio `1` means succesfull execution, but `0` means to stop processing messages, which is not what we want as statsd should not impact flow execution. Instead we want to return `-1` which signifies error, but the flow continues. * modules/statsd: do not fail module initilization when statsd init fails statsd_init executes `statsd_connect` which tries to connect to statd server. If connection fails then kamailio fails to start. This is not the desired behaviour as: 1. Kamailio should continue working even if statsd server is down, metrics should not impact runtime. 2. `statsd_connect` is also re-executed each time we try to send the metric https://github.com/salemove/kamailio/blame/master/src/modules/statsd/lib_st…, so it's initial result is not essential. Note, that before 5.8 the result of init was already ignored due to implicit conversion of `false` to `0` until after https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… was introduced (which could be considered a breaking change even if it seemingly fixes a bug in conversion). (cherry picked from commit 5e66ba23851f115bcb88d7e3f71f78ab33fc1e30) - URL: https://github.com/kamailio/kamailio/commit/8af0605ade36566597ff691a2adc1e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:49+02:00 ims_registrar_scscf: init variable to fix analyzer warning (cherry picked from commit 8558947034f16b162c15eda39d18f5f5df4ef562) - URL: https://github.com/kamailio/kamailio/commit/1387c32dfa601496c38f9c10d554c49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:01+02:00 ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests - both flags should be avaible for use at the same time in ipsec_forward() - for request IPSEC_FORWARD_USEVIA gets the protocol from the next hop address (cherry picked from commit ab261540d656ed456bac8876f77f940457a9baf6) - URL: https://github.com/kamailio/kamailio/commit/7e202ec38593462559e81db7b0f97e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:11+02:00 ims_ipsec_pcscf: docs updated for ipsec_forward() flags (cherry picked from commit 575b17d23cd5fa060f775bc56b42c735048bc849) - URL: https://github.com/kamailio/kamailio/commit/9493dc0c895d1dde50239c903fd976c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:18+02:00 ims_ipsec_pcscf: updated comments for ipsec_forward() flags (cherry picked from commit f7f93828993b5975dfe5f26ad63ba6c489aa69f7) - URL: https://github.com/kamailio/kamailio/commit/00f51e28875c209cbf25a47c96e60c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:24+02:00 ims_ipsec_pcscf: handle tls for replies (cherry picked from commit 48dab490965fa7f2f7200d95edd7dbb1407b2536) - URL: https://github.com/kamailio/kamailio/commit/4aa0920b2e573661959d5c9149ee041… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:07:38+02:00 ims_registrar_scscf: fix uninitialized arguments in save() The script "save" command can be used with different arguments: 2, 3 and 4. But internally for all save() calls the exact same function is use, w_save(). When calling save("PRE_REG_SAR_REPLY","location"); as given by the examples, kamailio will call w_save(). Because the command code will cast the function pointer, the w_save() function is called with 2 uninitialized arguments *mode, *c_flags. mode is unused, seems a legacy argument. c_flags is referenced resulting in a crash if not null. Use separate wrapper functions to handle different argument number. Fixes: a627c9a04a74 ("ims_registrar_scscf: Extend save() with optional flag") (cherry picked from commit 20a75004d53a06da0f22b11804a4d83496ad8919) - URL: https://github.com/kamailio/kamailio/commit/8bb9f0601eb94597f3bfab4ede97971… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:03+02:00 ims_registrar_scscf: refactor save_fixup4 Rename function to match argument number. Use assign_save_fixup3_async instead of the code copy (cherry picked from commit 82a6d7ea6edbaca60879a38c5e74e40920e89342) - URL: https://github.com/kamailio/kamailio/commit/569662043b656063be97d0ea0e22dd8… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:11+02:00 ims_registrar_scscf: fix typo in function name uint_fixup (cherry picked from commit 6f908f05d4691abcb1b3a745048d3cc2a9996676) - URL: https://github.com/kamailio/kamailio/commit/4b3620d0f0d7d636bf1d9e4c2b19bf5… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:22+02:00 ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter The free_uint_fixup() freed the wrong parameter in the past. (cherry picked from commit c3e6c1edc7531406208efe2965243e6e81506127) - URL: https://github.com/kamailio/kamailio/commit/4e98a4ae06ec0bbff408af211680c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:32+02:00 ims_ipsec_pcscf: cascade on options to get the uri for fill_contact() (cherry picked from commit 60d2ab6464657abf38136a771c297c6f5536e27a) - URL: https://github.com/kamailio/kamailio/commit/3aac0c7379577480fb09902bfb31b9a… Author: Jannik <40364587+volkland(a)users.noreply.github.com> Date: 2024-05-07T17:08:41+02:00 sipcapture: docs - fix default value for parameter (cherry picked from commit 265c948286f2df5136179c95fbb1d7f1255e4c71) - URL: https://github.com/kamailio/kamailio/commit/fc54fdcd67e244ad075c54b5f24bb64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:52+02:00 tm: free new buffer on drop for local requests - GH #3403 (cherry picked from commit ee06666c43d96029315dae7618e10d381265a85a) - URL: https://github.com/kamailio/kamailio/commit/f9ca6854d88e4fcc161e1083a953f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:58+02:00 tm: cb flag to mark local uac on request drop (cherry picked from commit f5da773c5fa29edbf9d0e65a83a62f495928ddec) - URL: https://github.com/kamailio/kamailio/commit/a86d7d2bad119fc4cccf5c19719b445… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:06+02:00 tm: cb_flags made unsigned for uac_req (cherry picked from commit ebd1c6c75a1b832ce85d576aad134b99d47b5738) - URL: https://github.com/kamailio/kamailio/commit/e54b03fc41bc55486430b09d9a4839b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:15+02:00 pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function (cherry picked from commit 68624c2da093ab789d4e8d35df65ef1bce024bca) - URL: https://github.com/kamailio/kamailio/commit/965a02ba4aca9283e4f43f8153ebeb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:25+02:00 presence: check if the local notify was dropped in event route - free tm cb parameter on drop - related to GH #3403 (cherry picked from commit d12fc31056cb37aac347ec05f9ada7bafa5f52de) - URL: https://github.com/kamailio/kamailio/commit/46c8e1a5b0e11162eee2c0b201bb535… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:39+02:00 uac: check if local requests are dropped and free the param (cherry picked from commit 00aac8d48370fac356eecff535835d918c631cc5) - URL: https://github.com/kamailio/kamailio/commit/244319c67a191cf1f093b2220fa1a85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:49+02:00 pua: check if local requests are dropped and free the param (cherry picked from commit 53e1a29c265df1489c9bd91deddc0719f8ca2092) - URL: https://github.com/kamailio/kamailio/commit/5b97d29f1bbac2656eba506c7fd94b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:10:17+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 (cherry picked from commit d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96) - URL: https://github.com/kamailio/kamailio/commit/d75dba611808322356fc8d1ebc9f8c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:10:25+02:00 core: parser/contact - basic validation tests for contact uri (cherry picked from commit fc52a54370c085d6fa951da876eee99580677922) - URL: https://github.com/kamailio/kamailio/commit/11f0cfec4d2fc6043d282cdb2258520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:19+02:00 core: parse/contact: jump to error on too many contacts (cherry picked from commit f69b22d44cb5abc803c2b58790dd33f2310c1c59) - URL: https://github.com/kamailio/kamailio/commit/24e43d27544bdfa1acfce7ebb8b6e3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:35+02:00 ctl: removed level and function names from log messages (cherry picked from commit 65bafaffd6bcfebc508b774cfbb78120e68bb3f0) - URL: https://github.com/kamailio/kamailio/commit/b5eb4f5ca037239f2ec1d99a16a71af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:46+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio (cherry picked from commit 446c75e0e2194b6e42d768d2e3c79b5f0222905f)

1 0

git:master:446c75e0: ctl: info log on ECONNRESET (connection reset by peer)
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 446c75e0e2194b6e42d768d2e3c79b5f0222905f URL: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T16:55:24+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… Patch: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… --- diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index eb93f5f960d..4c15a6b1f21 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -486,7 +486,11 @@ static int handle_stream_read(struct stream_connection *s_c, int idx) } else if(errno == EINTR) { goto again; } - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("handle_stream read: eof on %s\n", s_c->parent->name); @@ -602,7 +606,11 @@ static int handle_fifo_read(struct ctrl_socket *cs, int idx) goto no_read; /* nothing has been read */ } else if(errno == EINTR) goto again; - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("eof on %s\n", cs->name);

1 0

git:master:65bafaff: ctl: removed level and function names from log messages
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 65bafaffd6bcfebc508b774cfbb78120e68bb3f0 URL: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T16:49:49+02:00 ctl: removed level and function names from log messages --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812… Patch: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812…

1 0

git:master:6cb26e9e: core: cfg socket struct - option to bind to a range of sockets
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 6cb26e9e7045eeec9c08867fe264c71c697bb9d8 URL: https://github.com/kamailio/kamailio/commit/6cb26e9e7045eeec9c08867fe264c71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-06T18:40:41+02:00 core: cfg socket struct - option to bind to a range of sockets - bind can be: proto:addr:portstart-portend - bind=udp:127.0.0.1:5060-5080 - start and end ports are inclusive --- Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/6cb26e9e7045eeec9c08867fe264c71… Patch: https://github.com/kamailio/kamailio/commit/6cb26e9e7045eeec9c08867fe264c71… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index eb0ecaf2087..e026b1b8b9a 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -840,6 +840,19 @@ socket_lattr: tmp_sa.bindaddr.len = strlen(tmp_sa.bindaddr.s); tmp_sa.bindport = $5; } + | BIND EQUAL proto COLON listen_id COLON port MINUS port { + tmp_sa.bindproto = $3; + tmp_sa.bindaddr.s = $5; + tmp_sa.bindaddr.len = strlen(tmp_sa.bindaddr.s); + tmp_sa.bindport = $7; + tmp_sa.bindportend = $9; + } + | BIND EQUAL listen_id COLON port MINUS port { + tmp_sa.bindaddr.s = $3; + tmp_sa.bindaddr.len = strlen(tmp_sa.bindaddr.s); + tmp_sa.bindport = $5; + tmp_sa.bindportend = $7; + } | BIND EQUAL proto COLON listen_id { tmp_sa.bindproto = $3; tmp_sa.bindaddr.s = $5; diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index a8f9660b9c6..e475986d1a2 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -163,6 +163,7 @@ typedef struct socket_attrs int bindproto; str bindaddr; int bindport; + int bindportend; int useproto; str useaddr; int useport; diff --git a/src/core/socket_info.c b/src/core/socket_info.c index ab59df73dd6..fe7d04636e6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1255,6 +1255,9 @@ int add_listen_socket(socket_attrs_t *sa) { socket_info_t *newsi; name_lst_t addr_l; + char sname[128]; + char *psname = NULL; + int i; if(sa->bindaddr.s == NULL) { LM_ERR("no bind address provided\n"); @@ -1263,11 +1266,31 @@ int add_listen_socket(socket_attrs_t *sa) memset(&addr_l, 0, sizeof(name_lst_t)); addr_l.name = sa->bindaddr.s; - newsi = add_listen_socket_info(sa->bindaddr.s, &addr_l, sa->bindport, - sa->bindproto, sa->useproto, sa->useaddr.s, sa->useport, - sa->sockname.s, sa->sflags); + /* binding on single port */ + if(sa->bindportend <= sa->bindport) { + newsi = add_listen_socket_info(sa->bindaddr.s, &addr_l, sa->bindport, + sa->bindproto, sa->useproto, sa->useaddr.s, sa->useport, + sa->sockname.s, sa->sflags); + return (newsi != NULL) ? 0 : -1; + } - return (newsi != NULL) ? 0 : -1; + /* binding on a range of ports */ + for(i = 0; sa->bindport + i <= sa->bindportend; i++) { + if(sa->sockname.s != NULL) { + /* socketname gets port appended */ + snprintf(sname, 128, "%s%d", sa->sockname.s, sa->bindport + i); + psname = sname; + } else { + psname = NULL; + } + newsi = add_listen_socket_info(sa->bindaddr.s, &addr_l, + sa->bindport + i, sa->bindproto, sa->useproto, sa->useaddr.s, + sa->useport + i, psname, sa->sflags); + if(newsi == NULL) { + return -1; + } + } + return 0; } #ifdef __OS_linux

1 0

[kamailio/kamailio] Kamailio incoming call error (Issue #3842)
by Jasubek 07 May '24

07 May '24

kamailio.cfg #!KAMAILIO # # Kamailio SIP Server v5.5 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio # # Direct your questions about this file to: <sr-users(a)lists.kamailio.org> # # Refer to the Core CookBook at https://www.kamailio.org/wiki/ # for an explanation of possible statements, functions and parameters. # # Note: the comments can be: # - lines starting with #, but not the pre-processor directives, # which start with #!, like #!define, #!ifdef, #!endif, #!else, #!trydef, # #!subst, #!substdef, ... # - lines starting with // # - blocks enclosed in between /* */ # Note: the config performs symmetric SIP signaling # - it sends the reply to the source address of the request # - remove the use of force_rport() for asymmetric SIP signaling # # Several features can be enabled using '#!define WITH_FEATURE' directives: # # *** To run in debug mode: # - define WITH_DEBUG # - debug level increased to 3, logs still sent to syslog # - debugger module loaded with cfgtrace endabled # # *** To enable mysql: # - define WITH_MYSQL # # *** To enable authentication execute: # - enable mysql # - define WITH_AUTH # - add users using 'kamctl' or 'kamcli' # # *** To enable IP authentication execute: # - enable mysql # - enable authentication # - define WITH_IPAUTH # - add IP addresses with group id '1' to 'address' table # # *** To enable persistent user location execute: # - enable mysql # - define WITH_USRLOCDB # # *** To enable presence server execute: # - enable mysql # - define WITH_PRESENCE # - if modified headers or body in config must be used by presence handling: # - define WITH_MSGREBUILD # # *** To enable nat traversal execute: # - define WITH_NAT # - option for NAT SIP OPTIONS keepalives: WITH_NATSIPPING # - install RTPProxy: http://www.rtpproxy.org # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # # *** To use RTPEngine (instead of RTPProxy) for nat traversal execute: # - define WITH_RTPENGINE # - install RTPEngine: https://github.com/sipwise/rtpengine # - start RTPEngine: # rtpengine --listen-ng=127.0.0.1:2223 ... # # *** To enable PSTN gateway routing execute: # - define WITH_PSTN # - set the value of pstn.gw_ip # - check route[PSTN] for regexp routing condition # # *** To enable database aliases lookup execute: # - enable mysql # - define WITH_ALIASDB # # *** To enable speed dial lookup execute: # - enable mysql # - define WITH_SPEEDDIAL # # *** To enable multi-domain support execute: # - enable mysql # - define WITH_MULTIDOMAIN # # *** To enable TLS support execute: # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # # *** To enable JSONRPC over HTTP(S) support execute: # - define WITH_JSONRPC # - adjust event_route[xhttp:request] for access policy # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is # block if more than 16 requests in 2 seconds and ban for 300 seconds) # - define WITH_ANTIFLOOD # # *** To block 3XX redirect replies execute: # - define WITH_BLOCK3XX # # *** To block 401 and 407 authentication replies execute: # - define WITH_BLOCK401407 # # *** To enable VoiceMail routing execute: # - define WITH_VOICEMAIL # - set the value of voicemail.srv_ip # - adjust the value of voicemail.srv_port # # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB # - add following columns to database #!ifdef ACCDB_COMMENT ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif ####### Include Local Config If Exists ######### import_file "kamailio-local.cfg" ####### Defined Values ######### #!substdef "!MY_IP_ADDR!public ip!g" #!substdef "!MY_DOMAIN!test.sip.domain.com" #!substdef "!MY_WS_PORT!5065!g" #!substdef "!MY_WSS_PORT!443!g" #!substdef "!MY_MSRP_PORT!9000!g" #!substdef "!MY_WS_ADDR!tcp:MY_IP_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS_ADDR!tls:MY_IP_ADDR:MY_WSS_PORT!g" #!substdef "!MY_MSRP_ADDR!tls:MY_IP_ADDR:MY_MSRP_PORT!g" #!substdef "!MSRP_MIN_EXPIRES!1800!g" #!substdef "!MSRP_MAX_EXPIRES!3600!g" #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_ACCDB #!define WITH_WEBSOCKETS #!define WITH_NAT #!define WITH_NATSIPPING #!define WITH_DEBUG # *** Value defines - IDs used later in config #!ifdef WITH_DEBUG #!define DBGLEVEL 2 #!else #!define DBGLEVEL 2 #!endif #!ifdef WITH_MYSQL #loadmodule "db_mysql.so" # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!trydef DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!ifdef WITH_MULTIDOMAIN # - the value for 'use_domain' parameters #!define MULTIDOMAIN 1 #!else #!define MULTIDOMAIN 0 #!endif # - flags # FLT_ - per transaction (message) flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 # FLB_ - per branch flags #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 ####### Global Parameters ######### /* LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR, ... */ debug=DBGLEVEL /* set to 'yes' to print log messages to terminal or use '-E' cli option */ log_stderror=no memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes for each UDP socket * - value inherited by tcp_children and sctp_children when not set explicitely */ children=8 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes /* number of SIP routing processes for all TCP/TLS sockets */ # tcp_children=8 /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ # auto_aliases=no /* add local domain aliases - it can be set many times */ # alias="sip.mydomain.com" /* listen sockets - if none set, Kamailio binds to all local IP addresses * - basic prototype (full prototype can be found in Wiki - Core Cookbook): * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ # listen=udp:10.0.0.10:5060 /* 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 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif #!ifdef WITH_WEBSOCKETS tcp_accept_no_cl=yes tcp_rd_buf_size=65535 enable_tls=yes #!endif #!ifdef WITH_TLS /* upper limit for TLS connections */ tls_max_connections=2048 #!endif /* set it to yes to enable sctp and load sctp.so module */ enable_sctp=no ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description * Access: $sel(cfg_get.group.id) or @cfg_get.group.id */ #!ifdef WITH_PSTN /* PSTN GW Routing * * - pstn.gw_ip: valid IP or hostname as string value, example: * pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" * * - by default is empty to avoid misrouting */ pstn.gw_ip = "" desc "PSTN GW Address" pstn.gw_port = "" desc "PSTN GW Port" #!endif #!ifdef WITH_VOICEMAIL /* VoiceMail Routing on offline, busy or no answer * * - by default Voicemail server IP is empty to avoid misrouting */ voicemail.srv_ip = "sip.domain.com" voicemail.srv_port = "5060" #!endif listen=MY_IP_ADDR #!ifdef WITH_WEBSOCKETS listen=MY_WS_ADDR #!ifdef WITH_TLS listen=MY_WSS_ADDR #!endif #!endif #!ifdef WITH_MSRP listen=MY_MSRP_ADDR #!endif tcp_connection_lifetime=3604 tcp_accept_no_cl=yes tcp_rd_buf_size=16384 ####### Modules Section ######## /* set paths to location of modules */ # mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif #!ifdef WITH_JSONRPC loadmodule "xhttp.so" #!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "textopsx.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_ALIASDB loadmodule "alias_db.so" #!endif #!ifdef WITH_SPEEDDIAL loadmodule "speeddial.so" #!endif #!ifdef WITH_MULTIDOMAIN loadmodule "domain.so" #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_NAT loadmodule "nathelper.so" #!ifdef WITH_RTPENGINE loadmodule "rtpengine.so" #!else loadmodule "rtpproxy.so" #!endif #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif #!ifdef WITH_WEBSOCKETS loadmodule "websocket.so" loadmodule "xhttp.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") #!ifdef WITH_JSONRPC modparam("jsonrpcs", "transport", 7) #!endif # ----- ctl params ----- /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- sanity params ----- modparam("sanity", "autodrop", 0) # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ # modparam("registrar", "append_branches", 0) /* uncomment the next line not to allow more than 10 contacts per AOR */ # modparam("registrar", "max_contacts", 10) /* max value for expires of registrations */ modparam("registrar", "max_expires", 3600) /* set it to 1 to enable GRUU */ modparam("registrar", "gruu_enabled", 0) /* set it to 0 to disable Path handling */ modparam("registrar", "use_path", 1) /* save Path even if not listed in Supported header */ modparam("registrar", "path_mode", 0) # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) /* by default ww do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) /* account triggers (flags) */ modparam("acc", "log_flag", FLT_ACC) modparam("acc", "log_missed_flag", FLT_ACCMISSED) modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) /* enhanced DB accounting */ #!ifdef WITH_ACCDB modparam("acc", "db_flag", FLT_ACC) modparam("acc", "db_missed_flag", FLT_ACCMISSED) modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") #!endif # ----- usrloc params ----- modparam("usrloc", "timer_interval", 60) modparam("usrloc", "timer_procs", 1) modparam("usrloc", "use_domain", MULTIDOMAIN) /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") modparam("auth_db", "use_domain", MULTIDOMAIN) # ----- permissions params ----- #!ifdef WITH_IPAUTH modparam("permissions", "db_url", DBURL) modparam("permissions", "load_backends", 1) #!endif #!endif # ----- alias_db params ----- #!ifdef WITH_ALIASDB modparam("alias_db", "db_url", DBURL) modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif # ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) #!endif # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) /* register callback to match myself condition with domains list */ modparam("domain", "register_myself", 1) #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:22222") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") #!endif # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@kamailio.org") # params needed for NAT traversal in other modules modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) #!endif #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/etc/kamailio/tls.cfg") #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) # ----- htable params ----- /* ip ban htable with autoexpire after 5 minutes */ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") #!endif #!ifdef WITH_WEBSOCKETS modparam("websocket", "keepalive_mechanism", 0) modparam("websocket", "keepalive_timeout", 100) #!endif ####### Routing Logic ######## /* Main SIP request routing logic * - processing of any incoming SIP request starts with this route * - note: this is the same as route { ... } */ request_route { # per request initial checks route(REQINIT); # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle retransmissions if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) # # authentication # route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) { record_route(); } # account only INVITEs if (is_method("INVITE")) { setflag(FLT_ACC); # do accounting } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU==$null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } # dispatch destinations to PSTN route(PSTN); # user location service # route(LOCATION); } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); } if (is_method("INVITE")) { if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { # no connect for sending replies set_reply_no_connect(); # enforce symmetric signaling # - send back replies to the source address of request force_rport(); #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { if($sht(ipban=>$si)!=$null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if(is_method("OPTIONS") && uri==myself && $rU==$null) { sl_send_reply("200","Keepalive"); exit; } if(!sanity_check("17895", "7")) { xlog("Malformed SIP request from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (!has_totag()) return; # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); } else if ( is_method("NOTIFY") ) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); 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; } # Handle SIP registrations route[REGISTRAR] { if (!is_method("REGISTER")) return; if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); #!ifdef WITH_NATSIPPING # do SIP NAT pinging setbflag(FLB_NATSIPPING); #!endif } if (!save("location")) { sl_reply_error(); } exit; } # User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") { if(sd_lookup("speed_dial")) { route(SIPOUT); } } #!endif #!ifdef WITH_ALIASDB # search in DB-based aliases if(alias_db_lookup("dbaliases")) { route(SIPOUT); } #!endif $avp(oexten) = $rU; if (!lookup("location")) { $var(rc) = $rc; route(TOVOICEMAIL); t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } route(RELAY); exit; } # Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { route(TOVOICEMAIL); # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE #!ifdef WITH_MSGREBUILD # apply changes in case the request headers or body were modified msg_apply_changes(); #!endif if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } # IP authorization and user authentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } #!endif if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if(!is_method("REGISTER|PUBLISH")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!else # authentication not enabled - do not relay at all to foreign networks if(uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else { if(is_first_hop()) { set_contact_alias(); } } setflag(FLT_NATS); } #!endif return; } # RTPProxy control and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE if(nat_uac_test("8")) { rtpengine_manage("SIP-source-address replace-origin replace-session-connection"); } else { rtpengine_manage("replace-origin replace-session-connection"); } #!else if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } #!endif if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal if (is_request()) { if(has_totag()) { set_forward_no_connect(); } } } #!endif return; } # URI update for dialog requests route[DLGURI] { #!ifdef WITH_NAT if(!isdsturiset()) { handle_ruri_alias(); } #!endif return; } # Routing to foreign domains route[SIPOUT] { if (uri==myself) return; append_hf("P-Hint: outbound\r\n"); route(RELAY); exit; } # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } # route to PSTN dialed numbers starting with '+' or '00' # (international format) # - update the condition to match your dialing rules for PSTN routing if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) return; # only local users allowed to call if(from_uri!=myself) { sl_send_reply("403", "Not Allowed"); exit; } # normalize target number for pstn gateway # - convert leading 00 to + if (starts_with("$rU", "00")) { strip(2); prefix("+"); } if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":" + $sel(cfg_get.pstn.gw_port); } route(RELAY); exit; #!endif return; } # JSONRPC over HTTP(S) routing #!ifdef WITH_JSONRPC event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if(src_ip!=127.0.0.1) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>Not allowed from $si</body></html>"); exit; } if ($hu =~ "^/RPC") { jsonrpc_dispatch(); exit; } xhttp_reply("200", "OK", "text/html", "<html><body>Wrong URL $hu</body></html>"); exit; } #!endif #!ifdef WITH_WEBSOCKETS event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if ($hdr(Upgrade)=~"websocket" && $hdr(Connection)=~"Upgrade" && $rm=~"GET") { # Validate Host - make sure the client is using the correct # alias for WebSockets if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } if (ws_handle_handshake()) { # Optional... cache some information about the # successful connection exit; } } xhttp_reply("404", "Not Found", "", ""); } #!endif # Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if(is_method("INVITE")) { if($avp(oexten)==$null) return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } else { if($rU==$null) return; $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } route(RELAY); exit; #!endif return; } # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); } # Manage incoming replies reply_route { if(!sanity_check("17604", "6")) { xlog("Malformed SIP response from $si:$sp\n"); drop; } } # Manage incoming replies in transaction context onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } } # Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) exit; #!ifdef WITH_BLOCK3XX # block call redirect based on 3xx replies. if (t_check_status("3[0-9][0-9]")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_BLOCK401407 # block call redirect based on 401, 407 replies. if (t_check_status("401|407")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_VOICEMAIL # serial forking # - route to voicemail on busy or no answer (timeout) if (t_check_status("486|408")) { $du = $null; route(TOVOICEMAIL); exit; } #!endif } * **Operating System**: Ubuntu 22.04 SIP/2.0 500 Service Unavailable Via: SIP/2.0/WS 5h7t17u4ne29.invalid;branch=z9hG4bK1035487;rport=45366;received=178.218.200.29 To: <sip:107@sip.domain.com>;tag=ae7c22ff3e5ea89a75cf77ccdbc930c9-148e0000 From: <sip:107@sip.domain.com>;tag=i6hcmqvl9p Call-ID: of4dmvvehi37ai051i83 CSeq: 1146 INVITE Server: kamailio (5.5.4 (x86_64/linux)) Content-Length: 0 ![2024-05-07_09-42](https://github.com/kamailio/kamailio/assets/57658965/71939878-0f56-4380-beee-ca7091a4aec9) !g -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3842 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3842(a)github.com>

2 2

[kamailio/kamailio] uac_req_send crash Kamailio (Issue #3522)
by suharik71 07 May '24

07 May '24

### Description  Hello. I use uac_req_send to send registration to the asterisk pool. If some asterisk did not authorize and re-sent the 401 code, the module causes a kamailio crash ### Troubleshooting ds_select("BACKENDS","0"); while(ds_set_dst()) { xlog("L_DBG",">>> BACKEND du=$du\n"); $uac_req(ruri)="sip:" + $(du{uri.host}); $uac_req(furi)="sip:" + $avp(username) + "@" + $(du{uri.host}); $uac_req(turi)=$uac_req(furi); uac_req_send(); ds_next_dst(); } #### Reproduction  #### Debugging Data  ``` [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00005557272803b9 in timer_list_expire (t=1180105352, h=0x7f73b30a3bb8, slow_l=0x7f73b30a73a0, slow_mark=2907) at core/timer.c:846 846 core/timer.c: No such file or directory. (gdb) bt full #0 0x00005557272803b9 in timer_list_expire (t=1180105352, h=0x7f73b30a3bb8, slow_l=0x7f73b30a73a0, slow_mark=2907) at core/timer.c:846 tl = 0x7f73b3a49a88 ret = 0 #1 0x00005557272809cf in timer_handler () at core/timer.c:922 saved_ticks = 1180105352 run_slow_timer = 0 i = 859 __func__ = "timer_handler" #2 0x0000555727280f53 in timer_main () at core/timer.c:961 No locals. #3 0x0000555726f77736 in main_loop () at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:1831 i = 6 pid = 0 si = 0x0 si_desc = "udp receiver child=5 sock=10.153.5.40:5060\000\000\020\000\000\000\003\000\000\000!\000\000\000\000\262\270\224RE&\035(\247K'WU\000\000WqA'WU\000\000\000\000\000\000\000\000\000\000c\367@'WU\000\000!\000\000\000\000\000\000\000\260\325\022\371s\177\000\000 \236.\220\375\177\000\000ݕ\024'WU\000" nrprocs = 6 woneinit = 1 __func__ = "main_loop" #4 0x0000555726f83d11 in main (argc=12, argv=0x7ffd902ea398) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:3078 cfg_stream = 0x555727e12380 c = -1 r = 0 tmp = 0x7ffd902ebe36 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x55572744e898 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4270110361 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd902ea398 p = 0x7ffd902ea310 "" st = {st_dev = 25, st_ino = 5514, st_nlink = 2, st_mode = 16888, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_mtim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_ctim = {tv_sec = 1690276408, tv_nsec = 971865637}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 80 times>, "\377\000\000\000\377\000\000\000\000\377\000\000\000\000\000\000", '/' <repeats 16 times>, "\230\r", '\000' <repeats 14 times>, "`", '\000' <repeats 15 times>, "\001", '\000' <repeats 144 times>... option_index = 12 long_options = {{name = 0x55572740a2e9 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55572740b84a "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55572740f6e4 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55572740a2ee "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55572740a2f4 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55572740a2fd "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55572740a307 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55572740a311 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55572740a31c "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55572740a325 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55572740b967 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55572740a330 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55572740a33a "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals tl = 0x7f73b3a49a88 ret = 0 (gdb) list 841 in core/timer.c (gdb) ``` ``` [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f73f575d4d0 in free_hash_table () at /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c:464 464 /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c: No such file or directory. (gdb) bt full #0 0x00007f73f575d4d0 in free_hash_table () at /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c:464 p_cell = 0x0 tmp_cell = 0x0 i = 64459 __func__ = "free_hash_table" #1 0x00007f73f5793e46 in tm_shutdown () at /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/t_funcs.c:88 __func__ = "tm_shutdown" #2 0x00005557271db17b in destroy_modules () at core/sr_module.c:842 t = 0x7f73f68a65a0 foo = 0x7f73f68a59e0 __func__ = "destroy_modules" #3 0x0000555726f64029 in cleanup (show_status=1) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:561 memlog = 0 __func__ = "cleanup" #4 0x0000555726f66044 in shutdown_children (sig=15, show_status=1) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:704 __func__ = "shutdown_children" #5 0x0000555726f697dc in handle_sigs () at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:802 chld = 0 chld_status = 139 any_chld_stopped = 1 memlog = 0 __func__ = "handle_sigs" #6 0x0000555726f78f42 in main_loop () at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:1900 i = 6 pid = 37846 si = 0x0 si_desc = "udp receiver child=5 sock=10.153.5.40:5060\000\000\020\000\000\000\003\000\000\000!\000\000\000\000\262\270\224RE&\035(\247K'WU\000\000WqA'WU\000\000\000\000\000\000\000\000\000\000c\367@'WU\000\000!\000\000\000\000\000\000\000\260\325\022\371s\177\000\000 \236.\220\375\177\000\000ݕ\024'WU\000" nrprocs = 6 woneinit = 1 __func__ = "main_loop" #7 0x0000555726f83d11 in main (argc=12, argv=0x7ffd902ea398) at /build/kamailio-5.6.4+ubuntu22.04/src/main.c:3078 cfg_stream = 0x555727e12380 c = -1 r = 0 tmp = 0x7ffd902ebe36 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x55572744e898 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4270110361 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd902ea398 p = 0x7ffd902ea310 "" st = {st_dev = 25, st_ino = 5514, st_nlink = 2, st_mode = 16888, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_mtim = {tv_sec = 1690276408, tv_nsec = 971865637}, st_ctim = {tv_sec = 1690276408, tv_nsec = 971865637}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 80 times>, "\377\000\000\000\377\000\000\000\000\377\000\000\000\000\000\000", '/' <repeats 16 times>, "\230\r", '\000' <repeats 14 times>, "`", '\000' <repeats 15 times>, "\001", '\000' <repeats 144 times>... option_index = 12 long_options = {{name = 0x55572740a2e9 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55572740b84a "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55572740f6e4 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55572740a2ee "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55572740a2f4 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55572740a2fd "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55572740a307 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55572740a311 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55572740a31c "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55572740a325 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55572740b967 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55572740a330 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55572740a33a "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals p_cell = 0x0 tmp_cell = 0x0 i = 64459 __func__ = "free_hash_table" (gdb) list 459 in /build/kamailio-5.6.4+ubuntu22.04/src/modules/tm/h_table.c ``` #### Log Messages  ``` CRITICAL: <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f8a6c440050), called from uac: uac_send.c: uac_send_tm_callback(860), first free uac: uac_send.c: uac_send_info_clone(110) - ignoring CRITICAL: <core> [core/mem/q_malloc.c:123]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f74379f46b0 (address 0x7f74379f46e8) beginning overwritten (0)! Memory allocator was called from uac: uac_send.c:860. Fragment marked by (null):0. Exec from core/mem/q_malloc.c:511. ``` #### SIP Traffic  ``` proto:UDP 2023-07-25T10:00:44.452898Z 10.153.5.40:5060 ---> 192.168.50.107:5060 REGISTER sip:192.168.50.107 SIP/2.0 Via: SIP/2.0/UDP 10.153.5.40;branch=z9hG4bK6a0b.834627a6000000000000000000000000.0 To: <sip:3408@192.168.50.107> From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 CSeq: 10 REGISTER Call-ID: 2332840947916a3e-39417(a)10.153.5.40 Max-Forwards: 70 Content-Length: 0 Contact: <sip:3408@10.153.5.40:5060> Expires: 150 User-Agent: PortSIP UC Client Android - v11.8.1 proto:UDP 2023-07-25T10:00:44.464436Z 192.168.50.107:5060 ---> 10.153.5.40:5060 SIP/2.0 401 Unauthorized Via: SIP/2.0/UDP 10.153.5.40;rport=5060;received=10.153.5.40;branch=z9hG4bK6a0b.834627a6000000000000000000000000.0 Call-ID: 2332840947916a3e-39417(a)10.153.5.40 From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 To: <sip:3408@192.168.50.107>;tag=z9hG4bK6a0b.834627a6000000000000000000000000.0 CSeq: 10 REGISTER WWW-Authenticate: Digest realm="vpp",nonce="1690279244/67fc12dbaf6a76fa34181a4bd504de00",opaque="1680d45809efac86",algorithm=md5,qop="auth" Server: Asterisk Content-Length: 0 proto:UDP 2023-07-25T10:00:44.466447Z 10.153.5.40:5060 ---> 192.168.50.107:5060 REGISTER sip:192.168.50.107 SIP/2.0 Via: SIP/2.0/UDP 10.153.5.40;branch=z9hG4bK7a0b.5673b4d4000000000000000000000000.0 To: <sip:3408@192.168.50.107> From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 CSeq: 11 REGISTER Call-ID: 2332840947916a3e-39417(a)10.153.5.40 Max-Forwards: 70 Content-Length: 0 Contact: <sip:3408@10.153.5.40:5060> Expires: 150 Authorization: Digest username="3408", realm="vpp", nonce="1690279244/67fc12dbaf6a76fa34181a4bd504de00", uri="sip:192.168.50.107", opaque="1680d45809efac86", qop=auth, nc=00000001, cnonce="1935694403", response="38bc75e831e1267ce943bcc50f76390a", algorithm=MD5 User-Agent: PortSIP UC Client Android - v11.8.1 proto:UDP 2023-07-25T10:00:44.477675Z 192.168.50.107:5060 ---> 10.153.5.40:5060 SIP/2.0 401 Unauthorized Via: SIP/2.0/UDP 10.153.5.40;rport=5060;received=10.153.5.40;branch=z9hG4bK7a0b.5673b4d4000000000000000000000000.0 Call-ID: 2332840947916a3e-39417(a)10.153.5.40 From: <sip:3408@192.168.50.107>;tag=b2f228866a24b161d346cfb256d45132-a0527658 To: <sip:3408@192.168.50.107>;tag=z9hG4bK7a0b.5673b4d4000000000000000000000000.0 CSeq: 11 REGISTER WWW-Authenticate: Digest realm="vpp",nonce="1690279244/67fc12dbaf6a76fa34181a4bd504de00",opaque="5adc30b867f02d18",algorithm=md5,qop="auth" Server: Asterisk Content-Length: 0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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 11.3.0 ``` * **Operating System**:  ``` 5.15.0-76-generic #83-Ubuntu SMP Thu Jun 15 19:16:32 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3522 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3522(a)github.com>

5 11

[kamailio/kamailio] kamailio re-INVITE (Issue #3840)
by happytulubi 06 May '24

06 May '24

Now there is a call scenario where freeswitch ->kamailio ->rtpengine ->webrtc (jsSIP) voice and video cannot be displayed. Is there a problem with my handling and how can I solve it? 1、Freeswitch INVITE to kamailio without video code 2、kamailio request to rtpengine(rtpengine_offer("record-call=off force trust-address replace-origin replace-session-connection UDP/TLS/RTP/SAVPF"))and call to jsSIP 3、jsSIP response with "SIP/2.0 200 OK" to kamailio without video code 4、kamailio request to(rtpengine_answer("record-call=off replace-origin replace-session-connection DTLS=passive ICE=remove RTP/SAVPF"))and response to Freeswitch 5、jsSIP send re-INVITE to kamailio with video code 6、kamailio request to(rtpengine_offer("record-call=off replace-origin replace-session-connection DTLS=passive ICE=remove SDES-off UDP/TLS/RTP/SAVPF"))and response to Freeswitch 7、Freeswitch response with "SIP/2.0 200 OK" to kamailio with video code 8、kamailio request to(rtpengine_answer("record-call=off replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"))and response to jsSIP 9、Freeswitch send re-INVITE to kamailio with video code 10、kamailio request to(rtpengine_offer("record-call=off replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"))and response to jsSIP 11、jsSIP response with "SIP/2.0 200 OK" to kamailio with video code 12、kamailio request to(rtpengine_answer("record-call=off replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"))and response to Freeswitch -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3840 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3840(a)github.com>

2 2

git:master:61660322: core: new udp receiver mode - one multi-threaded process
by Daniel-Constantin Mierla 06 May '24

06 May '24

Module: kamailio Branch: master Commit: 61660322ad07be24cdc98c0debb01119960124ea URL: https://github.com/kamailio/kamailio/commit/61660322ad07be24cdc98c0debb0111… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-04T20:18:51+02:00 core: new udp receiver mode - one multi-threaded process - activated with udp_receiver_mode=1 - one process is created that starts one receiver thread per UDP socket - SIP messages are pushed to "udp" async tasks group - sending is still done by any of processes --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/udp_server.c Modified: src/core/udp_server.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/61660322ad07be24cdc98c0debb0111… Patch: https://github.com/kamailio/kamailio/commit/61660322ad07be24cdc98c0debb0111…

2 2

git:master:2503a6fa: core: udp server - lookup async task group for multi thread receiver
by Daniel-Constantin Mierla 06 May '24

06 May '24

Module: kamailio Branch: master Commit: 2503a6fa6d45bb44ae390819636ad96269029b75 URL: https://github.com/kamailio/kamailio/commit/2503a6fa6d45bb44ae390819636ad96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-06T07:56:28+02:00 core: udp server - lookup async task group for multi thread receiver - cache it locally for runtime usage --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/2503a6fa6d45bb44ae390819636ad96… Patch: https://github.com/kamailio/kamailio/commit/2503a6fa6d45bb44ae390819636ad96… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 0db76b4e599..263a0610963 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -952,12 +952,12 @@ void udpworker_task_exec(void *param) /** * */ -int udpworker_task_send(char *buf, int len, receive_info_t *rcv) +int udpworker_task_send( + async_wgroup_t *awg, char *buf, int len, receive_info_t *rcv) { async_task_t *at = NULL; udpworker_task_t *utp = NULL; int dsize; - str gname = str_init("udp"); dsize = sizeof(async_task_t) + sizeof(udpworker_task_t) + (len + 1) * sizeof(char); @@ -975,7 +975,7 @@ int udpworker_task_send(char *buf, int len, receive_info_t *rcv) utp->len = len; memcpy(&utp->rcv, rcv, sizeof(receive_info_t)); - return async_task_group_push(&gname, at); + return async_task_group_send(awg, at); } /** @@ -989,6 +989,8 @@ void *ksr_udp_mtworker(void *si) union sockaddr_union *fromaddr; unsigned int fromaddrlen; receive_info_t rcvi; + async_wgroup_t *awg = NULL; + str gname = str_init("udp"); tsock = (socket_info_t *)si; @@ -1014,6 +1016,8 @@ void *ksr_udp_mtworker(void *si) rcvi.dst_ip = tsock->address; rcvi.proto = PROTO_UDP; + awg = async_task_group_find(&gname); + while(1) { fromaddrlen = sizeof(union sockaddr_union); len = recvfrom(tsock->socket, buf, BUF_SIZE, 0, @@ -1049,7 +1053,12 @@ void *ksr_udp_mtworker(void *si) su2ip_addr(&rcvi.src_ip, fromaddr); rcvi.src_port = su_getport(fromaddr); - udpworker_task_send(buf, len, &rcvi); + if(awg == NULL) { + awg = async_task_group_find(&gname); + } + if(awg == NULL) { + udpworker_task_send(awg, buf, len, &rcvi); + } } }

1 0

git:master:f8b08d01: core: async task - functions to find group and send tasks
by Daniel-Constantin Mierla 05 May '24

05 May '24

Module: kamailio Branch: master Commit: f8b08d01a98be3e5c823af769e20f0ccee1af629 URL: https://github.com/kamailio/kamailio/commit/f8b08d01a98be3e5c823af769e20f0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-05T19:53:14+02:00 core: async task - functions to find group and send tasks --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/f8b08d01a98be3e5c823af769e20f0c… Patch: https://github.com/kamailio/kamailio/commit/f8b08d01a98be3e5c823af769e20f0c… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 376924ae571..bce7ed51faa 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -413,6 +413,26 @@ int async_task_push(async_task_t *task) return 0; } +/** + * + */ +async_wgroup_t *async_task_group_find(str *gname) +{ + async_wgroup_t *awg = NULL; + + if(_async_wgroup_list == NULL) { + LM_WARN("no async group\n"); + return NULL; + } + for(awg = _async_wgroup_list; awg != NULL; awg = awg->next) { + if(awg->name.len == gname->len + && memcmp(awg->name.s, gname->s, gname->len) == 0) { + return awg; + } + } + return NULL; +} + /** * */ @@ -445,6 +465,27 @@ int async_task_group_push(str *gname, async_task_t *task) return 0; } +/** + * + */ +int async_task_group_send(async_wgroup_t *awg, async_task_t *task) +{ + int len; + if(awg == NULL) { + LM_WARN("group not provided\n"); + return -1; + } + len = write(awg->sockets[1], &task, sizeof(async_task_t *)); + if(len <= 0) { + LM_ERR("failed to pass the task [%p] to group [%.*s]\n", task, + awg->name.len, awg->name.s); + return -1; + } + LM_DBG("task [%p] sent to group [%.*s]\n", task, awg->name.len, + awg->name.s); + return 0; +} + /** * */ diff --git a/src/core/async_task.h b/src/core/async_task.h index 5a3cc19e232..58386bba8bd 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -53,7 +53,9 @@ int async_task_set_usleep(int n); int async_task_workers_get(void); int async_task_workers_active(void); async_wgroup_t *async_task_workers_get_crt(void); +async_wgroup_t *async_task_group_find(str *gname); int async_task_group_push(str *gname, async_task_t *task); +int async_task_group_send(async_wgroup_t *awg, async_task_t *task); #endif

1 0

git:master:f69b22d4: core: parse/contact: jump to error on too many contacts
by Daniel-Constantin Mierla 04 May '24

04 May '24

Module: kamailio Branch: master Commit: f69b22d44cb5abc803c2b58790dd33f2310c1c59 URL: https://github.com/kamailio/kamailio/commit/f69b22d44cb5abc803c2b58790dd33f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-04T20:18:51+02:00 core: parse/contact: jump to error on too many contacts --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/f69b22d44cb5abc803c2b58790dd33f… Patch: https://github.com/kamailio/kamailio/commit/f69b22d44cb5abc803c2b58790dd33f… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index c67fe681d51..007949e88c4 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -340,7 +340,7 @@ int parse_contacts(str *_s, contact_t **_c) if(n > KSR_MAX_CONTACTS) { LM_ERR("too many contacts: %d\n", n); - return -1; + goto error; } if(_s->len == 0) { LM_ERR("text after comma missing\n");

1 0

git:master:77de8690: tls: document handling of thread-locals
by S-P Chan 04 May '24

04 May '24

Module: kamailio Branch: master Commit: 77de86909ac8c156335e1e789bb3067932f9eff5 URL: https://github.com/kamailio/kamailio/commit/77de86909ac8c156335e1e789bb3067… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-05-04T19:48:21+08:00 tls: document handling of thread-locals --- Added: src/modules/tls/OpenSSL3-README.md --- Diff: https://github.com/kamailio/kamailio/commit/77de86909ac8c156335e1e789bb3067… Patch: https://github.com/kamailio/kamailio/commit/77de86909ac8c156335e1e789bb3067… --- diff --git a/src/modules/tls/OpenSSL3-README.md b/src/modules/tls/OpenSSL3-README.md new file mode 100644 index 00000000000..6b6a7814129 --- /dev/null +++ b/src/modules/tls/OpenSSL3-README.md @@ -0,0 +1,55 @@ +# OpenSSL 3 Developer Notes + +## Background + +OpenSSL since 1.1.1 uses thread-local storage. The OpenSSL internal API +is `CRYPTO_THREAD_set_local()` and it is implemented on Linux using `pthread_setspecific()`. + +In a new thread, the value of a thread-local variable is 0x0; the first access of this +variable by OpenSSL will allocate new dynamic memory. The implication for Kamailio is that +if such variables are initialized in rank 0, then all workers will reuse the same memory +location as Kamailio uses shared memory for OpenSSL. + +## OpenSSL 1.1.1 shmmem Corruption + +In OpenSSL 1.1.1 there are three variables that impact Kamailio: `private_drbg`, `public_drbg`, and +`err_thread_local`. The first two variables are circumvented by an early call to `RAND_set_rand_method()`. + +The third variable, i.e., `err_thread_local` is reused by all workers and leads to shmmem corruption +particularly with other users of OpenSSL such as libcurl, and db modules with TLS. + +Historically, since 2019, this was a low-impact bug due to use of static variables in the OpenSSL 1.1.1 +implementation. + + +## OpenSSL 3 shmmem Corruption + +In OpenSSL 3 there is one variable that impacts Kamailio: `err_thread_local`. + +OpenSSL 3 uses more dynamic memory to handle the error stack and shmmem corruption is easily +reproducible, even without libcurl or db modules. + +## Resolution + +This resolution uses non-portable internal knowledge of pthreads on Linux: that `pthread_key_t` +is a small integer, and that it is incremented when a new thread-local key is requested + +OpenSSL 3 uses 6 thread-locals, and OpenSSL 1.1.1 uses 4 thread-locals. + +The first attempt (5.8.0/5.8.1) to resolve this issue uses the following technique: +* `tls_threads_mode = 1`: for each function that might initialize OpenSSL, run it in + a temporary thread; this leaves the thread-local variables in rank 0, main thread at their + default value of 0x0 +* `tls_threads_mode = 2`: add an at-fork handler to set thread-local variables to 0x0. + The implementation will set thread-local keys from 0-15 to have value 0x0.<br> + +Limitation: the limitation of this method is some libraries like libpython cannot be initialized +other than in the primary thread and they will initialize thread-locals. + +The revised method makes a few OpenSSL function calls so +that OpenSSL will initialize all required thread-locals, and the tls.so sets a high-water mark. +It is assumed that all `pthread_key_t` values at the high-water mark or greater are set +by non-OpenSSL libraries. During fork, tls.so will clear all thread-locals up to the high-water +mark. + +

1 0

git:5.7:d8907b62: tls: clear thread-local variables up to tls_pthreads_key_mark
by S-P Chan 04 May '24

04 May '24

Module: kamailio Branch: 5.7 Commit: d8907b6290d37965d07ceaf30e6c06956a59c90a URL: https://github.com/kamailio/kamailio/commit/d8907b6290d37965d07ceaf30e6c069… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-05-04T19:35:23+08:00 tls: clear thread-local variables up to tls_pthreads_key_mark - other libraries may set thread-locals via pthread_setspecific - assume that tls_pthreads_key_mark demarcates libssl's values - only clean thread-local values up to tls_pthreads_key_mark Currently only used by app_python[s] (cherry picked from commit fe6f4fcde2fa06a3c00479cef169c27dc32ae490) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/d8907b6290d37965d07ceaf30e6c069… Patch: https://github.com/kamailio/kamailio/commit/d8907b6290d37965d07ceaf30e6c069… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index c2a3c8de271..524419dd854 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -343,9 +343,11 @@ static tls_domains_cfg_t* tls_use_modparams(void) * is < 10 * */ +static int tls_pthreads_key_mark; static void fork_child(void) { - for(int k = 0; k < 16; k++) { + int k; + for(k = 0; k < tls_pthreads_key_mark; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); } @@ -355,6 +357,8 @@ static int mod_init(void) { int method; int verify_client; + unsigned char rand_buf[32]; + int k; if(tls_disable) { LM_WARN("tls support is disabled " @@ -463,6 +467,23 @@ static int mod_init(void) if(ksr_tls_threads_mode == 2) { pthread_atfork(NULL, NULL, &fork_child); } + +#if OPENSSL_VERSION_NUMBER >= 0x010101000L + /* + * force creation of all thread-locals now so that other libraries + * that use pthread_key_create(), e.g. python, + * will have larger key values + */ + if(ksr_tls_threads_mode > 0) { + ERR_clear_error(); + RAND_bytes(rand_buf, sizeof(rand_buf)); + for(k = 0; k < 32; k++) { + if(pthread_getspecific(k)) + tls_pthreads_key_mark = k + 1; + } + LM_WARN("set maximum pthreads key to %d\n", tls_pthreads_key_mark); + } +#endif return 0; error: tls_h_mod_destroy_f(); @@ -499,6 +520,7 @@ static int mod_child_hook(int *rank, void *dummy) if(tls_fix_domains_cfg(*tls_domains_cfg, &mod_params, &mod_params) < 0) return -1; } + return 0; } @@ -508,6 +530,8 @@ static OSSL_LIB_CTX *new_ctx; #endif static int mod_child(int rank) { + int k; + if(tls_disable || (tls_domains_cfg == 0)) return 0; @@ -519,6 +543,13 @@ static int mod_child(int rank) return run_thread4PP((_thread_proto4PP)mod_child_hook, &rank, NULL); } + if(ksr_tls_threads_mode == 1 && rank && rank != PROC_INIT + && rank != PROC_POSTCHILDINIT) { + for(k = 0; k < tls_pthreads_key_mark; k++) + pthread_setspecific(k, 0x0); + LM_WARN("clean-up of thread-locals key < %d\n", tls_pthreads_key_mark); + } + #ifdef KSR_SSL_COMMON /* * after the child is fork()ed we go through the TLS domains diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 58ddc853acd..7bbcf3a628c 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,10 +21,10 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> +#include <openssl/rand.h> #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L -#include <openssl/rand.h> const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void);

1 0

git:5.7:bec4ad64: phonenum: Makefile - option to set C standard version
by Victor Seva 04 May '24

04 May '24

Module: kamailio Branch: 5.7 Commit: bec4ad646f127a1f5bbf31604e6185b246867770 URL: https://github.com/kamailio/kamailio/commit/bec4ad646f127a1f5bbf31604e6185b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-04T11:55:35+02:00 phonenum: Makefile - option to set C standard version - can be set via option CSTDVER - defaults now to c++17 - GH #3659 (cherry picked from commit 6dd5598fc043fe3d2582e643d7d4ef675c9e6480) --- Modified: src/modules/phonenum/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/bec4ad646f127a1f5bbf31604e6185b… Patch: https://github.com/kamailio/kamailio/commit/bec4ad646f127a1f5bbf31604e6185b… --- diff --git a/src/modules/phonenum/Makefile b/src/modules/phonenum/Makefile index f465226a974..47780869232 100644 --- a/src/modules/phonenum/Makefile +++ b/src/modules/phonenum/Makefile @@ -7,6 +7,7 @@ NAME=phonenum.so CXX?=g++ LD?=g++ +CSTDVER?="c++17" LIBS+=-L$(LOCALBASE)/lib cphonenumber.o -lphonenumber -lgeocoding DEFS+=-I$(LOCALBASE)/include @@ -18,7 +19,7 @@ include ../../Makefile.modules cphonenumber.o: cphonenumber.cpp cphonenumber.h @echo "Compiling $<" - $(CXX) -std=c++11 $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ + $(CXX) -std=$(CSTDVER) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ phonenum.so: cphonenumber.o

1 0

[kamailio/kamailio] phonenum: fails to build on sid (Issue #3839)
by Victor Seva 04 May '24

04 May '24

Forwarded from: **https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069199** ``` Source: kamailio Version: 5.7.4-1 Severity: serious Tags: ftbfs Justification: fails to build from source (but built successfully in the past) X-Debbugs-Cc: sramacher(a)debian.org https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=amd64&ver=5.7.… g++ -std=c++11 -fPIC -DPIC -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -DVERSION_NODATE -Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing -fPIC -DPIC -funroll-loops -Wcast-align -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"5.7.4"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 13.2.0"' -D__CPU_x86_64 -D__OS_linux -DVERSIONVAL=5007004 -DCFG_DIR='"/etc/kamailio/"' -DSHARE_DIR='"/usr/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKAROUND -DUSE_FUTEX -DHAVE_SELECT -I/usr/local/include -DMOD_NAME='"phonenum"' -c cphonenumber.cpp -o cphonenumber.o cc1plus: warning: ‘-Werror=’ argument ‘-Werror=implicit-function-declaration’ is not valid for C++ cc1plus: warning: ‘-Werror=’ argument ‘-Werror=implicit-function-declaration’ is not valid for C++ In file included from /usr/include/absl/base/config.h:86, from /usr/include/absl/base/const_init.h:25, from /usr/include/absl/synchronization/mutex.h:67, from /usr/include/phonenumbers/geocoding/phonenumber_offline_geocoder.h:24, from cphonenumber.cpp:24: /usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." 79 | #error "C++ versions less than C++14 are not supported." | ^~~~~ Cheers -- Sebastian Ramacher ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3839 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3839(a)github.com>

1 2

[kamailio/kamailio] support zero media stream for sdp parsing module (Issue #3779)
by Dakna adnane 04 May '24

04 May '24

when using sdp module to parse sdp I noticed that function called from sdp_get return -1 when no m-lines are present in sdp , normally we should accept sdp without m -line because it can be at a later time through a modified offer , how can we accept such sdp without changing source code for function "parse_sdp_session" -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3779 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3779(a)github.com>

2 2

git:master:fc52a543: core: parser/contact - basic validation tests for contact uri
by Daniel-Constantin Mierla 03 May '24

03 May '24

Module: kamailio Branch: master Commit: fc52a54370c085d6fa951da876eee99580677922 URL: https://github.com/kamailio/kamailio/commit/fc52a54370c085d6fa951da876eee99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-03T14:57:47+02:00 core: parser/contact - basic validation tests for contact uri --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/fc52a54370c085d6fa951da876eee99… Patch: https://github.com/kamailio/kamailio/commit/fc52a54370c085d6fa951da876eee99… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 322a22e9590..c67fe681d51 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -232,10 +232,12 @@ int parse_contacts(str *_s, contact_t **_c) param_hooks_t hooks; str sv; int n; + int star; sv = *_s; n = 0; + star = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -277,6 +279,25 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } + if(c->uri.len == 1) { + if(c->uri.s[0] == '*') { + if(star == 1) { + LM_ERR("too many star contacts - index %d\n", n); + goto error; + } else { + star = 1; + } + } else { + LM_ERR("contact uri size 1 is too short - index %d\n", n); + goto error; + } + } else if(c->uri.len < 3) { + /* minimum length 's:a' (s - schema; a - address) */ + LM_ERR("contact uri size %d is too short - index %d\n", n, + c->uri.len); + goto error; + } + if(_s->len == 0) goto ok;

1 0

git:master:d6b0beb5: core: parser/contact - add limit for max number of contacts
by Daniel-Constantin Mierla 03 May '24

03 May '24

Module: kamailio Branch: master Commit: d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96 URL: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-03T14:36:29+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… Patch: https://github.com/kamailio/kamailio/commit/d6b0beb5a219ae57a62e9e7201a6ec1… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index dd522a6cd3c..322a22e9590 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -221,6 +221,8 @@ static inline void contact_append(contact_t **head, contact_t *node) ptr->next = node; } +#define KSR_MAX_CONTACTS 256 + /* * Parse contacts in a Contact HF */ @@ -229,9 +231,11 @@ int parse_contacts(str *_s, contact_t **_c) contact_t *c; param_hooks_t hooks; str sv; + int n; sv = *_s; + n = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -273,7 +277,6 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } - if(_s->len == 0) goto ok; @@ -312,7 +315,12 @@ int parse_contacts(str *_s, contact_t **_c) contact_append(_c, c); c = NULL; + n++; + if(n > KSR_MAX_CONTACTS) { + LM_ERR("too many contacts: %d\n", n); + return -1; + } if(_s->len == 0) { LM_ERR("text after comma missing\n"); goto error;

1 0

git:master:f1baf7dd: nghttp2: set the data field for event route
by Daniel-Constantin Mierla 02 May '24

02 May '24

Module: kamailio Branch: master Commit: f1baf7dd48c4ccb8d2d0ab0b24547f2793bb8588 URL: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-02T10:15:48+02:00 nghttp2: set the data field for event route - reset ctx fields when nothing was set from session/stream --- Modified: src/modules/nghttp2/nghttp2_server.c Modified: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… Patch: https://github.com/kamailio/kamailio/commit/f1baf7dd48c4ccb8d2d0ab0b24547f2… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index d8c23220a13..6f5faf02ad6 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -518,11 +518,25 @@ static int on_request_recv(nghttp2_session *session, if(stream_data->request_method) { _ksr_nghttp2_ctx.method.s = stream_data->request_method; _ksr_nghttp2_ctx.method.len = strlen(_ksr_nghttp2_ctx.method.s); + } else { + _ksr_nghttp2_ctx.method.s = NULL; + _ksr_nghttp2_ctx.method.len = 0; } if(session_data->client_addr) { _ksr_nghttp2_ctx.srcip.s = session_data->client_addr; _ksr_nghttp2_ctx.srcip.len = strlen(_ksr_nghttp2_ctx.srcip.s); + } else { + _ksr_nghttp2_ctx.srcip.s = NULL; + _ksr_nghttp2_ctx.srcip.len = 0; + } + + if(stream_data->request_data.len > 0) { + _ksr_nghttp2_ctx.data.s = stream_data->request_data.s; + _ksr_nghttp2_ctx.data.len = stream_data->request_data.len; + } else { + _ksr_nghttp2_ctx.data.s = NULL; + _ksr_nghttp2_ctx.data.len = 0; } ksr_event_route(); @@ -567,16 +581,26 @@ static int on_frame_recv_callback( static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags, int32_t stream_id, const uint8_t *data, size_t len, void *user_data) { - struct Request *req; + http2_stream_data *stream_data; (void)flags; - (void)user_data; - req = nghttp2_session_get_stream_user_data(session, stream_id); - if(req) { + stream_data = nghttp2_session_get_stream_user_data(session, stream_id); + + if(stream_data) { LM_DBG("---------------------------- (DATA chunk) [%lu bytes]\n", (unsigned long int)len); LM_DBG("[[%.*s]]", (int)len, (char *)data); - LM_DBG("----------------------------\n"); + LM_DBG("\n----------------------------\n"); + stream_data->request_data.s = realloc(stream_data->request_data.s, + len + stream_data->request_data.len + 1); + if(stream_data->request_data.s == NULL) { + LM_ERR("failed to allocate system memory\n"); + return 0; + } + memcpy(stream_data->request_data.s + stream_data->request_data.len, + data, len); + stream_data->request_data.len += len; + stream_data->request_data.s[stream_data->request_data.len] = '\0'; } return 0; } diff --git a/src/modules/nghttp2/nghttp2_server.h b/src/modules/nghttp2/nghttp2_server.h index ac69a147313..63650db53af 100644 --- a/src/modules/nghttp2/nghttp2_server.h +++ b/src/modules/nghttp2/nghttp2_server.h @@ -80,6 +80,7 @@ typedef struct http2_stream_data char *request_pathfull; char *request_method; http2_msghdr_t *hdrlist; + str request_data; int32_t stream_id; int fd; } http2_stream_data;

1 0

git:master:53e1a29c: pua: check if local requests are dropped and free the param
by Daniel-Constantin Mierla 02 May '24

02 May '24

Module: kamailio Branch: master Commit: 53e1a29c265df1489c9bd91deddc0719f8ca2092 URL: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-02T09:27:41+02:00 pua: check if local requests are dropped and free the param --- Modified: src/modules/pua/pua.c Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… Patch: https://github.com/kamailio/kamailio/commit/53e1a29c265df1489c9bd91deddc071… --- diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index ef542e2d627..e57183427f3 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -700,6 +700,11 @@ int update_pua(ua_pres_t *p) ret_code = -1; goto done; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + ret_code = 0; + goto done; + } } else { str met = {"SUBSCRIBE", 9}; ua_pres_t *cb_param = NULL; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 48e92e9728b..53644265633 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -624,6 +624,9 @@ int send_publish(publ_info_t *publ) LM_ERR("in t_request tm module function\n"); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + } done: ret = 0;

1 0

git:master:00aac8d4: uac: check if local requests are dropped and free the param
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: 00aac8d48370fac356eecff535835d918c631cc5 URL: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T07:00:58+02:00 uac: check if local requests are dropped and free the param --- Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… Patch: https://github.com/kamailio/kamailio/commit/00aac8d48370fac356eecff535835d9… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 4885f4d4023..bbe592ba04c 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -974,6 +974,10 @@ void uac_reg_tm_callback(struct cell *t, int type, struct tmcb_params *ps) ri->l_uuid.len, ri->l_uuid.s); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(uuid); + *ps->param = NULL; + } ri->flags |= UAC_REG_AUTHSENT; lock_release(ri->lock); @@ -1130,6 +1134,9 @@ int uac_reg_send(reg_uac_t *reg, time_t tn) reg->flags &= ~UAC_REG_ONGOING; return -1; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(uuid); + } return 0; } diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index c29e9b4b90e..f91a0c75b4f 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -794,6 +794,11 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) LM_ERR("failed to send request with authentication\n"); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(tp); + *ps->param = NULL; + tp = NULL; + } if(tp->evroute != 0) { return; @@ -871,6 +876,10 @@ int uac_req_send(void) shm_free(tp); return -1; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + if(tp != NULL) + shm_free(tp); + } return 1; }

1 0

git:master:d12fc310: presence: check if the local notify was dropped in event route
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: d12fc31056cb37aac347ec05f9ada7bafa5f52de URL: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:20:43+02:00 presence: check if the local notify was dropped in event route - free tm cb parameter on drop - related to GH #3403 --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… Patch: https://github.com/kamailio/kamailio/commit/d12fc31056cb37aac347ec05f9ada7b… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 4c9dece1a39..9a8af778c04 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1736,6 +1736,10 @@ int send_notify_request( shm_free(cb_param); goto error; } + if(uac_r.cb_flags & TMCB_LOCAL_REQUEST_DROP) { + shm_free(cb_param); + goto done; + } LM_GEN2(pres_local_log_facility, pres_local_log_level, "NOTIFY %.*s via %.*s on behalf of %.*s for event %.*s : %.*s\n", @@ -1744,6 +1748,7 @@ int send_notify_request( subs->event->name.len, subs->event->name.s, subs->callid.len, subs->callid.s); +done: ps_free_tm_dlg(td); if(str_hdr.s)

1 0

git:master:68624c2d: pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: 68624c2da093ab789d4e8d35df65ef1bce024bca URL: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:08:28+02:00 pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… Patch: https://github.com/kamailio/kamailio/commit/68624c2da093ab789d4e8d35df65ef1… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index c6196a1f5f6..c6ffe70753a 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -479,6 +479,8 @@ static inline char *tm_type_to_string(int type) return "TMCB_ON_BRANCH_FAILURE"; case TMCB_ON_BRANCH_FAILURE_RO: return "TMCB_ON_BRANCH_FAILURE_RO"; + case TMCB_LOCAL_REQUEST_DROP: + return "TMCB_LOCAL_REQUEST_DROP"; case TMCB_MAX: return "TMCB_MAX"; }

1 0

git:master:ebd1c6c7: tm: cb_flags made unsigned for uac_req
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: ebd1c6c75a1b832ce85d576aad134b99d47b5738 URL: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T06:07:26+02:00 tm: cb_flags made unsigned for uac_req --- Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… Patch: https://github.com/kamailio/kamailio/commit/ebd1c6c75a1b832ce85d576aad134b9… --- diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 59fa7f4e9ea..6fad3380cd8 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -47,7 +47,7 @@ typedef struct uac_req str *ssock; str *ssockname; dlg_t *dialog; - int cb_flags; + unsigned int cb_flags; transaction_cb *cb; void *cbp; str *callid;

1 0

git:master:f5da773c: tm: cb flag to mark local uac on request drop
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: f5da773c5fa29edbf9d0e65a83a62f495928ddec URL: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T05:57:46+02:00 tm: cb flag to mark local uac on request drop --- Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… Patch: https://github.com/kamailio/kamailio/commit/f5da773c5fa29edbf9d0e65a83a62f4… --- diff --git a/src/modules/tm/t_hooks.h b/src/modules/tm/t_hooks.h index aa566cb35d1..cdb657bad64 100644 --- a/src/modules/tm/t_hooks.h +++ b/src/modules/tm/t_hooks.h @@ -59,7 +59,8 @@ struct cell; #define TMCB_RESPONSE_SENT_N 23 #define TMCB_ON_BRANCH_FAILURE_RO_N 24 #define TMCB_ON_BRANCH_FAILURE_N 25 -#define TMCB_MAX_N 25 +#define TMCB_LOCAL_REQUEST_DROP_N 26 +#define TMCB_MAX_N 26 #define TMCB_REQUEST_IN (1 << TMCB_REQUEST_IN_N) @@ -88,6 +89,7 @@ struct cell; #define TMCB_RESPONSE_SENT (1 << TMCB_RESPONSE_SENT_N) #define TMCB_ON_BRANCH_FAILURE (1 << TMCB_ON_BRANCH_FAILURE_N) #define TMCB_ON_BRANCH_FAILURE_RO (1 << TMCB_ON_BRANCH_FAILURE_RO_N) +#define TMCB_LOCAL_REQUEST_DROP (1 << TMCB_LOCAL_REQUEST_DROP_N) #define TMCB_MAX ((1 << (TMCB_MAX_N + 1)) - 1) diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 5559533e5fb..5384d826dd8 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -680,6 +680,7 @@ int prepare_req_within(uac_req_t *uac_r, struct retr_buf **dst_req) ret = t_uac_prepare(uac_r, dst_req, 0); if(unlikely(ret < 0 && ret == E_DROP)) { + uac_r->cb_flags |= TMCB_LOCAL_REQUEST_DROP; ret = 0; } @@ -775,6 +776,7 @@ int t_uac_with_ids( if(ret < 0) { if(unlikely(ret == E_DROP)) { + uac_r->cb_flags |= TMCB_LOCAL_REQUEST_DROP; ret = 0; } return ret;

1 0

git:master:ee06666c: tm: free new buffer on drop for local requests
by Daniel-Constantin Mierla 01 May '24

01 May '24

Module: kamailio Branch: master Commit: ee06666c43d96029315dae7618e10d381265a85a URL: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-01T05:28:18+02:00 tm: free new buffer on drop for local requests - GH #3403 --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… Patch: https://github.com/kamailio/kamailio/commit/ee06666c43d96029315dae7618e10d3… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 206f69ef59d..5559533e5fb 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -559,6 +559,7 @@ static inline int t_uac_prepare( refresh_shortcuts = t_run_local_req(&buf, &buf_len, uac_r, new_cell, request); if(unlikely(refresh_shortcuts == E_DROP)) { + shm_free(buf); ret = E_DROP; goto error1; }

1 0

Enquiry about N5 interface implementation
by Viabhav Bansal 01 May '24

01 May '24

Hey there! I hope the Kamailio team is physically as well as mentally healthy and thriving towards progressive development. I am a part of a team which deals in development of converged 4G and 5G networks. We have been diving deep into Open5GS 5G core and use Kamailio as our SIP server. However, we are trying to successfully implement VoNR UE registration as well as calling, and facing challenges in that area. I recently saw the VoNR as well as SMSoNR demonstration which the Kamailio team performed and was massively impressed by it! I would like to know when will the N5 SBI update will be rolling out to the public so that we can conduct our testing as well. Hoping for a timely response and update, Thanks and regards, Vaibhav.

2 1

[kamailio/kamailio] User-params parsing fails in multiple ways (Issue #3762)
by Alex Hermann 01 May '24

01 May '24

### Description The uri parser seems to fail in multiple ways on username-parameters. The ways it fails depends on the presence of user-params in the incoming request and on adjustments to $ru, $rd and $rU in the script. My expectation is that the whole username, including user-params is *always* visible in $rU. In reality, the user-params are absent or present depending on manipulations to the uri in the script. When setting $rU to a value with a user-param, that user-param is represented when reading $ru, but not in $rU.  ### Troubleshooting #### Reproduction I used below config script to test various scenario's. ``` debug=2 memlog=4 #fork=no # This option should not be present to enable forking but disable daemonize, also -D commandline parameter is needed log_stderror=yes log_name="kamailio-test" log_facility=LOG_LOCAL5 sip_warning=no children=2 shm_mem_size=128 check_via=no # (cmd. line: -v) dns=no # (cmd. line: -r) rev_dns=no # (cmd. line: -R) dns_use_search_list=no use_dns_failover=yes dns_srv_lb=yes disable_tcp=yes auto_aliases=no listen=172.16.1.19:7060 loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" modparam("xlog", "prefix", "") route { xnotice("Incoming $rm to $rU\n"); xinfo("$$ru = $ru\n"); switch ($rU) { case "100": xnotice("Set $$rU = \"1234;first=yes\"\n"); $rU = "1234;first=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; case "200": xnotice("Set $$rd = \"example.com;transport=udp\"\n"); $rd = "example.com;transport=udp"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); xnotice("Set $$rU = \"1234;first=yes\"\n"); $rU = "1234;first=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; case "300": xnotice("Set $$ru = \"sip:1234@example.com;transport=udp\"\n"); $ru = "sip:1234@example.com;transport=udp"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); xnotice("Set $$rU = \"1234;first=yes\"\n"); $rU = "1234;first=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; case "400": xnotice("Set $$ru = \"sip:1234;first=yes@example.com;transport=udp\"\n"); $ru = "sip:1234;first=yes@example.com;transport=udp"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;first=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } xnotice("Set $$rU = \"1234;second=yes\"\n"); $rU = "1234;second=yes"; xinfo("$$ru: $ru\n"); xinfo("$$rU: $rU\n"); if ($rU != "1234;second=yes") { xerr("Fail!\n"); } else { xinfo("Success!\n"); } break; } sl_send_reply(500, "Done"); exit; } ``` Outputs: --- ``` 1(2206122) NOTICE: Incoming INVITE to 100 1(2206122) INFO: $ru = sip:100@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes@172.16.1.19:7060;user=phone 1(2206122) INFO: $rU: 1234 1(2206122) ERROR: Fail! ``` Setting $rU with a user-param sets it correctly in $ru, but reading $rU back fails. --- ``` 1(2206122) NOTICE: Incoming INVITE to 200 1(2206122) INFO: $ru = sip:200@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $rd = "example.com;transport=udp" 1(2206122) INFO: $ru: sip:200@example.com;transport=udp:7060;user=phone 1(2206122) INFO: $rU: 200 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp:7060;user=phone 1(2206122) INFO: $rU: 1234 1(2206122) ERROR: Fail! ``` Same when setting $rd in advance. --- ``` 1(2206122) NOTICE: Incoming INVITE to 300 1(2206122) INFO: $ru = sip:300@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $ru = "sip:1234@example.com;transport=udp" 1(2206122) INFO: $ru: sip:1234@example.com;transport=udp 1(2206122) INFO: $rU: 1234 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;first=yes 1(2206122) INFO: Success! ``` When setting $ru first with no user-param lets a later asssignment to $rU with user-param succeed. --- ``` 1(2206122) NOTICE: Incoming INVITE to 400 1(2206122) INFO: $ru = sip:400@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $ru = "sip:1234;first=yes@example.com;transport=udp" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;first=yes 1(2206122) INFO: Success! 1(2206122) NOTICE: Set $rU = "1234;second=yes" 1(2206122) INFO: $ru: sip:1234;second=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;second=yes 1(2206122) INFO: Success! ``` Setting $ru with a user-params succeeds. Subsequently overwriting the user part with $rU with a user-param also succeeds. --- ``` 1(2206122) NOTICE: Incoming INVITE to 400 1(2206122) INFO: $ru = sip:400;existing=yes@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $ru = "sip:1234;first=yes@example.com;transport=udp" 1(2206122) INFO: $ru: sip:1234;first=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;first=yes 1(2206122) INFO: Success! 1(2206122) NOTICE: Set $rU = "1234;second=yes" 1(2206122) INFO: $ru: sip:1234;second=yes@example.com;transport=udp 1(2206122) INFO: $rU: 1234;second=yes 1(2206122) INFO: Success! ``` Same as previous, but with incoming user-param. --- ``` 1(2206122) NOTICE: Incoming INVITE to 100 1(2206122) INFO: $ru = sip:100;existing=yes@172.16.1.19:7060;user=phone 1(2206122) NOTICE: Set $rU = "1234;first=yes" 1(2206122) INFO: $ru: sip:1234;first=yes;existing=yes@172.16.1.19:7060;user=phone 1(2206122) INFO: $rU: 1234 1(2206122) ERROR: Fail! ``` This one fails in an interesting way. The incoming uri has a user-param. When overwriting $rU with a user-param, the user-param from the incoming request is kept in addition to the new one instead of being overwritten. $rU still misses (both) user-params. #### Debugging Data I have no build (yet) with EXTRA_DEBUG enabled. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3762 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3762(a)github.com>

2 4

[kamailio/kamailio] tm: memory leak in case dropping messages in local-request event route (PR #3403)
by Simon Darienko 01 May '24

01 May '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I faced an issue with memory leak in case drop NOTIFY messages in the "local-request" event route in `mem_copy_subs` and `build_uac_req` analysis of mem leak: kamcmd corex.shm_summary <code>... Mar 23 12:00:28 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 11 size= 7520 bytes from presence: hash.c: mem_copy_subs(141)<br> Mar 23 12:00:28 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 23 size= 22536 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> a lot of dropped messages in local-request event route <code>... Mar 23 12:01:09 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 83 size= 51256 bytes from presence: hash.c: mem_copy_subs(141) Mar 23 12:01:09 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 98 size= 116864 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> no messages, no activities <code>... Mar 23 12:02:34 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 83 size= 51256 bytes from presence: hash.c: mem_copy_subs(141) Mar 23 12:02:34 pbx kamailio[72308]: NOTICE: fm_status: fm_sums(): count= 96 size= 115432 bytes from tm: t_msgbuilder.c: build_uac_req(1618) ...</code> In the code, we have a comment like "never free cbp here because if t_uac_prepare fails, cbp is not freed and thus caller has no chance to discover if it is freed or not", but we'll free the cbp in two cases: 1. in case of error, but we have if (ret == E_DROP) then ret = 0; (so, no error result) 2. in case call insert_tmcb for cbp, but we don't do it for E_DROP You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3403 -- Commit Summary -- * tm: memory leak in case dropping messages in local-request event route -- File Changes -- M src/modules/tm/uac.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3403.patch https://github.com/kamailio/kamailio/pull/3403.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3403 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3403(a)github.com>

4 9

git:master:3f774f37: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 30 Apr '24

30 Apr '24

Module: kamailio Branch: master Commit: 3f774f37a7ce6e102e1691707b2ba88cd4edfee1 URL: https://github.com/kamailio/kamailio/commit/3f774f37a7ce6e102e1691707b2ba88… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-30T16:46:09+02:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/3f774f37a7ce6e102e1691707b2ba88… Patch: https://github.com/kamailio/kamailio/commit/3f774f37a7ce6e102e1691707b2ba88… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index dda17d994c6..c9bb2daca98 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,7 +218,7 @@ Chapter 1. Admin Guide Database URL. - Default value is "". + Default value is ��DEFAULT_DB_URL��. Example 1.1. Set db_url parameter ...

1 0

[kamailio/kamailio] sipcapture: docs - fix default value for parameter (PR #3836)
by Jannik 30 Apr '24

30 Apr '24

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) _== Fix of documentation of a long standing error_ - [ ] 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 The sipcapture module actually uses the DEFAULT_DB_URL instead of "no database at all". When you do not set the parameter, the module will try to connect to the default db. [See source code of parameter](https://github.com/volkland/kamailio/blob/74361cdeacee8864216d30…. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3836 -- Commit Summary -- * sipcapture: docs - fix default value for parameter -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3836.patch https://github.com/kamailio/kamailio/pull/3836.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3836 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3836(a)github.com>

2 2

git:master:265c9482: sipcapture: docs - fix default value for parameter
by Henning Westerholt 30 Apr '24

30 Apr '24

Module: kamailio Branch: master Commit: 265c948286f2df5136179c95fbb1d7f1255e4c71 URL: https://github.com/kamailio/kamailio/commit/265c948286f2df5136179c95fbb1d7f… Author: Jannik <40364587+volkland(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-30T16:38:40+02:00 sipcapture: docs - fix default value for parameter --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/265c948286f2df5136179c95fbb1d7f… Patch: https://github.com/kamailio/kamailio/commit/265c948286f2df5136179c95fbb1d7f… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8bca159432f..6a428133866 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,7 +89,7 @@ </para> <para> <emphasis> - Default value is "". + Default value is <quote>DEFAULT_DB_URL</quote>. </emphasis> </para> <example>

1 0

git:master:60d2ab64: ims_ipsec_pcscf: cascade on options to get the uri for fill_contact()
by Daniel-Constantin Mierla 30 Apr '24

30 Apr '24

Module: kamailio Branch: master Commit: 60d2ab6464657abf38136a771c297c6f5536e27a URL: https://github.com/kamailio/kamailio/commit/60d2ab6464657abf38136a771c297c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-30T10:19:35+02:00 ims_ipsec_pcscf: cascade on options to get the uri for fill_contact() --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/60d2ab6464657abf38136a771c297c6… Patch: https://github.com/kamailio/kamailio/commit/60d2ab6464657abf38136a771c297c6… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b5c009dfcf8..05079834252 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -187,7 +187,7 @@ static int fill_contact( if(m->first_line.type == SIP_REQUEST) { char *alias_start; struct sip_uri uri; - str suri; + str suri = STR_NULL; memset(&uri, 0, sizeof(struct sip_uri)); @@ -196,17 +196,20 @@ static int fill_contact( suri.len = ruri->len; LM_DBG("using param r-uri for contact filling: %.*s\n", suri.len, suri.s); - } else if((sflags & IPSEC_DSTADDR_SEARCH) && m->dst_uri.s != NULL - && m->dst_uri.len > 0) { + } + if((sflags & IPSEC_DSTADDR_SEARCH) && suri.s == NULL + && m->dst_uri.s != NULL && m->dst_uri.len > 0) { suri = m->dst_uri; LM_DBG("using dst uri for contact filling: %.*s\n", suri.len, suri.s); - } else if((sflags & IPSEC_RURIADDR_SEARCH) && m->new_uri.s != NULL - && m->new_uri.len > 0) { + } + if((sflags & IPSEC_RURIADDR_SEARCH) && suri.s == NULL + && m->new_uri.s != NULL && m->new_uri.len > 0) { suri = m->new_uri; LM_DBG("using new r-uri for contact filling: %.*s\n", suri.len, suri.s); - } else { + } + if(suri.s == NULL) { suri = m->first_line.u.request.uri; LM_DBG("using original uri for contact filling: %.*s\n", suri.len, suri.s);

1 0

[kamailio/kamailio] registrar: adding contact and UA to xavp_cfg (Issue #3753)
by nirvanr-nextiva 30 Apr '24

30 Apr '24

### Description We are using Kamailio as a 'mid-registrar', and saving the location record (i.e calling registrar.save()) in the reply-route depending on received status code from other registrar. We noticed the saved location record had the contact URI (incl. instance id) and UA from response message; instead we would like to use the contact and UA from the original request. This feature change is similar to what was added for `tcpconn_id` in PR: https://github.com/kamailio/kamailio/pull/3430. i.e. we would set the request's contact URI and UA in `xavp_cfg` variable. Then `registrar.save.c` would use the contact and UA from `xavp_cfg`. Thanks. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3753 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3753(a)github.com>

2 3

[kamailio/kamailio] app_python3: make compatible with TLS refactoring (Issue #3832)
by space88man 29 Apr '24

29 Apr '24

### Description app_python3 loads libssl and also calls `pthread_setspecific()`. This makes it incompatible with tls_thread_mode refactoring. Reported by user @igorolhovskiy on the mailing list: https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… ### Troubleshooting #### Reproduction #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions - make it compatible with `tls_threads_mode = 1` ### Additional Information -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3832 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3832(a)github.com>

2 3

[kamailio/kamailio] ims_registrar_scscf: fix memleaks, minor refactors (PR #3787)
by Alexander Couzens 29 Apr '24

29 Apr '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 A couple small changes to the ims_registrar_scscf which prevents kamailio from crashing on my system. I would love to have more testing because I only did tests in my single user IMS setup. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3787 -- Commit Summary -- * ims_registrar_scscf: fix uninitialized arguments in save() * ims_registrar_scscf: refactor save_fixup4 * ims_registrar_scscf: fix typo in function name uint_fixup * ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter -- File Changes -- M src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3787.patch https://github.com/kamailio/kamailio/pull/3787.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3787 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3787(a)github.com>

4 5

git:master:c3e6c1ed: ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter
by Henning Westerholt 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: c3e6c1edc7531406208efe2965243e6e81506127 URL: https://github.com/kamailio/kamailio/commit/c3e6c1edc7531406208efe2965243e6… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter The free_uint_fixup() freed the wrong parameter in the past. --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e6c1edc7531406208efe2965243e6… Patch: https://github.com/kamailio/kamailio/commit/c3e6c1edc7531406208efe2965243e6… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 80535d77b5a..714ae571518 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -814,7 +814,7 @@ static int uint_fixup(void **param, int param_no) static int free_uint_fixup(void **param, int param_no) { - if(*param && param_no == 2) { + if(*param && param_no == 4) { pkg_free(*param); *param = 0; }

1 0

git:master:6f908f05: ims_registrar_scscf: fix typo in function name uint_fixup
by Henning Westerholt 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 6f908f05d4691abcb1b3a745048d3cc2a9996676 URL: https://github.com/kamailio/kamailio/commit/6f908f05d4691abcb1b3a745048d3cc… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: fix typo in function name uint_fixup --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f908f05d4691abcb1b3a745048d3cc… Patch: https://github.com/kamailio/kamailio/commit/6f908f05d4691abcb1b3a745048d3cc… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 854ed2d484f..80535d77b5a 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -786,7 +786,7 @@ static int assign_save_fixup3_async(void **param, int param_no) return 0; } -static int unit_fixup(void **param, int param_no) +static int uint_fixup(void **param, int param_no) { str s; unsigned int *num; @@ -826,7 +826,7 @@ static int save_fixup4(void **param, int param_no) if(param_no < 4) { return assign_save_fixup3_async(param, param_no); } else if(param_no == 4) { - return unit_fixup(param, param_no); + return uint_fixup(param, param_no); } return 0;

1 0

git:master:82a6d7ea: ims_registrar_scscf: refactor save_fixup4
by Henning Westerholt 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 82a6d7ea6edbaca60879a38c5e74e40920e89342 URL: https://github.com/kamailio/kamailio/commit/82a6d7ea6edbaca60879a38c5e74e40… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: refactor save_fixup4 Rename function to match argument number. Use assign_save_fixup3_async instead of the code copy --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82a6d7ea6edbaca60879a38c5e74e40… Patch: https://github.com/kamailio/kamailio/commit/82a6d7ea6edbaca60879a38c5e74e40… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index d17b5e38823..854ed2d484f 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -145,7 +145,7 @@ static int w_lookup_path_to_contact(struct sip_msg *_m, char *contact_uri); static int domain_fixup(void **param, int param_no); static int assign_save_fixup3_async(void **param, int param_no); static int free_uint_fixup(void **param, int param_no); -static int save_fixup3(void **param, int param_no); +static int save_fixup4(void **param, int param_no); static int unreg_fixup(void **param, int param_no); static int fetchc_fixup(void **param, int param_no); /*! \brief Functions */ @@ -237,7 +237,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | ONREPLY_ROUTE}, {"save", (cmd_function)w_save3, 3, assign_save_fixup3_async, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"save", (cmd_function)w_save4, 4, save_fixup3, free_uint_fixup, + {"save", (cmd_function)w_save4, 4, save_fixup4, free_uint_fixup, REQUEST_ROUTE | ONREPLY_ROUTE}, {"lookup", (cmd_function)w_lookup, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -821,27 +821,10 @@ static int free_uint_fixup(void **param, int param_no) return 0; } -static int save_fixup3(void **param, int param_no) +static int save_fixup4(void **param, int param_no) { - if(strlen((char *)*param) <= 0) { - LM_ERR("empty parameter %d not allowed\n", param_no); - return -1; - } - - if(param_no == 1) { //route name - static or dynamic string (config vars) - if(fixup_spve_null(param, param_no) < 0) - return -1; - return 0; - } else if(param_no == 2) { - udomain_t *d; - - if(ul.register_udomain((char *)*param, &d) < 0) { - LM_ERR("Error doing fixup on save"); - return -1; - } - *param = (void *)d; - } else if(param_no == 3) { - return 0; + if(param_no < 4) { + return assign_save_fixup3_async(param, param_no); } else if(param_no == 4) { return unit_fixup(param, param_no); }

1 0

git:master:20a75004: ims_registrar_scscf: fix uninitialized arguments in save()
by Henning Westerholt 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 20a75004d53a06da0f22b11804a4d83496ad8919 URL: https://github.com/kamailio/kamailio/commit/20a75004d53a06da0f22b11804a4d83… Author: Alexander Couzens <lynxis(a)fe80.eu> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-29T19:27:15+02:00 ims_registrar_scscf: fix uninitialized arguments in save() The script "save" command can be used with different arguments: 2, 3 and 4. But internally for all save() calls the exact same function is use, w_save(). When calling save("PRE_REG_SAR_REPLY","location"); as given by the examples, kamailio will call w_save(). Because the command code will cast the function pointer, the w_save() function is called with 2 uninitialized arguments *mode, *c_flags. mode is unused, seems a legacy argument. c_flags is referenced resulting in a crash if not null. Use separate wrapper functions to handle different argument number. Fixes: a627c9a04a74 ("ims_registrar_scscf: Extend save() with optional flag") --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20a75004d53a06da0f22b11804a4d83… Patch: https://github.com/kamailio/kamailio/commit/20a75004d53a06da0f22b11804a4d83… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 07403a2b1e6..d17b5e38823 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -131,7 +131,9 @@ struct _pv_req_data _pv_treq; static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_save( +static int w_save2(struct sip_msg *_m, char *_route, char *_d); +static int w_save3(struct sip_msg *_m, char *_route, char *_d, char *mode); +static int w_save4( struct sip_msg *_m, char *_route, char *_d, char *mode, char *_cflags); static int w_assign_server_unreg( struct sip_msg *_m, char *_route, char *_d, char *_direction); @@ -231,11 +233,11 @@ static pv_export_t mod_pvs[] = { * Exported functions */ static cmd_export_t cmds[] = { - {"save", (cmd_function)w_save, 2, assign_save_fixup3_async, 0, + {"save", (cmd_function)w_save2, 2, assign_save_fixup3_async, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"save", (cmd_function)w_save, 3, assign_save_fixup3_async, 0, + {"save", (cmd_function)w_save3, 3, assign_save_fixup3_async, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"save", (cmd_function)w_save, 4, save_fixup3, free_uint_fixup, + {"save", (cmd_function)w_save4, 4, save_fixup3, free_uint_fixup, REQUEST_ROUTE | ONREPLY_ROUTE}, {"lookup", (cmd_function)w_lookup, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -677,9 +679,21 @@ AAAMessage *callback_cdp_request(AAAMessage *request, void *param) /*! \brief * Wrapper to save(location) */ -static int w_save( +static int w_save2(struct sip_msg *_m, char *_route, char *_d) +{ + return save(_m, _d, _route, 0); +} + +static int w_save3(struct sip_msg *_m, char *_route, char *_d, char *_mode) +{ + /* mode is unsed. Docs says legacy parameter? Maybe to be compatible with registrar/save? */ + return save(_m, _d, _route, 0); +} + +static int w_save4( struct sip_msg *_m, char *_route, char *_d, char *mode, char *_cflags) { + /* mode is unsed. Docs says legacy parameter? Maybe to be compatible with registrar/save? */ if(_cflags) { return save(_m, _d, _route, ((int)(*_cflags))); }

1 0

git:5.8:cafe437d: tls: clear thread-local variables up to tls_pthreads_key_mark
by S-P Chan 29 Apr '24

29 Apr '24

Module: kamailio Branch: 5.8 Commit: cafe437dcb637b0e571a2d2ffd04d911584404d9 URL: https://github.com/kamailio/kamailio/commit/cafe437dcb637b0e571a2d2ffd04d91… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-04-29T21:27:38+08:00 tls: clear thread-local variables up to tls_pthreads_key_mark - other libraries may set thread-locals via pthread_setspecific - assume that tls_pthreads_key_mark demarcates libssl's values - only clean thread-local values up to tls_pthreads_key_mark Currently only used by app_python[s] (cherry picked from commit fe6f4fcde2fa06a3c00479cef169c27dc32ae490) --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/cafe437dcb637b0e571a2d2ffd04d91… Patch: https://github.com/kamailio/kamailio/commit/cafe437dcb637b0e571a2d2ffd04d91… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 83b86d99d58..baa1a7c76d1 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -343,10 +343,11 @@ static tls_domains_cfg_t* tls_use_modparams(void) * is < 10 * */ +static int tls_pthreads_key_mark; static void fork_child(void) { - int k = 0; - for(k = 0; k < 16; k++) { + int k; + for(k = 0; k < tls_pthreads_key_mark; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); } @@ -356,6 +357,8 @@ static int mod_init(void) { int method; int verify_client; + unsigned char rand_buf[32]; + int k; if(tls_disable) { LM_WARN("tls support is disabled " @@ -464,6 +467,23 @@ static int mod_init(void) if(ksr_tls_threads_mode == 2) { pthread_atfork(NULL, NULL, &fork_child); } + +#if OPENSSL_VERSION_NUMBER >= 0x010101000L + /* + * force creation of all thread-locals now so that other libraries + * that use pthread_key_create(), e.g. python, + * will have larger key values + */ + if(ksr_tls_threads_mode > 0) { + ERR_clear_error(); + RAND_bytes(rand_buf, sizeof(rand_buf)); + for(k = 0; k < 32; k++) { + if(pthread_getspecific(k)) + tls_pthreads_key_mark = k + 1; + } + LM_WARN("set maximum pthreads key to %d\n", tls_pthreads_key_mark); + } +#endif return 0; error: tls_h_mod_destroy_f(); @@ -500,6 +520,7 @@ static int mod_child_hook(int *rank, void *dummy) if(tls_fix_domains_cfg(*tls_domains_cfg, &mod_params, &mod_params) < 0) return -1; } + return 0; } @@ -509,17 +530,26 @@ static OSSL_LIB_CTX *new_ctx; #endif static int mod_child(int rank) { + int k; + if(tls_disable || (tls_domains_cfg == 0)) return 0; /* - * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor - * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 - */ + * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor + * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 + */ if(rank == PROC_INIT) { return run_thread4PP((_thread_proto4PP)mod_child_hook, &rank, NULL); } + if(ksr_tls_threads_mode == 1 && rank && rank != PROC_INIT + && rank != PROC_POSTCHILDINIT) { + for(k = 0; k < tls_pthreads_key_mark; k++) + pthread_setspecific(k, 0x0); + LM_WARN("clean-up of thread-locals key < %d\n", tls_pthreads_key_mark); + } + #ifdef KSR_SSL_COMMON /* * after the child is fork()ed we go through the TLS domains diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 58ddc853acd..7bbcf3a628c 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,10 +21,10 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> +#include <openssl/rand.h> #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L -#include <openssl/rand.h> const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void);

1 0

git:master:fe6f4fcd: tls: clear thread-local variables up to tls_pthreads_key_mark
by S-P Chan 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: fe6f4fcde2fa06a3c00479cef169c27dc32ae490 URL: https://github.com/kamailio/kamailio/commit/fe6f4fcde2fa06a3c00479cef169c27… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-04-29T21:20:20+08:00 tls: clear thread-local variables up to tls_pthreads_key_mark - other libraries may set thread-locals via pthread_setspecific - assume that tls_pthreads_key_mark demarcates libssl's values - only clean thread-local values up to tls_pthreads_key_mark Currently only used by app_python[s] --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/fe6f4fcde2fa06a3c00479cef169c27… Patch: https://github.com/kamailio/kamailio/commit/fe6f4fcde2fa06a3c00479cef169c27… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 83b86d99d58..baa1a7c76d1 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -343,10 +343,11 @@ static tls_domains_cfg_t* tls_use_modparams(void) * is < 10 * */ +static int tls_pthreads_key_mark; static void fork_child(void) { - int k = 0; - for(k = 0; k < 16; k++) { + int k; + for(k = 0; k < tls_pthreads_key_mark; k++) { if(pthread_getspecific(k) != 0) pthread_setspecific(k, 0x0); } @@ -356,6 +357,8 @@ static int mod_init(void) { int method; int verify_client; + unsigned char rand_buf[32]; + int k; if(tls_disable) { LM_WARN("tls support is disabled " @@ -464,6 +467,23 @@ static int mod_init(void) if(ksr_tls_threads_mode == 2) { pthread_atfork(NULL, NULL, &fork_child); } + +#if OPENSSL_VERSION_NUMBER >= 0x010101000L + /* + * force creation of all thread-locals now so that other libraries + * that use pthread_key_create(), e.g. python, + * will have larger key values + */ + if(ksr_tls_threads_mode > 0) { + ERR_clear_error(); + RAND_bytes(rand_buf, sizeof(rand_buf)); + for(k = 0; k < 32; k++) { + if(pthread_getspecific(k)) + tls_pthreads_key_mark = k + 1; + } + LM_WARN("set maximum pthreads key to %d\n", tls_pthreads_key_mark); + } +#endif return 0; error: tls_h_mod_destroy_f(); @@ -500,6 +520,7 @@ static int mod_child_hook(int *rank, void *dummy) if(tls_fix_domains_cfg(*tls_domains_cfg, &mod_params, &mod_params) < 0) return -1; } + return 0; } @@ -509,17 +530,26 @@ static OSSL_LIB_CTX *new_ctx; #endif static int mod_child(int rank) { + int k; + if(tls_disable || (tls_domains_cfg == 0)) return 0; /* - * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor - * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 - */ + * OpenSSL 3.x/1.1.1: create shared SSL_CTX* in thread executor + * to avoid init of libssl in thread#1: ksr_tls_threads_mode = 1 + */ if(rank == PROC_INIT) { return run_thread4PP((_thread_proto4PP)mod_child_hook, &rank, NULL); } + if(ksr_tls_threads_mode == 1 && rank && rank != PROC_INIT + && rank != PROC_POSTCHILDINIT) { + for(k = 0; k < tls_pthreads_key_mark; k++) + pthread_setspecific(k, 0x0); + LM_WARN("clean-up of thread-locals key < %d\n", tls_pthreads_key_mark); + } + #ifdef KSR_SSL_COMMON /* * after the child is fork()ed we go through the TLS domains diff --git a/src/modules/tls/tls_rand.h b/src/modules/tls/tls_rand.h index 58ddc853acd..7bbcf3a628c 100644 --- a/src/modules/tls/tls_rand.h +++ b/src/modules/tls/tls_rand.h @@ -21,10 +21,10 @@ #define _TLS_RAND_H_ #include <openssl/ssl.h> +#include <openssl/rand.h> #if OPENSSL_VERSION_NUMBER >= 0x10100000L \ && OPENSSL_VERSION_NUMBER < 0x030000000L -#include <openssl/rand.h> const RAND_METHOD *RAND_ksr_krand_method(void); const RAND_METHOD *RAND_ksr_fastrand_method(void);

1 0

git:master:27351e3f: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 27351e3f9f551a86ffecbc1e6aa269a2946d55d1 URL: https://github.com/kamailio/kamailio/commit/27351e3f9f551a86ffecbc1e6aa269a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-29T10:16:08+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/27351e3f9f551a86ffecbc1e6aa269a… Patch: https://github.com/kamailio/kamailio/commit/27351e3f9f551a86ffecbc1e6aa269a… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 8dd070ffe7d..bce99b791da 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -308,7 +308,7 @@ ipsec_create("location", "1"); then this must be name of the table which stores the contacts. flags - bitwise flag: + 0x01 (1) - set force socket for request messages. Useful for - ipsec and TCP. + ipsec and TCP/TLS. + 0x02 (2) - reverse search for a contact in the memory. Useful when contact alias is disabled. + 0x04 (4) - use destination URI for IPSec tunnel search. Useful @@ -317,12 +317,13 @@ ipsec_create("location", "1"); + 0x10 (16) - do not look for alias parameter to set received details. + 0x20 (32) - do not reset the destination URI. - + 0x40 (64) - use user equipment client port as target for TCP - requests. + + 0x40 (64) - use user equipment client port as target for + TCP/TLS requests (try to reuse the UE client connection). + 0x80 (128) - set transport parameter in the new dst uri for - TCP requests. + TCP/TLS requests. + 0x100 (256) - use Via attributes (port and protocol) for - routing UDP reply. + routing UDP reply, and protocol from next hop address for + request (otherwise it taken from saved contact). + 0x200 (512) - try TCP if corresponding UDP socket is not found. This is an optional parameter, default value - 0.

1 0

git:master:48dab490: ims_ipsec_pcscf: handle tls for replies
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 48dab490965fa7f2f7200d95edd7dbb1407b2536 URL: https://github.com/kamailio/kamailio/commit/48dab490965fa7f2f7200d95edd7dbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T10:08:29+02:00 ims_ipsec_pcscf: handle tls for replies --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/48dab490965fa7f2f7200d95edd7dbb… Patch: https://github.com/kamailio/kamailio/commit/48dab490965fa7f2f7200d95edd7dbb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b1e36ae2e24..b5c009dfcf8 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1053,13 +1053,15 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } if(m->first_line.type == SIP_REPLY) { + /* reply handling */ if(_cflags & IPSEC_FORWARD_USEVIA) { + /* req - corresponding request from transaction */ dst_proto = vb ? vb->proto : req->rcv.proto; // As per ETSI TS 133 203 V11.2.0, 7.1 Security association parameters // https://tools.ietf.org/html/rfc3261#section-18 // From Reply and TCP send via the same ports Request was recevied. - if(dst_proto == PROTO_TCP) { + if(dst_proto == PROTO_TCP || dst_proto == PROTO_TLS) { src_port = req->rcv.dst_port; dst_port = req->rcv.src_port; } else { @@ -1073,25 +1075,34 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } } } else { - // for Reply get the dest proto from the received request + // dest proto from the corresponding request from transaction dst_proto = req->rcv.proto; - // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port - src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; + if(dst_proto == PROTO_TCP || dst_proto == PROTO_TLS) { + // for TCP/TLS send from P-CSCF server port + src_port = s->port_ps; - // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port - dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + // for TCP/TLS send to UE client port + dst_port = s->port_uc; + } else { + // for UDP send from P-CSCF client port + src_port = s->port_pc; - // Check send socket + // for UDP send to UE server port + dst_port = s->port_us; + } + // find send socket client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { + /* fallback: P-CSCF client port to UE server port */ src_port = s->port_pc; dst_port = s->port_us; } } } else { + /* request handling */ if(_cflags & IPSEC_FORWARD_USEVIA) { dst_proto = ims_ipsec_get_forward_proto(m); } else {

1 0

git:master:f7f93828: ims_ipsec_pcscf: updated comments for ipsec_forward() flags
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: f7f93828993b5975dfe5f26ad63ba6c489aa69f7 URL: https://github.com/kamailio/kamailio/commit/f7f93828993b5975dfe5f26ad63ba6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T06:49:47+02:00 ims_ipsec_pcscf: updated comments for ipsec_forward() flags --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/f7f93828993b5975dfe5f26ad63ba6c… Patch: https://github.com/kamailio/kamailio/commit/f7f93828993b5975dfe5f26ad63ba6c… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index fff9def48a2..b1e36ae2e24 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -88,11 +88,12 @@ extern struct tm_binds tmb; #define IPSEC_NOALIAS_SEARCH (1 << 4) /* if set - do not reset dst uri for IPsec forward */ #define IPSEC_NODSTURI_RESET (1 << 5) -/* if set - use user equipment client port as target for requests over TCP */ +/* if set - use user equipment client port as target for requests over TCP/TLS */ #define IPSEC_TCPPORT_UEC (1 << 6) -/* if set - build new dst uri with transport parameter for TCP */ +/* if set - build new dst uri with transport parameter for TCP/TLS */ #define IPSEC_SETDSTURI_FULL (1 << 7) -/* if set - use Via attributes for routing reply */ +/* if set - use Via attributes for routing reply + * and protocol from next hop address for request */ #define IPSEC_FORWARD_USEVIA (1 << 8) /* if set - try TCP if corresponding UDP socket is not found */ #define IPSEC_FORWARD_TRYTCP (1 << 9)

1 0

git:master:575b17d2: ims_ipsec_pcscf: docs updated for ipsec_forward() flags
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: 575b17d23cd5fa060f775bc56b42c735048bc849 URL: https://github.com/kamailio/kamailio/commit/575b17d23cd5fa060f775bc56b42c73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T06:46:56+02:00 ims_ipsec_pcscf: docs updated for ipsec_forward() flags --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/575b17d23cd5fa060f775bc56b42c73… Patch: https://github.com/kamailio/kamailio/commit/575b17d23cd5fa060f775bc56b42c73… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index ff65668e6e1..ee58f16fb63 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -284,7 +284,7 @@ ipsec_create("location", "1"); <itemizedlist> <listitem> <para> - <emphasis>0x01</emphasis> (1) - set force socket for request messages. Useful for ipsec and TCP. + <emphasis>0x01</emphasis> (1) - set force socket for request messages. Useful for ipsec and TCP/TLS. </para> </listitem> <listitem> @@ -316,17 +316,19 @@ ipsec_create("location", "1"); </listitem> <listitem> <para> - <emphasis>0x40</emphasis> (64) - use user equipment client port as target for TCP requests. + <emphasis>0x40</emphasis> (64) - use user equipment client port as target for TCP/TLS requests + (try to reuse the UE client connection). </para> </listitem> <listitem> <para> - <emphasis>0x80</emphasis> (128) - set transport parameter in the new dst uri for TCP requests. + <emphasis>0x80</emphasis> (128) - set transport parameter in the new dst uri for TCP/TLS requests. </para> </listitem> <listitem> <para> - <emphasis>0x100</emphasis> (256) - use Via attributes (port and protocol) for routing UDP reply. + <emphasis>0x100</emphasis> (256) - use Via attributes (port and protocol) for routing UDP reply, + and protocol from next hop address for request (otherwise it taken from saved contact). </para> </listitem> <listitem>

1 0

git:master:ab261540: ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

Module: kamailio Branch: master Commit: ab261540d656ed456bac8876f77f940457a9baf6 URL: https://github.com/kamailio/kamailio/commit/ab261540d656ed456bac8876f77f940… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T06:32:07+02:00 ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests - both flags should be avaible for use at the same time in ipsec_forward() - for request IPSEC_FORWARD_USEVIA gets the protocol from the next hop address --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/ab261540d656ed456bac8876f77f940… Patch: https://github.com/kamailio/kamailio/commit/ab261540d656ed456bac8876f77f940… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b5a598b44ba..fff9def48a2 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -942,6 +942,37 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) return ret; } +/** + * + */ +int ims_ipsec_get_forward_proto(sip_msg_t *msg) +{ + struct sip_uri parsed_uri; + str uri; + + if(msg == NULL) { + LM_ERR("no message structure - fallback to UDP\n"); + return PROTO_UDP; + } + + if(msg->dst_uri.s != NULL && msg->dst_uri.len > 0) { + uri = msg->dst_uri; + } else { + if(msg->new_uri.s != NULL && msg->new_uri.len > 0) { + uri = msg->new_uri; + } else { + uri = msg->first_line.u.request.uri; + } + } + if(parse_uri(uri.s, uri.len, &parsed_uri) != 0) { + LM_ERR("failed to parse next hop uri [%.*s]\n", uri.len, uri.s); + return PROTO_UDP; + } + if(parsed_uri.proto == PROTO_NONE || parsed_uri.proto == PROTO_OTHER) { + return PROTO_UDP; + } + return parsed_uri.proto; +} int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) { @@ -1061,43 +1092,24 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } } else { if(_cflags & IPSEC_FORWARD_USEVIA) { - if(req->first_line.u.request.method_value == METHOD_REGISTER) { - // for Request get the dest proto from the saved contact - dst_proto = pcontact->received_proto; - } else { - if(m->dst_uri.s != NULL - && strstr(m->dst_uri.s, ";transport=tcp") != NULL) { - dst_proto = PROTO_TCP; - } else if(m->dst_uri.s != NULL - && strstr(m->dst_uri.s, ";transport=tls") != NULL) { - dst_proto = PROTO_TLS; - } else { - dst_proto = m->rcv.proto; - } - } - - // for Request sends from P-CSCF client port - src_port = s->port_pc; - // for Request sends to UE server port - dst_port = s->port_us; + dst_proto = ims_ipsec_get_forward_proto(m); } else { - // for Request get the dest proto from the saved contact dst_proto = pcontact->received_proto; + } + if((_cflags & IPSEC_TCPPORT_UEC) + && ((dst_proto == PROTO_TCP) || (dst_proto == PROTO_TLS))) { + // TCP/TLS send from P-CSCF server port, UDP sends from P-CSCF client port + src_port = s->port_ps; - if(_cflags & IPSEC_TCPPORT_UEC) { - // for Request and TCP sends from P-CSCF server port, for Request and UDP sends from P-CSCF client port - src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; - - // for Request and TCP sends to UE client port, for Request and UDP sends to UE server port - dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + // for TCP/TLS sends to UE client port, for UDP sends to UE server port + dst_port = s->port_uc; - } else { - // for Request sends from P-CSCF client port - src_port = s->port_pc; + } else { + // send from P-CSCF client port + src_port = s->port_pc; - // for Request sends to UE server port - dst_port = s->port_us; - } + // send to UE server port + dst_port = s->port_us; } }

1 0

git:5.7:afd6189d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 29 Apr '24

29 Apr '24

Module: kamailio Branch: 5.7 Commit: afd6189d65b06b80a433b6e4e321ac509af0c40c URL: https://github.com/kamailio/kamailio/commit/afd6189d65b06b80a433b6e4e321ac5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-29T05:31:24+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/smsops/README --- Diff: https://github.com/kamailio/kamailio/commit/afd6189d65b06b80a433b6e4e321ac5… Patch: https://github.com/kamailio/kamailio/commit/afd6189d65b06b80a433b6e4e321ac5… --- diff --git a/src/modules/smsops/README b/src/modules/smsops/README index 65e410de6ba..0dc5edbd605 100644 --- a/src/modules/smsops/README +++ b/src/modules/smsops/README @@ -33,6 +33,8 @@ Carsten Bock 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + List of Examples 1.1. isRPDATA() usage @@ -57,6 +59,8 @@ Chapter 1. Admin Guide 4.1. isRPDATA() 4.2. smsdump() + 5. Variables + 1. Overview This module collects the Transformations for 3GPP-SMS. @@ -115,3 +119,12 @@ if (isRPDATA()) ... smsdump(); ... + +5. Variables + + Several variables are exported by the module to access the attributes + of the SMS. + * $smsack + $smsbody + $rpdata(key) + $tpdu(key)

1 0

git: new commits in branch 5.7
by Daniel-Constantin Mierla 29 Apr '24

29 Apr '24

- URL: https://github.com/kamailio/kamailio/commit/fb685a8bd5d5e34edde44614f313cbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:02:09+02:00 jansson: declare variables at the beginning of blocks (cherry picked from commit a2bff77c3f7bfee8dae90c3ef20522d480f2e14d) - URL: https://github.com/kamailio/kamailio/commit/2758754f2bb427bff06b2a6e8217587… Author: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-04-29T05:05:31+02:00 core: properly handle drop() action for kemi engines - GH #3718 (cherry picked from commit 82593a09f8ef6d53e7e88238c057bbcdd9ab287b) - URL: https://github.com/kamailio/kamailio/commit/4b88c5bf30054739f476388523e8d2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:08:18+02:00 core: rthreads - init return variable (cherry picked from commit 181c602616e13323786335e8e28f182871aa5e9b) (cherry picked from commit 0747c18d5c4db2e7e8408ad2c7efa120ec76523e) - URL: https://github.com/kamailio/kamailio/commit/02b877493cd6ffc6cfdf7da114d255d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:08:56+02:00 core: ppcfg - jump to end when defexp eval does not get a str val (cherry picked from commit daac0bdb88f6f732bda7c683af45b90f87fdb7c9) (cherry picked from commit 4c78a564c5ad8662014cf686428a37238a6d8476) - URL: https://github.com/kamailio/kamailio/commit/cea618ede170bd02bb7ccd478a4f1a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:09:18+02:00 core: select - handle ws and wss inside select_ip_port() (cherry picked from commit d8e0942c9e83c8cad7c182bf41c156ba35bf24d2) (cherry picked from commit 089bf63178039b13cde0beccfacab1536af76179) - URL: https://github.com/kamailio/kamailio/commit/92d3b52ca4595a7e4d8ab003951191c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:09:31+02:00 core: parser rr - check for rr value before serializing (cherry picked from commit 6ee26a3ae3293aaeb4507d5d0b16ad31173cc39a) (cherry picked from commit 4626cb7f0e0b273153ce0004900a92553783a893) - URL: https://github.com/kamailio/kamailio/commit/d12613c8e357a8dc882eefe2d84fedd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:10:14+02:00 ctl: reset log prefix on reading ctl traffic - it may be previously set in process by some event route (cherry picked from commit 5b8b2717ee2f57da932132683b27eb33cea3fd59) (cherry picked from commit d45c78eeeaea6a9fc9dcb927436f834392d9d7c9) - URL: https://github.com/kamailio/kamailio/commit/f225edd2fdc87b0ebf72e15d8a11255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:12:20+02:00 acc: more log messages of failure arsing extra acc string (cherry picked from commit 04a73ace6572dd5c95a8f50b39b2ce712f7ebe84) (cherry picked from commit 91b0962679092f28abb5022d1505372356460f7d) - URL: https://github.com/kamailio/kamailio/commit/c90b736a098e1d76224c1e97c2a7142… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-04-29T05:13:20+02:00 core: resolve/create_srv_pref_list() - insert at correct position in list (cherry picked from commit f35cf8904119dcf582ea2451648de5fef095466b) (cherry picked from commit dbf9208f3a402844c9981fb7ed09493a1338dfdd) - URL: https://github.com/kamailio/kamailio/commit/a82d1575d9ac7820e526741fc169033… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-04-29T05:13:27+02:00 corex: fix conditions for dns_cache modparam srv attributes (cherry picked from commit 8114b2016d032484edafe4edd04fb02d52cfd058) (cherry picked from commit 3f44cabcfc0abc83ae1971ac74fbb0bd36829ce4) - URL: https://github.com/kamailio/kamailio/commit/edbcfff018145372fd6fa5d1777912f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:13:56+02:00 smsops: reformat module exports structures (cherry picked from commit 9848d43cb367d6901a0b8c727759feb8a8fad930) (cherry picked from commit b21a7aaa467f2b76a52308557657c65274e34087) - URL: https://github.com/kamailio/kamailio/commit/b3935051a8112b1a2152d8eb65da29b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:14:04+02:00 smsops: short reference section about variables (cherry picked from commit 9a94930ae1168d5df79e3dc1414841cdf23a2eba) (cherry picked from commit c0c8ee05ab25256b9154d2056ee04b07f3f2290a) - URL: https://github.com/kamailio/kamailio/commit/f1969ecaacd47eb03ef6b54d71c7037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:14:11+02:00 blst: reformat exported structures (cherry picked from commit e39557c96d2f419184c826d779f1a3309acc4269) (cherry picked from commit e394a05152b29d4009c9cb963bced72526c7651b) - URL: https://github.com/kamailio/kamailio/commit/8bb69fd5f5911098a3e567887ad2a3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:14:51+02:00 sdpops: reformat the codecs map (cherry picked from commit 359a442e14a156b0bcf60dc5b2580cbc57924e34) (cherry picked from commit 855c76780c4399d6d9881ce3c525a7df56e111c4) - URL: https://github.com/kamailio/kamailio/commit/96ff473191bb24be90e2dde82fccb5c… Author: vijay kumar <vijay.kumar(a)exotel.in> Date: 2024-04-29T05:15:24+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket (cherry picked from commit b4753ae4216b0c960ac094f4be8232fb4d0147b0) (cherry picked from commit d2cf78f5c70977639f3b7f66b852350b764e4b13) - URL: https://github.com/kamailio/kamailio/commit/550573b37b566aa46bd94a2a644e932… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:15:45+02:00 tcp_main: Add protocol argument for searching tcp/tls connections (cherry picked from commit 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8) (cherry picked from commit 2661594bf7f31558e6ac7524f33ebb358aefce21) - URL: https://github.com/kamailio/kamailio/commit/4ccf4c9b5134a0632f5ea5a653a6f5e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:15:51+02:00 tcp_main: Add proto argument to tcpconn_exists function (cherry picked from commit 6779efd430178adff0ae438d178e38c003e4e05c) (cherry picked from commit 0c070443b585c597d2d6249ac6ac32490d9c7f48) - URL: https://github.com/kamailio/kamailio/commit/63120ef838cbcde1f40862a745b9d31… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:16:03+02:00 tcp_main: Update comment docs (cherry picked from commit 0a28a93c6e060081267dc686e342d45ef03358e7) (cherry picked from commit a19e6e0e49d9881ab990d23ad31a95773fe1a00b) - URL: https://github.com/kamailio/kamailio/commit/aff1797bb83a10868914e814702367f… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:16:10+02:00 core/forward: Match protocol when forwarding (cherry picked from commit d81e5113884b933251499630d112ec5b1150b8a4) (cherry picked from commit 7d103cf3887401fca32d95f7ea7ee10f28e9e127) - URL: https://github.com/kamailio/kamailio/commit/09699ba5d4efab0cbe64869c1ed8db7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-29T05:16:17+02:00 tcp_main: Match wss protocol (cherry picked from commit 175d755c40bc50b78b2cf4f18ad22429289af90d) (cherry picked from commit 3052565e3ce14d5d3c45d790877a562185085548) - URL: https://github.com/kamailio/kamailio/commit/6ed99ae36fa16da2f0f59e3b5700abe… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-04-29T05:16:32+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. (cherry picked from commit 49276a1f43b1a3bf4a8d681888df964000360c79) (cherry picked from commit 28bbcd5a50f45b8217125481706180a76323dc44) - URL: https://github.com/kamailio/kamailio/commit/a794cef754fb3f2bc59d2d6a6d060e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:02+02:00 core: tcp - keep connection id on event route cb structure (cherry picked from commit 11e7d71e5c2ee9428298658ed3b9a0f625d40f00) (cherry picked from commit db2e96ec2aacde1bd50b65ea6357388bad39e86f) - URL: https://github.com/kamailio/kamailio/commit/cc7c586fbd72fe132719f3cfdba4809… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:08+02:00 tcpops: reworked some debug messages (cherry picked from commit 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81) (cherry picked from commit c9fe59d6cd73179aa75e21b3b215bc0465b182aa) - URL: https://github.com/kamailio/kamailio/commit/aeba79f5d9d5bf4fffdb64dd2c603fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:14+02:00 core: tcp - set a global shortcut to tcp connection for event route (cherry picked from commit d114d11724dc4157e7e5809504531d26da6bcc57) (cherry picked from commit 069de99576b5f8bff002176331ed2f545afe8158) - URL: https://github.com/kamailio/kamailio/commit/50c1b5cfe1b765b98438ac071eaa47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:20+02:00 pv: use global tcp connection callback for event route on $conid (cherry picked from commit f5c05a68ae72881ab0691bb8488112356fc67c79) (cherry picked from commit 7e987d8937349246f2abfa041679f568344ff402) - URL: https://github.com/kamailio/kamailio/commit/365bb5d7fd1534e467f8a2d1b120f2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:17:30+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 (cherry picked from commit 66b3c04a9653425b1602c82dd2456a7eb7cf59d1) (cherry picked from commit 794c2edeaffe059bf8de6ab1d3df5db003ed4cb0) - URL: https://github.com/kamailio/kamailio/commit/9e270790302f075317d8b9eefce9141… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-29T05:18:01+02:00 tcpops: removed unused variable introduced recently (cherry picked from commit fe8f052c29528b656062927626f9784b32b7c8f6) (cherry picked from commit e76d755de6482e51c9ddac5bba3834cb58ad79b2)

1 0

git:master:85589470: ims_registrar_scscf: init variable to fix analyzer warning
by Daniel-Constantin Mierla 28 Apr '24

28 Apr '24

Module: kamailio Branch: master Commit: 8558947034f16b162c15eda39d18f5f5df4ef562 URL: https://github.com/kamailio/kamailio/commit/8558947034f16b162c15eda39d18f5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-28T23:29:22+02:00 ims_registrar_scscf: init variable to fix analyzer warning --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/8558947034f16b162c15eda39d18f5f… Patch: https://github.com/kamailio/kamailio/commit/8558947034f16b162c15eda39d18f5f… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 836ce9ca11b..99707dae0ce 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -334,7 +334,7 @@ int term_impu_has_contact(struct sip_msg *_m, udomain_t *_d, char *_s) str aor, uri; ucontact_t *ptr = 0; int res; - int ret; + int ret = -1; impu_contact_t *impucontact;

1 0

[kamailio/kamailio] modules/statsd: ensure statsd failures do not stop execution (PR #3819)
by Ostap 28 Apr '24

28 Apr '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  2 issues: **Issue 1:** Currently statsd functions return bool: `true` or `false` depending when the function succeeds or fails respectively. This value gets implicitly converted to `int`: `true` -> `1`, `false` -> `0`. For Kamailio `1` means succesfull execution, but `0` means to stop processing messages, which is not what we want as statsd should not impact flow execution. Instead we want to return `-1` which signifies error, but the flow continues. **Issue 2:** statsd_init executes `statsd_connect` which tries to connect to statd server. If connection fails then kamailio fails to start. This is not the desired behaviour as: 1. Kamailio should continue working even if statsd server is down, metrics should not impact runtime. 2. `statsd_connect` is also re-executed each time we try to send the metric https://github.com/salemove/kamailio/blame/master/src/modules/statsd/lib_st…, so it's initial result is not essential. Note, that before 5.8 the result of init was already ignored due to implicit conversion of `false` to `0` until after https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… was introduced (which could be considered a breaking change even if it seemingly fixes a bug in conversion). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3819 -- Commit Summary -- * modules/statsd: avoid stopping flow when sending statsd metric fails * modules/statsd: do not fail module initilization when statsd init fails -- File Changes -- M src/modules/statsd/statsd.c (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3819.patch https://github.com/kamailio/kamailio/pull/3819.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3819 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3819(a)github.com>

2 5

git:master:5e66ba23: modules/statsd: ensure statsd failures do not stop execution (#3819)
by GitHub 28 Apr '24

28 Apr '24

Module: kamailio Branch: master Commit: 5e66ba23851f115bcb88d7e3f71f78ab33fc1e30 URL: https://github.com/kamailio/kamailio/commit/5e66ba23851f115bcb88d7e3f71f78a… Author: Ostap <ostap_mal(a)hotmail.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-28T23:15:28+02:00 modules/statsd: ensure statsd failures do not stop execution (#3819) * modules/statsd: avoid stopping flow when sending statsd metric fails Currently statsd functions return bool: `true` or `false` depending when the function succeeds or fails respectively. This value gets implicitly converted to `int`: `true` -> `1`, `false` -> `0`. For Kamailio `1` means succesfull execution, but `0` means to stop processing messages, which is not what we want as statsd should not impact flow execution. Instead we want to return `-1` which signifies error, but the flow continues. * modules/statsd: do not fail module initilization when statsd init fails statsd_init executes `statsd_connect` which tries to connect to statd server. If connection fails then kamailio fails to start. This is not the desired behaviour as: 1. Kamailio should continue working even if statsd server is down, metrics should not impact runtime. 2. `statsd_connect` is also re-executed each time we try to send the metric https://github.com/salemove/kamailio/blame/master/src/modules/statsd/lib_st…, so it's initial result is not essential. Note, that before 5.8 the result of init was already ignored due to implicit conversion of `false` to `0` until after https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… was introduced (which could be considered a breaking change even if it seemingly fixes a bug in conversion). --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/5e66ba23851f115bcb88d7e3f71f78a… Patch: https://github.com/kamailio/kamailio/commit/5e66ba23851f115bcb88d7e3f71f78a…

1 0

[kamailio/kamailio] utils/kamctl: make root host/port configurable (PR #3830)
by Tyler Moore 28 Apr '24

28 Apr '24

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - add support for configuring the DB root host/port connection parameters separate from the ro/rw settings. This allows the user to authenticate over the specific socket configured (tcp/udp/unix) for each connection type (root/ro/rw). - note that support is added for mysql and postgresql connections. no changes to the other DB engine connection parameters. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3830 -- Commit Summary -- * utils/kamctl: make root host/port configurable -- File Changes -- M utils/kamctl/kamctlrc (8) M utils/kamctl/kamdbctl.base (3) M utils/kamctl/kamdbctl.mysql (23) M utils/kamctl/kamdbctl.pgsql (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3830.patch https://github.com/kamailio/kamailio/pull/3830.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3830 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3830(a)github.com>

2 3

git:master:de23dc10: utils/kamctl: make root host/port configurable
by Daniel-Constantin Mierla 28 Apr '24

28 Apr '24

Module: kamailio Branch: master Commit: de23dc1035e4b885f45bc4150d282c26b294db64 URL: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-28T23:14:16+02:00 utils/kamctl: make root host/port configurable - add support for configuring the DB root host/port connection parameters separate from the ro/rw settings. This allows the user to authenticate over the specific socket configured (tcp/udp/unix) for each connection type (root/ro/rw). - note that support is added for mysql and postgresql connections. no changes to the other DB engine connection parameters. --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base Modified: utils/kamctl/kamdbctl.mysql Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… Patch: https://github.com/kamailio/kamailio/commit/de23dc1035e4b885f45bc4150d282c2… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index ce0bd9d93bc..67af483d9c6 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -44,6 +44,14 @@ ## database access host (from where is kamctl used) # DBACCESSHOST=192.168.0.1 +## database host for super user (useful for specifying a local socket or virtual hostname) +# defaults to value of DBHOST when not set +# DBROOTHOST="localhost" + +## database port for super user (on some DB specifying the port will force TCP connections) +# default value will depend on client DB tool +# DBROOTPORT="" + ## database super user (for ORACLE this is 'scheme-creator' user) # DBROOTUSER="root" diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4a3beccaef4..5579c9e8373 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -20,6 +20,9 @@ DBROUSER=${DBROUSER:-kamailioro} # password for read-only user DBROPW=${DBROPW:-kamailioro} +# address of database server for root connections +DBROOTHOST=${DBROOTHOST:-$DBHOST} + # user name column USERCOL=${USERCOL:-username} diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 81a730bbe65..49915dc7954 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -27,23 +27,22 @@ fi # config vars ################################################################# -# full privileges MySQL user -if [ -z "$DBROOTUSER" ]; then - DBROOTUSER="root" -fi - # Set DBROOTPW in kamctlrc or via next line to set the database # root password if you want to run this script without any user prompt. # This is unsafe, but useful e.g. for automatic testing. #DBROOTPW="" - -if [ -z "$DBPORT" ] ; then - CMD="mysql -h $DBHOST -u$DBROOTUSER " - DUMP_CMD="mysqldump -h $DBHOST -u$DBROOTUSER -c -t " -else - CMD="mysql -h $DBHOST -P $DBPORT -u$DBROOTUSER " - DUMP_CMD="mysqldump -h $DBHOST -P $DBPORT -u$DBROOTUSER -c -t " +# build the client base commands one param at a time +# let the client choose defaults where not specified +CMD="mysql -h $DBROOTHOST" +DUMP_CMD="mysqldump -c -t -h $DBROOTHOST" +if [ -n "$DBROOTPORT" ] ; then + CMD="$CMD -P $DBROOTPORT" + DUMP_CMD="$DUMP_CMD -P $DBROOTPORT" +fi +if [ -n "$DBROOTUSER" ]; then + CMD="$CMD -u $DBROOTUSER" + DUMP_CMD="mysqldump -u $DBROOTUSER" fi ################################################################# diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index 1eb5d88d2b8..3b46c04294f 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -51,12 +51,12 @@ if [ -z "$DBROOTUSER" ]; then fi fi -if [ -z "$DBPORT" ] ; then - CMD="psql -q -h $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" +if [ -z "$DBROOTPORT" ] ; then + CMD="psql -q -h $DBROOTHOST -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBROOTHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" + CMD="psql -q -h $DBROOTHOST -p $DBROOTPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBROOTHOST -p $DBROOTPORT -U $DBROOTUSER -c" fi #################################################################

1 0

git:master:f0caa96e: phonenum: clang format cpp file
by Daniel-Constantin Mierla 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: f0caa96e7622c40200d22d730ca904f27e5fe752 URL: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-27T08:46:17+02:00 phonenum: clang format cpp file --- Modified: src/modules/phonenum/cphonenumber.cpp --- Diff: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f… Patch: https://github.com/kamailio/kamailio/commit/f0caa96e7622c40200d22d730ca904f…

1 0

git:master:5b0e1e6d: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: 5b0e1e6d23fb0bf028589ae27949f11be2b22837 URL: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-27T08:46:10+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… Patch: https://github.com/kamailio/kamailio/commit/5b0e1e6d23fb0bf028589ae27949f11… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 87cb9e485f5..5d50ebf8f2e 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -191,7 +191,8 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { + number - phone number that is matched + valid - 1 if the matched number has a valid result; 0 otherwise - + normalized - normalized phone number + + normalized - normalized (E164) phone number + + natnum - nationally formatted phone number + cctel - country code for phone number + ccname - country code name + ltype - local network type

1 0

[kamailio/kamailio] phonenum: add national number (PR #3820)
by Daniel Donoghue 27 Apr '24

27 Apr '24

- add natnum property, containing the nationally formatted number, to pv   #### 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 - [ ] 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/3820 -- Commit Summary -- * phonenum: add national number -- File Changes -- M src/modules/phonenum/cphonenumber.cpp (12) M src/modules/phonenum/cphonenumber.h (1) M src/modules/phonenum/doc/phonenum_admin.xml (5) M src/modules/phonenum/phonenum_pv.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3820.patch https://github.com/kamailio/kamailio/pull/3820.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3820 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3820(a)github.com>

2 2

git:master:efffd1db: phonenum: add national number
by Daniel-Constantin Mierla 27 Apr '24

27 Apr '24

Module: kamailio Branch: master Commit: efffd1db25f2da411f53fdab4954c60c16c021ae URL: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… Author: Daniel Donoghue <daniel.donoghue(a)aurorainnovation.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-27T08:44:10+02:00 phonenum: add national number - add natnum property, containing the nationally formatted number, to pv --- Modified: src/modules/phonenum/cphonenumber.cpp Modified: src/modules/phonenum/cphonenumber.h Modified: src/modules/phonenum/doc/phonenum_admin.xml Modified: src/modules/phonenum/phonenum_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… Patch: https://github.com/kamailio/kamailio/commit/efffd1db25f2da411f53fdab4954c60… --- diff --git a/src/modules/phonenum/cphonenumber.cpp b/src/modules/phonenum/cphonenumber.cpp index 60f5039c88f..94cc9d2cddb 100644 --- a/src/modules/phonenum/cphonenumber.cpp +++ b/src/modules/phonenum/cphonenumber.cpp @@ -128,9 +128,11 @@ telnum_t* telnum_parse(char* number, char* region) return res; } res->valid = 1; - string formattedNumber; - _phoneUtil.Format(parsedNumber, PhoneNumberUtil::E164, &formattedNumber); - res->normalized = strdup(formattedNumber.c_str()); + string formattedNumberE164, formattedNumberNational; + _phoneUtil.Format(parsedNumber, PhoneNumberUtil::E164, &formattedNumberE164); + _phoneUtil.Format(parsedNumber, PhoneNumberUtil::NATIONAL, &formattedNumberNational); + res->normalized = strdup(formattedNumberE164.c_str()); + res->natnum = strdup(formattedNumberNational.c_str()); string descNumber = _phoneGeoCoder->GetDescriptionForNumber(parsedNumber, Locale("en")); res->ndesc = strdup(descNumber.c_str()); res->ltype = strdup(telnum_linetype(_phoneUtil.GetNumberType(parsedNumber))); @@ -156,6 +158,7 @@ telnum_t* telnum_new(char* number) tn->ltype = NULL; tn->ndesc = NULL; tn->ccname = NULL; + tn->natnum = NULL; tn->error = NULL; return tn; } @@ -183,5 +186,8 @@ void telnum_free(telnum_t* tn) if (tn->ccname) { free(tn->ccname); } + if (tn->natnum) { + free(tn->natnum); + } free(tn); } diff --git a/src/modules/phonenum/cphonenumber.h b/src/modules/phonenum/cphonenumber.h index 1a6a06df861..b9e1dc09d96 100644 --- a/src/modules/phonenum/cphonenumber.h +++ b/src/modules/phonenum/cphonenumber.h @@ -37,6 +37,7 @@ extern "C" char *ltype; char *ndesc; char *ccname; + char *natnum; char *error; int cctel; int valid; diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index f3a3e98ede0..740ec4780a3 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -205,7 +205,10 @@ if(phonenum_match_cn("1-484-555-8888", "US", "src")) { valid result; 0 otherwise </para></listitem> <listitem><para> - <emphasis>normalized</emphasis> - normalized phone number + <emphasis>normalized</emphasis> - normalized (E164) phone number + </para></listitem> + <listitem><para> + <emphasis>natnum</emphasis> - nationally formatted phone number </para></listitem> <listitem><para> <emphasis>cctel</emphasis> - country code for phone number diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index f6bcc025f66..5970c6b9845 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -190,6 +190,8 @@ int pv_parse_phonenum_name(pv_spec_p sp, str *in) gpv->type = 0; else if(strncmp(pvs.s, "ccname", 6) == 0) gpv->type = 7; + else if(strncmp(pvs.s, "natnum", 6) == 0) + gpv->type = 8; else goto error; break; @@ -268,6 +270,10 @@ int pv_get_phonenum(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(gpv->item->r.record->ccname == NULL) return pv_get_null(msg, param, res); return pv_get_strzval(msg, param, res, gpv->item->r.record->ccname); + case 8: /* natnum */ + if(gpv->item->r.record->natnum == NULL) + return pv_get_null(msg, param, res); + return pv_get_strzval(msg, param, res, gpv->item->r.record->natnum); default: /* number */ if(gpv->item->r.record->number == NULL) return pv_get_null(msg, param, res);

1 0

git:master:465994de: modules: readme files regenerated - ims_usrloc_scscf ... [skip ci]
by Kamailio Dev 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 465994de2859c7863b4cef8457be0a207f15c932 URL: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-26T15:46:09+02:00 modules: readme files regenerated - ims_usrloc_scscf ... [skip ci] --- Modified: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2… Patch: https://github.com/kamailio/kamailio/commit/465994de2859c7863b4cef8457be0a2…

1 0

git:master:8506a6fe: ims_usrloc_scscf: enclose examples in dotted lines for better visibility
by Daniel-Constantin Mierla 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 8506a6fe781e6e0b0b1418f4087db50480db6b57 URL: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-26T14:35:22+02:00 ims_usrloc_scscf: enclose examples in dotted lines for better visibility --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50… Patch: https://github.com/kamailio/kamailio/commit/8506a6fe781e6e0b0b1418f4087db50…

1 0

git:master:15d859e1: ims_usrloc_scscf: reformat exported structures
by Daniel-Constantin Mierla 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 15d859e1e96552fca2708cf56047021beae29711 URL: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-26T14:24:16+02:00 ims_usrloc_scscf: reformat exported structures --- Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021… Patch: https://github.com/kamailio/kamailio/commit/15d859e1e96552fca2708cf56047021…

1 0

git:master:9f284503: uid_auth_db: spelling fix in documentation
by Henning Westerholt 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: 9f28450312749dfbc021a8cbc23472c8a39d3fef URL: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-26T05:54:27Z uid_auth_db: spelling fix in documentation --- Modified: src/modules/uid_auth_db/auth_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… Patch: https://github.com/kamailio/kamailio/commit/9f28450312749dfbc021a8cbc23472c… --- diff --git a/src/modules/uid_auth_db/auth_db.xml b/src/modules/uid_auth_db/auth_db.xml index 25849663c54..99e5eb7c594 100644 --- a/src/modules/uid_auth_db/auth_db.xml +++ b/src/modules/uid_auth_db/auth_db.xml @@ -66,7 +66,7 @@ the <serdoc:module>textops</serdoc:module> module. </para> <para> - The reason for the failure can be determined from the interger + The reason for the failure can be determined from the integer return value stored in the <varname>$?</varname> attribute. A value of <literal>-3</literal> indicates that it was impossible to retrieve credentials from the request. A 400 (Bad Request)

1 0

git:master:db176a49: core: spelling fix in comment and log message
by Henning Westerholt 26 Apr '24

26 Apr '24

Module: kamailio Branch: master Commit: db176a4918c0b500f5f051cad16fd8d442450ab7 URL: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-26T05:53:30Z core: spelling fix in comment and log message --- Modified: src/core/switch.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… Patch: https://github.com/kamailio/kamailio/commit/db176a4918c0b500f5f051cad16fd8d… --- diff --git a/src/core/switch.c b/src/core/switch.c index 79cee21c501..e12b7e5f6d1 100644 --- a/src/core/switch.c +++ b/src/core/switch.c @@ -203,7 +203,7 @@ int fix_switch(struct action *t) return E_BUG; } if(rval_expr_eval_long(0, 0, &c->label.match_int, c->ct_rve) < 0) { - LM_ERR("case expression (%d,%d) has non-interger type\n", + LM_ERR("case expression (%d,%d) has non-integer type\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); return E_BUG; } diff --git a/src/core/ut.h b/src/core/ut.h index ff8d964e559..1efd7abd242 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -315,7 +315,7 @@ static inline char *int2strbuf(unsigned long l, char *r, int r_size, int *len) } extern char ut_buf_int2str[INT2STR_MAX_LEN]; -/** interger(long) to string conversion. +/** integer(long) to string conversion. * This version uses a static buffer (shared with sint2str()). * WARNING: other function calls might overwrite the static buffer, so * either always save the result immediately or use int2strbuf(...).

1 0

[kamailio/kamailio] ERROR: <core> [core/ppcfg.c:275]: pp_ifdef_level_error(): different number of preprocessor directives: 1 more #!if[n]def as #!endif (Issue #3826)
by FeTristan 25 Apr '24

25 Apr '24

Hi, I am trying to learn Kamailio to set up a SIP/RTP proxy for WebRTC with FreeSWITCH, and I wanted to use this configuration file template as a starting point. (Source: https://github.com/havfo/WEBRTC-to-SIP) ``` #!KAMAILIO # #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_TLS #!define WITH_HOMER #!define WITH_WEBSOCKETS #!define WITH_ANTIFLOOD #!define WITH_IPV6 ##!define WITH_BRIDGE_ON_FAIL #!define WITH_LOCALHOST_WS ##!define WITH_LOCALHOST_SIP #!substdef "!MY_SIP_PORT!5060!g" #!substdef "!MY_SIPS_PORT!5061!g" #!substdef "!MY_WS_PORT!8080!g" #!substdef "!MY_WSS_PORT!4443!g" #!substdef "!MY_IP4_ADDR!XXXXX-XXXXX!g" #!substdef "!IP4_LOCALHOST!127.0.0.1!g" #!substdef "!MY_WS4_ADDR!tcp:MY_IP4_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS4_ADDR!tls:MY_IP4_ADDR:MY_WSS_PORT!g" #!substdef "!LOCALHOST_WS4_ADDR!tcp:IP4_LOCALHOST:MY_WS_PORT!g" #!substdef "!LOCALHOST_WSS4_ADDR!tls:IP4_LOCALHOST:MY_WSS_PORT!g" #!ifdef WITH_IPV6 #!substdef "!MY_IP6_ADDR![XXXXXX-XXXXXX]!g" #!substdef "!IP6_LOCALHOST![::1]!g" #!substdef "!MY_WS6_ADDR!tcp:MY_IP6_ADDR:MY_WS_PORT!g" #!substdef "!MY_WSS6_ADDR!tls:MY_IP6_ADDR:MY_WSS_PORT!g" #!substdef "!LOCALHOST_WS6_ADDR!tcp:IP6_LOCALHOST:MY_WS_PORT!g" #!substdef "!LOCALHOST_WSS6_ADDR!tls:IP6_LOCALHOST:MY_WSS_PORT!g" #!endif #!substdef "!MY_DOMAIN!XXXX-XXXX!g" # *** Value defines - IDs used later in config #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!ifndef DBURL #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!endif # - flags # FLT_ - per transaction (message) flags # FLB_ - per branch flags #!define FLT_NATS 5 #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 #!define FLB_RTPWS 8 #!define FLB_IPV6 9 #!define FLB_V4V6 10 #!define FLB_BRIDGE 11 ####### Global Parameters ######### ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=no #!else debug=2 log_stderror=no #!endif memdbg=5 memlog=5 log_facility=LOG_LOCAL0 fork=yes children=4 port=MY_SIP_PORT tls_port_no=MY_SIPS_PORT #!ifdef WITH_TLS enable_tls=yes #!endif listen=MY_IP4_ADDR #!ifdef WITH_LOCALHOST_SIP listen=IP4_LOCALHOST #!endif #!ifdef WITH_IPV6 listen=MY_IP6_ADDR #!ifdef WITH_LOCALHOST_SIP listen=IP6_LOCALHOST #!endif #!endif #!ifdef WITH_WEBSOCKETS listen=MY_WS4_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WS4_ADDR #!endif #!ifdef WITH_IPV6 listen=MY_WS6_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WS6_ADDR #!endif #!endif #!ifdef WITH_TLS listen=MY_WSS4_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WSS4_ADDR #!endif #!ifdef WITH_IPV6 listen=MY_WSS6_ADDR #!ifdef WITH_LOCALHOST_WS listen=LOCALHOST_WSS6_ADDR #!endif #!endif #!endif #!endif use_dns_cache = on # Use KAMAILIO internal DNS cache use_dns_failover = on # Depends on KAMAILIO internal DNS cache dns_srv_loadbalancing = on # dns_try_naptr = on # dns_retr_time=1 # Time in seconds before retrying a DNS request dns_retr_no=3 # Number of DNS retransmissions before giving up # Set protocol preference order - ignore target priority dns_naptr_ignore_rfc= yes # Ignore target NAPTR priority dns_tls_pref=50 # First priority: TLS dns_tcp_pref=30 # Second priority: TCP dns_udp_pref=10 # Third priority: UDP tcp_connection_lifetime=3604 tcp_accept_no_cl=yes tcp_rd_buf_size=16384 # set paths to location of modules (to sources or installation folders) #!ifdef WITH_SRCPATH mpath="modules/" #!else mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" #!endif #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "sdpops.so" loadmodule "textopsx.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_HOMER loadmodule "siptrace.so" #!endif #!ifdef WITH_WEBSOCKETS loadmodule "xhttp.so" loadmodule "websocket.so" loadmodule "nathelper.so" loadmodule "rtpengine.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- rr params ----- # add value to ;lr param to cope with most of the UAs modparam("rr", "enable_full_lr", 1) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) # max value for expires of registrations modparam("registrar", "max_expires", 3600) # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", 1) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif ##!ifdef WITH_NAT # ----- rtpproxy params ----- modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:22222") modparam("rtpengine", "extra_id_pv", "$avp(extra_id)") # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@XXXX-XXXX") modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) ##!endif # ----- corex params ----- modparam("corex", "alias_subdomains", "MY_DOMAIN") #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/etc/kamailio/tls.cfg") modparam("tls", "tls_force_run", 1) #!endif #!ifdef WITH_WEBSOCKETS modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") #!endif #!ifdef WITH_HOMER #Siptrace modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:9060") modparam("siptrace", "hep_mode_on", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "trace_flag", 22) modparam("siptrace", "trace_on", 1) #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) # ----- htable params ----- # ip ban htable with autoexpire after 5 minutes modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) #!endif ####### Routing Logic ######## request_route { #!ifdef WITH_HOMER # start duplicate the SIP message here sip_trace(); setflag(22); #!endif # per request initial checks route(REQINIT); xlog("L_INFO", "START: $rm from $fu (IP:$si:$sp)\n"); #!ifdef WITH_WEBSOCKETS if (nat_uac_test(64)) { # Do NAT traversal stuff for requests from a WebSocket # connection - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the # WebSocket client support Outbound and Path. force_rport(); if (is_method("REGISTER")) { fix_nated_register(); } else if (!add_contact_alias()) { xlog("L_ERR", "Error aliasing contact <$ct>\n"); sl_send_reply("400", "Bad Request"); exit; } } #!endif # NAT detection route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) t_check_trans(); # authentication route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) { record_route(); } # dispatch requests to foreign domains route(SIPOUT); ### requests for my local domains # handle presence related requests route(PRESENCE); # handle registrations route(REGISTRAR); if ($rU == $null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; } # user location service route(LOCATION); } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if (!t_is_set("branch_route")) { t_on_branch("MANAGE_BRANCH"); } } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if (!t_is_set("onreply_route")) { t_on_reply("MANAGE_REPLY"); } } if (is_method("INVITE")) { if (!t_is_set("failure_route")) { t_on_failure("MANAGE_FAILURE"); } } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { #!ifdef WITH_ANTIFLOOD # flood dection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if (src_ip != myself) { if ($sht(ipban=>$si) != $null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if (!sanity_check("1511", "7")) { xlog("Malformed SIP message from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (has_totag()) { # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { #!ifdef WITH_WEBSOCKETS if ($du == "") { if (!handle_ruri_alias()) { xlog("L_ERR", "Bad alias <$ru>\n"); sl_send_reply("400", "Bad Request"); exit; } } #!endif route(DLGURI); if (is_method("ACK")) { # ACK is forwarded statelessy route(NATMANAGE); } else if (is_method("NOTIFY")) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); } else { if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); 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; } } # Handle SIP registrations route[REGISTRAR] { if (is_method("REGISTER")) { if (isflagset(FLT_NATS)) { setbflag(FLB_NATB); # uncomment next line to do SIP NAT pinging ## setbflag(FLB_NATSIPPING); } #!ifdef WITH_IPV6 if (af == INET6) { setbflag(FLB_IPV6); } #!endif if (!save("location")) { sl_reply_error(); } exit; } } # USER location service route[LOCATION] { if (!lookup("location")) { $var(rc) = $rc; t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } route(RELAY); exit; } # Presence server route route[PRESENCE] { if (!is_method("PUBLISH|SUBSCRIBE")) { return; } if (is_method("SUBSCRIBE") && $hdr(Event) == "message-summary") { # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE if (!t_newtran()) { sl_reply_error(); exit; } if (is_method("PUBLISH")) { handle_publish(); t_release(); } else if (is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU == $null) { sl_send_reply("404", "Not here"); exit; } return; } # Authentication route route[AUTH] { #!ifdef WITH_AUTH if (is_method("REGISTER") || from_uri == myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if (!is_method("REGISTER|PUBLISH")) { consume_credentials(); } } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri != myself && uri != myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route route[NATDETECT] { #!ifdef WITH_IPV6 if(af==INET6) { return; } #!endif force_rport(); if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else if (is_first_hop()) { set_contact_alias(); } setflag(FLT_NATS); } return; } # NAT handling route[NATMANAGE] { if (is_request()) { if (has_totag()) { if (check_route_param("nat=yes")) { setbflag(FLB_NATB); } if (check_route_param("rtp=bridge")) { setbflag(FLB_BRIDGE); } if (check_route_param("rtp=ws")) { setbflag(FLB_RTPWS); } #!ifdef WITH_IPV6 if (check_route_param("rtp=v46")) { setbflag(FLB_V4V6); } #!endif } } if (!isbflagset(FLB_BRIDGE)) { return; } if ( !(isflagset(FLT_NATS) || isbflagset(FLB_NATB) || isbflagset(FLB_RTPWS) #!ifdef WITH_IPV6 || isbflagset(FLB_V4V6) #!endif ) ) { return; } $xavp(r=>$T_branch_idx) = "replace-origin replace-session-connection"; if (!nat_uac_test("8")) { $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " trust-address"; } if (is_request()) { if (!has_totag()) { if (!t_is_failure_route()) { $avp(extra_id) = @via[1].branch + $T_branch_idx; $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " via-branch=extra"; } } } if (is_reply()) { $avp(extra_id) = @via[2].branch + $T_branch_idx; $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " via-branch=extra"; } #!ifdef WITH_IPV6 if (af == INET && isbflagset(FLB_IPV6)) { # IPv4 --> IPv6 $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " address-family=IP6"; } else if (af == INET6 && !isbflagset(FLB_IPV6)) { # IPv6 --> IPv4 $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " address-family=IP4"; } #!endif if (isbflagset(FLB_RTPWS)) { if ($proto =~ "ws") { # web --> SIP $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " rtcp-mux-demux DTLS=off SDES-off ICE=remove RTP/AVP"; } else { # SIP --> web $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " rtcp-mux-offer generate-mid DTLS=passive SDES-off ICE=force RTP/SAVPF"; } } else { if ($proto =~ "ws") { # web --> web $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + " generate-mid DTLS=passive SDES-off ICE=force"; } # else { # $xavp(r=>$T_branch_idx) = $xavp(r=>$T_branch_idx) + ""; # } } xlog("L_INFO", "NATMANAGE branch_id:$T_branch_idx ruri: $ru, method:$rm, status:$rs, extra_id: $avp(extra_id), rtpengine_manage: $xavp(r=>$T_branch_idx)\n"); rtpengine_manage($xavp(r=>$T_branch_idx)); if (is_request()) { if (!has_totag()) { if (t_is_branch_route()) { if (isbflagset(FLB_NATB)) { add_rr_param(";nat=yes"); } if (isbflagset(FLB_BRIDGE)) { add_rr_param(";rtp=bridge"); } if (isbflagset(FLB_RTPWS)) { add_rr_param(";rtp=ws"); } #!ifdef WITH_IPV6 if (isbflagset(FLB_V4V6)) { add_rr_param(";rtp=v46"); } #!endif } } } if (is_reply()) { if (isbflagset(FLB_NATB)) { if (is_first_hop()) { if (af == INET) { set_contact_alias(); } } } } return; } # URI update for dialog requests route[DLGURI] { if (!isdsturiset()) { handle_ruri_alias(); } return; } # Routing to foreign domains route[SIPOUT] { if (!uri == myself) { append_hf("P-hint: outbound\r\n"); route(RELAY); } } route[BRIDGING] { if (!has_totag()) { if ($proto =~ "ws" && !($ru =~ "transport=ws")) { # Coming from WS, NOT to WS setbflag(FLB_RTPWS); # Need bridging } else if (!($proto =~ "ws") && $ru =~ "transport=ws") { # Coming from NOT WS, going to WS setbflag(FLB_RTPWS); # Need bridging } #!ifdef WITH_IPV6 if (af == INET6 && !isbflagset(FLB_IPV6)) { setbflag(FLB_V4V6); } else if(af == INET && isbflagset(FLB_IPV6)) { setbflag(FLB_V4V6); } #!endif } } # manage outgoing branches branch_route[MANAGE_BRANCH] { xlog("L_INFO", "MANAGE_BRANCH: New branch [$T_branch_idx] to $ru\n"); t_on_branch_failure("rtpengine"); #!ifndef WITH_BRIDGE_ON_FAIL setbflag(FLB_BRIDGE); #!endif route(BRIDGING); route(NATMANAGE); } # manage incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if (status =~ "[12][0-9][0-9]") { route(NATMANAGE); } } # manage failure routing cases failure_route[MANAGE_FAILURE] { xlog("L_INFO", "Failure: $rs"); } #!ifdef WITH_WEBSOCKETS onreply_route { if ((($Rp == MY_WS_PORT || $Rp == MY_WSS_PORT) && !(proto == WS || proto == WSS))) { xlog("L_WARN", "SIP response received on $Rp\n"); drop; } if (nat_uac_test(64)) { # Do NAT traversal stuff for replies to a WebSocket connection # - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the # WebSocket client support Outbound and Path. add_contact_alias(); } } event_route[tm:branch-failure:rtpengine] { xlog("L_INFO", "BRANCH FAILED: $sel(via[1].branch) + $T_branch_idx"); #!ifdef WITH_BRIDGE_ON_FAIL if (!isbflagset(FLB_BRIDGE) && t_check_status("415|488")) { t_reuse_branch(); setbflag(FLB_BRIDGE); xlog("L_INFO", "event_route[branch-failure:rtpengine]: trying again\n"); route(RELAY); } else { $avp(extra_id) = @via[1].branch + $T_branch_idx; rtpengine_delete("via-branch=extra"); xlog("L_INFO", "event_route[branch-failure:rtpengine]: failed\n"); } #!else $avp(extra_id) = @via[1].branch + $T_branch_idx; rtpengine_delete("via-branch=extra"); #!endif } event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if ($Rp != MY_WS_PORT #!ifdef WITH_TLS && $Rp != MY_WSS_PORT #!endif ) { xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } xlog("L_INFO", "HTTP Request Received\n"); if ($hdr(Upgrade) =~ "websocket" && $hdr(Connection) =~ "Upgrade" && $rm =~ "GET" ) { # Validate Host - make sure the client is using the correct # alias for WebSockets if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } # Optional... validate Origin - make sure the client is from an # authorised website. For example, # # if ($hdr(Origin) != "https://example.com" # && $hdr(Origin) != "https://example.com") { # xlog("L_WARN", "Unauthorised client $hdr(Origin)\n"); # xhttp_reply("403", "Forbidden", "", ""); # exit; # } # Optional... perform HTTP authentication # ws_handle_handshake() exits (no further configuration file # processing of the request) when complete. if (ws_handle_handshake()) { # Optional... cache some information about the # successful connection exit; } } xhttp_reply("404", "Not Found", "", ""); } event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); } #!endif ``` But i have the error : **ERROR: <core> [core/ppcfg.c:275]: pp_ifdef_level_error(): different number of preprocessor directives: 1 more #!if[n]def as #!endif** I don't understand because I checked and everything seems okay with the if/endif statements to me. ``` # grep '#!ifndef' kamailio.cfg | wc -l 2 # grep '#!ifdef' kamailio.cfg | wc -l 49 # grep '#!endif' kamailio.cfg | wc -l 51 ``` And it's ok for chat gpt too : ``` #!ifdef : 49 occurrences #!ifndef : 2 occurrences Total (#!ifdef and #!ifndef) : 51 occurrences #!endif : 51 occurrences ``` Is there a problem with the parser or a compatibility problem (i am on 5.6.3) ? Thank. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3826 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3826(a)github.com>

2 2

git:master:36fc03ea: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: 36fc03eaa49ba8ff02acd451699185ac18d8618e URL: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-25T14:16:08+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… Patch: https://github.com/kamailio/kamailio/commit/36fc03eaa49ba8ff02acd451699185a… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 75f47f5f445..00b6a209c81 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -852,6 +852,7 @@ sht_rm_value_re("ha=>.*"); * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. * ew - match the val parameter as 'ends with'. + * in - match the val parameter as 'includes'. All parameters can be static strings or contain variables. @@ -871,6 +872,7 @@ sht_rm_name("ha", "re", ".*"); * re - match the val parameter as regular expression. * sw - match the val parameter as 'starts with'. * ew - match the val parameter as 'ends with'. + * in - match the val parameter as 'includes'. All parameters can be static strings or contain variables.

1 0

git:5.8:03ff5051: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Apr '24

25 Apr '24

Module: kamailio Branch: 5.8 Commit: 03ff5051b640d2478dd68ea89ad74d516752ab0f URL: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-25T14:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_redis/README Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… Patch: https://github.com/kamailio/kamailio/commit/03ff5051b640d2478dd68ea89ad74d5… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index d2baa50e72d..4cfdcaa5b4f 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -39,7 +39,7 @@ Joel Centelles Martin 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -75,7 +75,7 @@ Chapter 1. Admin Guide 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 5. Usage 6. Module Specific Considerations @@ -203,7 +203,7 @@ allid,time_hires&cid:callid 4.3. verbosity (int) 4.4. opt_tls (int) 4.5. db_pass (string) - 4.6. ac_path (string) + 4.6. ca_path (string) 4.1. schema_path (string) @@ -247,6 +247,12 @@ modparam("db_redis", "verbosity", 0) Controls TLS usage while connecting to a remote DB. If set to 1, TLS is used to connect to the DB. + If TLS is enabled, the module will validate the Redis server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the Redis server must therefore be turned + off. + Default value: 0. Example 1.4. Enabling TLS connection @@ -265,9 +271,10 @@ modparam("db_redis", "opt_tls", 1) modparam("db_redis", "db_pass", "r3d1sPass") ... -4.6. ac_path (string) +4.6. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the Redis server + certificate are stored. Default value: "" (empty). diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1cdfc842db3..90071f5e3f0 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -55,7 +55,7 @@ Joel Centelles Martin 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -103,7 +103,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 4. Functions @@ -149,7 +149,7 @@ Chapter 1. Admin Guide 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) 3.10. debug (integer) - 3.11. ac_path (string) + 3.11. ca_path (string) 3.1. server (str) @@ -168,6 +168,12 @@ Chapter 1. Admin Guide many REDIS servers, just give different attributes and use the specific server name when querying the REDIS instance. + If tls is enabled, the module will validate the REDIS server + certificate against the ca_path. There is currently no way to connect + with a specified client certificate, the corresponding configuration to + check client certificates in the REDIS server must therefore be turned + off. + Default value is NULL. Example 1.1. Set server parameter @@ -346,9 +352,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "debug", 1) ... -3.11. ac_path (string) +3.11. ca_path (string) - Sets the path where Certificates Authorities certs are stored. + Sets the path where Certificates Authorities certs for the REDIS server + certificate are stored. Default value: "" (empty).

1 0

git:master:39a2679f: htable: docs for in operator for remove functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: 39a2679fe165e34a225615ec32c58692fdcaf6a8 URL: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T14:00:40+02:00 htable: docs for in operator for remove functions --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… Patch: https://github.com/kamailio/kamailio/commit/39a2679fe165e34a225615ec32c5869… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index c5cc20e22ed..23a159c6982 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -916,6 +916,11 @@ sht_rm_value_re("ha=>.*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables. @@ -962,6 +967,11 @@ sht_rm_name("ha", "re", ".*"); with'. </para> </listitem> + <listitem> + <para> + <emphasis>in</emphasis> - match the val parameter as 'includes'. + </para> + </listitem> </itemizedlist> <para> All parameters can be static strings or contain variables.

1 0

git:master:c0d80f9e: htable: added in operator for rm functions
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: c0d80f9eb42b025802c4680f19d788d01497301a URL: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:53:31+02:00 htable: added in operator for rm functions --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… Patch: https://github.com/kamailio/kamailio/commit/c0d80f9eb42b025802c4680f19d788d… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index afda3dc6c54..ecc49b547d6 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1389,8 +1389,12 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) == 0) { match = 1; } + } else if(op == HT_RM_OP_IN) { + if(sre->len <= it->name.len + && str_search(&it->name, sre) != NULL) { + match = 1; + } } - } else { if(op == HT_RM_OP_SW) { if(it->flags & AVP_VAL_STR) { @@ -1410,6 +1414,13 @@ int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op) match = 1; } } + } else if(op == HT_RM_OP_IN) { + if(it->flags & AVP_VAL_STR) { + if(sre->len <= it->value.s.len + && str_search(&it->value.s, sre) != NULL) { + match = 1; + } + } } } if(match == 1) { diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 7c7642ef5df..f7bd8ed42c0 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -126,6 +126,8 @@ int ht_reset_content(ht_t *ht); #define HT_RM_OP_SW 3 #define HT_RM_OP_EW 3 #define HT_RM_OP_RE 4 +#define HT_RM_OP_IN 5 + int ht_rm_cell_op(str *sre, ht_t *ht, int mode, int op); int ht_match_cell_op_str(str *sre, ht_t *ht, int mode, int op); diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index 7577e445a76..5388d8e00df 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -40,7 +40,8 @@ typedef enum HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, HT_DMQ_RM_CELL_SW, - HT_DMQ_RM_CELL_EW + HT_DMQ_RM_CELL_EW, + HT_DMQ_RM_CELL_IN } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 6f775bb33ce..414bd5556b1 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -527,6 +527,18 @@ static int ht_rm_items(sip_msg_t *msg, str *hname, str *op, str *val, int mkey) return -1; } return 1; + } else if(strncmp(op->s, "ew", 2) == 0) { + isval.s = *val; + if((ht->dmqreplicate > 0) + && ht_dmq_replicate_action(HT_DMQ_RM_CELL_IN, &ht->name, + NULL, AVP_VAL_STR, &isval, mkey) + != 0) { + LM_ERR("dmq replication failed (op %d)\n", mkey); + } + if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_IN) < 0) { + return -1; + } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:5.8:e76d755d: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: 5.8 Commit: e76d755de6482e51c9ddac5bba3834cb58ad79b2 URL: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:50:44+02:00 tcpops: removed unused variable introduced recently (cherry picked from commit fe8f052c29528b656062927626f9784b32b7c8f6) --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… Patch: https://github.com/kamailio/kamailio/commit/e76d755de6482e51c9ddac5bba3834c… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:fe8f052c: tcpops: removed unused variable introduced recently
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

Module: kamailio Branch: master Commit: fe8f052c29528b656062927626f9784b32b7c8f6 URL: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:49:58+02:00 tcpops: removed unused variable introduced recently --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… Patch: https://github.com/kamailio/kamailio/commit/fe8f052c29528b656062927626f9784… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 9c648c1f2a3..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,7 +248,6 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; - int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 25 Apr '24

25 Apr '24

- URL: https://github.com/kamailio/kamailio/commit/bb48da13adfe36716c3d958ed1d9c41… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:15+02:00 db_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 40a50243f0bae782b7acd97cf0a9b1138185068b) - URL: https://github.com/kamailio/kamailio/commit/f337f13cdbc7e8805c0130dbae3befa… Author: Jannik Volkland <volkland(a)sipgate.de> Date: 2024-04-25T13:31:21+02:00 ndb_redis: docs - refine docs regarding client certificates [skip ci] The created ssl context does not use client certificates [1,2] which is against the default in current Redis configurations [3]. The used Redis server therefore needs to be configured to not use tls-auth-clients [3]. There is also a small typo in "ac_path" which was fixed to "ca_path". [1]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [2]: https://github.com/kamailio/kamailio/blob/8047c958b42ea5af2e8f9ede0152f892a… [3]: https://redis.io/docs/management/security/encryption/#client-certificate-au… (cherry picked from commit 6faa180661e799187eff3a498f8b13e96719fa92) - URL: https://github.com/kamailio/kamailio/commit/855c76780c4399d6d9881ce3c525a7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:31:50+02:00 sdpops: reformat the codecs map (cherry picked from commit 359a442e14a156b0bcf60dc5b2580cbc57924e34) - URL: https://github.com/kamailio/kamailio/commit/7295607e680ad1dd5290b15dab7fed7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:32:18+02:00 core: parser/sdp - rename parameter to suggest better its role (cherry picked from commit b03ec73589c12e566b11ce2c653401daa915c805) - URL: https://github.com/kamailio/kamailio/commit/8d312ded02559b325cdd691bde61c54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:01+02:00 siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri (cherry picked from commit d1118064d04bb77c818540e68edf1766db1d560a) - URL: https://github.com/kamailio/kamailio/commit/800ed174b9402d1b253b2cb4ab04b5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:33:24+02:00 ims_ipsec_pcscf: log error message made info (cherry picked from commit 92d3573b500374d100639484e5a84cb640dc6b1d) - URL: https://github.com/kamailio/kamailio/commit/595d3f472179402dce7a51672c2dbfb… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:34:17+02:00 corex: Fix unknown af in list_sockets (cherry picked from commit 8bc64a9e6820243336387d9cd9acf81f24d89993) - URL: https://github.com/kamailio/kamailio/commit/d2cf78f5c70977639f3b7f66b852350… Author: vijay kumar <vijay.kumar(a)exotel.in> Date: 2024-04-25T13:35:18+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket (cherry picked from commit b4753ae4216b0c960ac094f4be8232fb4d0147b0) - URL: https://github.com/kamailio/kamailio/commit/2661594bf7f31558e6ac7524f33ebb3… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:38+02:00 tcp_main: Add protocol argument for searching tcp/tls connections (cherry picked from commit 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8) - URL: https://github.com/kamailio/kamailio/commit/0c070443b585c597d2d6249ac6ac324… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:45+02:00 tcp_main: Add proto argument to tcpconn_exists function (cherry picked from commit 6779efd430178adff0ae438d178e38c003e4e05c) - URL: https://github.com/kamailio/kamailio/commit/a19e6e0e49d9881ab990d23ad31a957… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:35:57+02:00 tcp_main: Update comment docs (cherry picked from commit 0a28a93c6e060081267dc686e342d45ef03358e7) - URL: https://github.com/kamailio/kamailio/commit/7d103cf3887401fca32d95f7ea7ee10… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:25+02:00 core/forward: Match protocol when forwarding (cherry picked from commit d81e5113884b933251499630d112ec5b1150b8a4) - URL: https://github.com/kamailio/kamailio/commit/3052565e3ce14d5d3c45d790877a562… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-25T13:36:39+02:00 tcp_main: Match wss protocol (cherry picked from commit 175d755c40bc50b78b2cf4f18ad22429289af90d) - URL: https://github.com/kamailio/kamailio/commit/28bbcd5a50f45b8217125481706180a… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-04-25T13:37:16+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. (cherry picked from commit 49276a1f43b1a3bf4a8d681888df964000360c79) - URL: https://github.com/kamailio/kamailio/commit/db2e96ec2aacde1bd50b65ea6357388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:37+02:00 core: tcp - keep connection id on event route cb structure (cherry picked from commit 11e7d71e5c2ee9428298658ed3b9a0f625d40f00) - URL: https://github.com/kamailio/kamailio/commit/c9fe59d6cd73179aa75e21b3b215bc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:46+02:00 tcpops: reworked some debug messages (cherry picked from commit 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81) - URL: https://github.com/kamailio/kamailio/commit/069de99576b5f8bff002176331ed2f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:37:54+02:00 core: tcp - set a global shortcut to tcp connection for event route (cherry picked from commit d114d11724dc4157e7e5809504531d26da6bcc57) - URL: https://github.com/kamailio/kamailio/commit/7e987d8937349246f2abfa041679f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:01+02:00 pv: use global tcp connection callback for event route on $conid (cherry picked from commit f5c05a68ae72881ab0691bb8488112356fc67c79) - URL: https://github.com/kamailio/kamailio/commit/794c2edeaffe059bf8de6ab1d3df5db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:09+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 (cherry picked from commit 66b3c04a9653425b1602c82dd2456a7eb7cf59d1) - URL: https://github.com/kamailio/kamailio/commit/eaacc171adbcd84fb2b95b4c182cd1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:17+02:00 regex: init globals for safer shutdown on failure (cherry picked from commit 84517c14ca38a8371c67b858077a42019c2217a8) - URL: https://github.com/kamailio/kamailio/commit/c8f685359c411ac43000dd77cbc2e4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:24+02:00 regex: allocate pcres array - GH #3812 (cherry picked from commit 2cc62133db4f6875f55e73e044f37dafbb2274c2) - URL: https://github.com/kamailio/kamailio/commit/3ff024fd0057d3a9d045d3f20df5d1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-25T13:38:34+02:00 regex: reformat exported structures (cherry picked from commit 0ebfddd20b43396d602b4c68a88f7c2bc58ed211)

1 0

[kamailio/kamailio] Chaining Transformations {uri.param,received}{uri.host} does not work for IPv6 (Issue #3794)
by ChristianBergerSipgate 25 Apr '24

25 Apr '24

### Description Chaining the transformations {uri.param,received} and {uri.host} does not work if the address is IPv6. It works for IPv4 addresses. #### Reproduction We tested this with the following code: ``` if ($du != $null) { $var(received_uri)=$(du{uri.param,received}); if ($var(received_uri)!="") { $var(subscriber_host)=$(var(received_uri){uri.host}); } $var(test_tmp)=$(du{uri.param,received}{uri.host}); xlog("L_ERR", "WURST subscriber_host=$var(subscriber_host) test_tmp=$var(test_tmp) du=$du received_uri=$var(received_uri)"); } } #### Log Messages For IPv6 this gives us: ``` "module": "pv", "file": "pv_trans.c", "line": 1545, "function": "tr_eval_uri", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": **"invalid uri [ab:cdef:dead:beef]:1234]\n"** "module": "core", "file": "core/lvalue.c", "line": 351, "function": "lval_pvar_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "non existing right pvar\n" "module": "core", "file": "core/lvalue.c", "line": 411, "function": "lval_assign", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "assignment failed at pos: (1432,19-1432,53)\n" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=[2001:db8:0123:4567:89ab:cdef:dead:beef] test_tmp=0 du=sip:1.2.4.129;lr;received=sip[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234 received_uri=sip:[2001:db8:0123:4567:89ab:cdef:dead:beef]:1234" "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "determineSubscribeIpFamily: contacts worked path=0 ip=[2001:db8:0123:4567:89ab:cdef:dead:beef] af=6" ``` For IPv4 it works: `{ "idx": 8, "pid": 577, "level": "ERROR", "module": "xlog", "file": "xlog.c", "line": 278, "function": "", "logprefix": ", "callid": "1-91(a)1.2.4.16", "x-telco-capture-id": "<null>"", "message": "WURST subscriber_host=12.34.56.78 test_tmp=12.34.56.78 du=sip:1.2.4.149;lr;received=sip:12.34.56.78:1234 received_uri=sip:12.34.56.78:1234" } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3794 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3794(a)github.com>

3 3

[kamailio/kamailio] Error by installing new Rel. 5.8 (Issue #3825)
by leila Mohammadinafchi 25 Apr '24

25 Apr '24

I am using this docker file for installaing kamailio. I wana use it with open5gs for trynig VoNR , I used before it for VoLTE it works but right now I have this error in installation process. ![log](https://github.com/kamailio/kamailio/assets/161492387/42017f48-3a7f-4cbe-bdf0-48dbb3443f5f) and there is docker file that Im using: FROM ubuntu:focal ENV DEBIAN_FRONTEND=noninteractive # Install updates and dependencies RUN apt-get update && \ apt-get -y install mysql-server tcpdump screen tmux ntp ntpdate git-core dkms \ gcc flex bison libmysqlclient-dev make libssl-dev libcurl4-openssl-dev \ libxml2-dev libpcre2-dev bash-completion g++ autoconf libmnl-dev \ libsctp-dev libradcli-dev libradcli4 libjson-c-dev pkg-config iproute2 net-tools \ iputils-ping # Fetch Kamailio code (branch 5.3) RUN mkdir -p /usr/local/src/ && cd /usr/local/src/ && \ git clone https://github.com/kamailio/kamailio && \ cd kamailio && git checkout 5.8 # Build and Install Kamailio RUN cd /usr/local/src/kamailio && make cfg COPY modules.lst /usr/local/src/kamailio/src RUN cd /usr/local/src/kamailio && \ make -j`nproc` Q=0 all | tee make_all.txt && \ make install | tee make_install.txt && \ ldconfig COPY kamailio_init.sh / CMD /kamailio_init.sh -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3825 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3825(a)github.com>

2 3

[kamailio/kamailio] ndb_reids module in event_route[tcp:closed] route block error: "no redis context for server" (Issue #3768)
by liangbaolin 25 Apr '24

25 Apr '24

### Description The process of using kamailio prompts the following error： ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN I did not encounter similar errors in version 5.4.8, and there were no similar errors in other routing blocks. Suspect that the new core version has unknown logical issues with the routing block of the module in event_route.  #### Log Messages  ``` 2024-02-26T03:39:11.161557654Z 51(97) DEBUG: <core> [core/tcp_read.c:280]: tcp_read_data(): EOF on connection 0x7f24539006a0 (state: 0, flags: c018) - FD 24, bytes 0, rd-flags 10000 ([12.0.1.6]:22827 -> [12.0.1.6]:5060)51(97) DEBUG: <core> [core/tcp_read.c:343]: tcp_read(): read 0 bytes: 2024-02-26T03:39:11.161563494Z 2024-02-26T03:39:11.161567864Z 51(97) DEBUG: <core> [core/tcp_read.c:1532]: tcp_read_req(): read= 0 bytes, parsed=0, state=0, error=1 2024-02-26T03:39:11.161574144Z 51(97) DEBUG: <core> [core/tcp_read.c:1534]: tcp_read_req(): last char=0x00, parsed msg= 2024-02-26T03:39:11.161579134Z 2024-02-26T03:39:11.161584594Z 51(97) DEBUG: <core> [core/tcp_read.c:1544]: tcp_read_req(): EOF 2024-02-26T03:39:11.161598914Z 51(97) DEBUG: <core> [core/io_wait.h:598]: io_watch_del(): DBG: io_watch_del (0x563e1ce29740, 24, -1, 0x10) fd_no=2 called 2024-02-26T03:39:11.161604494Z 51(97) DEBUG: <core> [core/tcp_read.c:1927]: handle_io(): removing from list 0x7f24539006a0 id 1 fd 24, state 2, flags c018, main fd 132, refcnt 2 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161610294Z 51(97) DEBUG: <core> [core/tcp_read.c:1702]: release_tcpconn(): releasing con 0x7f24539006a0, state -1, fd=24, id=1 ([12.0.1.6]:22827 -> [12.0.1.6]:5060) 2024-02-26T03:39:11.161615934Z 51(97) DEBUG: <core> [core/tcp_read.c:1705]: release_tcpconn(): extra_data (nil) 2024-02-26T03:39:11.162263374Z 83(129) DEBUG: <core> [core/tcp_main.c:3747]: handle_tcp_child(): reader response= 7f24539006a0, -1 from 0 2024-02-26T03:39:11.162286594Z 83(129) DEBUG: <core> [core/tcp_main.c:3671]: tcp_emit_closed_event(): TCP closed event creation triggered (reason: 0) 2024-02-26T03:39:11.162293034Z 83(129) DEBUG: tcpops [tcpops.c:311]: tcpops_handle_tcp_closed(): received TCP closed event 2024-02-26T03:39:11.162299134Z 83(129) DEBUG: tcpops [tcpops.c:261]: tcpops_tcp_closed_run_route(): event reason id: 0 rt: 1 2024-02-26T03:39:11.162304234Z 83(129) ERROR: tcpops [tcpops.c:278]: tcpops_tcp_closed_run_route(): run_top_route() before tev->id: 1 2024-02-26T03:39:11.162311444Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162316784Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162322944Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162328584Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162333764Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162338674Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162343764Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162349254Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162355494Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 101 2024-02-26T03:39:11.162360924Z 83(129) ERROR: <script>: tcp connection closed conid: (1), tcp(conid): 1, Ri: 12.0.1.185, Rp: 5060 , si: 12.0.1.6 , sp: 22827 2024-02-26T03:39:11.162375744Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162381944Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162388024Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162395164Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162400884Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162406634Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162412284Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162417034Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162422294Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 27 2024-02-26T03:39:11.162427844Z 83(129) ERROR: <script>: tcp connection closed (1) 2024-02-26T03:39:11.162433574Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162439254Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162444184Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162449324Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162454724Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 1 2024-02-26T03:39:11.162460094Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162466084Z 83(129) DEBUG: <core> [core/tcp_main.c:1713]: _tcpconn_find(): 1 port 0 2024-02-26T03:39:11.162471724Z 83(129) DEBUG: <core> [core/tcp_main.c:1721]: _tcpconn_find(): c=0x7f24539006a0, c->id=1, port=22827 2024-02-26T03:39:11.162477324Z 83(129) DEBUG: <core> [core/ip_addr.c:577]: print_ip(): ip=12.0.1.6 2024-02-26T03:39:11.162482144Z 83(129) DEBUG: <core> [core/tcp_main.c:1725]: _tcpconn_find(): found connection by id: 1 2024-02-26T03:39:11.162487154Z 83(129) DEBUG: <core> [core/pvapi.c:1418]: pv_printf_mode(): final buffer length 52 2024-02-26T03:39:11.162501164Z 83(129) DEBUG: ndb_redis [redis_client.c:399]: redisc_get_server(): Hash 2100282857 (srvN) 2024-02-26T03:39:11.162508124Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162514104Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162520554Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162526404Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162532034Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162537324Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162542824Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162548064Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162554074Z 83(129) DEBUG: ndb_redis [redis_client.c:402]: redisc_get_server(): Entry 2100306023 (srvTPS), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162559184Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209461 (12.0.1.9:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162564524Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209462 (12.0.1.8:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162569904Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694209448 (12.0.1.7:7469), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162575334Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210133 (12.0.1.9:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162580154Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210134 (12.0.1.8:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162585964Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2694210120 (12.0.1.7:7369), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162592294Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282854 (srvM), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162597644Z 83(129) DEBUG: ndb_redis [redis_client.c:408]: redisc_get_server(): Entry 2100282857 (srvN), rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162611324Z 83(129) DEBUG: ndb_redis [redis_client.c:413]: redisc_get_server(): Using entry 2100282857 (srvN) 2024-02-26T03:39:11.162617084Z 83(129) DEBUG: ndb_redis [redis_client.c:960]: redisc_exec(): rsrv->ctxRedis = (nil) 2024-02-26T03:39:11.162622004Z 83(129) ERROR: ndb_redis [redis_client.c:963]: redisc_exec(): no redis context for server: srvN 2024-02-26T03:39:11.162627834Z 83(129) ERROR: tcpops [tcpops.c:280]: tcpops_tcp_closed_run_route(): run_top_route() after tev->id: 1 2024-02-26T03:39:11.162633294Z 83(129) DEBUG: <core> [core/tcp_main.c:3904]: handle_tcp_child(): case CONN_EOF tcp_emit_closed_event before 5 ``` #### SIP Traffic  ``` event_route[tcp:closed] { xlog("L_ERR", "$proto connection closed conid: ($conid), tcp(conid): $tcp(conid), Ri: $Ri, Rp: $Rp , si: $si , sp: $sp\n"); if($conid ne $null) { xlog("L_ERR", "$proto connection closed ($conid)\n"); route(TCPEVENT); } } route[TCPEVENT] { if(redis_cmd("srvN", "get %s", "$conid", "r")) { ..... } } #redis module config loadmodule "ndb_redis" modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) modparam("ndb_redis", "server", "name=srvN;addr=NDB_N_REDIS_CLUSTER_MAINADDR;port=NDB_N_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=srvM;addr=NDB_M_REDIS_CLUSTER_MAINADDR;port=NDB_M_REDIS_CLUSTER_MAINPORT;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7369;addr=12.0.1.7;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7369;addr=12.0.1.8;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7369;addr=12.0.1.9;port=7369;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.7:7469;addr=12.0.1.7;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.8:7469;addr=12.0.1.8;port=7469;pass=NDB_REDIS_PASSWORD") modparam("ndb_redis", "server", "name=12.0.1.9:7469;addr=12.0.1.9;port=7469;pass=NDB_REDIS_PASSWORD") ``` * **Operating System**:  ``` version: kamailio 5.7.4 (x86_64/linux) 9920d9-dirty flags: , EXTRA_DEBUGUSE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9920d9 -dirty compiled on 09:59:52 Feb 26 2024 with gcc 7.5.0 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3768 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3768(a)github.com>

3 10

git:master:0ebfddd2: regex: reformat exported structures
by Daniel-Constantin Mierla 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 0ebfddd20b43396d602b4c68a88f7c2bc58ed211 URL: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-24T21:34:28+02:00 regex: reformat exported structures --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… Patch: https://github.com/kamailio/kamailio/commit/0ebfddd20b43396d602b4c68a88f7c2… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 4bb4d7cdcee..292af692136 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -113,48 +113,54 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); /* * Exported functions */ +/* clang-format off */ static cmd_export_t cmds[] = { - {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, + fixup_spve_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE + | LOCAL_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Exported parameters */ -static param_export_t params[] = {{"file", PARAM_STRING, &file}, - {"max_groups", INT_PARAM, &max_groups}, - {"group_max_size", INT_PARAM, &group_max_size}, - {"pcre_caseless", INT_PARAM, &pcre_caseless}, - {"pcre_multiline", INT_PARAM, &pcre_multiline}, - {"pcre_dotall", INT_PARAM, &pcre_dotall}, - {"pcre_extended", INT_PARAM, &pcre_extended}, {0, 0, 0}}; +static param_export_t params[] = { + {"file", PARAM_STRING, &file}, + {"max_groups", INT_PARAM, &max_groups}, + {"group_max_size", INT_PARAM, &group_max_size}, + {"pcre_caseless", INT_PARAM, &pcre_caseless}, + {"pcre_multiline", INT_PARAM, &pcre_multiline}, + {"pcre_dotall", INT_PARAM, &pcre_dotall}, + {"pcre_extended", INT_PARAM, &pcre_extended}, + {0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "regex", /*!< module name */ - DEFAULT_DLFLAGS, /*!< dlopen flags */ - cmds, /*!< exported functions */ - params, /*!< exported parameters */ - 0, /*!< exported RPC functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response handling function */ - mod_init, /*!< module initialization function */ - 0, /*!< per-child init function */ - destroy /*!< destroy function */ + "regex", /*!< module name */ + DEFAULT_DLFLAGS, /*!< dlopen flags */ + cmds, /*!< exported functions */ + params, /*!< exported parameters */ + 0, /*!< exported RPC functions */ + 0, /*!< exported pseudo-variables */ + 0, /*!< response handling function */ + mod_init, /*!< module initialization function */ + 0, /*!< per-child init function */ + destroy /*!< destroy function */ }; +/* clang-format on */ static void *pcre2_malloc(size_t size, void *ext)

1 0

[kamailio/kamailio] ERROR cfgtrace:dbg_cfg_trace() (Issue #3821)
by happytulubi 24 Apr '24

24 Apr '24

May I ask what the problem is? It prompts an error but does not affect the program's operation. Is it that the configuration file and the deployed version are inconsistent? 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=706 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) INFO: <script>: Call from Websocket endpoint at the DURI {sip:117.80.229.36:15060} for callee {3008} 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=691 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=685 a=25 n=has_body Here is the code for my kamailio.cfg section branch_route[MANAGE_BRANCH]{ xlog("L_INFO","Call to ru:{$ru} '$du'/'$proto'\n"); if(($du=~"transport=ws") || ($du=~"transport=wss")){ if ($du=~"transport=tls") { #sdp_remove_media("video"); xlog("L_INFO","Call to TLS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=6:$ci force trust-address replace-origin replace-session-connection UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_TLS"); $fs="tls:MY_IP_ADDR:MY_WSS_PORT"; } else if ($du=~"transport=ws") { xlog("L_INFO","Call to Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_WS"); $du = $du + ";transport=ws"; $fs="tcp:MY_IP_ADDR:MY_WS_PORT"; } }else { if ($proto=~ "tls") { #sdp_remove_media("video"); xlog("L_INFO","Call from WSS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=8:$ci trust-address replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_TLS"); } else if ($proto =~ "ws"){ xlog("L_INFO","Call from Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_WS"); } if (($proto=~ "udp") || ($proto=~"tcp")) { #sdp_remove_media("video"); xlog("L_INFO","UDP Branch is {$du} for {$tU}\n"); # $avp(mediaAddr) = ''; if ( has_body('application/sdp')) { #rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection"); } t_on_reply("STANDART"); } } xlog("L_INFO", "t_on_reply set\n"); if is_method("BYE|CANCEL") { rtpengine_manage(); } } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3821 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3821(a)github.com>

2 2

[kamailio/kamailio] tools/kemi: escape docstrings when required (PR #3824)
by tsearle 24 Apr '24

24 Apr '24

some of the documentation contains \ which need escaping   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3824 -- Commit Summary -- * tools/kemi: escape docstrings when required -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3824.patch https://github.com/kamailio/kamailio/pull/3824.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3824 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3824(a)github.com>

1 1

git:master:999d0c65: tools/kemi: escape docstrings when required (#3824)
by GitHub 24 Apr '24

24 Apr '24

Module: kamailio Branch: master Commit: 999d0c65402c99491683d694d77a01a5c1f91ecf URL: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-24T11:28:49+02:00 tools/kemi: escape docstrings when required (#3824) some of the documentation contains \ which need escaping --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Patch: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 145fcb34b3a..918551a1887 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -129,7 +129,7 @@ def generate_function_doc(module_name, func, prefix): print(prefix + "\t\"\"\"") documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") for line in documentation_lines: - print(prefix + "\t" + line) + print(prefix + "\t" + line.replace("\\", "\\\\\\\\")) print(prefix + "\t\"\"\"") break

1 0

git:master:2cc62133: regex: allocate pcres array
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 2cc62133db4f6875f55e73e044f37dafbb2274c2 URL: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T12:08:30+02:00 regex: allocate pcres array - GH #3812 --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Patch: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 8e8c1645f0e..4bb4d7cdcee 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -462,6 +462,15 @@ static int load_pcres(int action) } shm_free(pcres); } + + if(pcres == NULL) { + if((pcres = shm_malloc(sizeof(pcre2_code *) * num_pcres_tmp)) == 0) { + LM_ERR("no more memory for pcres\n"); + goto err; + } + memset(pcres, 0, sizeof(pcre2_code *) * num_pcres_tmp); + } + *num_pcres = num_pcres_tmp; *pcres = *pcres_tmp; *pcres_addr = pcres;

1 0

git:master:84517c14: regex: init globals for safer shutdown on failure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 84517c14ca38a8371c67b858077a42019c2217a8 URL: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:49:23+02:00 regex: init globals for safer shutdown on failure --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Patch: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e7aaada852d..8e8c1645f0e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -68,7 +68,7 @@ gen_lock_t *reload_lock; /* * Module exported parameter variables */ -static char *file; +static char *file = NULL; static int max_groups = MAX_GROUPS; static int group_max_size = GROUP_MAX_SIZE; static int pcre_caseless = 0; @@ -83,9 +83,9 @@ static int pcre_extended = 0; static pcre2_general_context *pcres_gctx = NULL; static pcre2_match_context *pcres_mctx = NULL; static pcre2_compile_context *pcres_ctx = NULL; -static pcre2_code **pcres; -static pcre2_code ***pcres_addr; -static int *num_pcres; +static pcre2_code **pcres = NULL; +static pcre2_code ***pcres_addr = NULL; +static int *num_pcres = NULL; static int pcre_options = 0x00000000;

1 0

[kamailio/kamailio] TSILO: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) (Issue #3782)
by vteliatnykov 23 Apr '24

23 Apr '24

After the transaction was suspended, 1st user registered, got INVITE message, there is 2nd user wakes up and send REGISTER. Kamailio check if transaction suspended (for 2nd user, it is not suspended anymore), and checks if there is stored transaction. So, for 2nd user we have stored transaction, then it should append new branch. ts_append failed. if ($var(suspended) == 0) { if ($var(stored)) { # no suspended INVITE (i.e. there was at least one # registered contact for target) and 'stored' set # (i.e. ongoing transaction) -> this newly just # registered contact needs alerting. ts_append("location", "sip:$avp(extension)@LOCALVIRTUALIP"); xinfo("appending branches for sip:$avp(extension)@LOCALVIRTUALIP, result $rc"); } else { xinfo("no suspended transactions for $tu"); } return; } Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1339] <script>: -----------122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1348] <script>: var(suspended)=0, tsilo=>suspended::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1349] <script>: var(stored)=1, tsilo=>stored::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: ERROR: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1357] tsilo [ts_append.c:152]: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1359] <script>: appending branches for sip:1000@10.160.201.190, result 1 At this moment we have active transaction `{ cell: 0x7f313d43cda8 tindex: 11743 tlabel: 1310842517 method: INVITE from: From: "9988" <sip:9988@10.156.0.6>;tag=as081c0936 to: To: <sip:1000@10.160.201.190:5070> callid: Call-ID: 66d9dace125df36915783fb379f4e3dd@10.156.0.6:5060 cseq: CSeq: 102 uas_request: yes tflags: 69 outgoings: 3 ref_count: 1 lifetime: 5402832 } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3782 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3782(a)github.com>

2 3

[kamailio/kamailio] Misleading source IP of 1.0.0.127 in event routes (Issue #3817)
by Jukka Väisänen 23 Apr '24

23 Apr '24

### Description Event routes that are executed without a real SIP message available use the default "fake SIP message". The fake message has a source IPv4 address of 1.0.0.127 which belongs to CloudFlare (1.0.0.0/24).. and this led us to believe that traffic is coming from CF but could not find the messages on tcpdumps or HEP exports. Had a bit of a wild goose chase there trying to find the source. I believe the original intention has been to use 127.0.0.1 loopback address but the bytes are reversed at: https://github.com/kamailio/kamailio/blob/master/src/core/fmsg.c#L78 It would be best to change this address to well ANYTHING that doesn't imply CloudFlare is pinging you 😂 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3817 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3817(a)github.com>

3 4

git:master:66b3c04a: core: fmsg - parse loopback ip when initializing faked msg structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 66b3c04a9653425b1602c82dd2456a7eb7cf59d1 URL: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:19:30+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Patch: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 7a4f9ba87e5..b30ca9f69cf 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -25,6 +25,7 @@ #include "dprint.h" #include "globals.h" #include "dset.h" +#include "resolve.h" #include "fmsg.h" @@ -57,6 +58,8 @@ static void faked_msg_buf_init(void) static int faked_msg_init_new(sip_msg_t *fmsg) { + str loip = str_init("127.0.0.1"); + faked_msg_buf_init(); /* init faked sip msg */ @@ -75,13 +78,9 @@ static int faked_msg_init_new(sip_msg_t *fmsg) fmsg->rcv.proto = PROTO_UDP; fmsg->rcv.src_port = 5060; - fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.src_ip.af = AF_INET; - fmsg->rcv.src_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.src_ip); fmsg->rcv.dst_port = 5060; - fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.dst_ip.af = AF_INET; - fmsg->rcv.dst_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.dst_ip); return 0; }

1 0

git:master:f5c05a68: pv: use global tcp connection callback for event route on $conid
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: f5c05a68ae72881ab0691bb8488112356fc67c79 URL: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:42:02+02:00 pv: use global tcp connection callback for event route on $conid --- Modified: src/modules/pv/pv_core.c Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Patch: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 40557ba4628..b10b7513a6f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2927,6 +2927,13 @@ int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(msg == NULL) return -1; + /* use first the connection set for event_route[tcp:...] */ + con = ksr_tcpcon_evcb_get(); + if(con != NULL) { + return pv_get_sintval(msg, param, res, con->id); + } + + /* find connection from sip message structure */ if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) return pv_get_null(msg, param, res); diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 97068c627bb..9c648c1f2a3 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,6 +248,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; + int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:d114d117: core: tcp - set a global shortcut to tcp connection for event route
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: d114d11724dc4157e7e5809504531d26da6bcc57 URL: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:36:35+02:00 core: tcp - set a global shortcut to tcp connection for event route --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Patch: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 5b579b2ffb9..57dff5a291b 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -434,4 +434,6 @@ typedef struct ws_event_info int id; } ws_event_info_t; +tcp_connection_t *ksr_tcpcon_evcb_get(void); + #endif diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 957a9b97c0f..2456459cfa2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3670,6 +3670,12 @@ int _tcpconn_write_nb( return n; } +static tcp_connection_t *_ksr_tcpcon_evcb = NULL; + +tcp_connection_t *ksr_tcpcon_evcb_get(void) +{ + return _ksr_tcpcon_evcb; +} static int tcp_emit_closed_event(struct tcp_connection *con) { @@ -3692,7 +3698,9 @@ static int tcp_emit_closed_event(struct tcp_connection *con) tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); + _ksr_tcpcon_evcb = con; ret = sr_event_exec(SREV_TCP_CLOSED, &evp); + _ksr_tcpcon_evcb = NULL; } else { LM_DBG("no callback registering for handling TCP closed event\n"); }

1 0

git:master:27e3b7f3: tcpops: reworked some debug messages
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81 URL: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:21:20+02:00 tcpops: reworked some debug messages --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Patch: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 2b767a9470e..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -249,6 +249,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sr_kemi_eng_t *keng = NULL; str *evname; + LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) { rt = -1; keng = sr_kemi_eng_get(); @@ -258,9 +259,10 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) } } else { rt = tcp_closed_routes[tev->reason]; - LM_DBG("event reason id: %d rt: %d\n", tev->reason, rt); - if(rt == -1) + if(rt == -1) { + LM_DBG("event reason id: %d - event route not set\n", tev->reason); return; + } } if(faked_msg_init() < 0) {

1 0

git:master:11e7d71e: core: tcp - keep connection id on event route cb structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 11e7d71e5c2ee9428298658ed3b9a0f625d40f00 URL: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:19:29+02:00 core: tcp - keep connection id on event route cb structure --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Patch: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 13301563945..5b579b2ffb9 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -422,6 +422,7 @@ typedef struct tcp_event_info typedef struct tcp_closed_event_info { enum tcp_closed_reason reason; + int id; struct tcp_connection *con; } tcp_closed_event_info_t; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b71e7ad37f2..957a9b97c0f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3689,6 +3689,7 @@ static int tcp_emit_closed_event(struct tcp_connection *con) if(likely(sr_event_enabled(SREV_TCP_CLOSED))) { memset(&tev, 0, sizeof(tcp_closed_event_info_t)); tev.reason = reason; + tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); ret = sr_event_exec(SREV_TCP_CLOSED, &evp);

1 0

git:master:6e6b4f06: xhttp_prom: use %lu for printing pkg fields
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6e6b4f06546a0d9ad942847ee745b17a5aeb7f6a URL: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:54:26+02:00 xhttp_prom: use %lu for printing pkg fields --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Patch: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index efe111b752a..71accf21845 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -253,7 +253,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " - "%d %" PRIu64 "\n", + "%lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) @@ -263,7 +263,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) @@ -273,7 +273,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) @@ -283,7 +283,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) @@ -293,7 +293,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts)

1 0

git:master:b96de87a: ipops: define hostname size for ptr structure
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: b96de87ae94db2285d7a5f022c38a746d69ae5ef URL: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:43:40+02:00 ipops: define hostname size for ptr structure - replace the strncpy with strlen with straight strcpy --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Patch: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 034ec696594..acbe08a4283 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -429,7 +429,7 @@ int ptr_update_pv(str *ip_address, str *name) sr_dns_item_t *dr = NULL; struct sockaddr_in sa; struct sockaddr_in6 sa6; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int result; int ip_type; if(ip_address->len > INET6_ADDRSTRLEN) { @@ -499,8 +499,7 @@ int ptr_update_pv(str *ip_address, str *name) } /* Store the hostname in the sr_dns_item_t structure. */ - strncpy(dr->hostname, hostname, strlen(hostname)); - dr->hostname[strlen(hostname)] = '\0'; + strcpy(dr->hostname, hostname); dr->count = 1; LM_DBG("reverse dns PV updated for: %s (%d)\n", dr->r[0].addr, dr->count); diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 5e9a19be1da..cede3b4217c 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -27,7 +27,7 @@ #define PV_DNS_ADDR 64 #define PV_DNS_RECS 32 #define SR_DNS_PVIDX 1 - +#define SR_DNS_HOSTNAME_SIZE 256 typedef struct _sr_dns_record { int type; @@ -38,7 +38,7 @@ typedef struct _sr_dns_item { str name; unsigned int hashid; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int count; int ipv4; int ipv6;

1 0

[kamailio/kamailio] tools/kemi: add dockstrings to the mocking (PR #3818)
by tsearle 22 Apr '24

22 Apr '24

kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3818 -- Commit Summary -- * tools/kemi: add dockstrings to the mocking -- File Changes -- M misc/tools/kemi/python_mock/README.md (15) M misc/tools/kemi/python_mock/kemi_mock.py (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3818.patch https://github.com/kamailio/kamailio/pull/3818.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3818 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3818(a)github.com>

1 1

git:master:6b29df73: tools/kemi: add dockstrings to the mocking (#3818)
by GitHub 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6b29df73115682424daf7b276d0138f004e274f7 URL: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-22T12:53:48+02:00 tools/kemi: add dockstrings to the mocking (#3818) kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project --- Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Patch: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… --- diff --git a/misc/tools/kemi/python_mock/README.md b/misc/tools/kemi/python_mock/README.md index 5e72e738c58..385cbd5656a 100644 --- a/misc/tools/kemi/python_mock/README.md +++ b/misc/tools/kemi/python_mock/README.md @@ -2,7 +2,7 @@ Generate a mocking framework base on the output of app_python.api_list -Usage: +### Usage: ``` /usr/sbin/kamctl rpc app_python.api_list > api.json ./kemi_mock.py api.json > KSR.py @@ -15,6 +15,19 @@ the Union type add the --no-union flag ./kemi_mock.py api.json --no-union > KSR.py ``` +### Usage with Documentation: +run the generate.py from the following project + +https://github.com/braams/vscode-kamailio-hover + +this creates a modules.json file in a tmp directory. This file can be used to generate the KSR.py file with documentation + +pass the modules.json as a 2nd parameter to kemi_mock.py +``` +./kemi_mock.py api.json modules.json > KSR.py +``` + +## Mocking Return values can be injected through the dictionary \_mock\_data ```python diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 48a73efa232..145fcb34b3a 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -113,21 +113,41 @@ def printFunction(module_name, func, indent): else: print(prefix + "def " + func['name'] +"("+params+"):") + generate_function_doc(module_name, func, prefix) + print(prefix + "\tprint(\"Calling " + log_format_params + "\" % "+log_params+")") printMocReturn(module_name, func, indent+1) print("") +def generate_function_doc(module_name, func, prefix): + if documentation is not None and module_name in documentation: + function_parts = func['name'].split("_") + for i in range(len(function_parts), 0, -1): + function_prefix = "_".join(function_parts[:i]) + if function_prefix in documentation[module_name]["functions"]: + print(prefix + "\t\"\"\"") + documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") + for line in documentation_lines: + print(prefix + "\t" + line) + print(prefix + "\t\"\"\"") + break + + classes = defaultdict(list) if len(sys.argv) < 2: print("Please specify the json file to parse") sys.exit(-1) +documentation = None if len(sys.argv) > 2: for i in range(2,len(sys.argv)): if sys.argv[i] == "--no-union": noUnion = True + else: + with open(sys.argv[i]) as f: + documentation = json.load(f) if not noUnion: print("from typing import Union") @@ -193,12 +213,23 @@ def printFunction(module_name, func, indent): print("") printFunction('', func, 0) + +def document_module(module_name): + if documentation is not None and module_name in documentation: + print("\"\"\"") + documentation_lines = documentation[module_name]["overview"].split("\n") + for line in documentation_lines: + print("" + line) + print("\"\"\"") + + for module_name in classes.keys(): if module_name != "": if module_name in reserved_keywords: print("setattr(sys.modules[__name__], '" + module_name + "', " + module_name.capitalize() + "())") else: print(module_name + " = "+module_name.capitalize()+"()") + document_module(module_name) print("")

1 0

[kamailio/kamailio] usrloc: check on db delete the return value of memchr (PR #3815)
by Rick Barenthin 20 Apr '24

20 Apr '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] 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  When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3815 -- Commit Summary -- * usrloc: check on db delete the return value of memchr -- File Changes -- M src/modules/usrloc/urecord.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3815.patch https://github.com/kamailio/kamailio/pull/3815.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3815 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3815(a)github.com>

3 5

git:master:49276a1f: usrloc: check on db delete the return value of memchr
by Henning Westerholt 20 Apr '24

20 Apr '24

Module: kamailio Branch: master Commit: 49276a1f43b1a3bf4a8d681888df964000360c79 URL: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-20T06:35:51+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. --- Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Patch: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… --- diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index e027affc8aa..3c394a24a10 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -491,13 +491,17 @@ int db_delete_urecord(urecord_t *_r) vals[0].val.str_val.len = _r->aor.len; if(ul_use_domain) { - dom = memchr(_r->aor.s, '@', _r->aor.len); - vals[0].val.str_val.len = dom - _r->aor.s; - vals[1].type = DB1_STR; vals[1].nul = 0; - vals[1].val.str_val.s = dom + 1; - vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + dom = memchr(_r->aor.s, '@', _r->aor.len); + if(dom == 0) { + vals[0].val.str_val.len = 0; + vals[1].val.str_val = _r->aor; + } else { + vals[0].val.str_val.len = dom - _r->aor.s; + vals[1].val.str_val.s = dom + 1; + vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + } } if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {

1 0

[kamailio/kamailio] Core parameters user_agent_header fail to take effect (Issue #3816)
by suiyuemanbu 19 Apr '24

19 Apr '24

I want kamailio use User-Agent header, not Server head My setup is as follows: kamailio.cfg server_signature=no user_agent_header="User-Agent: carrierroute-kam" the result is : SIP/2.0 100 trying -- your call is important to us Via: SIP/2.0/UDP xxx From: xxxxxxtag=N856ZmNXa4S6D To: xxx Call-ID: 5ab0 CSeq: 82194 INVITE Content-Length: 0 **not have User-Agent header** please help me,How to make it appear the User-Agent field? thank you version: kamailio 5.7.0 (x86_64/linux) f1e91d -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3816 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3816(a)github.com>

2 2

git:master:d4c23324: cfgutils: initialize the optional key
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: d4c23324a84d9727653e0b67c4455f9cf6be3d0c URL: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T16:12:33+02:00 cfgutils: initialize the optional key * bug introduced at 424769743c93dea5a4d2c21f7a0ef8ea8779a5bb --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Patch: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index f7aea690e88..487f68aaab0 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -691,7 +691,7 @@ static int cfg_lock_helper(str *lkey, str *lkey2, int mode) unsigned int pos; str *key2 = NULL; - if(lkey2 && lkey2->len > 0) { + if(lkey2 && lkey2->s && lkey2->len > 0) { key2 = lkey2; } @@ -770,7 +770,8 @@ static int cfg_trylock_key2(sip_msg_t *msg, str *lkey, str *lkey2) static int w_cfg_lock_wrapper( struct sip_msg *msg, gparam_p key, gparam_p key2, int mode) { - str s1, s2; + str s1; + str s2 = STR_NULL; if(key == NULL) { return -1; }

1 0

git:master:38226473: cfgutils: reformat exported structures
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: 382264730393afac09a319df46044c6ac0753ea7 URL: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T14:25:45+02:00 cfgutils: reformat exported structures --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Patch: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6…

1 0

git:master:175d755c: tcp_main: Match wss protocol
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 175d755c40bc50b78b2cf4f18ad22429289af90d URL: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Match wss protocol --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Patch: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e3323736cc0..b71e7ad37f2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5435,7 +5435,7 @@ int wss_send(dest_info_t *dst, const char *buf, unsigned len) if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:d81e5113: core/forward: Match protocol when forwarding
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: d81e5113884b933251499630d112ec5b1150b8a4 URL: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 core/forward: Match protocol when forwarding --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Patch: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… --- diff --git a/src/core/forward.h b/src/core/forward.h index 46bd3a36171..7b51e1a5559 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -189,7 +189,7 @@ static inline int msg_send_buffer( if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:0a28a93c: tcp_main: Update comment docs
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 0a28a93c6e060081267dc686e342d45ef03358e7 URL: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Update comment docs --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Patch: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 0ea1b541ea6..e3323736cc0 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1697,8 +1697,8 @@ void tcpconn_rm(struct tcp_connection *c) /* finds a connection, if id=0 uses the ip addr, port, local_ip and local port * (host byte order) and tries to find the connection that matches all of - * them. Wild cards can be used for local_ip and local_port (a 0 filled - * ip address and/or a 0 local port). + * them. Wild cards can be used for local_ip, local_port and proto (a 0 filled + * ip address and/or a 0 local port and/or PROTO_NONE). * WARNING: unprotected (locks) use tcpconn_get unless you really * know what you are doing */ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, @@ -1754,7 +1754,7 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, /** - * find if a tcp connection exits by id or remote+local address/port + * find if a tcp connection exits by id or remote+local address/port and protocol * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, @@ -1774,6 +1774,7 @@ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, /* TCP connection find with locks and timeout * - local_addr contains the desired local ip:port. If null any local address * will be used. IN*ADDR_ANY or 0 port are wild cards. + * - proto is the protocol to match (PROTO_NONE for any) * - try_local_port makes the search use it first, instead of port from local_addr * If found, the connection's reference counter will be incremented, you might * want to decrement it after use.

1 0

git:master:6779efd4: tcp_main: Add proto argument to tcpconn_exists function
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 6779efd430178adff0ae438d178e38c003e4e05c URL: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add proto argument to tcpconn_exists function --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Patch: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 73e2ef6163d..0ea1b541ea6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1758,13 +1758,12 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, - ip_addr_t *local_ip, int local_port) + ip_addr_t *local_ip, int local_port, sip_protos_t proto) { tcp_connection_t *c; TCPCONN_LOCK; - c = _tcpconn_find( - conn_id, peer_ip, peer_port, local_ip, local_port, PROTO_NONE); + c = _tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port, proto); TCPCONN_UNLOCK; if(c) { return 1; @@ -4497,7 +4496,8 @@ static inline int handle_new_connect(struct socket_info *si) if(likely(tcpconn)) { if(tcp_accept_unique) { if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, - &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port, + si->proto)) { LM_ERR("duplicated connection by local and remote addresses\n"); _tcpconn_free(tcpconn); tcp_safe_close(new_sock);

1 0

git:master:4a40b16d: tcp_main: Add protocol argument for searching tcp/tls connections
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8 URL: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add protocol argument for searching tcp/tls connections --- Modified: src/core/forward.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Patch: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e…

1 0

[kamailio/kamailio] tcp/docs: Added tcp_accept_iplimit config sample (PR #3792)
by Arnis Voitkāns 16 Apr '24

16 Apr '24

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description We noticed that configuration option tcp_accept_iplimit was included in newer kamailio versions (most notably 5.7.4), and it was a breaking change for us. Added sample configuration value in /etc/kamailio.cfg file - already tested in our production deployment. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3792 -- Commit Summary -- * tcp/docs: Added tcp_accept_iplimit config sample -- File Changes -- M etc/kamailio.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3792.patch https://github.com/kamailio/kamailio/pull/3792.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3792 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3792(a)github.com>

3 5

git:master:30a0fe2e: etc/kamailio.cfg: added tcp_accept_iplimit config sample
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 30a0fe2ea4b1b59bb8e552f9abd3a65e1c7226ec URL: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Author: Arnis Voitkans <a.voitkans(a)dynatech.lv> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T12:40:09Z etc/kamailio.cfg: added tcp_accept_iplimit config sample --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Patch: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..cd2ecd0109f 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -211,6 +211,9 @@ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 +/* upper limit for TCP connections for one ip address - default 1024 */ +#tcp_accept_iplimit=1024 + #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif

1 0

[kamailio/kamailio] rtpengine: fix pkg mem leak in send_rtpp_command() (PR #3813)
by vijaykumar-exotel 16 Apr '24

16 Apr '24

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

2 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev