sr-dev December 2019

sr-dev@lists.kamailio.org

19 participants
280 discussions

git:5.2:fdd8bd3c: dispatcher: small style fix in ds_probing_mode docs
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.2 Commit: fdd8bd3cce007e6256be5373d84413ffdeff802e URL: https://github.com/kamailio/kamailio/commit/fdd8bd3cce007e6256be5373d84413f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:43:48+01:00 dispatcher: small style fix in ds_probing_mode docs (cherry picked from commit faccbb1cf62bfb625d0bcc9d1a52727dcdd962ff) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fdd8bd3cce007e6256be5373d84413f… Patch: https://github.com/kamailio/kamailio/commit/fdd8bd3cce007e6256be5373d84413f… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index bcfa4a95c9..ed8b1808ad 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -644,8 +644,8 @@ modparam("dispatcher", "force_dst", 1) but you can skip some servers with flag 4 in destination list file, for example.</para> </listitem> <listitem> - <para>Value 2: if set to 2, only gateways in inactive state with - probing mode set are tested.</para> + <para>Value 2: if set to 2, only gateways in INACTIVE state with + PROBING mode set are tested.</para> </listitem> <listitem> <para>Value 3: If set to 3, any gateway with state PROBING is continually probed

1 0

git:5.1:45f62634: dispatcher: small style fix in ds_probing_mode docs
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.1 Commit: 45f6263470bc6866352d450a606d094a45bcbb70 URL: https://github.com/kamailio/kamailio/commit/45f6263470bc6866352d450a606d094… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:42:44+01:00 dispatcher: small style fix in ds_probing_mode docs (cherry picked from commit faccbb1cf62bfb625d0bcc9d1a52727dcdd962ff) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45f6263470bc6866352d450a606d094… Patch: https://github.com/kamailio/kamailio/commit/45f6263470bc6866352d450a606d094… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c62385279c..2b486ad090 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -681,8 +681,8 @@ modparam("dispatcher", "force_dst", 1) set to TRYING state.</para> </listitem> <listitem> - <para>Value 2: if set to 2, only gateways in inactive state with - probing mode set are tested.</para> + <para>Value 2: if set to 2, only gateways in INACTIVE state with + PROBING mode set are tested.</para> </listitem> <listitem> <para>Value 3: If set to 3, any gateway with state PROBING is continually probed

1 0

[kamailio/kamailio] dispatcher ds_probing_mode inconsistent behaviour (#2100)
by Henning Westerholt 19 Dec '19

19 Dec '19

I observed inconsistent behaviour in the dispatcher module. In some modes either the code needs to be fixed or the documentation adapted. As it is a widely used module, some feedback about this would be appreciated. 1) ds_probing_mode 0 This mode don't work together with a ds_inactive_threshold > 1 and gateway set to "IP". It will set a gateway to IX after the first successful ping. Therefore gateways will not be activated automatically. In mode "TP" it works and sets the gateway to "AX". My suggestion would be to fix this in the code, that it behaves as mode 1 and 3: count to the ds_inactive_threshold and then set to "AX". 2) ds_probing_mode 2 According to the docs this should like this: “only gateways in inactive state with probing mode set are tested”. I understood it that it means gateways with mode "IP". But according to my tests it also probes gateways in "TP" or "AP" probing state and changes this both to AX. Either the documentation or the module behaviour should be fixed. The same issue mentioned above (ds_probing_mode 0 together with ds_inactive_threshold > 1) is also present. I also would suggest to fix it in the code here as well. root@sip:/etc/kamailio# kamcmd core.version kamailio 5.4.0-dev1 (x86_64/linux) 8ee711 -- 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/2100

1 2

git:master:faccbb1c: dispatcher: small style fix in ds_probing_mode docs
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: faccbb1cf62bfb625d0bcc9d1a52727dcdd962ff URL: https://github.com/kamailio/kamailio/commit/faccbb1cf62bfb625d0bcc9d1a52727… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:35:58+01:00 dispatcher: small style fix in ds_probing_mode docs --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/faccbb1cf62bfb625d0bcc9d1a52727… Patch: https://github.com/kamailio/kamailio/commit/faccbb1cf62bfb625d0bcc9d1a52727… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 4c9430a630..36bf343a0d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -651,8 +651,8 @@ modparam("dispatcher", "force_dst", 1) but you can skip some servers with flag 4 in destination list file, for example.</para> </listitem> <listitem> - <para>Value 2: if set to 2, only gateways in inactive state with - probing mode set are tested.</para> + <para>Value 2: if set to 2, only gateways in INACTIVE state with + PROBING mode set are tested.</para> </listitem> <listitem> <para>Value 3: If set to 3, any gateway with state PROBING is continually probed

1 0

git:master:ee45c2a0: dispatcher: fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100)
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: ee45c2a07292cc977a7a212cac18fd2156279588 URL: https://github.com/kamailio/kamailio/commit/ee45c2a07292cc977a7a212cac18fd2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T17:32:14+01:00 dispatcher: fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100) - fix bugs in ds_inactive threshold and ds_probing_mode 2 (GH #2100) - ds_mode 2 should ping only gateways with mode inactive and probing - ds_inactive threshould should work also in ds_probing_mode 0 and 2 - move ping logic to a small helper function --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ee45c2a07292cc977a7a212cac18fd2… Patch: https://github.com/kamailio/kamailio/commit/ee45c2a07292cc977a7a212cac18fd2… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index ab55f21990..d56f579b14 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2767,6 +2767,10 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state, if(idx->dlist[i].message_count < inactive_threshold) { /* Destination has not enough successful replies.. Leaving it into inactive state */ idx->dlist[i].flags |= DS_INACTIVE_DST; + /* if destination was in probing state, we stay there for now */ + if((old_state & DS_PROBING_DST) != 0) { + idx->dlist[i].flags |= DS_PROBING_DST; + } LM_DBG("destination replied successful %d times, threshold %d\n", idx->dlist[i].message_count, inactive_threshold); } else { @@ -3235,6 +3239,32 @@ static void ds_options_callback( return; } +/* + * Small helper to decide to ping a gateway or not + */ +static inline int ds_ping_result_helper(ds_set_t *node, int j) +{ + /* probe all */ + if(ds_probing_mode == DS_PROBE_ALL) { + LM_DBG("probe all, mode DS_PROBE_ALL\n"); + return 1; + } + /* probe if probing is set, but not in mode DS_PROBE_INACTIVE */ + if (ds_probing_mode != DS_PROBE_INACTIVE + && (node->dlist[j].flags & DS_PROBING_DST) != 0) { + LM_DBG("probing set, but not mode DS_PROBE_INACTIVE\n"); + return 1; + } + /* probe for mode DS_PROBE_INACTIVE only for inactive and probing gw */ + if (ds_probing_mode == DS_PROBE_INACTIVE + && (node->dlist[j].flags & DS_PROBING_DST) != 0 + && (node->dlist[j].flags & DS_INACTIVE_DST) != 0) { + LM_DBG("probing and inactive set, mode DS_PROBE_INACTIVE\n"); + return 1; + } + return 0; +} + /** * */ @@ -3255,8 +3285,7 @@ void ds_ping_set(ds_set_t *node) if((node->dlist[j].flags & DS_DISABLED_DST) != 0) continue; /* If the Flag of the entry has "Probing set, send a probe: */ - if(ds_probing_mode == DS_PROBE_ALL - || (node->dlist[j].flags & DS_PROBING_DST) != 0) { + if(ds_ping_result_helper(node, j)) { LM_DBG("probing set #%d, URI %.*s\n", node->id, node->dlist[j].uri.len, node->dlist[j].uri.s);

1 0

git:5.2:32d4f587: sdpops: add missing line break for debug log
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.2 Commit: 32d4f5875e7b9624dc54a83f9f4a507ff20486a5 URL: https://github.com/kamailio/kamailio/commit/32d4f5875e7b9624dc54a83f9f4a507… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:35:37+01:00 sdpops: add missing line break for debug log (cherry picked from commit 0d7b5bd4575c80053e1d3851aeae34d5fbd5cf0b) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/32d4f5875e7b9624dc54a83f9f4a507… Patch: https://github.com/kamailio/kamailio/commit/32d4f5875e7b9624dc54a83f9f4a507… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 221daf5c63..d02c9dcfcc 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1058,7 +1058,7 @@ static int sdp_remove_media(sip_msg_t *msg, str *media) media->len)==0) { /* found - remove */ - LM_DBG("removing media stream: %.*s", media->len, media->s); + LM_DBG("removing media stream: %.*s\n", media->len, media->s); nxt_stream = get_sdp_stream(msg, sdp_session_num, sdp_stream_num+1); /* skip back 'm=' */

1 0

git:5.3:1ebae0fa: sdpops: add missing line break for debug log
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: 5.3 Commit: 1ebae0fa58ff83848336391422014580861bef03 URL: https://github.com/kamailio/kamailio/commit/1ebae0fa58ff8384833639142201458… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:35:20+01:00 sdpops: add missing line break for debug log (cherry picked from commit 0d7b5bd4575c80053e1d3851aeae34d5fbd5cf0b) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1ebae0fa58ff8384833639142201458… Patch: https://github.com/kamailio/kamailio/commit/1ebae0fa58ff8384833639142201458… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index f71dfcf46b..980c17f4e1 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1080,7 +1080,7 @@ static int sdp_remove_media(sip_msg_t *msg, str *media) media->len)==0) { /* found - remove */ - LM_DBG("removing media stream: %.*s", media->len, media->s); + LM_DBG("removing media stream: %.*s\n", media->len, media->s); nxt_stream = get_sdp_stream(msg, sdp_session_num, sdp_stream_num+1); /* skip back 'm=' */

1 0

git:master:0d7b5bd4: sdpops: add missing line break for debug log
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: 0d7b5bd4575c80053e1d3851aeae34d5fbd5cf0b URL: https://github.com/kamailio/kamailio/commit/0d7b5bd4575c80053e1d3851aeae34d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:32:30+01:00 sdpops: add missing line break for debug log --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0d7b5bd4575c80053e1d3851aeae34d… Patch: https://github.com/kamailio/kamailio/commit/0d7b5bd4575c80053e1d3851aeae34d… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 137defee30..1492ec0832 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1080,7 +1080,7 @@ static int sdp_remove_media(sip_msg_t *msg, str *media) media->len)==0) { /* found - remove */ - LM_DBG("removing media stream: %.*s", media->len, media->s); + LM_DBG("removing media stream: %.*s\n", media->len, media->s); nxt_stream = get_sdp_stream(msg, sdp_session_num, sdp_stream_num+1); /* skip back 'm=' */

1 0

git:master:cb8b582f: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: cb8b582f478d80e80d0dff492e0e376427182d91 URL: https://github.com/kamailio/kamailio/commit/cb8b582f478d80e80d0dff492e0e376… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-19T11:01:22+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/cb8b582f478d80e80d0dff492e0e376… Patch: https://github.com/kamailio/kamailio/commit/cb8b582f478d80e80d0dff492e0e376… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index 32bb2d6000..fb95bae68b 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -54,7 +54,7 @@ Tsvetomir Dimitrov 4. Functions 4.1. ipsec_create(domain) - 4.2. ipsec_forward(domain) + 4.2. ipsec_forward(domain, flags) 4.3. ipsec_destroy(domain) List of Examples @@ -93,7 +93,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. ipsec_create(domain) - 4.2. ipsec_forward(domain) + 4.2. ipsec_forward(domain, flags) 4.3. ipsec_destroy(domain) 1. Overview @@ -222,7 +222,7 @@ modparam("ims_ipsec_pcscf", "ipsec_spi_id_range", 1000) 4. Functions 4.1. ipsec_create(domain) - 4.2. ipsec_forward(domain) + 4.2. ipsec_forward(domain, flags) 4.3. ipsec_destroy(domain) 4.1. ipsec_create(domain) @@ -241,7 +241,7 @@ modparam("ims_ipsec_pcscf", "ipsec_spi_id_range", 1000) ipsec_create("location"); ... -4.2. ipsec_forward(domain) +4.2. ipsec_forward(domain, flags) The function processes redirects outgoing message via the IPSec tunnel initiated with ipsec_create(). @@ -249,10 +249,15 @@ ipsec_create("location"); Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. + flags - Set send force socket for request messages. If 1 - set + force socket for request messages. Useful for ipsec and TCP. This + is an optional parameter, default value - 0. Example 1.9. ipsec_forward ... ipsec_forward("location"); +# or +ipsec_forward("location", "1"); ... 4.3. ipsec_destroy(domain)

1 0

git:master:52f6ca73: ims_ipsec_pcscf: small docs change for ipsec_forward
by Henning Westerholt 19 Dec '19

19 Dec '19

Module: kamailio Branch: master Commit: 52f6ca731c252a55b5c2cb605f661d04def8dd6b URL: https://github.com/kamailio/kamailio/commit/52f6ca731c252a55b5c2cb605f661d0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-12-19T11:00:02+01:00 ims_ipsec_pcscf: small docs change for ipsec_forward --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/52f6ca731c252a55b5c2cb605f661d0… Patch: https://github.com/kamailio/kamailio/commit/52f6ca731c252a55b5c2cb605f661d0… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 54d152fab7..5308f04438 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -223,7 +223,7 @@ ipsec_create("location"); <para> <emphasis>flags</emphasis> - Set send force socket for request messages. If 1 - set force socket for request messages. Useful for ipsec and TCP. - An optional parameter. Default value - 0. + This is an optional parameter, default value - 0. </para> </listitem> </itemizedlist> @@ -232,7 +232,9 @@ ipsec_create("location"); <programlisting format="linespecific"> ... -ipsec_forward("location"); or ipsec_forward("location", "1"); +ipsec_forward("location"); +# or +ipsec_forward("location", "1"); ... </programlisting> </example>

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2019