sr-dev July 2023

sr-dev@lists.kamailio.org

15 participants
240 discussions

git:5.5:a5c798a2: htable: set dbload filed on empty db result

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: a5c798a2292323e235df5423cdc27eea46bddbbf URL: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:53+02:00 htable: set dbload filed on empty db result (cherry picked from commit ba9d663c5d382edef3c98b31aa4341b21c307a34) (cherry picked from commit 27ab4b757805083c231ceb109a46f5501b1baa7c) (cherry picked from commit 249f476403f987917ed7d5c7f6d7ea70e1f43e63) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… Patch: https://github.com/kamailio/kamailio/commit/a5c798a2292323e235df5423cdc27ee… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index cbce085f6c5..f76ea463201 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -249,6 +249,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if(RES_ROW_N(db_res)==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; LM_DBG("Nothing to be loaded in hash table\n"); return 0; } @@ -261,6 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if( ret==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; return 0; } else { goto error;

1 year, 5 months

git:5.5:2555e1b1: tm: enhance documentation for on_sl_reply param

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 2555e1b1a02af8d96504c43953ab395097c86adb URL: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:44+02:00 tm: enhance documentation for on_sl_reply param (cherry picked from commit a4970749b2be40cd598d4ce5cf2eaa6b38fc2307) (cherry picked from commit 2f86215a704ff10a58cb3f5e57497918c381a048) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… Patch: https://github.com/kamailio/kamailio/commit/2555e1b1a02af8d96504c43953ab395… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 247d6ad5e6d..d8f8251818d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -715,7 +715,7 @@ modparam("tm", "reparse_on_dns_failover", 0) </para> <para> If KEMI is used, the parameter has to be the KEMI function name, which - receives a string parameter with the event name. + receives a string parameter with the event name, respectively "on_sl_reply". </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,6 +727,20 @@ modparam("tm", "on_sl_reply", "stateless_replies") onreply_route["stateless_replies"] { # do not allow stateless replies to be forwarded return 0; +} + </programlisting> + </example> + <example> + <title>Set <varname>on_sl_reply</varname> parameter (KEMI javascript)</title> + <programlisting> +... +modparam("tm", "on_sl_reply", "ksr_slreply") +... +-- event callback function implemented in javascript +function ksr_slreply(evname) { + # the evname is set to "on_sl_reply" + # do not allow stateless replies to be forwarded + KSR.x.drop(); } </programlisting> </example>

1 year, 5 months

git:5.5:23470fcc: app_lua: fix crash on exausted memory scenario

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 23470fccf6e54d7f853e6df4ab519feb30272721 URL: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:35+02:00 app_lua: fix crash on exausted memory scenario (cherry picked from commit ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6) (cherry picked from commit b524321a4871c349e6ebb464ea018e138bc6d5ed) --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… Patch: https://github.com/kamailio/kamailio/commit/23470fccf6e54d7f853e6df4ab519fe… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index f736bea98b9..c3d16c98129 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -852,6 +852,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -891,6 +895,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 year, 5 months

git:5.5:b1953700: auth_ephemeral: fix authentication with secrets added at runtime (#3390)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b1953700ae03bde4c4b4d0c549d09c2f66e8ec09 URL: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2… Author: Dennis <dennis_y(a)mail.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:23+02:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. (cherry picked from commit 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc) (cherry picked from commit ca13a3382b9067a0dc14fc7ec995ec2d95c8c6cb) --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2… Patch: https://github.com/kamailio/kamailio/commit/b1953700ae03bde4c4b4d0c549d09c2…

1 year, 5 months

git:5.5:2a5c590a: sqlops: do not allow empty name component in URL

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 2a5c590ae8e3fb435670d0bd97deda35d22a33ad URL: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:16:10+02:00 sqlops: do not allow empty name component in URL (cherry picked from commit b15db86e93120824dcfc879099432f3ec1c3b0c7) (cherry picked from commit 9daacc36e3ed858eca97e9b7ac7eaa90e10c0803) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… Patch: https://github.com/kamailio/kamailio/commit/2a5c590ae8e3fb435670d0bd97deda3… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 63c035ca89e..eed82f0a149 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -677,6 +677,9 @@ int sql_parse_param(char *val) if(p>in.s+in.len || *p=='\0') goto error; name.len = p - name.s; + if(name.len==0) { + goto error; + } if(*p!='=') { while(p<in.s+in.len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))

1 year, 5 months

git:5.6:7ee2bfb3: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.6 Commit: 7ee2bfb30f1119bc8c5b2eddf8f81be77f4804da URL: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-17T11:18:01+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be… Patch: https://github.com/kamailio/kamailio/commit/7ee2bfb30f1119bc8c5b2eddf8f81be…

1 year, 5 months

git:5.6:5fc4cca3: sst: fix condition on sst_min_se for sst_check_min()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 5fc4cca395e057714376b681bbad4935a9570d0d URL: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:44:58+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) (cherry picked from commit febfc9722f83d992a3c1643fa373468b73cb3fa0) --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… Patch: https://github.com/kamailio/kamailio/commit/5fc4cca395e057714376b681bbad493… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index 55010baaee2..690c03ddfac 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -672,7 +672,7 @@ int ki_sst_check_min(struct sip_msg *msg, int flag) * too small. We will take the smaller of the messages * Session-expires and min-se if stated. */ - if (sst_min_se < MIN(minse, se.interval)) { + if(sst_min_se > MIN(minse, se.interval)) { /* * Too small. See if we need to send the 422 and are able * to send it.

1 year, 5 months

git:5.6:771fcd42: ipops: create container items if not found for srv and naptr functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 771fcd42e315376c9d3c16bb63983a72e508be18 URL: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:44:34+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) (cherry picked from commit 408643ec916bc00f9f9447952e553d129f8ec896) --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… Patch: https://github.com/kamailio/kamailio/commit/771fcd42e315376c9d3c16bb63983a7… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 9ee6f5879a5..444fb084d9e 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -640,7 +640,7 @@ static sr_srv_item_t *_sr_srv_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found; 1 - search only * OUTPUT: srv record pointer; NULL=not found **********/ @@ -1029,9 +1029,9 @@ int srv_update_pv (str *srvcname, str *pvid) LM_DBG ("service name missing: %.*s\n", srvcname->len, srvcname->s); return -2; } - pitem = sr_srv_add_item (pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_srv_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; } @@ -1192,7 +1192,7 @@ static sr_naptr_item_t *_sr_naptr_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found, 1 - search only * OUTPUT: naptr record pointer; NULL=not found **********/ @@ -1498,9 +1498,9 @@ int naptr_update_pv(str *naptrname, str *pvid) LM_DBG ("naptr name missing: %.*s\n", naptrname->len, naptrname->s); return -2; } - pitem = sr_naptr_add_item(pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_naptr_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; }

1 year, 5 months

git:5.6:249f4764: htable: set dbload filed on empty db result

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 249f476403f987917ed7d5c7f6d7ea70e1f43e63 URL: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:43:12+02:00 htable: set dbload filed on empty db result (cherry picked from commit ba9d663c5d382edef3c98b31aa4341b21c307a34) (cherry picked from commit 27ab4b757805083c231ceb109a46f5501b1baa7c) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… Patch: https://github.com/kamailio/kamailio/commit/249f476403f987917ed7d5c7f6d7ea7… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index bbcba99913b..b091113b637 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -249,6 +249,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if(RES_ROW_N(db_res)==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; LM_DBG("Nothing to be loaded in hash table\n"); return 0; } @@ -261,6 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if( ret==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; return 0; } else { goto error;

1 year, 5 months

git:5.6:2f86215a: tm: enhance documentation for on_sl_reply param

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 2f86215a704ff10a58cb3f5e57497918c381a048 URL: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:38:18+02:00 tm: enhance documentation for on_sl_reply param (cherry picked from commit a4970749b2be40cd598d4ce5cf2eaa6b38fc2307) --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… Patch: https://github.com/kamailio/kamailio/commit/2f86215a704ff10a58cb3f5e5749791… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 3f67ae3f4d9..8c01ab78d0c 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -715,7 +715,7 @@ modparam("tm", "reparse_on_dns_failover", 0) </para> <para> If KEMI is used, the parameter has to be the KEMI function name, which - receives a string parameter with the event name. + receives a string parameter with the event name, respectively "on_sl_reply". </para> <example> <title>Set <varname>on_sl_reply</varname> parameter</title> @@ -727,6 +727,20 @@ modparam("tm", "on_sl_reply", "stateless_replies") onreply_route["stateless_replies"] { # do not allow stateless replies to be forwarded return 0; +} + </programlisting> + </example> + <example> + <title>Set <varname>on_sl_reply</varname> parameter (KEMI javascript)</title> + <programlisting> +... +modparam("tm", "on_sl_reply", "ksr_slreply") +... +-- event callback function implemented in javascript +function ksr_slreply(evname) { + # the evname is set to "on_sl_reply" + # do not allow stateless replies to be forwarded + KSR.x.drop(); } </programlisting> </example>

1 year, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2023