- sr-dev - kamailio.org

git:master:098955e2: xmlops: coherent formatting
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: 098955e23289b82db40d5cef76ee03bf09e8a0da URL: https://github.com/kamailio/kamailio/commit/098955e23289b82db40d5cef76ee03b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T09:02:01+02:00 xmlops: coherent formatting --- Modified: src/modules/xmlops/pv_xml.c Modified: src/modules/xmlops/pv_xml.h Modified: src/modules/xmlops/xmlops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/098955e23289b82db40d5cef76ee03b… Patch: https://github.com/kamailio/kamailio/commit/098955e23289b82db40d5cef76ee03b…

1 0

git:master:ceb688b3: topos: use direction for loading invite record for other early dialog requests
by Daniel-Constantin Mierla 21 Apr '22

21 Apr '22

Module: kamailio Branch: master Commit: ceb688b3d364bb7b8d9f52b7238d560cb4e30b3d URL: https://github.com/kamailio/kamailio/commit/ceb688b3d364bb7b8d9f52b7238d560… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-21T09:02:01+02:00 topos: use direction for loading invite record for other early dialog requests - GH #3090 --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/ceb688b3d364bb7b8d9f52b7238d560… Patch: https://github.com/kamailio/kamailio/commit/ceb688b3d364bb7b8d9f52b7238d560… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c7de5e514f..c16a0adacb 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -803,6 +803,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) uint32_t direction = TPS_DIR_DOWNSTREAM; int ret; int use_branch = 0; + unsigned int metid = 0; LM_DBG("handling incoming request\n"); @@ -835,11 +836,11 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { goto error; } - if(((((get_cseq(msg)->method_id) & (METHOD_PRACK|METHOD_UPDATE)) - && stsd.b_contact.len <= 0)) || (((get_cseq(msg)->method_id) - & (METHOD_BYE) && stsd.b_contact.len <= 0) && (0 == dialog))) { + metid = get_cseq(msg)->method_id; + if((metid & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) + && stsd.b_contact.len <= 0) { /* no B-side contact, look for INVITE transaction record */ - if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { + if(metid & (METHOD_BYE|METHOD_UPDATE)) { /* detect direction - via from-tag */ if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { goto error; @@ -917,7 +918,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) goto error; } } - if((get_cseq(msg)->method_id)&(METHOD_SUBSCRIBE)) { + if(metid & METHOD_SUBSCRIBE) { if(tps_storage_update_dialog(msg, &mtsd, &stsd, TPS_DBU_CONTACT|TPS_DBU_TIME)<0) { goto error; } diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 1a67c0252c..56d56776a4 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1146,7 +1146,11 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_ops[nr_keys]=OP_EQ; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; - db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_tag); + if(md->direction==TPS_DIR_DOWNSTREAM) { + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_tag); + } else { + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_tag); + } nr_keys++; db_keys[nr_keys]=&tt_col_s_method;

1 0

[kamailio/kamailio] Kamailio tries to parse HTTP replies as SIP ? (Issue #3081)
by Alexandru Pirvulescu 20 Apr '22

20 Apr '22

### Description This is a longstanding error when using websockets or the HTTP client (this one is a bit newer, didn't see it for long). Searching the net has led me here: https://lists.kamailio.org/pipermail/sr-users/2018-January/099881.html It looks like Kamailio cannot parse HTTP responses, but that message is ambigous. Why would it try to parse them in the first place? ``` 32(203) ERROR: <core> [core/parser/msg_parser.c:748]: parse_msg(): ERROR: parse_msg: message=<HTTP/1.1 100 Continue ``` ``` 47(89) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<HTTP/1.1 101 Switching Protocols ```  ### Troubleshooting Except confirming that the messages are legit, there is nothing else that I can do. #### Reproduction  The first error is generated by making HTTP requests using the HTTP client embedded in Kamailio. The second error happens on each WebRTC call served by Kamailio. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  HTTP responses should not go through the core message parser. Not sure if this can be described as a "solution". ### Additional Information * **Kamailio Version** - output of `kamailio -v` For the 100 parsing error. The used HTTP clients are `http_client` and `http_async_client` modules. ``` # kamailio -v version: kamailio 5.5.4 (x86_64/linux) 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: unknown compiled with gcc 8.3.0 ``` For the 101 parsing error. Kamailio is a WebRTC server for `sipML5` library. ``` # kamailio -v version: kamailio 5.4.4 (x86_64/linux) 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, 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` # uname -a Linux gke-dev-1-sbc-out-dbbddabc-amiw 5.4.0-1054-gke #57-Ubuntu SMP Fri Oct 1 03:16:03 UTC 2021 x86_64 GNU/Linux ``` ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3081 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3081(a)github.com>

2 2

[kamailio/kamailio] xhttp: fix typo (PR #3089)
by liviu-rolo 19 Apr '22

19 Apr '22

#### 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3089 -- Commit Summary -- * fix typo -- File Changes -- M src/modules/xhttp/xhttp_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3089.patch https://github.com/kamailio/kamailio/pull/3089.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3089 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3089(a)github.com>

2 2

git:master:f406d036: fix typo
by Henning Westerholt 19 Apr '22

19 Apr '22

Module: kamailio Branch: master Commit: f406d036af6abd7330b6b250bba04f2875f073d0 URL: https://github.com/kamailio/kamailio/commit/f406d036af6abd7330b6b250bba04f2… Author: liviu-rolo <82887358+liviu-rolo(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-19T12:06:58+02:00 fix typo --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f406d036af6abd7330b6b250bba04f2… Patch: https://github.com/kamailio/kamailio/commit/f406d036af6abd7330b6b250bba04f2… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 1aec2763d9..31b2efb4d6 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -145,7 +145,7 @@ static int mod_init(void) if(cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { LM_WARN("tcp_accept_no_cl not set - usually required" - " to handle HTTP requests with no Content-Lenght\n"); + " to handle HTTP requests with no Content-Length\n"); } /* bind the SL API */

1 0

git:master:24776e14: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 19 Apr '22

19 Apr '22

Module: kamailio Branch: master Commit: 24776e1463742b11cf0201093105129235216d7b URL: https://github.com/kamailio/kamailio/commit/24776e1463742b11cf0201093105129… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-19T12:01:16+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/24776e1463742b11cf0201093105129… Patch: https://github.com/kamailio/kamailio/commit/24776e1463742b11cf0201093105129… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index c06ccdd6ec..9e378a5681 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -1340,8 +1340,8 @@ r * each watcher. It either gets the body received by the PUBLISH, or the bod y * generated by the agg_nbody function. - * The module can deceide if it makes a copy of the original body, which is -then + * The module can decide if it makes a copy of the original body, which is t +hen * manipulated, or if it works directly in the original body. If the module makes a * copy of the original body, it also has to register the aux_free_body() to

1 0

[kamailio/kamailio] presence: fix typos (PR #3087)
by liviu-rolo 19 Apr '22

19 Apr '22

#### 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3087 -- Commit Summary -- * fix typos -- File Changes -- M src/modules/presence/doc/presence_devel.xml (2) M src/modules/presence/event_list.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3087.patch https://github.com/kamailio/kamailio/pull/3087.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3087 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3087(a)github.com>

2 2

git:master:f63a4645: fix typos
by Henning Westerholt 19 Apr '22

19 Apr '22

Module: kamailio Branch: master Commit: f63a4645afe1c52050bbd8050bf3c392acc985b8 URL: https://github.com/kamailio/kamailio/commit/f63a4645afe1c52050bbd8050bf3c39… Author: Liviu Andron <liviu.andron(a)bjtmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-19T11:46:06+02:00 fix typos --- Modified: src/modules/presence/doc/presence_devel.xml Modified: src/modules/presence/event_list.h --- Diff: https://github.com/kamailio/kamailio/commit/f63a4645afe1c52050bbd8050bf3c39… Patch: https://github.com/kamailio/kamailio/commit/f63a4645afe1c52050bbd8050bf3c39… --- diff --git a/src/modules/presence/doc/presence_devel.xml b/src/modules/presence/doc/presence_devel.xml index 608fa6eeb5..2bb1953764 100644 --- a/src/modules/presence/doc/presence_devel.xml +++ b/src/modules/presence/doc/presence_devel.xml @@ -115,7 +115,7 @@ typedef struct pres_ev * If a module registers the aux_body_processing callback, it gets called for * each watcher. It either gets the body received by the PUBLISH, or the body * generated by the agg_nbody function. - * The module can deceide if it makes a copy of the original body, which is then + * The module can decide if it makes a copy of the original body, which is then * manipulated, or if it works directly in the original body. If the module makes a * copy of the original body, it also has to register the aux_free_body() to * free this "per watcher" body. diff --git a/src/modules/presence/event_list.h b/src/modules/presence/event_list.h index 3f30cb8265..7874a1f967 100644 --- a/src/modules/presence/event_list.h +++ b/src/modules/presence/event_list.h @@ -88,7 +88,7 @@ struct pres_ev * 0 - the standard mechanism (allocating new etag for each Publish) * 1 - allocating an etag only for an initial Publish * */ - /* fileds that deal with authorization rules*/ + /* fields that deal with authorization rules*/ /* * req_auth -> flag 0 - if not require * is_watcher_allowed - get subscription state from xcap rules @@ -114,7 +114,7 @@ struct pres_ev * If a module registers the aux_body_processing callback, it gets called for * each watcher. It either gets the body received by the PUBLISH, or the body * generated by the agg_nbody function. - * The module can deceide if it makes a copy of the original body, which is then + * The module can decide if it makes a copy of the original body, which is then * manipulated, or if it works directly in the original body. If the module makes a * copy of the original body, it also has to register the aux_free_body() to * free this "per watcher" body.

1 0

[kamailio/kamailio] htable: wrong printf format (PR #3086)
by liviu-rolo 19 Apr '22

19 Apr '22

"%*.s" used instead of "%.*s"   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description "%*.s" used instead of "%.*s": "The result is padded with space characters" (https://en.cppreference.com/w/cpp/io/c/fprintf) Probably harmless (but still wrong) if the string ends with '\0'. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3086 -- Commit Summary -- * wrong printf format -- File Changes -- M src/modules/htable/ht_db.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3086.patch https://github.com/kamailio/kamailio/pull/3086.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3086 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3086(a)github.com>

2 2

git:master:c259eb64: wrong printf format
by Henning Westerholt 19 Apr '22

19 Apr '22

Module: kamailio Branch: master Commit: c259eb6421713165d0800c030a589c867fe4da22 URL: https://github.com/kamailio/kamailio/commit/c259eb6421713165d0800c030a589c8… Author: liviu-rolo <82887358+liviu-rolo(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-19T11:45:27+02:00 wrong printf format "%*.s" used instead of "%.*s": "The result is padded with space characters" (https://en.cppreference.com/w/cpp/io/c/fprintf) Probably harmless (but still wrong) if the string ends with '\0'. --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/c259eb6421713165d0800c030a589c8… Patch: https://github.com/kamailio/kamailio/commit/c259eb6421713165d0800c030a589c8… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index cbce085f6c..bbcba99913 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -495,7 +495,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if (ht->htexpire > 0 && expires.n > 0) { expires.n -= now; if(ht_set_cell_expire(ht, &hname, 0, &expires)) { - LM_ERR("error setting expires to hash entry [%*.s]\n", hname.len, hname.s); + LM_ERR("error setting expires to hash entry [%.*s]\n", hname.len, hname.s); goto error; } }

1 0

git:master:95bf86dc: siprepo: updates to kemi exports signatures
by Daniel-Constantin Mierla 19 Apr '22

19 Apr '22

Module: kamailio Branch: master Commit: 95bf86dc2900b707d4b9bfa2005fcea6c17c3410 URL: https://github.com/kamailio/kamailio/commit/95bf86dc2900b707d4b9bfa2005fcea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-19T08:50:51+02:00 siprepo: updates to kemi exports signatures --- Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/95bf86dc2900b707d4b9bfa2005fcea… Patch: https://github.com/kamailio/kamailio/commit/95bf86dc2900b707d4b9bfa2005fcea… --- diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index 59473b0388..35a9778743 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -344,18 +344,18 @@ static void siprepo_timer_exec(unsigned int ticks, int worker, void *param) static sr_kemi_t sr_kemi_sworker_exports[] = { { str_init("siprepo"), str_init("sr_msg_push"), SR_KEMIP_INT, ki_sr_msg_push, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siprepo"), str_init("sr_msg_pull"), SR_KEMIP_INT, ki_sr_msg_pull, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, - SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siprepo"), str_init("sr_msg_async_pull"), SR_KEMIP_INT, ki_sr_msg_async_pull, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, - SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE } }, { str_init("siprepo"), str_init("sr_msg_rm"), SR_KEMIP_INT, ki_sr_msg_rm,

1 0

git:master:9601f651: pv_headers: update kemi exports signatures to match c code
by Daniel-Constantin Mierla 18 Apr '22

18 Apr '22

Module: kamailio Branch: master Commit: 9601f651ecdbf5e816f15fc6aedce9981d4afae7 URL: https://github.com/kamailio/kamailio/commit/9601f651ecdbf5e816f15fc6aedce99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-18T09:16:34+02:00 pv_headers: update kemi exports signatures to match c code --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/9601f651ecdbf5e816f15fc6aedce99… Patch: https://github.com/kamailio/kamailio/commit/9601f651ecdbf5e816f15fc6aedce99… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index be43bb29f4..fb20dfcc02 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -590,13 +590,13 @@ static sr_kemi_t pvh_kemi_exports[] = { }, { str_init("pv_headers"), str_init("pvh_header_param_exists"), SR_KEMIP_INT, pvh_header_param_exists, - { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} }, { str_init("pv_headers"), str_init("pvh_remove_header_param"), SR_KEMIP_INT, pvh_remove_header_param, - { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE} }, {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}} };

1 0

git:master:6cddfb88: kamctl: version set to 5.6.0
by Daniel-Constantin Mierla 16 Apr '22

16 Apr '22

Module: kamailio Branch: master Commit: 6cddfb888d5622a986f2e5b57fe3a36f81632cfd URL: https://github.com/kamailio/kamailio/commit/6cddfb888d5622a986f2e5b57fe3a36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-16T15:24:59+02:00 kamctl: version set to 5.6.0 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/6cddfb888d5622a986f2e5b57fe3a36… Patch: https://github.com/kamailio/kamailio/commit/6cddfb888d5622a986f2e5b57fe3a36… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a83720fcde..b4b861763a 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.4.0' +VERSION='5.6.0' PATH=$PATH:/usr/local/sbin/

1 0

git:master:03726a3f: ims_registrar_scscf: fix build warning
by Victor Seva 15 Apr '22

15 Apr '22

Module: kamailio Branch: master Commit: 03726a3f04f860ead060ad2f7984b587ad10ab43 URL: https://github.com/kamailio/kamailio/commit/03726a3f04f860ead060ad2f7984b58… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T13:23:49+02:00 ims_registrar_scscf: fix build warning > userdata_parser.c: In function 'parse_user_data': > userdata_parser.c:930:23: warning: pointer targets in passing argument 1 > of 'xmlParseMemory' differ in signedness [-Wpointer-sign] > 930 | doc = xmlParseMemory((unsigned char *)xml.s, xml.len); > | ^~~~~~~~~~~~~~~~~~~~~~ > | | > | unsigned char * > In file included from /usr/include/libxml2/libxml/globals.h:18, > from /usr/include/libxml2/libxml/threads.h:35, > from /usr/include/libxml2/libxml/xmlmemory.h:218, > from /usr/include/libxml2/libxml/tree.h:1307, > from /usr/include/libxml2/libxml/xmlschemas.h:19, > from userdata_parser.h:47, > from userdata_parser.c:44: > /usr/include/libxml2/libxml/parser.h:846:32: note: expected 'const char > *' but argument is of type 'unsigned char *' > 846 | xmlParseMemory (const char *buffer, > | ~~~~~~~~~~~~^~~~~~ --- Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/03726a3f04f860ead060ad2f7984b58… Patch: https://github.com/kamailio/kamailio/commit/03726a3f04f860ead060ad2f7984b58… --- diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index d8b08b5491..43a5657c5b 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -927,7 +927,7 @@ ims_subscription *parse_user_data(str xml) if (!ctxtInit) parser_init(scscf_user_data_dtd,scscf_user_data_xsd); doc=0; - doc = xmlParseMemory((unsigned char *)xml.s, xml.len); + doc = xmlParseMemory(xml.s, xml.len); if (!doc){ LM_ERR("This is not a valid XML <%.*s>\n", xml.len,xml.s); goto error;

1 0

git:master:3e46fc12: pv: remove unused variable
by Victor Seva 15 Apr '22

15 Apr '22

Module: kamailio Branch: master Commit: 3e46fc12adbee2c8d0b0dc4de4814d343762c52d URL: https://github.com/kamailio/kamailio/commit/3e46fc12adbee2c8d0b0dc4de4814d3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T13:17:25+02:00 pv: remove unused variable > pv_branch.c:623:13: warning: unused variable 's' [-Wunused-variable] --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/3e46fc12adbee2c8d0b0dc4de4814d3… Patch: https://github.com/kamailio/kamailio/commit/3e46fc12adbee2c8d0b0dc4de4814d3… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 83cc273f12..22f3e7afa5 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -620,7 +620,6 @@ int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val) { sr_net_info_t *neti = NULL; - str s; neti = ksr_evrt_rcvnetinfo_get();

1 0

git:master:6c15b875: pv_headers: fix build warning
by Victor Seva 15 Apr '22

15 Apr '22

Module: kamailio Branch: master Commit: 6c15b875c9763013afc1aafc1ae06c96c4e2c698 URL: https://github.com/kamailio/kamailio/commit/6c15b875c9763013afc1aafc1ae06c9… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T11:29:53+02:00 pv_headers: fix build warning pvh_func.c:392:35: warning: division 'sizeof (char *) / sizeof (char)' pvh_func.c:407:66: warning: division 'sizeof (char *) / sizeof (char)' --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/6c15b875c9763013afc1aafc1ae06c9… Patch: https://github.com/kamailio/kamailio/commit/6c15b875c9763013afc1aafc1ae06c9… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 4ca72d217d..c2a3f98e41 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -389,8 +389,7 @@ int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *eleme char *token; char *result = (char*)pkg_malloc(elements->len - toRemove->len); char *t = (char*)pkg_malloc(elements->len); - int maxSize = sizeof(elements->s)/sizeof(char); - maxSize = maxSize < elements->len?elements->len:maxSize; + int maxSize = elements->len; if (result == NULL || t == NULL) { @@ -404,7 +403,7 @@ int pvh_remove_header_param(struct sip_msg *msg, int idx, str *hname, str *eleme token = strtok_r(t, ", ", &next_token); while(token) { - int notTarget = strncmp(token, toRemove->s, sizeof(toRemove->s)/sizeof(char)); + int notTarget = strncmp(token, toRemove->s, toRemove->len); if (notTarget) { int n = snprintf(result + offset, maxSize - offset, "%s", token);

1 0

git:master:8964b1a9: pkg/kamailio/deb: version set 5.6.0~pre0
by Victor Seva 15 Apr '22

15 Apr '22

Module: kamailio Branch: master Commit: 8964b1a9819d9fd644a5a30b0fe4de9b3146501d URL: https://github.com/kamailio/kamailio/commit/8964b1a9819d9fd644a5a30b0fe4de9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-15T09:04:56+02:00 pkg/kamailio/deb: version set 5.6.0~pre0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/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/8964b1a9819d9fd644a5a30b0fe4de9… Patch: https://github.com/kamailio/kamailio/commit/8964b1a9819d9fd644a5a30b0fe4de9…

1 0

git:master:a1d89de0: Makefile.defs: version set to 5.6.0-pre0
by Daniel-Constantin Mierla 15 Apr '22

15 Apr '22

Module: kamailio Branch: master Commit: a1d89de03b0274b642d35ee875a1985ee51a2cd8 URL: https://github.com/kamailio/kamailio/commit/a1d89de03b0274b642d35ee875a1985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-15T08:30:04+02:00 Makefile.defs: version set to 5.6.0-pre0 - testing phase for v5.6.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a1d89de03b0274b642d35ee875a1985… Patch: https://github.com/kamailio/kamailio/commit/a1d89de03b0274b642d35ee875a1985… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c167e2c11f..90aa777782 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:a0f53622: Makefile.defs: version set to 5.6.0-dev4
by Daniel-Constantin Mierla 15 Apr '22

15 Apr '22

Module: kamailio Branch: master Commit: a0f53622fd624562d9f65ac212b2d91363f2714c URL: https://github.com/kamailio/kamailio/commit/a0f53622fd624562d9f65ac212b2d91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-15T08:29:16+02:00 Makefile.defs: version set to 5.6.0-dev4 - mark the end of development for 5.6.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a0f53622fd624562d9f65ac212b2d91… Patch: https://github.com/kamailio/kamailio/commit/a0f53622fd624562d9f65ac212b2d91… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d3ca839c0d..c167e2c11f 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] Compilation warning with gcc-12 (Issue #3073)
by Anthony Messina 14 Apr '22

14 Apr '22

When building for Fedora 36 with gcc-12.0.1: ``` Makefile.defs:1683: You are using an old and unsupported gcc version (12.0.1), compile at your own risk! ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3073 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3073(a)github.com>

2 4

git:master:3bdd15c8: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: 3bdd15c8dd60d445fc9f86b7579ddd2e1a862bc4 URL: https://github.com/kamailio/kamailio/commit/3bdd15c8dd60d445fc9f86b7579ddd2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-14T16:01:13+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/3bdd15c8dd60d445fc9f86b7579ddd2… Patch: https://github.com/kamailio/kamailio/commit/3bdd15c8dd60d445fc9f86b7579ddd2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index b3bc69a9fd..be898f0d7f 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -62,6 +62,7 @@ Muhammad Shahzad Shafi 4.22. via_use_xavp_fields(flags) 4.23. is_faked_msg() 4.24. is_socket_name(sockname) + 4.25. forward_reply() 5. RPC Commands @@ -114,8 +115,9 @@ Muhammad Shahzad Shafi 1.28. via_use_xavp_fields usage 1.29. is_faked_msg usage 1.30. is_socket_name usage - 1.31. event_route[network:msg] use cases - 1.32. Sample PERL code for do_compress and do_uncompress + 1.31. forward_reply usage + 1.32. event_route[network:msg] use cases + 1.33. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -162,6 +164,7 @@ Chapter 1. Admin Guide 4.22. via_use_xavp_fields(flags) 4.23. is_faked_msg() 4.24. is_socket_name(sockname) + 4.25. forward_reply() 5. RPC Commands @@ -351,6 +354,7 @@ modparam("corex", "nio_msg_avp", "$avp(msg)") 4.22. via_use_xavp_fields(flags) 4.23. is_faked_msg() 4.24. is_socket_name(sockname) + 4.25. forward_reply() 4.1. append_branch([ uri, [ q ] ]) @@ -744,6 +748,19 @@ event_route[dispatcher:dst-down] { } ... +4.25. forward_reply() + + Forward received reply on demand. + + This function can be used in CORE_ONREPLY_ROUTE. + + Example 1.31. forward_reply usage +... +route[reply] { + forward_reply(); +} +... + 5. RPC Commands 5.1. corex.debug @@ -907,7 +924,7 @@ event_route[dispatcher:dst-down] { Next is a basic usage example where encoding and decoding is done using PERL. - Example 1.31. event_route[network:msg] use cases + Example 1.32. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -938,7 +955,7 @@ event_route[network:msg] { } ... - Example 1.32. Sample PERL code for do_compress and do_uncompress + Example 1.33. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:eeb04173: siprepo: parse msg for pull operation
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: eeb0417340a120da5f3267aef5e08600dad3107b URL: https://github.com/kamailio/kamailio/commit/eeb0417340a120da5f3267aef5e0860… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:20:54+02:00 siprepo: parse msg for pull operation --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h --- Diff: https://github.com/kamailio/kamailio/commit/eeb0417340a120da5f3267aef5e0860… Patch: https://github.com/kamailio/kamailio/commit/eeb0417340a120da5f3267aef5e0860… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 55deed3b75..ef81b7694c 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -35,6 +35,8 @@ #include "../../core/trim.h" #include "../../core/ut.h" #include "../../core/receive.h" +#include "../../core/globals.h" +#include "../../core/dset.h" #include "../../core/route.h" #include "../../core/kemi.h" @@ -193,6 +195,9 @@ int siprepo_msg_set(sip_msg_t *msg, str *msgid) it->mtype = msg->first_line.type; it->itime = time(NULL); + it->msgno = msg->id; + it->pid = msg->pid; + it->mflags = msg->flags; _siprepo_table[slotid].plist->prev = it; it->next = _siprepo_table[slotid].plist; @@ -308,6 +313,7 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) int rtno; sr_kemi_eng_t *keng = NULL; str evname = str_init("siprepo:msg"); + char lbuf[BUF_SIZE]; it = siprepo_msg_find(msg, callid, msgid, 1); if(it==NULL) { @@ -316,10 +322,35 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) lock_release(&_siprepo_table[slotid].lock); return 1; } - memset(&lmsg, 0, sizeof(sip_msg_t)); slotid = it->hid % _siprepo_table_size; + memset(&lmsg, 0, sizeof(sip_msg_t)); + lmsg.buf = lbuf; + memcpy(lmsg.buf, it->dbuf.s, it->dbuf.len); + lmsg.len = it->dbuf.len; + lmsg.rcv = it->rcv; + lmsg.id = it->msgno; + lmsg.pid = it->pid; + lmsg.set_global_address = default_global_address; + lmsg.set_global_port = default_global_port; + + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { + LM_ERR("failed to parse msg id [%.*s]\n", msgid->len, msgid->s); + lock_release(&_siprepo_table[slotid].lock); + return 1; + } + if(unlikely(parse_headers(&lmsg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) + < 0)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "parsing relevant headers failed\n"); + } + /* set log prefix */ + log_prefix_set(&lmsg); + + /* ... clear branches from previous message */ + clear_branches(); if(it->mtype==SIP_REQUEST) { + ruri_mark_new(); rtype = REQUEST_ROUTE; } else { rtype = CORE_ONREPLY_ROUTE; @@ -340,7 +371,10 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) } set_route_type(rtbk); ksr_msg_env_reset(); - + LM_DBG("cleaning up\n"); + free_sip_msg(&lmsg); + /* reset log prefix */ + log_prefix_set(NULL); return 0; } diff --git a/src/modules/siprepo/siprepo_data.h b/src/modules/siprepo/siprepo_data.h index ed568fa90a..ba519a558a 100644 --- a/src/modules/siprepo/siprepo_data.h +++ b/src/modules/siprepo/siprepo_data.h @@ -38,7 +38,9 @@ typedef struct siprepo_msg { str vbranch; str dbuf; unsigned int cseqmetid; + int msgno; int pid; + flag_t mflags; receive_info_t rcv; time_t itime; struct siprepo_msg *next;

1 0

git:master:b08bfd02: siprepo: added rmode parameter for push and pull functions
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: b08bfd0226f244bb44299ce8177efbd6f5bf0c11 URL: https://github.com/kamailio/kamailio/commit/b08bfd0226f244bb44299ce8177efbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:28:47+02:00 siprepo: added rmode parameter for push and pull functions --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b08bfd0226f244bb44299ce8177efbd… Patch: https://github.com/kamailio/kamailio/commit/b08bfd0226f244bb44299ce8177efbd…

1 0

git:master:a23ede72: corex: added forward_reply() function
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: a23ede7247b52ddc53dc0186810923dc1ae8c51c URL: https://github.com/kamailio/kamailio/commit/a23ede7247b52ddc53dc0186810923d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:11:37+02:00 corex: added forward_reply() function - forward received reply on demand --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a23ede7247b52ddc53dc0186810923d… Patch: https://github.com/kamailio/kamailio/commit/a23ede7247b52ddc53dc0186810923d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 765bedf5f1..3c6b6a59f4 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -34,6 +34,7 @@ #include "../../core/str_list.h" #include "../../core/events.h" #include "../../core/onsend.h" +#include "../../core/forward.h" #include "../../core/dns_cache.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -47,6 +48,7 @@ MODULE_VERSION static int nio_intercept = 0; +static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2); static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send_udp(sip_msg_t *msg, char *su, char *sq); static int w_send_tcp(sip_msg_t *msg, char *su, char *sq); @@ -105,6 +107,8 @@ static tr_export_t mod_trans[] = { }; static cmd_export_t cmds[]={ + {"forward_reply", (cmd_function)w_forward_reply, 0, 0, + 0, CORE_ONREPLY_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 1, fixup_spve_null, @@ -249,6 +253,7 @@ static int child_init(int rank) return 0; } + /** * destroy module function */ @@ -256,6 +261,15 @@ static void mod_destroy(void) { } +/** + * forward reply based on via + */ +static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2) +{ + forward_reply(msg); + return 1; +} + /** * config wrapper for append branch */

1 0

git:master:ba66bc87: corex: docs for forward_reply() function
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: ba66bc87ac05403f494d2820ef53a40b321881b0 URL: https://github.com/kamailio/kamailio/commit/ba66bc87ac05403f494d2820ef53a40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:14:42+02:00 corex: docs for forward_reply() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba66bc87ac05403f494d2820ef53a40… Patch: https://github.com/kamailio/kamailio/commit/ba66bc87ac05403f494d2820ef53a40… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index da9d8ea101..2675a559ac 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -904,6 +904,27 @@ event_route[dispatcher:dst-down] { xinfo("matched local socket name\n"); } ... +</programlisting> + </example> + </section> + <section id="corex.f.forward_reply"> + <title> + <function moreinfo="none">forward_reply()</function> + </title> + <para> + Forward received reply on demand. + </para> + <para> + This function can be used in CORE_ONREPLY_ROUTE. + </para> + <example> + <title><function>forward_reply</function> usage</title> + <programlisting format="linespecific"> +... +route[reply] { + forward_reply(); +} +... </programlisting> </example> </section>

1 0

The recursive lock of tm module is not safe?
by 王斌 14 Apr '22

14 Apr '22

Hi： See lock_hash in h_table.c: Flowing lines of code do not guarantee atomicity and I think it is not safe: - atomic_get(&_tm_table->entries[i].locker_pid) != mypid - lock(&_tm_table->entries[i].mutex) - atomic_set(&_tm_table->entries[i].locker_pid, mypid) Would you mind solving my confusion? Best Regards!

2 1

git:master:190e172f: siprepo: timer routing to clean up stored items
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: 190e172fee572c169a0caa14bb08d7d271aa4f48 URL: https://github.com/kamailio/kamailio/commit/190e172fee572c169a0caa14bb08d7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T10:02:50+02:00 siprepo: timer routing to clean up stored items --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/190e172fee572c169a0caa14bb08d7d… Patch: https://github.com/kamailio/kamailio/commit/190e172fee572c169a0caa14bb08d7d… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 9010eceb6d..55deed3b75 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -43,6 +43,7 @@ static siprepo_slot_t *_siprepo_table = NULL; extern int _siprepo_table_size; +extern int _siprepo_expire; /** * @@ -342,3 +343,47 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) return 0; } + +/** + * + */ +void siprepo_timer_exec(unsigned int ticks, int worker, void *param) +{ + time_t tnow; + int i; + siprepo_msg_t *it = NULL; + siprepo_msg_t *elist = NULL; + + tnow = time(NULL); + for(i=0; i<_siprepo_table_size; i++) { + lock_get(&_siprepo_table[i].lock); + for(it=_siprepo_table[i].plist; it!=NULL; it=it->next) { + if(it->itime+_siprepo_expire < tnow) { + if(it->prev==NULL) { + _siprepo_table[i].plist = it->next; + if(_siprepo_table[i].plist) { + _siprepo_table[i].plist->prev = NULL; + } + } else { + it->prev->next = it->next; + } + if(it->next!=NULL) { + it->next->prev = it->prev; + } + if(elist) { + it->next = elist; + elist = it; + } else { + it->next = NULL; + elist = it; + } + } + } + lock_release(&_siprepo_table[i].lock); + } + while(elist) { + it = elist; + elist = elist->next; + shm_free(it); + } +} diff --git a/src/modules/siprepo/siprepo_data.h b/src/modules/siprepo/siprepo_data.h index f7c01fbf28..ed568fa90a 100644 --- a/src/modules/siprepo/siprepo_data.h +++ b/src/modules/siprepo/siprepo_data.h @@ -55,5 +55,6 @@ int siprepo_msg_set(sip_msg_t *msg, str *msgid); int siprepo_msg_rm(sip_msg_t *msg, str *callid, str *msgid); int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname); int siprepo_msg_check(sip_msg_t *msg); +void siprepo_msg_timer(unsigned int ticks, int worker, void *param); #endif diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index 129317b853..5a3210d425 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -32,6 +32,7 @@ #include "../../core/receive.h" #include "../../core/mod_fix.h" #include "../../core/async_task.h" +#include "../../core/timer_proc.h" #include "../../core/kemi.h" #include "siprepo_data.h" @@ -54,6 +55,8 @@ static int w_sr_msg_async_pull(sip_msg_t *msg, char *pcallid, char *pmsgid, static int w_sr_msg_rm(sip_msg_t *msg, char *pcallid, char *pmsgid); static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2); +static void siprepo_timer_exec(unsigned int ticks, int worker, void *param); + /* clang-format off */ typedef struct sworker_task_param { char *buf; @@ -108,6 +111,7 @@ static int mod_init(void) LM_ERR("failed to initialize hash table\n"); return -1; } + register_basic_timers(_siprepo_timer_procs); return 0; } @@ -116,6 +120,21 @@ static int mod_init(void) */ static int child_init(int rank) { + int i; + char si_desc[MAX_PT_DESC]; + + if(rank!=PROC_MAIN) { + return 0; + } + for(i=0; i<_siprepo_timer_procs; i++) { + snprintf(si_desc, MAX_PT_DESC, "SIPREPO child=%d", i); + if(fork_basic_timer_w(PROC_TIMER, si_desc, 1 /*socks flag*/, + siprepo_timer_exec, i, NULL, _siprepo_timer_interval + /*sec*/)<0) { + LM_ERR("failed to start timer routine as process\n"); + return -1; /* error */ + } + } return 0; } @@ -295,6 +314,11 @@ static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2) return ki_sr_msg_check(msg); } +static void siprepo_timer_exec(unsigned int ticks, int worker, void *param) +{ + siprepo_msg_timer(ticks, worker, param); +} + /** * */

1 0

git:master:4e86a159: siprepo: new module to store sip message content in a hash table
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: 4e86a15979249a881ccbe4828588e8be0f241626 URL: https://github.com/kamailio/kamailio/commit/4e86a15979249a881ccbe4828588e8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T07:54:20+02:00 siprepo: new module to store sip message content in a hash table - push/pull sip messages - wip --- Added: src/modules/siprepo/Makefile Added: src/modules/siprepo/README Added: src/modules/siprepo/doc/Makefile Added: src/modules/siprepo/doc/siprepo.xml Added: src/modules/siprepo/doc/siprepo_admin.xml Added: src/modules/siprepo/siprepo_data.c Added: src/modules/siprepo/siprepo_data.h Added: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4e86a15979249a881ccbe4828588e8b… Patch: https://github.com/kamailio/kamailio/commit/4e86a15979249a881ccbe4828588e8b…

1 0

Roadmap to the next major release - v5.6.0
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Hello, it is the time to plan a bit the road to the next major release, to be versioned 5.6.0. The 5.5.0 was release about one year ago, therefore it is time to set the milestones for getting 5.6.0 out. I would propose to freeze the development on Thursday, April 14, 2020, test till mid of May or so, then release v5.6.0. There is a lot of development to existing components and a couple of new modules. If anyone wants a different time line towards 5.6.0, let's discuss and choose the one that suits most of the developers. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:master:d542cb89: htable: reset entries field if hash table initialization fails
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: d542cb89afb1a34cba35cbcf0f40315581fbb767 URL: https://github.com/kamailio/kamailio/commit/d542cb89afb1a34cba35cbcf0f40315… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T12:52:15+02:00 htable: reset entries field if hash table initialization fails --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d542cb89afb1a34cba35cbcf0f40315… Patch: https://github.com/kamailio/kamailio/commit/d542cb89afb1a34cba35cbcf0f40315… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index daf088d1f8..00023e7153 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -395,7 +395,6 @@ int ht_init_tables(void) if(ht->entries==NULL) { LM_ERR("no more shared memory for [%.*s]\n", ht->name.len, ht->name.s); - shm_free(ht); return -1; } memset(ht->entries, 0, ht->htsize*sizeof(ht_entry_t)); @@ -413,7 +412,7 @@ int ht_init_tables(void) i--; } shm_free(ht->entries); - shm_free(ht); + ht->entries = NULL; return -1; }

1 0

git:master:b1fa63b1: htable: track when records were successfully loaded from database
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: b1fa63b1547fc5af6cc1e97db42ea76db1bf927b URL: https://github.com/kamailio/kamailio/commit/b1fa63b1547fc5af6cc1e97db42ea76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T13:11:30+02:00 htable: track when records were successfully loaded from database - write back only in such case --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_db.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/b1fa63b1547fc5af6cc1e97db42ea76… Patch: https://github.com/kamailio/kamailio/commit/b1fa63b1547fc5af6cc1e97db42ea76… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 00023e7153..f212600e21 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1099,7 +1099,7 @@ int ht_db_sync_tables(void) ht = _ht_root; while(ht) { - if(ht->dbtable.len>0 && ht->dbmode!=0 && ht->ncols==0) + if(ht->dbtable.len>0 && ht->dbmode!=0 && ht->dbload!=0 && ht->ncols==0) { LM_DBG("sync db table [%.*s] from ht [%.*s]\n", ht->dbtable.len, ht->dbtable.s, diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4cee835325..b3d0436ea3 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -63,6 +63,7 @@ typedef struct _ht unsigned int htexpire; str dbtable; int dbmode; + int dbload; int ncols; str scols[HT_MAX_COLS]; char pack[4]; diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 5cdecb1814..5b9a5942ed 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -211,6 +211,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) LM_ERR("failed to use_table\n"); return -1; } + ht->dbload = 0; if(ht->ncols>0) { db_ord = &ht->scols[0]; for(c=0; c<ht->ncols; c++) { @@ -527,6 +528,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) ht_dbf.free_result(ht_db_con, db_res); LM_DBG("loaded %d values in hash table\n", cnt); + ht->dbload = 1; return 0; error: diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index f7a9cb389a..fea9786298 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -2053,6 +2053,8 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) ht_slot_unlock(ht, i); nht.entries[i].first = first; } + ht->dbload = 1; + /* free old entries */ for(i=0; i<nht.htsize; i++) {

1 0

git:master:9a8974a8: htable: check if entries are initialized before sync'ing to db
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 9a8974a80b8ce5ffc9166e81f43f8581777cd48f URL: https://github.com/kamailio/kamailio/commit/9a8974a80b8ce5ffc9166e81f43f858… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T17:05:18+02:00 htable: check if entries are initialized before sync'ing to db --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/9a8974a80b8ce5ffc9166e81f43f858… Patch: https://github.com/kamailio/kamailio/commit/9a8974a80b8ce5ffc9166e81f43f858… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 5b9a5942ed..cbce085f6c 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -551,6 +551,11 @@ int ht_db_save_table(ht_t *ht, str *dbtable) time_t now; int ncols; + if(ht==NULL || ht->entries==NULL) { + LM_DBG("hash table not initialized yet\n"); + return -1; + } + if(ht_db_con==NULL) { LM_ERR("no db connection\n");

1 0

The recursive lock of tm module is not safe?
by progrom 13 Apr '22

13 Apr '22

Hi： See lock_hash in h_table.c: Flowing lines of code do not guarantee atomicity and I think it is not safe: -      atomic_get(&_tm_table->entries[i].locker_pid) != mypid -      lock(&_tm_table->entries[i].mutex) -      atomic_set(&_tm_table->entries[i].locker_pid, mypid) Would you mind solving my confusion?

1 0

Questions about dlg_search
by progrom 13 Apr '22

13 Apr '22

Hi： See dlg_new_dialog in dlg_handlers.c. After dlg_search, the dlg has locked and referenced, but there is no dlg_hash_release/dlg_release in some places ?

1 0

How to add CLI parameter in kamailio.cfg-Json formatting
by Jeetha P J 13 Apr '22

13 Apr '22

Hi all I want the syslog output in json structure. When I run 'kamailio --log-engine=json:M' I am getting this but only for that command.I want all syslog out in the json format. Any one please help me to achieve this Thanks & Regards Jeetha P J -- _This message contains information that may be privileged or confidential and is the property of the Quantiphi Inc and/or its affiliates_. It is intended only for the person to whom it is addressed. _If you are not the intended recipient, any review, dissemination, distribution, copying, storage or other use of all or any portion of this message is strictly prohibited. If you received this message in error, please immediately notify the sender by reply e-mail and delete this message in its *entirety*___

2 1

[kamailio/kamailio] dead lock of dialog module (Issue #3084)
by progromm 13 Apr '22

13 Apr '22

### Description See `internal_get_dlg`: ```C static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, str* callid, str* ftag, str* ttag, unsigned int* dir, int mode) { struct dlg_cell* dlg; struct dlg_entry* d_entry; d_entry = &(d_table->entries[h_entry]); dlg_lock(d_table, d_entry); for (dlg = d_entry->first ; dlg ; dlg = dlg->next) { /* Check callid / fromtag / totag */ if (match_dialog(dlg, callid, ftag, ttag, dir) == 1) { ref_dlg_unsafe(dlg, 1); if (likely(mode == 0)) { dlg_unlock(d_table, d_entry); } LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", callid->len, callid->s, h_entry, *dir); return dlg; } } if (likely(mode == 0)) { dlg_unlock(d_table, d_entry); } LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; } ``` Should judge whether `mode` is 0 before `dlg_lock` . -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3084 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3084(a)github.com>

3 4

(no subject)
by 王斌 13 Apr '22

13 Apr '22

1 0

Memleak and deadlock abount dlg_search?
by 王斌 13 Apr '22

13 Apr '22

Hi： See dlg_new_dialog in dlg_handlers.c. After dlg_search, the dlg has locked and referenced, but there is no dlg_hash_release/dlg_release in some places ? Best Regards!

1 0

[kamailio/kamailio] the recursive lock of tm module is not safe? (Issue #3083)
by progromm 13 Apr '22

13 Apr '22

### Description See `lock_hash` in `h_table.c`: ```C void lock_hash(int i) { int mypid; mypid = my_pid(); if (likely(atomic_get(&_tm_table->entries[i].locker_pid) != mypid)) { lock(&_tm_table->entries[i].mutex); atomic_set(&_tm_table->entries[i].locker_pid, mypid); } else { /* locked within the same process that called us*/ _tm_table->entries[i].rec_lock_level++; } } ``` Flowing lines of code do not guarantee atomicity and I think it is not safe: * atomic_get(&_tm_table->entries[i].locker_pid) != mypid * lock(&_tm_table->entries[i].mutex) * atomic_set(&_tm_table->entries[i].locker_pid, mypid) Would you mind solving my confusion? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3083 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3083(a)github.com>

2 2

git:master:bf69b85f: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: bf69b85fe9f383debcae6420c5d2d53a2ba452e9 URL: https://github.com/kamailio/kamailio/commit/bf69b85fe9f383debcae6420c5d2d53… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T12:01:10+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/bf69b85fe9f383debcae6420c5d2d53… Patch: https://github.com/kamailio/kamailio/commit/bf69b85fe9f383debcae6420c5d2d53… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 98d8d97f5c..80691c5516 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -37,7 +37,7 @@ Henning Westerholt 5. RPC Commands - 5.1. userblocklist.reload_blocklist + 5.1. geoip2.reload 6. Exported pseudo-variables @@ -67,7 +67,7 @@ Chapter 1. Admin Guide 5. RPC Commands - 5.1. userblocklist.reload_blocklist + 5.1. geoip2.reload 6. Exported pseudo-variables @@ -144,9 +144,9 @@ if(geoip2_match("$si", "src")) 5. RPC Commands - 5.1. userblocklist.reload_blocklist + 5.1. geoip2.reload -5.1. userblocklist.reload_blocklist +5.1. geoip2.reload Reload the internal GeoIP database. This is necessary after the database file has been changed on the disk.

1 0

git:master:282bbf18: geoip2: docs - fixed the rpc command geoip2.reload title
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 282bbf188831bf9b4187fa2aa54fd9b2412e066c URL: https://github.com/kamailio/kamailio/commit/282bbf188831bf9b4187fa2aa54fd9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T11:58:01+02:00 geoip2: docs - fixed the rpc command geoip2.reload title --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/282bbf188831bf9b4187fa2aa54fd9b… Patch: https://github.com/kamailio/kamailio/commit/282bbf188831bf9b4187fa2aa54fd9b… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index cbcc2d8c79..8c5a96caa8 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -128,9 +128,9 @@ if(geoip2_match("$si", "src")) <section> <title>RPC Commands</title> - <section id="userblocklist.r.reload_blocklist"> + <section id="geoip2.r.reload"> <title> - <function moreinfo="none">userblocklist.reload_blocklist</function> + <function moreinfo="none">geoip2.reload</function> </title> <para> Reload the internal GeoIP database. This is necessary after

1 0

[kamailio/kamailio] The I-CSCF does not send Ringing under heavy load. (Issue #3071)
by Eugeniy 13 Apr '22

13 Apr '22

### Description  I set up Kamailio IMS , in the end everything turned out great, calls are made, and I decided to check how Kamailio copes with the load. I am creating load using sipp application. There is no problem with a low call generation rate, but if you raise the call generation to more than 20 calls per second, some of the calls fail. ### Troubleshooting Challenges are always dropped sequentially ![image](https://user-images.githubusercontent.com/92918808/161745286-264d6e9b-47bb-4fcb-923a-1f5ded4cd999.png) I compared the calls and saw that the ICSCF does not send a 180 Ringing message towards the SCSCF. ![image](https://user-images.githubusercontent.com/92918808/161745354-2f97f8d1-2eb4-4a53-a9b0-2cb9d9d536d6.png) Below is an example of a successful call. ![image](https://user-images.githubusercontent.com/92918808/161745412-20f0ecc6-3952-4e01-9c74-4f6fa6cfd3c8.png) CPU, MEM indicators are normal. I increased the shr_mem and pkg_mem parameters. S-CSCF and I-CSCF communicate over UDP, but reside on the same server. It doesn't look like the packets are dropping or suffering from collisions. 10.21.4.226 external IP P-CSCF 10.10.0.1 IP P-CSCF 10.10.0.2 IP S/I-CSCF #### Reproduction  Using the sipp application, generate 100 calls at a generation rate greater than 20 calls per second. #### Debugging Data  ``` none ``` #### Log Messages  ``` attached below ``` [logs.zip](https://github.com/kamailio/kamailio/files/8417659/logs.zip) #### SIP Traffic  ``` attached below ``` [call_rejected.zip](https://github.com/kamailio/kamailio/files/8417640/call_… ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.2 (x86_64/linux) 42be5d 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, 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: 42be5d compiled on 10:39:53 Dec 27 2021 with gcc 9.3.0 ``` * **Operating System**:  ``` Ubuntu 20.04.3 LTS Linux ims-core 5.4.0-104-generic #118-Ubuntu SMP Wed Mar 2 19:02:41 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3071 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3071(a)github.com>

2 12

git:master:c43432e6: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: c43432e6fda8db527ffca3442d7cea8e601a211e URL: https://github.com/kamailio/kamailio/commit/c43432e6fda8db527ffca3442d7cea8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T11:16:09+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/c43432e6fda8db527ffca3442d7cea8… Patch: https://github.com/kamailio/kamailio/commit/c43432e6fda8db527ffca3442d7cea8… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 0362750258..98d8d97f5c 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -91,7 +91,10 @@ Chapter 1. Admin Guide to enable access to the results of a query to the database. Many queries can be done and store results in different containers to - be able to use in parallel. Database is loaded at startup in cache. + be able to use in parallel. Database is loaded at startup in cache. The + cache can be reloaded with an RPC command. In this case make sure that + you do not overwrite the file in place, but replace it, e.g. with a + “move” command. 2. Dependencies

1 0

git:master:166edc37: geoip2: add a note about db replacement recommendations
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 166edc37177c2a92f57a31591ca781b15202a57f URL: https://github.com/kamailio/kamailio/commit/166edc37177c2a92f57a31591ca781b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T09:04:31Z geoip2: add a note about db replacement recommendations --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/166edc37177c2a92f57a31591ca781b… Patch: https://github.com/kamailio/kamailio/commit/166edc37177c2a92f57a31591ca781b… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index d3d0228946..cbcc2d8c79 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -44,6 +44,9 @@ <para> Many queries can be done and store results in different containers to be able to use in parallel. Database is loaded at startup in cache. + The cache can be reloaded with an RPC command. In this case make sure + that you do not overwrite the file in place, but replace it, e.g. with + a <quote>move</quote> command. </para> </section> <section>

1 0

git:master:6a001d3f: geoip2: fix logging for reload failures, initialize memory for db
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 6a001d3f90a8cfa2514b5b2781fc61dec50fc0c4 URL: https://github.com/kamailio/kamailio/commit/6a001d3f90a8cfa2514b5b2781fc61d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T08:20:54Z geoip2: fix logging for reload failures, initialize memory for db --- Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/6a001d3f90a8cfa2514b5b2781fc61d… Patch: https://github.com/kamailio/kamailio/commit/6a001d3f90a8cfa2514b5b2781fc61d… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index 0b50fd4447..0995ae2d25 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -490,6 +490,8 @@ int geoip2_init_pv(char *path) { int status; _handle_GeoIP = shm_malloc(sizeof(struct MMDB_s)); + memset(_handle_GeoIP, 0, sizeof(struct MMDB_s)); + if (_handle_GeoIP == NULL) { SHM_MEM_ERROR; @@ -522,9 +524,13 @@ int geoip2_reload_pv(char *path) if(MMDB_SUCCESS != status) { LM_ERR("cannot reload GeoIP database file at: %s\n", path); + + } + else + { + LM_INFO("reloaded GeoIP database file at: %s\n", path); } lock_release(lock); - LM_INFO("reloaded GeoIP database file at: %s\n", path); return status; }

1 0

git:master:85c4ad10: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 85c4ad1025cc3aa882ddfb42cb35257500f4528b URL: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:46:12+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… Patch: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 697ccf0889..0362750258 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -10,6 +10,10 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> +Henning Westerholt + + gilawa.com + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ @@ -31,12 +35,17 @@ Daniel-Constantin Mierla 4.1. geoip2_match(ipaddr, pvc) - 5. Exported pseudo-variables + 5. RPC Commands + + 5.1. userblocklist.reload_blocklist + + 6. Exported pseudo-variables List of Examples 1.1. Set path parameter 1.2. geoip2_match usage + 1.3. geoip2.reload usage Chapter 1. Admin Guide @@ -56,7 +65,11 @@ Chapter 1. Admin Guide 4.1. geoip2_match(ipaddr, pvc) - 5. Exported pseudo-variables + 5. RPC Commands + + 5.1. userblocklist.reload_blocklist + + 6. Exported pseudo-variables 1. Overview @@ -126,7 +139,21 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... -5. Exported pseudo-variables +5. RPC Commands + + 5.1. userblocklist.reload_blocklist + +5.1. userblocklist.reload_blocklist + + Reload the internal GeoIP database. This is necessary after the + database file has been changed on the disk. + + Example 1.3. geoip2.reload usage +... +kamcmd geoip2.reload +... + +6. Exported pseudo-variables * $gip2(pvc=>key) - pvc is an identifier for this query result; it is designated by the second parameter of geoip2_match(). The key can

1 0

[kamailio/kamailio] [Feature Request] Add reload capability for geoip2 module (#2029)
by Joel Serrano 13 Apr '22

13 Apr '22

### Description Currently, the `geoip2` module loads the IP database at startup and keeps it in cache and there is no way to tell Kamailio to reload the database without a full restart. ### Possible Solutions To keep this module inline with other modules that use external datasources, I would suggest to implement a new RPC command and a new geoip2 function to reload the database defined in the `path` geoip2 modparam without the need of a restart. I'm not aware of the effort required for implementing either of them, but only having an RPC command would effectively solve this issue as you can call RPC commands from within Kamailio conf, thus, the reload function would not be something strictly required but more of a nice-to-have. ### Examples: Function: ``` geoip2_reload() ``` RPC command: ``` kamctl rpc gip2.reload / kamctl rpc geoip2.reload ``` Kamcmd command: ``` kamcmd geoip2.reload ``` -- 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/2029

2 3

git:master:2f78b97e: geoip2: add reload RCP command fuctionality (related to GH #2029)
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 2f78b97eaf3d4232a623be0d2eb2da575c93f13b URL: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T06:36:23Z geoip2: add reload RCP command fuctionality (related to GH #2029) --- Modified: src/modules/geoip2/doc/geoip2.xml Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5… Patch: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5…

1 0

git:master:3440a433: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 3440a43377ee14fd68de90c940a763b845e98be1 URL: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:16:10+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b… Patch: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b…

1 0

git:master:d1342772: userblocklist: add a note about deactivated MI cmds to docs
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: d1342772cdcd882b0c26db111b608e37b748314d URL: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T06:02:57Z userblocklist: add a note about deactivated MI cmds to docs --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… Patch: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… --- diff --git a/src/modules/userblocklist/doc/userblocklist_admin.xml b/src/modules/userblocklist/doc/userblocklist_admin.xml index a5f136d8f4..8e562f63e1 100644 --- a/src/modules/userblocklist/doc/userblocklist_admin.xml +++ b/src/modules/userblocklist/doc/userblocklist_admin.xml @@ -405,24 +405,7 @@ if (!check_allowlist("globalblocklist")) { <section> <title>MI Commands</title> - <section> - <title> - <function moreinfo="none">reload_blocklist</function> - </title> - <para> - Reload the internal global blocklist cache. This is necessary after - the database tables for the global blocklist have been changed. - </para> - <example> - <title><function>reload_blocklist</function> usage</title> - <programlisting format="linespecific"> - ... - &ctltool; fifo reload_blocklist - ... - </programlisting> - </example> - </section> - + The following MI commands are currently disabled, they need to migrated to the RPC infrastructure. <section> <title> <function moreinfo="none">dump_blocklist</function>

1 0

git:master:79859614: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 79859614cb584ec1f3d3bbdd885b7f4979e61da5 URL: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:01:18+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4… Patch: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4…

1 0

git:master:dd12c792: userblocklist: small spelling improvement in docs
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: dd12c792b42c223bf93bb58ff0103efb454ab88b URL: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z userblocklist: small spelling improvement in docs --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… Patch: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… --- diff --git a/src/modules/userblocklist/doc/userblocklist_admin.xml b/src/modules/userblocklist/doc/userblocklist_admin.xml index f991e0efa2..a5f136d8f4 100644 --- a/src/modules/userblocklist/doc/userblocklist_admin.xml +++ b/src/modules/userblocklist/doc/userblocklist_admin.xml @@ -33,7 +33,7 @@ The module exports four functions, <function>check_blocklist</function>, <function>check_allowlist</function>, <function>check_user_blocklist</function> and <function>check_user_allowlist</function> - for usage in the configuration file. Furthermore it provides a MI function to + for usage in the configuration file. Furthermore it provides a RPC function to reload the global blocklist cache. </para> <para>

1 0

git:master:7f03faa0: geoip2: logging library version at startup
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 7f03faa01ee4d832f5079b9344fc895ff425ac6c URL: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: logging library version at startup --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Patch: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 1ac03f06d6..17d910399b 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,6 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { + LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:b467ce54: geoip2: also log database path
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: b467ce544afa709c28e39d8734b2e9ba6a43b79c URL: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: also log database path --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Patch: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 17d910399b..f24a853c3a 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,7 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { - LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); + LM_INFO("using GeoIP database path %s, library version %s\n", geoip2_path, MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:1bde8e0e: core: function to get local socket by index
by Daniel-Constantin Mierla 12 Apr '22

12 Apr '22

Module: kamailio Branch: master Commit: 1bde8e0e6193f0ed63452b3b8d31bfc78121dfb6 URL: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-12T08:38:07+02:00 core: function to get local socket by index --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Patch: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 5622e2634d..c9dd89118d 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -912,6 +912,40 @@ socket_info_t* ksr_get_socket_by_advertise(str *sockstr) return NULL; } +socket_info_t* ksr_get_socket_by_index(int idx) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + if (idx<0) { + idx += _ksr_sockets_no; + if (idx < 0) { + LM_DBG("negative overall index\n"); + return NULL; + } + } + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(idx==0) { + return si; + } + idx--; + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 3c8deeb244..cbc630b9b8 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -106,6 +106,7 @@ struct socket_info* find_si(struct ip_addr* ip, unsigned short port, socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); socket_info_t* ksr_get_socket_by_advertise(str *sockstr); +socket_info_t* ksr_get_socket_by_index(int idx); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:2c3cc027: corex: corex: $lsock() variable can match by index
by Daniel-Constantin Mierla 12 Apr '22

12 Apr '22

Module: kamailio Branch: master Commit: 2c3cc027b05317ec61c706180cb9cfea555cbc11 URL: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-12T08:38:07+02:00 corex: corex: $lsock() variable can match by index --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… Patch: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 74fcff6e79..9f404d32aa 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -218,6 +218,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'a': si = ksr_get_socket_by_advertise(&lexpr.val); break; + case 'i': + si = ksr_get_socket_by_index(lexpr.valno); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

1 0

git:master:aa8ec3bf: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: aa8ec3bf19328741b0565d306438a9b396f39eef URL: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T16:01:26+02:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… Patch: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index c0badc4115..25c448901d 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -143,7 +143,8 @@ Chapter 1. Admin Guide 2. Dependencies - The module does not depend on any other module. + The following modules must be loaded before this module: + * sl - stateless reply. 3. Parameters

1 0

[kamailio/kamailio] Typos docs (PR #3078)
by Bastian Triller 11 Apr '22

11 Apr '22

#### 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 - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3078 -- Commit Summary -- * core: Fix typos, reference to SER * auth: Fix missing dependency in docs -- File Changes -- M src/core/str.h (2) M src/core/ut.c (14) M src/core/ut.h (8) M src/modules/auth/doc/auth.xml (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3078.patch https://github.com/kamailio/kamailio/pull/3078.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3078 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3078(a)github.com>

2 3

git:master:dd15436e: auth: Fix missing dependency in docs
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: dd15436e8697f70df6ef9d188da36f70e7116a74 URL: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 auth: Fix missing dependency in docs --- Modified: src/modules/auth/doc/auth.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… Patch: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… --- diff --git a/src/modules/auth/doc/auth.xml b/src/modules/auth/doc/auth.xml index 6f20e8c71d..137a5a5f56 100644 --- a/src/modules/auth/doc/auth.xml +++ b/src/modules/auth/doc/auth.xml @@ -66,7 +66,14 @@ <section id="auth.dep"> <title>Dependencies</title> <para> - The module does not depend on any other module. + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>sl</emphasis> - stateless reply. + </para> + </listitem> + </itemizedlist> </para> </section>

1 0

git:master:841681e6: pua_dialoginfo: Fix typo
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 841681e68a8fd913bc6944eed4f4d00c05f92359 URL: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 pua_dialoginfo: Fix typo --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… Patch: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 0385ed90dd..7b27e666c5 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -643,7 +643,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } #ifdef PUA_DIALOGINFO_DEBUG - /* dialog callback testing (registered last to be executed frist) */ + /* dialog callback testing (registered last to be executed first) */ if (dlg_api.register_dlgcb(dlg, DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED

1 0

git:master:8bab7115: core: Fix typos, reference to SER
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 8bab711590ac8b4fd73efabbc7c22be3231e6214 URL: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 core: Fix typos, reference to SER --- Modified: src/core/str.h Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… Patch: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… --- diff --git a/src/core/str.h b/src/core/str.h index d7977652d9..063a9e9398 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -143,7 +143,7 @@ typedef struct _str str; } while(0) /** - * str with value: not null and not emptu + * str with value: not null and not empty */ #define STR_WITHVAL(_sp) ((_sp) && ((_sp)->s) && ((_sp)->len)) diff --git a/src/core/ut.c b/src/core/ut.c index 8dde51aaff..a581f98e9f 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -97,7 +97,7 @@ int group2gid(int* gid, char* group) /* - * Replacement of timegm (does not exists on all platforms + * Replacement of timegm (does not exists on all platforms) * Taken from * http://lists.samba.org/archive/samba-technical/2002-November/025737.html */ @@ -232,7 +232,7 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2) /** transform a relative pathname into an absolute one. * @param base - base file, used to extract the absolute path prefix. - * Might be NULL, in which case the path of the ser.cfg is + * Might be NULL, in which case the path of the kamailio.cfg is * used. * @param file - file path to be transformed. If it's already absolute * (starts with '/') is left alone. If not the result will @@ -301,7 +301,7 @@ char* get_abs_pathname(str* base, str* file) /** - * @brief search for occurence of needle in text + * @brief search for occurrence of needle in text * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -323,7 +323,7 @@ char *str_search(str *text, str *needle) } /** - * @brief search for occurence of needlez starting from vstart and before vend + * @brief search for occurrence of needlez starting from vstart and before vend * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -346,7 +346,7 @@ char *stre_search_strz(char *vstart, char *vend, char *needlez) } /** - * @brief case insensitive search for occurence of needle in text + * @brief case insensitive search for occurrence of needle in text * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -393,7 +393,7 @@ char *str_casesearch_strz(str *text, char *needlez) } /** - * @brief search for last occurence of needle in text (reverse search) + * @brief search for last occurrence of needle in text (reverse search) * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -415,7 +415,7 @@ char *str_rsearch(str *text, str *needle) } /** - * @brief case insensitive search for last occurence of needle in text (reverse search) + * @brief case insensitive search for last occurrence of needle in text (reverse search) * @return pointer to start of needle in text or NULL if the needle * is not found */ diff --git a/src/core/ut.h b/src/core/ut.h index 44bd0e75c7..7792a865ef 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -729,7 +729,7 @@ static inline int str2int(str* _s, unsigned int* _r) /* - * Convert an str to signed long + * Convert a str to signed long */ static inline int str2slong(str* _s, long* _r) { @@ -738,7 +738,7 @@ static inline int str2slong(str* _s, long* _r) /* - * Convert an str to signed integer + * Convert a str to signed integer */ static inline int str2sint(str* _s, int* _r) { @@ -747,7 +747,7 @@ static inline int str2sint(str* _s, int* _r) /* - * Convert an strz to integer + * Convert a strz to integer */ static inline int strz2int(char* _s, unsigned int* _r) { @@ -770,7 +770,7 @@ static inline int strz2int(char* _s, unsigned int* _r) } /* - * Convert an strz to signed integer + * Convert a strz to signed integer */ static inline int strz2sint(char* _s, int* _r) {

1 0

git:master:abd41396: modules: readme files regenerated - pv_headers ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: abd41396a937155a978ff024f309b082459a057e URL: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T15:16:16+02:00 modules: readme files regenerated - pv_headers ... [skip ci] --- Modified: src/modules/pv_headers/README --- Diff: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… Patch: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… --- diff --git a/src/modules/pv_headers/README b/src/modules/pv_headers/README index 828c7d1a13..e714d3f666 100644 --- a/src/modules/pv_headers/README +++ b/src/modules/pv_headers/README @@ -12,6 +12,11 @@ Victor Seva Sipwise GmbH <vseva(a)sipwise.com> +Fabricio Santolin da Silva + + Alcatel-Lucent Enterprise + <fabricio.santolin-da-silva(a)al-enterprise.com> + Copyright © 2018 Sipwise GmbH __________________________________________________________________ @@ -44,6 +49,8 @@ Victor Seva 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 5. Exported Variables @@ -86,6 +93,8 @@ Chapter 1. Admin Guide 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 5. Exported Variables @@ -240,8 +249,8 @@ modparam("pv_headers", "auto_msg", 1) 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) - - \ + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 4.1. pvh_collect_headers() @@ -317,6 +326,32 @@ modparam("pv_headers", "auto_msg", 1) This function can be used from ANY_ROUTE but only after pvh_collect_headers() or with “auto_msg” parameter enabled. +4.8. pvh_value_exists(hname, hparameter) + + Checks if the parameter “hparameter” is present in the header “hname” + from XAVP. + + This function can be used from ANY_ROUTE but only after + pvh_collect_headers() have been called or with “auto_msg” parameter + enabled. + +4.9. pvh_remove_header_param(hname, hparameter) + + Removes an existing parameter “hparameter” in the header “hname” from + the XAVP. + + If there are multiple headers, only the one containing the parameter + will be modified. + + The parameter can be located in any position (begining, middle or end) + of the list of parameters. + + If the parameter is the only one present, the header will be removed. + + This function can be used from ANY_ROUTE but only after + pvh_collect_headers() have been called or with “auto_msg” parameter + enabled. + 5. Exported Variables * $x_hdr

1 0

[kamailio/kamailio] pv_headers: Add support to remove a specific value from a header (PR #3070)
by Tomohare 11 Apr '22

11 Apr '22

- To be used with headers containing values separated by commas - pvh_header_param_exists() check if the value is present to a given header - pvh_remove_header_param() remove the value from the given header or the entire header if no other value is present   #### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  Previously, to remove a parameter from a header it was needed to create a complex method on the configuration file for each header/parameter. This modification moves this complexity to the 'pv_headers' module. Two new functions: * pvh_header_param_exists * pvh_remove_header_param Both functions take as parameters the name of the header and the name of the parameter. It returns '-1' if the combination header/parameter: - is not found (pvh_header_param_exists) - couldn't be removed (pvh_remove_header_param). Examples (proxy configuration): if (pvh_header_param_exists("Supported", "100rel")) { // "100rel" is present on the "Supported" header } if (pvh_remove_header_param("Supported", "100rel")) { // "100rel" removed from header "Supported" } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3070 -- Commit Summary -- * pv_headers: Add support to remove a specific value from a header -- File Changes -- M src/modules/pv_headers/doc/functions.xml (35) M src/modules/pv_headers/doc/pv_headers.xml (6) M src/modules/pv_headers/pv_headers.c (61) M src/modules/pv_headers/pvh_func.c (87) M src/modules/pv_headers/pvh_func.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3070.patch https://github.com/kamailio/kamailio/pull/3070.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3070 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3070(a)github.com>

4 4

git:master:7a3f71e7: pv_headers: Add support to remove a specific value from a header
by Victor Seva 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 7a3f71e7ce6b63fe1c32853c30d785bc9c1f2236 URL: https://github.com/kamailio/kamailio/commit/7a3f71e7ce6b63fe1c32853c30d785b… Author: Fabricio Santolin da Silva <fabricio.santolin-da-silva(a)al-enterprise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-11T15:10:11+02:00 pv_headers: Add support to remove a specific value from a header - To be used with headers containing values separated by commas - pvh_header_param_exists() check if the value is present to a given header - pvh_remove_header_param() remove the value from the given header or the entire header if no other value is present --- Modified: src/modules/pv_headers/doc/functions.xml Modified: src/modules/pv_headers/doc/pv_headers.xml Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_func.h --- Diff: https://github.com/kamailio/kamailio/commit/7a3f71e7ce6b63fe1c32853c30d785b… Patch: https://github.com/kamailio/kamailio/commit/7a3f71e7ce6b63fe1c32853c30d785b…

1 0

git:master:322102e6: fix compilation warning for gcc 12.x (GH #3073)
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 322102e6a6b9e775aaa5d9f738e549ba8dddf2cd URL: https://github.com/kamailio/kamailio/commit/322102e6a6b9e775aaa5d9f738e549b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T07:40:09Z fix compilation warning for gcc 12.x (GH #3073) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/322102e6a6b9e775aaa5d9f738e549b… Patch: https://github.com/kamailio/kamailio/commit/322102e6a6b9e775aaa5d9f738e549b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d2d7c60814..d3ca839c0d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -283,7 +283,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) # sed with POSIX.1 regex doesn't support |, + or ? # (darwin, solaris ...) => this complicated expression MKDEP=$(CC) -MM -MG - #transform gcc version into 2.9x or 3.0 + #transform gcc version into some well-known versions, or 9 for newer versions CC_SHORTVER:=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ sed -e 's/[^0-9]*-$.*$/\1/'| \ sed -e 's/2\.9.*/2.9x/' \ @@ -310,7 +310,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/10\.[0-9]\..*/9.0+/' \ -e 's/10\.[0-9]$$/9.0+/' \ -e 's/11\.[0-9]\..*/9.0+/' \ - -e 's/11\.[0-9]$$/9.0+/') + -e 's/11\.[0-9]$$/9.0+/' \ + -e 's/12\.[0-9]\..*/9.0+/' \ + -e 's/12\.[0-9]$$/9.0+/') ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP

1 0

[kamailio/kamailio] Does Kamailio process each SIP message in a separate process? (Issue #3075)
by jinhua luo 11 Apr '22

11 Apr '22

I check the codes and it seems that in `udp_rcv_loop()`, each incoming message got processed in the same process, so may it get blocked by some module function? For example, when the script calls `rtpengine_manage()`, it opens a new socket, sends a message, and receives the reply in blocking way, then it blocks the whole `udp_rcv_loop()`. Is it the expected design goal? why not consider new process or threading? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3075 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3075(a)github.com>

2 2

git:master:4033b3be: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 4033b3be916eef91773fa8c3f04ee7e8f954b7f0 URL: https://github.com/kamailio/kamailio/commit/4033b3be916eef91773fa8c3f04ee7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T08:46:20+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/ipops/README --- Diff: https://github.com/kamailio/kamailio/commit/4033b3be916eef91773fa8c3f04ee7e… Patch: https://github.com/kamailio/kamailio/commit/4033b3be916eef91773fa8c3f04ee7e…

1 0

git:master:06aa21a9: ipops: docs for dns_set_local_ttl()
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 06aa21a975f76ce49a10925972ad8c239fc91216 URL: https://github.com/kamailio/kamailio/commit/06aa21a975f76ce49a10925972ad8c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:42:57+02:00 ipops: docs for dns_set_local_ttl() --- Modified: src/modules/ipops/doc/ipops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/06aa21a975f76ce49a10925972ad8c2… Patch: https://github.com/kamailio/kamailio/commit/06aa21a975f76ce49a10925972ad8c2… --- diff --git a/src/modules/ipops/doc/ipops_admin.xml b/src/modules/ipops/doc/ipops_admin.xml index a04a42ab16..9b7da7a974 100644 --- a/src/modules/ipops/doc/ipops_admin.xml +++ b/src/modules/ipops/doc/ipops_admin.xml @@ -1064,6 +1064,46 @@ if (naptr_query ("example.com", "res") > 0) { </section> + <section id="ipops.f.dns_set_local_ttl"> + <title> + <function moreinfo="none">dns_set_local_ttl(vttl)</function> + </title> + + <para> + Set local ttl for DNS query results. If vttl is 0, then the value of + the result and the core parameters are used. + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>vttl</emphasis> - TTL value in seconds. It can be static + integer or a variable holding an integer value. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>dns_set_local_ttl</function> usage + </title> + <programlisting format="linespecific"> +... + dns_set_local_ttl("7200"); + dns_query("test.com", "xyz") + dns_set_local_ttl("0"); +... + </programlisting> + </example> + + </section> + </section> - + </chapter>

1 0

git:master:6074d5ce: dispatcher: new ds_dns_ttl
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 6074d5cecf3f7f009d5a33678843926b57f34520 URL: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-09T21:27:21+02:00 dispatcher: new ds_dns_ttl - option to set ttl for dns queries done by dispatcher --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… Patch: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9d9b849183..d19098800a 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -112,6 +112,7 @@ extern int ds_attrs_none; extern param_t *ds_db_extra_attrs_list; extern int ds_load_mode; extern uint32_t ds_dns_mode; +extern int ds_dns_ttl; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -490,6 +491,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; } else if (ds_dns_mode & (DS_DNS_MODE_INIT|DS_DNS_MODE_TIMER)) { + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = dp->port; sproto = (char)dp->proto; @@ -509,6 +511,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) hn[puri.host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", puri.host.len, puri.host.s); @@ -3372,6 +3375,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, if(!(ds_dns_mode & DS_DNS_MODE_ALWAYS)) { ipa = &node->dlist[j].ip_address; } else { + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = node->dlist[j].port; sproto = (char)node->dlist[j].proto; @@ -3389,6 +3393,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, hn[node->dlist[j].host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_WARN("could not resolve %.*s (skipping)\n", node->dlist[j].host.len, node->dlist[j].host.s); @@ -3485,6 +3490,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) } tport = puri.port_no; tproto = puri.proto; + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = tport; sproto = (char)tproto; @@ -3502,6 +3508,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) hn[puri.host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s\n", puri.host.len, puri.host.s); return -1; @@ -3863,6 +3870,7 @@ void ds_dns_update_set(ds_set_t *node) } LM_DBG("resolving [%.*s] - mode: %d\n", node->dlist[j].host.len, node->dlist[j].host.s, ds_dns_mode); + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = node->dlist[j].port; sproto = (char)node->dlist[j].proto; @@ -3882,6 +3890,7 @@ void ds_dns_update_set(ds_set_t *node) hn[node->dlist[j].host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s\n", node->dlist[j].host.len, node->dlist[j].host.s); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8dea1f29f3..827d925ed8 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -122,6 +122,7 @@ int ds_attrs_none = 0; int ds_load_mode = 0; uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_interval = 600; +int ds_dns_ttl = 0; str ds_outbound_proxy = STR_NULL; @@ -300,6 +301,7 @@ static param_export_t params[]={ {"reload_delta", PARAM_INT, &ds_reload_delta }, {"ds_dns_mode", PARAM_INT, &ds_dns_mode}, {"ds_dns_interval", PARAM_INT, &ds_dns_interval}, + {"ds_dns_ttl", PARAM_INT, &ds_dns_ttl}, {0,0,0} }; @@ -338,6 +340,9 @@ static int mod_init(void) return -1; } } + if(ds_dns_ttl<0) { + ds_dns_ttl = 0; + } if(ds_ping_active_init() < 0) { return -1; }

1 0

git:master:1c67548e: dispatcher: docs for ds_dns_ttl
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 1c67548e9e3c78040fac933a6b59397f2ebb329e URL: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:22:16+02:00 dispatcher: docs for ds_dns_ttl --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… Patch: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 1e67256c88..a910b8480c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1162,6 +1162,28 @@ modparam("dispatcher", "ds_interval_mode", 1800) </example> </section> + <section id="dispatcher.p.ds_dns_ttl"> + <title><varname>ds_dns_ttl</varname> (int)</title> + <para> + The interval in seconds to set TTL for DNS results received for + queries dones inside this module. If 0, this TTL is not set, + result and core values are used. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_dns_ttl</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_interval_mode", 7200) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:ac376471: ipops: added function to set local ttl for dns queries
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: ac376471d95ab7a350d9d7cc124c06a157776dff URL: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:31:20+02:00 ipops: added function to set local ttl for dns queries --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… Patch: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 273f232fa7..49b9ceb653 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -46,6 +46,7 @@ #include "../../core/mod_fix.h" #include "../../core/pvar.h" #include "../../core/resolve.h" +#include "../../core/dns_cache.h" #include "../../core/lvalue.h" #include "../../core/kemi.h" #include "api.h" @@ -110,6 +111,7 @@ static int fixup_free_detailed_ip_type(void** param, int param_no); static int w_dns_query(sip_msg_t* msg, char* str1, char* str2); static int w_srv_query(sip_msg_t* msg, char* str1, char* str2); static int w_naptr_query(sip_msg_t* msg, char* str1, char* str2); +static int w_dns_set_local_ttl(sip_msg_t*, char*, char*); static int mod_init(void); static pv_export_t mod_pvs[] = { @@ -165,6 +167,8 @@ static cmd_export_t cmds[] = ANY_ROUTE }, { "naptr_query", (cmd_function)w_naptr_query, 2, fixup_spve_spve, 0, ANY_ROUTE }, + { "dns_set_local_ttl", (cmd_function)w_dns_set_local_ttl, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, { "bind_ipops", (cmd_function)bind_ipops, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0 } }; @@ -1358,6 +1362,30 @@ static int ki_naptr_query(sip_msg_t* msg, str* naptrname, str* pvid) return naptr_update_pv(naptrname, pvid); } +/** + * + */ +static int ki_dns_set_local_ttl(sip_msg_t* msg, int vttl) +{ + dns_set_local_ttl(vttl); + return 1; +} + +/** + * + */ +static int w_dns_set_local_ttl(sip_msg_t *msg, char *pttl, char *p2) +{ + int vttl = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)pttl, &vttl)<0) { + LM_ERR("cannot get the ttl value\n"); + return -1; + } + + return ki_dns_set_local_ttl(msg, vttl); +} + /** * */ @@ -1458,6 +1486,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("dns_set_local_ttl"), + SR_KEMIP_INT, ki_dns_set_local_ttl, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:0846ddd9: core: dns cache - option to set local ttl to overwrite the global value
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 0846ddd9eb79eeb0f93535ad65c75670f026941b URL: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-09T15:36:32+02:00 core: dns cache - option to set local ttl to overwrite the global value --- Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… Patch: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 58247265eb..d6826f0707 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -88,12 +88,15 @@ struct t_dns_cache_stats* dns_cache_stats=0; #define LOCK_DNS_HASH() lock_get(dns_hash_lock) #define UNLOCK_DNS_HASH() lock_release(dns_hash_lock) +static int _dns_local_ttl = 0; + #define FIX_TTL(t) \ - (((t)<cfg_get(core, core_cfg, dns_cache_min_ttl))? \ - cfg_get(core, core_cfg, dns_cache_min_ttl): \ - (((t)>cfg_get(core, core_cfg, dns_cache_max_ttl))? \ - cfg_get(core, core_cfg, dns_cache_max_ttl): \ - (t))) + ((_dns_local_ttl>0)?_dns_local_ttl: \ + (((t)<cfg_get(core, core_cfg, dns_cache_min_ttl))? \ + cfg_get(core, core_cfg, dns_cache_min_ttl): \ + (((t)>cfg_get(core, core_cfg, dns_cache_max_ttl))? \ + cfg_get(core, core_cfg, dns_cache_max_ttl): \ + (t)))) struct dns_hash_head{ @@ -132,6 +135,10 @@ static const char* dns_str_errors[]={ }; +void dns_set_local_ttl(int ttl) +{ + _dns_local_ttl = ttl; +} /* param: err (negative error number) */ const char* dns_strerror(int err) diff --git a/src/core/dns_cache.h b/src/core/dns_cache.h index 0ec919f2d2..f8ae153a30 100644 --- a/src/core/dns_cache.h +++ b/src/core/dns_cache.h @@ -374,5 +374,6 @@ int dns_cache_delete_single_record(unsigned short type, str *value, int flags); +void dns_set_local_ttl(int ttl); #endif

1 0

git:master:d5e29886: core: enable updating received data via $rcv(buf)
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: d5e29886ccca6e4384859523e8b923761532c513 URL: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T19:15:26+02:00 core: enable updating received data via $rcv(buf) - on event_route[core:msg-received] --- Modified: src/core/ip_addr.h Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… Patch: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index c3f423123e..2f7770f81d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -203,6 +203,7 @@ typedef struct ksr_coninfo { typedef struct sr_net_info { str data; + unsigned int bufsize; receive_info_t* rcv; dest_info_t* dst; } sr_net_info_t; diff --git a/src/core/receive.c b/src/core/receive.c index b3e6aee8b8..5ed35a584c 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -161,7 +161,7 @@ sr_net_info_t *ksr_evrt_rcvnetinfo_get(void) /** * */ -int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) +int ksr_evrt_received(char *buf, unsigned int *len, receive_info_t *rcv_info) { sr_kemi_eng_t *keng = NULL; sr_net_info_t netinfo; @@ -192,7 +192,8 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) } memset(&netinfo, 0, sizeof(sr_net_info_t)); netinfo.data.s = buf; - netinfo.data.len = len; + netinfo.data.len = *len; + netinfo.bufsize = BUF_SIZE; netinfo.rcv = rcv_info; ksr_evrt_rcvnetinfo = &netinfo; @@ -212,6 +213,7 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) LM_DBG("dropping received message\n"); ret = -1; } + *len = netinfo.data.len; ksr_evrt_rcvnetinfo = NULL; return ret; @@ -312,7 +314,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) } if(ksr_evrt_received_mode!=0) { - if(ksr_evrt_received(buf, len, rcv_info)<0) { + if(ksr_evrt_received(buf, &len, rcv_info)<0) { LM_DBG("dropping the received message\n"); goto error00; }

1 0

git:master:ba28855a: pv: added set function for variable $rcv(buf)
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: ba28855a1745e0b084d230958bd3fbb5b0e23847 URL: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T19:17:35+02:00 pv: added set function for variable $rcv(buf) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_branch.c Modified: src/modules/pv/pv_branch.h --- Diff: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… Patch: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c34ce5dd31..cdd34ce5b9 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -91,7 +91,7 @@ static pv_export_t mod_pvs[] = { pv_parse_snd_name, 0, 0, 0 }, { {"sndfrom", (sizeof("sndfrom")-1)}, PVT_OTHER, pv_get_sndfrom, 0, pv_parse_snd_name, 0, 0, 0 }, - { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0, + { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, pv_set_rcv, pv_parse_rcv_name, 0, 0, 0 }, { {"xavp", sizeof("xavp")-1}, /* xavp */ PVT_XAVP, pv_get_xavp, pv_set_xavp, diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index ecce3156e7..83cc273f12 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -617,6 +617,60 @@ int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val) +{ + sr_net_info_t *neti = NULL; + str s; + + neti = ksr_evrt_rcvnetinfo_get(); + + if (neti==NULL || neti->rcv==NULL || neti->rcv->bind_address==NULL) { + LM_ERR("received info not set\n"); + return -1; + } + + if(param==NULL) { + LM_ERR("bad parameters\n"); + return -1; + } + switch(param->pvn.u.isname.name.n) + { + case 1: /* buf */ + if (neti->bufsize <= 0) { + LM_ERR("received data cannot be changed\n"); + return -1; + } + if(val==NULL || (val->flags&PV_VAL_NULL)) { + neti->data.s[0] = '\0'; + neti->data.len = 0; + break; + } + if(!(val->flags&PV_VAL_STR)) { + LM_ERR("str value required to set received data\n"); + return -1; + } + if(val->rs.len<=0) { + neti->data.s[0] = '\0'; + neti->data.len = 0; + break; + } + + if (unlikely(val->rs.len >= neti->bufsize - 1)) { + LM_ERR("new data is too long: %.*s\n", + val->rs.len, val->rs.s); + return -1; + } + memcpy(neti->data.s, val->rs.s, val->rs.len); + neti->data.s[val->rs.len] = '\0'; + neti->data.len = val->rs.len; + break; + default: + LM_DBG("set operation not supported for field %d\n", + param->pvn.u.isname.name.n); + } + return 0; +} + int pv_parse_rcv_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) diff --git a/src/modules/pv/pv_branch.h b/src/modules/pv/pv_branch.h index a83c98208b..5252db0d6b 100644 --- a/src/modules/pv/pv_branch.h +++ b/src/modules/pv/pv_branch.h @@ -42,6 +42,7 @@ int pv_parse_snd_name(pv_spec_p sp, str *in); int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val); int pv_parse_rcv_name(pv_spec_p sp, str *in); int pv_get_nh(struct sip_msg *msg, pv_param_t *param,

1 0

git:master:f10f3b51: dispatcher: track time of last dns timer update
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: f10f3b516ccab7f2bca8ff71c3fa34b915fc03f6 URL: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T16:17:02+02:00 dispatcher: track time of last dns timer update --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… Patch: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0f6a6b178f..9d9b849183 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3889,6 +3889,7 @@ void ds_dns_update_set(ds_set_t *node) } else { /* Store hostent in the dispatcher structure */ hostent2ip_addr(&node->dlist[j].ip_address, he, 0); + gettimeofday(&node->dlist[j].dnstime, NULL); } } } diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 3eaa9894dd..99c63eb7b9 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -29,6 +29,7 @@ #define _DISPATCH_H_ #include <stdio.h> +#include <sys/time.h> #include "../../core/pvar.h" #include "../../core/xavp.h" #include "../../core/parser/msg_parser.h" @@ -231,6 +232,7 @@ typedef struct _ds_dest { unsigned short int port; /*!< port of the URI */ unsigned short int proto; /*!< protocol of the URI */ int message_count; + struct timeval dnstime; struct _ds_dest *next; } ds_dest_t; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index ccf579fba8..8dea1f29f3 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1664,9 +1664,11 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, if(mode == DS_RPC_PRINT_FULL) { ipbuf[0] = '\0'; ip_addr2sbufz(&node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssdd", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, - "PROTOID", (int)node->dlist[j].proto) < 0) { + "PROTOID", (int)node->dlist[j].proto, + "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, + "DNSTIME_USEC", (unsigned long)node->dlist[j].dnstime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; }

1 0

git:master:a7e9eb08: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: a7e9eb0897a0ea512a4c72c44ced9a14113099ff URL: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-08T13:31:17+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… Patch: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 66659be123..b74ca1841a 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1684,15 +1684,18 @@ kamcmd dispatcher.ping_active 0 * _group_: destination group id * _address_: address of the destination in the _group_ * _flags_ (optional): as described in the list file format, default 0 + * _priority_ (optional): as described in the list file format, + default 0 * _attrs_ (optional): as described in the list file format, default "" Example: ... -# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ _attrs_ +# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ _priority_ _attrs_ kamcmd dispatcher.add 2 sip:127.0.0.1:5080 kamcmd dispatcher.add 3 sip:127.0.0.1:5075 8 -kamcmd dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 +kamcmd dispatcher.add 3 sip:127.0.0.1:5075 0 0 duid=abc;socket=udp:127.0.0.1:506 +0 ... 5.7. dispatcher.remove

1 0

git:master:a7ade4f3: dispatcher: rpc command to add a record updated to get priority
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: a7ade4f3c6c2439ebc286c0c595c92b88550dbc3 URL: https://github.com/kamailio/kamailio/commit/a7ade4f3c6c2439ebc286c0c595c92b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T13:25:31+02:00 dispatcher: rpc command to add a record updated to get priority --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/a7ade4f3c6c2439ebc286c0c595c92b… Patch: https://github.com/kamailio/kamailio/commit/a7ade4f3c6c2439ebc286c0c595c92b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b82bc89b90..0f6a6b178f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2611,12 +2611,11 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) } /* add dispatcher entry to in-memory dispatcher list */ -int ds_add_dst(int group, str *address, int flags, str *attrs) +int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) { - int setn, priority; + int setn; setn = _ds_list_nr; - priority = 0; *ds_next_idx = (*ds_crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*ds_next_idx]); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index fec204bfff..3eaa9894dd 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -145,7 +145,7 @@ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, uint32_t limit, int mode); int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_update_dst(struct sip_msg *msg, int upos, int mode); -int ds_add_dst(int group, str *address, int flags, str *attrs); +int ds_add_dst(int group, str *address, int flags, int priority, str *attrs); int ds_remove_dst(int group, str *address); int ds_update_state(sip_msg_t *msg, int group, str *address, int state, ds_rctx_t *rctx); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index e877e3bf6c..ccf579fba8 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1907,7 +1907,7 @@ static const char *dispatcher_rpc_add_doc[2] = { */ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { - int group, flags, nparams; + int group, flags, priority, nparams; str dest; str attrs = STR_NULL; @@ -1924,17 +1924,18 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) *ds_rpc_reload_time = time(NULL); flags = 0; + priority = 0; - nparams = rpc->scan(ctx, "dS*dS", &group, &dest, &flags, &attrs); + nparams = rpc->scan(ctx, "dS*ddS", &group, &dest, &flags, &priority, &attrs); if(nparams < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; - } else if (nparams <= 3) { + } else if (nparams <= 4) { attrs.s = 0; attrs.len = 0; } - if(ds_add_dst(group, &dest, flags, &attrs) != 0) { + if(ds_add_dst(group, &dest, flags, priority, &attrs) != 0) { rpc->fault(ctx, 500, "Adding dispatcher dst failed"); return; }

1 0

git:master:8e211bc1: dispatcher: docs updated for rpc add command
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: 8e211bc196abd49a635192f788364afad13c5a45 URL: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T13:28:23+02:00 dispatcher: docs updated for rpc add command --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… Patch: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 23dcb513e6..1e67256c88 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2082,8 +2082,9 @@ DEST: { <function moreinfo="none">dispatcher.add</function> </title> <para> - Add a destination address to the in-memory dispatcher list. Reloading the dispatcher will remove - any destinations that are only added to the in-memory dispatcher list. + Add a destination address to the in-memory dispatcher list. Reloading + the dispatcher will remove any destinations that are only added to the + in-memory dispatcher list. </para> <para> Name: <emphasis>dispatcher.add</emphasis> @@ -2097,6 +2098,9 @@ DEST: { <listitem><para>_flags_ (optional): as described in the list file format, default 0</para></listitem> + <listitem><para>_priority_ (optional): as described in the list file format, + default 0</para></listitem> + <listitem><para>_attrs_ (optional): as described in the list file format, default ""</para></listitem> @@ -2106,10 +2110,10 @@ DEST: { </para> <programlisting format="linespecific"> ... -# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _attrs_ +# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _priority_ _attrs_ &sercmd; dispatcher.add 2 sip:127.0.0.1:5080 &sercmd; dispatcher.add 3 sip:127.0.0.1:5075 8 -&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 +&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 0 duid=abc;socket=udp:127.0.0.1:5060 ... </programlisting> </section>

1 0

git:master:313c0a93: core: helper function to get socket by advertise address
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: 313c0a93ad2076a2eac88c95d8992c42975a36cf URL: https://github.com/kamailio/kamailio/commit/313c0a93ad2076a2eac88c95d8992c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T12:38:27+02:00 core: helper function to get socket by advertise address --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/313c0a93ad2076a2eac88c95d8992c4… Patch: https://github.com/kamailio/kamailio/commit/313c0a93ad2076a2eac88c95d8992c4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 2b29d2b95c..5622e2634d 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -878,6 +878,40 @@ socket_info_t* ksr_get_socket_by_listen(str *sockstr) return NULL; } +socket_info_t* ksr_get_socket_by_advertise(str *sockstr) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->useinfo.sock_str.s == NULL) { + continue; + } + LM_DBG("checking if listen %.*s matches %.*s\n", + sockstr->len, sockstr->s, + si->useinfo.sock_str.len, si->useinfo.sock_str.s); + if (sockstr->len == si->useinfo.sock_str.len + && strncasecmp(sockstr->s, si->useinfo.sock_str.s, + sockstr->len)==0) { + return si; + } + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 0b517de2de..3c8deeb244 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -105,6 +105,7 @@ struct socket_info* find_si(struct ip_addr* ip, unsigned short port, unsigned short proto); socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); +socket_info_t* ksr_get_socket_by_advertise(str *sockstr); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:d09e2250: corex: $lsock() variable can match by advertise address
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: d09e2250db652650945867d135faa84a08dda820 URL: https://github.com/kamailio/kamailio/commit/d09e2250db652650945867d135faa84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T12:39:12+02:00 corex: $lsock() variable can match by advertise address --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/d09e2250db652650945867d135faa84… Patch: https://github.com/kamailio/kamailio/commit/d09e2250db652650945867d135faa84… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 0f0f5c39e1..74fcff6e79 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -215,6 +215,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'l': si = ksr_get_socket_by_listen(&lexpr.val); break; + case 'a': + si = ksr_get_socket_by_advertise(&lexpr.val); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

1 0

git:master:e272eea0: permissions: return ret variable set inside double_fixup()
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: e272eea0229678b4446a3907b7360c61c273caa7 URL: https://github.com/kamailio/kamailio/commit/e272eea0229678b4446a3907b7360c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T12:36:49+02:00 permissions: return ret variable set inside double_fixup() --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/e272eea0229678b4446a3907b7360c6… Patch: https://github.com/kamailio/kamailio/commit/e272eea0229678b4446a3907b7360c6… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index d5655206e4..6f1b36cf23 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -548,7 +548,7 @@ static int double_fixup(void** param, int param_no) *param = tmp; pkg_free(buffer); - return 0; + return ret; } else if (param_no == 2) { /* pseudo variable */

1 0

git:master:d4d20240: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: d4d20240d5ef55a55b2ddd37ae926124d9919623 URL: https://github.com/kamailio/kamailio/commit/d4d20240d5ef55a55b2ddd37ae92612… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-07T20:16:16+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/d4d20240d5ef55a55b2ddd37ae92612… Patch: https://github.com/kamailio/kamailio/commit/d4d20240d5ef55a55b2ddd37ae92612…

1 0

git:master:168b7653: p_usrloc: add a note to docs about runtime change of UTC parameter, related to gh #3072
by Henning Westerholt 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 168b76538c33be5a91d73d553930c60229e72c1f URL: https://github.com/kamailio/kamailio/commit/168b76538c33be5a91d73d553930c60… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-07T18:14:10Z p_usrloc: add a note to docs about runtime change of UTC parameter, related to gh #3072 --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/168b76538c33be5a91d73d553930c60… Patch: https://github.com/kamailio/kamailio/commit/168b76538c33be5a91d73d553930c60… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 2cd04221b5..ca8faa827f 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -761,7 +761,7 @@ kamcmd cfg.get p_usrloc matching_mode <title><varname>UTC_timestamps</varname>(int)</title> <para> <emphasis> - Enables UTC timestamps for expires and last_modified columns. + Enables UTC timestamps for expires and last_modified columns. It can be changed at runtime via rpc command. </emphasis> </para> <para>

1 0

git:master:a3ca4237: dispatcher: docs for ds_dns_mode and ds_dns_interval
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: a3ca4237f3514da99d9fb1095b82a76740ebd108 URL: https://github.com/kamailio/kamailio/commit/a3ca4237f3514da99d9fb1095b82a76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T20:13:27+02:00 dispatcher: docs for ds_dns_mode and ds_dns_interval --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a3ca4237f3514da99d9fb1095b82a76… Patch: https://github.com/kamailio/kamailio/commit/a3ca4237f3514da99d9fb1095b82a76… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 6075d110fe..23dcb513e6 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1100,6 +1100,68 @@ modparam("dispatcher", "reload_delta", 1) </programlisting> </example> </section> + + <section id="dispatcher.p.ds_dns_mode"> + <title><varname>ds_dns_mode</varname> (int)</title> + <para> + Specify the how DNS resolving is done for destination addresses. + </para> + <para> + It is a bitwise flag and can be set to one or the sum of: + </para> + <itemizedlist> + <listitem> + <para>1 - do it at startup and reload (previous behaviour).</para> + </listitem> + <listitem> + <para>2 - do it always when the address is matched with ds_is_from_list().</para> + </listitem> + <listitem> + <para>4 - do it startup/reload and refresh on the timer interval + specified by ds_dns_interval.</para> + </listitem> + <listitem> + <para>8 - do SRV (and NAPTR if enabled in core) query instead of + A/AAAA lookup. NAPTR is done if protocol and port are not set. + SRV is done if port is not set.</para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_dns_mode</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_dns_mode", 2) +... +</programlisting> + </example> + </section> + + <section id="dispatcher.p.ds_dns_interval"> + <title><varname>ds_dns_interval</varname> (int)</title> + <para> + The interval in seconds to periodically refresh the DNS queries for + destination addresses if ds_dns_mode has value 4 set. + </para> + <para> + <emphasis> + Default value is <quote>600</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_dns_interval</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_interval_mode", 1800) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:fa0e1684: dispatcher: dns resolving of destination addresses done on timer
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: fa0e1684a39a505abf95e0fa202907ceb7d3ff3e URL: https://github.com/kamailio/kamailio/commit/fa0e1684a39a505abf95e0fa202907c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T20:13:27+02:00 dispatcher: dns resolving of destination addresses done on timer - new option to refresh periodically the ip addresses corresponding to destination addresses --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/fa0e1684a39a505abf95e0fa202907c… Patch: https://github.com/kamailio/kamailio/commit/fa0e1684a39a505abf95e0fa202907c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 66356878ac..b82bc89b90 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3835,6 +3835,85 @@ void ds_ht_timer(unsigned int ticks, void *param) return; } + + +/** + * + */ +void ds_dns_update_set(ds_set_t *node) +{ + int i, j; + char hn[DS_HN_SIZE]; + struct hostent *he; + unsigned short sport = 0; + char sproto = PROTO_NONE; + + if(!node) + return; + + for(i = 0; i < 2; ++i) + ds_dns_update_set(node->next[i]); + + for(j = 0; j < node->nr; j++) { + /* do a DNS qookup for the host part, if not disabled via dst flags */ + if(node->dlist[j].flags & DS_NODNSARES_DST) { + continue; + } + if(node->dlist[j].host.len <= 0) { + continue; + } + LM_DBG("resolving [%.*s] - mode: %d\n", node->dlist[j].host.len, + node->dlist[j].host.s, ds_dns_mode); + if (ds_dns_mode & DS_DNS_MODE_QSRV) { + sport = node->dlist[j].port; + sproto = (char)node->dlist[j].proto; + he = sip_resolvehost(&node->dlist[j].host, &sport, &sproto); + if(he != 0) { + if(sport != 0) { + node->dlist[j].port = sport; + } + if(sproto != PROTO_NONE) { + node->dlist[j].proto = sproto; + } + } + } else { + /* The Hostname needs to be \0 terminated for resolvehost, so we + * make a copy here. */ + memcpy(hn, node->dlist[j].host.s, node->dlist[j].host.len); + hn[node->dlist[j].host.len] = '\0'; + he = resolvehost(hn); + } + if(he == 0) { + LM_ERR("could not resolve %.*s\n", node->dlist[j].host.len, + node->dlist[j].host.s); + continue; + } else { + /* Store hostent in the dispatcher structure */ + hostent2ip_addr(&node->dlist[j].ip_address, he, 0); + } + } +} + +/*! \brief + * Timer for DNS query of destination addresses + * + * This timer is regularly fired. + */ +void ds_dns_timer(unsigned int ticks, void *param) +{ + if(!(ds_dns_mode & DS_DNS_MODE_TIMER)) { + return; + } + + /* Check for the list. */ + if(_ds_list == NULL || _ds_list_nr <= 0) { + LM_DBG("no destination sets\n"); + return; + } + + ds_dns_update_set(_ds_list); +} + int ds_next_dst_api(sip_msg_t *msg, int mode) { return ds_update_dst(msg, DS_USE_NEXT, mode); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index d00bc42e47..fec204bfff 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -173,12 +173,16 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode); */ void ds_check_timer(unsigned int ticks, void *param); - /*! \brief * Timer for checking active calls load */ void ds_ht_timer(unsigned int ticks, void *param); +/*! \brief + * Timer for DNS query of destination addresses + */ +void ds_dns_timer(unsigned int ticks, void *param); + /*! \brief * Check if the reply-code is valid: */ diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ae2fb7b68..471070fe4e 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -122,6 +122,7 @@ int ds_attrs_none = 0; int ds_load_mode = 0; uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_mode_param = 0; +static int ds_dns_interval = 0; str ds_outbound_proxy = STR_NULL; @@ -299,6 +300,7 @@ static param_export_t params[]={ {"ds_load_mode", PARAM_INT, &ds_load_mode}, {"reload_delta", PARAM_INT, &ds_reload_delta }, {"ds_dns_mode", PARAM_INT, &ds_dns_mode_param}, + {"ds_dns_interval", PARAM_INT, &ds_dns_interval}, {0,0,0} }; @@ -330,6 +332,15 @@ static int mod_init(void) ds_dns_mode = 1U<<(unsigned int)ds_dns_mode_param; + if(ds_dns_mode & DS_DNS_MODE_TIMER) { + if(ds_dns_interval<=0) { + LM_WARN("dns interval parameter not set - using 600\n"); + ds_dns_interval = 600; + } + if(sr_wtimer_add(ds_dns_timer, NULL, ds_dns_interval) < 0) { + return -1; + } + } if(ds_ping_active_init() < 0) { return -1; }

1 0

git:master:fd0794bc: dispatcher: set default value for ds_dns_interval to 600
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: fd0794bc87c15d04c78c5bf2f23a8afc550b24eb URL: https://github.com/kamailio/kamailio/commit/fd0794bc87c15d04c78c5bf2f23a8af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T20:13:27+02:00 dispatcher: set default value for ds_dns_interval to 600 - use modparam value for ds_dns_mode --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/fd0794bc87c15d04c78c5bf2f23a8af… Patch: https://github.com/kamailio/kamailio/commit/fd0794bc87c15d04c78c5bf2f23a8af… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 471070fe4e..e877e3bf6c 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -121,8 +121,7 @@ int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; uint32_t ds_dns_mode = DS_DNS_MODE_INIT; -static int ds_dns_mode_param = 0; -static int ds_dns_interval = 0; +static int ds_dns_interval = 600; str ds_outbound_proxy = STR_NULL; @@ -299,7 +298,7 @@ static param_export_t params[]={ {"ds_db_extra_attrs", PARAM_STR, &ds_db_extra_attrs}, {"ds_load_mode", PARAM_INT, &ds_load_mode}, {"reload_delta", PARAM_INT, &ds_reload_delta }, - {"ds_dns_mode", PARAM_INT, &ds_dns_mode_param}, + {"ds_dns_mode", PARAM_INT, &ds_dns_mode}, {"ds_dns_interval", PARAM_INT, &ds_dns_interval}, {0,0,0} }; @@ -330,8 +329,6 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; - ds_dns_mode = 1U<<(unsigned int)ds_dns_mode_param; - if(ds_dns_mode & DS_DNS_MODE_TIMER) { if(ds_dns_interval<=0) { LM_WARN("dns interval parameter not set - using 600\n");

1 0

[kamailio/kamailio] p_usrloc: make UTC param runtime configurable (PR #3072)
by Stefan Mititelu 07 Apr '22

07 Apr '22

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3072 -- Commit Summary -- * p_usrloc: make UTC param runtime configurable -- File Changes -- M src/modules/p_usrloc/config.c (5) M src/modules/p_usrloc/config.h (1) M src/modules/p_usrloc/p_usrloc_mod.c (7) M src/modules/p_usrloc/p_usrloc_mod.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3072.patch https://github.com/kamailio/kamailio/pull/3072.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3072 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3072(a)github.com>

2 2

git:master:ef7f784e: p_usrloc: make UTC param runtime configurable
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: ef7f784e70087abd8dec22a899eb7c544e9d981d URL: https://github.com/kamailio/kamailio/commit/ef7f784e70087abd8dec22a899eb7c5… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T19:20:35+02:00 p_usrloc: make UTC param runtime configurable --- Modified: src/modules/p_usrloc/config.c Modified: src/modules/p_usrloc/config.h Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ef7f784e70087abd8dec22a899eb7c5… Patch: https://github.com/kamailio/kamailio/commit/ef7f784e70087abd8dec22a899eb7c5… --- diff --git a/src/modules/p_usrloc/config.c b/src/modules/p_usrloc/config.c index bf24a97229..c95be9ec70 100644 --- a/src/modules/p_usrloc/config.c +++ b/src/modules/p_usrloc/config.c @@ -35,7 +35,8 @@ struct cfg_group_p_usrloc default_p_usrloc_cfg = { DEFAULT_FAILOVER_LEVEL, /* failover_level */ 0, /* db_ops_ruid */ 1, /* db_update_as_insert */ - CONTACT_ONLY /* matching_mode */ + CONTACT_ONLY, /* matching_mode */ + 0, /* utc_timestamps */ }; void *p_usrloc_cfg = &default_p_usrloc_cfg; @@ -53,5 +54,7 @@ cfg_def_t p_usrloc_cfg_def[] = { "Set this parameter if you want to do INSERT DB operations instead of UPDATE DB operations. "}, {"matching_mode", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "Specified which contact maching algorithm to be used (0 - Contact only / 1 - Contact and Call-ID / 2 - Contact and Path)"}, + {"utc_timestamps", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, + "Expires and last_modified timestamps in UTC time format"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/p_usrloc/config.h b/src/modules/p_usrloc/config.h index 42e16cb6b4..396bcded49 100644 --- a/src/modules/p_usrloc/config.h +++ b/src/modules/p_usrloc/config.h @@ -33,6 +33,7 @@ struct cfg_group_p_usrloc { unsigned int db_ops_ruid; unsigned int db_update_as_insert; unsigned int matching_mode; + unsigned int utc_timestamps; }; extern struct cfg_group_p_usrloc default_p_usrloc_cfg; diff --git a/src/modules/p_usrloc/p_usrloc_mod.c b/src/modules/p_usrloc/p_usrloc_mod.c index b29f4e7e18..89d053d278 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.c +++ b/src/modules/p_usrloc/p_usrloc_mod.c @@ -148,7 +148,6 @@ str uniq_col = str_init(UNIQ_COL); /*!< Name of column containing the un int db_mode = 3; /*!< Database sync scheme: 1-write through, 2-write back, 3-only db */ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ -int ul_UTC_timestamps = 0; /*!< If set to 1 use UTC instead of local time for expires and last_modified */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 9; @@ -241,7 +240,7 @@ static param_export_t params[] = { {"error_column", PARAM_STR, &error_col }, {"risk_group_column", PARAM_STR, &risk_group_col }, {"expire_time", INT_PARAM, &default_p_usrloc_cfg.expire_time}, - {"UTC_timestamps", INT_PARAM, &ul_UTC_timestamps}, + {"UTC_timestamps", INT_PARAM, &default_p_usrloc_cfg.utc_timestamps}, {"db_err_threshold", INT_PARAM, &default_p_usrloc_cfg.db_err_threshold}, {"failover_level", INT_PARAM, &default_p_usrloc_cfg.failover_level}, {"db_retry_interval", INT_PARAM, &retry_interval }, @@ -484,7 +483,7 @@ struct mi_root* mi_loc_nr_refresh(struct mi_root* cmd_tree, void* param) { #endif time_t ul_db_datetime_set(time_t v) { - if (ul_UTC_timestamps == 1) { + if (cfg_get(p_usrloc, p_usrloc_cfg, utc_timestamps) == 1) { return local2utc(v); } else { return v; @@ -492,7 +491,7 @@ time_t ul_db_datetime_set(time_t v) { } time_t ul_db_datetime_get(time_t v) { - if (ul_UTC_timestamps == 1) { + if (cfg_get(p_usrloc, p_usrloc_cfg, utc_timestamps) == 1) { return utc2local(v); } else { return v; diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index eb87b7a608..bfdcc2f45c 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -92,7 +92,6 @@ extern int desc_time_order; extern int cseq_delay; extern int ul_fetch_rows; extern int ul_hash_size; -extern int ul_UTC_timestamps; extern str default_db_url;

1 0

BLF: Yealink telephone status freezes
by Liviu Andron 07 Apr '22

07 Apr '22

Hello, I have a problem with BLF (Busy Lamp Fields, i.e. dialog events) on Yealink T41S: the key status (green or blinking red) freezes when calling a user to which we SUBSCRIBEd. It freezes until the subscription expires. Using sngrep, I was able to see that some NOTIFYs get a timeout (they are sent 3 times) because the phone doesn't reply (200 OK). These NOTIFY seem to have in common the fact that the caller is the SUBSCRIBEd Yealink user. Example on NOTIFY body: <?xml version="1.0"?> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="4" state="full" entity="sip:callee@sip.com"> <dialog id="5_2630032430(a)11.202.138.255" call-id=" 5_2630032430(a)11.202.138.255" direction="recipient"> <state>confirmed</state> <remote> <identity>sip:caller@sip.com:5060</identity> <target uri="sip:caller@11.202.138.255:5060"/> </remote> <local> <identity>sip:callee@sip.com:5060</identity> <target uri="sip:callee@sip.com:5060"/> </local> </dialog> </dialog-info> caller(a)sip.com subscribed to callee(a)sip.com and then called it. I wasn't able to find a solution with the current implementation, for example presence_dialoginfo/force_single_dialog = 1 doesn't help. I come with a setting modparam("presence", "dont_notify_subscribed_caller", 1) that, if enabled, doesn't NOTIFY a subscriber if this one is the caller itself. It does this by validating remote and local elements in the xml body of the NOTIFY message against the message target. Is there a better solution? The technical questions: 1. I verify the sender in the function notify(..) by analyzing the dialog's event xml body. Is there a more direct method, not passing by this xml? modparam("pua_dialoginfo", "include_localremote", 0) - might be missing, but it's not relevant 2. I would have preferred a flag-like solution: but how to flag (refuse) a NOTIFY message that doesn't even pass by the configuration script? For example, I could activate that flag for a SUBSCRIBE coming from "User-Agent: Yealink SIP-T41S". 3. I am using xml_utils.h, so libser_cds, libser_presence, but is this alright? I had to modify their Makefiles for the build to succeed, this gets new dependencies in presence.so ... 4. I verify only that dialog-info/remote & local/identity is not the one of the recipient (the subscriber) and, if so, I stop the notification ... Because the message could contain multiple dialogs, this technique is not enough: removing parts of the dialog is necessary. Thank you, Liviu

1 0

[kamailio/kamailio] mqueue: add mqueue_mode modparam (PR #3053)
by Stefan Mititelu 07 Apr '22

07 Apr '22

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  Add a mqueue parameter to control the mq_add() mode. 0 - default, no changes in behavior 1 - add unique keys, keep oldest 2 - add unique keys, keep newest You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3053 -- Commit Summary -- * mqueue: add mqueue_mode modparam -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (40) M src/modules/mqueue/mqueue_api.c (44) M src/modules/mqueue/mqueue_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3053.patch https://github.com/kamailio/kamailio/pull/3053.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3053 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3053(a)github.com>

2 12

git:master:19a8c97b: corex: new transformation {sock.attr}
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 19a8c97b0b4089966af6b1705bf5eaee7554e30b URL: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T09:39:29+02:00 corex: new transformation {sock.attr} - get attributes of a socket address proto:host:port --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_var.c Modified: src/modules/corex/corex_var.h --- Diff: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae… Patch: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae…

1 0

git:master:a3d88ed0: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: a3d88ed0128d5d9d94af3bc5b9bbc3e1dbe9aea7 URL: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-07T08:31:25+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… Patch: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index ff24e03f26..5472fd15ba 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1575,8 +1575,9 @@ kamcmd dispatcher.set_duid_state ip 2 xyz Name: dispatcher.list Parameters: - * _rmode_ - (optional) response mode - can be 'short' to get a - shorter version of groups and destinations + * _rmode_ - (optional) response mode - can be: 'short' to get a + shorter version of groups and destinations; 'full' to get more + attributes per destination Example: kamcmd dispatcher.list

1 0

git:master:4e08fbcd: dispatcher: docs updated for rpc dispatcher.list
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 4e08fbcd45886dfa7d687cda68540ef548b23cf9 URL: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T08:27:19+02:00 dispatcher: docs updated for rpc dispatcher.list --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… Patch: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index bcd0a49a71..6075d110fe 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1932,8 +1932,9 @@ onreply_route { <para>Parameters:</para> <itemizedlist> <listitem> - <para>_rmode_ - (optional) response mode - can be 'short' to get a - shorter version of groups and destinations</para> + <para>_rmode_ - (optional) response mode - can be: 'short' to get a + shorter version of groups and destinations; 'full' to get more + attributes per destination</para> </listitem> </itemizedlist> <para>

1 0

git:master:2eac6a0c: core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 2eac6a0c2f2dd7c8831ef65fa9d92b88a79d23af URL: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T20:36:26+02:00 core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6 --- Modified: src/core/ip_addr.c --- Diff: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… Patch: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index cb07a3e60d..77ac233eee 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -237,7 +237,7 @@ int ip_addr2sbuf(struct ip_addr* ip, char* buff, int len) } -/* same as ip_addr2sbuf, but with [ ] around IPv6 addresses */ +/* same as ip_addr2sbuf, but with [ ] around IPv6 addresses and ending \0 */ int ip_addr2sbufz(struct ip_addr* ip, char* buff, int len) { char *p; @@ -247,15 +247,15 @@ int ip_addr2sbufz(struct ip_addr* ip, char* buff, int len) switch(ip->af){ case AF_INET6: *p++ = '['; - sz = ip6tosbuf(ip->u.addr, p, len-2); + sz = ip6tosbuf(ip->u.addr, p, len-3); p += sz; *p++ = ']'; - *p=0; + *p = '\0'; return sz + 2; - break; case AF_INET: - return ip4tosbuf(ip->u.addr, buff, len); - break; + sz = ip4tosbuf(ip->u.addr, buff, len-1); + buff[sz] = '\0'; + return sz; default: LM_CRIT("unknown address family %d\n", ip->af); return 0;

1 0

git:master:68901fca: dispatcher: new option for rpc list command to print more attributes
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 68901fca96a2ebfa812dd2b2c857e020e08e7331 URL: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T08:23:59+02:00 dispatcher: new option for rpc list command to print more attributes --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… Patch: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index ccb8b1334a..8ae2fb7b68 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1587,6 +1587,7 @@ static const char *dispatcher_rpc_list_doc[2] = { #define DS_RPC_PRINT_NORMAL 1 #define DS_RPC_PRINT_SHORT 2 +#define DS_RPC_PRINT_FULL 3 /** * @@ -1604,6 +1605,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, int j; char c[3]; str data = STR_NULL; + char ipbuf[IP_ADDR_MAX_STRZ_SIZE]; if(!node) return 0; @@ -1644,11 +1646,26 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, else c[1] = 'X'; + if(rpc->struct_add(vh, "Ssd", "URI", &node->dlist[j].uri, "FLAGS", + c, "PRIORITY", node->dlist[j].priority) + < 0) { + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return -1; + } + + if(mode == DS_RPC_PRINT_FULL) { + ipbuf[0] = '\0'; + ip_addr2sbufz(&node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); + if(rpc->struct_add(vh, "Ssdd", "HOST", &node->dlist[j].host, + "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, + "PROTOID", (int)node->dlist[j].proto) < 0) { + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return -1; + } + } + if(mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s!=NULL) { - if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, - "FLAGS", c, - "PRIORITY", node->dlist[j].priority, - "ATTRS", &wh) < 0) { + if(rpc->struct_add(vh, "{", "ATTRS", &wh) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } @@ -1669,13 +1686,6 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1; } - } else { - if(rpc->struct_add(vh, "Ssd", "URI", &node->dlist[j].uri, "FLAGS", - c, "PRIORITY", node->dlist[j].priority) - < 0) { - rpc->fault(ctx, 500, "Internal error creating dest struct"); - return -1; - } } if (ds_ping_latency_stats) { if(rpc->struct_add(vh, "{", "LATENCY", &lh) < 0) { @@ -1722,6 +1732,8 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) if(n == 1) { if(smode.len==5 && strncasecmp(smode.s, "short", 5)==0) { vmode = DS_RPC_PRINT_SHORT; + } else if(smode.len==4 && strncasecmp(smode.s, "full", 4)==0) { + vmode = DS_RPC_PRINT_FULL; } }

1 0

git:master:bed923dd: core: helper function to get socket by listen string
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: bed923ddb92d9d7b694167f0276414373d3297c4 URL: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T17:00:02+02:00 core: helper function to get socket by listen string --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… Patch: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a60c4c5678..2b29d2b95c 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -844,6 +844,40 @@ socket_info_t* ksr_get_socket_by_name(str *sockname) return NULL; } +socket_info_t* ksr_get_socket_by_listen(str *sockstr) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->sock_str.s == NULL) { + continue; + } + LM_DBG("checking if listen %.*s matches %.*s\n", + sockstr->len, sockstr->s, + si->sock_str.len, si->sock_str.s); + if (sockstr->len == si->sock_str.len + && strncasecmp(sockstr->s, si->sock_str.s, + sockstr->len)==0) { + return si; + } + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 77baeb42fb..0b517de2de 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -104,6 +104,7 @@ struct socket_info* grep_sock_info_by_port(unsigned short port, struct socket_info* find_si(struct ip_addr* ip, unsigned short port, unsigned short proto); socket_info_t* ksr_get_socket_by_name(str *sockname); +socket_info_t* ksr_get_socket_by_listen(str *sockstr); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:1dfeba4a: corex: support matching on listen string for $lsock(...) variable
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: 1dfeba4aeed8cd76c630108b2363155eab07801c URL: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T17:20:02+02:00 corex: support matching on listen string for $lsock(...) variable --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… Patch: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 9fd1061184..b7575ec043 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -210,6 +210,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'n': si = ksr_get_socket_by_name(&lexpr.val); break; + case 'l': + si = ksr_get_socket_by_listen(&lexpr.val); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

1 0

git:master:507b8ab6: corex: new variable $lsock(expr) - get listen socket attributes
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: 507b8ab6e109e8b8ec231b2436324c534497c794 URL: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T14:02:10+02:00 corex: new variable $lsock(expr) - get listen socket attributes - the expr is an expression to match the socket and specify the field to return - example: "n/s1/listen" - match the socket with the n[ame] "s1" and return the listen address - wip --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_var.c Modified: src/modules/corex/corex_var.h --- Diff: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5… Patch: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5…

1 0

git:master:61b32b46: core: count and store global index for listen sockets at startup
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: 61b32b46afd7cc0a82f33aa3d92a5e76c4d87fee URL: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T13:54:59+02:00 core: count and store global index for listen sockets at startup --- Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… Patch: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 9205def123..c3f423123e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -110,6 +110,7 @@ typedef struct advertise_info { typedef struct socket_info { int socket; + int gindex; /* global index in the lists of all sockets */ str name; /* name - eg.: foo.bar or 10.0.0.1 */ struct ip_addr address; /* ip address */ str address_str; /*ip address converted to string -- optimization*/ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 500945a22a..a60c4c5678 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -762,6 +762,54 @@ struct socket_info* grep_sock_info(str* host, unsigned short port, return si; } +/** + * + */ +static int _ksr_sockets_no = 0; + +/** + * + */ +int ksr_sockets_no_get(void) +{ + return _ksr_sockets_no; +} + +/** + * + */ +void ksr_sockets_index(void) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + if(_ksr_sockets_no > 0) { + return; + } + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->sockname.s == NULL) { + continue; + } + si->gindex = _ksr_sockets_no; + _ksr_sockets_no++; + } + } while((c_proto = next_proto(c_proto))!=0); + + LM_DBG("number of listen sockets: %d\n", _ksr_sockets_no); +} + socket_info_t* ksr_get_socket_by_name(str *sockname) { socket_info_t *si = NULL; diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 50e4a063c1..77baeb42fb 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -163,4 +163,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r); unsigned int ipv6_get_netif_scope(char *ipval); +int ksr_sockets_no_get(void); +void ksr_sockets_index(void); + #endif diff --git a/src/main.c b/src/main.c index 016a90cabe..2a268a689b 100644 --- a/src/main.c +++ b/src/main.c @@ -2851,6 +2851,7 @@ int main(int argc, char** argv) fprintf(stderr, "failed to initialize list addresses\n"); goto error; } + ksr_sockets_index(); if (default_core_cfg.dns_try_ipv6 && !(socket_types & SOCKET_T_IPV6)){ /* if we are not listening on any ipv6 address => no point * to try to resovle ipv6 addresses */

1 0

least cost routing module activation error
by bayu p 06 Apr '22

06 Apr '22

Dear Kamailio Expert, I already add module lcr, but found error when searching pvar "ddn" inside source code core/pvapi.c at line 923, as shown error log captured below : Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/pvapi.c:923]: pv_parse_spec2(): error searching pvar "ddn" Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/pvapi.c:1126]: pv_parse_spec2(): wrong char [n/110] in [$ddn] at [3 (0)] Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: xlog [xlog.c:511]: xdbg_fixup_helper(): wrong format[Domain of destination: $ddn] Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:901 Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:903 Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:918 The question are, how to define correct "INVITE" methode (or correct format) inside route[LCR] which is already defined inside kamailio.cfg: route[LCR] { if (status=="200") { xlog("LCR: Inside the LCR routen"); } if(method=="INVITE") { xlog("We got an invite"); if(!load_gws(1, $rU, $var(caller_uri))) { xlog("Couldn't load gateways"); sl_send_reply("500", "Server Internal Error - Cannot load gateways"); exit; } else { xlog("GW Selected '$avp(i:709)'n"); xlog("Domain of destination: $ddn"); xlog("To URI: $tun"); } if(!next_gw()) { xlog("Couldn't proceed to next gateway"); sl_send_reply("503", "Service not available, no gateways found"); exit; } else { xlog("Calling the first matched gatewayn"); xlog("ruri_user_avp: '$avp(i:500)'n"); xlog("To URI after next_gw: $tun"); xlog("Request URI: $rUn"); } } } Kind Regards

1 0

git:master:b3bdfa61: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: b3bdfa61aabfaf4f546f899b2afe2d288a9849c5 URL: https://github.com/kamailio/kamailio/commit/b3bdfa61aabfaf4f546f899b2afe2d2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-05T21:16:16+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/b3bdfa61aabfaf4f546f899b2afe2d2… Patch: https://github.com/kamailio/kamailio/commit/b3bdfa61aabfaf4f546f899b2afe2d2… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 6f9146b8d6..ff24e03f26 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1569,11 +1569,14 @@ kamcmd dispatcher.set_duid_state ip 2 xyz 5.3. dispatcher.list - Lists the groups and included destinations. + Lists the routing groups with destination addresses and corresponding + attributes. Name: dispatcher.list - Parameters: none + Parameters: + * _rmode_ - (optional) response mode - can be 'short' to get a + shorter version of groups and destinations Example: kamcmd dispatcher.list

1 0

git:master:2e5b8167: dispatcher: option to get shorter result for rpc list command
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 2e5b81676c91f9c39ba8613f1116a7f8e0e06453 URL: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T18:11:50+02:00 dispatcher: option to get shorter result for rpc list command --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… Patch: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ff3307548..ccb8b1334a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1584,10 +1584,15 @@ static void dispatcher_rpc_reload(rpc_t *rpc, void *ctx) static const char *dispatcher_rpc_list_doc[2] = { "Return the content of dispatcher sets", 0}; + +#define DS_RPC_PRINT_NORMAL 1 +#define DS_RPC_PRINT_SHORT 2 + /** * */ -int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) +int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, + int mode) { int i = 0, rc = 0; void *rh; @@ -1604,7 +1609,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) return 0; for(; i < 2; ++i) { - rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle); + rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle, mode); if(rc != 0) return rc; } @@ -1639,7 +1644,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) else c[1] = 'X'; - if(node->dlist[j].attrs.body.s) { + if(mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s!=NULL) { if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, "FLAGS", c, "PRIORITY", node->dlist[j].priority, @@ -1709,6 +1714,16 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) { void *th; void *ih; + int n; + str smode; + int vmode = DS_RPC_PRINT_NORMAL; + + n = rpc->scan(ctx, "*S", &smode); + if(n == 1) { + if(smode.len==5 && strncasecmp(smode.s, "short", 5)==0) { + vmode = DS_RPC_PRINT_SHORT; + } + } ds_set_t *dslist = ds_get_list(); int dslistnr = ds_get_list_nr(); @@ -1729,7 +1744,7 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) return; } - ds_rpc_print_set(dslist, rpc, ctx, ih); + ds_rpc_print_set(dslist, rpc, ctx, ih, vmode); return; }

1 0

git:master:3f84e45e: dispatcher: docs updated for rpc dispatcher.list
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 3f84e45edc0d00866b76b7f35d569f02ff72eff2 URL: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T21:07:31+02:00 dispatcher: docs updated for rpc dispatcher.list --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… Patch: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 78523a7c1b..bcd0a49a71 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1923,12 +1923,19 @@ onreply_route { <function moreinfo="none">dispatcher.list</function> </title> <para> - Lists the groups and included destinations. + Lists the routing groups with destination addresses and corresponding + attributes. </para> <para> Name: <emphasis>dispatcher.list</emphasis> </para> - <para>Parameters: <emphasis>none</emphasis></para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>_rmode_ - (optional) response mode - can be 'short' to get a + shorter version of groups and destinations</para> + </listitem> + </itemizedlist> <para> Example: </para>

1 0

git:master:e680b6b7: dispatcher: option to do srv dns query for target addresses
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: e680b6b7f7fc33c98720b928b505e8ac96980186 URL: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T13:02:06+02:00 dispatcher: option to do srv dns query for target addresses --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a… Patch: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a…

1 0

git:master:03f844bb: dispatcher: fix compile error by previous commit pushing unsaved files
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 03f844bbe842107ad09cbf46bfcbff722e788937 URL: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T11:07:56+02:00 dispatcher: fix compile error by previous commit pushing unsaved files --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… Patch: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b770a02a40..c62f484b8f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3352,7 +3352,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, /* dst record using hotname with dns not done - no ip to match */ continue; } - if(ds_dns_mode != DS_DNS_MODE_ALWAYS) { + if(!(ds_dns_mode & DS_DNS_MODE_ALWAYS)) { ipa = &node->dlist[j].ip_address; } else { memcpy(hn, node->dlist[j].host.s, node->dlist[j].host.len); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 6a1b88c484..8ff3307548 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,7 +120,7 @@ int ds_hash_check_interval = 30; int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; -uint32_t ds_dns_mode = DS_DNS_INIT; +uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_mode_param = 0; str ds_outbound_proxy = STR_NULL;

1 0

git:master:bf6b1fef: dispatcher: turned ds_dns_mode values in bit flags
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: bf6b1feffeef81f43c9bffc75f7a1fbf5cd9caa7 URL: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T10:29:57+02:00 dispatcher: turned ds_dns_mode values in bit flags --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… Patch: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d59eebe23e..b770a02a40 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -111,7 +111,7 @@ extern float ds_latency_estimator_alpha; extern int ds_attrs_none; extern param_t *ds_db_extra_attrs_list; extern int ds_load_mode; -extern int ds_dns_mode; +extern uint32_t ds_dns_mode; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -486,7 +486,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /* Do a DNS-Lookup for the Host-Name, if not disabled via dst flags */ if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; - } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_TIMER) { + } else if (ds_dns_mode & (DS_DNS_MODE_INIT|DS_DNS_MODE_TIMER)) { he = resolvehost(hn); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 36e01e96ef..0d79386906 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -74,9 +74,9 @@ #define DS_IRMODE_NOIPADDR 1 -#define DS_DNS_MODE_INIT 0 -#define DS_DNS_MODE_ALWAYS 1 -#define DS_DNS_MODE_TIMER 2 +#define DS_DNS_MODE_INIT 1 +#define DS_DNS_MODE_ALWAYS (1<<1) +#define DS_DNS_MODE_TIMER (1<<2) /* clang-format on */ typedef struct ds_rctx { diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 6317334fba..6a1b88c484 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,7 +120,8 @@ int ds_hash_check_interval = 30; int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; -int ds_dns_mode = 0; +uint32_t ds_dns_mode = DS_DNS_INIT; +static int ds_dns_mode_param = 0; str ds_outbound_proxy = STR_NULL; @@ -297,7 +298,7 @@ static param_export_t params[]={ {"ds_db_extra_attrs", PARAM_STR, &ds_db_extra_attrs}, {"ds_load_mode", PARAM_INT, &ds_load_mode}, {"reload_delta", PARAM_INT, &ds_reload_delta }, - {"ds_dns_mode", PARAM_INT, &ds_dns_mode}, + {"ds_dns_mode", PARAM_INT, &ds_dns_mode_param}, {0,0,0} }; @@ -327,11 +328,7 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; - if(ds_dns_mode!=DS_DNS_MODE_INIT && ds_dns_mode!=DS_DNS_MODE_ALWAYS - && ds_dns_mode!=DS_DNS_MODE_TIMER) { - LM_ERR("invalid dns mode %d\n", ds_dns_mode); - return -1; - } + ds_dns_mode = 1U<<(unsigned int)ds_dns_mode_param; if(ds_ping_active_init() < 0) { return -1;

1 0

git:master:cdf8cb64: dispatcher: check valid values for ds_dns_mode
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: cdf8cb6444f3b3f9aeb76053edc05bf595d4a583 URL: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T07:54:15+02:00 dispatcher: check valid values for ds_dns_mode --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… Patch: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0ca8839c89..d59eebe23e 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -82,10 +82,6 @@ #define DS_HN_SIZE 256 -#define DS_DNS_MODE_INIT 0 -#define DS_DNS_MODE_ALWAYS 1 -#define DS_DNS_MODE_CACHE 2 - /* increment call load */ #define DS_LOAD_INC(dgrp, didx) do { \ lock_get(&(dgrp)->lock); \ @@ -490,7 +486,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /* Do a DNS-Lookup for the Host-Name, if not disabled via dst flags */ if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; - } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_CACHE) { + } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_TIMER) { he = resolvehost(hn); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index e360e67592..36e01e96ef 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -73,8 +73,12 @@ #define DS_XAVP_CTX_SKIP_CNT 1 #define DS_IRMODE_NOIPADDR 1 -/* clang-format on */ +#define DS_DNS_MODE_INIT 0 +#define DS_DNS_MODE_ALWAYS 1 +#define DS_DNS_MODE_TIMER 2 + +/* clang-format on */ typedef struct ds_rctx { int flags; int code; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 42b1a41aa8..6317334fba 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -327,6 +327,12 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; + if(ds_dns_mode!=DS_DNS_MODE_INIT && ds_dns_mode!=DS_DNS_MODE_ALWAYS + && ds_dns_mode!=DS_DNS_MODE_TIMER) { + LM_ERR("invalid dns mode %d\n", ds_dns_mode); + return -1; + } + if(ds_ping_active_init() < 0) { return -1; }

1 0

git:master:1b5b0aa9: dispatcher: added ds_dns_mode parameter
by Daniel-Constantin Mierla 04 Apr '22

04 Apr '22

Module: kamailio Branch: master Commit: 1b5b0aa94b82845995791a356b68ed6e1cbc3491 URL: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-04T19:34:55+02:00 dispatcher: added ds_dns_mode parameter - control when dns resolving is done for hostnames in target addresses from dispatcher groups (wip) --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6… Patch: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6…

1 0

git:master:5555e893: mqueue: use local variable to lock early only when needed
by Daniel-Constantin Mierla 04 Apr '22

04 Apr '22

Module: kamailio Branch: master Commit: 5555e893ea0997a7c71a3e424ef09c4570f122f6 URL: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-04T08:02:44+02:00 mqueue: use local variable to lock early only when needed --- Modified: src/modules/mqueue/mqueue_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Patch: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… --- diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 59421f6e2f..b38f0a1069 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -293,6 +293,7 @@ int mq_item_add(str *qname, str *key, str *val) mq_item_t *mi = NULL; mq_item_t *miter = NULL; mq_item_t *miter_prev = NULL; + int oplock = 0; int len; mh = mq_head_get(qname); @@ -301,9 +302,10 @@ int mq_item_add(str *qname, str *key, str *val) LM_ERR("mqueue not found: %.*s\n", qname->len, qname->s); return -1; } - - lock_get(&mh->lock); + if (mh->addmode == 1 || mh->addmode == 2) { + lock_get(&mh->lock); + oplock = 1; miter = mh->ifirst; miter_prev = mh->ifirst; while (miter) { @@ -344,7 +346,9 @@ int mq_item_add(str *qname, str *key, str *val) if(mi==NULL) { LM_ERR("no more shm to add to: %.*s\n", qname->len, qname->s); - lock_release(&mh->lock); + if(oplock) { + lock_release(&mh->lock); + } return -1; } memset(mi, 0, len); @@ -352,12 +356,15 @@ int mq_item_add(str *qname, str *key, str *val) memcpy(mi->key.s, key->s, key->len); mi->key.len = key->len; mi->key.s[key->len] = '\0'; - + mi->val.s = mi->key.s + mi->key.len + 1; memcpy(mi->val.s, val->s, val->len); mi->val.len = val->len; mi->val.s[val->len] = '\0'; + if(oplock==0) { + lock_get(&mh->lock); + } if(mh->ifirst==NULL) { mh->ifirst = mi;

1 0

git:master:c09daf26: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: c09daf26a58f23483c2b8cf1f40c990f20e4d215 URL: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T14:16:20+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/mqueue/README Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Patch: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990…

1 0

git:master:20559f64: ims_qos: removed angle brakets in the text
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 20559f647fee0dc46fef83f8f7782ec24a1f0b94 URL: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:04:27+02:00 ims_qos: removed angle brakets in the text --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Patch: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 3a72257f7d..0ff629e17e 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -388,7 +388,7 @@ modparam("ims_qos", "include_rtcp_fd", 1) <section> <title><varname>af_signaling_ip</varname> (String)</title> - <para>Set P-CSCF IPv4 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv4 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is 127.0.0.1</emphasis></para> @@ -407,7 +407,7 @@ modparam("ims_qos", "af_signaling_ip", "127.0.0.1") <section> <title><varname>af_signaling_ip6</varname> (String)</title> - <para>Set P-CSCF IPv6 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv6 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is ""</emphasis></para>

1 0

git:master:6da1a08b: stirshaken: docs - add missing end of section tag
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 6da1a08b12e162a5dd4cde90033f51e7b9d48656 URL: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:08:22+02:00 stirshaken: docs - add missing end of section tag --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… Patch: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index f54747d0cf..25434ff0b4 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -57,6 +57,7 @@ </itemizedlist> </para> </section> + </section> <section> <title>Parameters</title> <section>

1 0

git:master:2799782c: mqueue: add mqueue_mode modparam
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 2799782c530927de5db3c69df18b8248b8055ee2 URL: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:01:41+02:00 mqueue: add mqueue_mode modparam --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824… Patch: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824…

1 0

git:master:e2383b74: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: e2383b74f79107aed232ffb8e6a311c56f64ff46 URL: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T14:01:12+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c… Patch: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c…

1 0

[kamailio/kamailio] uac: fix shm leak (PR #3065)
by Stefan Mititelu 01 Apr '22

01 Apr '22

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Setup: uac_req_send() with evroute=2 and tm module enable_uac_fr=1 Noticed following shm errors while intensively testing uac_req_send(), happening quite soon after a fresh restart (e.g. 10 min): ``` kamailio[5384]: ERROR: <core> [core/mem/q_malloc.c:297]: qm_find_free(): qm_find_free(0x7fe8943bc000, 40632); Free fragment not found! kamailio[5384]: ERROR: <core> [core/mem/q_malloc.c:430]: qm_malloc(): qm_malloc(0x7fe8943bc000, 40632) called from uac: uac_send.c: uac_send_info_clone(105), module: uac; Free fragment not found! kamailio[5384]: ERROR: uac [uac_send.c:108]: uac_send_info_clone(): no more shm memory kamailio[5384]: ERROR: uac [uac_send.c:837]: uac_req_send(): cannot clone the uac structure ``` I tried monitoring system memory using `free` tool and noticed that the "used" memory didn't grow alot. However, I noticed the "buff/cached" memory had a steep growth when 200OK(s) started to come, for my setup. Noticed that, for my setup, when 200OK come, event_route[uac:reply] is not called, so the tm callback set by UAC module is not called. => the "tp" callback parameter shm allocated by UAC module is not freed. By analogy, when using uac_req_send() with evroute=1 and timeout happens (e.g. no reply comes), event_route[uac:reply] won't be called and same leak should happen => *i didn;t tested that*, was just an analogy. I updated the code to call the callback on TMCB_DESTROY, and make sure tp parameter is freed, *one time*. Let me know what you think of this... in my setup/tests I got no kamailio shm logs anymore. Also "buff/cached" memory didn't have that steep growth anymore. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3065 -- Commit Summary -- * uac: fix shm leak -- File Changes -- M src/modules/uac/uac_send.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3065.patch https://github.com/kamailio/kamailio/pull/3065.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3065 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3065(a)github.com>

3 4

git:master:1ff0a9c4: uac: fix shm leak
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 1ff0a9c4cee17a68a54c7002a528710ce85b96da URL: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:55:44+02:00 uac: fix shm leak --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… Patch: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 887dc1b4a4..be04464cae 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -717,14 +717,16 @@ void uac_resend_tm_callback(struct cell *t, int type, struct tmcb_params *ps) } tp = (uac_send_info_t*)(*ps->param); - if(tp->evroute!=0) { + if(tp->evroute!=0 && ps->code > 0) { uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, tp, ps->code); } done: - if(tp!=NULL) + if(tp!=NULL){ shm_free(tp); + *ps->param = NULL; + } return; } @@ -755,7 +757,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) } tp = (uac_send_info_t*)(*ps->param); - if(tp->evroute!=0) { + if(tp->evroute!=0 && ps->code > 0) { uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, tp, ps->code); } @@ -829,7 +831,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) uac_r.body = (tp->s_body.len <= 0) ? NULL : &tp->s_body; uac_r.ssock = (tp->s_sock.len <= 0) ? NULL : &tp->s_sock; uac_r.dialog = &tmdlg; - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED|TMCB_DESTROY; if(tp->evroute!=0) { /* Callback function */ uac_r.cb = uac_resend_tm_callback; @@ -849,8 +851,10 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) done: error: - if(tp!=NULL) + if(tp!=NULL){ shm_free(tp); + *ps->param = NULL; + } return; } @@ -890,13 +894,13 @@ int uac_req_send(void) { case 2: - uac_r.cb_flags = TMCB_ON_FAILURE; + uac_r.cb_flags = TMCB_ON_FAILURE|TMCB_DESTROY; /* Callback function */ uac_r.cb = uac_resend_tm_callback; break; case 1: default: - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED|TMCB_DESTROY; /* Callback function */ uac_r.cb = uac_send_tm_callback; break;

1 0

[kamailio/kamailio] ims_qos: Added new parameters for AAR, AVP517 (PR #3066)
by alexyosifov 01 Apr '22

01 Apr '22

- Added new parameters: af_signaling_ip6, component_media_type, flow_protocol, omit_flow_ports, rs_default_bandwidth, rr_default_bandwidth. Check doc for details.   #### 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) - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3066 -- Commit Summary -- * ims_qos: Added new parameters for AAR,AVP517 -- File Changes -- M src/modules/ims_qos/doc/ims_qos_admin.xml (134) M src/modules/ims_qos/ims_qos_mod.c (13) M src/modules/ims_qos/rx_aar.c (29) M src/modules/ims_qos/rx_avp.c (67) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3066.patch https://github.com/kamailio/kamailio/pull/3066.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3066 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3066(a)github.com>

2 2

git:master:5a85767e: ims_qos: Added new parameters for AAR, AVP517
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 5a85767ef3371dd6443e9cc0caebf3b68980dc07 URL: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b… Author: Aleksandar Yosifov <alexander.yosifov(a)circles.bz> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:54:38+02:00 ims_qos: Added new parameters for AAR,AVP517 - Added new parameters: af_signaling_ip6, component_media_type, flow_protocol, omit_flow_ports, rs_default_bandwidth, rr_default_bandwidth. Check doc for details. --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b… Patch: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b…

1 0

[kamailio/kamailio] stirshaken: fix doc typos (PR #3067)
by mrtrev 01 Apr '22

01 Apr '22

#### 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 - [ ] 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 Seems I managed to submit a corrupted doc file with my last PR. Tested it plenty this time and fixed a typo while I was at it. Also I see this is showing my previous PR as well. I'm not sure how to make it not do that. Any tips would be appreciated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3067 -- Commit Summary -- * stirshaken: Add PVs to allow access to x509 subject and ppt grants * Merge branch 'kamailio:master' into master * stirshaken: fix doc typos -- File Changes -- M src/modules/stirshaken/doc/stirshaken_admin.xml (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3067.patch https://github.com/kamailio/kamailio/pull/3067.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3067 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3067(a)github.com>

2 1

git:master:1986ac41: stirshaken: fix doc typos
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 1986ac41e38d2bd7600a19527cf00164876e77e3 URL: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016… Author: Trevor Peirce <trev(a)acrovoice.ca> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:52:31+02:00 stirshaken: fix doc typos --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016… Patch: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index 1e7c7001ef..f54747d0cf 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -275,8 +275,7 @@ modparam("stirshaken", "vs_certsubject_pvname", "$vn(certsubject)") </programlisting> </example> </section> - </section> - <section> + <section> <title><varname>vs_pptgrants_pvname</varname> (str)</title> <para> If vs_pptgrants_pvname is set then the JSON string of the authenticated PASSporT's grants will be written to this pseudo-variable when @@ -422,7 +421,7 @@ request_route { </para> <para> The parameters can contain pseudo-variables. - If origid is empty, an unique identifier will be generated wih libuuid, e.g. "3f31bd2b-9fc4-4084-b0b0-566506c46292". + If origid is empty, an unique identifier will be generated with libuuid, e.g. "3f31bd2b-9fc4-4084-b0b0-566506c46292". </para> <para> This function can be used from ANY_ROUTE.

1 0

git:master:58fde684: modules: readme files regenerated - evrexec ... [skip ci]
by Kamailio Dev 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 58fde6844ca5b6f98ca12693d59e22722635cf16 URL: https://github.com/kamailio/kamailio/commit/58fde6844ca5b6f98ca12693d59e227… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T09:01:22+02:00 modules: readme files regenerated - evrexec ... [skip ci] --- Modified: src/modules/evrexec/README --- Diff: https://github.com/kamailio/kamailio/commit/58fde6844ca5b6f98ca12693d59e227… Patch: https://github.com/kamailio/kamailio/commit/58fde6844ca5b6f98ca12693d59e227… --- diff --git a/src/modules/evrexec/README b/src/modules/evrexec/README index 4d80d4c006..059b8d7bea 100644 --- a/src/modules/evrexec/README +++ b/src/modules/evrexec/README @@ -104,7 +104,8 @@ Chapter 1. Admin Guide * wait - timer interval in micro-seconds to wait inside the dedicated process before executing the task. * sockaddr - full UDP socket address in format 'udp:ip:port' - (example: 'udp:127.0.0.1:54321'). + (example: 'udp:127.0.0.1:54321'). Received data is made available + in the event route via $evr(data). Default value is NULL. @@ -124,7 +125,7 @@ event_route[evrexec:timer] { } event_route[evrexec:udp] { - xinfo("udp socket data: [$evr(data)]\n"); + xinfo("udp socket data: [$evr(data)] from [$evr(srcip)]\n"); } ...

1 0

git:master:ba98cbb7: evrexec: docs update with variable example
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: ba98cbb78e0e2b9f4075bf548bb8e9bc3c3c8b48 URL: https://github.com/kamailio/kamailio/commit/ba98cbb78e0e2b9f4075bf548bb8e9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T08:50:16+02:00 evrexec: docs update with variable example --- Modified: src/modules/evrexec/doc/evrexec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba98cbb78e0e2b9f4075bf548bb8e9b… Patch: https://github.com/kamailio/kamailio/commit/ba98cbb78e0e2b9f4075bf548bb8e9b… --- diff --git a/src/modules/evrexec/doc/evrexec_admin.xml b/src/modules/evrexec/doc/evrexec_admin.xml index 565b33f560..a2bcfe1403 100644 --- a/src/modules/evrexec/doc/evrexec_admin.xml +++ b/src/modules/evrexec/doc/evrexec_admin.xml @@ -102,7 +102,8 @@ <listitem> <para> <emphasis>sockaddr</emphasis> - full UDP socket address in format - 'udp:ip:port' (example: 'udp:127.0.0.1:54321'). + 'udp:ip:port' (example: 'udp:127.0.0.1:54321'). Received data is + made available in the event route via $evr(data). </para> </listitem> @@ -129,7 +130,7 @@ event_route[evrexec:timer] { } event_route[evrexec:udp] { - xinfo("udp socket data: [$evr(data)]\n"); + xinfo("udp socket data: [$evr(data)] from [$evr(srcip)]\n"); } ...

1 0

git:master:22041301: evrexec: use structure of exec context attributes
by Daniel-Constantin Mierla 31 Mar '22

31 Mar '22

Module: kamailio Branch: master Commit: 220413010fa1e268501edd8808dc02fcc8b9d0d1 URL: https://github.com/kamailio/kamailio/commit/220413010fa1e268501edd8808dc02f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-30T17:28:29+02:00 evrexec: use structure of exec context attributes --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/220413010fa1e268501edd8808dc02f… Patch: https://github.com/kamailio/kamailio/commit/220413010fa1e268501edd8808dc02f… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 89a189c9c8..e3d131ff9f 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -52,7 +52,14 @@ typedef struct evrexec_task { evrexec_task_t *_evrexec_list = NULL; -static str *pv_evr_data = NULL; +typedef struct evrexec_info { + str data; + str srcip; + str srcport; + int srcportno; +} evrexec_info_t; + +static evrexec_info_t _evrexec_info = { 0 }; /** module functions */ static int mod_init(void); @@ -222,7 +229,6 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) struct sockaddr_storage src_addr; socklen_t src_addr_len; ssize_t count; - str evr_data = STR_NULL; char srchostval[NI_MAXHOST]; char srcportval[NI_MAXSERV]; @@ -282,9 +288,8 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) LM_DBG("received data from %s port %s\n", srchostval, srcportval); } - evr_data.s = rcvbuf; - evr_data.len = (int)count; - pv_evr_data = &evr_data; + _evrexec_info.data.s = rcvbuf; + _evrexec_info.data.len = (int)count; fmsg = faked_msg_next(); set_route_type(LOCAL_ROUTE); @@ -302,7 +307,7 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) LM_ERR("error running event route kemi callback\n"); } } - pv_evr_data = NULL; + memset(&_evrexec_info, 0, sizeof(evrexec_info_t)); } /* avoid exiting the process */ while(1) { sleep(3600); } @@ -412,13 +417,13 @@ int evrexec_param(modparam_t type, void *val) */ static int pv_get_evr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { - if(param==NULL || pv_evr_data==NULL) { + if(param==NULL || _evrexec_info.data.s==NULL) { return pv_get_null(msg, param, res); } switch(param->pvn.u.isname.name.n) { case 0: /* data */ - return pv_get_strval(msg, param, res, pv_evr_data); + return pv_get_strval(msg, param, res, &_evrexec_info.data); default: return pv_get_null(msg, param, res); } @@ -489,12 +494,12 @@ void rpc_evr_run(rpc_t *rpc, void *c) evr_data.len = strlen(evr_data.s); } - pv_evr_data = &evr_data; + _evrexec_info.data = evr_data; keng = sr_kemi_eng_get(); if(keng==NULL) { evr_id = route_lookup(&event_rt, evr_name.s); if(evr_id == -1) { - pv_evr_data = NULL; + memset(&_evrexec_info, 0, sizeof(evrexec_info_t)); LM_ERR("event route not found: %.*s\n", evr_name.len, evr_name.s); rpc->fault(c, 500, "Event route not found"); return; @@ -522,7 +527,7 @@ void rpc_evr_run(rpc_t *rpc, void *c) } } set_route_type(rtbk); - pv_evr_data = NULL; + memset(&_evrexec_info, 0, sizeof(evrexec_info_t)); } /**

1 0

git:master:0292cae2: evrexec: exposed src ip and port via variable
by Daniel-Constantin Mierla 31 Mar '22

31 Mar '22

Module: kamailio Branch: master Commit: 0292cae2812628e433cc07af6a45bf229e2ba708 URL: https://github.com/kamailio/kamailio/commit/0292cae2812628e433cc07af6a45bf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-31T08:23:58+02:00 evrexec: exposed src ip and port via variable --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0292cae2812628e433cc07af6a45bf2… Patch: https://github.com/kamailio/kamailio/commit/0292cae2812628e433cc07af6a45bf2… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index e3d131ff9f..253197d100 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -286,6 +286,11 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) NI_NUMERICHOST | NI_NUMERICSERV); if(ret == 0) { LM_DBG("received data from %s port %s\n", srchostval, srcportval); + _evrexec_info.srcip.s = srchostval; + _evrexec_info.srcip.len = strlen(_evrexec_info.srcip.s); + _evrexec_info.srcport.s = srcportval; + _evrexec_info.srcport.len = strlen(_evrexec_info.srcport.s); + str2sint(&_evrexec_info.srcport, &_evrexec_info.srcportno); } _evrexec_info.data.s = rcvbuf; @@ -424,6 +429,19 @@ static int pv_get_evr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) switch(param->pvn.u.isname.name.n) { case 0: /* data */ return pv_get_strval(msg, param, res, &_evrexec_info.data); + case 1: /* srcpip */ + if(_evrexec_info.srcip.s==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_evrexec_info.srcip); + case 2: /* srcport */ + if(_evrexec_info.srcport.s==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_evrexec_info.srcport); + case 3: /* srcportno */ + return pv_get_sintval(msg, param, res, _evrexec_info.srcportno); + default: return pv_get_null(msg, param, res); } @@ -445,6 +463,27 @@ static int pv_parse_evr_name(pv_spec_p sp, str *in) goto error; } break; + case 5: + if(strncmp(in->s, "srcip", 5)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else { + goto error; + } + break; + case 7: + if(strncmp(in->s, "srcport", 7)==0) { + sp->pvp.pvn.u.isname.name.n = 2; + } else { + goto error; + } + break; + case 9: + if(strncmp(in->s, "srcportno", 9)==0) { + sp->pvp.pvn.u.isname.name.n = 3; + } else { + goto error; + } + break; default: goto error; }

1 0

git:master:b81000ca: evrexec: log src ip and port
by Daniel-Constantin Mierla 30 Mar '22

30 Mar '22

Module: kamailio Branch: master Commit: b81000ca0f3332a00831ce9d6e774027beb4a605 URL: https://github.com/kamailio/kamailio/commit/b81000ca0f3332a00831ce9d6e77402… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-30T13:01:03+02:00 evrexec: log src ip and port --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b81000ca0f3332a00831ce9d6e77402… Patch: https://github.com/kamailio/kamailio/commit/b81000ca0f3332a00831ce9d6e77402… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 71e7c94921..89a189c9c8 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -223,6 +223,8 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) socklen_t src_addr_len; ssize_t count; str evr_data = STR_NULL; + char srchostval[NI_MAXHOST]; + char srcportval[NI_MAXSERV]; if(parse_protohostport(&it->sockaddr, &phostp)<0 || phostp.port==0 || phostp.host.len>62 || phostp.sport.len>5) { @@ -273,6 +275,13 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) } rcvbuf[count] = '\0'; + ret = getnameinfo((struct sockaddr *)&src_addr, src_addr_len, srchostval, + sizeof(srchostval), srcportval, sizeof(srcportval), + NI_NUMERICHOST | NI_NUMERICSERV); + if(ret == 0) { + LM_DBG("received data from %s port %s\n", srchostval, srcportval); + } + evr_data.s = rcvbuf; evr_data.len = (int)count; pv_evr_data = &evr_data;

1 0

[kamailio/kamailio] When using t_relay to convert sip message udp to tcp, the source port changes (Issue #3069)
by zhangyang 30 Mar '22

30 Mar '22

My cfg file is written like this ： $du = "sip:"+$rd+":"+$rp+";transport=tcp"; ![image](https://user-images.githubusercontent.com/16113837/160795856-945514d5-b36b-4b1a-95a1-41d60bf0de7a.png) when i use $du = "sip:"+$rd+":"+$rp+";transport=udp"; the sip message will be normal ![image](https://user-images.githubusercontent.com/16113837/160796099-0d498eb2-e6a8-4703-9f4a-0e7d9b069bef.png) excuse me, can you tell me the reason ? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3069 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3069(a)github.com>

2 3

[kamailio/kamailio] Kamailio 5.4.x dialog profiles functionality dead-lock on certain high-load scenarios (Issue #2923)
by Henning Westerholt 30 Mar '22

30 Mar '22

### Description The Kamailio 5.4.x dialog profiles functionality can lead to dead-lock on certain high-load scenarios. The Kamailio dialog profiles are used to track parallel channels for about 200 outgoing PSTN carrier interconnections. During high traffic times (like several thousands parallel calls) the Kamailio server will frequently (e.g. hourly) goes into an end-less loop while executing get_profile_size in the configuration script. This causes the locking for the dialog profiles never be released and Kamailio will stop serving traffic. Internal monitoring tools and RPC commands stay working, as long as they do not touch the dialog functionality. A similar (dedicated) Kamailio setup is used for tracking parallel channels for customers. Here the dead-lock is not observed that frequently, but aparentely also some crashes happens in a much longer time interval. ### Troubleshooting After analysis of the back-traces with GDB the get_profile_size() function was removed from the configuration script. After this change the crash did not happened anymore for several days. #### Reproduction Issue could not be reproduced so far. #### Debugging Data ##### bt 1 (some data removed) (gdb) bt \# 0 0x00007f57cf3b00da in get_profile_size (profile=0x7f50ccbc7e80, value=0x7ffd9928f300) at dlg_profile.c:859 n = 364 i = 12 ph = 0x7f50d3e4b7d0 \# 1 0x00007f57cf419c67 in w_get_profile_size_helper (msg=0x7f57d699d418, profile=0x7f50ccbc7e80, value=0x7ffd9928f300, spd=0x7f57d6916960) at dialog.c:941 \# 2 0x00007f57cf41a459 in w_get_profile_size3 (msg=0x7f57d699d418, profile=0x7f50ccbc7e80, value=0x7f57d6935118, result=0x7f57d6916960) at dialog.c:982 \# 3 0x0000000000463fea in do_action (h=0x7ffd99293610, a=0x7f57d6936488, msg=0x7f57d699d418) at core/action.c:1094 \# 4 0x00000000004711ee in run_actions (h=0x7ffd99293610, a=0x7f57d6936488, msg=0x7f57d699d418) at core/action.c:1581 \# 5 0x000000000046058b in do_action (h=0x7ffd99293610, a=0x7f57d690fda8, msg=0x7f57d699d418) at core/action.c:700 The first back-trace was taking from a running process with gdb. The counter in f0 does not increased that much during this time, probably due the overflow of the loop counter. ##### bt2 (analysis with data structure with gdb scripts) Here the loop counter in f0 showed a really high value. Expected size of dialog profiles hash table: (gdb) p profile->entries[3] $4 = {first = 0x7f9bfd4aad98, content = 2068} (gdb) p profile->entries[7] $3 = {first = 0x7f9c12079f70, content = 784} (gdb) p profile->entries[12] $6 = {first = 0x7f9c02be5d50, content = 7600} (gdb) p profile->entries[14] $2 = {first = 0x7f9bff636de8, content = 6764} hash table bucket 14 shows a lot of corruption and the loop never ends (carrier names and IPs replaced). The list for hash bucket 7 got linked to the list for hash bucket 14: counter 6755: prev 0x7f9c0b9dcde0 - current 0x7f9c02e5b378 - next 0x7f9c0a5f9ba0 - value carrier1-XX.XX - hash 14 counter 6756: prev 0x7f9c02e5b378 - current 0x7f9c0a5f9ba0 - next 0x7f9c0860b968 - value carrier1-XX.XX▒▒▒▒ - hash 14 counter 6757: prev 0x7f9c0a5f9ba0 - current 0x7f9c0860b968 - next 0x7f9bfe3f3a78 - value carrier1-XX.XX▒▒▒▒ - hash 14 counter 6758: prev 0x7f9c0860b968 - current 0x7f9bfe3f3a78 - next 0x7f9c10d977f0 - value carrier1-XX.XX - hash 14 counter 6759: prev 0x7f9bfe3f3a78 - current 0x7f9c10d977f0 - next 0x7f9c0ae198b0 - value carrier2-XX.XX▒▒▒▒ - hash 7 counter 6760: prev 0x7f9c10d977f0 - current 0x7f9c0ae198b0 - next 0x7f9c12079f70 - value carrier3-XX.XX - hash 7 counter 6761: prev 0x7f9c0ae198b0 - current 0x7f9c12079f70 - next 0x7f9c011f2540 - value-carrier2-XX.XX▒▒▒▒ - hash 7 counter 6762: prev 0x7f9c12079f70 - current 0x7f9c011f2540 - next 0x7f9bfff886f0 - value carrier2-XX.XX▒▒▒▒ - hash 7 counter 6763: prev 0x7f9c011f2540 - current 0x7f9bfff886f0 - next 0x7f9c05db00a8 - value carrier3-XX.XX= - hash 7 [...] counter 28270: prev 0x7f9c019d06e8 - current 0x7f9bfaf18290 - next 0x7f9c12c90680 - value carrier2-XX.XX▒▒▒▒ - hash 7 counter 28271: prev 0x7f9bfaf18290 - current 0x7f9c12c90680 - next 0x7f9c086a2b58 - value-carrier2-XX.XX▒▒▒▒ - hash 7 counter 28272: prev 0x7f9c12c90680 - current 0x7f9c086a2b58 - next 0x7f9c0b4f09e8 - value carrier2-XX.XX▒▒▒▒ - hash 7 [...] hash table bucket 7 is still consistent regarding the loop, but already shows initial sign of corruption. There is one item of the list for hash bucket 14 visible: counter 780: prev 0x7f9c0db57ac8 - current 0x7f9c02225700 - next 0x7f9bfbf7db08 - value carrier2-XX.XX▒▒▒▒ - hash 7 counter 781: prev 0x7f9c02225700 - current 0x7f9bfbf7db08 - next 0x7f9c10d977f0 - value carrier1-XX.XX- hash 14 counter 782: prev 0x7f9bfe3f3a78 - current 0x7f9c10d977f0 - next 0x7f9c0ae198b0 - value carrier2-XX.XX▒▒▒▒ - hash 7 counter 783: prev 0x7f9c10d977f0 - current 0x7f9c0ae198b0 - next 0x7f9c12079f70 - value carrier3-XX.XX - hash 7 total size of hash table is 784 #### Log Messages No special log messages observed. #### SIP Traffic SIP traffic looked ok during analysis of the core dumps. ### Possible Solutions * adding additional safe-guards for the get_profile_size function to not access data from other hash buckets * stopping the loop counter after some threshold * finding and fixing the source of the internal data corruption (obviously) * refactoring the dialog modules to use another approach for storing the dialog profile information ### Additional Information * **Kamailio version**: Kamailio 5.4.7, compiled from git repository * **Operating System**: CentOS 7.9 -- 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/2923

3 6

git:master:e792de60: modules: readme files regenerated - evrexec ... [skip ci]
by Kamailio Dev 30 Mar '22

30 Mar '22

Module: kamailio Branch: master Commit: e792de60d24386cdd3816b67d4778f4eba33b0f0 URL: https://github.com/kamailio/kamailio/commit/e792de60d24386cdd3816b67d4778f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-30T08:46:20+02:00 modules: readme files regenerated - evrexec ... [skip ci] --- Modified: src/modules/evrexec/README --- Diff: https://github.com/kamailio/kamailio/commit/e792de60d24386cdd3816b67d4778f4… Patch: https://github.com/kamailio/kamailio/commit/e792de60d24386cdd3816b67d4778f4… --- diff --git a/src/modules/evrexec/README b/src/modules/evrexec/README index f7363c4c43..4d80d4c006 100644 --- a/src/modules/evrexec/README +++ b/src/modules/evrexec/README @@ -57,11 +57,12 @@ Chapter 1. Admin Guide 1. Overview The module executes event route blocks or KEMI functions on dedicated - processes at startup. The execution can be delayed for a specified - interval of time. + processes at startup, upon an RPC command or data received on a custom + UDP socket. - The actions in the event route should be a loop or other tasks that run - forever. + For startup event route, the execution can be delayed for a specified + interval of time. The actions in the event route should be a loop or + other tasks that run forever. 2. Dependencies @@ -87,7 +88,8 @@ Chapter 1. Admin Guide The definition of an exec task. The value of the parameter must have the following format: - * "name=_string_;wait=_number_;workers=_number_" + * "name=_string_;wait=_number_;workers=_number_;sockaddr=_udp_socket_ + " The parameter can be set multiple times to get more exec tasks in same configuration file. @@ -97,15 +99,20 @@ Chapter 1. Admin Guide will retrieve the index of the works in string format. * workers - if set to 0 or 1 the task is executed in a dedicated process. Any number > 1 will create more dedicated processes, each - of them executing the task. + of them executing the startup task. For UDP data execution (when + 'sockaddr' is set), only 1 worker process is created. * wait - timer interval in micro-seconds to wait inside the dedicated process before executing the task. + * sockaddr - full UDP socket address in format 'udp:ip:port' + (example: 'udp:127.0.0.1:54321'). Default value is NULL. Example 1.1. Set exec parameter ... modparam("evrexec", "exec", "name=evrexec:timer;wait=1000;workers=1;") +modparam("evrexec", "exec", "name=evrexec:udp;sockaddr=udp:127.0.0.1:4444;worker +s=1;") ... event_route[evrexec:timer] { $var(x) = 0; @@ -115,6 +122,11 @@ event_route[evrexec:timer] { sleep("600"); } } + +event_route[evrexec:udp] { + xinfo("udp socket data: [$evr(data)]\n"); +} + ... 4. RPC Commands

1 0

git:master:b3f59ded: core: keep references to proto and port parts by parse_protohostport()
by Daniel-Constantin Mierla 30 Mar '22

30 Mar '22

Module: kamailio Branch: master Commit: b3f59ded7d5ea9b183e4d301ca2a69aaeb966e65 URL: https://github.com/kamailio/kamailio/commit/b3f59ded7d5ea9b183e4d301ca2a69a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-30T08:26:32+02:00 core: keep references to proto and port parts by parse_protohostport() --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/b3f59ded7d5ea9b183e4d301ca2a69a… Patch: https://github.com/kamailio/kamailio/commit/b3f59ded7d5ea9b183e4d301ca2a69a… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 00d7bdf289..500945a22a 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -2271,11 +2271,14 @@ int parse_protohostport(str* ins, sr_phostp_t *r) if (second) { /* 2 ':' found => check if valid */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto; + r->sproto.s = ins->s; + r->sproto.len = first-ins->s; tmp.s=second+1; tmp.len=(ins->s + ins->len) - tmp.s; if (str2int(&tmp, (unsigned int *)&(r->port))<0) goto error_port; + r->sport = tmp; r->host.s=first+1; r->host.len=(int)(second-r->host.s); @@ -2288,10 +2291,13 @@ int parse_protohostport(str* ins, sr_phostp_t *r) /* invalid port => it's proto:host */ if (parse_proto((unsigned char*)ins->s, first-ins->s, &r->proto)<0) goto error_proto; + r->sproto.s = ins->s; + r->sproto.len = first-ins->s; r->host.s=first+1; r->host.len=(int)(p-r->host.s); }else{ /* valid port => its host:port */ + r->sport = tmp; r->host.s=ins->s; r->host.len=(int)(first-r->host.s); } diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 4bf7b3e96c..50e4a063c1 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -151,8 +151,10 @@ inline static struct socket_info* get_first_socket(void) /* structure to break down 'proto:host:port' */ typedef struct _sr_phostp { + str sproto; int proto; str host; + str sport; int port; } sr_phostp_t;

1 0

git:master:a2d97f89: evrexec: execute event route on data received on a custom udp socket
by Daniel-Constantin Mierla 30 Mar '22

30 Mar '22

Module: kamailio Branch: master Commit: a2d97f897b5ee1cc550480af02af8d79b94a8ef3 URL: https://github.com/kamailio/kamailio/commit/a2d97f897b5ee1cc550480af02af8d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-30T08:27:12+02:00 evrexec: execute event route on data received on a custom udp socket --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a2d97f897b5ee1cc550480af02af8d7… Patch: https://github.com/kamailio/kamailio/commit/a2d97f897b5ee1cc550480af02af8d7…

1 0

git:master:a074608c: evrexec: docs for sockaddr attribute
by Daniel-Constantin Mierla 30 Mar '22

30 Mar '22

Module: kamailio Branch: master Commit: a074608ca41e70b21de27e050869883e70e13033 URL: https://github.com/kamailio/kamailio/commit/a074608ca41e70b21de27e050869883… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-30T08:40:45+02:00 evrexec: docs for sockaddr attribute --- Modified: src/modules/evrexec/doc/evrexec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a074608ca41e70b21de27e050869883… Patch: https://github.com/kamailio/kamailio/commit/a074608ca41e70b21de27e050869883… --- diff --git a/src/modules/evrexec/doc/evrexec_admin.xml b/src/modules/evrexec/doc/evrexec_admin.xml index bcd6af5f49..565b33f560 100644 --- a/src/modules/evrexec/doc/evrexec_admin.xml +++ b/src/modules/evrexec/doc/evrexec_admin.xml @@ -17,12 +17,13 @@ <title>Overview</title> <para> The module executes event route blocks or KEMI functions on dedicated - processes at startup. The execution can be delayed for a specified - interval of time. + processes at startup, upon an RPC command or data received on a custom + UDP socket. </para> <para> - The actions in the event route should be a loop or other tasks that - run forever. + For startup event route, the execution can be delayed for a specified + interval of time. The actions in the event route should be a loop or + other tasks that run forever. </para> </section> <section> @@ -66,7 +67,7 @@ <itemizedlist> <listitem> <para> - "name=_string_;wait=_number_;workers=_number_" + "name=_string_;wait=_number_;workers=_number_;sockaddr=_udp_socket_" </para> </listitem> </itemizedlist> @@ -88,7 +89,8 @@ <para> <emphasis>workers</emphasis> - if set to 0 or 1 the task is executed in a dedicated process. Any number > 1 will create more dedicated - processes, each of them executing the task. + processes, each of them executing the startup task. For UDP data + execution (when 'sockaddr' is set), only 1 worker process is created. </para> </listitem> <listitem> @@ -97,6 +99,13 @@ inside the dedicated process before executing the task. </para> </listitem> + <listitem> + <para> + <emphasis>sockaddr</emphasis> - full UDP socket address in format + 'udp:ip:port' (example: 'udp:127.0.0.1:54321'). + </para> + </listitem> + </itemizedlist> <para> <emphasis> @@ -108,6 +117,7 @@ <programlisting format="linespecific"> ... modparam("evrexec", "exec", "name=evrexec:timer;wait=1000;workers=1;") +modparam("evrexec", "exec", "name=evrexec:udp;sockaddr=udp:127.0.0.1:4444;workers=1;") ... event_route[evrexec:timer] { $var(x) = 0; @@ -117,6 +127,11 @@ event_route[evrexec:timer] { sleep("600"); } } + +event_route[evrexec:udp] { + xinfo("udp socket data: [$evr(data)]\n"); +} + ... </programlisting> </example>

1 0

[kamailio/kamailio] More than TCP 800 concurrent calls, slows Kamailio (LUA FILE API REQUESTS) (Issue #3068)
by giofrigo 29 Mar '22

29 Mar '22

### Description Hello Guys I am having this issue where kamailio is receiving requests from SIPp (we are currently testing the platform and doing QA) but if we do more than 800 concurrent calls kamailio starts failing and slowing the requests, The scenario is the following: I am sending 5000 calls at 100 CPS on TCP and I am having this route in the configuration file: ``` # Handle the calls to api route[CALL_API] { xlog("L_NOTICE"," Call request $var(call_request) method: $rm \n"); $var(loop_true)=1; while ($var(loop_true)) { if(!lua_run("call_request","$var(call_request)","$sht(token=>new_token)")) { xlog("L_NOTICE", "SCRIPT: failed to execute lua function!\n"); } if ($var(loop_true)){ sleep("1"); } } xlog("L_NOTICE", "SCRIPT: Sucess to execute lua function!\n"); } ``` So I am executing a LUA script for the requests and the API response will tell the destination of the call. At 800 concurrent calls, I can notice SLOWLINESS in the SIPp testing tool, and then I will start receiving 408 timeouts. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.8 (x86_64/linux) 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, 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` BUT KAMAILIO IS RUNNING IN A DOCKER CONTAINER Linux ip-10-10-0-27.us-west-1.compute.internal 4.14.246-187.474.amzn2.x86_64 #1 SMP Tue Sep 7 21:48:11 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` This sounds like a load issue or something because I believe there's a time that it's been added every time we hit the backend and wait for the response. any help will be appreciated Regards Gio -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3068 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3068(a)github.com>

2 3

git:master:d1bb4892: modules: readme files regenerated - stirshaken ... [skip ci]
by Kamailio Dev 29 Mar '22

29 Mar '22

Module: kamailio Branch: master Commit: d1bb4892c74062a0e4a6f932b76c1bdb3fa59ebb URL: https://github.com/kamailio/kamailio/commit/d1bb4892c74062a0e4a6f932b76c1bd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-29T20:01:24+02:00 modules: readme files regenerated - stirshaken ... [skip ci] --- Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/d1bb4892c74062a0e4a6f932b76c1bd… Patch: https://github.com/kamailio/kamailio/commit/d1bb4892c74062a0e4a6f932b76c1bd…

1 0

git:master:1989193a: stirshaken: docs - removed extra section ending tag
by Daniel-Constantin Mierla 29 Mar '22

29 Mar '22

Module: kamailio Branch: master Commit: 1989193a1ce22b06be0fef23e84e92084d9ecdc6 URL: https://github.com/kamailio/kamailio/commit/1989193a1ce22b06be0fef23e84e920… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-29T19:57:52+02:00 stirshaken: docs - removed extra section ending tag --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1989193a1ce22b06be0fef23e84e920… Patch: https://github.com/kamailio/kamailio/commit/1989193a1ce22b06be0fef23e84e920… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index 12032f83ba..1e7c7001ef 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -57,7 +57,6 @@ </itemizedlist> </para> </section> - </section> <section> <title>Parameters</title> <section>

1 0

git:master:68bb7859: modules: readme files regenerated - stirshaken ... [skip ci]
by Kamailio Dev 25 Mar '22

25 Mar '22

Module: kamailio Branch: master Commit: 68bb785914a8f2efef678974e845e7e7a36382ea URL: https://github.com/kamailio/kamailio/commit/68bb785914a8f2efef678974e845e7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-25T13:16:25+01:00 modules: readme files regenerated - stirshaken ... [skip ci] --- Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/68bb785914a8f2efef678974e845e7e… Patch: https://github.com/kamailio/kamailio/commit/68bb785914a8f2efef678974e845e7e…

1 0

[kamailio/kamailio] stirshaken: Add PVs to allow access to x509 subject and ppt grants (PR #3063)
by mrtrev 25 Mar '22

25 Mar '22

- added vs_certsubject_pvname and vs_pptgrants_pvname config params - adjusted log level of load/unload events   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3063 -- Commit Summary -- * stirshaken: Add PVs to allow access to x509 subject and ppt grants -- File Changes -- M src/modules/stirshaken/doc/stirshaken_admin.xml (41) M src/modules/stirshaken/stirshaken_mod.c (72) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3063.patch https://github.com/kamailio/kamailio/pull/3063.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3063 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3063(a)github.com>

2 4

git:master:363b9da8: stirshaken: Add PVs to allow access to x509 subject and ppt grants
by Daniel-Constantin Mierla 25 Mar '22

25 Mar '22

Module: kamailio Branch: master Commit: 363b9da8516ee56b9892f760b24c531c19cee3b5 URL: https://github.com/kamailio/kamailio/commit/363b9da8516ee56b9892f760b24c531… Author: Trevor Peirce <trev(a)acrovoice.ca> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-25T13:12:37+01:00 stirshaken: Add PVs to allow access to x509 subject and ppt grants - added vs_certsubject_pvname and vs_pptgrants_pvname config params - adjusted log level of load/unload events --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml Modified: src/modules/stirshaken/stirshaken_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/363b9da8516ee56b9892f760b24c531… Patch: https://github.com/kamailio/kamailio/commit/363b9da8516ee56b9892f760b24c531…

1 0

[kamailio/kamailio] siptrace: add direction attribute to exported by module pseudo-variable (PR #3061)
by Dennis 24 Mar '22

24 Mar '22

- Add direction attribute to event route siptrace pseudo-variable.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3061 -- Commit Summary -- * siptrace: add direction attribute to exported by module pseudo-variable -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3061.patch https://github.com/kamailio/kamailio/pull/3061.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3061 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3061(a)github.com>

2 2

git:master:2f9c0c4d: siptrace: add direction attribute to exported by module pseudo-variable
by Daniel-Constantin Mierla 24 Mar '22

24 Mar '22

Module: kamailio Branch: master Commit: 2f9c0c4d2b6551bb0f8f1915d2585d96c3bca8cb URL: https://github.com/kamailio/kamailio/commit/2f9c0c4d2b6551bb0f8f1915d2585d9… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-24T14:08:09+01:00 siptrace: add direction attribute to exported by module pseudo-variable - Add direction attribute to event route siptrace pseudo-variable. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2f9c0c4d2b6551bb0f8f1915d2585d9… Patch: https://github.com/kamailio/kamailio/commit/2f9c0c4d2b6551bb0f8f1915d2585d9… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 95c9b8ac7a..9540e83d06 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2601,6 +2601,8 @@ int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &host); case 9: /* dst_hostip */ return pv_get_strval(msg, param, res, &host); + case 10: /* direction */ + return pv_get_strzval(msg, param, res, siptrace_event_data->dir); default: LM_ERR("unexpected config param\n"); return pv_get_null(msg, param, res); @@ -2644,6 +2646,8 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "dst_hostip", 10)==0) sp->pvp.pvn.u.isname.name.n = 9; + else if(strncmp(in->s, "direction", 10)==0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; default:

1 0

licensing of videos and images from Kamailio World?
by Daniel Pocock 24 Mar '22

24 Mar '22

There are various pages about the videos from Kamailio World but nothing there about the license... https://www.kamailio.org/w/2020/09/kamailio-world-2020-online-video-recordi… https://www.youtube.com/c/KamailioWorld/ There is a fair use doctrine that people can generally use a screenshot or extract from copyrighted material but it is better to have some explicit statement there. Could anybody please clarify this and update the web page? There are two details required: 1. Who owns the copyright? By default, the name of the volunteer(s) who recorded the videos or if the work was done under contract, was copyright transferred to Kamailio, Asipto or anybody else? 2. Which license? The CC BY SA 4.0 license might be a good choice consistent with existing Kamailio licensing: BY: must credit the original work (Kamailio or volunteer) SA: (ShareAlike) - derivative works must also be CC BY SA (viral effect, like the GPL used for Kamailio itself) https://creativecommons.org/choose/ I suspect that many speakers are motivated to use their videos in some commercial context and may not be keen to apply the No Derivatives (ND) or Non-Commercial (NC) constraints from Creative Commons. Thanks to those who produced and shared these works for the community. Regards, Daniel -- https://danielpocock.com

3 7

git:master:8d5d5a87: etc/kamailio.cfg: add return to root blocks
by Daniel-Constantin Mierla 24 Mar '22

24 Mar '22

Module: kamailio Branch: master Commit: 8d5d5a872c0bafa2e591b69fa5d8c17179e1e4a4 URL: https://github.com/kamailio/kamailio/commit/8d5d5a872c0bafa2e591b69fa5d8c17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-24T11:10:32+01:00 etc/kamailio.cfg: add return to root blocks - make it more explicit for returned code --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/8d5d5a872c0bafa2e591b69fa5d8c17… Patch: https://github.com/kamailio/kamailio/commit/8d5d5a872c0bafa2e591b69fa5d8c17… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 56c1ea791e..2333eacacc 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -567,6 +567,8 @@ request_route { # user location service route(LOCATION); + + return; } # Wrapper for relaying requests @@ -1002,6 +1004,7 @@ route[TOVOICEMAIL] { branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); + return; } # Manage incoming replies @@ -1010,6 +1013,7 @@ reply_route { xlog("Malformed SIP response from $si:$sp\n"); drop; } + return; } # Manage incoming replies in transaction context @@ -1018,6 +1022,7 @@ onreply_route[MANAGE_REPLY] { if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } + return; } # Manage failure routing cases @@ -1051,4 +1056,5 @@ failure_route[MANAGE_FAILURE] { exit; } #!endif + return; }

1 0

bug in tm module?
by dpaape＠frontier.com 23 Mar '22

23 Mar '22

Hello I'm running K5.5.3 and have checked the 'issues' link in github and saw nothing regarding what I am seeing. I think that there is a bug in the tm module with respect to the "tm:local-response" event route. In the "t_reply.c" file, there is a static variable called '_tm_local_response_set_lookup'. This variable is initialized at load time to zero. It is checked in the '_reply_light()' routine and will initiate a local callback from the config script if "armed". The problem as I see it is that if the callback is readied, the variable is set to one. But it is never reset.So the practical outworking is as follows. A register is received and the request_route arms the callback. The register requires an authorization (local database sqlite). After the 401 is sent back, the callback via the module event route is called as expected. All good except that the module event route script fragment is never executed again after the first call.I'm no expert on the tm module but I would think that somewhere in there, the variable should be reset to zero so that subsequent transactions can initiate the event route again. thanks for any help,Dan

1 0

[kamailio/kamailio] core parsing of SIP message failed (Issue #3062)
by soroshsabz 22 Mar '22

22 Mar '22

ITNOA ### Description I try to connect Kamailio and Freeswitch together, and initiate call from Zoiper5 soft phone through Kamailio My Kamailio config is below ``` #!ifdef ACCDB_COMMENT ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default ''; ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT ''; ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif ####### Include Local Config If Exists ######### import_file "kamailio-local.cfg" ####### Defined Values ######### # *** Value defines - IDs used later in config #!ifdef WITH_DEBUG #!define DBGLEVEL 3 #!else #!define DBGLEVEL 2 #!endif #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!trydef DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!ifdef WITH_MULTIDOMAIN # - the value for 'use_domain' parameters #!define MULTIDOMAIN 1 #!else #!define MULTIDOMAIN 0 #!endif # - flags # FLT_ - per transaction (message) flags # FLB_ - per branch flags #!define FLT_ACC 1 #!define FLT_ACCMISSED 2 #!define FLT_ACCFAILED 3 #!define FLT_NATS 5 #!define FLB_NATB 6 #!define FLB_NATSIPPING 7 ####### Global Parameters ######### /* LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR, ... */ debug=DBGLEVEL /* set to 'yes' to print log messages to terminal or use '-E' cli option */ log_stderror=yes memdbg=5 memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes for each UDP socket * - value inherited by tcp_children and sctp_children when not set explicitely */ children=8 /* uncomment the next line to disable TCP (default on) */ disable_tcp=yes /* number of SIP routing processes for all TCP/TLS sockets */ # tcp_children=8 /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ auto_aliases=no /* add local domain aliases - it can be set many times */ # alias="sip.mydomain.com" /* listen sockets - if none set, Kamailio binds to all local IP addresses * - basic prototype (full prototype can be found in Wiki - Core Cookbook): * listen=[proto]:[localip]:[lport] advertise [publicip]:[pport] * - it can be set many times to add more sockets to listen to */ listen=udp:172.28.72.99:5060 advertise 172.28.72.99:5060 #listen=tcp:172.28.72.99:5060 /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif #!ifdef WITH_TLS enable_tls=no /* upper limit for TLS connections */ tls_max_connections=2048 #!endif /* set it to yes to enable sctp and load sctp.so module */ enable_sctp=no ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description * Access: $sel(cfg_get.group.id) or @cfg_get.group.id */ #!ifdef WITH_PSTN /* PSTN GW Routing * * - pstn.gw_ip: valid IP or hostname as string value, example: * pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" * * - by default is empty to avoid misrouting */ pstn.gw_ip = "" desc "PSTN GW Address" pstn.gw_port = "" desc "PSTN GW Port" #!endif #!ifdef WITH_VOICEMAIL /* VoiceMail Routing on offline, busy or no answer * * - by default Voicemail server IP is empty to avoid misrouting */ voicemail.srv_ip = "" desc "VoiceMail IP Address" voicemail.srv_port = "5060" desc "VoiceMail Port" #!endif ####### Modules Section ######## /* set paths to location of modules */ # mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" #!ifdef WITH_MYSQL loadmodule "db_mysql.so" #!endif #!ifdef WITH_JSONRPC loadmodule "xhttp.so" #!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "textopsx.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" #!ifdef WITH_IPAUTH loadmodule "permissions.so" #!endif #!endif #!ifdef WITH_ALIASDB loadmodule "alias_db.so" #!endif #!ifdef WITH_SPEEDDIAL loadmodule "speeddial.so" #!endif #!ifdef WITH_MULTIDOMAIN loadmodule "domain.so" #!endif #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif #!ifdef WITH_NAT loadmodule "nathelper.so" #!ifdef WITH_RTPENGINE loadmodule "rtpengine.so" #!else loadmodule "rtpproxy.so" #!endif #!endif #!ifdef WITH_TLS loadmodule "tls.so" #!endif #!ifdef WITH_ANTIFLOOD loadmodule "htable.so" loadmodule "pike.so" #!endif #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC fifo control file */ # modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") #!ifdef WITH_JSONRPC modparam("jsonrpcs", "transport", 7) #!endif # ----- ctl params ----- /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/run/kamailio/kamailio_ctl") # ----- sanity params ----- modparam("sanity", "autodrop", 0) # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) # ----- rr params ----- # set next param to 1 to add value to ;lr param (helps with some UAs) modparam("rr", "enable_full_lr", 0) # do not append from tag to the RR (no need for this script) modparam("rr", "append_fromtag", 0) # ----- registrar params ----- modparam("registrar", "method_filtering", 1) /* uncomment the next line to disable parallel forking via location */ # modparam("registrar", "append_branches", 0) /* uncomment the next line not to allow more than 10 contacts per AOR */ # modparam("registrar", "max_contacts", 10) /* max value for expires of registrations */ modparam("registrar", "max_expires", 3600) /* set it to 1 to enable GRUU */ modparam("registrar", "gruu_enabled", 0) /* set it to 0 to disable Path handling */ modparam("registrar", "use_path", 1) /* save Path even if not listed in Supported header */ modparam("registrar", "path_mode", 0) # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) /* by default ww do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) /* account triggers (flags) */ modparam("acc", "log_flag", FLT_ACC) modparam("acc", "log_missed_flag", FLT_ACCMISSED) modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) /* enhanced DB accounting */ #!ifdef WITH_ACCDB modparam("acc", "db_flag", FLT_ACC) modparam("acc", "db_missed_flag", FLT_ACCMISSED) modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") #!endif # ----- usrloc params ----- modparam("usrloc", "timer_interval", 60) modparam("usrloc", "timer_procs", 1) modparam("usrloc", "use_domain", MULTIDOMAIN) /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) #!endif # ----- auth_db params ----- #!ifdef WITH_AUTH modparam("auth_db", "db_url", DBURL) modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") modparam("auth_db", "use_domain", MULTIDOMAIN) # ----- permissions params ----- #!ifdef WITH_IPAUTH modparam("permissions", "db_url", DBURL) modparam("permissions", "db_mode", 1) #!endif #!endif # ----- alias_db params ----- #!ifdef WITH_ALIASDB modparam("alias_db", "db_url", DBURL) modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif # ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) #!endif # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) /* register callback to match myself condition with domains list */ modparam("domain", "register_myself", 1) #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) #!endif #!ifdef WITH_NAT #!ifdef WITH_RTPENGINE # ----- rtpengine params ----- modparam("rtpengine", "rtpengine_sock", "udp:127.0.0.1:2223") #!else # ----- rtpproxy params ----- modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") #!endif # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@kamailio.org") # params needed for NAT traversal in other modules modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") modparam("usrloc", "nat_bflag", FLB_NATB) #!endif #!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "config", "/etc/kamailio/tls.cfg") #!endif #!ifdef WITH_ANTIFLOOD # ----- pike params ----- modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) # ----- htable params ----- /* ip ban htable with autoexpire after 5 minutes */ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) modparam("debugger", "log_level_name", "exec") #!endif ####### Routing Logic ######## /* Main SIP request routing logic * - processing of any incoming SIP request starts with this route * - note: this is the same as route { ... } */ request_route { # per request initial checks # route(REQINIT); # NAT detection #route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle retransmissions if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } if (is_method("REGISTER")) { xdbg("request from gggggggggggggggggggggggggggggggggggggggggg - $rm from $fu (IP:$si:$sp)\n"); } rewritehostport("172.28.69.52:5060"); # handle requests within SIP dialogs # route(WITHINDLG); ### only initial requests (no To tag) # authentication # route(AUTH); # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers #remove_hf("Route"); #if (is_method("INVITE|SUBSCRIBE")) { # record_route(); #} # account only INVITEs #if (is_method("INVITE")) { # setflag(FLT_ACC); # do accounting #} # dispatch requests to foreign domains #route(SIPOUT); ### requests for my local domains # handle presence related requests #route(PRESENCE); # handle registrations # route(REGISTRAR); #if ($rU==$null) { # # request with no Username in RURI # sl_send_reply("484","Address Incomplete"); # exit; #} # dispatch destinations to PSTN #route(PSTN); # user location service #route(LOCATION); } # Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests # - serial forking, RTP relaying handling, a.s.o. if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) { if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH"); } if (is_method("INVITE|SUBSCRIBE|UPDATE")) { if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); } if (is_method("INVITE")) { if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { sl_reply_error(); } exit; } # Per SIP request initial checks route[REQINIT] { # no connect for sending replies set_reply_no_connect(); # enforce symmetric signaling # - send back replies to the source address of request force_rport(); #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { if($sht(ipban=>$si)!=$null) { # ip is already blocked xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n"); exit; } if (!pike_check_req()) { xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n"); $sht(ipban=>$si) = 1; exit; } } #!endif if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; } if(is_method("OPTIONS") && uri==myself && $rU==$null) { sl_send_reply("200","Keepalive"); exit; } if(!sanity_check("17895", "7")) { xlog("Malformed SIP request from $si:$sp\n"); exit; } } # Handle requests within SIP dialogs route[WITHINDLG] { if (!has_totag()) return; # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { route(DLGURI); if (is_method("BYE")) { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); } else if ( is_method("NOTIFY") ) { # Add Record-Route for in-dialog NOTIFY as per RFC 6665. record_route(); } route(RELAY); exit; } if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); exit; } if ( is_method("ACK") ) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 from upstream server route(RELAY); exit; } else { # ACK without matching transaction ... ignore and discard exit; } } sl_send_reply("404","Not here"); exit; } # Handle SIP registrations route[REGISTRAR] { if (!is_method("REGISTER")) return; if(isflagset(FLT_NATS)) { setbflag(FLB_NATB); #!ifdef WITH_NATSIPPING # do SIP NAT pinging setbflag(FLB_NATSIPPING); #!endif } if (!save("location")) { sl_reply_error(); } exit; } # User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") { if(sd_lookup("speed_dial")) { route(SIPOUT); } } #!endif #!ifdef WITH_ALIASDB # search in DB-based aliases if(alias_db_lookup("dbaliases")) { route(SIPOUT); } #!endif $avp(oexten) = $rU; if (!lookup("location")) { $var(rc) = $rc; route(TOVOICEMAIL); t_newtran(); switch ($var(rc)) { case -1: case -3: send_reply("404", "Not Found"); exit; case -2: send_reply("405", "Method Not Allowed"); exit; } } # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } route(RELAY); exit; } # Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") { route(TOVOICEMAIL); # returns here if no voicemail server is configured sl_send_reply("404", "No voicemail service"); exit; } #!ifdef WITH_PRESENCE #!ifdef WITH_MSGREBUILD # apply changes in case the request headers or body were modified msg_apply_changes(); #!endif if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif # if presence enabled, this part will not be executed if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } # IP authorization and user authentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } #!endif if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header if(!is_method("REGISTER|PUBLISH")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!else # authentication not enabled - do not relay at all to foreign networks if(uri!=myself) { sl_send_reply("403","Not relaying"); exit; } #!endif return; } # Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT if (nat_uac_test("19")) { if (is_method("REGISTER")) { fix_nated_register(); } else { if(is_first_hop()) { set_contact_alias(); } } setflag(FLT_NATS); } #!endif return; } # RTPProxy control and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { if(has_totag()) { if(check_route_param("nat=yes")) { setbflag(FLB_NATB); } } } if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) return; #!ifdef WITH_RTPENGINE if(nat_uac_test("8")) { rtpengine_manage("replace-origin replace-session-connection"); } else { rtpengine_manage("trust-address replace-origin replace-session-connection"); } #!else if(nat_uac_test("8")) { rtpproxy_manage("co"); } else { rtpproxy_manage("cor"); } #!endif if (is_request()) { if (!has_totag()) { if(t_is_branch_route()) { add_rr_param(";nat=yes"); } } } if (is_reply()) { if(isbflagset(FLB_NATB)) { if(is_first_hop()) set_contact_alias(); } } if(isbflagset(FLB_NATB)) { # no connect message in a dialog involving NAT traversal if (is_request()) { if(has_totag()) { set_forward_no_connect(); } } } #!endif return; } # URI update for dialog requests route[DLGURI] { #!ifdef WITH_NAT if(!isdsturiset()) { handle_ruri_alias(); } #!endif return; } # Routing to foreign domains route[SIPOUT] { if (uri==myself) return; append_hf("P-Hint: outbound\r\n"); route(RELAY); exit; } # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN # check if PSTN GW IP is defined if (strempty($sel(cfg_get.pstn.gw_ip))) { xlog("SCRIPT: PSTN routing enabled but pstn.gw_ip not defined\n"); return; } # route to PSTN dialed numbers starting with '+' or '00' # (international format) # - update the condition to match your dialing rules for PSTN routing if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) return; # only local users allowed to call if(from_uri!=myself) { sl_send_reply("403", "Not Allowed"); exit; } # normalize target number for pstn gateway # - convert leading 00 to + if (starts_with("$rU", "00")) { strip(2); prefix("+"); } if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":" + $sel(cfg_get.pstn.gw_port); } route(RELAY); exit; #!endif return; } # JSONRPC over HTTP(S) routing #!ifdef WITH_JSONRPC event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if(src_ip!=127.0.0.1) { xhttp_reply("403", "Forbidden", "text/html", "<html><body>Not allowed from $si</body></html>"); exit; } if ($hu =~ "^/RPC") { jsonrpc_dispatch(); exit; } xhttp_reply("200", "OK", "text/html", "<html><body>Wrong URL $hu</body></html>"); exit; } #!endif # Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) return; # check if VoiceMail server IP is defined if (strempty($sel(cfg_get.voicemail.srv_ip))) { xlog("SCRIPT: VoiceMail routing enabled but IP not defined\n"); return; } if(is_method("INVITE")) { if($avp(oexten)==$null) return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } else { if($rU==$null) return; $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip) + ":" + $sel(cfg_get.voicemail.srv_port); } route(RELAY); exit; #!endif return; } # Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); } # Manage incoming replies reply_route { if(!sanity_check("17604", "6")) { xlog("Malformed SIP response from $si:$sp\n"); drop; } } # Manage incoming replies in transaction context onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") { route(NATMANAGE); } } # Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) exit; #!ifdef WITH_BLOCK3XX # block call redirect based on 3xx replies. if (t_check_status("3[0-9][0-9]")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_BLOCK401407 # block call redirect based on 401, 407 replies. if (t_check_status("401|407")) { t_reply("404","Not found"); exit; } #!endif #!ifdef WITH_VOICEMAIL # serial forking # - route to voicemail on busy or no answer (timeout) if (t_check_status("486|408")) { $du = $null; route(TOVOICEMAIL); exit; } #!endif } ``` As you can see I just one thing in `request_route` ``` request_route { # per request initial checks # route(REQINIT); # NAT detection #route(NATDETECT); # CANCEL processing if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } exit; } # handle retransmissions if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } if (is_method("REGISTER")) { xdbg("request from gggggggggggggggggggggggggggggggggggggggggg - $rm from $fu (IP:$si:$sp)\n"); } rewritehostport("172.28.69.52:5060"); ``` The `172.28.69.52` is ip of my Freeswitch After I try to call from Zoiper5, I get below error in Kamailio log and Zoiper does not work. ``` 4(10) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 4(10) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) ``` ### Troubleshooting #### Reproduction * pull official Kamailio docker image `kamailio/kamailio 5.4.6-buster` * then run below command ``` docker run --net=host --name kamailio \ -v /home/ssoroosh/kamailio:/etc/kamailio \ kamailio/kamailio:5.4.6-buster ``` #### Debugging Data I do not have any debug data #### Log Messages ``` Listening on udp: 172.28.72.99 [172.28.72.99]:5060 advertise 172.28.72.99:5060 Aliases: 0(1) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(1) INFO: rr [rr_mod.c:185]: mod_init(): outbound module not available 0(1) INFO: <core> [main.c:2919]: main(): processes (at least): 16 - shm size: 67108864 - pkg size: 8388608 0(1) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(1) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 13(19) INFO: jsonrpcs [jsonrpcs_sock.c:443]: jsonrpc_dgram_process(): a new child 0/19 15(21) INFO: ctl [io_listener.c:210]: io_listen_loop(): io_listen_loop: using epoll_lt as the io watch method (auto detected) 2(8) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 2(8) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 2(8) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<�> 2(8) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 4(10) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 4(10) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 4(10) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 4(10) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 1(7) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 1(7) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 1(7) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 1(7) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 3(9) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 3(9) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 3(9) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 3(9) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 5(11) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 5(11) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 5(11) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 5(11) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 8(14) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 8(14) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 8(14) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 8(14) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 1(7) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 1(7) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 1(7) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 1(7) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 5(11) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 5(11) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 5(11) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 5(11) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 4(10) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 4(10) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 4(10) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 4(10) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 5(11) INFO: <core> [core/parser/parse_fline.c:156]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 5(11) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 0) 5(11) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 5(11) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 6(12) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 6(12) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<�> 6(12) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 7(13) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 7(13) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 7(13) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 8(14) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 8(14) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 8(14) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 2(8) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 2(8) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 2(8) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 4(10) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 4(10) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 4(10) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 1(7) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 1(7) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 1(7) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 3(9) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 3(9) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 3(9) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 5(11) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 5(11) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 5(11) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 6(12) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 6(12) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 6(12) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) 7(13) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 41) 7(13) ERROR: <core> [core/parser/msg_parser.c:681]: parse_msg(): ERROR: parse_msg: message=<��> 7(13) ERROR: <core> [core/receive.c:310]: receive_msg(): core parsing of SIP message failed (172.28.64.1:51370/1) ``` #### SIP Traffic My pcap is attached [sip.zip](https://github.com/kamailio/kamailio/files/8326814/sip.zip) ### Possible Solutions I have not any solution yet. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.6 (x86_64/linux) 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, 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**: ``` Linux master 5.4.0-104-generic #118-Ubuntu SMP Wed Mar 2 19:02:41 UTC 2022 x86_64 GNU/Linux root@master:/home# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3062 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3062(a)github.com>

2 3

[kamailio/kamailio] siptrace: fix pkg memory leak when module configured with core callbacks (PR #3059)
by Dennis 22 Mar '22

22 Mar '22

- Correctly freeng pkg memory in core callbacks when body modifications take place with X-Siptrace headers, also fix potential pkg_free with not dynamicaly allocated objects.  #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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  Releated to [57b1d5375927b987b162fcf0e2c99a39b717bd65](https://github.com/kamailio/kamai… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3059 -- Commit Summary -- * siptrace: fix pkg memory leak when module configured with core callbacks -- File Changes -- M src/modules/siptrace/siptrace.c (38) M src/modules/siptrace/siptrace_data.h (2) M src/modules/siptrace/siptrace_send.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3059.patch https://github.com/kamailio/kamailio/pull/3059.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3059 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3059(a)github.com>

2 1

git:master:fc50ce1d: siptrace: fix pkg memory leak when module configured with core callbacks
by Daniel-Constantin Mierla 22 Mar '22

22 Mar '22

Module: kamailio Branch: master Commit: fc50ce1dbd31bbd28a11d672ed9bdbe9bd4ae5d0 URL: https://github.com/kamailio/kamailio/commit/fc50ce1dbd31bbd28a11d672ed9bdbe… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-22T08:24:47+01:00 siptrace: fix pkg memory leak when module configured with core callbacks - Correctly freeng pkg memory in core callbacks when body modifications take place with X-Siptrace headers, also fix potential pkg_free with not dynamicaly allocated objects. --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/fc50ce1dbd31bbd28a11d672ed9bdbe… Patch: https://github.com/kamailio/kamailio/commit/fc50ce1dbd31bbd28a11d672ed9bdbe…

1 0

[kamailio/kamailio] Update uac_admin.xml (PR #3056)
by genajan 22 Mar '22

22 Mar '22

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3056 -- Commit Summary -- * Update uac_admin.xml -- File Changes -- M src/modules/uac/doc/uac_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3056.patch https://github.com/kamailio/kamailio/pull/3056.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3056 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3056(a)github.com>

2 3

git:master:51dcda9a: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 22 Mar '22

22 Mar '22

Module: kamailio Branch: master Commit: 51dcda9aab961aa86c77c7e0a99bc91aee860d52 URL: https://github.com/kamailio/kamailio/commit/51dcda9aab961aa86c77c7e0a99bc91… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-22T08:16:22+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/51dcda9aab961aa86c77c7e0a99bc91… Patch: https://github.com/kamailio/kamailio/commit/51dcda9aab961aa86c77c7e0a99bc91… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 3c804906dd..f1a6e6f5e8 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -595,7 +595,7 @@ modparam("uac", "reg_active", 0) Timer interval (in seconds) at which remote registrations are cleaned up in case of failure or removed. When setting it take in consideration the maximum value for retransmission timeout, this param should be - greater than it. This value also impacts how ofter the reload for + greater than it. This value also impacts how often the reload for remote registrations table can be executed -- the RPC command will fail if executed in less than reg_gc_interval value since the last reload.

1 0

git:master:faefa6cc: uac: docs - fixed typo
by Daniel-Constantin Mierla 22 Mar '22

22 Mar '22

Module: kamailio Branch: master Commit: faefa6ccc3ce9a774ca977aa35b8da07b46daf02 URL: https://github.com/kamailio/kamailio/commit/faefa6ccc3ce9a774ca977aa35b8da0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-22T08:11:38+01:00 uac: docs - fixed typo - GH #3056 --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/faefa6ccc3ce9a774ca977aa35b8da0… Patch: https://github.com/kamailio/kamailio/commit/faefa6ccc3ce9a774ca977aa35b8da0… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 3ce59d3e11..a15fbbc90b 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -567,7 +567,7 @@ modparam("uac", "reg_active", 0) Timer interval (in seconds) at which remote registrations are cleaned up in case of failure or removed. When setting it take in consideration the maximum value for retransmission timeout, this param should be greater - than it. This value also impacts how ofter the reload for remote + than it. This value also impacts how often the reload for remote registrations table can be executed -- the RPC command will fail if executed in less than reg_gc_interval value since the last reload. </para>

1 0

[kamailio/kamailio] utils: fixed sinitiser error (PR #3057)
by sergey-safarov 22 Mar '22

22 Mar '22

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description fixed sinitizer memory leaks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3057 -- Commit Summary -- * utils: fixed sinitiser error -- File Changes -- M utils/kamcmd/kamcmd.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3057.patch https://github.com/kamailio/kamailio/pull/3057.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3057 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3057(a)github.com>

2 1

git:master:d28ca884: utils: fixed sinitiser error
by Daniel-Constantin Mierla 22 Mar '22

22 Mar '22

Module: kamailio Branch: master Commit: d28ca884548b0f24a618ed9cbdc8e1b9538f2574 URL: https://github.com/kamailio/kamailio/commit/d28ca884548b0f24a618ed9cbdc8e1b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-22T08:09:12+01:00 utils: fixed sinitiser error [root@localhost]# kamcmd cfg.seti param_group param_name value ================================================================= ==2409977==ERROR: LeakSanitizer: detected memory leaks Direct leak of 38 byte(s) in 1 object(s) allocated from: #0 0xffff98c250af in malloc (/lib64/libasan.so.5+0xd50af) #1 0x41549f in parse_listen_id /root/kamailio/utils/kamcmd/parse_listen_id.c:133 #2 0x4144fb in main /root/kamailio/utils/kamcmd/kamcmd.c:2075 #3 0xffff97dc0de3 in __libc_start_main (/lib64/libc.so.6+0x20de3) #4 0x40260b (/usr/local/sbin/kamcmd+0x40260b) --- Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/d28ca884548b0f24a618ed9cbdc8e1b… Patch: https://github.com/kamailio/kamailio/commit/d28ca884548b0f24a618ed9cbdc8e1b… --- diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index 141f309aaf..e940ab8ae1 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -2106,6 +2106,7 @@ int main(int argc, char** argv) fprintf(stderr, "ERROR: Bad socket type for %s\n", sock_name); goto error; } + free(sock_id->buf); /* not needed anymore */ free(sock_id); /* not needed anymore */ sock_id=0;

1 0

[kamailio/kamailio] {param.value, name[, delimiter]}, and delimiter is comma (Issue #3060)
by hance2010 22 Mar '22

22 Mar '22

### Description  ### Expected behavior $var(s) = "a=1,b=2,c=3"; $var(s1) = $(var(s){param.value,b,,}); /* 2 */ #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.4 ``` * **Operating System**:  ``` debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3060 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3060(a)github.com>

2 2

git:master:16a5234b: modules: readme files regenerated - auth_db ... [skip ci]
by Kamailio Dev 21 Mar '22

21 Mar '22

Module: kamailio Branch: master Commit: 16a5234b11f139ec6b2be99499c970234dec90c3 URL: https://github.com/kamailio/kamailio/commit/16a5234b11f139ec6b2be99499c9702… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-21T15:16:26+01:00 modules: readme files regenerated - auth_db ... [skip ci] --- Modified: src/modules/auth_db/README --- Diff: https://github.com/kamailio/kamailio/commit/16a5234b11f139ec6b2be99499c9702… Patch: https://github.com/kamailio/kamailio/commit/16a5234b11f139ec6b2be99499c9702… --- diff --git a/src/modules/auth_db/README b/src/modules/auth_db/README index 287f1517c5..2825c58d2f 100644 --- a/src/modules/auth_db/README +++ b/src/modules/auth_db/README @@ -448,7 +448,8 @@ if (!proxy_authorize("$fd", "subscriber)) { user. All other requests: From header must match the authentication user. If bit 2 is set as well (flags==3), the ID check is skipped for INVITE, BYE, PRACK, UPDATE, MESSAGE - these requests can come - with anonymous caller id. + with anonymous caller id. If set to 0, then all user checks are + skipped. Additionally all domains in the checked URIs and the realm in the authentication header will be checked to match the provided realm parameter.

1 0

git:master:c67c568a: auth_db: document flag 0 for auth_check function
by Henning Westerholt 21 Mar '22

21 Mar '22

Module: kamailio Branch: master Commit: c67c568ad476879529cd04f7a5b1b77401a8f428 URL: https://github.com/kamailio/kamailio/commit/c67c568ad476879529cd04f7a5b1b77… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-03-21T14:11:32Z auth_db: document flag 0 for auth_check function --- Modified: src/modules/auth_db/doc/auth_db_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c67c568ad476879529cd04f7a5b1b77… Patch: https://github.com/kamailio/kamailio/commit/c67c568ad476879529cd04f7a5b1b77… --- diff --git a/src/modules/auth_db/doc/auth_db_admin.xml b/src/modules/auth_db/doc/auth_db_admin.xml index 422738e869..e112332b40 100644 --- a/src/modules/auth_db/doc/auth_db_admin.xml +++ b/src/modules/auth_db/doc/auth_db_admin.xml @@ -549,7 +549,8 @@ if (!proxy_authorize("$fd", "subscriber)) { match the authentication user. All other requests: From header must match the authentication user. If bit 2 is set as well (flags==3), the ID check is skipped for INVITE, BYE, PRACK, UPDATE, MESSAGE - - these requests can come with anonymous caller id. + - these requests can come with anonymous caller id. If set to 0, + then all user checks are skipped. </para> <para> Additionally all domains in the checked URIs and the realm in the

1 0

git:master:0b7a7107: ims_qos: free result of getaddrinfo()
by Daniel-Constantin Mierla 17 Mar '22

17 Mar '22

Module: kamailio Branch: master Commit: 0b7a71070f3845e4c7e89e149a80b3db8872bb1e URL: https://github.com/kamailio/kamailio/commit/0b7a71070f3845e4c7e89e149a80b3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-17T09:34:56+01:00 ims_qos: free result of getaddrinfo() --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0b7a71070f3845e4c7e89e149a80b3d… Patch: https://github.com/kamailio/kamailio/commit/0b7a71070f3845e4c7e89e149a80b3d… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 18d111eb67..08018d9c45 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -649,10 +649,13 @@ uint16_t check_ip_version(str ip) return 0; } if (res->ai_family == AF_INET) { + freeaddrinfo(res); return AF_INET; } else if (res->ai_family == AF_INET6) { + freeaddrinfo(res); return AF_INET6; } else { + freeaddrinfo(res); LM_ERR("unknown IP format \n"); return 0; }

1 0

git:master:782b4773: cdp: init the entire msg structure
by Daniel-Constantin Mierla 17 Mar '22

17 Mar '22

Module: kamailio Branch: master Commit: 782b4773119e21a9354d698c0f405d7162166a4a URL: https://github.com/kamailio/kamailio/commit/782b4773119e21a9354d698c0f405d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-17T09:00:36+01:00 cdp: init the entire msg structure --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/782b4773119e21a9354d698c0f405d7… Patch: https://github.com/kamailio/kamailio/commit/782b4773119e21a9354d698c0f405d7… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 5aed0a36f4..0bff4131d3 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -346,6 +346,7 @@ static int receive_fd(int pipe_fd, int* fd,peer **p) char control[CMSG_SPACE(sizeof(new_fd))]; }control_un; + memset(&msg, 0, sizeof(struct msghdr)); msg.msg_control=control_un.control; msg.msg_controllen=sizeof(control_un.control); #else

1 0

git:master:b32a9caf: core: parse uri - extra check when user part is missing before @
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: b32a9caf4797370a4704b5f94d2d704b6e52fdef URL: https://github.com/kamailio/kamailio/commit/b32a9caf4797370a4704b5f94d2d704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T10:11:43+01:00 core: parse uri - extra check when user part is missing before @ --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b32a9caf4797370a4704b5f94d2d704… Patch: https://github.com/kamailio/kamailio/commit/b32a9caf4797370a4704b5f94d2d704… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index edc46acea1..adc94fbc0a 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1241,14 +1241,15 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) /* port value too large */ goto error_invalid_port; } - if(uri->host.len>0 && uri->host.s>buf && *(uri->host.s-1)=='@' - && uri->user.len<=0) { + if(uri->host.len>0 && uri->user.len<=0 &&uri->host.s>buf && (*(uri->host.s-1)=='@' + || *uri->host.s=='@')) { /* '@' before host, but no user part */ goto error_bad_uri; } #ifdef EXTRA_DEBUG /* do stuff */ + LM_DBG("state=%d\n", state); LM_DBG("parsed uri:\n type=%d user=<%.*s>(%d)\n passwd=<%.*s>(%d)\n" " host=<%.*s>(%d)\n port=<%.*s>(%d): %d\n params=<%.*s>(%d)\n" " headers=<%.*s>(%d)\n",

1 0

git:master:dad44317: db_berkeley: covert blob values
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: dad443172628c3736b057fa24343c265ed3827b2 URL: https://github.com/kamailio/kamailio/commit/dad443172628c3736b057fa24343c26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T09:12:03+01:00 db_berkeley: covert blob values --- Modified: src/modules/db_berkeley/km_bdb_val.c --- Diff: https://github.com/kamailio/kamailio/commit/dad443172628c3736b057fa24343c26… Patch: https://github.com/kamailio/kamailio/commit/dad443172628c3736b057fa24343c26… --- diff --git a/src/modules/db_berkeley/km_bdb_val.c b/src/modules/db_berkeley/km_bdb_val.c index d895a870c9..e75ad4dc3b 100644 --- a/src/modules/db_berkeley/km_bdb_val.c +++ b/src/modules/db_berkeley/km_bdb_val.c @@ -266,10 +266,10 @@ int km_bdb_val2str(db_val_t *_v, char *_s, int *_len) LM_ERR("Destination buffer too short for blob\n"); return -7; } else { - LM_DBG("Converting BLOB [%s]\n", _s); - _s = VAL_BLOB(_v).s; - *_len = 0; - return -8; + LM_DBG("Converted BLOB\n"); + memcpy(_s, VAL_BLOB(_v).s, l); + *_len = l; + return 0; } break;

1 0

git:master:b8c4d8b8: db_redis: init allocated structure
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: b8c4d8b8d0f06267f2bc1a760307345fd06745ce URL: https://github.com/kamailio/kamailio/commit/b8c4d8b8d0f06267f2bc1a760307345… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T09:00:35+01:00 db_redis: init allocated structure --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/b8c4d8b8d0f06267f2bc1a760307345… Patch: https://github.com/kamailio/kamailio/commit/b8c4d8b8d0f06267f2bc1a760307345… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index dc0dc2136f..68536816a8 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1783,7 +1783,7 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_keys[j] = &tmp->key; } - db_vals = (db_val_t*) pkg_malloc(all_type_keys_count * sizeof(db_val_t)); + db_vals = (db_val_t*) pkg_mallocxz(all_type_keys_count * sizeof(db_val_t)); if (!db_vals) { LM_ERR("Failed to allocate memory for manual db vals\n"); goto error;

1 0

git:master:476d763d: core: 0-terminate string for very long local network interface names
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: 476d763d8ee504b71c13063ca002ecfe158da94e URL: https://github.com/kamailio/kamailio/commit/476d763d8ee504b71c13063ca002ecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T09:04:33+01:00 core: 0-terminate string for very long local network interface names --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/476d763d8ee504b71c13063ca002ecf… Patch: https://github.com/kamailio/kamailio/commit/476d763d8ee504b71c13063ca002ecf… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index afb1dd5603..00d7bdf289 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1333,6 +1333,7 @@ static int build_iface_list(void) case IFA_LABEL: LM_DBG("iface name is %s\n", (char*)RTA_DATA(rtap)); strncpy(name, (char*)RTA_DATA(rtap), MAX_IF_LEN-1); + name[MAX_IF_LEN-1] = '\0'; break; case IFA_BROADCAST: case IFA_ANYCAST:

1 0

git:master:b7fa610c: core: resolve - use macro value for comparison
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: b7fa610ca381dff572d0276fabe7101acdc3ced1 URL: https://github.com/kamailio/kamailio/commit/b7fa610ca381dff572d0276fabe7101… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T08:35:24+01:00 core: resolve - use macro value for comparison --- Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/b7fa610ca381dff572d0276fabe7101… Patch: https://github.com/kamailio/kamailio/commit/b7fa610ca381dff572d0276fabe7101… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index c2ea36d9ec..336b958ea3 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -841,7 +841,7 @@ struct rdata* get_record(char* name, int type, int flags) #endif p+=skip; rec_name_len=strlen(rec_name); - if (unlikely(rec_name_len>255)){ + if (unlikely(rec_name_len>MAX_DNS_NAME-2)){ LM_ERR("dn_expand(rec_name): name too long (%d)\n", rec_name_len); goto error;

1 0

git:5.3:879be1b8: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.3 Commit: 879be1b8996bc1f4768ef7b54631a17caa14d0a1 URL: https://github.com/kamailio/kamailio/commit/879be1b8996bc1f4768ef7b54631a17… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:14:05-04:00 db_text: fix db url in example config (cherry picked from commit b98cbddfaf271887276c4be8a98a0708dab4d091) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/879be1b8996bc1f4768ef7b54631a17… Patch: https://github.com/kamailio/kamailio/commit/879be1b8996bc1f4768ef7b54631a17… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:5.4:053b3db1: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.4 Commit: 053b3db11a89d0bbb86ca95f9fd9b242cfb68f78 URL: https://github.com/kamailio/kamailio/commit/053b3db11a89d0bbb86ca95f9fd9b24… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:13:25-04:00 db_text: fix db url in example config (cherry picked from commit b98cbddfaf271887276c4be8a98a0708dab4d091) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/053b3db11a89d0bbb86ca95f9fd9b24… Patch: https://github.com/kamailio/kamailio/commit/053b3db11a89d0bbb86ca95f9fd9b24… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:5.5:4c893825: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.5 Commit: 4c8938252d583bcfe720231e9f579ee461095c6d URL: https://github.com/kamailio/kamailio/commit/4c8938252d583bcfe720231e9f579ee… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:12:44-04:00 db_text: fix db url in example config (cherry picked from commit b98cbddfaf271887276c4be8a98a0708dab4d091) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/4c8938252d583bcfe720231e9f579ee… Patch: https://github.com/kamailio/kamailio/commit/4c8938252d583bcfe720231e9f579ee… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:master:b98cbddf: db_text: fix db url in example config
by Ovidiu Sas 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: b98cbddfaf271887276c4be8a98a0708dab4d091 URL: https://github.com/kamailio/kamailio/commit/b98cbddfaf271887276c4be8a98a070… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2022-03-15T12:09:15-04:00 db_text: fix db url in example config --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b98cbddfaf271887276c4be8a98a070… Patch: https://github.com/kamailio/kamailio/commit/b98cbddfaf271887276c4be8a98a070… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 8c94d7c56a..de2202f9fc 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -41,7 +41,7 @@ loadmodule "modules/auth_db/auth_db.so" # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") +modparam("usrloc|auth_db", "db_url", "text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:master:d4af1304: db_text: reworked the checks for database and table names
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: d4af1304778c10213cb1f98e23938c6c4b912723 URL: https://github.com/kamailio/kamailio/commit/d4af1304778c10213cb1f98e23938c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T13:01:10+01:00 db_text: reworked the checks for database and table names --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/d4af1304778c10213cb1f98e23938c6… Patch: https://github.com/kamailio/kamailio/commit/d4af1304778c10213cb1f98e23938c6… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 6480210ebc..ec74c298bd 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -94,28 +94,22 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) enum {DBT_FLINE_ST, DBT_NLINE_ST, DBT_DATA_ST} state; - if(!tbn || !tbn->s || tbn->len<=0 || tbn->len>=255) + if(!tbn || !tbn->s || tbn->len<=0 || tbn->len>=255) { + LM_ERR("invalid table name\n"); return NULL; + } + if(!dbn || !dbn->s || dbn->len<=0 || dbn->len>=255) { + LM_ERR("invalid database name\n"); + return NULL; + } LM_DBG("request for table [%.*s] (len: %d)\n", tbn->len, tbn->s, tbn->len); + LM_DBG("database is [%.*s] (len: %d)\n", dbn->len, dbn->s, dbn->len); - path[0] = 0; - if(dbn && dbn->s && dbn->len>0) - { - LM_DBG("db is [%.*s] (len: %d)\n", dbn->len, dbn->s, dbn->len); - if(dbn->len+tbn->len<511) - { - strncpy(path, dbn->s, dbn->len); - path[dbn->len] = '/'; - strncpy(path+dbn->len+1, tbn->s, tbn->len); - path[dbn->len+tbn->len+1] = 0; - } - } - if(path[0] == 0) - { - strncpy(path, tbn->s, tbn->len); - path[tbn->len] = 0; - } + strncpy(path, dbn->s, dbn->len); + path[dbn->len] = '/'; + strncpy(path+dbn->len+1, tbn->s, tbn->len); + path[dbn->len+tbn->len+1] = 0; LM_DBG("loading file [%s]\n", path); fin = fopen(path, "rt");

1 0

git:master:e513d1cc: seas: check for header type value for flags comparison
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: e513d1cc549fea43eebc5fc504bb01270adbc10e URL: https://github.com/kamailio/kamailio/commit/e513d1cc549fea43eebc5fc504bb012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:41:59+01:00 seas: check for header type value for flags comparison --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/e513d1cc549fea43eebc5fc504bb012… Patch: https://github.com/kamailio/kamailio/commit/e513d1cc549fea43eebc5fc504bb012… --- diff --git a/src/modules/seas/seas_action.c b/src/modules/seas/seas_action.c index 83be6307d0..de8fc9be65 100644 --- a/src/modules/seas/seas_action.c +++ b/src/modules/seas/seas_action.c @@ -1278,7 +1278,7 @@ int extract_allowed_headers(struct sip_msg *my_msg,int strip_top_vias,int allow_ vb=NULL; for(hf=my_msg->headers;hf;hf=hf->next){ - if(forbidden_hdrs & HDR_T2F(hf->type)){ + if((hf->type>0) && (forbidden_hdrs & HDR_T2F(hf->type))){ LM_DBG("Skipping header (%.*s)\n",hf->name.len,hf->name.s); continue; }else if(hf->type==HDR_VIA_T && strip_top_vias > 0){

1 0

git:master:67e0fa5e: core: parser digest - warn if the header type is not set properly
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 67e0fa5e53ef5d4dd9802e3027b2bc7ff6dcb671 URL: https://github.com/kamailio/kamailio/commit/67e0fa5e53ef5d4dd9802e3027b2bc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:30:58+01:00 core: parser digest - warn if the header type is not set properly --- Modified: src/core/parser/digest/digest.c --- Diff: https://github.com/kamailio/kamailio/commit/67e0fa5e53ef5d4dd9802e3027b2bc7… Patch: https://github.com/kamailio/kamailio/commit/67e0fa5e53ef5d4dd9802e3027b2bc7… --- diff --git a/src/core/parser/digest/digest.c b/src/core/parser/digest/digest.c index ccc62a6551..83cce621f0 100644 --- a/src/core/parser/digest/digest.c +++ b/src/core/parser/digest/digest.c @@ -259,8 +259,9 @@ int find_credentials(struct sip_msg* msg, str* realm, hdr_flags=HDR_PROXYAUTH_F; break; default: + LM_WARN("unexpected header type %d - using authorization\n", hftype); hook = &(msg->authorization); - hdr_flags=HDR_T2F(hftype); + hdr_flags=HDR_AUTHORIZATION_F; break; }

1 0

git:master:f9a38d6b: core: parser - catch special header types for get_hdr()
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: f9a38d6b621a2c3966a3c85dce6fdd2e6bb8d431 URL: https://github.com/kamailio/kamailio/commit/f9a38d6b621a2c3966a3c85dce6fdd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:35:12+01:00 core: parser - catch special header types for get_hdr() --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/f9a38d6b621a2c3966a3c85dce6fdd2… Patch: https://github.com/kamailio/kamailio/commit/f9a38d6b621a2c3966a3c85dce6fdd2… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index a348503544..6455c9e539 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1012,10 +1012,14 @@ hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht) { hdr_field_t *hdr; - if (msg->parsed_flag & HDR_T2F(ht)) + if (ht == HDR_ERROR_T || ht == HDR_EOH_T) { + return NULL; + } + if (msg->parsed_flag & HDR_T2F(ht)) { for(hdr = msg->headers; hdr; hdr = hdr->next) { if(hdr->type == ht) return hdr; } + } return NULL; }

1 0

git:master:5c774d6e: ims_auth: warn if the header type is not set properly
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 5c774d6eced2ad52cb341b9e36419aac6c0506cb URL: https://github.com/kamailio/kamailio/commit/5c774d6eced2ad52cb341b9e36419aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:38:42+01:00 ims_auth: warn if the header type is not set properly --- Modified: src/modules/ims_auth/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/5c774d6eced2ad52cb341b9e36419aa… Patch: https://github.com/kamailio/kamailio/commit/5c774d6eced2ad52cb341b9e36419aa… --- diff --git a/src/modules/ims_auth/utils.c b/src/modules/ims_auth/utils.c index 94d02e3fe7..b745af0275 100644 --- a/src/modules/ims_auth/utils.c +++ b/src/modules/ims_auth/utils.c @@ -71,8 +71,9 @@ int ims_find_credentials(struct sip_msg* _m, str* _realm, hdr_flags = HDR_PROXYAUTH_F; break; default: + LM_WARN("unexpected header type %d - using authorization\n", _hftype); hook = &(_m->authorization); - hdr_flags = HDR_T2F(_hftype); + hdr_flags = HDR_AUTHORIZATION_F; break; }

1 0

git:master:8b20e604: core: parse - fix typo in comment of previous commit
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 8b20e6045dbebdb784a4e8f66d81fc79c0a17304 URL: https://github.com/kamailio/kamailio/commit/8b20e6045dbebdb784a4e8f66d81fc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:18:23+01:00 core: parse - fix typo in comment of previous commit --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/8b20e6045dbebdb784a4e8f66d81fc7… Patch: https://github.com/kamailio/kamailio/commit/8b20e6045dbebdb784a4e8f66d81fc7… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 8f7a53f77b..edc46acea1 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1238,7 +1238,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) /* common sanity checks */ if(uri->port.len>5) { - /* port value to large */ + /* port value too large */ goto error_invalid_port; } if(uri->host.len>0 && uri->host.s>buf && *(uri->host.s-1)=='@'

1 0

git:master:eda4b3c5: core: parse uri - sanity check for user part
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: eda4b3c51ce12d4fe052b7e9ad40be1ef6e56444 URL: https://github.com/kamailio/kamailio/commit/eda4b3c51ce12d4fe052b7e9ad40be1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:11:09+01:00 core: parse uri - sanity check for user part --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/eda4b3c51ce12d4fe052b7e9ad40be1… Patch: https://github.com/kamailio/kamailio/commit/eda4b3c51ce12d4fe052b7e9ad40be1… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 6cbf22a7c7..8f7a53f77b 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1236,8 +1236,16 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) break; /* do nothing, avoids a compilation warning */ } - if(uri->port.len>5) + /* common sanity checks */ + if(uri->port.len>5) { + /* port value to large */ goto error_invalid_port; + } + if(uri->host.len>0 && uri->host.s>buf && *(uri->host.s-1)=='@' + && uri->user.len<=0) { + /* '@' before host, but no user part */ + goto error_bad_uri; + } #ifdef EXTRA_DEBUG /* do stuff */

1 0

git:master:692d15ce: pua_reginfo: init uri buffer
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 692d15ce9bcc329fff55060dcdc8e5161f12c30e URL: https://github.com/kamailio/kamailio/commit/692d15ce9bcc329fff55060dcdc8e51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 pua_reginfo: init uri buffer --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/692d15ce9bcc329fff55060dcdc8e51… Patch: https://github.com/kamailio/kamailio/commit/692d15ce9bcc329fff55060dcdc8e51… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index ee533a6a63..07fceba899 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -239,6 +239,7 @@ int process_body(str notify_body, udomain_t * domain) { /* Temporary */ int mem_only = 1; + uri[0] = '\0'; doc = xmlParseMemory(notify_body.s, notify_body.len); if(doc== NULL) { LM_ERR("Error while parsing the xml body message, Body is:\n%.*s\n",

1 0

git:master:0204232b: dmq: init peer structures
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 0204232ba1f229edb9c7e0080e98e9d3b2500672 URL: https://github.com/kamailio/kamailio/commit/0204232ba1f229edb9c7e0080e98e9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 dmq: init peer structures --- Modified: src/modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0204232ba1f229edb9c7e0080e98e9d… Patch: https://github.com/kamailio/kamailio/commit/0204232ba1f229edb9c7e0080e98e9d… --- diff --git a/src/modules/dmq/dmq_funcs.c b/src/modules/dmq/dmq_funcs.c index aeea4a83e3..a71e0a85a3 100644 --- a/src/modules/dmq/dmq_funcs.c +++ b/src/modules/dmq/dmq_funcs.c @@ -300,8 +300,8 @@ int ki_dmq_send_message(sip_msg_t *msg, str *peer_str, str *to_str, dmq_peer_t *destination_peer = find_peer(*peer_str); if(!destination_peer) { + dmq_peer_t new_peer = {0}; LM_INFO("cannot find peer %.*s\n", peer_str->len, peer_str->s); - dmq_peer_t new_peer; new_peer.callback = empty_peer_callback; new_peer.description.s = ""; new_peer.description.len = 0; @@ -370,9 +370,9 @@ int ki_dmq_bcast_message(sip_msg_t *msg, str *peer_str, str *body_str, dmq_peer_t *destination_peer = find_peer(*peer_str); if(!destination_peer) { + dmq_peer_t new_peer = {0}; LM_INFO("cannot find peer %.*s - adding it.\n", peer_str->len, peer_str->s); - dmq_peer_t new_peer; new_peer.callback = empty_peer_callback; new_peer.description.s = ""; new_peer.description.len = 0;

1 0

git:master:0b684a5d: sipcapture: more init buffers content
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 0b684a5d9a2f5d17e64cb8cb5f4b53b06f180f06 URL: https://github.com/kamailio/kamailio/commit/0b684a5d9a2f5d17e64cb8cb5f4b53b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 sipcapture: more init buffers content --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/0b684a5d9a2f5d17e64cb8cb5f4b53b… Patch: https://github.com/kamailio/kamailio/commit/0b684a5d9a2f5d17e64cb8cb5f4b53b… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 4c032ab239..6ec37ffbd7 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2569,6 +2569,8 @@ int receive_logging_json_msg(char *buf, unsigned int len, str corrtmp = STR_NULL; _capture_mode_data_t *c = NULL; + ipstr_dst[0] = '\0'; + ipstr_src[0] = '\0'; c = capture_def; if(!c) { LM_ERR("no connection mode available to store data\n");

1 0

git:master:9292b9f5: sipcapture: init buffers content
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 9292b9f5daacfa5340b5fe1a5f02469a7e597d9b URL: https://github.com/kamailio/kamailio/commit/9292b9f5daacfa5340b5fe1a5f02469… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 sipcapture: init buffers content --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/9292b9f5daacfa5340b5fe1a5f02469… Patch: https://github.com/kamailio/kamailio/commit/9292b9f5daacfa5340b5fe1a5f02469… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 9070e1e9fc..4c032ab239 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2580,6 +2580,8 @@ int receive_logging_json_msg(char *buf, unsigned int len, return -1; } + ipstr_dst[0] = '\0'; + ipstr_src[0] = '\0'; memset(&sco, 0, sizeof(struct _sipcapture_object)); gettimeofday(&tvb, &tz);

1 0

git:5.5:19e3d173: pv-headers: ignore skip-header config on clone_branch
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.5 Commit: 19e3d173ab0bc30663c67874708c95469699d82a URL: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:56:46+01:00 pv-headers: ignore skip-header config on clone_branch (cherry picked from commit 473e051bef688d9e78bc4c28abebbedfffd1f549) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… Patch: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b8e4f92e61..8b2acbf08b 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -515,8 +515,6 @@ int pvh_clone_branch_xavi(struct sip_msg *msg, str *xname) } do { - if(pvh_skip_header(&sub->name)) - continue; if(sub->val.type == SR_XTYPE_DATA) continue; if(pvh_xavi_append_value(&sub->name, &sub->val, &br_xavi->val.v.xavp)

1 0

git:master:473e051b: pv-headers: ignore skip-header config on clone_branch
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 473e051bef688d9e78bc4c28abebbedfffd1f549 URL: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:54:47+01:00 pv-headers: ignore skip-header config on clone_branch --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… Patch: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b8e4f92e61..8b2acbf08b 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -515,8 +515,6 @@ int pvh_clone_branch_xavi(struct sip_msg *msg, str *xname) } do { - if(pvh_skip_header(&sub->name)) - continue; if(sub->val.type == SR_XTYPE_DATA) continue; if(pvh_xavi_append_value(&sub->name, &sub->val, &br_xavi->val.v.xavp)

1 0

git:5.3:f35c7fe0: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.3 Commit: f35c7fe0016fea44bbfa4d686f985cf5db4a3372 URL: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:50:54+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) (cherry picked from commit 2e0537ba306219df0ce71605848e811027c69a57) (cherry picked from commit 78506f7f2dfcdbf2bc9e21168929437516a368bd) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… Patch: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 5a5887d658..bb7423fcbd 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -111,6 +111,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

git:5.4:78506f7f: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.4 Commit: 78506f7f2dfcdbf2bc9e21168929437516a368bd URL: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:50:01+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) (cherry picked from commit 2e0537ba306219df0ce71605848e811027c69a57) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… Patch: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index dd421a7844..d6c24163b1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -112,6 +112,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

git:5.5:2e0537ba: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.5 Commit: 2e0537ba306219df0ce71605848e811027c69a57 URL: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:49:14+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… Patch: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index dd421a7844..d6c24163b1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -112,6 +112,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

git:master:0c101ffe: core: parse uri - detect empty user when @ is found
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 0c101ffe713603e812759da6d396e0451cf13ba1 URL: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T08:18:03+01:00 core: parse uri - detect empty user when @ is found --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… Patch: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 19f6f2e02a..6cbf22a7c7 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -434,6 +434,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) /* found the user*/ uri->user.s=s; uri->user.len=p-s; + if(uri->user.len<=0) { + /* at '@' and no user part */ + goto error_bad_char; + } state=URI_HOST; found_user=1; s=p+1; /* skip '@' */

1 0

[kamailio/kamailio] Error when running kamdbctl create (Issue #3055)
by lcph 15 Mar '22

15 Mar '22

When running kamdbctl create, it fails. The error is as show below. Can someone with knowledge please help me solve this. /usr/share/kamailio/mysql$ kamdbctl create MySQL password for root: -e database engine 'mysql' loaded -e \E[37;33mINFO: test server charset mysql: [Warning] Using a password on the command line interface can be insecure. ERROR 1682 (HY000) at line 1: Native table 'performance_schema'.'session_variables' has the wrong structure mysql: [Warning] Using a password on the command line interface can be insecure. Usage: grep [OPTION]... PATTERN [FILE]... Try 'grep --help' for more information. /usr/sbin/kamdbctl: 117: [: =: unexpected operator -e \E[37;33mINFO: creating database kamailio ... mysql: [Warning] Using a password on the command line interface can be insecure. ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 -e \E[37;31mERROR: Creatin -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3055 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3055(a)github.com>

2 2

[kamailio/kamailio] Dispatcher ds_reload() function always returns error (Issue #3054)
by kdanderso 14 Mar '22

14 Mar '22

### Description The ds_reload() function in dispatcher.c always returns -1, even when successful. ### Possible Solutions I think a patch like the following would resolve the issue. ``` diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 059df89123..83d6b45ee9 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -963,13 +963,15 @@ static int ds_reload(sip_msg_t *msg) *ds_rpc_reload_time = time(NULL); if(!ds_db_url.s) { - if(ds_load_list(dslistfile) != 0) + if(ds_load_list(dslistfile) != 0) { LM_ERR("Error reloading from list\n"); - return -1; + return -1; + } } else { - if(ds_reload_db() < 0) + if(ds_reload_db() < 0) { LM_ERR("Error reloading from db\n"); - return -1; + return -1; + } } LM_DBG("reloaded dispatcher\n"); return 1; ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.5.3 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3054 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3054(a)github.com>

2 2

git:master:30079910: dispatcher: fix ds_reload() return logic
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 30079910bbb33b430621f188beae40c71592bcba URL: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T17:07:42+01:00 dispatcher: fix ds_reload() return logic - GH #3054 --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… Patch: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 059df89123..83d6b45ee9 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -963,13 +963,15 @@ static int ds_reload(sip_msg_t *msg) *ds_rpc_reload_time = time(NULL); if(!ds_db_url.s) { - if(ds_load_list(dslistfile) != 0) + if(ds_load_list(dslistfile) != 0) { LM_ERR("Error reloading from list\n"); - return -1; + return -1; + } } else { - if(ds_reload_db() < 0) + if(ds_reload_db() < 0) { LM_ERR("Error reloading from db\n"); - return -1; + return -1; + } } LM_DBG("reloaded dispatcher\n"); return 1;

1 0

git:master:4659d27f: core: mem - define qm_report() for compilation with debug disabled
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 4659d27f73f4e4d840e04a20d9b65a76280954e8 URL: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T13:01:24+01:00 core: mem - define qm_report() for compilation with debug disabled --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… Patch: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 2ff295fcb1..ba64f00854 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1145,6 +1145,14 @@ void qm_mod_free_stats(void *qm_rootp) void qm_sums(void *qmp) { + LM_WARN("Enable DBG_QM_MALLOC for getting the status summary\n"); + return; +} + +void qm_report(void* qmp, mem_report_t *mrep) +{ + LM_WARN("Enable DBG_QM_MALLOC for getting the report\n"); + memset(mrep, 0, sizeof(mem_report_t)); return; }

1 0

git:master:9140686d: misctesc: sync-ed with fuzz function
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 9140686dcd4c32712e46f3e6e824ab090545a03e URL: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:53:56+01:00 misctesc: sync-ed with fuzz function --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… Patch: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 0867c1ae46..c00a8b9c5c 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -40,6 +40,7 @@ #include "../../core/parser/parse_hname2.h" #include "../../core/parser/contact/parse_contact.h" #include "../../core/parser/parse_to.h" +#include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_refer_to.h" #include "../../core/parser/parse_ppi_pai.h" @@ -341,7 +342,7 @@ static int misctest_message_init(void) parse_to_uri(&tmsg); - parse_contact_header(&tmsg); + parse_contact_headers(&tmsg); parse_refer_to_header(&tmsg); @@ -355,6 +356,10 @@ static int misctest_message_init(void) parse_identityinfo_header(&tmsg); + parse_record_route_headers(&tmsg); + + parse_route_headers(&tmsg); + str uri; get_src_uri(&tmsg, 0, &uri);

1 0

git:master:ae46c85a: core: fuzz - include missing headers file for last changes
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: ae46c85a3d1e829900080c2b6ee16fda1bce90d4 URL: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:28:55+01:00 core: fuzz - include missing headers file for last changes --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… Patch: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index 6688e92389..e20c2e64f3 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -4,6 +4,7 @@ #include "../parser/contact/parse_contact.h" #include "../parser/parse_from.h" #include "../parser/parse_to.h" +#include "../parser/parse_rr.h" #include "../parser/parse_refer_to.h" #include "../parser/parse_ppi_pai.h" #include "../parser/parse_privacy.h"

1 0

git:master:a9e92eb9: misc: fuzz - add functions for parsing record-/route headers
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: a9e92eb9dfe4e52b45e271bcfa51c0c732dc23c4 URL: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:20:37+01:00 misc: fuzz - add functions for parsing record-/route headers --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… Patch: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index d832ff3d92..6688e92389 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -52,6 +52,10 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { parse_identityinfo_header(&orig_inv); + parse_record_route_headers(&orig_inv); + + parse_route_headers(&orig_inv); + str uri; get_src_uri(&orig_inv, 0, &uri);

1 0

git:master:22b8ecc2: core: parser - helper functions to parse all record-/route headers
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 22b8ecc24442dce775600dfb186a83bc947fd4ca URL: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:17:42+01:00 core: parser - helper functions to parse all record-/route headers --- Modified: src/core/parser/parse_rr.c Modified: src/core/parser/parse_rr.h --- Diff: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… Patch: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index 9557bffc9b..e8854cbd4b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -494,3 +494,49 @@ int get_path_dst_uri(str *_p, str *_dst) return 0; } + +/*! + * Parse all Record-Route header + */ +int parse_record_route_headers(sip_msg_t *msg) +{ + hdr_field_t *hf; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the headers\n"); + return -1; + } + + hf = msg->record_route; + while(hf) { + if (parse_rr(hf) < 0) { + LM_ERR("failed to parse Record-Route\n"); + return -1; + } + + hf = next_sibling_hdr(hf); + } + return 0; +} + +/*! + * Parse all Route header + */ +int parse_route_headers(sip_msg_t *msg) +{ + hdr_field_t *hf; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the headers\n"); + return -1; + } + + hf = msg->route; + while(hf) { + if (parse_rr(hf) < 0) { + LM_ERR("failed to parse Record-Route\n"); + return -1; + } + + hf = next_sibling_hdr(hf); + } + return 0; +} diff --git a/src/core/parser/parse_rr.h b/src/core/parser/parse_rr.h index f7379a6035..7c38a2d38d 100644 --- a/src/core/parser/parse_rr.h +++ b/src/core/parser/parse_rr.h @@ -180,4 +180,7 @@ int print_rr_body(struct hdr_field *iroute, str *oroute, int order, int get_path_dst_uri(str *_p, str *_dst); +int parse_record_route_headers(sip_msg_t *msg); +int parse_route_headers(sip_msg_t *msg); + #endif /* PARSE_RR_H */

1 0

git:master:8f04fd24: core: mem - expose qm_report() in header file
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 8f04fd24c8f0d9edc88b5c3ff734560bb10735ee URL: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T11:30:38+01:00 core: mem - expose qm_report() in header file --- Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… Patch: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… --- diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 85d3c86e60..cfcb43eced 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -167,6 +167,7 @@ void qm_check(struct qm_block*); void qm_status(void*); void qm_info(void*, struct mem_info*); +void qm_report(void* qmp, mem_report_t *mrep); unsigned long qm_available(void* qm);

1 0

git:master:9f7edfbd: misc/fuzz: use parse_contact_headers() instead of parse_contact_header()
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 9f7edfbd9f3b5fdb660043048a4c3a517483016e URL: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T11:20:54+01:00 misc/fuzz: use parse_contact_headers() instead of parse_contact_header() --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… Patch: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index 1c813fd715..d832ff3d92 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -38,7 +38,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { parse_to_uri(&orig_inv); - parse_contact_header(&orig_inv); + parse_contact_headers(&orig_inv); parse_refer_to_header(&orig_inv);

1 0

git:master:5c99d7f8: sanity: use dedicated functions for parsing From/To URIs
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 5c99d7f87ed94cd52c6ab74d46f511447b3db2b9 URL: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T10:23:58+01:00 sanity: use dedicated functions for parsing From/To URIs - updates to parsing Contact headers --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114… Patch: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114…

1 0

[kamailio/kamailio] module keepalive bug report (Issue #3028)
by 狐狐 14 Mar '22

14 Mar '22

### Description Ka servers A(172.22.247.37) and B(172.22.247.232) use the keepalive module to check if each other's status is available. When one server such as B is down, server A will still send about 16 OPTIONS messages. When A sends the 14th or 15th OPTIONS, ka on A will change B's status to down. At this point, if B restarts, B will reply 200OK to A’s OPTIONS message, and A will change B's status to alive, but A will not send OPTIONS message to B any more. Even if B dies later, B's status will be alive on A forever. ps: if B is restart at the 14th OPTIONS or earlier, A will correctly send heartbeat OPTIONS to B later. if B is restart at the 16th or later, A will not change B's status to alive, and certainly will not sends OPTIONS to B anymore, but this is correct isn't it? question is obviously B’s status is alive on A, but A sends no OPTIONS to B. ### Troubleshooting ![image](https://user-images.githubusercontent.com/26111722/154245407-93f3ac77-3c22-4129-9877-9efa317007a5.png) ![image](https://user-images.githubusercontent.com/26111722/154245553-d19c8121-27ef-448b-933d-153843c61048.png) #### Reproduction 1. set keepalive config ant A ``` loadmodule "keepalive.so" modparam("keepalive","ping_interval",3) modparam("keepalive","destination","172.22.247.232") ``` use ka_is_alive function check B's status. 2. restart A server and confirm that the OPTIONS status is correct. 3. stop the B server until the number of retran messages reaches 15. 4. restart B server, and check OPTIONS #### Log Messages ![image](https://user-images.githubusercontent.com/26111722/154245407-93f3ac77-3c22-4129-9877-9efa317007a5.png) #### SIP Traffic ![image](https://user-images.githubusercontent.com/26111722/154245553-d19c8121-27ef-448b-933d-153843c61048.png) at the time that the arrow points to, 172.22.247.232's status is 1(refers to the log above). but notice that there is no OPTIONS message to 172.22.247.232 anymore. ![image](https://user-images.githubusercontent.com/26111722/154248962-fa6efd08-361c-4be1-b3cf-3c452d6b4e36.png) ![image](https://user-images.githubusercontent.com/26111722/154249002-f1c6b80e-2880-4c6b-bfb0-4a0f3963c6b8.png) ### Possible Solutions ### Additional Information * **Operating System**: ``` Linux localhost.localdomain 3.10.0-1127.el7.x86_64 #1 SMP Tue Mar 31 23:36:51 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux kamailio 5.5.2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3028 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3028(a)github.com>

3 4

[kamailio/kamailio] segmentation fault on kamailio 5.4.4 (Issue #3040)
by descartin 14 Mar '22

14 Mar '22

hello all we have seen a segmentation fault on a kamailio 5.4.4 ``` #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 277 varlist = varlist->next; Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.6-13.el7.x86_64 cyrus-sasl-lib-2.1.26-20.el7_2.x86_64 elfutils-libelf-0.166-2.el7.x86_64 elfutils-libs-0.166-2.el7.x86_64 glibc-2.17-157.el7_3.5.x86_64 jansson-2.10-1.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-8.el7.x86_64 libattr-2.4.46-12.el7.x86_64 libcap-2.22-8.el7.x86_64 libcom_err-1.42.9-9.el7.x86_64 libcurl-7.29.0-35.el7.centos.x86_64 libev-4.15-7.el7.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-16.el7.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-6.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libuuid-2.23.2-33.el7_3.2.x86_64 libxml2-2.9.1-6.el7_2.3.x86_64 nspr-4.13.1-1.0.el7_3.x86_64 nss-3.28.4-1.2.el7_3.x86_64 nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64 nss-util-3.28.4-1.0.el7_3.x86_64 openldap-2.4.40-13.el7.x86_64 openssl-libs-1.0.2k-19.el7.x86_64 pcre-8.32-15.el7_2.1.x86_64 systemd-libs-219-30.el7_3.9.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-17.el7.x86_64 (gdb) bt #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 #1 0x00007feb664367ff in pv_set_dlg_variable (msg=0x7feb6a881bd8, param=0x7feb6adc85a0, op=254, val=0x7ffea166a7a0) at dlg_var.c:443 #2 0x00000000004bbaf2 in lval_pvar_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rv=0x7feb6adc87e8) at core/lvalue.c:352 #3 0x00000000004bc5f0 in lval_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rve=0x7feb6adc87e0) at core/lvalue.c:400 #4 0x0000000000487ddf in do_action (h=0x7ffea166bbd0, a=0x7feb6adc8f80, msg=0x7feb6a881bd8) at core/action.c:1455 #5 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc8338, msg=0x7feb6a881bd8) at core/action.c:1581 #6 0x000000000047c6d7 in do_action (h=0x7ffea166bbd0, a=0x7feb6adce4c0, msg=0x7feb6a881bd8) at core/action.c:1067 #7 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc3190, msg=0x7feb6a881bd8) at core/action.c:1581 #8 0x000000000048a25f in run_top_route (a=0x7feb6adc3190, msg=0x7feb6a881bd8, c=0x7ffea166bbd0) at core/action.c:1666 #9 0x00007feb69eab0a2 in reply_received (p_msg=0x7feb6a881bd8) at t_reply.c:2543 #10 0x000000000059dc77 in do_forward_reply (msg=0x7feb6a881bd8, mode=0) at core/forward.c:764 #11 0x000000000059f949 in forward_reply (msg=0x7feb6a881bd8) at core/forward.c:865 #12 0x00000000005f095a in receive_msg ( buf=0xacec80 <buf.7134> "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 79.170.70.13;branch=z9hG4bK7837.ffc6315fbd54de1e6a00b32fa1cc0eda.1\r\nVia: SIP/2.0/UDP 79.170.66.28:5080;received=79.170.66.28;rport=5080;branch=z9hG4bK83ve3c7ty27QF"..., len=426, rcv_info=0x7ffea166c6c0) at core/receive.c:509 #13 0x00000000004e3cd7 in udp_rcv_loop () at core/udp_server.c:543 #14 0x0000000000429f56 in main_loop () at main.c:1689 #15 0x0000000000434034 in main (argc=15, argv=0x7ffea166cf58) at main.c:2876 ``` [Uploading core_kamailio_mia_osp_feb18.log…]() could you please take a look to the attached full backtrace? thanks a lot and regards david -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3040 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3040(a)github.com>

3 3

git:master:355c0210: core: parse sdp - removed redundant check
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 355c02106c95400c44833a89aeea68c61ba2f200 URL: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T21:41:06+01:00 core: parse sdp - removed redundant check --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… Patch: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index d81413a0a5..404a20fee8 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -685,8 +685,7 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) return -1; } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); - if((d1p + delimiter.len + 2 > bodylimit) - || (d2p - d1p < delimiter.len + 2)) { + if(d2p - d1p < delimiter.len + 2) { LM_ERR("invalid format [%.*s]\n", (int)(d2p-d1p), d1p); return -1; }

1 0

git:master:7076904d: core: parse sdp - detect multipart invalid format
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 7076904d0f0980d6bfa0814e3b1a8c61ee0acecc URL: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T21:36:16+01:00 core: parse sdp - detect multipart invalid format --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… Patch: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index dc584e1c8b..d81413a0a5 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -685,6 +685,11 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) return -1; } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); + if((d1p + delimiter.len + 2 > bodylimit) + || (d2p - d1p < delimiter.len + 2)) { + LM_ERR("invalid format [%.*s]\n", (int)(d2p-d1p), d1p); + return -1; + } /* d2p is text limit for application parsing */ memset(&hf, 0, sizeof(struct hdr_field)); rest = eat_line(d1p + delimiter.len + 2, d2p - d1p - delimiter.len - 2);

1 0

git:master:11d9cf59: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 11d9cf595eb92c8eee74ab386db0c061ee1c63f0 URL: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-11T13:31:20+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06… Patch: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06…

1 0

git:master:70c38551: textops: remove_hf_match() returns true when a header is removed
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 70c385518829d07b2061678af4e2d7f21587e454 URL: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:21:48+01:00 textops: remove_hf_match() returns true when a header is removed --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Patch: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e47e7b65d1..e4de8600d2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2243,7 +2243,7 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) regex_t mre; regmatch_t pmatch; char c; - int ret = -1; + int ret = -2; memset(&mre, 0, sizeof(regex_t)); @@ -2330,9 +2330,6 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) ret = 1; } } - if(ret==-1) { - ret = 2; - } done: if(vop==4) {

1 0

git:master:8b24f28e: textops: added remove_hf_match(hname, op, expr)
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 8b24f28e9949271d993a5f6cf814fe1de2ddbf6d URL: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:09:55+01:00 textops: added remove_hf_match(hname, op, expr) - remove headers with name hname that match the body with expr --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Patch: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1…

1 0

git:master:5c59e96a: textops: docs for remove_hf_match()
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 5c59e96a7d0a04bff13bde8be688fae8c4d664d9 URL: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:20:48+01:00 textops: docs for remove_hf_match() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Patch: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 2a166f37a9..9805aac6aa 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1541,6 +1541,50 @@ remove_hf_idx("X-My-Header", "-1"); </example> </section> + <section id="textops.f.remove_hf_match"> + <title> + <function moreinfo="none">remove_hf_match(hname, op, expr)</function> + </title> + <para> + Remove from message all headers with name 'hname' matching the body + with expression <quote>expr</quote>, based on operator + <quote>op</quote>. + </para> + <para> + Returns true if at least one header is found and removed. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hanem</emphasis> - name of the header. + </para> + </listitem> + <listitem> + <para><emphasis>op</emphasis> - operator - it can be: 'eq' - equal; + 'ne' - not equal; 'in' - include; 're' - regular expression match. + </para> + </listitem> + <listitem> + <para><emphasis>expr</emphasis> - expression to match. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_hf_match</function> usage</title> + <programlisting format="linespecific"> +... +if(remove_hf_match("X-Info", "in", "^data")) { + # all headers with name "X-Info" that have the body matching regular + # expression "^data" are removed +} +... +</programlisting> + </example> + </section> + <section id="textops.f.has_body"> <title> <function moreinfo="none">has_body()</function>,

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev