sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
206 discussions

git:master:53664ba2: htable: replicate the operation rm with sw
by Daniel-Constantin Mierla 03 Dec '20

03 Dec '20

Module: kamailio Branch: master Commit: 53664ba26af389855444c1c2c6a78d53b276c0a0 URL: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-03T13:50:58+01:00 htable: replicate the operation rm with sw - GH #2573 --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… Patch: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index ccb67e30d8..42e1847d30 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -350,7 +350,9 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq return 0; } -int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { +int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, + int type, int_str* val, int mode) +{ srjson_doc_t jdoc; @@ -370,7 +372,8 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int srjson_AddStrToObject(&jdoc, jdoc.root, "cname", cname->s, cname->len); } - if (action==HT_DMQ_SET_CELL || action==HT_DMQ_SET_CELL_EXPIRE || action==HT_DMQ_RM_CELL_RE) { + if (action==HT_DMQ_SET_CELL || action==HT_DMQ_SET_CELL_EXPIRE + || action==HT_DMQ_RM_CELL_RE || action==HT_DMQ_RM_CELL_SW) { srjson_AddNumberToObject(&jdoc, jdoc.root, "type", type); if (type&AVP_VAL_STR) { srjson_AddStrToObject(&jdoc, jdoc.root, "strval", val->s.s, val->s.len); @@ -407,7 +410,8 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int return -1; } -int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { +int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, + int type, int_str* val, int mode) { ht_t* ht; ht = ht_get_table(htname); @@ -416,7 +420,8 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int ty return -1; } - LM_DBG("replaying action %d on %.*s=>%.*s...\n", action, htname->len, htname->s, cname->len, cname->s); + LM_DBG("replaying action %d on %.*s=>%.*s...\n", action, + htname->len, htname->s, cname->len, cname->s); if (action==HT_DMQ_SET_CELL) { return ht_set_cell(ht, cname, type, val, mode); @@ -426,6 +431,8 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int ty return ht_del_cell(ht, cname); } else if (action==HT_DMQ_RM_CELL_RE) { return ht_rm_cell_re(&val->s, ht, mode); + } else if (action==HT_DMQ_RM_CELL_SW) { + return ht_rm_cell_op(&val->s, ht, mode, HT_RM_OP_SW); } else { LM_ERR("unrecognized action\n"); return -1; diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index 55f2af783d..22c4876191 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -33,11 +33,12 @@ extern dmq_resp_cback_t ht_dmq_resp_callback; typedef enum { HT_DMQ_NONE, + HT_DMQ_SYNC, HT_DMQ_SET_CELL, HT_DMQ_SET_CELL_EXPIRE, HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, - HT_DMQ_SYNC + HT_DMQ_RM_CELL_SW } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 55717ecd94..d449839c2f 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -493,6 +493,10 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, } return 1; } else if(strncmp(op->s, "sw", 2)==0) { + if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_SW, &ht->name, NULL, + AVP_VAL_STR, &isval, mkey)!=0) { + LM_ERR("dmq relication failed (op %d)\n", mkey); + } if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_SW)<0) { return -1; }

1 0

git:master:c0f5382b: tm: check end of header name in lw parser
by Daniel-Constantin Mierla 03 Dec '20

03 Dec '20

Module: kamailio Branch: master Commit: c0f5382bfbd2022896a9b206967977f827517700 URL: https://github.com/kamailio/kamailio/commit/c0f5382bfbd2022896a9b206967977f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-03T13:15:52+01:00 tm: check end of header name in lw parser - proper identification of header type, prior could mistakenly set the type by matching the prefix of long header name - GH #2572 --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/c0f5382bfbd2022896a9b206967977f… Patch: https://github.com/kamailio/kamailio/commit/c0f5382bfbd2022896a9b206967977f…

1 0

[kamailio/kamailio] lost: do not parse locationURI with indention spaces (#2569)
by sergey-safarov 03 Dec '20

03 Dec '20

### Description Examples of [RFC7840](https://tools.ietf.org/html/rfc7840#section-7) contains this response: ```xml <locationResponse xmlns="urn:ietf:params:xml:ns:geopriv:held"> <locationUriSet expires="2006-01-01T13:00:00.0Z"> <locationURI> https://ls.example.com:9768/357yc6s64ceyoiuy5ax3o </locationURI> <locationURI> sip:9769+357yc6s64ceyoiuy5ax3o@ls.example.com </locationURI> </locationUriSet> <routingInformation xmlns="urn:ietf:params:xml:ns:geopriv:held:ri"> <service serviceUri="urn:service:sos"> <dest>sip:112@example.com</dest> <dest>sips:112@example.com</dest> <dest>xmpp:112@example.com</dest> </service> </routingInformation> </locationResponse> ``` When the `lost` module receives such a response, then generate this message ``` http_client [functions.c:299]: curL_query_url(): Malformed URL used in http client (url: https://ls.example.com:9768/357yc6s64ceyoiuy5ax3o ) lost [functions.c:325]: lost_held_function(): dereferencing location failed: 3 ``` This error is fixed when if I strip spaces in a string of `locationURI` element. ### Troubleshooting #### Reproduction Send xml eample from RFC as responce for `lost_held_query` function call. ### Possible Solutions Strip leading and trailing spaces of `locationURI` element. Maybe the required changes here https://github.com/kamailio/kamailio/blob/master/src/modules/lost/functions… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@ip-100-86-47-115 ~]# kamailio -v version: kamailio 5.5.0-dev3 (x86_64/linux) 0f572c 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 0f572c compiled on 04:01:25 Nov 29 2020 with gcc 8.3.1 ``` * **Operating System**: ``` [root@ip-100-86-47-115 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="8" ``` -- 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/2569

3 6

[kamailio/kamailio] dialog/dmq access dialog table by reference (#2570)
by pwakano 02 Dec '20

02 Dec '20

- Access to the d_table entries should be done by reference so there is no risk of race conditions to get and release the lock   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2547 #### Description  It was seen the access to the d_table was not being made by reference on the function dmq_send_all_dlgs. It was then leading to race conditions where the same entry could have its lock changed elsewhere and then a dead lock would occur. By checking the code in other places where the d_table is used, everywhere it is accessed by reference, this function was the only one not following this logic. Changes were done to have "entry" as a reference to d_table and not a copy. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2570 -- Commit Summary -- * dialog/dmq access dialog table by reference -- File Changes -- M src/modules/dialog/dlg_dmq.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2570.patch https://github.com/kamailio/kamailio/pull/2570.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/2570

3 4

[kamailio/kamailio] lost: trimed spaces before reolving locationURI value (#2571)
by sergey-safarov 02 Dec '20

02 Dec '20

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2569 #### Description fixes GH2569. Allow parse examples from RFC7840 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2571 -- Commit Summary -- * lost: trimed spaces before reolving locationURI value -- File Changes -- M src/modules/lost/functions.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2571.patch https://github.com/kamailio/kamailio/pull/2571.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/2571

3 4

git:master:f9d424ac: lost: trimed spaces before reolving locationURI value
by Henning Westerholt 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: f9d424ac426dc0547c7233902dfa44ad1287e077 URL: https://github.com/kamailio/kamailio/commit/f9d424ac426dc0547c7233902dfa44a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-02T21:13:37+01:00 lost: trimed spaces before reolving locationURI value fixes GH2569 (#2569). Allow parse exmaples from RFC7840 --- Modified: src/modules/lost/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/f9d424ac426dc0547c7233902dfa44a… Patch: https://github.com/kamailio/kamailio/commit/f9d424ac426dc0547c7233902dfa44a… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index c94c7883f0..481d737071 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -298,6 +298,8 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url, if(geo.len == 0) { LM_WARN("%s element not found\n", HELD_TYPE_URI); geo.s = NULL; + } else { + geo.s = lost_trim_content(geo.s, &geo.len); } } if(xmlStrcmp(cur_node->name,

1 0

[kamailio/kamailio] core: main - Protect async-signal-unsafe code in sig_usr() with SIG_DEBUG (#2127)
by Guillem Jover 02 Dec '20

02 Dec '20

#### Pre-Submission Checklist - [ ] 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) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The sig_usr() signal handler contains debug code to print memory usage and statistics that is not async-signal-safe, which can cause crashes or misbehavior. This code which only affects explicit SIGUSR1 signals on children processes, and is not guarded with the SIG_DEBUG macro. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2127 -- Commit Summary -- * core: main - Protect async-signal-unsafe code in sig_usr() with SIG_DEBUG -- File Changes -- M src/main.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2127.patch https://github.com/kamailio/kamailio/pull/2127.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/2127

4 9

git:master:86532d14: core: main - removed old unchanged compile ifndef condition
by Daniel-Constantin Mierla 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: 86532d14f005409be7ae67e3013703b216775aed URL: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-02T16:20:57+01:00 core: main - removed old unchanged compile ifndef condition --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b… Patch: https://github.com/kamailio/kamailio/commit/86532d14f005409be7ae67e3013703b… --- diff --git a/src/main.c b/src/main.c index db81d3a0c3..fa18b3221e 100644 --- a/src/main.c +++ b/src/main.c @@ -797,14 +797,12 @@ void handle_sigs(void) break; } -#ifndef STOP_JIRIS_CHANGES if (dont_fork) { LM_INFO("dont_fork turned on, living on\n"); break; } LM_INFO("terminating due to SIGCHLD\n"); -#endif - LM_DBG("terminating due to SIGCHLD\n"); + /* exit */ shutdown_children(SIGTERM, 1); if (WIFSIGNALED(chld_status)) { @@ -909,13 +907,9 @@ void sig_usr(int signo) #endif break; case SIGCHLD: -#ifndef STOP_JIRIS_CHANGES #ifdef SIG_DEBUG /* signal unsafe stuff follows */ LM_DBG("SIGCHLD received: " "we do not worry about grand-children\n"); -#endif -#else - _exit(0); /* terminate if one child died */ #endif break; }

1 0

git:master:31f0612c: core: main - log message on more signal values, wrap around SIG_DEBUG
by Daniel-Constantin Mierla 02 Dec '20

02 Dec '20

Module: kamailio Branch: master Commit: 31f0612c2d1f843e3cdc43aefebf3b942300149b URL: https://github.com/kamailio/kamailio/commit/31f0612c2d1f843e3cdc43aefebf3b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-02T14:25:46+01:00 core: main - log message on more signal values, wrap around SIG_DEBUG - includes part of GH #2127 --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/31f0612c2d1f843e3cdc43aefebf3b9… Patch: https://github.com/kamailio/kamailio/commit/31f0612c2d1f843e3cdc43aefebf3b9… --- diff --git a/src/main.c b/src/main.c index 373236c5d0..db81d3a0c3 100644 --- a/src/main.c +++ b/src/main.c @@ -833,9 +833,10 @@ void handle_sigs(void) */ void sig_usr(int signo) { - +#ifdef SIG_DEBUG #ifdef PKG_MALLOC int memlog; +#endif #endif if (is_main){ @@ -859,7 +860,7 @@ void sig_usr(int signo) #ifdef SIG_DEBUG /* signal unsafe stuff follows */ LM_INFO("signal %d received\n", signo); /* print memory stats for non-main too */ - #ifdef PKG_MALLOC +#ifdef PKG_MALLOC /* make sure we have current cfg values, but update only the safe part (values not requiring callbacks), to account for processes that might not have registered @@ -877,11 +878,13 @@ void sig_usr(int signo) pkg_sums(); } } - #endif +#endif #endif _exit(0); break; case SIGUSR1: +#ifdef SIG_DEBUG /* signal unsafe stuff follows */ + LM_INFO("signal %d received\n", signo); #ifdef PKG_MALLOC cfg_update_no_cbs(); memlog=cfg_get(core, core_cfg, memlog); @@ -895,11 +898,15 @@ void sig_usr(int signo) pkg_sums(); } } +#endif #endif break; /* ignored*/ case SIGUSR2: case SIGHUP: +#ifdef SIG_DEBUG /* signal unsafe stuff follows */ + LM_INFO("signal %d received - ignoring\n", signo); +#endif break; case SIGCHLD: #ifndef STOP_JIRIS_CHANGES

1 0

[kamailio/kamailio] keep-alive refactoring: use case front-end proxy with backend registrar (#2565)
by sergey-safarov 02 Dec '20

02 Dec '20

### Description In my use case exists 1. pool of front-end proxies (all share some IPv4 address via AWS network load-balancer); 2. pool of backend registrars. I must: 1. send keepalive messages to endpoints when used INVITE, REGISTRAR, SUBSCRIBE methods via all possible transports (UDP/TSP/TLS/WS/WSS/SCTP) (like nat_keepalive function of nat_traversal module). Internally store record for this SIP URI with flag `ka_dynamic` and `Record-Route` headers from `180, 183, 200` responses as `Route`; 2. send keepalive messages on predefined SIP URI (like ka_add_destination of keepalive module). Internally store record for this SIP URI with flag `ka_static` and manually defined `Route` value; 3. when keepalive for cases above is failed, then added record into arrays: a. ka_invite_failed; b. ka_registrar_failed; c. ka_supscribe_failed; d. ka_invite_succcess; e. ka_registrar_success; f. ka_supscribe_success; 4. need to trigger `even route` function with initialized `xavp` params of a. of SIP URI endpoints; b. relevant array ID; c. dynamic or static flag of SIP URI record; d. `Record-Route` of SIP URI record; 5.If we have arrays for multiple arrays, then the `event router` function called multiple times. 6. the time period for `event route` calls must be configurable via module settings; 7. when executed `event route` I want to have abbility a. send a new registration message to the registrar node using saved `Route` header when OPTION is successful for the statically defined SIP URI; a. send registration expiration message to the registrar node from received `200` response; b. send the clear subscription message to the node from received `200` response; #### Actual observed behavior In current implementation `OPTIONS` keepalive messages send from different modules 1. usrloc; 2. keepalive; 3. nat_traversal; 4. nathelper All the above have limitations like: 1. no TCP/TLS/WS/WSS transport support (nat_traversal, nathelper); 2. no ability to define call `event-route` on failed (success) OPTIONS message (think all modules do not have such feature); 3. no ability to check response code before enabling keepalive (nat_traversal); 4. no ability to notify backend REGISTRAR/SUBSCRIPTION server (think all modules do not have such feature) about failed keepalive messages; #### What is expected >From my of view required: 1. some refactor of keepalive feature; 2. merge code from different modules into one and make other modules dependent; 3. implement the ability to notify backend REGISTRAR/SUBSCRIPTION servers of failed keepalive messages; 4. implement the ability to emulate registration when OPTION message success to SIP URI. Required on SBC to emulate customer PBX registration. -- 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/2565

2 5

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2020