sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
314 discussions

Kamailio websocket state FINWAIT1 after switchover
by Shahid Hussain 09 Jul '21

09 Jul '21

Hi !., Kamailio websocket state is going into FINWAIT1 without sending FIN message out when we do service kamailio restart. I have a Primary and Secondary node configured. When I perform switchover socket status is going into FINWAIT1 state without sending FIN to the client hence client status is showing established, This is happening 90+% of times but does work sometimes. AT Kamailio: [root@localhost ~]# netstat -tunelap | grep 41034 tcp 0 1 172.27.45.198:9040 172.27.6.98:… [View More]

2 2

git:5.5:557ac56a: core: str list - added function to insert a block string in list
by Daniel-Constantin Mierla 08 Jul '21

08 Jul '21

Module: kamailio Branch: 5.5 Commit: 557ac56a6ec6b4ca3d76a57ff8b21c64027791f2 URL: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:12+02:00 core: str list - added function to insert a block string in list (cherry picked from commit b92b931c26c199b756fd08e9c80cc9305469fd2b) --- Modified: src/core/str_list.c Modified: … [View More]src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Patch: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… --- diff --git a/src/core/str_list.c b/src/core/str_list.c index f63b4c9151..207cee5bc3 100644 --- a/src/core/str_list.c +++ b/src/core/str_list.c @@ -13,13 +13,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions * @ingroup core * Module: @ref core @@ -32,7 +32,7 @@ /** * @brief Add a new allocated list element to an existing list - * + * * Add a new allocated list element to an existing list, the allocation is done * from the private memory pool * @param s input character @@ -43,18 +43,45 @@ */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) { - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { + struct str_list *nv; + nv = pkg_malloc(sizeof(struct str_list)); + if (!nv) { PKG_MEM_ERROR; return 0; } - new->s.s = s; - new->s.len = len; - new->next = 0; + nv->s.s = s; + nv->s.len = len; + nv->next = 0; - (*last)->next = new; - *last = new; + (*last)->next = nv; + *last = nv; *total += len; - return new; + return nv; +} + +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len) +{ + str_list_t *nv; + nv = pkg_mallocxz(sizeof(str_list_t) + (len+1)*sizeof(char)); + if (!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->s.s = (char*)nv + sizeof(str_list_t); + memcpy(nv->s.s, s, len); + nv->s.len = len; + nv->next = *head; + *head = nv; + + return nv; } diff --git a/src/core/str_list.h b/src/core/str_list.h index db3fa12887..1eac2578b0 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -51,4 +51,16 @@ typedef struct str_list { */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len); + #endif [View Less]

2 3

systemd watchdog
by Sergey Safarov 06 Jul '21

06 Jul '21

I have observed a case when Kamaili debug module try to grab the lock on shutdown and not able to do it. As a result, the Kamailio process is stuck and not able to restart (dead lock). To resolve such a case i want to utilize systemd watchdog feature https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.html# To use this feature I need send sd_notify(3) with a message string of "WATCHDOG=1" from main process https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.… [View More]

2 1

[kamailio/kamailio] tls: allow export session keys (#2785)
by sergey-safarov 05 Jul '21

05 Jul '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature … [View More]

3 14

[kamailio/kamailio] core on start (#2788)
by sergey-safarov 01 Jul '21

01 Jul '21

### Description coredump kamailio start ### Troubleshooting #### Debugging Data ``` (gdb) bt #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 #4 0x0000000000562898 in … [View More]pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 (gdb) bt full #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 No symbol table info available. #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 s = {s = 0x7ffff6af9178 "\001", len = -156263992} p = 0x82be18 <__func__.9> "pv_init_buffer" nsp = 0x0 hdr = {type = 8368264, name = {s = 0x85 <error: Cannot access memory at address 0x85>, len = -10896}, body = {s = 0x5634f1 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -156349208}, len = -10736, parsed = 0x1, next = 0x0} __func__ = "pv_parse_hdr_name" #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 p = 0x7ffff6ae4d53 ")[0])" s = {s = 0x7ffff6ae4d4e "X-CID)[0])", len = 5} pvname = {s = 0x7ffff6ae4d4a "hdr(X-CID)[0])", len = 3} pvstate = 2 tr = 0x0 pte = 0x7ffff6500c38 n = 0 __func__ = "pv_parse_spec2" #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 pvn = 0x7ffff6ae4cd0 pvid = 949637875 p = 0x0 __func__ = "pv_cache_add" #4 0x0000000000562898 in pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} __func__ = "pv_spec_lookup" #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 p = 0x7ffff6afc668 "$(hdr(X-CID)[0])" p0 = 0xc600000001 <error: Cannot access memory at address 0xc600000001> n = 1 e = 0x7ffff6ae4c48 e0 = 0x0 s = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} len = 16 __func__ = "pv_parse_format" #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 p = 0x7ffff6ae4ba8 name = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} s = {s = 0x1800000 <error: Cannot access memory at address 0x1800000>, len = 0} num = 32767 err = -156291736 __func__ = "fix_param" #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 ret = -156248399 t = 256 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 ret = 0 fp = 0x0 __func__ = "fixup_spve_null" #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 No locals. #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 No locals. #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 res = 0 __func__ = "append_hf_value_fixup" #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 t = 0x7ffff6afc430 p = 0x7ffff6af8730 tmp = 0x4bbed9 <sr_event_exec+415> "\211E\374\213E\374\351/\003" tmp_p = 0x7ffff6afc668 ret = 0 i = 1 cmd = 0x7ffff6528150 s = {s = 0x7ffff6af99c8 "\001", len = -8700} he = 0x7fffffffded0 ip = {af = 25165824, len = 0, u = {addrl = {0, 140737488346496}, addr32 = {0, 0, 4294958464, 32767}, addr16 = {0, 0, 0, 0, 56704, 65535, 32767, 0}, addr = "\000\000\000\000\000\000\000\000\200\335\377\377\377\177\000"}} si = 0x7fffffffdecc lval = 0x7fffffffded4 rve = 0x7ffff6af8398 err_rve = 0x4000000 rve_type = RV_NONE err_type = 133 expected_type = RV_NONE rv = 0x7ffff6af8448 rve_param_no = 0 __func__ = "fix_actions" #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 t = 0x7ffff6afc6e8 p = 0x0 tmp = 0x6f16b7 <qm_malloc+1321> "H\203\304\020H\213E\310H\213P\030H\213E\270H\213" tmp_p = 0x7ffff6af88f0 ret = 0 i = 2 cmd = 0x7ffff652bab8 s = {s = 0x7ffff6ac87f8 "LIS_REPLY", len = 9} he = 0x7fffffffe020 ip = {af = 0, len = 0, u = {addrl = {140737274206128, 140737488347056}, addr32 = {4080818096, 32767, 4294959024, 32767}, addr16 = {22448, 62268, 32767, 0, 57264, 65535, 32767, 0}, addr = "\260W<\363\377\177\000\000\260\337\377\377\377\177\000"}} si = 0xaab32f7585fd7500 lval = 0x7ffff6ac7520 rve = 0x7ffff6afbc18 err_rve = 0x0 rve_type = RV_INT err_type = 32 expected_type = RV_NONE rv = 0x7ffff6ac91e0 rve_param_no = 0 __func__ = "fix_actions" #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 i = 97 ret = 0 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 ret = 0 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 cfg_stream = 0x9c02d0 c = -1 r = 0 tmp = 0x7fffffffe8bb "" tmp_len = 896 port = 896 proto = 896 ahost = 0x0 aport = 0 options = 0x7fe158 ":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 = 4231472377 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xc2 <error: Cannot access memory at address 0xc2> st = {st_dev = 56, st_ino = 279340502, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 120, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1622741422, tv_nsec = 474562221}, st_mtim = {tv_sec = 1624650702, tv_nsec = 443892052}, st_ctim = {tv_sec = 1624650702, tv_nsec = 443892052}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\342\377\377\377\177", '\000' <repeats 11 times>, "\342\377\377\377\177", '\000' <repeats 18 times>, "\260\027\375\367\377\177\000\000\350\317\377\367\377\177\000\000\b\345\377\367\377\177\000\000\340\031\375\367\377\177\000\000\025\217\376\367\377\177\000\000$f\307\367\377\177\000\000\354K\377\367\377\177\000\000\336K\377\367\377\177\000\000\205\317c\t\000\000\000\000\300S\374\367\377\177\000\000ߏ\376\367\377\177\000\000\000\000\000\000\254\202\226\006\334P\307\367\377\177\000\000\000\000\000\000\000\000\000\000\300S\374\367\377\177\000\000\001\000\000\000\000\000\000\000@\347N\360\356\"\000\000\240\341\377\367\377\177\000\000\370\377\377\377\377\377\377\377\240\341\377\367\377\177\000\000R"... option_index = 12 long_options = {{name = 0x800836 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7fb521 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x80083b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x800841 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x800847 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x800850 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x80085a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x800864 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x80086f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x800878 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x800883 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x800889 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x800893 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` ### Additional Information master on CentOS8 -- 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/2788 [View Less]

2 12

[kamailio/kamailio] nats: make sure pkg & shm memory is allocated; check pointers before freeing memory (#2792)
by Emmanuel Schmidbauer 30 Jun '21

30 Jun '21

…freeing memory   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  as per @miconda's suggestion, added memory checks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2792 -- Commit Summary -- * nats: make sure pkg & shm memory is allocated; check pointers before freeing memory -- File Changes -- M src/modules/nats/nats_mod.c (69) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2792.patch https://github.com/kamailio/kamailio/pull/2792.diff -- 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/pull/2792 [View Less]

2 3

git:master:5980ca59: Merge pull request #2792 from kamailio/nats-memory-checks
by GitHub 30 Jun '21

30 Jun '21

Module: kamailio Branch: master Commit: 5980ca59189c01a57b6765eaaf7d883f0541590b URL: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-30T06:22:49-04:00 Merge pull request #2792 from kamailio/nats-memory-checks nats: make sure pkg & shm memory is allocated; check pointers before freeing memory --- Modified: src/modules/nats/nats_mod.c --… [View More]- Diff: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… Patch: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 34a82910f5..90f73f243c 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -245,6 +245,10 @@ int init_worker( if(s0->url != NULL && num_servers < NATS_MAX_SERVERS) { len = strlen(s0->url); sc = shm_malloc(len + 1); + if(!sc) { + LM_ERR("no shm memory left\n"); + return -1; + } strcpy(sc, s0->url); sc[len] = '\0'; worker->init_nats_servers[num_servers++] = sc; @@ -368,30 +372,38 @@ int nats_destroy_workers() nats_consumer_worker_t *worker; for(i = 0; i < _nats_proc_count; i++) { worker = &nats_workers[i]; - natsSubscription_Unsubscribe(worker->subscription); - natsSubscription_Destroy(worker->subscription); - natsConnection_Close(worker->conn); - natsConnection_Destroy(worker->conn); - natsOptions_Destroy(worker->opts); - if(worker->uvLoop != NULL) { - uv_loop_close(worker->uvLoop); - } - nats_Close(); - if(worker->subject != NULL) { - shm_free(worker->subject); - } - if(worker->queue_group != NULL) { - shm_free(worker->queue_group); - } - if(worker->on_message != NULL) { - shm_free(worker->on_message); - } - for(s = 0; s < NATS_MAX_SERVERS; s++) { - if(worker->init_nats_servers[s]) { - shm_free(worker->init_nats_servers[s]); + if(worker != NULL) { + if(worker->subscription != NULL) { + natsSubscription_Unsubscribe(worker->subscription); + natsSubscription_Destroy(worker->subscription); + } + if(worker->conn != NULL) { + natsConnection_Close(worker->conn); + natsConnection_Destroy(worker->conn); + } + if(worker->opts != NULL) { + natsOptions_Destroy(worker->opts); + } + if(worker->uvLoop != NULL) { + uv_loop_close(worker->uvLoop); + } + nats_Close(); + if(worker->subject != NULL) { + shm_free(worker->subject); } + if(worker->queue_group != NULL) { + shm_free(worker->queue_group); + } + if(worker->on_message != NULL) { + shm_free(worker->on_message); + } + for(s = 0; s < NATS_MAX_SERVERS; s++) { + if(worker->init_nats_servers[s]) { + shm_free(worker->init_nats_servers[s]); + } + } + shm_free(worker); } - shm_free(worker); } return 0; } @@ -420,6 +432,10 @@ int _init_nats_server_url_add(modparam_t type, void *val) return -1; } value = pkg_malloc(len + 1); + if(!value) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(value, url); value[len] = '\0'; if(init_nats_server_url_add(url) < 0) { @@ -434,6 +450,11 @@ int _init_nats_sub_add(modparam_t type, void *val) char *sub = (char *)val; int len = strlen(sub); char *s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + strcpy(s, sub); s[len] = '\0'; if(init_nats_sub_add(s) < 0) { @@ -529,6 +550,10 @@ int init_nats_sub_add(char *sc) len = strlen(sc); s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(s, sc); s[len] = '\0'; [View Less]

1 0

git:master:b95b2448: nats: make sure pkg & shm memory is allocated; check pointers before freeing memory
by Emmanuel Schmidbauer 30 Jun '21

30 Jun '21

Module: kamailio Branch: master Commit: b95b2448d7e968c2bff59e1d820764defee104aa URL: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-06-28T07:30:40-04:00 nats: make sure pkg & shm memory is allocated; check pointers before freeing memory --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/… [View More]kamailio/commit/b95b2448d7e968c2bff59e1d820764d… Patch: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 34a82910f5..90f73f243c 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -245,6 +245,10 @@ int init_worker( if(s0->url != NULL && num_servers < NATS_MAX_SERVERS) { len = strlen(s0->url); sc = shm_malloc(len + 1); + if(!sc) { + LM_ERR("no shm memory left\n"); + return -1; + } strcpy(sc, s0->url); sc[len] = '\0'; worker->init_nats_servers[num_servers++] = sc; @@ -368,30 +372,38 @@ int nats_destroy_workers() nats_consumer_worker_t *worker; for(i = 0; i < _nats_proc_count; i++) { worker = &nats_workers[i]; - natsSubscription_Unsubscribe(worker->subscription); - natsSubscription_Destroy(worker->subscription); - natsConnection_Close(worker->conn); - natsConnection_Destroy(worker->conn); - natsOptions_Destroy(worker->opts); - if(worker->uvLoop != NULL) { - uv_loop_close(worker->uvLoop); - } - nats_Close(); - if(worker->subject != NULL) { - shm_free(worker->subject); - } - if(worker->queue_group != NULL) { - shm_free(worker->queue_group); - } - if(worker->on_message != NULL) { - shm_free(worker->on_message); - } - for(s = 0; s < NATS_MAX_SERVERS; s++) { - if(worker->init_nats_servers[s]) { - shm_free(worker->init_nats_servers[s]); + if(worker != NULL) { + if(worker->subscription != NULL) { + natsSubscription_Unsubscribe(worker->subscription); + natsSubscription_Destroy(worker->subscription); + } + if(worker->conn != NULL) { + natsConnection_Close(worker->conn); + natsConnection_Destroy(worker->conn); + } + if(worker->opts != NULL) { + natsOptions_Destroy(worker->opts); + } + if(worker->uvLoop != NULL) { + uv_loop_close(worker->uvLoop); + } + nats_Close(); + if(worker->subject != NULL) { + shm_free(worker->subject); } + if(worker->queue_group != NULL) { + shm_free(worker->queue_group); + } + if(worker->on_message != NULL) { + shm_free(worker->on_message); + } + for(s = 0; s < NATS_MAX_SERVERS; s++) { + if(worker->init_nats_servers[s]) { + shm_free(worker->init_nats_servers[s]); + } + } + shm_free(worker); } - shm_free(worker); } return 0; } @@ -420,6 +432,10 @@ int _init_nats_server_url_add(modparam_t type, void *val) return -1; } value = pkg_malloc(len + 1); + if(!value) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(value, url); value[len] = '\0'; if(init_nats_server_url_add(url) < 0) { @@ -434,6 +450,11 @@ int _init_nats_sub_add(modparam_t type, void *val) char *sub = (char *)val; int len = strlen(sub); char *s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + strcpy(s, sub); s[len] = '\0'; if(init_nats_sub_add(s) < 0) { @@ -529,6 +550,10 @@ int init_nats_sub_add(char *sc) len = strlen(sc); s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(s, sc); s[len] = '\0'; [View Less]

1 0

Implementation of ios/android push notifications module or similar
by javier falbo 29 Jun '21

29 Jun '21

Hello, As mobile applications based on kamailio are growing exponentially on Play Store and App Store, i would suggest if you could add by default the code for ios/android push notifications. I have problems mainly for incoming call (phone wakeup) on linphone iphone app, as kamailio is missing the push solution. On Android i am using Baresip and works perfect without push. Navigating on the web, i found some uncomplete or minimum tutorials to implement this. Like: https://denys-pozniak.… [View More]medium.com/apple-push-notification-with-kamailio-eeca… And also some code snippets of a modification of "kamailio.cfg" to add support for ios push notifications. (see below). Could someone have this already working? Or kamailio official developers could add this by default inside source code? # keep a record of an IPhone for 4 hours modparam("htable", "htable", "iphone_remote=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_voip=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_check=>size=10;autoexpire=14400;") modparam("htable", "htable", "vtp=>size=10;autoexpire=120;") route[REGISTRAR] { ... ... if (save("location")) { # user registered, now look at the useragent header for iPhone string if ($hdr(User-Agent)=~"LinphoneiOS.*") { $var(uri) = @contact.uri; # select the uri from contact header $var(pn-prid) = $(var(uri){uri.param,pn-prid}); # get the uri param pn-prid from the uri, i.e. 1DF26BC10F597676B xlog("!!!! - $var(pn-prid)"); $var(i) = 0; $var(n) = $(var(pn-prid){s.count,&}); while( $var(i) <= $var(n)) { $var(pn-prid_item) = $(var(pn-prid){s.select,$var(i),&}); $var(pn-prid_type) = $(var(pn-prid_item){s.select,1,:}); $var(pn-prid_token) = $(var(pn-prid_item){s.select,0,:}); if ( $var(pn-prid_type) == "remote" ) { $var(pn-prid_remote) = $(var(pn-prid_item){s.select,0,:}) ; } if ( $var(pn-prid_type) == "voip" ) { $var(pn-prid_voip) = $(var(pn-prid_item){s.select,0,:}) ; } $var(i) = $var(i) + 1; } xlog("L_INFO","iPhone PUSH tokens for user $fU - remote: $var(pn-prid_remote), voip: $var(pn-prid_voip)"); # store the values of tokens to htable with fromUser as key $sht(iphone_remote=>$fU) = $var(pn-prid_remote); $sht(iphone_voip=>$fU) = $var(pn-prid_voip); $sht(iphone_check=>$fU) = 1; if ( $sht(vtp=>id_index::$tU) != $null ) { xlog("L_INFO", "New $rm ru=$ru tu=$tu \n"); route(JOIN); } } else { # no iphone $sht(iphone_check=>$fU) = 0; } ... ... } route[LOCATION] { ... ... if (!lookup("location")) { $var(rc) = $rc; # handle PUSH notifications for iPhone # iphones should not be registered and contacts stored in database # hence lookup should fail and we need to try to push iphone first if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); route(RELAY); exit; } ... ... if (is_method("INVITE")) { setflag(FLT_ACCMISSED); # handle PUSH notifications for iPhone # in some cases, iphone does not send de-register when going to background # for these circumstances, push iphone even if it has an active registration if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); } } route(RELAY); exit; } route[SUSPEND] { if ( !t_suspend() ) { xlog("L_ERROR","[SUSPEND] failed suspending trasaction [$T(id_index):$T(id_label)]\n"); send_reply("501", "Suspending error"); exit; } else { xlog("L_INFO","[SUSPEND] suspended transaction [$T(id_index):$T(id_label)] $fU=> $rU\n"); $sht(vtp=>id_index::$rU) = $T(id_index); $sht(vtp=>id_label::$rU) = $T(id_label); xlog("L_INFO","[SUSPEND] htable key value [$sht(vtp=>id_index::$rU) -- $sht(vtp=>id_label::$rU)]\n"); route(SENDPUSH); exit; } } route[SENDPUSH] { #http_client_query("http://url/push.php"<http://url/push.php>, "user=$rU\r\npn-tok=$sht(tokens=>$rU)\r\n","Content-Type: text/plain", "$var(result)"); xlog("!!!!!!!!!!!!!!!!!!!!!! PUSH !!!!!!!!!!!!!!!!!!!"); xlog("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); exec_avp("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); xlog("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); sl_send_reply("100", "Pushing"); } route[JOIN] { xlog("L_WARN","[JOIN] htable key value [$sht(vtp=>id_index::$tU) -- $sht(vtp=>id_label::$tU)]\n"); t_continue("$sht(vtp=>id_index::$tU)", "$sht(vtp=>id_label::$tU)", "RESUME"); $sht(vtp=>joined::$tU) = 1; } route[RESUME] { lookup("location"); xlog("L_INFO","[RESUME] rm=$rm ru=$ru du=$du \n"); t_relay(); $sht(vtp=>id_index::$tU) = $null; $sht(vtp=>id_label::$tU) = $null; exit; } [View Less]

1 0

git:5.5:abbe78ae: core: clone value for loadmodulex
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: abbe78aec28d46b74f59d14334b6e4871915ea4a URL: https://github.com/kamailio/kamailio/commit/abbe78aec28d46b74f59d14334b6e48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:35+02:00 core: clone value for loadmodulex (cherry picked from commit e04890fe90d6e5ce879f968eb689e8616b318d54) --- Modified: src/core/sr_module.c --- Diff: https://github.com/… [View More]

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021