sr-dev August 2015

sr-dev@lists.kamailio.org

30 participants
191 discussions

git:master:c56209fa: Merge pull request #297 from evolvetsi/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c56209fa2d487385def4b98bfb662d90236ac5f8 URL: https://github.com/kamailio/kamailio/commit/c56209fa2d487385def4b98bfb662d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T08:57:43+02:00 Merge pull request #297 from evolvetsi/master dispatcher: add new probing_mode=3 to always probe flagged gateways --- Modified: modules/dispatcher/README Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c56209fa2d487385def4b98bfb662d9… Patch: https://github.com/kamailio/kamailio/commit/c56209fa2d487385def4b98bfb662d9…

9 years, 3 months

git:master:44e3691b: dispatcher: updated dispatcher_admin.xml to document new probing_mode

by root

Module: kamailio Branch: master Commit: 44e3691bc706bf9c232af7eb3fb36b166e5dd0c7 URL: https://github.com/kamailio/kamailio/commit/44e3691bc706bf9c232af7eb3fb36b1… Author: root <root(a)sipproxy1.evolvetsi.local> Committer: root <root(a)sipproxy1.evolvetsi.local> Date: 2015-08-24T16:37:20-04:00 dispatcher: updated dispatcher_admin.xml to document new probing_mode - as per @miconda, I moved my documentation for probing_mode=3 to the dispatcher_admin.xml file and regenerated the README. --- Modified: modules/dispatcher/README Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/44e3691bc706bf9c232af7eb3fb36b1… Patch: https://github.com/kamailio/kamailio/commit/44e3691bc706bf9c232af7eb3fb36b1…

9 years, 3 months

git:master:65a442a2: dispatcher: add new probing_mode=3 to always probe flagged gateways

by root

Module: kamailio Branch: master Commit: 65a442a2ab5fce1a469bc7ac5ec7f9880f4dae7e URL: https://github.com/kamailio/kamailio/commit/65a442a2ab5fce1a469bc7ac5ec7f98… Author: root <root(a)sipproxy1.evolvetsi.local> Committer: root <root(a)sipproxy1.evolvetsi.local> Date: 2015-08-24T14:29:23-04:00 dispatcher: add new probing_mode=3 to always probe flagged gateways - added DS_PROBE_ONLYFLAGGED probing_mode option. If set, any gateways with a state of PROBING will be continually probed and the PROBING flag will never be cleared. This allows probing specific gateways continually, keeping their up/down status current. --- Modified: modules/dispatcher/README Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/65a442a2ab5fce1a469bc7ac5ec7f98… Patch: https://github.com/kamailio/kamailio/commit/65a442a2ab5fce1a469bc7ac5ec7f98… --- diff --git a/modules/dispatcher/README b/modules/dispatcher/README index 281ca85..275de03 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -688,8 +688,14 @@ Note Controls what gateways are tested to see if they are reachable. If set to 0, only the gateways with state PROBING are tested; if set to 1, all gateways are tested; if set to 2, only gateways in inactive state with - probing mode set are tested. If set to 1 and there is a failure of - keepalive to an active gateway, then it is set to TRYING state. + probing mode set are tested. + + If set to 3, any gateway with a PROBING state is continually probed without + modifying/removing the PROBING state flag. This allows selected gateways to + be probed continually, regardless of state chagnes. + + If set to 1 and there is a failure of keepalive to an active gateway, then it + is set to TRYING state. Default value is "0". diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 4a7bf81..1cc3470 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -2753,8 +2753,10 @@ static void ds_options_callback( struct cell *t, int type, { /* Set the according entry back to "Active" */ state = 0; - if (ds_probing_mode==DS_PROBE_ALL) + if (ds_probing_mode==DS_PROBE_ALL || + (ds_probing_mode == DS_PROBE_ONLYFLAGGED && ds_get_state(group, &uri) & DS_PROBING_DST)) state |= DS_PROBING_DST; + /* Check if in the meantime someone disabled the target through RPC or MI */ if (!(ds_get_state(group, &uri) & DS_DISABLED_DST) && ds_update_state(fmsg, group, &uri, state) != 0) { diff --git a/modules/dispatcher/dispatch.h b/modules/dispatcher/dispatch.h index 9091155..56da6c7 100644 --- a/modules/dispatcher/dispatch.h +++ b/modules/dispatcher/dispatch.h @@ -48,6 +48,7 @@ #define DS_PROBE_NONE 0 #define DS_PROBE_ALL 1 #define DS_PROBE_INACTIVE 2 +#define DS_PROBE_ONLYFLAGGED 3 #define DS_MATCH_ALL 0 #define DS_MATCH_NOPORT 1

9 years, 3 months

[kamailio] dispatcher: add new probing_mode=3 to always probe flagged gateways (#297)

by evolvetsi

- added DS_PROBE_ONLYFLAGGED probing_mode option. If set, any gateways with a state of PROBING will be continually probed and the PROBING flag will never be cleared. This allows probing specific gateways continually, keeping their up/down status current. This is related to this sr-users mailing list thread: http://lists.sip-router.org/pipermail/sr-users/2015-August/089594.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/297 -- Commit Summary -- * dispatcher: add new probing_mode=3 to always probe flagged gateways -- File Changes -- M modules/dispatcher/README (10) M modules/dispatcher/dispatch.c (4) M modules/dispatcher/dispatch.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/297.patch https://github.com/kamailio/kamailio/pull/297.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/297

9 years, 3 months

git:master:31d984c6: Merge pull request #300 from grumvalski/ontimeout_bye_dlg_ctx

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 31d984c6a1b59da455387cb10bfd68dd8d8bbcc8 URL: https://github.com/kamailio/kamailio/commit/31d984c6a1b59da455387cb10bfd68d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-25T08:49:13+02:00 Merge pull request #300 from grumvalski/ontimeout_bye_dlg_ctx modules/dialog: make dialog context available in event route tm:localâ¦ --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/31d984c6a1b59da455387cb10bfd68d… Patch: https://github.com/kamailio/kamailio/commit/31d984c6a1b59da455387cb10bfd68d… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 591e410..3768fd4 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1402,8 +1402,12 @@ void dlg_ontimeout(struct dlg_tl *tl) if(dlg->iflags&DLG_IFLAG_TIMEOUTBYE) { + /* set the dialog context so that it's available in + * tm:local-request event route */ + dlg_set_ctx_iuid(dlg); if(dlg_bye_all(dlg, NULL)<0) dlg_unref(dlg, 1); + dlg_reset_ctx_iuid(); dlg_unref(dlg, 1); if_update_stat(dlg_enable_stats, expired_dlgs, 1);

9 years, 3 months

git:master:5002f66a: modules/dialog: make dialog context available in event route tm:local-request

by Federico Cabiddu

Module: kamailio Branch: master Commit: 5002f66a98b6104702c8c862e7335ff189e7b7d8 URL: https://github.com/kamailio/kamailio/commit/5002f66a98b6104702c8c862e7335ff… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-08-25T07:26:19+02:00 modules/dialog: make dialog context available in event route tm:local-request --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5002f66a98b6104702c8c862e7335ff… Patch: https://github.com/kamailio/kamailio/commit/5002f66a98b6104702c8c862e7335ff… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 591e410..3768fd4 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1402,8 +1402,12 @@ void dlg_ontimeout(struct dlg_tl *tl) if(dlg->iflags&DLG_IFLAG_TIMEOUTBYE) { + /* set the dialog context so that it's available in + * tm:local-request event route */ + dlg_set_ctx_iuid(dlg); if(dlg_bye_all(dlg, NULL)<0) dlg_unref(dlg, 1); + dlg_reset_ctx_iuid(); dlg_unref(dlg, 1); if_update_stat(dlg_enable_stats, expired_dlgs, 1);

9 years, 3 months

git:master:7e7ffea7: Merge pull request #299 from mslehto/warn-p_usrloc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7e7ffea767db9b2afd9dec6eea20389e21da1b50 URL: https://github.com/kamailio/kamailio/commit/7e7ffea767db9b2afd9dec6eea20389… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-24T22:31:35+02:00 Merge pull request #299 from mslehto/warn-p_usrloc modules/p_usrloc: fixes get_all_ucontacts() function signature --- Modified: modules/p_usrloc/dlist.c Modified: modules/p_usrloc/dlist.h --- Diff: https://github.com/kamailio/kamailio/commit/7e7ffea767db9b2afd9dec6eea20389… Patch: https://github.com/kamailio/kamailio/commit/7e7ffea767db9b2afd9dec6eea20389… --- diff --git a/modules/p_usrloc/dlist.c b/modules/p_usrloc/dlist.c index 9a6f806..5c16508 100644 --- a/modules/p_usrloc/dlist.c +++ b/modules/p_usrloc/dlist.c @@ -153,7 +153,7 @@ unsigned long get_number_of_users(void) int get_all_ucontacts(void *buf, int len, unsigned int flags, - unsigned int part_idx, unsigned int part_max) + unsigned int part_idx, unsigned int part_max, int options) { LM_INFO("not available with partitioned interface"); return -1; diff --git a/modules/p_usrloc/dlist.h b/modules/p_usrloc/dlist.h index 2114ac6..76c263e 100644 --- a/modules/p_usrloc/dlist.h +++ b/modules/p_usrloc/dlist.h @@ -107,7 +107,7 @@ int register_udomain(const char* _n, udomain_t** _d); * \return 0 on success, positive if buffer size was not sufficient, negative on failure */ int get_all_ucontacts(void *, int, unsigned int, - unsigned int part_idx, unsigned int part_max); + unsigned int part_idx, unsigned int part_max, int options); /*! * \brief Find a particular domain, small wrapper around find_dlist

9 years, 3 months

git:master:4dc718a0: modules/p_usrloc: fixes get_all_ucontacts() function signature

by Mikko Lehto

Module: kamailio Branch: master Commit: 4dc718a0f20169ed76b9f7618e3e9994c9313102 URL: https://github.com/kamailio/kamailio/commit/4dc718a0f20169ed76b9f7618e3e999… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-08-24T22:27:51+03:00 modules/p_usrloc: fixes get_all_ucontacts() function signature usrloc.c:61:26: warning: incompatible pointer types assigning to 'get_all_ucontacts_t' (aka 'int (*)(void *, int, unsigned int, unsigned int, unsigned int, int)') from 'int (void *, int, unsigned int, unsigned int, unsigned int)' [-Wincompatible-pointer-types] --- Modified: modules/p_usrloc/dlist.c Modified: modules/p_usrloc/dlist.h --- Diff: https://github.com/kamailio/kamailio/commit/4dc718a0f20169ed76b9f7618e3e999… Patch: https://github.com/kamailio/kamailio/commit/4dc718a0f20169ed76b9f7618e3e999… --- diff --git a/modules/p_usrloc/dlist.c b/modules/p_usrloc/dlist.c index 9a6f806..5c16508 100644 --- a/modules/p_usrloc/dlist.c +++ b/modules/p_usrloc/dlist.c @@ -153,7 +153,7 @@ unsigned long get_number_of_users(void) int get_all_ucontacts(void *buf, int len, unsigned int flags, - unsigned int part_idx, unsigned int part_max) + unsigned int part_idx, unsigned int part_max, int options) { LM_INFO("not available with partitioned interface"); return -1; diff --git a/modules/p_usrloc/dlist.h b/modules/p_usrloc/dlist.h index 2114ac6..76c263e 100644 --- a/modules/p_usrloc/dlist.h +++ b/modules/p_usrloc/dlist.h @@ -107,7 +107,7 @@ int register_udomain(const char* _n, udomain_t** _d); * \return 0 on success, positive if buffer size was not sufficient, negative on failure */ int get_all_ucontacts(void *, int, unsigned int, - unsigned int part_idx, unsigned int part_max); + unsigned int part_idx, unsigned int part_max, int options); /*! * \brief Find a particular domain, small wrapper around find_dlist

9 years, 3 months

[kamailio] modules/p_usrloc: fixes get_all_ucontacts() function signature (#299)

by Mikko Lehto

I am not user of p_usrloc, but accidentally compiled this and bumped into mentioned warning. Clang 3.0 and GCC 4.7 do not complain. Clang 3.5 and GCC 4.8 do complain. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/299 -- Commit Summary -- * modules/p_usrloc: fixes get_all_ucontacts() function signature -- File Changes -- M modules/p_usrloc/dlist.c (2) M modules/p_usrloc/dlist.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/299.patch https://github.com/kamailio/kamailio/pull/299.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/299

9 years, 3 months

git:master:7b357914: dmq_usrloc: fix indentation

by Charles Chance

Module: kamailio Branch: master Commit: 7b35791472620bee9f489b80f3528ce00ffbd688 URL: https://github.com/kamailio/kamailio/commit/7b35791472620bee9f489b80f3528ce… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-08-24T18:41:12+01:00 dmq_usrloc: fix indentation --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/7b35791472620bee9f489b80f3528ce… Patch: https://github.com/kamailio/kamailio/commit/7b35791472620bee9f489b80f3528ce…

9 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2015