- sr-dev - kamailio.org

git:5.6:8d7dee8b: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 May '23

11 May '23

Module: kamailio Branch: 5.6 Commit: 8d7dee8bb08ef7f44394c0add165dea66bf9c316 URL: https://github.com/kamailio/kamailio/commit/8d7dee8bb08ef7f44394c0add165dea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-11T14:31:43+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/8d7dee8bb08ef7f44394c0add165dea… Patch: https://github.com/kamailio/kamailio/commit/8d7dee8bb08ef7f44394c0add165dea… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 80691c55168..a8ebc98adfb 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -30,6 +30,7 @@ Henning Westerholt 3. Parameters 3.1. path (string) + 3.2. resid (str) 4. Functions @@ -44,8 +45,9 @@ Henning Westerholt List of Examples 1.1. Set path parameter - 1.2. geoip2_match usage - 1.3. geoip2.reload usage + 1.2. Set resid parameter + 1.3. geoip2_match usage + 1.4. geoip2.reload usage Chapter 1. Admin Guide @@ -60,6 +62,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. path (string) + 3.2. resid (str) 4. Functions @@ -115,6 +118,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. path (string) + 3.2. resid (str) 3.1. path (string) @@ -127,6 +131,23 @@ Chapter 1. Admin Guide modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") ... +3.2. resid (str) + + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native Kamailio.cfg file, + registration is done when parsing config and finding variables. + + Default value is �� (empty). + + Example 1.2. Set resid parameter +... +modparam("geoip2", "resid", "src") +... +if(geoip2_match("$si", "src")) { + ... +} +... + 4. Functions 4.1. geoip2_match(ipaddr, pvc) @@ -135,8 +156,10 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") Match ipaddr against the GeoIP database and set the pvc container. The function has to be called before accessing a key via: $gip2(pvc=>key). + At least one function needs to be present that access the pvc + container, otherwise this function will not work. - Example 1.2. geoip2_match usage + Example 1.3. geoip2_match usage ... if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); @@ -151,7 +174,7 @@ if(geoip2_match("$si", "src")) Reload the internal GeoIP database. This is necessary after the database file has been changed on the disk. - Example 1.3. geoip2.reload usage + Example 1.4. geoip2.reload usage ... kamcmd geoip2.reload ...

1 0

Re: [SR-Users] GeoIP2 and KEMI
by Henning Westerholt 11 May '23

11 May '23

(also adding sr-dev) Hello, I have cherry-picked the commit. Its technically a new feature addition, which would not qualify for a backport to a stable branch. On the other hand, if KEMI is not usable without that, we certainly import KEMI changes into stable branches so it would qualify for a backport. This unclear status was probably the reason that it was not included into the backports so far. If somebody is against adding this change, I will revert it of course. I did not cherry-picked it to 5.5 branch. Cheers, Henning From: Michal Hajek <michal.hajek(a)daktela.com> Sent: Donnerstag, 11. Mai 2023 12:16 To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: [SR-Users] GeoIP2 and KEMI Hello, why this commit is not in branch 5.6? https://github.com/kamailio/kamailio/commit/21817906853140322c701f8cbb82010… Without this, is KEMI and GeoIP2 incompatible. Thanks Michal

1 0

git:5.6:916abbb5: geoip2: new parameter to register result id to get pv work in kemi
by Henning Westerholt 11 May '23

11 May '23

Module: kamailio Branch: 5.6 Commit: 916abbb53aff22ff9214b9f7677904564ca021b3 URL: https://github.com/kamailio/kamailio/commit/916abbb53aff22ff9214b9f76779045… Author: Vadim Gaysin <gaysin(a)zvonok.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-05-11T12:18:41Z geoip2: new parameter to register result id to get pv work in kemi (cherry picked from commit 21817906853140322c701f8cbb8201049d2b58f0) --- Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/916abbb53aff22ff9214b9f76779045… Patch: https://github.com/kamailio/kamailio/commit/916abbb53aff22ff9214b9f76779045… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index a82b1a9a293..76e59055fa2 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -81,7 +81,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="geoip2.p.path"> <title><varname>path</varname> (string)</title> <para> Path to the GeoIP2 database file. @@ -100,7 +100,31 @@ modparam("geoip2", "path", "/usr/local/share/GeoIP/GeoLite2-City.mmdb") </programlisting> </example> </section> - + <section id="geoip2.p.resid"> + <title><varname>resid</varname> (str)</title> + <para> + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native &kamailio;.cfg file, registration + is done when parsing config and finding variables. + </para> + <para> + <emphasis> + Default value is <quote></quote> (empty). + </emphasis> + </para> + <example> + <title>Set <varname>resid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("geoip2", "resid", "src") +... +if(geoip2_match("$si", "src")) { + ... +} +... +</programlisting> + </example> + </section> </section> <section> diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 96285592425..b5b5e7db6c4 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -44,6 +44,7 @@ static int geoip2_rpc_init(void); static int w_geoip2_match(struct sip_msg* msg, char* str1, char* str2); static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass); +static int geoip2_resid_param(modparam_t type, void* val); static pv_export_t mod_pvs[] = { { {"gip2", sizeof("gip2")-1}, PVT_OTHER, pv_get_geoip2, 0, @@ -51,7 +52,6 @@ static pv_export_t mod_pvs[] = { { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; - static cmd_export_t cmds[]={ {"geoip2_match", (cmd_function)w_geoip2_match, 2, fixup_spve_spve, 0, ANY_ROUTE}, @@ -59,7 +59,8 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"path", PARAM_STRING, &geoip2_path}, + {"path", PARAM_STRING, &geoip2_path}, + {"resid", PARAM_STR|PARAM_USE_FUNC, &geoip2_resid_param}, {0, 0, 0} }; @@ -76,7 +77,6 @@ struct module_exports exports = { mod_destroy /* module destroy function */ }; - /** * init module function */ @@ -113,6 +113,19 @@ static void mod_destroy(void) geoip2_destroy_pv(); } +static int geoip2_resid_param(modparam_t type, void* val) +{ + str rname; + + rname = *((str*)val); + if(sr_geoip2_add_resid(&rname) < 0) { + LM_ERR("failed to register result container with id: %.*s\n", + rname.len, rname.s); + return -1; + } + return 0; +} + static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass) { geoip2_pv_reset(pvclass); @@ -192,4 +205,4 @@ static sr_kemi_t sr_kemi_geoip2_exports[] = { int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_geoip2_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index ff427f259f6..71b814e9ad3 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -124,6 +124,13 @@ sr_geoip2_item_t *sr_geoip2_add_item(str *name) return it; } +int sr_geoip2_add_resid(str *rname) +{ + if(sr_geoip2_add_item(rname)==NULL) { + return -1; + } + return 0; +} int pv_parse_geoip2_name(pv_spec_p sp, str *in) { diff --git a/src/modules/geoip2/geoip2_pv.h b/src/modules/geoip2/geoip2_pv.h index d616461673a..fbd25c00440 100644 --- a/src/modules/geoip2/geoip2_pv.h +++ b/src/modules/geoip2/geoip2_pv.h @@ -35,6 +35,7 @@ void geoip2_destroy_pv(void); int geoip2_reload_pv(char *path); void geoip2_pv_reset(str *pvclass); int geoip2_update_pv(str *tomatch, str *pvclass); +int sr_geoip2_add_resid(str *rname); #endif

1 0

Re: [SR-Users] kamailio/kamailio-ci docker image
by Henning Westerholt 11 May '23

11 May '23

Hi Sergey, I am not the one that works on the Kamailio docker packages, so others can probably comment more. But I think after we switched the kamailio docker to the github repository, it also make sense to move the other smaller “special” Kamailio repositories from docker hub to github. Just to have it in one place and to be less confusing for users and developers. Cheers, Henning From: Sergey Safarov <s.safarov(a)gmail.com> Sent: Freitag, 28. April 2023 19:59 To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: [SR-Users] kamailio/kamailio-ci docker image Hi Now "kamailio/kamailio-ci" docker image is pushed to GitHub packages<https://github.com/kamailio/kamailio-ci/pkgs/container/kamailio-ci> only. I have a question should we completely switch to using the GitHub docker repo and remove the "kamailio/kamailio-ci" docker image from Docker Hub<https://hub.docker.com/repository/docker/kamailio/kamailio-ci>? Or required to push the "kamailio/kamailio-ci" docker image to GitHub packages and Docker Hub repos? Sergey

1 0

git:master:e6dcc146: auth_radius: print radius config path on failure to load
by Daniel-Constantin Mierla 11 May '23

11 May '23

Module: kamailio Branch: master Commit: e6dcc14646f00aa71fc08368b268e7356d3343c7 URL: https://github.com/kamailio/kamailio/commit/e6dcc14646f00aa71fc08368b268e73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-11T08:16:09+02:00 auth_radius: print radius config path on failure to load --- Modified: src/modules/auth_radius/auth_radius.c --- Diff: https://github.com/kamailio/kamailio/commit/e6dcc14646f00aa71fc08368b268e73… Patch: https://github.com/kamailio/kamailio/commit/e6dcc14646f00aa71fc08368b268e73… --- diff --git a/src/modules/auth_radius/auth_radius.c b/src/modules/auth_radius/auth_radius.c index 387f58d30d1..cbf5acaa5eb 100644 --- a/src/modules/auth_radius/auth_radius.c +++ b/src/modules/auth_radius/auth_radius.c @@ -120,7 +120,8 @@ static int mod_init(void) int n; if ((rh = rc_read_config(radius_config)) == NULL) { - LM_ERR("failed to open configuration file \n"); + LM_ERR("failed to open configuration file: %s\n", + (radius_config)?radius_config:"none"); return -1; }

1 0

git:master:6d26825f: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 10 May '23

10 May '23

Module: kamailio Branch: master Commit: 6d26825f1e147713694fdb74d25e506b0626b249 URL: https://github.com/kamailio/kamailio/commit/6d26825f1e147713694fdb74d25e506… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-11T00:01:21+02:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/6d26825f1e147713694fdb74d25e506… Patch: https://github.com/kamailio/kamailio/commit/6d26825f1e147713694fdb74d25e506… --- diff --git a/src/modules/pipelimit/README b/src/modules/pipelimit/README index 18f5ff48214..717f28f6cd8 100644 --- a/src/modules/pipelimit/README +++ b/src/modules/pipelimit/README @@ -273,7 +273,7 @@ modparam("pipelimit", "plp_pipeid_column", "name") Name of 'limit' column. - Default value is ��limit��. + Default value is ��plimit��. Example 1.5. Set plp_limit_column parameter ...

1 0

[kamailio/kamailio] pipelimit module - typo in documentation (Issue #3449)
by arkadiam 10 May '23

10 May '23

Module doc says: 4.5. plp_limit_column (string) Name of 'limit' column. Default value is “limit”. According to source src/modules/pipelimit/pl_db.c default value is plimit #define RLP_LIMIT_COL "plimit" So the doc should say: Default value is “plimit”. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3449 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3449(a)github.com>

2 2

git:master:7438bfd8: pipelimit: fix documentation on default value of plp_limit_column [skip ci]
by Victor Seva 10 May '23

10 May '23

Module: kamailio Branch: master Commit: 7438bfd8405ab98f48a96138183675cf799c7386 URL: https://github.com/kamailio/kamailio/commit/7438bfd8405ab98f48a96138183675c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-10T23:48:23+02:00 pipelimit: fix documentation on default value of plp_limit_column [skip ci] fixes #3449 --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7438bfd8405ab98f48a96138183675c… Patch: https://github.com/kamailio/kamailio/commit/7438bfd8405ab98f48a96138183675c… --- diff --git a/src/modules/pipelimit/doc/pipelimit_admin.xml b/src/modules/pipelimit/doc/pipelimit_admin.xml index 3ddd69ce3e..ebcf861669 100644 --- a/src/modules/pipelimit/doc/pipelimit_admin.xml +++ b/src/modules/pipelimit/doc/pipelimit_admin.xml @@ -218,7 +218,7 @@ modparam("pipelimit", "plp_pipeid_column", "name") </para> <para> <emphasis> - Default value is <quote>limit</quote>. + Default value is <quote>plimit</quote>. </emphasis> </para> <example>

1 0

[kamailio/kamailio] rtpengine: google sanitizer aligment warning (Issue #3058)
by sergey-safarov 10 May '23

10 May '23

``` bencode.c:149:14: runtime error: member access within misaligned address 0xffff9f18937f for type 'struct bencode_item_t', which requires 8 byte alignment 0xffff9f18937f: note: pointer points here 9f ff ff 00 00 14 00 00 00 00 00 00 00 98 1b 21 9f ff ff 00 00 f0 8b 9a fe ff ff 00 00 18 26 9c ^ bencode.c:50:64: runtime error: member access within misaligned address 0xffff9f18937f for type 'struct bencode_item_t', which requires 8 byte alignment 0xffff9f18937f: note: pointer points here 9f ff ff 00 00 14 00 00 00 00 00 00 00 98 1b 21 9f ff ff 00 00 f0 8b 9a fe ff ff 00 00 18 26 9c ^ bencode.c:50:54: runtime error: member access within misaligned address 0xffff9f18937f for type 'struct bencode_item_t', which requires 8 byte alignment 0xffff9f18937f: note: pointer points here 9f ff ff 00 00 14 00 00 00 00 00 00 00 98 1b 21 9f ff ff 00 00 f0 8b 9a fe ff ff 00 00 00 00 00 ^ bencode.c:50:48: runtime error: member access within misaligned address 0xffff9f18937f for type 'struct bencode_item_t', which requires 8 byte alignment 0xffff9f18937f: note: pointer points here 9f ff ff 00 00 14 00 00 00 00 00 00 00 98 1b 21 9f ff ff 00 00 f0 8b 9a fe ff ff 00 00 00 00 00 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3058 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3058(a)github.com>

3 8

git:master:eca3bf75: registrar: do not walk xavp list twice to get tcp connection id
by Daniel-Constantin Mierla 10 May '23

10 May '23

Module: kamailio Branch: master Commit: eca3bf7570290854561ecd4ef71dc093941e2d72 URL: https://github.com/kamailio/kamailio/commit/eca3bf7570290854561ecd4ef71dc09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-10T13:38:23+02:00 registrar: do not walk xavp list twice to get tcp connection id --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/eca3bf7570290854561ecd4ef71dc09… Patch: https://github.com/kamailio/kamailio/commit/eca3bf7570290854561ecd4ef71dc09… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 878f22224b..15be2331b8 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -71,7 +71,11 @@ extern sruid_t _reg_sruid; static int q_override_msg_id; static qvalue_t q_override_value; -int reg_get_cfg_tcpconnid(void) + +/** + * + */ +static int reg_get_cfg_tcpconnid(void) { int n; sr_xavp_t *vavp=NULL; @@ -254,6 +258,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, static struct sip_msg *m = 0; static struct socket_info si = {0}; int_str val; + int tcid; if (_m!=0) { memset( &ci, 0, sizeof(ucontact_info_t)); @@ -298,9 +303,11 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } else { ci.tcpconn_id = -1; } - /* if a tcp connectionid is set, use it */ - if (reg_get_cfg_tcpconnid()) - ci.tcpconn_id = reg_get_cfg_tcpconnid(); + /* if a tcp connectionid is set via xavp, use it */ + tcid = reg_get_cfg_tcpconnid(); + if(tcid > 0) { + ci.tcpconn_id = tcid; + } /* additional info from message */ if (parse_headers(_m, HDR_USERAGENT_F, 0) != -1 && _m->user_agent &&

1 0

git:master:9326cff7: htable: use long types for expires operations
by Daniel-Constantin Mierla 10 May '23

10 May '23

Module: kamailio Branch: master Commit: 9326cff7f67604a27049ee1cae0c9a5b965efd9d URL: https://github.com/kamailio/kamailio/commit/9326cff7f67604a27049ee1cae0c9a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-10T13:34:32+02:00 htable: use long types for expires operations --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/9326cff7f67604a27049ee1cae0c9a5… Patch: https://github.com/kamailio/kamailio/commit/9326cff7f67604a27049ee1cae0c9a5… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 13e29ae5cd..432d224aab 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -970,8 +970,8 @@ int ht_dbg(void) while(it) { LM_ERR("\tcell: %.*s\n", it->name.len, it->name.s); - LM_ERR("\thid: %u msize: %u flags: %d expire: %u\n", it->cellid, - it->msize, it->flags, (unsigned int)it->expire); + LM_ERR("\thid: %u msize: %u flags: %d expire: %llu\n", it->cellid, + it->msize, it->flags, (unsigned long long)it->expire); if(it->flags&AVP_VAL_STR) LM_ERR("\tv-s:%.*s\n", it->value.s.len, it->value.s.s); else @@ -1268,7 +1268,7 @@ int ht_set_cell_expire(ht_t *ht, str *name, int type, int_str *val) now = 0; if(val->n>0) now = time(NULL) + val->n; - LM_DBG("set auto-expire to %u (%ld)\n", (unsigned int)now, + LM_DBG("set auto-expire to %llu (%ld)\n", (unsigned long long)now, val->n); ht_slot_lock(ht, idx); diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index db2a52ce8b..2b2eb25bfd 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -196,7 +196,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) int i; int ret; int cnt; - int now; + long now; int ncols; int c; @@ -272,7 +272,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) pname.s = ""; n = 0; last_ktype = 0; - now = (int)time(NULL); + now = (long)time(NULL); do { for(i=0; i<RES_ROW_N(db_res); i++) {

1 0

git:master:35e27960: cplc: use time_t field for proper storage size
by Daniel-Constantin Mierla 10 May '23

10 May '23

Module: kamailio Branch: master Commit: 35e279603f37aec4e8cba6a321726dfee958fc94 URL: https://github.com/kamailio/kamailio/commit/35e279603f37aec4e8cba6a321726df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-10T12:04:08+02:00 cplc: use time_t field for proper storage size --- Modified: src/modules/cplc/cpl_run.h Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/35e279603f37aec4e8cba6a321726df… Patch: https://github.com/kamailio/kamailio/commit/35e279603f37aec4e8cba6a321726df… --- diff --git a/src/modules/cplc/cpl_run.h b/src/modules/cplc/cpl_run.h index 6ec52beb708..f11db2a6a90 100644 --- a/src/modules/cplc/cpl_run.h +++ b/src/modules/cplc/cpl_run.h @@ -55,7 +55,7 @@ struct cpl_interpreter { str user; /* user */ str script; /* CPL script */ char *ip; /* instruction pointer */ - int recv_time; /* receiving time stamp */ + time_t recv_time; /* receiving time stamp */ struct sip_msg *msg; struct location *loc_set; /* location set */ /* pointers to the string-headers needed for switches; can point directly diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index e2d15bfbb36..19d26f7048c 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -689,8 +689,8 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) memset(&att, 0, sizeof(cpl_ac_tm_t)); memset(&trt, 0, sizeof(cpl_tmrec_t)); - LM_DBG("checking recv. time stamp <%d>\n", - intr->recv_time); + LM_DBG("checking recv. time stamp <%llu>\n", + (unsigned long long)intr->recv_time); switch (NR_OF_ATTR(intr->ip)) { case 1: p = ATTR_PTR(intr->ip);

1 0

git:master:88a1340f: cnxcc: cast time_t to get rid of newer compiler warnings
by Daniel-Constantin Mierla 10 May '23

10 May '23

Module: kamailio Branch: master Commit: 88a1340f0a9ec3408a61625e3621be82a4975940 URL: https://github.com/kamailio/kamailio/commit/88a1340f0a9ec3408a61625e3621be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-10T11:49:12+02:00 cnxcc: cast time_t to get rid of newer compiler warnings --- Modified: src/modules/cnxcc/cnxcc.h --- Diff: https://github.com/kamailio/kamailio/commit/88a1340f0a9ec3408a61625e3621be8… Patch: https://github.com/kamailio/kamailio/commit/88a1340f0a9ec3408a61625e3621be8… --- diff --git a/src/modules/cnxcc/cnxcc.h b/src/modules/cnxcc/cnxcc.h index 8c73dde2c9..e4ce5e2621 100644 --- a/src/modules/cnxcc/cnxcc.h +++ b/src/modules/cnxcc/cnxcc.h @@ -33,7 +33,7 @@ static inline unsigned int get_current_timestamp() { - return time(NULL); + return (unsigned int)(unsigned long long)time(NULL); } static inline int timestamp2isodt(str *dest, unsigned int timestamp)

1 0

git:5.5:ce08c374: rtpengine: fix unaligned memory access
by Stefan Mititelu 10 May '23

10 May '23

Module: kamailio Branch: 5.5 Commit: ce08c374e46532591ce54e29f3629554e9e3b011 URL: https://github.com/kamailio/kamailio/commit/ce08c374e46532591ce54e29f362955… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-05-10T11:07:51+03:00 rtpengine: fix unaligned memory access Make sure the pointers we return from our continuous memory buffer is always 64-bit aligned as it's used not only for strings, but also for structs/objects, and such unaligned memory access is undefined on some archs and flagged as such by ASAN. From https://github.com/sipwise/rtpengine/commit/ade8100d3b10308f1ff63f8cb06fdf2… fixes #3444 (cherry-picked from commit 43ac6b27d7ca7bc522f362c25ebb3c22ab918280) --- Modified: src/modules/rtpengine/bencode.c --- Diff: https://github.com/kamailio/kamailio/commit/ce08c374e46532591ce54e29f362955… Patch: https://github.com/kamailio/kamailio/commit/ce08c374e46532591ce54e29f362955… --- diff --git a/src/modules/rtpengine/bencode.c b/src/modules/rtpengine/bencode.c index 7a4b2ed0da2..cca17326242 100644 --- a/src/modules/rtpengine/bencode.c +++ b/src/modules/rtpengine/bencode.c @@ -12,6 +12,8 @@ #define BENCODE_HASH_BUCKETS 31 /* prime numbers work best */ +#define BENCODE_ALLOC_ALIGN 8 + struct __bencode_buffer_piece { char *tail; unsigned int left; @@ -76,7 +78,7 @@ static struct __bencode_buffer_piece *__bencode_piece_new(unsigned int size) { if (size < BENCODE_MIN_BUFFER_PIECE_LEN) size = BENCODE_MIN_BUFFER_PIECE_LEN; - ret = BENCODE_MALLOC(sizeof(*ret) + size); + ret = BENCODE_MALLOC(sizeof(*ret) + size + BENCODE_ALLOC_ALIGN); if (!ret) return NULL; @@ -99,6 +101,7 @@ int bencode_buffer_init(bencode_buffer_t *buf) { static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { struct __bencode_buffer_piece *piece; void *ret; + unsigned int align_size = ((size + BENCODE_ALLOC_ALIGN - 1) / BENCODE_ALLOC_ALIGN) * BENCODE_ALLOC_ALIGN; if (!buf) return NULL; @@ -121,9 +124,12 @@ static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { assert(size <= piece->left); alloc: - piece->left -= size; + if (piece->left >= align_size) + piece->left -= align_size; + else + piece->left = 0; ret = piece->tail; - piece->tail += size; + piece->tail += align_size; return ret; }

1 0

git:5.6:24989241: rtpengine: fix unaligned memory access
by Stefan Mititelu 10 May '23

10 May '23

Module: kamailio Branch: 5.6 Commit: 24989241cfc58c6ba47d48c9a86921251f4ba235 URL: https://github.com/kamailio/kamailio/commit/24989241cfc58c6ba47d48c9a869212… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-05-10T11:07:02+03:00 rtpengine: fix unaligned memory access Make sure the pointers we return from our continuous memory buffer is always 64-bit aligned as it's used not only for strings, but also for structs/objects, and such unaligned memory access is undefined on some archs and flagged as such by ASAN. From https://github.com/sipwise/rtpengine/commit/ade8100d3b10308f1ff63f8cb06fdf2… fixes #3444 (cherry-picked from commit 43ac6b27d7ca7bc522f362c25ebb3c22ab918280) --- Modified: src/modules/rtpengine/bencode.c --- Diff: https://github.com/kamailio/kamailio/commit/24989241cfc58c6ba47d48c9a869212… Patch: https://github.com/kamailio/kamailio/commit/24989241cfc58c6ba47d48c9a869212… --- diff --git a/src/modules/rtpengine/bencode.c b/src/modules/rtpengine/bencode.c index 7a4b2ed0da..cca1732624 100644 --- a/src/modules/rtpengine/bencode.c +++ b/src/modules/rtpengine/bencode.c @@ -12,6 +12,8 @@ #define BENCODE_HASH_BUCKETS 31 /* prime numbers work best */ +#define BENCODE_ALLOC_ALIGN 8 + struct __bencode_buffer_piece { char *tail; unsigned int left; @@ -76,7 +78,7 @@ static struct __bencode_buffer_piece *__bencode_piece_new(unsigned int size) { if (size < BENCODE_MIN_BUFFER_PIECE_LEN) size = BENCODE_MIN_BUFFER_PIECE_LEN; - ret = BENCODE_MALLOC(sizeof(*ret) + size); + ret = BENCODE_MALLOC(sizeof(*ret) + size + BENCODE_ALLOC_ALIGN); if (!ret) return NULL; @@ -99,6 +101,7 @@ int bencode_buffer_init(bencode_buffer_t *buf) { static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { struct __bencode_buffer_piece *piece; void *ret; + unsigned int align_size = ((size + BENCODE_ALLOC_ALIGN - 1) / BENCODE_ALLOC_ALIGN) * BENCODE_ALLOC_ALIGN; if (!buf) return NULL; @@ -121,9 +124,12 @@ static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { assert(size <= piece->left); alloc: - piece->left -= size; + if (piece->left >= align_size) + piece->left -= align_size; + else + piece->left = 0; ret = piece->tail; - piece->tail += size; + piece->tail += align_size; return ret; }

1 0

git:5.7:04b49bb8: rtpengine: fix unaligned memory access
by Stefan Mititelu 10 May '23

10 May '23

Module: kamailio Branch: 5.7 Commit: 04b49bb89fe6482a351a06ed08a9e9db5e934faf URL: https://github.com/kamailio/kamailio/commit/04b49bb89fe6482a351a06ed08a9e9d… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-05-10T11:05:18+03:00 rtpengine: fix unaligned memory access Make sure the pointers we return from our continuous memory buffer is always 64-bit aligned as it's used not only for strings, but also for structs/objects, and such unaligned memory access is undefined on some archs and flagged as such by ASAN. From https://github.com/sipwise/rtpengine/commit/ade8100d3b10308f1ff63f8cb06fdf2… fixes #3444 (cherry-picked from commit 43ac6b27d7ca7bc522f362c25ebb3c22ab918280) --- Modified: src/modules/rtpengine/bencode.c --- Diff: https://github.com/kamailio/kamailio/commit/04b49bb89fe6482a351a06ed08a9e9d… Patch: https://github.com/kamailio/kamailio/commit/04b49bb89fe6482a351a06ed08a9e9d… --- diff --git a/src/modules/rtpengine/bencode.c b/src/modules/rtpengine/bencode.c index 7a4b2ed0da2..cca17326242 100644 --- a/src/modules/rtpengine/bencode.c +++ b/src/modules/rtpengine/bencode.c @@ -12,6 +12,8 @@ #define BENCODE_HASH_BUCKETS 31 /* prime numbers work best */ +#define BENCODE_ALLOC_ALIGN 8 + struct __bencode_buffer_piece { char *tail; unsigned int left; @@ -76,7 +78,7 @@ static struct __bencode_buffer_piece *__bencode_piece_new(unsigned int size) { if (size < BENCODE_MIN_BUFFER_PIECE_LEN) size = BENCODE_MIN_BUFFER_PIECE_LEN; - ret = BENCODE_MALLOC(sizeof(*ret) + size); + ret = BENCODE_MALLOC(sizeof(*ret) + size + BENCODE_ALLOC_ALIGN); if (!ret) return NULL; @@ -99,6 +101,7 @@ int bencode_buffer_init(bencode_buffer_t *buf) { static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { struct __bencode_buffer_piece *piece; void *ret; + unsigned int align_size = ((size + BENCODE_ALLOC_ALIGN - 1) / BENCODE_ALLOC_ALIGN) * BENCODE_ALLOC_ALIGN; if (!buf) return NULL; @@ -121,9 +124,12 @@ static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { assert(size <= piece->left); alloc: - piece->left -= size; + if (piece->left >= align_size) + piece->left -= align_size; + else + piece->left = 0; ret = piece->tail; - piece->tail += size; + piece->tail += align_size; return ret; }

1 0

[kamailio/kamailio] 5.7 crash due to rtpengine module bencode, on aarch64 (raspberry pi) (Issue #3444)
by Stefan Mititelu 10 May '23

10 May '23

Hi, I've built today the 5.7 debs for kamailio together with latest rtpengine master branch debs (commit 13a7e1d), for raspberry pi and tried to give it a try: ``` root@pisip:~# sudo dpkg -l | grep kama ii kamailio 5.7.0~rc0 armhf very fast, dynamic and configurable SIP server ii kamailio-dbg:armhf 5.7.0~rc0 armhf very fast and configurable SIP server [debug symbols] ii kamailio-presence-modules:armhf 5.7.0~rc0 armhf SIP presence modules for Kamailio ii kamailio-tls-modules:armhf 5.7.0~rc0 armhf TLS support for the Kamailio SIP server (authentication, transport) ii kamailio-websocket-modules:armhf 5.7.0~rc0 armhf WebSocket module for the Kamailio SIP server root@pisip:~# sudo dpkg -l | grep rtpe ii ngcp-rtpengine 11.4.0.0+0~mr11.4.0.0 all NGCP RTP/media proxy - meta package ii ngcp-rtpengine-daemon 11.4.0.0+0~mr11.4.0.0 armhf proxy for RTP and media streams used in NGCP, userspace part ii ngcp-rtpengine-iptables 11.4.0.0+0~mr11.4.0.0 armhf IPtables extension module for the kernel-space NGCP media proxy ii ngcp-rtpengine-kernel-dkms 11.4.0.0+0~mr11.4.0.0 all IPtables kernel module for the NGCP media proxy - DKMS ii ngcp-rtpengine-recording-daemon 11.4.0.0+0~mr11.4.0.0 armhf recording daemon for RTP and media streams ii ngcp-rtpengine-utils 11.4.0.0+0~mr11.4.0.0 all scripts and Perl modules for NGCP rtpengine root@pisip:~# sudo dpkg -l | grep bencode ii libbencode-perl 1.501-1.1 all Perl module for BitTorrent serialisation format root@pisip:~# uname -a Linux ... 6.1.25-v8+ #1647 SMP PREEMPT Wed Apr 26 17:39:08 BST 2023 aarch64 GNU/Linux root@pisip:~# cat /etc/issue Raspbian GNU/Linux 11 \n \l ``` Kamailio crashes on startup, only when rtpengine module is loaded and rtp proxies are queried: ``` GNU gdb (Raspbian 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 "arm-linux-gnueabihf". 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 kamailio... Reading symbols from /usr/lib/debug/.build-id/b1/3b2e37e49071a519b33ce95a0b555c21a2d8f4.debug... warning: Can't open file /dev/zero (deleted) during file-backed mapping note processing [New LWP 5455] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/arm-linux-gnueabihf/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio_pid -f /etc/kamailio/kamailio_'. Program terminated with signal SIGBUS, Bus error. #0 0xf3237de8 in __bencode_decode_dictionary (end=0xf3294859 <buf+25> "", s=0xf329484a <buf+10> "6:result4:ponge", buf=0xffd06608) at bencode.c:464 464 bencode.c: No such file or directory. (gdb) bt #0 0xf3237de8 in __bencode_decode_dictionary (end=0xf3294859 <buf+25> "", s=0xf329484a <buf+10> "6:result4:ponge", buf=0xffd06608) at bencode.c:464 #1 __bencode_decode (buf=buf@entry=0xffd06608, s=0xf3294849 <buf+9> "d6:result4:ponge", end=0xf3294859 <buf+25> "") at bencode.c:613 #2 0xf3238a98 in bencode_decode (buf=buf@entry=0xffd06608, s=<optimized out>, len=<optimized out>) at bencode.c:638 #3 0xf32469dc in bencode_decode_expect (expect=BENCODE_DICTIONARY, len=<optimized out>, s=<optimized out>, buf=0xffd06600) at bencode.h:490 #4 rtpp_test (node=node@entry=0xb31464d0, isdisabled=isdisabled@entry=0, force=force@entry=1) at rtpengine.c:2954 #5 0xf324ef5c in build_rtpp_socks (lmode=lmode@entry=0, rtest=-1968410368, rtest@entry=1) at rtpengine.c:2021 #6 0xf32516d4 in child_init (rank=1) at rtpengine.c:2105 #7 child_init (rank=1) at rtpengine.c:2082 #8 0x0019fe08 in init_mod_child (m=0xf5cbbb54, rank=rank@entry=1) at core/sr_module.c:899 #9 0x0019fdd4 in init_mod_child (m=0xf5cbc2dc, rank=rank@entry=1) at core/sr_module.c:892 #10 0x0019fdd4 in init_mod_child (m=0xf5cbdbe4, rank=rank@entry=1) at core/sr_module.c:892 #11 0x0019fdd4 in init_mod_child (m=0xf5cbe46c, rank=rank@entry=1) at core/sr_module.c:892 #12 0x0019fdd4 in init_mod_child (m=0xf5cbe6fc, rank=rank@entry=1) at core/sr_module.c:892 #13 0x0019fdd4 in init_mod_child (m=0xf5cbea70, rank=rank@entry=1) at core/sr_module.c:892 #14 0x0019fdd4 in init_mod_child (m=0xf5cc4d64, rank=rank@entry=1) at core/sr_module.c:892 #15 0x0019fdd4 in init_mod_child (m=0xf5cc5558, rank=rank@entry=1) at core/sr_module.c:892 #16 0x0019fdd4 in init_mod_child (m=0xf5cc6670, rank=rank@entry=1) at core/sr_module.c:892 #17 0x0019fdd4 in init_mod_child (m=0xf5cc7630, rank=rank@entry=1) at core/sr_module.c:892 #18 0x001a486c in init_child (rank=rank@entry=1) at core/sr_module.c:953 #19 0x001117b0 in fork_process (child_id=1, desc=desc@entry=0xffd06f44 "\230I\244\001\214:\323\365udp receiver child=0 sock=192.168.100.57:50060 (86.123.193.247:50060)", make_sock=make_sock@entry=1) at core/pt.c:337 #20 0x000369c8 in main_loop () at main.c:1708 #21 0x0002c21c in main (argc=<optimized out>, argv=0xffd074a4) at main.c:3086 ``` Looks like some bencode issue I'm having but lib bencode version looks ok. So far couldn't figure it out. Note that I also had a kernel bump to 6.1.25-v8+ recently. Any opinions on this? Thank you, Stefan -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3444 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3444(a)github.com>

4 9

git:master:6b4e3b4b: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 10 May '23

10 May '23

Module: kamailio Branch: master Commit: 6b4e3b4b227381bfe896b23af5c4ce996c95f6e8 URL: https://github.com/kamailio/kamailio/commit/6b4e3b4b227381bfe896b23af5c4ce9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-10T09:46:21+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/6b4e3b4b227381bfe896b23af5c4ce9… Patch: https://github.com/kamailio/kamailio/commit/6b4e3b4b227381bfe896b23af5c4ce9… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 351aedd766..ae0702db5b 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -54,6 +54,7 @@ Patric Marschall 3.27. default_db_url(str) 3.28. matching_mode(int) 3.29. UTC_timestamps(int) + 3.30. use_domain_crc32(str) 4. Changes from usrloc module @@ -126,8 +127,9 @@ Patric Marschall 1.27. Set default_db_type parameter 1.28. Set matching_mode parameter 1.29. Set UTC_timestamps parameter - 1.30. Set db_mode parameter - 1.31. Example database content - reg_table (locdb) table + 1.30. Set use_domain_crc32 parameter + 1.31. Set db_mode parameter + 1.32. Example database content - reg_table (locdb) table Chapter 1. User's Guide @@ -170,6 +172,7 @@ Chapter 1. User's Guide 3.27. default_db_url(str) 3.28. matching_mode(int) 3.29. UTC_timestamps(int) + 3.30. use_domain_crc32(str) 4. Changes from usrloc module @@ -289,6 +292,7 @@ Warning 3.27. default_db_url(str) 3.28. matching_mode(int) 3.29. UTC_timestamps(int) + 3.30. use_domain_crc32(str) 3.1. write_db_url (string) @@ -696,6 +700,18 @@ kamcmd cfg.get p_usrloc matching_mode modparam("p_usrloc", "UTC_timestamps", 1) ... +3.30. use_domain_crc32(str) + + Enables or disables the crc32 of domain part for user@domain. If + disabled, will calculate crc32 only for user part. + + Default value is ��1�� (enabled). + + Example 1.30. Set use_domain_crc32 parameter +... +modparam("p_usrloc", "use_domain_crc32", "0") +... + 4. Changes from usrloc module 4.1. db_mode (integer) @@ -718,7 +734,7 @@ modparam("p_usrloc", "UTC_timestamps", 1) Default value is 3. - Example 1.30. Set db_mode parameter + Example 1.31. Set db_mode parameter ... modparam("p_usrloc", "db_mode", 2) ... @@ -752,7 +768,7 @@ modparam("p_usrloc", "db_mode", 2) complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. - Example 1.31. Example database content - reg_table (locdb) table + Example 1.32. Example database content - reg_table (locdb) table ... +----+----+------+--------+--------+---------------------+-------+----+ | id | no | url | status | errors | failover | spare | rg |

1 0

git:master:81d33005: p_usrloc: Add use_domain_crc32 modparam
by Stefan Mititelu 10 May '23

10 May '23

Module: kamailio Branch: master Commit: 81d33005df808699a7e8068883ab76e30a299d0f URL: https://github.com/kamailio/kamailio/commit/81d33005df808699a7e8068883ab76e… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-05-10T10:41:02+03:00 p_usrloc: Add use_domain_crc32 modparam --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db_handle.c --- Diff: https://github.com/kamailio/kamailio/commit/81d33005df808699a7e8068883ab76e… Patch: https://github.com/kamailio/kamailio/commit/81d33005df808699a7e8068883ab76e… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 37c84bf20b1..0a8ba7be487 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -779,6 +779,27 @@ modparam("p_usrloc", "UTC_timestamps", 1) </example> </section> + <section> + <title><varname>use_domain_crc32</varname>(str)</title> + <para> + Enables or disables the crc32 of domain part for user@domain. + If disabled, will calculate crc32 only for user part. + </para> + <para> + <emphasis> + Default value is <quote>1</quote> (enabled). + </emphasis> + </para> + <example> + <title>Set <varname>use_domain_crc32</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("p_usrloc", "use_domain_crc32", "0") +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/p_usrloc/p_usrloc_mod.c b/src/modules/p_usrloc/p_usrloc_mod.c index ac3c34775a7..20d4b13f7fb 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.c +++ b/src/modules/p_usrloc/p_usrloc_mod.c @@ -147,6 +147,7 @@ str last_mod_col = str_init(LAST_MOD_COL); /*!< Name of column containing t str uniq_col = str_init(UNIQ_COL); /*!< Name of column containing the uniq value*/ int db_mode = 3; /*!< Database sync scheme: 1-write through, 2-write back, 3-only db */ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ +int use_domain_crc32 = 1; /*!< Whether usrloc should use domain part of aor when calculating crc32 */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ @@ -212,6 +213,7 @@ static param_export_t params[] = { {"cflags_column", PARAM_STR, &cflags_col }, {"db_mode", INT_PARAM, &db_mode }, {"use_domain", INT_PARAM, &use_domain }, + {"use_domain_crc32", INT_PARAM, &use_domain_crc32 }, {"desc_time_order", INT_PARAM, &desc_time_order }, {"user_agent_column", PARAM_STR, &user_agent_col}, {"received_column", PARAM_STR, &received_col }, diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index 800a71851a8..a8b8c74dd98 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -88,6 +88,7 @@ extern str uniq_col; extern int db_mode; extern int use_domain; +extern int use_domain_crc32; extern int desc_time_order; extern int cseq_delay; extern int ul_fetch_rows; diff --git a/src/modules/p_usrloc/ul_db_handle.c b/src/modules/p_usrloc/ul_db_handle.c index 134dc32e599..4e4eab0848e 100644 --- a/src/modules/p_usrloc/ul_db_handle.c +++ b/src/modules/p_usrloc/ul_db_handle.c @@ -461,7 +461,7 @@ static int compute_id(str* first, str* second){ return -1; } - if(use_domain){ + if(use_domain && use_domain_crc32) { //compute crc32(user@domain) LM_DBG("XDBGX: compute_id HAS second key : %.*s", first->len, first->s); if(!second){

1 0

[kamailio/kamailio] p_usrloc: Add use_domain_crc32 modparam (PR #3427)
by Stefan Mititelu 10 May '23

10 May '23

#### 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  Needed a way to use_domain but calculate crc32 for user part only. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3427 -- Commit Summary -- * p_usrloc: Add use_domain_crc32 modparam -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (21) M src/modules/p_usrloc/p_usrloc_mod.c (2) M src/modules/p_usrloc/p_usrloc_mod.h (1) M src/modules/p_usrloc/ul_db_handle.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3427.patch https://github.com/kamailio/kamailio/pull/3427.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3427 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3427(a)github.com>

3 7

git:5.6:2d7b6c32: dialplan: fix ki_dp_translate() checks for input/output parameters
by Victor Seva 09 May '23

09 May '23

Module: kamailio Branch: 5.6 Commit: 2d7b6c32552b1e2a8b095192bb22e0f776e18100 URL: https://github.com/kamailio/kamailio/commit/2d7b6c32552b1e2a8b095192bb22e0f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-10T00:59:39+02:00 dialplan: fix ki_dp_translate() checks for input/output parameters fixes #3447 (cherry picked from commit ab0a2be6b522c1b48a2442447c24e7ab156e3d4e) (cherry picked from commit 5f3ed08b5e234465d4fb909460367a63ed63a550) --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/2d7b6c32552b1e2a8b095192bb22e0f… Patch: https://github.com/kamailio/kamailio/commit/2d7b6c32552b1e2a8b095192bb22e0f… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index fb57faa55d1..26c68f777fd 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -872,9 +872,12 @@ static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_s if (!msg) return -1; - if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || - output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { - LM_ERR("invalid destination var name for input or output\n"); + if (input_spv != NULL && (input_spv->s == NULL || input_spv->len <= 0)) { + LM_ERR("invalid destination var name for input\n"); + return -1; + } + if (output_spv != NULL && (output_spv->s == NULL || output_spv->len <= 0)) { + LM_ERR("invalid destination var name for output\n"); return -1; }

1 0

git:5.7:5f3ed08b: dialplan: fix ki_dp_translate() checks for input/output parameters
by Victor Seva 09 May '23

09 May '23

Module: kamailio Branch: 5.7 Commit: 5f3ed08b5e234465d4fb909460367a63ed63a550 URL: https://github.com/kamailio/kamailio/commit/5f3ed08b5e234465d4fb909460367a6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-10T00:59:18+02:00 dialplan: fix ki_dp_translate() checks for input/output parameters fixes #3447 (cherry picked from commit ab0a2be6b522c1b48a2442447c24e7ab156e3d4e) --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/5f3ed08b5e234465d4fb909460367a6… Patch: https://github.com/kamailio/kamailio/commit/5f3ed08b5e234465d4fb909460367a6… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index fb57faa55d1..26c68f777fd 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -872,9 +872,12 @@ static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_s if (!msg) return -1; - if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || - output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { - LM_ERR("invalid destination var name for input or output\n"); + if (input_spv != NULL && (input_spv->s == NULL || input_spv->len <= 0)) { + LM_ERR("invalid destination var name for input\n"); + return -1; + } + if (output_spv != NULL && (output_spv->s == NULL || output_spv->len <= 0)) { + LM_ERR("invalid destination var name for output\n"); return -1; }

1 0

[kamailio/kamailio] dialplan: KSR.dialplan.dp_translate produces ERROR (Issue #3447)
by Victor Seva 09 May '23

09 May '23

### Description Calling ``KSR.dialplan.dp_translate(<id>)`` always produces ERROR in parameters since the default ones are not used in KEMI function ``ki_dp_translate_id()`` #### Log Messages ``` dialplan [dialplan.c:877]: ki_dp_translate(): invalid destination var name for input or output ``` ### Possible Solutions use default "$rU/$rU" as documented https://kamailio.org/docs/modules/5.6.x/modules/dialplan.html#dialplan.p.dp… ### 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 10.2.1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3447 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3447(a)github.com>

1 1

git:master:ab0a2be6: dialplan: fix ki_dp_translate() checks for input/output parameters
by Victor Seva 09 May '23

09 May '23

Module: kamailio Branch: master Commit: ab0a2be6b522c1b48a2442447c24e7ab156e3d4e URL: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-09T23:28:04+02:00 dialplan: fix ki_dp_translate() checks for input/output parameters fixes #3447 --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… Patch: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index fb57faa55d1..26c68f777fd 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -872,9 +872,12 @@ static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_s if (!msg) return -1; - if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || - output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { - LM_ERR("invalid destination var name for input or output\n"); + if (input_spv != NULL && (input_spv->s == NULL || input_spv->len <= 0)) { + LM_ERR("invalid destination var name for input\n"); + return -1; + } + if (output_spv != NULL && (output_spv->s == NULL || output_spv->len <= 0)) { + LM_ERR("invalid destination var name for output\n"); return -1; }

1 0

git:master:84dbcdb8: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 09 May '23

09 May '23

Module: kamailio Branch: master Commit: 84dbcdb812fce70d6d470050793125698c06d0fd URL: https://github.com/kamailio/kamailio/commit/84dbcdb812fce70d6d4700507931256… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-09T20:31:14+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/84dbcdb812fce70d6d4700507931256… Patch: https://github.com/kamailio/kamailio/commit/84dbcdb812fce70d6d4700507931256… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 360577c8d1..92c06d8714 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -745,6 +745,10 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") * socket - the string representing the socket on which the register request was received, as alternative to using the sock_hdr. Used in save(). + * tcpconn_id This can be set with $conid, the TCP connection ID of + the connection the current message. This is useful when calling + save() on a reply route to set the connecion of the original + request. Used in save(). For example. if this parameter is set to 'reg', then the number of maximum contacts can be set in $xavp(reg=>max_contacts). diff --git a/src/modules/tls/README b/src/modules/tls/README index ed3c290803..7198c45529 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -81,7 +81,8 @@ Olle E. Johansson 12.1. tls.info 12.2. tls.list 12.3. tls.options - 12.4. tls.reload + 12.4. tls.kill + 12.5. tls.reload 13. Status @@ -213,7 +214,8 @@ Chapter 1. Admin Guide 12.1. tls.info 12.2. tls.list 12.3. tls.options - 12.4. tls.reload + 12.4. tls.kill + 12.5. tls.reload 13. Status @@ -1641,7 +1643,8 @@ verify_client = optional_no_ca 12.1. tls.info 12.2. tls.list 12.3. tls.options - 12.4. tls.reload + 12.4. tls.kill + 12.5. tls.reload 12.1. tls.info @@ -1665,7 +1668,14 @@ verify_client = optional_no_ca Parameters: * None. -12.4. tls.reload +12.4. tls.kill + + Kill a TLS session by id. + + Parameters: + * None. + +12.5. tls.reload Reload the external TLS configuration file (aka tls.cfg). It does not reload modparam() parameters. Note that existing active TLS connections

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev