sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
436 discussions

git:master:a12e436d: Makefile.defs: version set to 5.4.0-dev1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a12e436d054aba1c71cace2de4bf270d97ee1063 URL: https://github.com/kamailio/kamailio/commit/a12e436d054aba1c71cace2de4bf270… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:32:41+02:00 Makefile.defs: version set to 5.4.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a12e436d054aba1c71cace2de4bf270… Patch: https://github.com/kamailio/kamailio/commit/a12e436d054aba1c71cace2de4bf270… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3313524469..336eba1f44 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

5 years, 1 month

git:master:5a18155c: avp: free allocated variable in case of error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a18155c0fe661e7488f75afa7b0ea7638932943 URL: https://github.com/kamailio/kamailio/commit/5a18155c0fe661e7488f75afa7b0ea7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:31:39+02:00 avp: free allocated variable in case of error --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/5a18155c0fe661e7488f75afa7b0ea7… Patch: https://github.com/kamailio/kamailio/commit/5a18155c0fe661e7488f75afa7b0ea7… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f597086d92..f11d56baeb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1380,7 +1380,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - hdr_name_t *h; + hdr_name_t *h = NULL; int n; str *s; if(param_no == 1) { @@ -1427,6 +1427,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", params); + pkg_free(h); return E_CFG; } params++; @@ -1434,6 +1435,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier " "specified\n"); + pkg_free(h); return E_CFG; } } else {

5 years, 1 month

git:master:223380dc: kamctl: updated the version for kamctl and kamdbctl

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 223380dccdfc74c5a79c2bfa5281a1f75ea0f453 URL: https://github.com/kamailio/kamailio/commit/223380dccdfc74c5a79c2bfa5281a1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:25:14+02:00 kamctl: updated the version for kamctl and kamdbctl --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/223380dccdfc74c5a79c2bfa5281a1f… Patch: https://github.com/kamailio/kamailio/commit/223380dccdfc74c5a79c2bfa5281a1f… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index c97ad491a2..7fd9197a35 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.3.0' +VERSION='5.4.0' PATH=$PATH:/usr/local/sbin/ diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 4597afe09b..faa07cb38a 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.2.0' +VERSION='5.4.0' PATH=$PATH:/usr/local/sbin/

5 years, 1 month

[kamailio/kamailio] q_malloc crash on Kamailio 5.2.3 with http_async_query function (#2091)

by Michal Škuta

### Description We added http_async_client module to our configuration. We want to send HTTP POST request after the call is ended (in event_route[dialog_end]). We used the function **http_async_query** and right after calling the function Kamailio child exited by a signal 6 (more in the log down). ### Troubleshooting #### Reproduction In our system we just added http_async_module and its function http_async_query. It is located in own route HTTP_TEST_CALL_END called from event_route[dialog:end] Somewhat like this: ``` route[HTTP_TEST_CALL_END] { t_newtran(); $http_req(body) = "TEST"; http_async_query("http://192.168.6.23:2080/cdr_http", "HTTP_TEST_REPLY"); } ```  #### Debugging Data  ``` Core was generated by `/opt/ipgate/kamailio/sbin/kamailio -f /opt/ipgate/kamailio/etc/kamailio/kamaili'. Program terminated with signal 6, Aborted. #0 0xb7791424 in __kernel_vsyscall () (gdb) bt full #0 0xb7791424 in __kernel_vsyscall () No symbol table info available. #1 0xb7633661 in raise () from /lib/i386-linux-gnu/i686/cmov/libc.so.6 No symbol table info available. #2 0xb7636a92 in abort () from /lib/i386-linux-gnu/i686/cmov/libc.so.6 No symbol table info available. #3 0x0829fed6 in qm_debug_check_frag (qm=0x97607008, f=0x97a7ff3c, file=0x966f22d6 "http_async_client: hm_hash.c", line=82, efile=0x83f5093 "core/mem/q_malloc.c", eline=384) at core/mem/q_malloc.c:151 __FUNCTION__ = "qm_debug_check_frag" #4 0x082a16aa in qm_malloc (qmp=0x97607008, size=8, file=0x966f22d6 "http_async_client: hm_hash.c", func=0x966f2bfb "build_hash_key", line=82, mname=0x966f22c4 "http_async_client") at core/mem/q_malloc.c:384 qm = 0x97607008 f = 0x97a7ff3c hash = 4 list_cntr = 1 __FUNCTION__ = "qm_malloc" #5 0x966d5323 in build_hash_key (p=0x567d9620) at hm_hash.c:82 hash_str = 0x966f2be9 pointer_str = 0x97a7ff1c "0x567d9620" len = 10 hash = 360 __FUNCTION__ = "build_hash_key" #6 0x966d5d94 in build_http_m_cell (p=0x567d9620) at hm_hash.c:116 cell = 0x567cab3c len = 360 __FUNCTION__ = "build_http_m_cell" #7 0x966eafac in new_request (query=0xbfe65718, query_params=0xbfe65720, cb=0x966c9125 <async_http_cb>, param=0x567be804) at http_multi.c:442 __FUNCTION__ = "new_request" easy = 0x567d9620 rc = -1217109748 cell = 0x0 #8 0x966ce473 in notification_socket_cb (fd=16, event=2, arg=0x5679c988) at async_http.c:390 worker = 0x5679c988 received = 4 i = 0 len = -1075423144 aq = 0x567be804 query_params = {timeout = 500, tls_verify_host = 1, tls_verify_peer = 1, headers = 0x0, method = 0, tls_client_cert = 0x0, tls_client_key = 0x0, tls_ca_path = 0x0, body = { s = 0x567cb650 "TEST\300\300\300\300\355\357ͫ", len = 4}, authmethod = 3, username = 0x0, password = 0x0} query = {s = 0x567bf75c "http://192.168.6.23:2080/cdr_httpt_", len = 33} __FUNCTION__ = "notification_socket_cb" #9 0x9661d522 in event_base_loop () from /usr/lib/i386-linux-gnu/libevent-2.0.so.5 No symbol table info available. #10 0x9661e683 in event_base_dispatch () from /usr/lib/i386-linux-gnu/libevent-2.0.so.5 No symbol table info available. #11 0x966c8a4c in async_http_run_worker (worker=0x5679c988) at async_http.c:92 No locals. #12 0x966dabcd in child_init (rank=0) at http_async_client_mod.c:352 ---Type <return> to continue, or q <return> to quit--- pid = 0 i = 0 __FUNCTION__ = "child_init" #13 0x08200daa in init_mod_child (m=0x976a286c, rank=0) at core/sr_module.c:846 __FUNCTION__ = "init_mod_child" #14 0x082011ad in init_child (rank=0) at core/sr_module.c:874 ret = 23 #15 0x0806b409 in main_loop () at main.c:1737 i = 3 pid = 5318 si = 0x0 si_desc = "udp receiver child=2 sock=192.168.5.67:5060\000]\330g\267\360\243v\267X\037\000\000\300\243v\267\364\217v\267\300\243v\267\b\376R\t`\\\346\277]\330g\267\251\000\000\000\b\376R\t\364\217v\267\025\000\000\000\000]\346\277\367\273m\267\060+Z\t0+Z\t\\\v\232\227\000@\000\000@\200v\267\000\000\000" nrprocs = 3 woneinit = 1 __FUNCTION__ = "main_loop" #16 0x08071eb4 in main (argc=13, argv=0xbfe660b4) at main.c:2696 cfg_stream = 0x93f3008 c = -1 r = 0 tmp = 0xbfe6678c "" tmp_len = -1216949440 port = 2210 proto = 1 options = 0x8376690 ":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 = 2661251522 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xbfe65fe0 p = 0x805e4a0 "[\201\303p\374?" st = {st_dev = 14, __pad1 = 0, st_ino = 5047, st_mode = 16877, st_nlink = 2, st_uid = 109, st_gid = 111, st_rdev = 0, __pad2 = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1561470746, tv_nsec = 145357408}, st_mtim = {tv_sec = 1570111971, tv_nsec = 819339961}, st_ctim = {tv_sec = 1570111972, tv_nsec = 31337425}, __unused4 = 0, __unused5 = 0} __FUNCTION__ = "main" (gdb) info locals No symbol table info available. (gdb) list 1876 int proto; 1877 char *options; 1878 int ret; 1879 unsigned int seed; 1880 int rfd; 1881 int debug_save, debug_flag; 1882 int dont_fork_cnt; 1883 struct name_lst* n_lst; 1884 char *p; 1885 struct stat st = {0}; ``` #### Log Messages  ``` Oct 3 16:13:37 sip_server /opt/ipgate/kamailio/sbin/kamailio[5331]: CRITICAL: <core> [core/mem/q_malloc.c:149]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(c0003032, abcdefed)[0x97a7ff3c:0x97a7ff58]! Memory allocator was called from http_async_client: hm_hash.c:82. Fragment marked by http_async_client: hm_hash.c:71. Exec from core/mem/q_malloc.c:384. Oct 3 16:13:37 sip_server /opt/ipgate/kamailio/sbin/kamailio[5315]: INFO: <script>: XLOG: 93ffd680-1f94-4f60-b3b0-0fd599a46677 [onsend_route] Request BYE sent to sip:FreeSWITCH@192.168.5.94:5060;transport=udp;gw=balancer1 Oct 3 16:13:42 sip_server call-control[5004]: Starting factory <callcontrol.rating.RatingEngineFactory instance at 0xb6e8114c> Oct 3 16:13:42 sip_server call-control[5004]: <twisted.internet.tcp.Connector instance at 0xb6e8116c> will retry in 14 seconds Oct 3 16:13:42 sip_server call-control[5004]: Stopping factory <callcontrol.rating.RatingEngineFactory instance at 0xb6e8114c> Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5312]: ALERT: <core> [main.c:756]: handle_sigs(): child process 5331 exited by a signal 6 Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5312]: ALERT: <core> [main.c:759]: handle_sigs(): core was generated Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5312]: INFO: <core> [main.c:781]: handle_sigs(): terminating due to SIGCHLD Oct 3 16:13:44 sip_server /opt/ipgate/kamailio/sbin/kamailio[5321]: INFO: <core> [main.c:836]: sig_usr(): signal 15 received ... ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.3 (i386/linux) dcce68 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: dcce68 compiled on 17:08:25 Jun 20 2019 with gcc 4.7.2 ``` * **Operating System**:  ``` Debian GNU/Linux 7.1 (wheezy) Linux munda 3.2.0-4-686-pae #1 SMP Debian 3.2.46-1+deb7u1 i686 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/2091

5 years, 1 month

git:master:a52f0508: tls: fixed prototypes for seed() and add() functions for kxlibssl rand engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a52f05087a211bfecd36300907d0bff7170e08ec URL: https://github.com/kamailio/kamailio/commit/a52f05087a211bfecd36300907d0bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T12:11:48+02:00 tls: fixed prototypes for seed() and add() functions for kxlibssl rand engine - libssl 1.1.x docs seem to be inconsistent with the code --- Modified: src/modules/tls/tls_rand.c --- Diff: https://github.com/kamailio/kamailio/commit/a52f05087a211bfecd36300907d0bff… Patch: https://github.com/kamailio/kamailio/commit/a52f05087a211bfecd36300907d0bff… --- diff --git a/src/modules/tls/tls_rand.c b/src/modules/tls/tls_rand.c index 71d8de7bac..2cdb2ec0ef 100644 --- a/src/modules/tls/tls_rand.c +++ b/src/modules/tls/tls_rand.c @@ -209,42 +209,38 @@ void ksr_kxlibssl_init(void) } } -#ifdef __OS_darwin -int ksr_kxlibssl_seed(const void *buf, int num) -#else +#ifdef KSRTLSVOID void ksr_kxlibssl_seed(const void *buf, int num) -#endif { -#ifdef __OS_darwin + ksr_kxlibssl_init(); + if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { + return; + } + if(_ksr_kxlibssl_local_method->seed == NULL) { + return; + } + lock_get(_ksr_kxlibssl_local_lock); + _ksr_kxlibssl_local_method->seed(buf, num); + lock_release(_ksr_kxlibssl_local_lock); +} +#else +int ksr_kxlibssl_seed(const void *buf, int num) +{ int ret; -#endif ksr_kxlibssl_init(); if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } if(_ksr_kxlibssl_local_method->seed == NULL) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } lock_get(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin ret = _ksr_kxlibssl_local_method->seed(buf, num); -#else - _ksr_kxlibssl_local_method->seed(buf, num); -#endif lock_release(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin return ret; -#endif } +#endif int ksr_kxlibssl_bytes(unsigned char *buf, int num) { @@ -277,42 +273,39 @@ void ksr_kxlibssl_cleanup(void) lock_release(_ksr_kxlibssl_local_lock); } -#ifdef __OS_darwin -int ksr_kxlibssl_add(const void *buf, int num, double randomness) -#else +#ifdef KSRTLSVOID void ksr_kxlibssl_add(const void *buf, int num, int randomness) -#endif { -#ifdef __OS_darwin + ksr_kxlibssl_init(); + if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { + return; + } + if(_ksr_kxlibssl_local_method->add == NULL) { + return; + } + lock_get(_ksr_kxlibssl_local_lock); + _ksr_kxlibssl_local_method->add(buf, num, randomness); + lock_release(_ksr_kxlibssl_local_lock); +} +#else +int ksr_kxlibssl_add(const void *buf, int num, double randomness) +{ int ret; -#endif ksr_kxlibssl_init(); if(_ksr_kxlibssl_local_lock == 0 || _ksr_kxlibssl_local_method == 0) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } if(_ksr_kxlibssl_local_method->add == NULL) { -#ifdef __OS_darwin return 0; -#else - return; -#endif } lock_get(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin ret = _ksr_kxlibssl_local_method->add(buf, num, randomness); -#else - _ksr_kxlibssl_local_method->add(buf, num, randomness); -#endif lock_release(_ksr_kxlibssl_local_lock); -#ifdef __OS_darwin + return ret; -#endif } +#endif int ksr_kxlibssl_pseudorand(unsigned char *buf, int num) {

5 years, 1 month

git:master:b590df77: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b590df771e59b78963d3748b157d21896f9abaa8 URL: https://github.com/kamailio/kamailio/commit/b590df771e59b78963d3748b157d218… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-08T12:01:36+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/b590df771e59b78963d3748b157d218… Patch: https://github.com/kamailio/kamailio/commit/b590df771e59b78963d3748b157d218… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 650a964b58..f8d4e9743b 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1436,6 +1436,7 @@ end * krand - use internal kam_rand() function * fastrand - use internal fastrand function * cryptorand - use internal cryptorand (fortuna) function + * kxlibssl - default libssl rand engine wrapped by a Kamailio mutex Note: the krand and fastrand engines are not recommended for use on systems requiring strong security, as they may not generate numbers

5 years, 1 month

git:master:98a392fa: tls: docs for kxlibssl rand engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 98a392fa38419cd99494002dad66d4e1587110d3 URL: https://github.com/kamailio/kamailio/commit/98a392fa38419cd99494002dad66d4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T11:58:40+02:00 tls: docs for kxlibssl rand engine --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/98a392fa38419cd99494002dad66d4e… Patch: https://github.com/kamailio/kamailio/commit/98a392fa38419cd99494002dad66d4e… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index dc6494c2db..bf400da6c8 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1260,6 +1260,7 @@ end <listitem><para>krand - use internal kam_rand() function</para></listitem> <listitem><para>fastrand - use internal fastrand function</para></listitem> <listitem><para>cryptorand - use internal cryptorand (fortuna) function</para></listitem> + <listitem><para>kxlibssl - default libssl rand engine wrapped by a &kamailio; mutex</para></listitem> </itemizedlist> <para> Note: the krand and fastrand engines are not recommended for use on

5 years, 1 month

git:master:99eafac2: tls: added rand engine kxlibssl

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 99eafac2d92533ba93cd8244173aef0db0e76b0c URL: https://github.com/kamailio/kamailio/commit/99eafac2d92533ba93cd8244173aef0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-08T11:56:05+02:00 tls: added rand engine kxlibssl - use default libssl engine wrapped in a kamailio mutex lock --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_rand.c Modified: src/modules/tls/tls_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/99eafac2d92533ba93cd8244173aef0… Patch: https://github.com/kamailio/kamailio/commit/99eafac2d92533ba93cd8244173aef0…

5 years, 1 month

git:5.3:7f892850: pkg/kamailio/deb: version set 5.3.0~rc1

by Victor Seva

Module: kamailio Branch: 5.3 Commit: 7f892850916a6d668386575d1bb1ed1b3a638059 URL: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T23:21:33+02:00 pkg/kamailio/deb: version set 5.3.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1… Patch: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1…

5 years, 1 month

git:5.2:9fc7c9a1: usrloc: keep a private copy of urecord before running ul_callbacks

by Victor Seva

Module: kamailio Branch: 5.2 Commit: 9fc7c9a1ee97e708247e050988eabf8b529c5fb2 URL: https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-10-07T23:10:19+02:00 usrloc: keep a private copy of urecord before running ul_callbacks fixes #2089 (cherry picked from commit f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8… Patch: https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index d451057bdd..80980c4cdf 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) str user, contact; int i; int n; - urecord_t* r; + urecord_t r; ucontact_t* c; #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; @@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) } lock_udomain(_d, &user); - get_static_urecord(_d, &user, &r); + /* don't use the same static value from get_static_urecord() */ + memset( &r, 0, sizeof(struct urecord) ); + r.aor = user; + r.aorhash = ul_get_aorhash(&user); + r.domain = _d->name; - if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { + if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", user.len, user.s); - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); goto error; } @@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) user.len, user.s); } } - release_urecord(r); + release_urecord(&r); unlock_udomain(_d, &user); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */

5 years, 1 month

← Newer
1
...
28
29
30
31
32
33
34
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019