sr-dev September 2020

sr-dev@lists.kamailio.org

12 participants
270 discussions

git:master:60f04b6d: usrloc: set last keepalive value to current time on new records

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 60f04b6d6f51b55294d22722df3f351a76cbfb9b URL: https://github.com/kamailio/kamailio/commit/60f04b6d6f51b55294d22722df3f351… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-25T09:38:39+02:00 usrloc: set last keepalive value to current time on new records - do not rely on last modified value, can be loaded from db and be too old --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/60f04b6d6f51b55294d22722df3f351… Patch: https://github.com/kamailio/kamailio/commit/60f04b6d6f51b55294d22722df3f351… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 256d9530c2..95ed8d530c 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -26,8 +26,8 @@ * - Module: \ref usrloc */ -#include "ucontact.h" -#include <string.h> /* memcpy */ +#include <string.h> +#include <time.h> #include "../../core/mem/shm_mem.h" #include "../../core/ut.h" #include "../../core/ip_addr.h" @@ -129,7 +129,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->methods = _ci->methods; c->reg_id = _ci->reg_id; c->last_modified = _ci->last_modified; - c->last_keepalive = _ci->last_modified; + c->last_keepalive = time(NULL); c->tcpconn_id = _ci->tcpconn_id; c->server_id = _ci->server_id; c->keepalive = (_ci->cflags & ul_nat_bflag)?1:0; @@ -295,7 +295,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->cseq = _ci->cseq; _c->methods = _ci->methods; _c->last_modified = _ci->last_modified; - _c->last_keepalive = _ci->last_modified; + _c->last_keepalive = time(NULL); _c->flags = _ci->flags; _c->cflags = _ci->cflags; _c->server_id = _ci->server_id;

4 years, 1 month

[kamailio/kamailio] Kamailio-5.4.0 : Crashes from keepalive module (#2448)

by sagarmalam

### Description  I am using keepalive module to send keepalives to all the destinations registered with an application server which sits behind kamailio. When Kamailio recieves 200 Ok. I take URI contact from 200 OK and pass it as a param to ka_add_destination function.Most of the time it works fine but sometimes kamailio crashes when it recieves 200 OK of OPTIONS. ### Troubleshooting #### Reproduction I am able to reproduce it easily in below scenario : All the URIs which we are feeding to KA module has this syntax : sip:2003@10.50.8.11:9090;alias=10.50.8.1~5060~1;pb-ip=35.185.177.49;pb-pt=5060;tp=udp 1. So request will be generate by KA module and it will be send to 10.50.8.11:9090 ( which is another port of same kamailio instance ) via UDP protocol. 2. On recieving OPTION on 9090 port , - We are calling handle_ruri_alias() function which will set $du =sip:10.50.8.1:5060;transport=udp - Modify RURI from sip:2003@10.50.8.11:9090;alias=10.50.8.1~5060~1;pb-ip=35.185.177.49;pb-pt=5060;tp=udp to sip:2003@**35.185.177.49:5060**;pb-ip=35.185.177.49;pb-pt=5060;**transport**=udp - and relay to 10.50.8.1 3. 10.50.8.1 is another instance of Kamailio which will relay OPTION packet to final destination  #### Debugging Data  ``` [root@SBC-4-2 /]# gdb kamailio core.67771 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-110.el7 Copyright (C) 2013 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 "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/local/sbin/kamailio...done. [New LWP 67771] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -m 5000 -M 500 -P /run/kamailio/kamailio.pid'. Program terminated with signal 11, Segmentation fault. #0 0x00000000abcdefed in ?? () Missing separate debuginfos, use: debuginfo-install cyrus-sasl-lib-2.1.26-23.el7.x86_64 glibc-2.17-222.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-19.el7.x86_64 libcom_err-1.42.9-12.el7_5.x86_64 libcurl-7.29.0-51.el7.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-36.el7_6.2.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-12.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libstdc++-4.8.5-36.el7_6.2.x86_64 libuuid-2.23.2-52.el7_5.1.x86_64 mariadb-libs-5.5.64-1.el7.x86_64 nspr-4.19.0-1.el7_5.x86_64 nss-3.36.0-5.el7_5.x86_64 nss-softokn-freebl-3.36.0-5.el7_5.x86_64 nss-util-3.36.0-1.el7_5.x86_64 openldap-2.4.44-15.el7_5.x86_64 openssl-libs-1.0.2k-16.el7_6.1.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-18.el7.x86_64 (gdb) bt full #0 0x00000000abcdefed in ?? () No symbol table info available. #1 0x00007f931dc69c7e in ka_options_callback (t=0x7f91e58f05c0, type=1024, ps=0x7ffda0977bd0) at keepalive_core.c:126 uri = { s = 0x7f91e58f63f0 "sip:2003@10.50.8.11:9090;alias=10.50.8.1~5060~1;pb-ip=35.185.177.49;pb-pt=5060;tp=udp>\r\nFrom: <sip:keepalive@fromsbc>;tag=c7bfd876be500fff196414658218fc27-d6989f6d\r\nCSeq: 10 OPTIONS\r\nCall-ID: 3f2c3c7c"..., len = 85} msg = 0x0 state = 2 state_routes = {0x7f931dc6f844 "", 0x7f931dc6f93d "keepalive:dst-up", 0x7f931dc6f94e "keepalive:dst-down"} ka_dest = 0x7f91e5898988 __FUNCTION__ = "ka_options_callback" #2 0x00007f9324bfddd8 in run_trans_callbacks_internal (cb_lst=0x7f91e58f0638, type=1024, trans=0x7f91e58f05c0, params=0x7ffda0977bd0) at t_hooks.c:258 cbp = 0x7f91e58f6590 backup_from = 0xb2a750 <def_list+16> backup_to = 0xb2a758 <def_list+24> backup_dom_from = 0xb2a760 <def_list+32> backup_dom_to = 0xb2a768 <def_list+40> backup_uri_from = 0xb2a740 <def_list> backup_uri_to = 0xb2a748 <def_list+8> backup_xavps = 0xb29fd0 <_xavp_list_head> backup_xavus = 0xb29fd8 <_xavu_list_head> backup_xavis = 0xb29fe0 <_xavi_list_head> __FUNCTION__ = "run_trans_callbacks_internal" #3 0x00007f9324bfdf0a in run_trans_callbacks (type=1024, trans=0x7f91e58f05c0, req=0x0, rpl=0xffffffffffffffff, code=408) at t_hooks.c:285 params = {req = 0x0, rpl = 0xffffffffffffffff, param = 0x7f91e58f65a0, code = 408, flags = 0, branch = 0, t_rbuf = 0x0, dst = 0x0, send_buf = {s = 0x0, len = 0}} #4 0x00007f9324b943f1 in local_reply (t=0x7f91e58f05c0, p_msg=0xffffffffffffffff, branch=0, msg_status=408, cancel_data=0x7ffda0977d50) at t_reply.c:2265 local_store = 0 local_winner = 0 reply_status = RPS_COMPLETED winning_msg = 0xffffffffffffffff winning_code = 408 totag_retr = 0 ---Type <return> to continue, or q <return> to quit--- __FUNCTION__ = "local_reply" #5 0x00007f9324bcc9fd in fake_reply (t=0x7f91e58f05c0, branch=0, code=408) at timer.c:290 cancel_data = {cancel_bitmap = 0, reason = {cause = 0, u = {text = {s = 0x0, len = -443611712}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = -443611712}}}} do_cancel_branch = 0 reply_status = 67771 #6 0x00007f9324bcce95 in final_response_handler (r_buf=0x7f91e58f0860, t=0x7f91e58f05c0) at timer.c:462 silent = 0 branch_ret = 0 prev_branch = 0 now = 0 #7 0x00007f9324bccf56 in retr_buf_handler (ticks=112894435, tl=0x7f91e58f0880, p=0xfa0) at timer.c:518 rbuf = 0x7f91e58f0860 fr_remainder = 1 retr_remainder = 32657 retr_interval = 3847088576 new_retr_interval_ms = 6989250208 crt_retr_interval_ms = 140264594074048 t = 0x7f91e58f05c0 __FUNCTION__ = "retr_buf_handler" #8 0x00000000004b7bcd in slow_timer_main () at core/timer.c:1105 n = 12 ret = 4294967295 tl = 0x7f91e58f0880 i = 700 __FUNCTION__ = "slow_timer_main" #9 0x000000000042a4c3 in main_loop () at main.c:1737 i = 16 pid = 0 si = 0x0 si_desc = "udp receiver child=15 sock=10.50.8.11:9090\000:0:0:11]:5060\000\061:5060)\000\000\000\000\000\000\000\000\000\000F\345\221\177\000\000\000\000\000\000\000\000\000\000\bLv\345\221\177\000\000P\201\227\240\375\177\000\000\210\212K\000\000\000\000\000\260\270A\000\000\000\000\000\b{\017(\223\177\000" nrprocs = 16 woneinit = 1 ---Type <return> to continue, or q <return> to quit--- __FUNCTION__ = "main_loop" #10 0x0000000000433a66 in main (argc=7, argv=0x7ffda09786b8) at main.c:2856 cfg_stream = 0x27e7010 c = -1 r = 0 tmp = 0x7ffda0979f26 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x7d2498 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 791137056 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7f934718ea00 <intel_02_known> p = 0x0 st = {st_dev = 23, st_ino = 30676, st_nlink = 2, st_mode = 16877, st_uid = 0, st_gid = 5001, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1597841333, tv_nsec = 176009291}, st_mtim = {tv_sec = 1597841333, tv_nsec = 166009247}, st_ctim = {tv_sec = 1597841333, tv_nsec = 176009291}, __unused = {0, 0, 0}} tbuf = "\377\377\377\377", '\000' <repeats 12 times>, "\340\263\001G\223\177\000\000\310T\320G\223\177", '\000' <repeats 90 times>, "p\342\252\000\000\000\000\000\260\270A\000\000\000\000\000\260\206\227\240\375\177", '\000' <repeats 26 times>, "\036_\260G\223\177\000\000\001", '\000' <repeats 23 times>... option_index = 0 long_options = {{name = 0x7d468f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7cfc94 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7d4694 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7d469a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7d46a0 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7d46a9 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7d46b3 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7d46bd "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7d46c8 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7d46d1 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7d46dc "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) ``` #### Log Messages  ``` Aug 19 12:58:26 SBC-4-2 /usr/local/sbin/kamailio[67772]: CRITICAL: <core> [core/mem/q_malloc.c:138]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f91e5898950 (address 0x7f91e5898988) end overwritten (c0c0c0c1, abcdefed)! Memory allocator was called from core: core/usr_avp.c:626. Fragment marked by core: core/usr_avp.c:175. Exec from core/mem/q_malloc.c:511. Aug 19 12:58:38 SBC-4-2 /usr/local/sbin/kamailio[67793]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 94 ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@SBC-4-2 /]# kamailio -v version: kamailio 5.4.0 (x86_64/linux) 6c4fce 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_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: 6c4fce compiled on 14:16:47 Aug 14 2020 with gcc 4.8.5 ``` * **Operating System**:  ``` [root@SBC-4-2 /]# uname -a Linux SBC-4-2.netcarrier.net 5.1.0 #1 SMP Mon May 6 13:44:38 GMT 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/2448

4 years, 1 month

git:master:298aeb7f: core: dns cache - removed disabled code between #if 0 ... #endif

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 298aeb7f93bfa75ec78bc941f2c76167525b2e61 URL: https://github.com/kamailio/kamailio/commit/298aeb7f93bfa75ec78bc941f2c7616… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-24T10:04:08+02:00 core: dns cache - removed disabled code between #if 0 ... #endif --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/298aeb7f93bfa75ec78bc941f2c7616… Patch: https://github.com/kamailio/kamailio/commit/298aeb7f93bfa75ec78bc941f2c7616… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index c8567813e5..923c65049d 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2488,37 +2488,6 @@ struct hostent* dns_resolvehost(char* name) } - - -#if 0 -/* resolves a host name trying NAPTR, SRV, A & AAAA lookups, for details - * see dns_sip_resolve() - * FIXME: this version will return only the first ip - * returns: hostent struct & *port filled with the port from the SRV record; - * 0 on error - */ -struct hostent* dns_sip_resolvehost(str* name, unsigned short* port, - char* proto) -{ - struct dns_srv_handle h; - struct ip_addr ip; - int ret; - - if ((cfg_get(core, core_cfg, use_dns_cache==0)) || (dns_hash==0)){ - /* not init or off => use normal, non-cached version */ - return _sip_resolvehost(name, port, proto); - } - dns_srv_handle_init(&h); - ret=dns_sip_resolve(&h, name, &ip, port, proto, dns_flags); - dns_srv_handle_put(&h); - if (ret>=0) - return ip_addr2he(name, &ip); - return 0; -} -#endif - - - /* resolves a host name trying SRV lookup if *port==0 or normal A/AAAA lookup * if *port!=0. * when performing SRV lookup (*port==0) it will use proto to look for

4 years, 2 months

git:5.4:7f14deb8: usrloc: do keepalive mode checks before expire processing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 7f14deb8704697ebe1e073c8db30a5569bab6985 URL: https://github.com/kamailio/kamailio/commit/7f14deb8704697ebe1e073c8db30a55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:32:17+02:00 usrloc: do keepalive mode checks before expire processing (cherry picked from commit e67b588434a08c828548c79b6cc5f4c2a7240dc9) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/7f14deb8704697ebe1e073c8db30a55… Patch: https://github.com/kamailio/kamailio/commit/7f14deb8704697ebe1e073c8db30a55… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 105e32a2cf..a1070f3f74 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -126,10 +126,22 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_ka_mode & ULKA_NAT) { + /* keepalive for natted contacts only */ + if (ul_nat_bflag == 0) { + continue; + } + if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { + continue; + } + } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { if(uc->last_keepalive+ul_keepalive_timeout < tnow) { /* set contact as expired in 10s */ - LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + LM_DBG("set expired contact on keepalive (%u + %u < %u)" + " - aor: %.*s c: %.*s\n", (unsigned int)uc->last_keepalive, + (unsigned int)ul_keepalive_timeout, (unsigned int)tnow, ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); if(uc->expires > tnow + 10) { uc->expires = tnow + 10; @@ -137,16 +149,6 @@ int ul_ka_urecord(urecord_t *ur) } } } - - if(ul_ka_mode & ULKA_NAT) { - /* keepalive for natted contacts only */ - if (ul_nat_bflag == 0) { - continue; - } - if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { - continue; - } - } if(uc->received.len > 0) { sdst = uc->received; } else {

4 years, 2 months

git:5.4:f14111e9: usrloc: do keepalive-based contact expire on internal callback

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: f14111e9ba0139e79a2bf7b7c0c5bc98c47cf220 URL: https://github.com/kamailio/kamailio/commit/f14111e9ba0139e79a2bf7b7c0c5bc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:32:10+02:00 usrloc: do keepalive-based contact expire on internal callback - the one used by nathelper is not triggered automatically (cherry picked from commit 5c1e07dc2efc46fe078263c76ce0388f09949539) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/f14111e9ba0139e79a2bf7b7c0c5bc9… Patch: https://github.com/kamailio/kamailio/commit/f14111e9ba0139e79a2bf7b7c0c5bc9… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 6d93717db5..105e32a2cf 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -40,6 +40,8 @@ #include "ul_keepalive.h" +extern int ul_keepalive_timeout; + static int ul_ka_send(str *kamsg, dest_info_t *kadst); /** @@ -102,11 +104,13 @@ int ul_ka_urecord(urecord_t *ur) int aortype = 0; int i; struct timeval tv; + time_t tnow = 0; if (ul_ka_mode == ULKA_NONE) { return 0; } LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); + tnow = time(NULL); for(i=0; i<ur->aor.len; i++) { if(ur->aor.s[i] == '@') { @@ -122,6 +126,18 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { + if(uc->last_keepalive+ul_keepalive_timeout < tnow) { + /* set contact as expired in 10s */ + LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); + if(uc->expires > tnow + 10) { + uc->expires = tnow + 10; + continue; + } + } + } + if(ul_ka_mode & ULKA_NAT) { /* keepalive for natted contacts only */ if (ul_nat_bflag == 0) {

4 years, 2 months

git:5.4:4669e8f2: imc: jump over printing error log messages when list commands are ok

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 4669e8f295eefca64af61e168e5e79f540df89c8 URL: https://github.com/kamailio/kamailio/commit/4669e8f295eefca64af61e168e5e79f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T09:19:52+02:00 imc: jump over printing error log messages when list commands are ok - reported by GH #2481 (cherry picked from commit 92cfb5e8d291706889c926892397e663e2d93b05) --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/4669e8f295eefca64af61e168e5e79f… Patch: https://github.com/kamailio/kamailio/commit/4669e8f295eefca64af61e168e5e79f… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 4ace0b800e..9dbc403e3e 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -942,13 +942,15 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, struct imc_uri room; memset(&room, '\0', sizeof(room)); - if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) - goto error; + if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, + &dst->parsed)) { + goto done; + } rm = imc_get_room(&room.parsed.user, &room.parsed.host); if (rm == NULL || (rm->flags & IMC_ROOM_DELETED)) { LM_ERR("Room [%.*s] does not exist!\n", STR_FMT(&room.uri)); - goto error; + goto done; } /* verify if the user is a member of the room */ @@ -956,7 +958,7 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, if (member == NULL) { LM_ERR("User [%.*s] is not member of room [%.*s]!\n", STR_FMT(&src->uri), STR_FMT(&rm->uri)); - goto error; + goto done; } p = imc_body_buf; @@ -1004,13 +1006,16 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, body.len = p - body.s; LM_DBG("members = '%.*s'\n", STR_FMT(&body)); - LM_ERR("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); + LM_DBG("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); imc_send_message(&rm->uri, &member->uri, build_headers(msg), &body); rv = 0; + goto done; + overrun: LM_ERR("Buffer too small for member list message\n"); -error: + +done: if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; @@ -1065,7 +1070,8 @@ int imc_handle_rooms(struct sip_msg* msg, imc_cmd_t *cmd, LM_DBG("rooms = '%.*s'\n", STR_FMT(&body)); imc_send_message(&dst->uri, &src->uri, build_headers(msg), &body); - rv = 0; + return 0; + error: LM_ERR("Buffer too small for member list message\n"); return rv;

4 years, 2 months

git:master:e67b5884: usrloc: do keepalive mode checks before expire processing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e67b588434a08c828548c79b6cc5f4c2a7240dc9 URL: https://github.com/kamailio/kamailio/commit/e67b588434a08c828548c79b6cc5f4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:31:04+02:00 usrloc: do keepalive mode checks before expire processing --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/e67b588434a08c828548c79b6cc5f4c… Patch: https://github.com/kamailio/kamailio/commit/e67b588434a08c828548c79b6cc5f4c… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 105e32a2cf..a1070f3f74 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -126,10 +126,22 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_ka_mode & ULKA_NAT) { + /* keepalive for natted contacts only */ + if (ul_nat_bflag == 0) { + continue; + } + if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { + continue; + } + } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { if(uc->last_keepalive+ul_keepalive_timeout < tnow) { /* set contact as expired in 10s */ - LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + LM_DBG("set expired contact on keepalive (%u + %u < %u)" + " - aor: %.*s c: %.*s\n", (unsigned int)uc->last_keepalive, + (unsigned int)ul_keepalive_timeout, (unsigned int)tnow, ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); if(uc->expires > tnow + 10) { uc->expires = tnow + 10; @@ -137,16 +149,6 @@ int ul_ka_urecord(urecord_t *ur) } } } - - if(ul_ka_mode & ULKA_NAT) { - /* keepalive for natted contacts only */ - if (ul_nat_bflag == 0) { - continue; - } - if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { - continue; - } - } if(uc->received.len > 0) { sdst = uc->received; } else {

4 years, 2 months

git:master:5c1e07dc: usrloc: do keepalive-based contact expire on internal callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c1e07dc2efc46fe078263c76ce0388f09949539 URL: https://github.com/kamailio/kamailio/commit/5c1e07dc2efc46fe078263c76ce0388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:00:29+02:00 usrloc: do keepalive-based contact expire on internal callback - the one used by nathelper is not triggered automatically --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/5c1e07dc2efc46fe078263c76ce0388… Patch: https://github.com/kamailio/kamailio/commit/5c1e07dc2efc46fe078263c76ce0388… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 6d93717db5..105e32a2cf 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -40,6 +40,8 @@ #include "ul_keepalive.h" +extern int ul_keepalive_timeout; + static int ul_ka_send(str *kamsg, dest_info_t *kadst); /** @@ -102,11 +104,13 @@ int ul_ka_urecord(urecord_t *ur) int aortype = 0; int i; struct timeval tv; + time_t tnow = 0; if (ul_ka_mode == ULKA_NONE) { return 0; } LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); + tnow = time(NULL); for(i=0; i<ur->aor.len; i++) { if(ur->aor.s[i] == '@') { @@ -122,6 +126,18 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { + if(uc->last_keepalive+ul_keepalive_timeout < tnow) { + /* set contact as expired in 10s */ + LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); + if(uc->expires > tnow + 10) { + uc->expires = tnow + 10; + continue; + } + } + } + if(ul_ka_mode & ULKA_NAT) { /* keepalive for natted contacts only */ if (ul_nat_bflag == 0) {

4 years, 2 months

git:5.4:46349856: ndb_redis: set message level to debug on exec

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 463498565029aced931b44fd686f5c9d15b49341 URL: https://github.com/kamailio/kamailio/commit/463498565029aced931b44fd686f5c9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-23T09:03:52+02:00 ndb_redis: set message level to debug on exec * logging error makes no sense here since there's going to be a reconnection afterwards > ERROR: ndb_redis [redis_client.c:903]: redisc_exec_argv(): Redis error: Server closed the connection (cherry picked from commit a9c331d70dbed6827874aa99296203ac5a9d5c7b) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/463498565029aced931b44fd686f5c9… Patch: https://github.com/kamailio/kamailio/commit/463498565029aced931b44fd686f5c9… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 5ad063f89a..bd97012c8e 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -770,7 +770,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) /* null reply, reconnect and try again */ if (rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if (redisc_create_pipelined_message(rsrv) == 0) {

4 years, 2 months

git:master:a9c331d7: ndb_redis: set message level to debug on exec

by Victor Seva

Module: kamailio Branch: master Commit: a9c331d70dbed6827874aa99296203ac5a9d5c7b URL: https://github.com/kamailio/kamailio/commit/a9c331d70dbed6827874aa99296203a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-23T09:02:43+02:00 ndb_redis: set message level to debug on exec * logging error makes no sense here since there's going to be a reconnection afterwards > ERROR: ndb_redis [redis_client.c:903]: redisc_exec_argv(): Redis error: Server closed the connection --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/a9c331d70dbed6827874aa99296203a… Patch: https://github.com/kamailio/kamailio/commit/a9c331d70dbed6827874aa99296203a… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 5bc1bf0e47..15a86f7b10 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -770,7 +770,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) /* null reply, reconnect and try again */ if (rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if (redisc_create_pipelined_message(rsrv) == 0) {

4 years, 2 months

← Newer
1
...
10
11
12
13
14
15
16
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2020