sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

[kamailio] Make ds_ping_interval changeable at runtime (#473)

by Sven Neuhaus

Feature request for master/slave setups: What we would like to see is the ability to globally pause all OPTIONs checks (set ds_ping_interval temporarily to 0 at runtime) - or provide a different mechanism to temporarily disable pings. When you have a master/slave Kamailio setup the slave will currently fail all its pings because it has no network access and it fills its logfile with errors. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/473

8 years, 10 months

git:master:54003021: dispatcher: regenerated the readme file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 540030214d51d9e3db1e863a34ed2586bad031de URL: https://github.com/kamailio/kamailio/commit/540030214d51d9e3db1e863a34ed258… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-24T13:30:19+01:00 dispatcher: regenerated the readme file --- Modified: modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/540030214d51d9e3db1e863a34ed258… Patch: https://github.com/kamailio/kamailio/commit/540030214d51d9e3db1e863a34ed258… --- diff --git a/modules/dispatcher/README b/modules/dispatcher/README index 3ef38d1..043de16 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -102,6 +102,7 @@ Alessandro Arrichiello 6.1. dispatcher.set_state 6.2. dispatcher.list 6.3. dispatcher.reload + 6.4. dispatcher.ping_active 7. Installation and Running @@ -232,6 +233,7 @@ Chapter 1. Admin Guide 6.1. dispatcher.set_state 6.2. dispatcher.list 6.3. dispatcher.reload + 6.4. dispatcher.ping_active 7. Installation and Running @@ -1135,6 +1137,7 @@ onreply_route { 6.1. dispatcher.set_state 6.2. dispatcher.list 6.3. dispatcher.reload + 6.4. dispatcher.ping_active 6.1. dispatcher.set_state @@ -1184,6 +1187,27 @@ kamcmd dispatcher.set_state ip 2 sip:127.0.0.1:5080 Example kamcmd dispatcher.reload +6.4. dispatcher.ping_active + + Sets the global state for sending keepalive requests to destinations. + + Name: dispatcher.ping_active + + Parameters: + * _state_ : state of sending keepalives + + "0": inactive (don't send) + + "1": active (send) + + If the state parameter is missing, the current state is returned. When + state is changed, new and old values of the state are returned. Default + value for state is 1. + + Example: +... +# prototype: kamcmd dispatcher.ping_active _state_ +kamcmd dispatcher.ping_active 0 +... + 7. Installation and Running 7.1. Destination List File

8 years, 10 months

git:master:95aad518: dispatcher: documentation for rpc command dispatcher.ping_active

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 95aad5185c5622dea9b3edb3a2711b65ad146675 URL: https://github.com/kamailio/kamailio/commit/95aad5185c5622dea9b3edb3a2711b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-24T13:29:56+01:00 dispatcher: documentation for rpc command dispatcher.ping_active --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/95aad5185c5622dea9b3edb3a2711b6… Patch: https://github.com/kamailio/kamailio/commit/95aad5185c5622dea9b3edb3a2711b6… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 6f44754..c79ecaa 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1474,6 +1474,41 @@ onreply_route { </programlisting> </section> + <section id="dispatcher.rpc.ping_active"> + <title> + <function moreinfo="none">dispatcher.ping_active</function> + </title> + <para> + Sets the global state for sending keepalive requests to destinations. + </para> + <para> + Name: <emphasis>dispatcher.ping_active</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_state_ : state of sending keepalives</para> + <itemizedlist> + <listitem><para> <quote>0</quote>: inactive (don't send)</para></listitem> + <listitem><para> <quote>1</quote>: active (send)</para></listitem> + </itemizedlist> + </listitem> + </itemizedlist> + <para> + If the state parameter is missing, the current state is returned. + When state is changed, new and old values of the state are returned. + Default value for state is 1. + </para> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# prototype: &kamcmd; dispatcher.ping_active _state_ +&kamcmd; dispatcher.ping_active 0 +... +</programlisting> + </section> + </section> <section id="dispatcher.ex.install">

8 years, 10 months

git:master:44c5d1c0: dispatcher: rpc command dispatcher.ping_active

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 44c5d1c02e87024e075c5417838d2d33bcba35c8 URL: https://github.com/kamailio/kamailio/commit/44c5d1c02e87024e075c5417838d2d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-24T13:23:07+01:00 dispatcher: rpc command dispatcher.ping_active - manage global pinging state (send or not the keepalive to destinations) - kamcmd dispatcher.ping_active 0 - don't send keepalive requests - kamcmd dispatcher.ping_active 1 - send keepalive requests - default value is 1 --- Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatch.h Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/44c5d1c02e87024e075c5417838d2d3… Patch: https://github.com/kamailio/kamailio/commit/44c5d1c02e87024e075c5417838d2d3… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 3638a9c..6921aae 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -70,6 +70,7 @@ static int _ds_table_version = DS_TABLE_VERSION; static ds_ht_t *_dsht_load = NULL; +static int *_ds_ping_active = NULL; extern int ds_force_dst; @@ -94,6 +95,43 @@ int ds_reinit_rweight_on_state_change(int old_state, int new_state, ds_set_t *ds /** * */ +int ds_ping_active_init(void) +{ + if(_ds_ping_active!=NULL) + return 0; + _ds_ping_active = (int*)shm_malloc(sizeof(int)); + if(_ds_ping_active==NULL) { + LM_ERR("no more shared memory\n"); + return -1; + } + *_ds_ping_active = 1; + return 0; +} + +/** + * + */ +int ds_ping_active_get(void) +{ + if(_ds_ping_active!=NULL) + return -1; + return *_ds_ping_active; +} + +/** + * + */ +int ds_ping_active_set(int v) +{ + if(_ds_ping_active!=NULL) + return -1; + *_ds_ping_active = v; + return 0; +} + +/** + * + */ int ds_hash_load_init(unsigned int htsize, int expire, int initexpire) { if(_dsht_load != NULL) @@ -2812,6 +2850,11 @@ void ds_check_timer(unsigned int ticks, void* param) return; } + if(_ds_ping_active!=NULL && *_ds_ping_active==0) + { + LM_DBG("pinging destinations is inactive by admin\n"); + return; + } /* Iterate over the groups and the entries of each group: */ for(list = _ds_list; list!= NULL; list= list->next) { diff --git a/modules/dispatcher/dispatch.h b/modules/dispatcher/dispatch.h index 56da6c7..856a88e 100644 --- a/modules/dispatcher/dispatch.h +++ b/modules/dispatcher/dispatch.h @@ -183,5 +183,10 @@ typedef struct _ds_set ds_set_t *ds_get_list(void); int ds_get_list_nr(void); + +int ds_ping_active_init(void); +int ds_ping_active_get(void); +int ds_ping_active_set(int v); + #endif diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index f960297..51d1955 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -286,6 +286,10 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(ds_ping_active_init()<0) { + return -1; + } + if(ds_init_rpc()<0) { LM_ERR("failed to register RPC commands\n"); @@ -1318,6 +1322,54 @@ static void dispatcher_rpc_set_state(rpc_t* rpc, void* ctx) } +static const char* dispatcher_rpc_ping_active_doc[2] = { + "Manage setting on/off the pinging (keepalive) of destinations", + 0 +}; + + +/* + * RPC command to set the state of a destination address + */ +static void dispatcher_rpc_ping_active(rpc_t* rpc, void* ctx) +{ + int state; + int ostate; + void *th; + + if(rpc->scan(ctx, "*d", &state)!=1) { + state = -1; + } + ostate = ds_ping_active_get(); + /* add entry node */ + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + if(state==-1) { + if(rpc->struct_add(th, "d", + "OldPingState", ostate)<0) + { + rpc->fault(ctx, 500, "Internal error reply structure"); + return; + } + return; + } + + if(ds_ping_active_set(state)<0) { + rpc->fault(ctx, 500, "Ping State Update Failed"); + return; + } + if(rpc->struct_add(th, "dd", + "NewPingState", state, + "OldPingState", ostate)<0) + { + rpc->fault(ctx, 500, "Internal error reply structure"); + return; + } + return; +} + rpc_export_t dispatcher_rpc_cmds[] = { {"dispatcher.reload", dispatcher_rpc_reload, dispatcher_rpc_reload_doc, 0}, @@ -1325,6 +1377,8 @@ rpc_export_t dispatcher_rpc_cmds[] = { dispatcher_rpc_list_doc, 0}, {"dispatcher.set_state", dispatcher_rpc_set_state, dispatcher_rpc_set_state_doc, 0}, + {"dispatcher.ping_active", dispatcher_rpc_ping_active, + dispatcher_rpc_ping_active_doc, 0}, {0, 0, 0, 0} };

8 years, 10 months

git:master:1828dcc0: dispatcher: refreshed the readme

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1828dcc00581822989a98c3e63244146200725d8 URL: https://github.com/kamailio/kamailio/commit/1828dcc00581822989a98c3e6324414… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-24T13:18:58+01:00 dispatcher: refreshed the readme --- Modified: modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/1828dcc00581822989a98c3e6324414… Patch: https://github.com/kamailio/kamailio/commit/1828dcc00581822989a98c3e6324414…

8 years, 10 months

git:master:536b0ab1: dispatcher: documentation for ds_timer_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 536b0ab1c2f74a2b4832f40e6c1ad5c83733521e URL: https://github.com/kamailio/kamailio/commit/536b0ab1c2f74a2b4832f40e6c1ad5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-24T12:52:41+01:00 dispatcher: documentation for ds_timer_mode parameter --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/536b0ab1c2f74a2b4832f40e6c1ad5c… Patch: https://github.com/kamailio/kamailio/commit/536b0ab1c2f74a2b4832f40e6c1ad5c… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 99b7d0c..6f44754 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -804,11 +804,13 @@ modparam("dispatcher", "force_dst", 1) <section id="dispatcher.p.ds_default_socket"> <title><varname>ds_default_socket</varname> (str)</title> <para> - Default socket to be used for sending pings and dispatching requests when a gateway has no send socket configured. + Default socket to be used for sending pings and dispatching requests + when a gateway has no send socket configured. </para> <para> <emphasis> - By default no default socket is defined, the first configuration script <emphasis>listen</emphasis> directive is used. + By default no default socket is defined, the first configuration + script <emphasis>listen</emphasis> directive is used. </emphasis> </para> <example> @@ -821,6 +823,45 @@ modparam("dispatcher", "force_dst", 1) </example> </section> + <section id="dispatcher.p.ds_timer_mode"> + <title><varname>ds_timer_mode</varname> (int)</title> + <para> + Specify the timer process to be used by the module for + keepalives and active dialogs tracking. + </para> + <para> + It can be set to: + </para> + <itemizedlist> + <listitem> + <para>0 - use main timer process.</para> + </listitem> + <listitem> + <para>1 - use secondary timer process.</para> + </listitem> + </itemizedlist> + + <para> + On a server with a lot of traffic, using secondary + timer can help with performances, because the main timer + can be overloaded by taking care of transactions retransmissions + and expirations of items in memory. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_timer_mode</quote> parameter</title> + <programlisting format="linespecific"> + ... + modparam("dispatcher", "ds_timer_mode", 1) + ... + </programlisting> + </example> + </section> + </section> <section>

8 years, 10 months

git:master:77a2fae7: dispatcher: ds_timer_mode - new param to specify the timer proc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 77a2fae782c5a4c8c5c25bd594ad68193e046a49 URL: https://github.com/kamailio/kamailio/commit/77a2fae782c5a4c8c5c25bd594ad681… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-24T12:27:13+01:00 dispatcher: ds_timer_mode - new param to specify the timer proc - if set to 0 (default), main timer is used - if set to 1, secondary timer is used --- Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/77a2fae782c5a4c8c5c25bd594ad681… Patch: https://github.com/kamailio/kamailio/commit/77a2fae782c5a4c8c5c25bd594ad681… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 376e768..f960297 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -47,6 +47,7 @@ #include "../../error.h" #include "../../ut.h" #include "../../route.h" +#include "../../timer_proc.h" #include "../../mem/mem.h" #include "../../mod_fix.h" #include "../../rpc.h" @@ -114,6 +115,7 @@ int ds_hash_size = 0; int ds_hash_expire = 7200; int ds_hash_initexpire = 7200; int ds_hash_check_interval = 30; +int ds_timer_mode = 0; str ds_outbound_proxy = {0, 0}; @@ -241,6 +243,7 @@ static param_export_t params[]={ {"ds_hash_check_interval", INT_PARAM, &ds_hash_check_interval}, {"outbound_proxy", PARAM_STR, &ds_outbound_proxy}, {"ds_default_socket", PARAM_STR, &ds_default_socket}, + {"ds_timer_mode", PARAM_INT, &ds_timer_mode}, {0,0,0} }; @@ -511,7 +514,13 @@ static int mod_init(void) if(ds_hash_load_init(1<<ds_hash_size, ds_hash_expire, ds_hash_initexpire)<0) return -1; - register_timer(ds_ht_timer, NULL, ds_hash_check_interval); + if(ds_timer_mode==1) { + if(sr_wtimer_add(ds_ht_timer, NULL, ds_hash_check_interval)<0) + return -1; + } else { + if(register_timer(ds_ht_timer, NULL, ds_hash_check_interval)<0) + return -1; + } } else { LM_ERR("call load dispatching DSTID_AVP set but no size" " for hash table (see ds_hash_size parameter)\n"); @@ -532,7 +541,13 @@ static int mod_init(void) /***************************************************** * Register the PING-Timer *****************************************************/ - register_timer(ds_check_timer, NULL, ds_ping_interval); + if(ds_timer_mode==1) { + if(sr_wtimer_add(ds_check_timer, NULL, ds_ping_interval)<0) + return -1; + } else { + if(register_timer(ds_check_timer, NULL, ds_ping_interval)<0) + return -1; + } } return 0;

8 years, 10 months

git:master:8087e661: mohqueue: fixed Via processing

by Robert Boisvert

Module: kamailio Branch: master Commit: 8087e661d8619fa028e51caf4fd32a4aaabc35e1 URL: https://github.com/kamailio/kamailio/commit/8087e661d8619fa028e51caf4fd32a4… Author: Robert Boisvert <rdbprog(a)gmail.com> Committer: Robert Boisvert <rdbprog(a)gmail.com> Date: 2016-01-23T12:55:52-05:00 mohqueue: fixed Via processing - starts with the first Via - includes complete Via - call_tag placed in the correct location at end of buffer - call_bufpos renamed to more correct meaning of call_buflen --- Modified: modules/mohqueue/Makefile Modified: modules/mohqueue/mohq.h Modified: modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/8087e661d8619fa028e51caf4fd32a4… Patch: https://github.com/kamailio/kamailio/commit/8087e661d8619fa028e51caf4fd32a4…

8 years, 10 months

git:master:420fa65f: Makefile.groups: added statsc module to default group

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 420fa65f239d0eb2dc64ae559440eed6efab3dd1 URL: https://github.com/kamailio/kamailio/commit/420fa65f239d0eb2dc64ae559440eed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-23T18:21:50+01:00 Makefile.groups: added statsc module to default group --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/420fa65f239d0eb2dc64ae559440eed… Patch: https://github.com/kamailio/kamailio/commit/420fa65f239d0eb2dc64ae559440eed… --- diff --git a/Makefile.groups b/Makefile.groups index c7895db..92cda5f 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -15,7 +15,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ nat_traversal nathelper path pike pv ratelimit rr rtimer \ rtpproxy sanity sdpops siputils sl statistics textops \ textopsx tm tmx topoh xlog rtpengine stun sipt tcpops \ - auth_xkeys smsops tsilo cfgt + auth_xkeys smsops tsilo cfgt statsc # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \

8 years, 10 months

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,trusty,slave #434

by jenkins＠kamailio.sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

8 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016