- sr-dev - kamailio.org

Re: [kamailio/kamailio] benchmark: properly free previous allocated memory in case of error (d7770ca)
by Victor Seva 22 Mar '23

22 Mar '23

@henningw this is wrong no? it should be ``` pkg_free(bmt->start); shm_free(bmt); ``` instead. you can't access ``bmt->start`` if you freed ``bmt`` first, no? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0ba3ebb47d/105547932(a)github.com>

2 1

Re: [kamailio/kamailio] app_sqlang: convert to memory logging helper (0702a7e)
by Daniel-Constantin Mierla 22 Mar '23

22 Mar '23

In the above case, `SHM_MEM_ERROR` is losing the usefulness of the previous version of the log message, there is `SHM_MEM_ERROR_FMT` that should be used. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d953… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/0702a7e0d9df2867cbc86188c06d95363d484d5a/105546658(a)github.com>

2 1

git:master:43751e7b: app_sqlang: restore some details related to one memory error log
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 43751e7b0071135d433258cc0423cc00546a31e6 URL: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:52:09Z app_sqlang: restore some details related to one memory error log --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… Patch: https://github.com/kamailio/kamailio/commit/43751e7b0071135d433258cc0423cc0… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index fd2a81f759b..d0df44cb63d 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -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) { - SHM_MEM_ERROR; + SHM_MEM_ERROR_FMT("reload version\n");; return -1; } *_sr_sqlang_reload_version = 0;

1 0

Re: [kamailio/kamailio] auth_db: fix goto for memory allocation error, convert to memory logging helper (01e82b3)
by Daniel-Constantin Mierla 22 Mar '23

22 Mar '23

Probably the `parse_error` label should be replaced by `error` and all `goto`'s point to it. `parse_error` is used for other cases like target pv not being writeable, it's difference comparing with `error` is printing more context info about the position in the string where the error happens. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… You are receiving this because you commented. Message ID: <kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981ef0ce4318/105547846(a)github.com>

1 0

git:master:7378aa0f: cfgutils: convert to memory error logging helper, add missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 7378aa0f7dcbde237bb5701f40b8a2d008d78b45 URL: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:15:35Z cfgutils: convert to memory error logging helper, add missing free in error case --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… Patch: https://github.com/kamailio/kamailio/commit/7378aa0f7dcbde237bb5701f40b8a2d… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 9a77b40aed8..bf4b0680bbc 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -884,14 +884,15 @@ static int mod_init(void) probability=(int *) shm_malloc(sizeof(int)); if (!probability) { - LM_ERR("no shmem available\n"); + SHM_MEM_ERROR; return -1; } *probability = initial_prob; gflags=(unsigned int *) shm_malloc(sizeof(unsigned int)); if (!gflags) { - LM_ERR(" no shmem available\n"); + SHM_MEM_ERROR; + shm_free(probability); return -1; } *gflags=initial_gflags;

1 0

git:master:d7770cae: benchmark: properly free previous allocated memory in case of error
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: d7770cae2ee68be7184298b2bb41cb0ba3ebb47d URL: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T11:20:08Z benchmark: properly free previous allocated memory in case of error --- Modified: src/modules/benchmark/benchmark.c --- Diff: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… Patch: https://github.com/kamailio/kamailio/commit/d7770cae2ee68be7184298b2bb41cb0… --- diff --git a/src/modules/benchmark/benchmark.c b/src/modules/benchmark/benchmark.c index cb1e288be16..09af04abf88 100644 --- a/src/modules/benchmark/benchmark.c +++ b/src/modules/benchmark/benchmark.c @@ -443,6 +443,8 @@ int _bm_register_timer(char *tname, int mode, unsigned int *id) if(bm_mycfg->tindex==0) { SHM_MEM_ERROR; + shm_free(bmt); + pkg_free(bmt->start); if(tidx!=0) shm_free(tidx); return -1;

1 0

git:master:af9f95da: cplc: convert to memory error logging helper, add one missing free in error case
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: af9f95da42bd07ea9bf3de0ea5cbd264f384bc02 URL: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T12:13:47Z cplc: convert to memory error logging helper, add one missing free in error case --- Modified: src/modules/cplc/cpl_db.c Modified: src/modules/cplc/cpl_loader.c Modified: src/modules/cplc/cpl_log.c Modified: src/modules/cplc/cpl_nonsig.c Modified: src/modules/cplc/cpl_proxy.h Modified: src/modules/cplc/cpl_run.c Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cplc.c Modified: src/modules/cplc/loc_set.h Modified: src/modules/cplc/sub_list.c --- Diff: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26… Patch: https://github.com/kamailio/kamailio/commit/af9f95da42bd07ea9bf3de0ea5cbd26…

1 0

git:master:9e001534: avpops: convert to memory error logging helper
by Henning Westerholt 22 Mar '23

22 Mar '23

Module: kamailio Branch: master Commit: 9e001534589a3428cd5f8908e84fe327ffc20fb6 URL: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-22T11:17:22Z avpops: convert to memory error logging helper --- Modified: src/modules/avpops/avpops.c Modified: src/modules/avpops/avpops_db.c Modified: src/modules/avpops/avpops_parse.c --- Diff: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32… Patch: https://github.com/kamailio/kamailio/commit/9e001534589a3428cd5f8908e84fe32…

1 0

Re: [kamailio/kamailio] auth_db: fix goto for memory allocation error, convert to memory logging helper (01e82b3)
by Bastian Triller 22 Mar '23

22 Mar '23

Is it intended to jump to `error` instead of `parse_error` now? @pantelisk98 @henningw -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/01e82b38c41d344c1e94b2e0f574981ef0ce4318/105530322(a)github.com>

2 1

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

git:master:9cc9a177: p_usrloc: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture
by Victor Seva 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 9cc9a177daf6d5ce11fbdef714bd576716dc5a2f URL: https://github.com/kamailio/kamailio/commit/9cc9a177daf6d5ce11fbdef714bd576… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-20T16:56:03+01:00 p_usrloc: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture --- Modified: src/modules/p_usrloc/ul_check.c --- Diff: https://github.com/kamailio/kamailio/commit/9cc9a177daf6d5ce11fbdef714bd576… Patch: https://github.com/kamailio/kamailio/commit/9cc9a177daf6d5ce11fbdef714bd576… --- diff --git a/src/modules/p_usrloc/ul_check.c b/src/modules/p_usrloc/ul_check.c index dfc062f266..0ed32dc99f 100644 --- a/src/modules/p_usrloc/ul_check.c +++ b/src/modules/p_usrloc/ul_check.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <stdint.h> #include "../../core/mem/shm_mem.h" @@ -136,7 +137,7 @@ int must_retry(time_t *timer, time_t interval){ if(!timer){ return -1; } - LM_DBG("must_retry: time is at %llu, retry at %llu.\n", (uint64_t)time(NULL), + LM_DBG("must_retry: time is at %" PRIu64 ", retry at %" PRIu64 ".\n", (uint64_t)time(NULL), (uint64_t)(*timer)); if(*timer <= time(NULL)){ *timer = time(NULL) + interval;

1 0

git:master:1b3224c5: rtpengine: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture
by Victor Seva 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 1b3224c514105d69c3099c11edc5ef20ca02c567 URL: https://github.com/kamailio/kamailio/commit/1b3224c514105d69c3099c11edc5ef2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-03-20T16:53:15+01:00 rtpengine: use PRIu64 macro to find out what format is needed for uint64_t since it depends on architecture --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/1b3224c514105d69c3099c11edc5ef2… Patch: https://github.com/kamailio/kamailio/commit/1b3224c514105d69c3099c11edc5ef2… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 58c96efc0d..51bd9e380a 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> @@ -1337,7 +1338,7 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) _rtpe_list_version->vernum += 1; _rtpe_list_version->vertime = time(NULL); - LM_DBG("current rtpengines list version: %d (%llu)\n", + LM_DBG("current rtpengines list version: %d (%" PRIu64 ")\n", _rtpe_list_version->vernum, (uint64_t)_rtpe_list_version->vertime); rpc->rpl_printf(ctx, "Ok. Reload successful."); @@ -1857,7 +1858,7 @@ static int build_rtpp_socks(int lmode, int rtest) { if(_rtpe_list_vernum_local == _rtpe_list_version->vernum) { /* same version for the list of rtpengines */ - LM_DBG("same rtpengines list version: %d (%llu)\n", + LM_DBG("same rtpengines list version: %d (%" PRIu64 ")\n", _rtpe_list_version->vernum, (uint64_t)_rtpe_list_version->vertime); return 0;

1 0

git:master:452af935: modules: readme files regenerated - evapi ... [skip ci]
by Kamailio Dev 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 452af935fbcc60572541941612091cbc0535a310 URL: https://github.com/kamailio/kamailio/commit/452af935fbcc60572541941612091cb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-03-20T16:31:24+01:00 modules: readme files regenerated - evapi ... [skip ci] --- Modified: src/modules/evapi/README Modified: src/modules/jsonrpcs/README Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/452af935fbcc60572541941612091cb… Patch: https://github.com/kamailio/kamailio/commit/452af935fbcc60572541941612091cb…

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 20 Mar '23

20 Mar '23

- URL: https://github.com/kamailio/kamailio/commit/926ba9473775878d8f38b175764a50d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 rtpengine: cast to uint64_t when using time_t value - URL: https://github.com/kamailio/kamailio/commit/e29ce594466385a7c35634fda4b4664… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 p_usrloc: cast to uint64_t when using time_t value - URL: https://github.com/kamailio/kamailio/commit/161ec6d14b702cb92406171152d127b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 jsonrpcs: protocol extended to allow storing response in a file - implemented for udp sockets - URL: https://github.com/kamailio/kamailio/commit/4fec664327410db4e5ff7036a459e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 jsonrpcs: implemented result storing for rpc over fifo - URL: https://github.com/kamailio/kamailio/commit/1b5caab3479bb32c2986906e6e07ea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 kamctl: option to set store path for rpc commands - URL: https://github.com/kamailio/kamailio/commit/e27823f746eb8fca834474945e45bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 pipelimit: added rpc command pl.rm_pipe - URL: https://github.com/kamailio/kamailio/commit/6c0b62c464bcbc67e485c1e2193b7a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:29+01:00 pipelimit: docs for rpc command pl.rm_pipe - URL: https://github.com/kamailio/kamailio/commit/e0713531bf6ea2aa9b249503dc346ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 pipelimit: new rpc command pl.reset_pipe - reset associated values - URL: https://github.com/kamailio/kamailio/commit/569db2eeaef17f3034f692e808f3401… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 pipelimit: docs for rpc command pl.reset_pipe - URL: https://github.com/kamailio/kamailio/commit/4c998de5f54ee941f7516e589e29405… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: wait when idle made a modparam - URL: https://github.com/kamailio/kamailio/commit/3b99e09dc10ff38024b2821b26f2efe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: docs for wait_idle modparam - URL: https://github.com/kamailio/kamailio/commit/3bff060dcb74a081782abdbdade830b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: use internal workers to handle client messages - URL: https://github.com/kamailio/kamailio/commit/b34e24770a6435577097b173cafab30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 jsonrpcs: initial support for tcp transport - one rpc command per connection, which is closed after the response is sent - URL: https://github.com/kamailio/kamailio/commit/1400e8cb6aebdd93a5b0c6979a444a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 jsonrpcs: more debug messages when handling tcp commands - URL: https://github.com/kamailio/kamailio/commit/7000f437ac8f3fb40c7a55c8c7a3c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 jsonrpcs: docs for tcp_socket parameter - URL: https://github.com/kamailio/kamailio/commit/58bd64200e4d2f237f192acf6f88074… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: support for adaptive wait on idle to spare cpu when not busy - URL: https://github.com/kamailio/kamailio/commit/6e4ba9bd7421bf483cdbc7e5484f21d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: wait increase limit made modparam - URL: https://github.com/kamailio/kamailio/commit/b044c33c72318c12de78c0d8b7f8ac5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: docs for wait_increase parameter - URL: https://github.com/kamailio/kamailio/commit/1dc0eac9a3a3abd6e128aa5f1d17d5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: if workers is 0, execute callback by evapi receiver - URL: https://github.com/kamailio/kamailio/commit/d4be0b2ec72159c5769fc6d7d0cee57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 evapi: docs - updates to workers parameter - URL: https://github.com/kamailio/kamailio/commit/ab1831efc20816e18a89e6322d16c8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-20T16:28:30+01:00 core: skip warning for atomic ops with locking for some dev os-es - do not print the compile warning for non-native memory barier/atomic ops on some devel platforms, for now macos with apple silicon cpu

1 0

git:master:135f7b5e: modules: readme files regenerated - ims_registrar_pcscf ... [skip ci]
by Kamailio Dev 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 135f7b5e2114617b0bc408175ec146d248d01d3a URL: https://github.com/kamailio/kamailio/commit/135f7b5e2114617b0bc408175ec146d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-03-20T11:01:25+01:00 modules: readme files regenerated - ims_registrar_pcscf ... [skip ci] --- Modified: src/modules/ims_registrar_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/135f7b5e2114617b0bc408175ec146d… Patch: https://github.com/kamailio/kamailio/commit/135f7b5e2114617b0bc408175ec146d… --- diff --git a/src/modules/ims_registrar_pcscf/README b/src/modules/ims_registrar_pcscf/README index 3bfb0e6003..02327a005c 100644 --- a/src/modules/ims_registrar_pcscf/README +++ b/src/modules/ims_registrar_pcscf/README @@ -312,6 +312,33 @@ pcscf_save("location"); * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. + The return code may have the following values: + * ( 1) OK + * (-1) Parsing of contact data failed + * (-2) Deregistration in progress + + For db_mode = DB_ONLY (3) setting for ims_usrloc_pcscf module modparam + following logic is implemented: + * To avoid race time conditions between a REREGISTER and the expiry + handler state machine in the scscf an approach is chosen to refuse + a REREGISTER in time window of 20 seconds after pcontact expiry on + the pcscf (thus allowing expiry handling to finish). REREGISTER is + refused in this scenario with return code -2. + * In case a REREGISTER arrives at pcscf and the respective pcontact + is expired longer than time window of 20 seconds registration also + is refused with return code -2 and additionaly PUBLISH is sent to + scscf with expiry = 0. + * The rc -2 shall be handled in register.cfg script as follows: + pcscf_save_pending("location"); + switch ($retcode) { + case -1: + ....... + case -2: + send_reply("500", "Deregister in progress - Please try again"); + exit; + break; + } + 4.3. pcscf_follows_service_routes(domain) Returns true, if the request is following the "learned" service-routes

1 0

git:master:38d72c3f: ims_registrar_pcscf: changes for ul db_mode DB_ONLY
by Henning Westerholt 20 Mar '23

20 Mar '23

Module: kamailio Branch: master Commit: 38d72c3f8248b32b3ba0ff24abd1f2f7407f9d8f URL: https://github.com/kamailio/kamailio/commit/38d72c3f8248b32b3ba0ff24abd1f2f… Author: Annemarie Mandl <mandl(a)rpmbld.novalocal> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-20T10:57:21+01:00 ims_registrar_pcscf: changes for ul db_mode DB_ONLY Enable registration of pcscf contact callback during download from db location table and inserting pcontact (normally this callback is registered during handling of REGISTER). Refuse REGISTER when pcontact is expired since [0 to 20] seconds. Within this time window a NOTIFY is expected from scscf and in order to avoid race time conditions between scscf and pcscf REGISTER will be refused. Refuse REGISTER when pcontact is expired longer than 20 seconds - send PUBLISH (contact expired) to scscf to trigger NOTIFY. In both REGISTER refused scenarios routing script should reply 500 - Deregistration in progress. undo changes in ul_callback.c & ul_callback.h corrections after comments from Henning --- Modified: src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/38d72c3f8248b32b3ba0ff24abd1f2f… Patch: https://github.com/kamailio/kamailio/commit/38d72c3f8248b32b3ba0ff24abd1f2f…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev