sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
263 discussions

git:master:1e3606eb: presence_mwi: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 1e3606ebca0d927595f6a0aa98cc0972174b9a62 URL: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_mwi: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_mwi/add_events.c Modified: src/modules/presence_mwi/doc/presence_mwi_admin.xml Modified: src/modules/presence_mwi/presence_mwi.c Modified: src/modules/presence_mwi/presence_mwi.h --- Diff: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… Patch: https://github.com/kamailio/kamailio/commit/1e3606ebca0d927595f6a0aa98cc097… --- diff --git a/src/modules/presence_mwi/add_events.c b/src/modules/presence_mwi/add_events.c index 001034ade4..089940e081 100644 --- a/src/modules/presence_mwi/add_events.c +++ b/src/modules/presence_mwi/add_events.c @@ -124,7 +124,7 @@ int mwi_add_events(void) event.content_type.s = "application/simple-message-summary"; event.content_type.len = 34; - event.default_expires= 3600; + event.default_expires= pres_mwi_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = mwi_publ_handl; diff --git a/src/modules/presence_mwi/doc/presence_mwi_admin.xml b/src/modules/presence_mwi/doc/presence_mwi_admin.xml index e73c3f72a8..654dd080cd 100644 --- a/src/modules/presence_mwi/doc/presence_mwi_admin.xml +++ b/src/modules/presence_mwi/doc/presence_mwi_admin.xml @@ -68,9 +68,26 @@ <section> <title>Parameters</title> - <para> - None. - </para> + <section id="presence_mwi.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence_mwi", "default_expires", 3600) + ... + </programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/presence_mwi/presence_mwi.c b/src/modules/presence_mwi/presence_mwi.c index afd605f7c7..9fdeeeb84c 100644 --- a/src/modules/presence_mwi/presence_mwi.c +++ b/src/modules/presence_mwi/presence_mwi.c @@ -59,6 +59,9 @@ static int mod_init(void); /* module variables */ add_event_t pres_add_event; +/* module parameters */ +unsigned int pres_mwi_default_expires = 3600; + /* module exported commands */ static cmd_export_t cmds[] = { @@ -67,6 +70,7 @@ static cmd_export_t cmds[] = /* module exported paramaters */ static param_export_t params[] = { + { "default_expires", INT_PARAM, &pres_mwi_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_mwi/presence_mwi.h b/src/modules/presence_mwi/presence_mwi.h index 9e7d5c4d52..5eed0d742c 100644 --- a/src/modules/presence_mwi/presence_mwi.h +++ b/src/modules/presence_mwi/presence_mwi.h @@ -34,5 +34,6 @@ #define _PRES_MWI_H_ extern add_event_t pres_add_event; +extern unsigned int pres_mwi_default_expires; #endif

1 0

git:master:31598421: presence_dialoginfo: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 31598421de858786f9ed416db8f33c12c0efd383 URL: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_dialoginfo: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_dialoginfo/add_events.c Modified: src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml Modified: src/modules/presence_dialoginfo/presence_dialoginfo.c Modified: src/modules/presence_dialoginfo/presence_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… Patch: https://github.com/kamailio/kamailio/commit/31598421de858786f9ed416db8f33c1… --- diff --git a/src/modules/presence_dialoginfo/add_events.c b/src/modules/presence_dialoginfo/add_events.c index 03cd981837..bed11b2d48 100644 --- a/src/modules/presence_dialoginfo/add_events.c +++ b/src/modules/presence_dialoginfo/add_events.c @@ -43,7 +43,7 @@ int dlginfo_add_events(void) event.content_type.s = "application/dialog-info+xml"; event.content_type.len = 27; - event.default_expires= 3600; + event.default_expires= pres_dlginfo_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml index cdb1729584..caca121f18 100644 --- a/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml +++ b/src/modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml @@ -248,6 +248,26 @@ modparam("presence_dialoginfo", "force_dummy_dialog", 1) </example> </section> +<section id="presence_dialoginfo.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_dialoginfo", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.c b/src/modules/presence_dialoginfo/presence_dialoginfo.c index 9bf8199dda..edc96fb11e 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.c +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.c @@ -49,6 +49,7 @@ add_event_t pres_add_event; /* module parameters */ int force_single_dialog = 0; int force_dummy_dialog = 0; +unsigned int pres_dlginfo_default_expires = 3600; /* module exported commands */ static cmd_export_t cmds[] = @@ -60,6 +61,7 @@ static cmd_export_t cmds[] = static param_export_t params[] = { { "force_single_dialog", INT_PARAM, &force_single_dialog }, { "force_dummy_dialog", INT_PARAM, &force_dummy_dialog }, + { "default_expires", INT_PARAM, &pres_dlginfo_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.h b/src/modules/presence_dialoginfo/presence_dialoginfo.h index 750a8c3347..2e9c40553d 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.h +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.h @@ -26,5 +26,6 @@ #define _PRES_DLGINFO_H_ extern add_event_t pres_add_event; +extern unsigned int pres_dlginfo_default_expires; #endif

1 0

git:master:21588198: presence_conference: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 2158819818afabd501af1a41803989d4bd00656e URL: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… Author: Adrian Tabacioiu <adi.tabacioiu(a)c-s.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:19:16+01:00 presence_conference: use parameter default_expires instead of 3600 constant - GH #2996 --- Modified: src/modules/presence_conference/add_events.c Modified: src/modules/presence_conference/doc/presence_conference_admin.xml Modified: src/modules/presence_conference/presence_conference.c Modified: src/modules/presence_conference/presence_conference.h --- Diff: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… Patch: https://github.com/kamailio/kamailio/commit/2158819818afabd501af1a41803989d… --- diff --git a/src/modules/presence_conference/add_events.c b/src/modules/presence_conference/add_events.c index 576746efed..7683f5a8bc 100644 --- a/src/modules/presence_conference/add_events.c +++ b/src/modules/presence_conference/add_events.c @@ -43,7 +43,7 @@ int conference_add_events(void) event.content_type.s = "application/conference-info+xml"; event.content_type.len = 31; - event.default_expires= 3600; + event.default_expires = pres_conf_default_expires; event.type = PUBL_TYPE; event.req_auth = 0; event.evs_publ_handl = 0; diff --git a/src/modules/presence_conference/doc/presence_conference_admin.xml b/src/modules/presence_conference/doc/presence_conference_admin.xml index 6b1f46012e..158d241c24 100644 --- a/src/modules/presence_conference/doc/presence_conference_admin.xml +++ b/src/modules/presence_conference/doc/presence_conference_admin.xml @@ -76,6 +76,26 @@ modparam("presence_conference", "use_partial_states", 0) </example> </section> +<section id="presence_conference.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_conference", "default_expires", 3600) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence_conference/presence_conference.c b/src/modules/presence_conference/presence_conference.c index cb117c3c6a..890533e11f 100644 --- a/src/modules/presence_conference/presence_conference.c +++ b/src/modules/presence_conference/presence_conference.c @@ -49,6 +49,7 @@ add_event_t pres_add_event; /* module parameters */ int use_partial_states = 0; +unsigned int pres_conf_default_expires = 3600; /* module exported commands */ static cmd_export_t cmds[] = @@ -59,6 +60,7 @@ static cmd_export_t cmds[] = /* module exported paramaters */ static param_export_t params[] = { { "use_partial_states", INT_PARAM, &use_partial_states }, + { "default_expires", INT_PARAM, &pres_conf_default_expires }, {0, 0, 0} }; diff --git a/src/modules/presence_conference/presence_conference.h b/src/modules/presence_conference/presence_conference.h index f8e0efe9de..8bf05885af 100644 --- a/src/modules/presence_conference/presence_conference.h +++ b/src/modules/presence_conference/presence_conference.h @@ -26,5 +26,6 @@ #define _PRES_CONFERENCE_H_ extern add_event_t pres_add_event; +extern unsigned int pres_conf_default_expires; #endif

1 0

[kamailio/kamailio] replacing wrong function return with correct one (PR #3004)
by Saurabh 18 Jan '22

18 Jan '22

Replacing wrong return function with correct one in `w_ht_iterator_setex` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3004 -- Commit Summary -- * replacing wrong function return with correct one -- File Changes -- M src/modules/htable/htable.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3004.patch https://github.com/kamailio/kamailio/pull/3004.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3004 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3004(a)github.com>

2 2

git:master:1f3de642: htable: proper function executed by w_ht_iterator_setex()
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 1f3de642bc3822290608dfed6a47a9052fa65ae1 URL: https://github.com/kamailio/kamailio/commit/1f3de642bc3822290608dfed6a47a90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T20:11:58+01:00 htable: proper function executed by w_ht_iterator_setex() - reported by GH #3004 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1f3de642bc3822290608dfed6a47a90… Patch: https://github.com/kamailio/kamailio/commit/1f3de642bc3822290608dfed6a47a90… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 7e72ad0840..ed28190880 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -923,7 +923,7 @@ static int w_ht_iterator_setex(struct sip_msg* msg, char* iname, char* val) return -1; } - return ki_ht_iterator_seti(msg, &siname, ival); + return ki_ht_iterator_setex(msg, &siname, ival); } static int ki_ht_slot_xlock(sip_msg_t *msg, str *htname, str *skey, int lmode)

1 0

git:master:2e85bb54: app_lua: support for lua 5.4.x
by Daniel-Constantin Mierla 18 Jan '22

18 Jan '22

Module: kamailio Branch: master Commit: 2e85bb541ff19e4b0074b04c4d05399a216deca2 URL: https://github.com/kamailio/kamailio/commit/2e85bb541ff19e4b0074b04c4d05399… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-18T15:19:52+01:00 app_lua: support for lua 5.4.x - GH #2728 --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/2e85bb541ff19e4b0074b04c4d05399… Patch: https://github.com/kamailio/kamailio/commit/2e85bb541ff19e4b0074b04c4d05399… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 6dffde1119..2bf255414a 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -42,6 +42,10 @@ #define KSR_APP_LUA_LOG_EXPORTS (1<<0) +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 +#define luaL_openlib ksr_luaL_openlib +#endif + extern int _ksr_app_lua_log_mode; void lua_sr_kemi_register_libs(lua_State *L); @@ -190,15 +194,41 @@ int sr_lua_reload_module(unsigned int reload) void ksr_luaL_openlib_mode(lua_State *L, const char *libname, const luaL_Reg *lfuncs, int nup, int mode) { + char modname[256]; + char *submod = NULL; + int tidx = 0; if(mode) { - lua_getglobal(L, libname); + /* support for registering 'module.submodule' functions + * - 'module' functions must be registered first */ + if(strlen(libname)>254) { + LM_ERR("module name is too long [%s]\n", libname); + return; + } + strcpy(modname, libname); + submod = strchr(modname, '.'); + if(submod != NULL) { + *submod = '\0'; + submod++; + } + lua_getglobal(L, modname); if (lua_isnil(L, -1)) { + if(submod != NULL) { + LM_ERR("main module not registered yet [%s]\n", libname); + return; + } lua_pop(L, 1); lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, modname); + return; } - } else { + tidx = lua_gettop(L); lua_newtable(L); + luaL_setfuncs(L, lfuncs, 0); + lua_setfield(L, tidx, submod); + return; } + lua_newtable(L); luaL_setfuncs(L, lfuncs, 0); lua_setglobal(L, libname); } @@ -209,7 +239,7 @@ void ksr_luaL_openlib_mode(lua_State *L, const char *libname, void ksr_luaL_openlib(lua_State *L, const char *libname, const luaL_Reg *lfuncs, int nup) { - ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 0); + ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 1); } /**

1 0

[kamailio/kamailio] DB_UNIXODBC always reports errors for sql queries with no result set (#2810)
by kdanderso 17 Jan '22

17 Jan '22

### Description SQL queries that do not return a result set (such as INSERT, DELETE, UPDATE) always report errors when using db_unixodbc. The query succeeds, but the log indicates a failure. #### Reproduction Use db_unixodbc.so for sql queries. Issue a valid query such as INSERT that is not expected to return a result set. #### Log Messages ERROR: db_unixodbc [res.c:52]: db_unixodbc_get_columns(): no columns returned from the query ERROR: db_unixodbc [res.c:253]: db_unixodbc_convert_result(): getting column names failed ERROR: db_unixodbc [dbase.c:271]: db_unixodbc_store_result(): failed to convert result ERROR: <core> [db_query.c:197]: db_do_raw_query(): error while storing result ERROR: sqlops [sql_api.c:297]: sql_do_query(): cannot do the query [DELETE FROM mytable WHERE id = 1] ### Additional Information Kamailio Version 5.5.0 This issue was also reported to SR-users, but that user did not open an issue. (See https://lists.kamailio.org/pipermail/sr-users/2018-March/100581.html) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2810

2 5

git:master:a30a6ceb: app_lua: added internal alternative to luaL_openlib()
by Daniel-Constantin Mierla 17 Jan '22

17 Jan '22

Module: kamailio Branch: master Commit: a30a6ceb5d7616bc135377b1dc507bd2eeeab876 URL: https://github.com/kamailio/kamailio/commit/a30a6ceb5d7616bc135377b1dc507bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-17T08:29:13+01:00 app_lua: added internal alternative to luaL_openlib() - it was deprecated in Lua API, no longer available in newer versions [wip] --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/a30a6ceb5d7616bc135377b1dc507bd… Patch: https://github.com/kamailio/kamailio/commit/a30a6ceb5d7616bc135377b1dc507bd… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 8b572d2382..6dffde1119 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -184,6 +184,34 @@ int sr_lua_reload_module(unsigned int reload) return 0; } +/** + * + */ +void ksr_luaL_openlib_mode(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup, int mode) +{ + if(mode) { + lua_getglobal(L, libname); + if (lua_isnil(L, -1)) { + lua_pop(L, 1); + lua_newtable(L); + } + } else { + lua_newtable(L); + } + luaL_setfuncs(L, lfuncs, 0); + lua_setglobal(L, libname); +} + +/** + * + */ +void ksr_luaL_openlib(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup) +{ + ksr_luaL_openlib_mode(L, libname, lfuncs, nup, 0); +} + /** * */

1 0

[kamailio/kamailio] mhomed does not work with virtual IPs created by keepalived (Issue #3002)
by ccolumbu999 15 Jan '22

15 Jan '22

### Description I enabled mhomed=1 as well as ip_free_bind=1, but kamailio does not recognize that there is internal and external traffic. For example I also enabled modparam("rr", "enable_double_rr", 1), but the 2 Record-Routes both have the external IP. In addition fix_nated_contact() and fix_nated_sdp don't work because they think all traffic is coming from the external IP.  ### Troubleshooting I tried a lot of things. #### Reproduction Set up a server with keepalived and a virtual IP and use any standard NAT config and it won't work.  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions I thought that ip_free_bind=1 would fix this issue, but it does not seem to have any effect.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3002 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3002(a)github.com>

2 3

git:master:3da3a780: kex: use unsigned long for rpc stats.fetchn values
by Daniel-Constantin Mierla 14 Jan '22

14 Jan '22

Module: kamailio Branch: master Commit: 3da3a780c9a9a4fc7a0852193080da2cbaa2adcf URL: https://github.com/kamailio/kamailio/commit/3da3a780c9a9a4fc7a0852193080da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-14T16:50:07+01:00 kex: use unsigned long for rpc stats.fetchn values --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/3da3a780c9a9a4fc7a0852193080da2… Patch: https://github.com/kamailio/kamailio/commit/3da3a780c9a9a4fc7a0852193080da2… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index a1f14a7dc6..ec543d1b60 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -496,7 +496,7 @@ static void rpc_fetch_add_stat(rpc_t* rpc, void* ctx, void* hst, char* g, char* snprintf(nbuf, 127, "%s.%s", g, n); if (numeric) { - res = rpc->struct_add(hst, "d", nbuf, val); + res = rpc->struct_add(hst, "j", nbuf, val); } else { res = rpc->struct_printf(hst, nbuf, "%lu", val); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022