sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
260 discussions

[kamailio/kamailio] replacing wrong function return with correct one (PR #3004)

by Saurabh

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 years, 3 months

git:master:1f3de642: htable: proper function executed by w_ht_iterator_setex()

by Daniel-Constantin Mierla

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)

2 years, 3 months

git:master:2e85bb54: app_lua: support for lua 5.4.x

by Daniel-Constantin Mierla

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); } /**

2 years, 3 months

[kamailio/kamailio] DB_UNIXODBC always reports errors for sql queries with no result set (#2810)

by kdanderso

### 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 years, 3 months

git:master:a30a6ceb: app_lua: added internal alternative to luaL_openlib()

by Daniel-Constantin Mierla

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); +} + /** * */

2 years, 3 months

[kamailio/kamailio] mhomed does not work with virtual IPs created by keepalived (Issue #3002)

by ccolumbu999

### 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 years, 3 months

git:master:3da3a780: kex: use unsigned long for rpc stats.fetchn values

by Daniel-Constantin Mierla

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); }

2 years, 3 months

git:master:6794a120: statsc: use long long for rpc output value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6794a120f3c2466985fe1d837f00c5366df8e1c1 URL: https://github.com/kamailio/kamailio/commit/6794a120f3c2466985fe1d837f00c53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-14T16:19:28+01:00 statsc: use long long for rpc output value --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6794a120f3c2466985fe1d837f00c53… Patch: https://github.com/kamailio/kamailio/commit/6794a120f3c2466985fe1d837f00c53… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 1ee13c3cec..6baf2bea4a 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -354,7 +354,8 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) int cmode; str sname; int range; - int k, m, n, v; + int k, m, n; + int64_t v; time_t tn; void* th; void* ts; @@ -433,7 +434,7 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Error creating rpc (5)"); return; } - v = (int)sm->vals[k]; + v = sm->vals[k]; switch(cmode) { case 1: break; @@ -442,13 +443,13 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) continue; } if(k==0) { - v -= (int)sm->vals[statsc_items-1]; + v -= sm->vals[statsc_items-1]; } else { - v -= (int)sm->vals[k-1]; + v -= sm->vals[k-1]; } break; } - if(rpc->struct_add(ti, "udd", + if(rpc->struct_add(ti, "uLd", "timestamp", (unsigned int)_statsc_info->slist->vals[k], "value", v, "index", m++)<0) { @@ -464,7 +465,7 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Error creating rpc (7)"); return; } - v = (int)sm->vals[k]; + v = sm->vals[k]; switch(cmode) { case 1: break; @@ -472,10 +473,10 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) if(n==k-1) { continue; } - v -= (int)sm->vals[k-1]; + v -= sm->vals[k-1]; break; } - if(rpc->struct_add(ti, "udd", + if(rpc->struct_add(ti, "uLd", "timestamp", (unsigned int)_statsc_info->slist->vals[k], "value", v, "index", m++)<0) {

2 years, 3 months

[kamailio/kamailio] add parameter presence : default_expires (Issue #2996)

by adita76

### Description Similar to pua:default_expires, a default expire value could be added for subscriptions. The default expiration values are now hard coded for presence modules, in presence_*/add_events.c files. ### Expected behavior Default expiration value that is configurable. #### Actual observed behavior Default expiration value is 3600. ### Possible Solutions Adding a parameter presence : default_expires and use it in all presence_*/add_events.c files. I can implement this myself. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2996 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2996(a)github.com>

2 years, 3 months

[kamailio/kamailio] server crashes every 10 hours (#2101)

by ekke56

### Description  ### Troubleshooting coredump data below. #### Reproduction  #### Debugging Data  ``` (gdb) bt full #0 0x000000000046ccdd in get_hash1_raw (s=0x5da51296 <Address 0x5da51296 out of bounds>, len=9) at core/hashes.h:109 p = 0x5da51296 <Address 0x5da51296 out of bounds> v = 4100353960 h = 0 #1 0x000000000046cfb6 in str_hash_get (ht=0xa6d6c0 <cnts_hash_table>, key=0x5da51296 <Address 0x5da51296 out of bounds>, len=9) at core/str_hash.h:94 h = 0 e = 0x19 #2 0x000000000046debe in cnt_hash_lookup (group=0x7ffc2db9d7c0, name=0x7eff79693b80) at core/counters.c:420 e = 0x7eff80c48c88 first = 0xbd8191bc2e950d55 cnt_rec = 0x7eff80c48cb0 #3 0x000000000046e752 in counter_lookup_str (handle=0x7ffc2db9d7d0, group=0x7ffc2db9d7c0, name=0x7eff79693b80) at core/counters.c:541 cnt_rec = 0x19 #4 0x00007eff7d65b447 in get_stat (name=0x7eff79693b80) at ../../core/counters.h:197 h = {id = 13} grp = {s = 0x0, len = 0} #5 0x00007eff7d65c113 in statsc_svalue (name=0x7eff79693b80, res=0x7eff79693f4b) at statsc_mod.c:149 stat = 0xd __FUNCTION__ = "statsc_svalue" #6 0x00007eff7d65db79 in statsc_timer (ticks=113205942, param=0x0) at statsc_mod.c:274 sm = 0x7eff79693b70 tn = 1571099286 n = 115 __FUNCTION__ = "statsc_timer" #7 0x00000000005db7f9 in sr_wtimer_exec (ticks=113205942, param=0x0) at core/timer_proc.c:390 wt = 0x7eff80c56f48 wn = 0x0 wp = 0x0 cs = 0 __FUNCTION__ = "sr_wtimer_exec" #8 0x00000000005daa29 in fork_sync_timer (child_id=-1, desc=0x7c8a71 "secondary timer", make_sock=1, f=0x5db4f2 <sr_wtimer_exec>, param=0x0, interval=1000) at core/timer_proc.c:224 pid = 0 ts1 = 1811295077 ts2 = 1000 #9 0x00000000005dbb26 in sr_wtimer_start () at core/timer_proc.c:416 __FUNCTION__ = "sr_wtimer_start" #10 0x0000000000425a33 in main_loop () at main.c:1729 i = 8 pid = 3615 si = 0x0 si_desc = "udp receiver child=7 sock=91.216.86.57:5060\000\377~\000\000@۹-\374\177\000\000\020\207A\000\000\000\000\000\020\336\271-\374\177\000\000\323c{\000\000\000\000\000\031\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\200\000\000\000\000\000__:\201\377~\000\000\250\346\260v\377~\000\000\270\314À\377~\000" nrprocs = 8 woneinit = 1 __FUNCTION__ = "main_loop" #11 0x000000000042c72a in main (argc=7, argv=0x7ffc2db9def8) at main.c:2696 cfg_stream = 0x1ee3010 c = -1 r = 0 tmp = 0x7ffc2db9ef2c "" tmp_len = 0 port = 0 proto = 0 options = 0x76a9a0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 ---Type <return> to continue, or q <return> to quit--- info locals seed = 2620966285 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x2 p = 0x0 st = {st_dev = 20, st_ino = 22346, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1568107728, tv_nsec = 458000000}, st_mtim = { tv_sec = 1571064422, tv_nsec = 57000000}, st_ctim = {tv_sec = 1571064422, tv_nsec = 57000000}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) list 104 register unsigned v; 105 register unsigned h; 106 107 h=0; 108 109 hash_update_str(s, s+len, p, v, h); 110 return hash_finish(h); 111 } 112 113 ``` #### Log Messages  ``` no relevant messages ``` #### SIP Traffic  ``` seems to be triggered by internal timer ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.4 (x86_64/linux) 759867 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: 759867 compiled on 12:20:22 Sep 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` CentOS Linux release 7.4.1708 (Core) Linux xxx 3.10.0-957.12.2.el7.x86_64 #1 SMP Tue May 14 21:24:32 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2101

2 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022