sr-dev September 2020

sr-dev@lists.kamailio.org

12 participants
269 discussions

git:5.4:609685c9: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.4 Commit: 609685c91d92337a1d0832d709ebff437fb193ef URL: https://github.com/kamailio/kamailio/commit/609685c91d92337a1d0832d709ebff4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-22T19:46:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/609685c91d92337a1d0832d709ebff4… Patch: https://github.com/kamailio/kamailio/commit/609685c91d92337a1d0832d709ebff4… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ac3a6b7bb6..d075042834 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -94,8 +94,9 @@ Carsten Bock 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 4. RPC Commands @@ -197,8 +198,9 @@ Carsten Bock 1.52. ka_from parameter usage 1.53. ka_domain parameter usage 1.54. ka_filter parameter usage - 1.55. ka_loglevel parameter usage - 1.56. ka_logmsg parameter usage + 1.55. Set ka_timeout parameter + 1.56. ka_loglevel parameter usage + 1.57. ka_logmsg parameter usage Chapter 1. Admin Guide @@ -269,8 +271,9 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 4. RPC Commands @@ -404,8 +407,9 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 3.1. nat_bflag (int) @@ -683,8 +687,8 @@ modparam("usrloc", "desc_time_order", 1) 3.25. timer_interval (int) Number of seconds between two timer runs. The module uses a timer to - delete expired contacts, synchronize with database and other tasks, - that need to be run periodically. + delete expired contacts, synchronize with database, send keepalives and + other tasks, that need to be run periodically. Default value is 60. @@ -1163,19 +1167,38 @@ modparam("usrloc", "ka_domain", "mydomain.com") modparam("usrloc", "ka_filter", 1) ... -3.55. ka_loglevel (int) +3.55. ka_timeout (int) + + The parameter sets the interval in seconds after which a contact is + removed from location table if it does not reply to SIP keepalives + (usually OPTIONS ping requests). + + The features is available only for contacts that are stored in memory + (not working for db only mode of the usrloc module). + + Keepalives are sent stateless, not using TM module. The value of this + parameter has to be few times higher than timer interval. + + Default value is “0” (feature disabled). + + Example 1.55. Set ka_timeout parameter +... +modparam("usrloc", "ka_timeout", 120) +... + +3.56. ka_loglevel (int) The level to print the log message when the keepalive response is received. It should be a value between -5 (L_ALERT) and 3 (L_DBG). Default value is “255” (disabled). - Example 1.55. ka_loglevel parameter usage + Example 1.56. ka_loglevel parameter usage ... modparam("usrloc", "ka_loglevel", 1) ... -3.56. ka_logmsg (str) +3.57. ka_logmsg (str) The formatted log specification to be added to the message printed when the keepalive is received and roundtrip time is computed. The log @@ -1187,7 +1210,7 @@ modparam("usrloc", "ka_loglevel", 1) Default value is “ to-uri: [$tu] remote-addr: [$sas]”. - Example 1.56. ka_logmsg parameter usage + Example 1.57. ka_logmsg parameter usage ... modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ...

3 years, 8 months

git:5.4:79ec049b: usrloc: docs for ka_timeout module parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 79ec049ba50c0c48c02748c2679c07f4da2a766e URL: https://github.com/kamailio/kamailio/commit/79ec049ba50c0c48c02748c2679c07f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-22T19:28:58+02:00 usrloc: docs for ka_timeout module parameter (cherry picked from commit 2e9d4e2dc45bf5baab1bff9c13fc841b66793cb4) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79ec049ba50c0c48c02748c2679c07f… Patch: https://github.com/kamailio/kamailio/commit/79ec049ba50c0c48c02748c2679c07f… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 396d89828d..4b624fb81f 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -604,8 +604,8 @@ modparam("usrloc", "desc_time_order", 1) <title><varname>timer_interval</varname> (int)</title> <para> Number of seconds between two timer runs. The module uses a timer to - delete expired contacts, synchronize with database and other tasks, - that need to be run periodically. + delete expired contacts, synchronize with database, send keepalives + and other tasks, that need to be run periodically. </para> <para> <emphasis> @@ -1424,6 +1424,36 @@ modparam("usrloc", "ka_filter", 1) </example> </section> + <section id="usrloc.p.ka_timeout"> + <title><varname>ka_timeout</varname> (int)</title> + <para> + The parameter sets the interval in seconds after which a + contact is removed from location table if it does not reply to SIP + keepalives (usually OPTIONS ping requests). + </para> + <para> + The features is available only for contacts that are stored in memory + (not working for db only mode of the usrloc module). + </para> + <para> + Keepalives are sent stateless, not using TM module. The value of this + parameter has to be few times higher than timer interval. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (feature disabled). + </emphasis> + </para> + <example> + <title>Set <varname>ka_timeout</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_timeout", 120) +... +</programlisting> + </example> + </section> + <section id="usrloc.p.ka_loglevel"> <title><varname>ka_loglevel</varname> (int)</title> <para>

3 years, 8 months

git:5.4:f5eb642c: usrloc: export modparam to set keepalive timeout

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: f5eb642c9bc9012debd2009ad03f2598d0c7c354 URL: https://github.com/kamailio/kamailio/commit/f5eb642c9bc9012debd2009ad03f259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-22T19:28:48+02:00 usrloc: export modparam to set keepalive timeout - variable was not exported by the module for internal keepalive mechanism (cherry picked from commit 9331044bf517be120dea59414402415090b63007) --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f5eb642c9bc9012debd2009ad03f259… Patch: https://github.com/kamailio/kamailio/commit/f5eb642c9bc9012debd2009ad03f259… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 7aecb318a1..860fb715b5 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -258,6 +258,7 @@ static param_export_t params[] = { {"ka_domain", PARAM_STR, &ul_ka_domain}, {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, + {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg}, {0, 0, 0}

3 years, 8 months

git:master:92cfb5e8: imc: jump over printing error log messages when list commands are ok

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92cfb5e8d291706889c926892397e663e2d93b05 URL: https://github.com/kamailio/kamailio/commit/92cfb5e8d291706889c926892397e66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-22T19:01:34+02:00 imc: jump over printing error log messages when list commands are ok - reported by GH #2481 --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92cfb5e8d291706889c926892397e66… Patch: https://github.com/kamailio/kamailio/commit/92cfb5e8d291706889c926892397e66… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 4ace0b800e..9dbc403e3e 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -942,13 +942,15 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, struct imc_uri room; memset(&room, '\0', sizeof(room)); - if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) - goto error; + if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, + &dst->parsed)) { + goto done; + } rm = imc_get_room(&room.parsed.user, &room.parsed.host); if (rm == NULL || (rm->flags & IMC_ROOM_DELETED)) { LM_ERR("Room [%.*s] does not exist!\n", STR_FMT(&room.uri)); - goto error; + goto done; } /* verify if the user is a member of the room */ @@ -956,7 +958,7 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, if (member == NULL) { LM_ERR("User [%.*s] is not member of room [%.*s]!\n", STR_FMT(&src->uri), STR_FMT(&rm->uri)); - goto error; + goto done; } p = imc_body_buf; @@ -1004,13 +1006,16 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, body.len = p - body.s; LM_DBG("members = '%.*s'\n", STR_FMT(&body)); - LM_ERR("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); + LM_DBG("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); imc_send_message(&rm->uri, &member->uri, build_headers(msg), &body); rv = 0; + goto done; + overrun: LM_ERR("Buffer too small for member list message\n"); -error: + +done: if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; @@ -1065,7 +1070,8 @@ int imc_handle_rooms(struct sip_msg* msg, imc_cmd_t *cmd, LM_DBG("rooms = '%.*s'\n", STR_FMT(&body)); imc_send_message(&dst->uri, &src->uri, build_headers(msg), &body); - rv = 0; + return 0; + error: LM_ERR("Buffer too small for member list message\n"); return rv;

3 years, 8 months

[kamailio/kamailio] Matching uri == myself fails when request uri has parameter (#2482)

by Jukka Väisänen

### Description If the SIP request URI has a parameter ;user=phone, then the match with `myself` fails with error in log. ### Troubleshooting Sending an OPTIONS request through the proxy: ``` OPTIONS sip:+358removed@example.com;user=phone SIP/2.0. ... From: <sip:+358removed@example.com;user=phone>;tag=JJhksk01ou7PFTq8xz1-GlhgGNG-c94A. To: <sip:+358removed@example.com;user=phone>. ... Content-Length: 0. ``` Note: The R-URI does NOT match myself. It never does in my case unless it's an attacker. #### Reproduction My config is very simple in terms of aliases: ``` auto_aliases=no alias=172.29.1.21:5060 ``` and in routing block: ` if (uri==myself) return;` Log shows: ``` Listening on udp: 172.29.1.21 [172.29.1.21]:5060 Aliases: *: 172.29.1.21:5060 ... 7(20681) ERROR: <core> [core/resolve.c:1808]: str2ip6buf(): invalid name, no conversion to IP address possible ... ``` ### Possible Solutions Sorry, I couldn't figure out where in the source this call to resolve.c functions happens. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.6 (x86_64/linux) bf6c08 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 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: bf6c08 compiled on 09:25:09 Sep 10 2020 with gcc 4.8.5 ``` * **Operating System**: ``` Amazon Linux 2 (up to date) on AWS ``` -- 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/2482

3 years, 8 months

[kamailio/kamailio] Keepalive - Remove race condition when removing destination (#2474)

by Nacho G.

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2474 -- Commit Summary -- * WIP -- File Changes -- M src/modules/keepalive/keepalive.h (1) M src/modules/keepalive/keepalive_api.c (23) M src/modules/keepalive/keepalive_core.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2474.patch https://github.com/kamailio/kamailio/pull/2474.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2474

3 years, 8 months

git:master:7fb391b4: Merge pull request #2474 from NGSegovia/keepalive_solve_sync_problems

by GitHub

Module: kamailio Branch: master Commit: 7fb391b4c320741ccc950ddf13c7bf256cc55f62 URL: https://github.com/kamailio/kamailio/commit/7fb391b4c320741ccc950ddf13c7bf2… Author: Nacho G <nacho.gs(a)zaleos.net> Committer: GitHub <noreply(a)github.com> Date: 2020-09-22T17:52:57+02:00 Merge pull request #2474 from NGSegovia/keepalive_solve_sync_problems Keepalive - Remove race condition when removing destination --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7fb391b4c320741ccc950ddf13c7bf2… Patch: https://github.com/kamailio/kamailio/commit/7fb391b4c320741ccc950ddf13c7bf2…

3 years, 8 months

git:master:fb115679: keepalive: prevent race condition when deleting a destination

by Nacho Garcia Segovia

Module: kamailio Branch: master Commit: fb115679228b19944f886893b47743db44465072 URL: https://github.com/kamailio/kamailio/commit/fb115679228b19944f886893b47743d… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-09-14T13:18:37+02:00 keepalive: prevent race condition when deleting a destination - Added a lock to ka_dest type, so we get it when we run callbacks that may be associated to an OPTIONS response - Same lock is used to not remove destinations that are running callbacks - Now find destinations consider owner and uri --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/fb115679228b19944f886893b47743d… Patch: https://github.com/kamailio/kamailio/commit/fb115679228b19944f886893b47743d…

3 years, 8 months

Info: recordings of Kamailio World 2020 sessions

by Daniel-Constantin Mierla

Hello, for those that couldn't attend the Kamailio World 2020 online event that happened a few weeks ago, or someone wants to view again a session, the recordings of the two days were split per session -- they are available on KamailioWorld youtube channel: * https://www.youtube.com/c/KamailioWorld/ For convenience, they were also grouped in a playlist for KW2020, see: * https://www.youtube.com/c/KamailioWorld/playlists No other editing than just cutting at start/stop of each session. Slides should be available at: * http://kamailio.org/events/2020-KamailioWorldOnline/ Enjoy! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 years, 9 months

git:master:b754b9f6: usrloc: use unsigned int for rpc output for the fields having this type

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b754b9f68bee0b58b4ae00b7f0764c2bf711d14c URL: https://github.com/kamailio/kamailio/commit/b754b9f68bee0b58b4ae00b7f0764c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-21T10:59:34+02:00 usrloc: use unsigned int for rpc output for the fields having this type --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b754b9f68bee0b58b4ae00b7f0764c2… Patch: https://github.com/kamailio/kamailio/commit/b754b9f68bee0b58b4ae00b7f0764c2… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 9124eb746f..63c45381b5 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -144,12 +144,12 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding state"); return -1; } - if(rpc->struct_add(vh, "d", "Flags", c->flags)<0) + if(rpc->struct_add(vh, "u", "Flags", c->flags)<0) { rpc->fault(ctx, 500, "Internal error adding flags"); return -1; } - if(rpc->struct_add(vh, "d", "CFlags", c->cflags)<0) + if(rpc->struct_add(vh, "u", "CFlags", c->cflags)<0) { rpc->fault(ctx, 500, "Internal error adding cflags"); return -1; @@ -159,7 +159,7 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding socket"); return -1; } - if(rpc->struct_add(vh, "d", "Methods", c->methods)<0) + if(rpc->struct_add(vh, "u", "Methods", c->methods)<0) { rpc->fault(ctx, 500, "Internal error adding methods"); return -1; @@ -175,7 +175,7 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding instance"); return -1; } - if(rpc->struct_add(vh, "d", "Reg-Id", c->reg_id)<0) + if(rpc->struct_add(vh, "u", "Reg-Id", c->reg_id)<0) { rpc->fault(ctx, 500, "Internal error adding reg_id"); return -1; @@ -286,7 +286,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error creating aor struct"); return; } - if(rpc->struct_add(bh, "Sd[", + if(rpc->struct_add(bh, "Su[", "AoR", &r->aor, "HashID", r->aorhash, "Contacts", &ih)<0)

3 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2020