sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
242 discussions

[kamailio/kamailio] dialog keep-alive only for own records (PR #3023)

by Riccardo-78

#### 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 - [x] Related to issue #3018 #### Description Skip keepalive check if dialog is not local, do the same in case of dialog timeout  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3023 -- Commit Summary -- * dialog: don't do nothing on timeout if dialog is not local * dialog: don't sent ka if dialog is not local -- File Changes -- M src/modules/dialog/dlg_handlers.c (10) M src/modules/dialog/dlg_req_within.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3023.patch https://github.com/kamailio/kamailio/pull/3023.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3023 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3023(a)github.com>

2 years, 10 months

git:master:e530ad44: dialog: add ignore_non_local_dlg parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e530ad444741a2d8bddc1e6c67676282ce648456 URL: https://github.com/kamailio/kamailio/commit/e530ad444741a2d8bddc1e6c6767628… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T15:57:17+01:00 dialog: add ignore_non_local_dlg parameter --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_req_within.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e530ad444741a2d8bddc1e6c6767628… Patch: https://github.com/kamailio/kamailio/commit/e530ad444741a2d8bddc1e6c6767628… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index a25224318c..ddcb3b134b 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -104,6 +104,7 @@ str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; static int db_skip_load = 0; static int dlg_keep_proxy_rr = 0; +int dlg_ignore_non_local_dlg = 0; int initial_cbs_inscript = 1; int dlg_wait_ack = 1; static int dlg_timer_procs = 0; @@ -327,6 +328,7 @@ static param_export_t mod_params[]={ { "h_id_start", PARAM_INT, &dlg_h_id_start }, { "h_id_step", PARAM_INT, &dlg_h_id_step }, { "keep_proxy_rr", INT_PARAM, &dlg_keep_proxy_rr }, + { "ignore_non_local_dlg", INT_PARAM, &dlg_ignore_non_local_dlg }, { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 422a714daf..dd8cef6fd8 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -71,6 +71,7 @@ extern int dlg_send_bye; extern int dlg_event_rt[DLG_EVENTRT_MAX]; extern int dlg_wait_ack; extern int dlg_enable_dmq; +extern int dlg_ignore_non_local_dlg; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -1581,14 +1582,16 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); - if (dlg->bind_addr[0] == NULL) { - LM_DBG("skipping dialog without bind address\n"); - return 0; - } + if (dlg_ignore_non_local_dlg) { + if (dlg->bind_addr[0] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return; + } - if (lookup_local_socket(&(dlg->bind_addr[0]->sock_str)) == NULL) { - LM_DBG("skipping non local dialog\n"); - return 0; + if (lookup_local_socket(&(dlg->bind_addr[0]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return; + } } /* mark dialog as expired */ diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index fb81da8066..c38d2062cc 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -53,6 +53,7 @@ extern str dlg_extra_hdrs; extern str dlg_lreq_callee_headers; extern int dlg_ka_failed_limit; +extern int dlg_ignore_non_local_dlg; /** * @@ -452,14 +453,16 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) int result; dlg_iuid_t *iuid = NULL; - if (dlg->bind_addr[dir] == NULL) { - LM_DBG("skipping dialog without bind address\n"); - return 0; - } + if (dlg_ignore_non_local_dlg) { + if (dlg->bind_addr[dir] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return 0; + } - if (lookup_local_socket(&(dlg->bind_addr[dir]->sock_str)) == NULL) { - LM_DBG("skipping non local dialog\n"); - return 0; + if (lookup_local_socket(&(dlg->bind_addr[dir]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return 0; + } } /* do not send KA request for non-confirmed dialogs (not supported) */ diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 290e68d4d6..1850a08de6 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1299,7 +1299,26 @@ modparam("dialog", "send_bye", 1) </programlisting> </example> </section> - + <section id="dialog.p.ignore_non_local_dlg"> + <title><varname>ignore_non_local_dlg</varname> (int)</title> + <para> + If set to 1, don't send keepalives and + do nothing on timeout if dialog is non local. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ignore_non_local_dlg</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "ignore_non_local_dlg", 1) +... +</programlisting> + </example> + </section> <section id="dialog.p.wait_ack"> <title><varname>wait_ack</varname> (int)</title> <para>

2 years, 10 months

git:master:f8398d93: dialog: don't sent ka if dialog is not local

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f8398d937611c692f87ccc0ddc284442acbf1893 URL: https://github.com/kamailio/kamailio/commit/f8398d937611c692f87ccc0ddc28444… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T15:57:17+01:00 dialog: don't sent ka if dialog is not local --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/f8398d937611c692f87ccc0ddc28444… Patch: https://github.com/kamailio/kamailio/commit/f8398d937611c692f87ccc0ddc28444… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 809834527f..fb81da8066 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -452,6 +452,16 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) int result; dlg_iuid_t *iuid = NULL; + if (dlg->bind_addr[dir] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return 0; + } + + if (lookup_local_socket(&(dlg->bind_addr[dir]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return 0; + } + /* do not send KA request for non-confirmed dialogs (not supported) */ if (dlg->state != DLG_STATE_CONFIRMED) { LM_DBG("skipping non-confirmed dialogs\n");

2 years, 10 months

git:master:79c4c7d0: dialog: don't do nothing on timeout if dialog is not local

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 79c4c7d0c4de2b15c68e07380a106544f2e27dbe URL: https://github.com/kamailio/kamailio/commit/79c4c7d0c4de2b15c68e07380a10654… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-11T15:57:17+01:00 dialog: don't do nothing on timeout if dialog is not local --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/79c4c7d0c4de2b15c68e07380a10654… Patch: https://github.com/kamailio/kamailio/commit/79c4c7d0c4de2b15c68e07380a10654… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 3f8adefb79..422a714daf 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1581,6 +1581,16 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg = ((struct dlg_cell*)((char *)(tl) - (unsigned long)(&((struct dlg_cell*)0)->tl))); + if (dlg->bind_addr[0] == NULL) { + LM_DBG("skipping dialog without bind address\n"); + return 0; + } + + if (lookup_local_socket(&(dlg->bind_addr[0]->sock_str)) == NULL) { + LM_DBG("skipping non local dialog\n"); + return 0; + } + /* mark dialog as expired */ dlg->dflags |= DLG_FLAG_EXPIRED;

2 years, 10 months

[kamailio/kamailio] resending same message from UE after receiving RP-ACK (Issue #3022)

by EugeneBogush

### Description I trying to use smsops module as SMSC. ### Troubleshooting When I sending message from UE I see re-sending same message after each RP-ACK #### Reproduction Always when I send sms message. #### Log Messages [case1.log](https://github.com/kamailio/kamailio/files/8042347/case1.log) #### SIP Traffic [sip.zip](https://github.com/kamailio/kamailio/files/8042345/sip.zip) ### Additional Information 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 07:21:24 Oct 22 2021 with gcc 7.5.0 ubuntu 18.04 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3022 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3022(a)github.com>

2 years, 10 months

git:master:b3314c8b: modules: readme files regenerated - xmlops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b3314c8b99fb7e9c15aee137e2b9f1fe83881c05 URL: https://github.com/kamailio/kamailio/commit/b3314c8b99fb7e9c15aee137e2b9f1f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-10T17:16:16+01:00 modules: readme files regenerated - xmlops ... [skip ci] --- Modified: src/modules/xmlops/README --- Diff: https://github.com/kamailio/kamailio/commit/b3314c8b99fb7e9c15aee137e2b9f1f… Patch: https://github.com/kamailio/kamailio/commit/b3314c8b99fb7e9c15aee137e2b9f1f… --- diff --git a/src/modules/xmlops/README b/src/modules/xmlops/README index 0ecfcb5ca0..df62770802 100644 --- a/src/modules/xmlops/README +++ b/src/modules/xmlops/README @@ -93,11 +93,28 @@ modparam("xmlops", "buf_size", 8192) 3.2. xml_ns (str) Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'. + 'prefix=uri'. It can be set many times to cope with multiple namespaces + without prefix. + + This is useful when it is needed to access XML documents that specify + xmlns without prefix, which is not XML-standard compliant, but it comes + with SIP SIMPLE presence bodies. Example 1.2. Set xml_ns parameter ... modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") +... +$xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?> + <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@mydomain.com" +> + <tuple id="86ae65b7-42de-4399-b635-295caad13aac"> + <status><basic>none</basic></status> + </tuple> + </presence>'; + +xinfo("status: $xml(x=>xpath:/pidf:presence/pidf:tuple/pidf:status/pidf:basic)\n +"); ... 4. Pseudo-Variables

2 years, 10 months

git:master:56e26387: xmlops: docs - added the remark that xml_ns param can be set many times

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 56e26387b77536e6c9f13dd62e5aecabaaba2d9a URL: https://github.com/kamailio/kamailio/commit/56e26387b77536e6c9f13dd62e5aeca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-10T17:11:45+01:00 xmlops: docs - added the remark that xml_ns param can be set many times --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/56e26387b77536e6c9f13dd62e5aeca… Patch: https://github.com/kamailio/kamailio/commit/56e26387b77536e6c9f13dd62e5aeca… --- diff --git a/src/modules/xmlops/doc/xmlops_admin.xml b/src/modules/xmlops/doc/xmlops_admin.xml index d78247d310..d9a6e04a5d 100644 --- a/src/modules/xmlops/doc/xmlops_admin.xml +++ b/src/modules/xmlops/doc/xmlops_admin.xml @@ -68,7 +68,8 @@ modparam("xmlops", "buf_size", 8192) <title><varname>xml_ns</varname> (str)</title> <para> Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'. + 'prefix=uri'. It can be set many times to cope with multiple namespaces + without prefix. </para> <para> This is useful when it is needed to access XML documents that specify @@ -80,6 +81,7 @@ modparam("xmlops", "buf_size", 8192) <programlisting format="linespecific"> <![CDATA[ ... +modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") ... $xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?>

2 years, 10 months

git:master:0cb6a064: xmlops: docs - more practical example for xml_ns

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0cb6a0640e9e3e2e06d2c5bc68c6177d5bd38b89 URL: https://github.com/kamailio/kamailio/commit/0cb6a0640e9e3e2e06d2c5bc68c6177… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-10T17:06:13+01:00 xmlops: docs - more practical example for xml_ns --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0cb6a0640e9e3e2e06d2c5bc68c6177… Patch: https://github.com/kamailio/kamailio/commit/0cb6a0640e9e3e2e06d2c5bc68c6177… --- diff --git a/src/modules/xmlops/doc/xmlops_admin.xml b/src/modules/xmlops/doc/xmlops_admin.xml index 7082b03b1f..d78247d310 100644 --- a/src/modules/xmlops/doc/xmlops_admin.xml +++ b/src/modules/xmlops/doc/xmlops_admin.xml @@ -68,13 +68,30 @@ modparam("xmlops", "buf_size", 8192) <title><varname>xml_ns</varname> (str)</title> <para> Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'.</para> + 'prefix=uri'. + </para> + <para> + This is useful when it is needed to access XML documents that specify + xmlns without prefix, which is not XML-standard compliant, but it + comes with SIP SIMPLE presence bodies. + </para> <example> <title>Set <varname>xml_ns</varname> parameter</title> <programlisting format="linespecific"> +<![CDATA[ ... -modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") +... +$xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?> + <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@mydomain.com"> + <tuple id="86ae65b7-42de-4399-b635-295caad13aac"> + <status><basic>none</basic></status> + </tuple> + </presence>'; + +xinfo("status: $xml(x=>xpath:/pidf:presence/pidf:tuple/pidf:status/pidf:basic)\n"); ... +]]> </programlisting> </example> </section>

2 years, 10 months

git:master:aca381d3: core: updated description for core.psa rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aca381d30413eb1b43abf9e7e3b1306854ceb117 URL: https://github.com/kamailio/kamailio/commit/aca381d30413eb1b43abf9e7e3b1306… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-10T08:42:10+01:00 core: updated description for core.psa rpc command --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/aca381d30413eb1b43abf9e7e3b1306… Patch: https://github.com/kamailio/kamailio/commit/aca381d30413eb1b43abf9e7e3b1306… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index e4695bb251..d045a144cb 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -478,7 +478,7 @@ static void core_psx(rpc_t* rpc, void* c) } static const char* core_psa_doc[] = { - "Return all the attributes of running.", + "Return all the attributes of running processes.", /* Documentation string */ 0 /* Method signature(s) */ };

2 years, 10 months

Timers firing too soon

by Alberto Izquierdo

Hi all, I'm using Kamailio timers to execute a series of calls with a certain delay. I have found out that from time to time, the timers are triggered too soon, sometimes they are triggered 2/3 seconds before they should. There is nothing significant in the logs, some of the log lines previous to the premature call are: 10(16136) DEBUG: tm [timer.c:606]: wait_handler(): WAIT timer hit @1111936903 for 0x7f32cc4eede8 (timer_lm 0x7f32cc4eee70) 10(16136) DEBUG: tm [timer.c:643]: wait_handler(): finished transaction: 0x7f32cc4eede8 (p:0x7f32cc34ee90/n:0x7f32cc34ee90) 10(16136) DEBUG: tm [h_table.c:132]: free_cell_helper(): freeing transaction 0x7f32cc4eede8 from timer.c:652 And some other ones after the call are 10(16136) DEBUG: tm [timer.c:494]: retr_buf_handler(): timer retr_buf_handler @1111937043 (0x7f32cc4efa18 -> 0x7f32cc4ef9f8 -> 0x7f32cc4ef6d8) 10(16136) DEBUG: tm [timer.c:545]: retr_buf_handler(): new interval 2000 ms / 16 ticks (max 4000 ms) 10(16136) DEBUG: tm [timer.c:329]: retransmission_handler(): request resending (t=0x7f32cc4ef6d8, SUBSCRIBE ... ) 10(16136) DEBUG: tm [timer.c:573]: retr_buf_handler(): timer retr_buf_handler @1111937043 (0x7f32cc4efa18 ->0x7f32cc4ef9f8->0x7f32cc4ef6d8) exiting min (16, 24) I have read in the documentation that it is normal to have a bit of delay in some of the timers, but it doesn't mention anything about this behavior. Is this normal? Thank you.

2 years, 10 months

← Newer
1
...
17
18
19
20
21
22
23
24
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022