sr-dev September 2020

sr-dev@lists.kamailio.org

12 participants
269 discussions

git:master:9c97c700: rr: new function loose_route_mode(vmode)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c97c700a7db52e80189b88f2c6950f3dabbc8ed URL: https://github.com/kamailio/kamailio/commit/9c97c700a7db52e80189b88f2c6950f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T13:24:31+02:00 rr: new function loose_route_mode(vmode) - if vmode==1, then do only loose routing (do not test if r-uri==myself to do strict routing, always do loose routing, with preloaded check like loose_route()) - if vmode==0, then behave like loose_route() --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/loose.h Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9c97c700a7db52e80189b88f2c6950f… Patch: https://github.com/kamailio/kamailio/commit/9c97c700a7db52e80189b88f2c6950f…

3 years, 8 months

git:master:e307432e: dispatcher: sync on updating last used fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e307432e5f34a2093544e9ff703ea205169e4088 URL: https://github.com/kamailio/kamailio/commit/e307432e5f34a2093544e9ff703ea20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T13:01:17+02:00 dispatcher: sync on updating last used fields --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e307432e5f34a2093544e9ff703ea20… Patch: https://github.com/kamailio/kamailio/commit/e307432e5f34a2093544e9ff703ea20… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b78a89fdb5..4066bc39d7 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2070,6 +2070,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) unsigned int hash; ds_set_t *idx = NULL; int ulast = 0; + int vlast = 0; if(msg == NULL) { LM_ERR("bad parameters\n"); @@ -2124,8 +2125,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } break; case DS_ALG_ROUNDROBIN: /* 4 - round robin */ + lock_get(&idx->lock); hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + vlast = idx->last; + lock_release(&idx->lock); ulast = 1; break; case DS_ALG_HASHAUTHUSER: /* 5 - hash auth username */ @@ -2136,8 +2140,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) break; case 1: /* No Authorization found: Use round robin */ + lock_get(&idx->lock); hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + vlast = idx->last; + lock_release(&idx->lock); ulast = 1; break; default: @@ -2158,8 +2165,10 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) hash = 0; break; case DS_ALG_WEIGHT: /* 9 - weight based distribution */ + lock_get(&idx->lock); hash = idx->wlist[idx->wlast]; idx->wlast = (idx->wlast + 1) % 100; + lock_release(&idx->lock); break; case DS_ALG_CALLLOAD: /* 10 - call load based distribution */ /* only INVITE can start a call */ @@ -2189,8 +2198,10 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } break; case DS_ALG_RELWEIGHT: /* 11 - relative weight based distribution */ + lock_get(&idx->lock); hash = idx->rwlist[idx->rwlast]; idx->rwlast = (idx->rwlast + 1) % 100; + lock_release(&idx->lock); break; case DS_ALG_PARALLEL: /* 12 - parallel dispatching */ hash = 0; @@ -2240,10 +2251,13 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) rstate->emode = 1; } - /* update last field for next select to point after the current active used */ - if(ulast) { + /* update last field for next select to point after the current active used, + * if not updated meanwhile */ + lock_get(&idx->lock); + if(ulast && (vlast == idx->last)) { idx->last = (hash + 1) % idx->nr; } + lock_release(&idx->lock); LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, rstate->umode, hash,

3 years, 8 months

git:5.2:01d814b8: dispatcher: update state if sending keepalive OPTIONS fails

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 01d814b824c5b03a044f793783bd9ab7a9d811c3 URL: https://github.com/kamailio/kamailio/commit/01d814b824c5b03a044f793783bd9ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T09:34:56+02:00 dispatcher: update state if sending keepalive OPTIONS fails - backport of 4584e17b98f338916cc89dac6e1700f250cdf501 (cherry picked from commit 1bccb817c20f02665d48a38eb59a57a6ae17b81f) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/01d814b824c5b03a044f793783bd9ab… Patch: https://github.com/kamailio/kamailio/commit/01d814b824c5b03a044f793783bd9ab… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 77294c7782..23625e87d1 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3095,6 +3095,7 @@ void ds_ping_set(ds_set_t *node) uac_req_t uac_r; int i, j; str ping_from; + int state; if(!node) return; @@ -3144,6 +3145,18 @@ void ds_ping_set(ds_set_t *node) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); + state = DS_TRYING_DST; + if(ds_probing_mode != DS_PROBE_NONE) { + state |= DS_PROBING_DST; + } + /* check if meantime someone disabled the target via RPC */ + if(!(node->dlist[j].flags & DS_DISABLED_DST) + && ds_update_state(NULL, node->id, &node->dlist[j].uri, + state) != 0) { + LM_ERR("Setting the probing state failed (%.*s, group %d)\n", + node->dlist[j].uri.len, node->dlist[j].uri.s, + node->id); + } } } }

3 years, 8 months

git:5.3:1bccb817: dispatcher: update state if sending keepalive OPTIONS fails

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 1bccb817c20f02665d48a38eb59a57a6ae17b81f URL: https://github.com/kamailio/kamailio/commit/1bccb817c20f02665d48a38eb59a57a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T09:33:16+02:00 dispatcher: update state if sending keepalive OPTIONS fails - backport of 4584e17b98f338916cc89dac6e1700f250cdf501 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/1bccb817c20f02665d48a38eb59a57a… Patch: https://github.com/kamailio/kamailio/commit/1bccb817c20f02665d48a38eb59a57a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d66a48e919..aa563a984b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3252,6 +3252,7 @@ void ds_ping_set(ds_set_t *node) uac_req_t uac_r; int i, j; str ping_from; + int state; if(!node) return; @@ -3300,6 +3301,18 @@ void ds_ping_set(ds_set_t *node) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); + state = DS_TRYING_DST; + if(ds_probing_mode != DS_PROBE_NONE) { + state |= DS_PROBING_DST; + } + /* check if meantime someone disabled the target via RPC */ + if(!(node->dlist[j].flags & DS_DISABLED_DST) + && ds_update_state(NULL, node->id, &node->dlist[j].uri, + state) != 0) { + LM_ERR("Setting the probing state failed (%.*s, group %d)\n", + node->dlist[j].uri.len, node->dlist[j].uri.s, + node->id); + } } } }

3 years, 8 months

Multi Kamailio Scenarios

by Benjamín Visón

I am setting up a redundant active/active environment and I am in need of having 2 kamailios operate as full proxies (meaning both of them will accept registrations). I am using DMQ in order to keep htables synched as well as dialogs. For locations, I have a PostgreSQL database with the registrations. My problem is that since both kamailios are accepting registrations the UACs are only able to receive packets from the UAS on which they are registered. Therefore when let's say UAC-1 registers to Kamailio A and it tries to call UAC-2 which is registered on Kamailio B nothing happens because UAC-2 receives the INVITE from Kamailio A and just ignores them. I've spent almost a month trying to play with inter-kamailio communication (that is, detecting these types of scenarios and sending the INVITE to Kamailio B and have Kamailio B send the INVITE to UAC-2) but there are a LOT of things that are not working properly let alone having to keep track of all the dialog information and to/from tags and doing proper route of all ACK/BYE/CANCEL, etc. My question is, is there a way to achieve this scenario where multiple kamailios can coexist with all responsibilities? Things I've tried: - Keep track of to/from tag in an htable and forward requests based on who sent the request - Use append_branches to handle multiple AOR (with the possibility of 1 user having multiple registrations in different kamailios) - Manually tweaking $ru/$du based on what type of request is and who is it destined to. Any orientation will be appreciated as this is a crucial piece of the project I'm working on. Saludos, [image: Facebook] <https://www.facebook.com/bvisonl>[image: Twitter] <https://twitter.com/benjaminvison>[image: Instagram] <https://instagram.com/bvisonl/> Benjamín Visón / IT Engineer / Software Developer bvisonl(a)gmail.com / (829)-664-5163

3 years, 8 months

git:master:3c19ca90: docs: add matrix channel information to normal and github READMEs

by Henning Westerholt

Module: kamailio Branch: master Commit: 3c19ca90327d92be69cdce482e66991147db9083 URL: https://github.com/kamailio/kamailio/commit/3c19ca90327d92be69cdce482e66991… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-12T09:57:10Z docs: add matrix channel information to normal and github READMEs --- Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/3c19ca90327d92be69cdce482e66991… Patch: https://github.com/kamailio/kamailio/commit/3c19ca90327d92be69cdce482e66991… --- diff --git a/README b/README index 8458765154..957361df15 100644 --- a/README +++ b/README @@ -109,7 +109,8 @@ To participate in the mailing list, subscribe at the following web address: https://lists.kamailio.org/mailman/listinfo/sr-users The IRC channel #kamailio on freenode.net is a place where to meet and discuss -with other members of Kamailio community. +with other members of Kamailio community. Additionally there is also a Matrix +Kamailio community channel available on https://riot.kamailio.dev/. VI. Contributions ================= diff --git a/README.md b/README.md index 8005030775..f160311182 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,13 @@ An open IRC discussion channel is managed by the community: * irc server: irc.freenode.net * irc channel: #kamailio +### Matrix Channel + +An open Matrix discussion channel is managed by the community: + + * server: https://riot.kamailio.dev/ + * Room: https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev + ## Useful Resources News:

3 years, 8 months

git:master:e52c1f33: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e52c1f334fb98e00809226cde190da3406976348 URL: https://github.com/kamailio/kamailio/commit/e52c1f334fb98e00809226cde190da3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-11T22:16:12+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/e52c1f334fb98e00809226cde190da3… Patch: https://github.com/kamailio/kamailio/commit/e52c1f334fb98e00809226cde190da3… --- 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:master:2e9d4e2d: usrloc: docs for ka_timeout module parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2e9d4e2dc45bf5baab1bff9c13fc841b66793cb4 URL: https://github.com/kamailio/kamailio/commit/2e9d4e2dc45bf5baab1bff9c13fc841… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-11T22:07:31+02:00 usrloc: docs for ka_timeout module parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e9d4e2dc45bf5baab1bff9c13fc841… Patch: https://github.com/kamailio/kamailio/commit/2e9d4e2dc45bf5baab1bff9c13fc841… --- 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:master:9331044b: usrloc: export modparam to set keepalive timeout

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9331044bf517be120dea59414402415090b63007 URL: https://github.com/kamailio/kamailio/commit/9331044bf517be120dea59414402415… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-11T22:07:31+02:00 usrloc: export modparam to set keepalive timeout - variable was not exported by the module for internal keepalive mechanism --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9331044bf517be120dea59414402415… Patch: https://github.com/kamailio/kamailio/commit/9331044bf517be120dea59414402415… --- 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

[kamailio/kamailio] msrp: fixed IPv6 addrees parsing (#2472)

by sergey-safarov

#### 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 - [*] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fix relaying MSRP messages to IPv6 uri. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2472 -- Commit Summary -- * msrp: fixed IPv6 addrees parsing -- File Changes -- M src/modules/msrp/msrp_parser.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2472.patch https://github.com/kamailio/kamailio/pull/2472.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/2472

3 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
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