sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:3b01cfa4: Merge pull request #13 from alezzandro/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3b01cfa4f8bc86e0060799fc455141bc6274fdfd URL: https://github.com/kamailio/kamailio/commit/3b01cfa4f8bc86e0060799fc455141b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-09T20:11:26+01:00 Merge pull request #13 from alezzandro/master dispatcher: fixing some misspelled words and adding support for custom number of successful probing requests --- Modified: modules/dispatcher/README Modified: modules/dispatcher/config.c Modified: modules/dispatcher/config.h Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h Modified: modules/dispatcher/dispatcher.c Modified: modules/dispatcher/doc/dispatcher.xml Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3b01cfa4f8bc86e0060799fc455141b… Patch: https://github.com/kamailio/kamailio/commit/3b01cfa4f8bc86e0060799fc455141b…

9 years, 11 months

git:master:2fe8749a: dispatcher: Corrected comments indentation

by alezzandro

Module: kamailio Branch: master Commit: 2fe8749ab7bd7622d46a57ab88f90e35bb7b0164 URL: https://github.com/kamailio/kamailio/commit/2fe8749ab7bd7622d46a57ab88f90e3… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2015-01-09T16:59:11+01:00 dispatcher: Corrected comments indentation --- Modified: modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/2fe8749ab7bd7622d46a57ab88f90e3… Patch: https://github.com/kamailio/kamailio/commit/2fe8749ab7bd7622d46a57ab88f90e3… --- diff --git a/modules/dispatcher/dispatch.h b/modules/dispatcher/dispatch.h index 29f2ec7..d991fd7 100644 --- a/modules/dispatcher/dispatch.h +++ b/modules/dispatcher/dispatch.h @@ -102,8 +102,10 @@ extern pv_spec_t ds_attrs_pv; extern struct tm_binds tmb; extern str ds_ping_method; extern str ds_ping_from; -extern int probing_threshold; /*!< number of failed requests, before a destination is taken into probing */ -extern int inactive_threshold; /*!< number of successful requests, before a destination is taken into active */ +extern int probing_threshold; /*!< number of failed requests, + before a destination is taken into probing */ +extern int inactive_threshold; /*!< number of successful requests, + before a destination is taken into active */ extern int ds_probing_mode; extern str ds_outbound_proxy; extern str ds_default_socket;

9 years, 11 months

git:master:92db7b10: dispatcher: Moved init_state var declaration at beginning of ds_update_state function

by alezzandro

Module: kamailio Branch: master Commit: 92db7b10f075e2b4e28545fc6c05d2001c2f198c URL: https://github.com/kamailio/kamailio/commit/92db7b10f075e2b4e28545fc6c05d20… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2015-01-09T16:57:48+01:00 dispatcher: Moved init_state var declaration at beginning of ds_update_state function --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/92db7b10f075e2b4e28545fc6c05d20… Patch: https://github.com/kamailio/kamailio/commit/92db7b10f075e2b4e28545fc6c05d20… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 7cecc9f..ff3871f 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -2231,6 +2231,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) { int i=0; int old_state = 0; + int init_state = 0; ds_set_t *idx = NULL; if(_ds_list==NULL || _ds_list_nr<=0) @@ -2259,7 +2260,7 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) idx->dlist[i].flags &= ~(DS_STATES_ALL); /* we need the initial state for inactive counter */ - int init_state = state; + init_state = state; if((state & DS_TRYING_DST) && (old_state & DS_INACTIVE_DST)) {

9 years, 11 months

git:master:f6744a8e: dispatcher: Fixed default values for options probing_threshold and inactive_probing_threshold, setting them from 3 to 1

by alezzandro

Module: kamailio Branch: master Commit: f6744a8e3c452be6405dd6948738ff6377def2a7 URL: https://github.com/kamailio/kamailio/commit/f6744a8e3c452be6405dd6948738ff6… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2015-01-09T16:53:35+01:00 dispatcher: Fixed default values for options probing_threshold and inactive_probing_threshold, setting them from 3 to 1 --- Modified: modules/dispatcher/config.c --- Diff: https://github.com/kamailio/kamailio/commit/f6744a8e3c452be6405dd6948738ff6… Patch: https://github.com/kamailio/kamailio/commit/f6744a8e3c452be6405dd6948738ff6… --- diff --git a/modules/dispatcher/config.c b/modules/dispatcher/config.c index 25e0d02..92a1885 100644 --- a/modules/dispatcher/config.c +++ b/modules/dispatcher/config.c @@ -31,8 +31,8 @@ #include "config.h" struct cfg_group_dispatcher default_dispatcher_cfg = { - 3, /* Probing threshold */ - 3, /* Inactive threshold */ + 1, /* Probing threshold */ + 1, /* Inactive threshold */ {0,0} /* reply codes */ };

9 years, 11 months

git:master:9153b9fa: dispatcher: Edited docs xml file and generated README file using make command as suggested by @miconda

by alezzandro

Module: kamailio Branch: master Commit: 9153b9fa73ba27a5975c593329d944b5912eeae7 URL: https://github.com/kamailio/kamailio/commit/9153b9fa73ba27a5975c593329d944b… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2015-01-09T16:45:37+01:00 dispatcher: Edited docs xml file and generated README file using make command as suggested by @miconda --- Modified: modules/dispatcher/README Modified: modules/dispatcher/doc/dispatcher.xml --- Diff: https://github.com/kamailio/kamailio/commit/9153b9fa73ba27a5975c593329d944b… Patch: https://github.com/kamailio/kamailio/commit/9153b9fa73ba27a5975c593329d944b…

9 years, 11 months

git:master:cac6ea3e: dispatcher: Changes to the docs for the new feature counting successful requests

by alezzandro

Module: kamailio Branch: master Commit: cac6ea3edf630e2cbd3db09f408a2d5cbd9532e3 URL: https://github.com/kamailio/kamailio/commit/cac6ea3edf630e2cbd3db09f408a2d5… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2014-12-24T00:56:23+01:00 dispatcher: Changes to the docs for the new feature counting successful requests --- Modified: modules/dispatcher/README Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cac6ea3edf630e2cbd3db09f408a2d5… Patch: https://github.com/kamailio/kamailio/commit/cac6ea3edf630e2cbd3db09f408a2d5…

9 years, 11 months

git:master:1dd98c58: dispatcher: Fixing misspelled words in some docs

by alezzandro

Module: kamailio Branch: master Commit: 1dd98c58cfc7eca6cb7b6db703d010804051c75c URL: https://github.com/kamailio/kamailio/commit/1dd98c58cfc7eca6cb7b6db703d0108… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2014-12-24T00:28:58+01:00 dispatcher: Fixing misspelled words in some docs --- Modified: modules/dispatcher/README Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1dd98c58cfc7eca6cb7b6db703d0108… Patch: https://github.com/kamailio/kamailio/commit/1dd98c58cfc7eca6cb7b6db703d0108… --- diff --git a/modules/dispatcher/README b/modules/dispatcher/README index 23515d8..78af356 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -22,6 +22,12 @@ Olle E. Johansson Edvina AB +Edited by + +Alessandro Arrichiello + + Hewlett-Packard + Copyright © 2004 FhG FOKUS Copyright © 2005 Voice Sistem @@ -140,7 +146,7 @@ Olle E. Johansson 1.21. Set the "ds_ping_method" parameter 1.22. Set the "ds_ping_from" parameter 1.23. Set the "ds_ping_interval" parameter - 1.24. Set the "ds_probing_threshhold" parameter + 1.24. Set the "ds_probing_threshold" parameter 1.25. Set the "ds_ping_reply_codes" parameter 1.26. Set the "ds_probing_mode" parameter 1.27. Set the "ds_hash_size" parameter @@ -632,9 +638,9 @@ Note Default value is "1" (set inactive with first failure). - Example 1.24. Set the "ds_probing_threshhold" parameter + Example 1.24. Set the "ds_probing_threshold" parameter ... - modparam("dispatcher", "ds_probing_threshhold", 10) + modparam("dispatcher", "ds_probing_threshold", 10) ... 3.24. ds_ping_reply_codes (string) diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 404bbd2..5e57ae6 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -598,10 +598,10 @@ modparam("dispatcher", "force_dst", 1) </emphasis> </para> <example> - <title>Set the <quote>ds_probing_threshhold</quote> parameter</title> + <title>Set the <quote>ds_probing_threshold</quote> parameter</title> <programlisting format="linespecific"> ... - modparam("dispatcher", "ds_probing_threshhold", 10) + modparam("dispatcher", "ds_probing_threshold", 10) ... </programlisting> </example>

9 years, 11 months

git:master:f0d64282: dispatcher: Fixing misspelled words in some code's variables

by alezzandro

Module: kamailio Branch: master Commit: f0d642820e363090ad4a79a8c198e9f898bbde07 URL: https://github.com/kamailio/kamailio/commit/f0d642820e363090ad4a79a8c198e9f… Author: alezzandro <alezzandro(a)gmail.com> Committer: alezzandro <alezzandro(a)gmail.com> Date: 2014-12-24T00:27:40+01:00 dispatcher: Fixing misspelled words in some code's variables --- Modified: modules/dispatcher/config.c Modified: modules/dispatcher/config.h Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/f0d642820e363090ad4a79a8c198e9f… Patch: https://github.com/kamailio/kamailio/commit/f0d642820e363090ad4a79a8c198e9f…

9 years, 11 months

[kamailio] dispatcher: fixing some misspelled words in code/docs (#13)

by Alessandro Arrichiello

First of all excuse me if in the previous pull request I didn't follow guidelines by devel-git-commit guide :) As anticipated in the previous request I made some changes to dispatcher module for counting successful ping requests before moving a destination from inactive to active state. While doing this changes I noticed some misspelled variables (in code and docs too) and I fixed them. So I've used similar variables (with the corrected words) also for the new feature I developed. In the case we leave the old variables introducing the new one we will have in the code: "ds_probing_threshhold" vs "ds_inactive_threshold" This behaviour could be confusing while editing the configuration file and also while reading the code. As you requested I've separated the misspelled fixes in two commits one for the code and one for the docs. To this pull request will follow the one with the changes developing the new feature. You can merge this Pull Request by running: git pull https://github.com/alezzandro/kamailio master Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/13 -- Commit Summary -- * dispatcher: Fixing misspelled words in some code's variables * dispatcher: Fixing misspelled words in some docs -- File Changes -- M modules/dispatcher/README (12) M modules/dispatcher/config.c (4) M modules/dispatcher/config.h (2) M modules/dispatcher/dispatch.c (5) M modules/dispatcher/dispatch.h (3) M modules/dispatcher/dispatcher.c (11) M modules/dispatcher/doc/dispatcher_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/13.patch https://github.com/kamailio/kamailio/pull/13.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/13

9 years, 11 months

Registrar - check for local path

by Charles Chance

Hi All, Can anyone see a problem with doing (something like) the following, to handle the situation like http://lists.sip-router.org/pipermail/sr-users/2014-October/085251.html? Admittedly, it is probably a less common use case, but it has been raised several times on the list so I believe it is a genuine one. diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index 794d968..66730b4 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -41,6 +41,7 @@ #include "../../action.h" #include "../../mod_fix.h" #include "../../parser/parse_rr.h" +#include "../../forward.h" #include "../usrloc/usrloc.h" #include "common.h" #include "regtime.h" @@ -121,6 +122,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) sr_xavp_t *list=NULL; str xname = {"ruid", 4}; sr_xval_t xval; + sip_uri_t path_uri; ret = -1; @@ -265,6 +267,14 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) ret = -3; goto done; } + if (parse_uri(path_dst.s, path_dst.len, &path_uri) < 0){ + LM_ERR("failed to parse the Path URI\n"); + ret = -3; + goto done; + } + } + /* Only use path-uri if non-local */ + if (path_uri.host.s && !check_self(&(path_uri.host), 0, 0)) { if (set_path_vector(_m, &ptr->path) < 0) { LM_ERR("failed to set path vector\n"); ret = -3; The above needs to be repeated in lookup_branches function of same file, but I wanted to check others' opinions first. Best regards, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB.

9 years, 11 months

← Newer
1
...
31
32
33
34
35
36
37
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015