sr-dev March 2023

sr-dev@lists.kamailio.org

14 participants
251 discussions

git:master:fcf733ce: db_flatstore: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: fcf733ce205221a40f68414662f841b918dea48f URL: https://github.com/kamailio/kamailio/commit/fcf733ce205221a40f68414662f841b… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T10:19:30Z db_flatstore: convert to memory logging helper --- Modified: src/modules/db_flatstore/db_flatstore.c Modified: src/modules/db_flatstore/flat_cmd.c Modified: src/modules/db_flatstore/flat_con.c Modified: src/modules/db_flatstore/km_flat_con.c Modified: src/modules/db_flatstore/km_flat_id.c Modified: src/modules/db_flatstore/km_flatstore.c Modified: src/modules/db_flatstore/km_flatstore_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcf733ce205221a40f68414662f841b… Patch: https://github.com/kamailio/kamailio/commit/fcf733ce205221a40f68414662f841b…

1 0

git:master:d45eb770: auth_xkeys: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: d45eb770b0a8e17533f12e16dfc1d23dc5e7d951 URL: https://github.com/kamailio/kamailio/commit/d45eb770b0a8e17533f12e16dfc1d23… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T10:14:39Z auth_xkeys: convert to memory logging helper --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/d45eb770b0a8e17533f12e16dfc1d23… Patch: https://github.com/kamailio/kamailio/commit/d45eb770b0a8e17533f12e16dfc1d23… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index 6963d4e3132..3f02f0d9bce 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -61,7 +61,7 @@ int auth_xkeys_list_init(void) return 0; _auth_xkeys_list = shm_malloc(sizeof(auth_xkey_t*)); if(_auth_xkeys_list==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(_auth_xkeys_list, 0, sizeof(auth_xkey_t*)); @@ -88,7 +88,7 @@ int authx_xkey_insert(auth_xkey_t *nkey) + nkey->kvalue.len + 3; ukey = (auth_xkey_t*)shm_malloc(ksize); if(ukey==NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(ukey, 0, ksize); @@ -269,7 +269,7 @@ int auth_xkeys_add(sip_msg_t* msg, str *hdr, str *key, } p = (char*)pkg_malloc(xdata.len+1); if(p==NULL) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -2; } memcpy(p, xdata.s, xdata.len);

1 0

git:master:01e82b38: auth_db: fix goto for memory allocation error, convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 01e82b38c41d344c1e94b2e0f574981ef0ce4318 URL: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T10:07:02Z auth_db: fix goto for memory allocation error, convert to memory logging helper --- Modified: src/modules/auth_db/auth_db_mod.c Modified: src/modules/auth_db/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… Patch: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index ce8baae8381..5d54bdf4bd4 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -359,7 +359,7 @@ int parse_aaa_pvs(char *definition, pv_elem_t **pv_def, int *cnt) while ( (end=strchr(p,';'))!=0 || (end=p+strlen(p))!=p ) { /* new pv_elem_t */ if ( (pve=(pv_elem_t*)pkg_malloc(sizeof(pv_elem_t)))==0 ) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; goto error; } memset( pve, 0, sizeof(pv_elem_t)); @@ -394,8 +394,8 @@ int parse_aaa_pvs(char *definition, pv_elem_t **pv_def, int *cnt) /* create an avp definition for the spec parser */ pv.s = (char*)pkg_malloc(pve->text.len + 7); if (pv.s == NULL) { - LM_ERR("no more pkg mem\n"); - goto parse_error; + PKG_MEM_ERROR; + goto error; } pv.len = snprintf(pv.s, pve->text.len + 7, "$avp(%.*s)", pve->text.len, pve->text.s); diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index 4f8d9674549..dfaf8f92bbf 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -59,7 +59,7 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl } col = pkg_malloc(sizeof(*col) * (nc+1)); if (col == NULL) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -1; } @@ -140,7 +140,7 @@ static inline int get_ha1(struct username* _username, str* _domain, col = pkg_malloc(sizeof(*col) * (credentials_n + 1)); if (col == NULL) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -1; }

1 0

git:master:0702a7e0: app_sqlang: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 0702a7e0d9df2867cbc86188c06d95363d484d5a URL: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:55:14Z app_sqlang: convert to memory logging helper --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… Patch: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index a1d195bace2..fd2a81f759b 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -362,7 +362,7 @@ static SQInteger sqlang_sr_modf (HSQUIRRELVM J) if(sqlangv[i]!=NULL) { argv[i] = (char*)pkg_malloc(strlen(sqlangv[i])+1); if(argv[i]==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } strcpy(argv[i], sqlangv[i]); @@ -583,7 +583,7 @@ int sqlang_sr_init_mod(void) if(_sr_sqlang_reload_version == NULL) { _sr_sqlang_reload_version = (int*)shm_malloc(sizeof(int)); if(_sr_sqlang_reload_version == NULL) { - LM_ERR("failed to allocated reload version\n"); + SHM_MEM_ERROR; return -1; } *_sr_sqlang_reload_version = 0; @@ -1085,7 +1085,7 @@ SQInteger sqlang_open_KSR(HSQUIRRELVM J) _sr_J_KSRMethods = malloc(SR_SQLANG_KSR_METHODS_SIZE * sizeof(SQRegFunction)); if(_sr_J_KSRMethods==NULL) { - LM_ERR("no more pkg memory\n"); + SYS_MEM_ERROR ; return 0; } memset(_sr_J_KSRMethods, 0, SR_SQLANG_KSR_METHODS_SIZE * sizeof(SQRegFunction));

1 0

git:master:66e9b02f: app_lua_sr: convert to memory logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 66e9b02f7fc99084341d6519ac94cd580b334ac7 URL: https://github.com/kamailio/kamailio/commit/66e9b02f7fc99084341d6519ac94cd5… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:52:17Z app_lua_sr: convert to memory logging helper --- Modified: src/modules/app_lua_sr/app_lua_sr_api.c --- Diff: https://github.com/kamailio/kamailio/commit/66e9b02f7fc99084341d6519ac94cd5… Patch: https://github.com/kamailio/kamailio/commit/66e9b02f7fc99084341d6519ac94cd5… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_api.c b/src/modules/app_lua_sr/app_lua_sr_api.c index dc1e14f17fc..7e9fc023656 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.c +++ b/src/modules/app_lua_sr/app_lua_sr_api.c @@ -276,7 +276,7 @@ static int lua_sr_modf (lua_State *L) argv[i] = (char*)pkg_malloc(strlen(luav[i])+1); if(argv[i]==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } strcpy(argv[i], luav[i]);

1 0

git:master:8bf54822: app_jsdt: fix log message for system memory allocation
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 8bf54822b9f610eceae1b5c6006ab6cc5ed96d00 URL: https://github.com/kamailio/kamailio/commit/8bf54822b9f610eceae1b5c6006ab6c… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:49:48Z app_jsdt: fix log message for system memory allocation --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/8bf54822b9f610eceae1b5c6006ab6c… Patch: https://github.com/kamailio/kamailio/commit/8bf54822b9f610eceae1b5c6006ab6c… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 5df1b2db716..548b27690fb 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -868,7 +868,7 @@ duk_ret_t dukopen_KSR(duk_context *J) _sr_J_KSRMethods = malloc(SR_JSDT_KSR_METHODS_SIZE * sizeof(duk_function_list_entry)); if(_sr_J_KSRMethods==NULL) { - LM_ERR("no more pkg memory\n"); + SYS_MEM_ERROR; return 0; } memset(_sr_J_KSRMethods, 0, SR_JSDT_KSR_METHODS_SIZE * sizeof(duk_function_list_entry));

1 0

git:master:eef779ca: app_java: add missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: eef779ca7b5b203d216f76fbec56025d595f6e6d URL: https://github.com/kamailio/kamailio/commit/eef779ca7b5b203d216f76fbec56025… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T09:48:05Z app_java: add missing free in error case --- Modified: src/modules/app_java/java_native_methods.c --- Diff: https://github.com/kamailio/kamailio/commit/eef779ca7b5b203d216f76fbec56025… Patch: https://github.com/kamailio/kamailio/commit/eef779ca7b5b203d216f76fbec56025… --- diff --git a/src/modules/app_java/java_native_methods.c b/src/modules/app_java/java_native_methods.c index bb2ebe6be70..a73fdc313de 100644 --- a/src/modules/app_java/java_native_methods.c +++ b/src/modules/app_java/java_native_methods.c @@ -1002,6 +1002,7 @@ JNIEXPORT jint JNICALL Java_org_siprouter_CoreMethods_force_1send_1socket( si = (struct socket_id *)pkg_malloc(sizeof(struct socket_id)); if(!si) { PKG_MEM_ERROR; + pkg_free(nl); return -1; }

1 0

[kamailio/kamailio] With TOPOH module enabled, transferred call hangup from callee side does not hang up the call (Issue #3398)
by akabihno 21 Mar '23

21 Mar '23

### Description We have faced an issue which appears when TOPOH module is enabled, call is made from WebRTC client, then transferred by callee. #### Scenario WebRTC client behind load balancer makes call to softphone, call from softphone is transferred to external number using Asterisk. #### Expected result When call is hanged up on external number side, call should be hanged up on WebRTC client side. #### Actual result When call is hanged up on external number side, call is not hanged up on WebRTC client side. ### Troubleshooting #### Legend 10.5.0.145 - load balancer 10.128.150.67 - WebRTC client 10.181.0.1 - kamailio 10.5.2.192 - asterisk #### Log Messages On transfer: https://pastebin.com/H3FQ4Kpj On hangup from external number side: https://pastebin.com/wgfRzGbd On hangup from WebRTC client side: https://pastebin.com/sE0yhBae #### SIP Traffic Faulty case with TOPOH module enabled: [topoh_on.csv](https://github.com/kamailio/kamailio/files/11028205/topoh_on.… Normal behavior with TOPOH module disabled: [topoh_off.csv](https://github.com/kamailio/kamailio/files/11028206/topoh_of… #### Config files kamailio.cfg: [kamailio.txt](https://github.com/kamailio/kamailio/files/11028283/kamailio.… kamailio-local.cfg enabled toggles: #!define WITH_MYSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_DISPATCHER #!define WITH_HOMER #!define WITH_PSTN #!define WITH_TOPOH #!define WITH_CUSTOM_HEADERS #!define WITH_PROM #!define WITH_DMQ #!define WITH_NAT #!define WITH_XXXX_HEADERS #!define WITH_TLS #!define WITH_WEBSOCKET #!define WITH_VOIP_AUTH #!define WITH_ADVERTISE #!define WITH_JSONRPC #!define WITH_TCP #!define WITH_DIALOG #!define WITH_DIFF_PROVIDER_SRC_IP #!define WITH_UAC #!define WITH_DEV ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.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, 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 09:11:15 Nov 15 2022 with gcc 9.3.0 ``` * **Operating System**: ``` dockerized kamailio running on Ubuntu 16.04.3 LTS Docker version 18.03.1-ce, build 9ee9f40 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3398 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3398(a)github.com>

2 2

[kamailio/kamailio] Missing from: tag creates ERROR: log (Issue #3399)
by CarlWickbom 21 Mar '23

21 Mar '23

Hi Kamailio, We have noticed that a request not belonging to a dialog (e.g. a SIP MESSAGE) missing the tag= parameter in the from: header will trigger an ERROR: message like. ```` Mar 21 14:40:23 ip-10-85-164-143 /usr/sbin/kamailio[172]: ERROR: dialog [dlg_handlers.c:726]: pre_match_parse(): failed to get From header ```` ```` Mar 21 14:42:31 ip-10-85-165-13 /usr/sbin/kamailio[183]: ERROR: tmx [tmx_pretran.c:227]: tmx_check_pretran(): failed to get From header ```` According to our interpretation of 3261 section 12.1.1 ```` "A UAS MUST be prepared to receive a request without a tag in the From field, in which case the tag is considered to have a value of null." ```` this should not be the case. Also the BNF states no from: tag: is mandatory ``` From = ( "From" / "f" ) HCOLON from-spec from-spec = ( name-addr / addr-spec ) *( SEMI from-param ) from-param = tag-param / generic-param tag-param = "tag" EQUAL token ``` We believe this to be implemented in at least two places where one example is in the `dlg_handler` where `pre_match_parse` check ``` if (parse_from_header(req) < 0 || get_from(req)->tag_value.len == 0) { LM_ERR("failed to get From header\n"); return -1; } ``` As our interpretation of the standard is that the from: tag is not mandatory, hence we can't require our customer to change their behaviour, we consider this as a bug. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3399 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3399(a)github.com>

2 3

git:master:b9d397c8: async: convert to memory error logging helper
by Henning Westerholt 21 Mar '23

21 Mar '23

Module: kamailio Branch: master Commit: b9d397c84cb3e0911e9823386b6eb4944b02c9ed URL: https://github.com/kamailio/kamailio/commit/b9d397c84cb3e0911e9823386b6eb49… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-21T16:22:24Z async: convert to memory error logging helper --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/b9d397c84cb3e0911e9823386b6eb49… Patch: https://github.com/kamailio/kamailio/commit/b9d397c84cb3e0911e9823386b6eb49… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 3b18eda9570..3075bf61d00 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -289,7 +289,7 @@ static int fixup_async_sleep(void **param, int param_no) return 0; ap = (async_param_t *)pkg_malloc(sizeof(async_param_t)); if(ap == NULL) { - LM_ERR("no more pkg memory available\n"); + PKG_MEM_ERROR; return -1; } memset(ap, 0, sizeof(async_param_t)); diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index d6dd41d3f17..c19f05bbe67 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -109,7 +109,7 @@ int async_init_timer_list(void) _async_list_head = (struct async_list_head *)shm_malloc( sizeof(struct async_list_head)); if(_async_list_head == NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(_async_list_head, 0, sizeof(struct async_list_head)); @@ -135,7 +135,7 @@ int async_init_ms_timer_list(void) _async_ms_list = (struct async_ms_list *)shm_malloc( sizeof(struct async_ms_list)); if(_async_ms_list == NULL) { - LM_ERR("no more shm\n"); + SHM_MEM_ERROR; return -1; } memset(_async_ms_list, 0, sizeof(struct async_ms_list)); @@ -247,7 +247,7 @@ int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act, str *cbname) slot = ticks % ASYNC_RING_SIZE; ai = (async_item_t *)shm_malloc(sizeof(async_item_t)); if(ai == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(ai, 0, sizeof(async_item_t)); @@ -454,7 +454,7 @@ int async_ms_sleep(sip_msg_t *msg, int milliseconds, cfg_action_t *act, str *cbn at = (async_task_t *)shm_malloc(dsize); if(at == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(at, 0, dsize); @@ -517,7 +517,7 @@ int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname) dsize = sizeof(async_task_t) + sizeof(async_task_param_t); at = (async_task_t *)shm_malloc(dsize); if(at == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(at, 0, dsize); @@ -614,7 +614,7 @@ int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, dsize = sizeof(async_task_t) + sizeof(async_data_param_t) + sdata->len + 1; at = (async_task_t *)shm_malloc(dsize); if(at == NULL) { - LM_ERR("no more shm memory\n"); + SHM_MEM_ERROR; return -1; } memset(at, 0, dsize);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2023