sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
260 discussions

git:master:7583b930: Makefile.defs: version set to 5.6.0-dev3

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7583b9300864caeb6538a3bfbaf30aa7b0a22ba3 URL: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-06T11:10:12+01:00 Makefile.defs: version set to 5.6.0-dev3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… Patch: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 57bccfe725..84f9438bc4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc)

2 years, 3 months

git:master:f7358b01: db_cluster: enclose block in curly braces

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7358b01efd0d8d71edf730d1a8cf4c9555d1dd8 URL: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-06T11:08:09+01:00 db_cluster: enclose block in curly braces - fix returning always introduced in previous commit --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… Patch: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index c42d5b2aa9..07192d6362 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -263,9 +263,10 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) return; } - if(con->sinfo==NULL) + if(con->sinfo==NULL) { rpc->fault(c, 500, "Cluster state info missing."); return; + } /* Overwrite the number of seconds if the connection is already disabled. */ if (con->sinfo->state & DBCL_CON_INACTIVE)

2 years, 3 months

[kamailio/kamailio] pua : default_expires parameter is not used in code (Issue #2994)

by adita76

### Description pua : default_expires parameter is not functionally used in code It is not used neither in pua module, nor in others pua_* modules. ### Troubleshooting Its presence is confusing if it does nothing, but it is described in documentation. ### Possible Solutions Can it be used as default expires for subscriptions related to pua events ? Otherwise it should be removed. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2994 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2994(a)github.com>

2 years, 3 months

git:master:50a976f0: pua: use parameter default_expires instead of 3600 constant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 50a976f00e4ee19c24260a10f0a70349fe2d9d6d URL: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-05T18:44:41+01:00 pua: use parameter default_expires instead of 3600 constant - GH #2994 --- Modified: src/modules/pua/pua.c Modified: src/modules/pua/pua.h Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… Patch: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… --- diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index d0c89ba10d..be68e29549 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -58,7 +58,7 @@ htable_t* HashT= NULL; int HASH_SIZE= -1; extern int bind_pua(pua_api_t* api); int min_expires= 0; -int default_expires=3600; +int pua_default_expires=3600; static str db_url = str_init(DEFAULT_DB_URL); str db_table= str_init("pua"); int update_period= 100; @@ -126,7 +126,7 @@ static param_export_t params[]={ {"db_url", PARAM_STR, &db_url}, {"db_table", PARAM_STR, &db_table}, {"min_expires", INT_PARAM, &min_expires}, - {"default_expires", INT_PARAM, &default_expires}, + {"default_expires", INT_PARAM, &pua_default_expires}, {"update_period", INT_PARAM, &update_period}, {"outbound_proxy", PARAM_STR, &outbound_proxy}, {"dlginfo_increase_version", INT_PARAM, &dlginfo_increase_version}, @@ -162,8 +162,8 @@ static int mod_init(void) if(min_expires< 0) min_expires= 0; - if(default_expires< 600) - default_expires= 3600; + if(pua_default_expires< 600) + pua_default_expires= 3600; if(pua_rpc_init()<0) { LM_ERR("failed to register RPC commands\n"); @@ -702,7 +702,7 @@ int update_pua(ua_pres_t* p) dlg_t* td = NULL; if(p->desired_expires== 0) - expires= 3600; + expires= pua_default_expires; else expires= p->desired_expires- (int)time(NULL); @@ -1255,4 +1255,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_pua_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 908f5b0cb3..7d99c0f796 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -43,7 +43,7 @@ extern htable_t* HashT; extern int HASH_SIZE; extern int min_expires; extern int pua_ul_publish; -extern int default_expires; +extern int pua_default_expires; extern str outbound_proxy; extern int check_remote_contact; extern int dbmode; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 338ee892b4..e2e4c0ca7f 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -668,7 +668,7 @@ int send_publish( publ_info_t* publ ) if(publ->flag & UPDATE_TYPE) LM_DBG("etag:%.*s\n", etag.len, etag.s); - str_hdr = publ_build_hdr((publ->expires< 0)?3600:publ->expires, ev, &publ->content_type, + str_hdr = publ_build_hdr((publ->expires< 0)?pua_default_expires:publ->expires, ev, &publ->content_type, (publ->flag & UPDATE_TYPE)?&etag:NULL, publ->extra_headers, (body)?1:0); if(str_hdr == NULL) diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index fefc4ef283..723507bb86 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -971,7 +971,7 @@ int send_subscribe(subs_info_t* subs) subs->source_flag= XMPP_SUBSCRIBE; if(subs->expires< 0) - expires= 3600; + expires= pua_default_expires; else expires= subs->expires;

2 years, 3 months

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)

by Olle E. Johansson

Fixed in cf1907cac4c21fe12a27057cc3eeb2dd98e65635 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62881526(a)github.com>

2 years, 3 months

git:master:6ce9c3c8: Secfilter: Modify error messages to RPC error messages instead of printf

by Olle E. Johansson

Module: kamailio Branch: master Commit: 6ce9c3c897055ff9942634c493caf79780ccf71b URL: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-04T10:49:10+01:00 Secfilter: Modify error messages to RPC error messages instead of printf --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… Patch: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… --- diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index 2f763e4732..72db9a599d 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -112,7 +112,7 @@ void secf_rpc_add_bl(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%.*s, %.*s) inserted into blacklist", ctype.len, ctype.s, data.len, data.s); } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + rpc->fault(ctx, 500, "Error inserting values in the blacklist"); } lock_release(&secf_data->lock); } @@ -141,7 +141,7 @@ void secf_rpc_add_wl(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%.*s, %.*s) inserted into whitelist", ctype.len, ctype.s, data.len, data.s); } else { - rpc->rpl_printf(ctx, "Error insert values in the whitelist"); + rpc->fault(ctx, 500, "Error insert values in the whitelist"); } lock_release(&secf_data->lock); } @@ -154,7 +154,7 @@ void secf_rpc_reload(rpc_t *rpc, void *ctx) if(secf_load_db() == -1) { LM_ERR("Error loading data from database\n"); - rpc->rpl_printf(ctx, "Error loading data from database"); + rpc->fault(ctx, 500, "Error loading data from database"); } else { rpc->rpl_printf(ctx, "Data reloaded"); }

2 years, 3 months

git:master:cf1907ca: mtree: Re-instate error log messages in RPC reload removed in an earlier commit

by Olle E. Johansson

Module: kamailio Branch: master Commit: cf1907cac4c21fe12a27057cc3eeb2dd98e65635 URL: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-04T10:47:28+01:00 mtree: Re-instate error log messages in RPC reload removed in an earlier commit --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… Patch: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 1a2cd9f737..8c703f3531 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -937,6 +937,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(mt_load_db_trees()!=0) { rpc->fault(c, 500, "Can not reload Mtrees from database."); + LM_ERR("RPC failed: cannot reload mtrees from database\n"); return; } rpc->rpl_printf(c, "Ok. Mtrees reloaded."); @@ -945,6 +946,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(!mt_defined_trees()) { rpc->fault(c, 500, "No Mtrees defined."); + LM_ERR("RPC failed: No Mtrees defined\n"); return; } @@ -971,6 +973,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(mt_load_db(pt)!=0) { rpc->fault(c, 500, "Mtree Reload Failed"); + LM_ERR("RPC failed: cannot reload mtrees from database\n"); return; } treeloaded = 1; @@ -978,7 +981,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) pt = pt->next; } if(treeloaded == 0) { - rpc->fault(c, 500, "Can not find specified Mtree"); + rpc->fault(c, 500, "Can not find specified Mtree"); } rpc->rpl_printf(c, "Ok. Mtree reloaded."); return;

2 years, 3 months

git:master:89958e93: TLS: Add RPC success confirmation message

by Olle E. Johansson

Module: kamailio Branch: master Commit: 89958e9350597100d09689357b631ad30928ed99 URL: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T17:00:28+01:00 TLS: Add RPC success confirmation message --- Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… Patch: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… --- diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index 9927710647..9c7f980e71 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -87,7 +87,7 @@ static void tls_reload(rpc_t* rpc, void* ctx) *tls_domains_cfg = cfg; lock_release(tls_domains_cfg_lock); - + rpc->rpl_printf(ctx, "Ok. TLS configuration reloaded."); return; error:

2 years, 3 months

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)

by Olle E. Johansson

OK, I did not see the point of them, but you made it understandable :-) Thanks. Will fix. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62841767(a)github.com>

2 years, 3 months

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)

by Daniel-Constantin Mierla

The commit seems to remove the existing error log messages and they are useful with the systems that monitor syslog and trigger alerts. While the commit adds text to rpc response, that is visible on client app and it might not be easily caught by server devops team. The error logs should be reintroduced. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62841330(a)github.com>

2 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022