sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
117 discussions

git:master: module/avpops: Add short description to clarify the purpose of the avp_delete flag.
by Sven Knoblich 24 Feb '12

24 Feb '12

Module: sip-router Branch: master Commit: fb0951c332894ac6cd967daa02c4a2b569ada671 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb0951c… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Fri Feb 24 15:47:49 2012 +0100 module/avpops: Add short description to clarify the purpose of the avp_delete flag. --- modules/avpops/doc/avpops_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/avpops/doc/avpops_admin.xml b/modules/avpops/doc/avpops_admin.xml index caa51ca..dc3ab0c 100644 --- a/modules/avpops/doc/avpops_admin.xml +++ b/modules/avpops/doc/avpops_admin.xml @@ -583,7 +583,7 @@ avp_db_query("delete from subscriber"); matching_flags = please refer to avp_db_load() function </emphasis></para></listitem> <listitem><para><emphasis> - flag = 'g'|'G' + flag = 'g'|'G' = deletes not only the last value but the complete AVP. </emphasis></para></listitem> </itemizedlist> </para>

1 0

git:master: modules_k/acc: Add new cdr-feature 'modifying cdr basic parameter st/et/d'
by Sven Knoblich 24 Feb '12

24 Feb '12

Hello all, I just commited changes without naming the commit as from you expected (missing <module_path> at the beginning). The changes are composed of: (main commit) -http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b4567c4cc4611ee32e403b41f53ed9a34ce9727 (just a fix) -http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c110823321b3da0fc8286308fe8851f3c06835ff Next commits will be all right again. Bye Sven

1 0

git:master: Fix consistency of exported parameter by rename cdr_stop_id to cdr_end_id. The command is already mentioned correctly in the doc.
by Sven Knoblich 24 Feb '12

24 Feb '12

Module: sip-router Branch: master Commit: c110823321b3da0fc8286308fe8851f3c06835ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c110823… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Fri Feb 24 10:50:11 2012 +0100 Fix consistency of exported parameter by rename cdr_stop_id to cdr_end_id. The command is already mentioned correctly in the doc. --- modules_k/acc/acc_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index 15bfe9e..1d5d252 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -255,7 +255,7 @@ static param_export_t params[] = { {"cdr_facility", STR_PARAM, &cdr_facility_str }, {"cdr_extra", STR_PARAM, &cdr_log_extra_str }, {"cdr_start_id", STR_PARAM, &cdr_start_str.s }, - {"cdr_stop_id", STR_PARAM, &cdr_end_str.s }, + {"cdr_end_id", STR_PARAM, &cdr_end_str.s }, {"cdr_duration_id", STR_PARAM, &cdr_duration_str.s }, #ifdef RAD_ACC {"radius_config", STR_PARAM, &radius_config },

1 0

git:master: lib/srutils: link against -lm for math functions in json
by Daniel-Constantin Mierla 24 Feb '12

24 Feb '12

Module: sip-router Branch: master Commit: 16c9ca3e89e672f9a0339e60ddee7a6ab6d7fdf8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16c9ca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 24 10:35:10 2012 +0100 lib/srutils: link against -lm for math functions in json - some distros requires explicit linking, although is part of libc --- lib/srutils/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srutils/Makefile b/lib/srutils/Makefile index f2b4c4f..db6cb97 100644 --- a/lib/srutils/Makefile +++ b/lib/srutils/Makefile @@ -4,6 +4,6 @@ NAME:=srutils MAJOR_VER=1 MINOR_VER=0 BUGFIX_VER=0 -LIBS= +LIBS= -lm include ../../Makefile.libs

1 0

git:master: tls: check for support of ssl2
by Daniel-Constantin Mierla 24 Feb '12

24 Feb '12

Module: sip-router Branch: master Commit: 7c7ed8ad9d62bd501bd2c856a01689a84a0c0711 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c7ed8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 24 10:24:29 2012 +0100 tls: check for support of ssl2 - latest distros with newer ssl lib are removing the ssl2 support --- modules/tls/tls_init.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index cc16598..70338b1 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -333,10 +333,12 @@ int tls_h_init_si(struct socket_info *si) */ static void init_ssl_methods(void) { +#ifndef OPENSSL_NO_SSL2 ssl_methods[TLS_USE_SSLv2_cli - 1] = SSLv2_client_method(); ssl_methods[TLS_USE_SSLv2_srv - 1] = SSLv2_server_method(); ssl_methods[TLS_USE_SSLv2 - 1] = SSLv2_method(); - +#endif + ssl_methods[TLS_USE_SSLv3_cli - 1] = SSLv3_client_method(); ssl_methods[TLS_USE_SSLv3_srv - 1] = SSLv3_server_method(); ssl_methods[TLS_USE_SSLv3 - 1] = SSLv3_method();

1 0

git:master: Add new cdr-feature 'modifying cdr basic parameter st/et/d'. This is necessary for the upcoming db-storage of cdr's.
by Sven Knoblich 24 Feb '12

24 Feb '12

Module: sip-router Branch: master Commit: 7b4567c4cc4611ee32e403b41f53ed9a34ce9727 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b4567c… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Thu Feb 23 14:33:19 2012 +0100 Add new cdr-feature 'modifying cdr basic parameter st/et/d'. This is necessary for the upcoming db-storage of cdr's. --- modules_k/acc/acc_cdr.c | 33 +++++++------- modules_k/acc/acc_mod.c | 88 +++++++++++++++++++++++++-------------- modules_k/acc/doc/acc_admin.xml | 46 ++++++++++++++++++++- 3 files changed, 119 insertions(+), 48 deletions(-) diff --git a/modules_k/acc/acc_cdr.c b/modules_k/acc/acc_cdr.c index a3760b9..996ebf4 100644 --- a/modules_k/acc/acc_cdr.c +++ b/modules_k/acc/acc_cdr.c @@ -36,6 +36,7 @@ * */ #include "../../modules/tm/tm_load.h" +#include "../../str.h" #include "../dialog/dlg_load.h" #include "acc_api.h" @@ -66,9 +67,6 @@ struct dlg_binds dlgb; struct acc_extra* cdr_extra = NULL; int cdr_facility = LOG_DAEMON; -static const str start_id = { "st", 2}; -static const str end_id = { "et", 2}; -static const str duration_id = { "d", 1}; static const str zero_duration = { "0", 1}; static const char time_separator = {'.'}; static char time_buffer[ TIME_BUFFER_LENGTH]; @@ -81,6 +79,9 @@ static int cdr_int_arr[ MAX_CDR_CORE + MAX_CDR_EXTRA]; static char cdr_type_array[ MAX_CDR_CORE + MAX_CDR_EXTRA]; extern struct tm_binds tmb; +extern str cdr_start_str; +extern str cdr_end_str; +extern str cdr_duration_str; /* write all basic information to buffers(e.g. start-time ...) */ static int cdr_core2strar( struct dlg_cell* dlg, @@ -98,9 +99,9 @@ static int cdr_core2strar( struct dlg_cell* dlg, return 0; } - start = dlgb.get_dlg_var( dlg, (str*)&start_id); - end = dlgb.get_dlg_var( dlg, (str*)&end_id); - duration = dlgb.get_dlg_var( dlg, (str*)&duration_id); + start = dlgb.get_dlg_var( dlg, (str*)&cdr_start_str); + end = dlgb.get_dlg_var( dlg, (str*)&cdr_end_str); + duration = dlgb.get_dlg_var( dlg, (str*)&cdr_duration_str); values[0] = ( start != NULL ? *start : empty_string); types[0] = ( start != NULL ? TYPE_STR : TYPE_NULL); @@ -284,11 +285,11 @@ static int set_duration( struct dlg_cell* dialog) return -1; } - if ( string2time( dlgb.get_dlg_var( dialog, (str*)&start_id), &start_time) < 0) { + if ( string2time( dlgb.get_dlg_var( dialog, (str*)&cdr_start_str), &start_time) < 0) { LM_ERR( "failed to extract start time\n"); return -1; } - if ( string2time( dlgb.get_dlg_var( dialog, (str*)&end_id), &end_time) < 0) { + if ( string2time( dlgb.get_dlg_var( dialog, (str*)&cdr_end_str), &end_time) < 0) { LM_ERR( "failed to extract end time\n"); return -1; } @@ -301,7 +302,7 @@ static int set_duration( struct dlg_cell* dialog) } if( dlgb.set_dlg_var( dialog, - (str*)&duration_id, + (str*)&cdr_duration_str, (str*)&duration_str) != 0) { LM_ERR( "failed to set duration time"); @@ -335,7 +336,7 @@ static int set_start_time( struct dlg_cell* dialog) } if( dlgb.set_dlg_var( dialog, - (str*)&start_id, + (str*)&cdr_start_str, (str*)&start_time) != 0) { LM_ERR( "failed to set start time\n"); @@ -343,7 +344,7 @@ static int set_start_time( struct dlg_cell* dialog) } if( dlgb.set_dlg_var( dialog, - (str*)&end_id, + (str*)&cdr_end_str, (str*)&start_time) != 0) { LM_ERR( "failed to set initiation end time\n"); @@ -351,7 +352,7 @@ static int set_start_time( struct dlg_cell* dialog) } if( dlgb.set_dlg_var( dialog, - (str*)&duration_id, + (str*)&cdr_duration_str, (str*)&zero_duration) != 0) { LM_ERR( "failed to set initiation duration time\n"); @@ -385,7 +386,7 @@ static int set_end_time( struct dlg_cell* dialog) } if( dlgb.set_dlg_var( dialog, - (str*)&end_id, + (str*)&cdr_end_str, (str*)&end_time) != 0) { LM_ERR( "failed to set start time"); @@ -595,9 +596,9 @@ int set_cdr_extra( char* cdr_extra_value) } /* fixed core attributes */ - cdr_attrs[ counter++] = start_id; - cdr_attrs[ counter++] = end_id; - cdr_attrs[ counter++] = duration_id; + cdr_attrs[ counter++] = cdr_start_str; + cdr_attrs[ counter++] = cdr_end_str; + cdr_attrs[ counter++] = cdr_duration_str; for(extra=cdr_extra; extra ; extra=extra->next) { diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index c1d6d68..15bfe9e 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -66,6 +66,7 @@ #include "../../dprint.h" #include "../../mem/mem.h" #include "../../modules/tm/tm_load.h" +#include "../../str.h" #include "../rr/api.h" #include "acc.h" #include "acc_api.h" @@ -132,6 +133,11 @@ int cdr_enable = 0; int cdr_start_on_confirmed = 0; static char* cdr_facility_str = 0; static char* cdr_log_extra_str = 0; + +str cdr_start_str = str_init("st"); +str cdr_end_str = str_init("et"); +str cdr_duration_str = str_init("d"); + /*@{*/ /* ----- RADIUS acc variables ----------- */ @@ -243,11 +249,14 @@ static param_export_t params[] = { {"log_level", INT_PARAM, &log_level }, {"log_facility", STR_PARAM, &log_facility_str }, {"log_extra", STR_PARAM, &log_extra_str }, - /* cdr specific */ - {"cdr_enable", INT_PARAM, &cdr_enable }, - {"cdr_start_on_confirmed", INT_PARAM, &cdr_start_on_confirmed }, - {"cdr_facility", STR_PARAM, &cdr_facility_str }, - {"cdr_extra", STR_PARAM, &cdr_log_extra_str }, + /* cdr specific */ + {"cdr_enable", INT_PARAM, &cdr_enable }, + {"cdr_start_on_confirmed", INT_PARAM, &cdr_start_on_confirmed }, + {"cdr_facility", STR_PARAM, &cdr_facility_str }, + {"cdr_extra", STR_PARAM, &cdr_log_extra_str }, + {"cdr_start_id", STR_PARAM, &cdr_start_str.s }, + {"cdr_stop_id", STR_PARAM, &cdr_end_str.s }, + {"cdr_duration_id", STR_PARAM, &cdr_duration_str.s }, #ifdef RAD_ACC {"radius_config", STR_PARAM, &radius_config }, {"radius_flag", INT_PARAM, &radius_flag }, @@ -504,34 +513,51 @@ static int mod_init( void ) acc_log_init(); - /* ----------- INIT CDR GENERATION ----------- */ + /* ----------- INIT CDR GENERATION ----------- */ - if( cdr_enable < 0 || cdr_enable > 1) - { - LM_ERR("cdr_enable is out of range\n"); - return -1; - } + if( cdr_enable < 0 || cdr_enable > 1) + { + LM_ERR("cdr_enable is out of range\n"); + return -1; + } - if( cdr_enable) - { - if( set_cdr_extra( cdr_log_extra_str) != 0) - { - LM_ERR( "failed to set cdr extra '%s'\n", cdr_log_extra_str); - return -1; - } - - if( cdr_facility_str && set_cdr_facility( cdr_facility_str) != 0) - { - LM_ERR( "failed to set cdr facility '%s'\n", cdr_facility_str); - return -1; - } - - if( init_cdr_generation() != 0) - { - LM_ERR("failed to init cdr generation\n"); - return -1; - } - } + if( cdr_enable) + { + if( !cdr_start_str.s || !cdr_end_str.s || !cdr_duration_str.s) + { + LM_ERR( "necessary cdr_parameters are not set\n"); + return -1; + } + + cdr_start_str.len = strlen(cdr_start_str.s); + cdr_end_str.len = strlen(cdr_end_str.s); + cdr_duration_str.len = strlen(cdr_duration_str.s); + + if( !cdr_start_str.len || !cdr_end_str.len || !cdr_duration_str.len) + { + LM_ERR( "necessary cdr_parameters are empty\n"); + return -1; + } + + + if( set_cdr_extra( cdr_log_extra_str) != 0) + { + LM_ERR( "failed to set cdr extra '%s'\n", cdr_log_extra_str); + return -1; + } + + if( cdr_facility_str && set_cdr_facility( cdr_facility_str) != 0) + { + LM_ERR( "failed to set cdr facility '%s'\n", cdr_facility_str); + return -1; + } + + if( init_cdr_generation() != 0) + { + LM_ERR("failed to init cdr generation\n"); + return -1; + } + } /* ------------ SQL INIT SECTION ----------- */ diff --git a/modules_k/acc/doc/acc_admin.xml b/modules_k/acc/doc/acc_admin.xml index 50fb91d..afb4934 100644 --- a/modules_k/acc/doc/acc_admin.xml +++ b/modules_k/acc/doc/acc_admin.xml @@ -1179,7 +1179,51 @@ modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" </programlisting> </example> </section> - + <section id="cdr_start_id"> + <title><varname>cdr_start_id</varname> (string)</title> + <para> + Modifying the start id which is used to store the start time. + </para> + <para> + Default value is 'st' + </para> + <example> + <title>cdr_start_id example</title> + <programlisting format="linespecific"> +modparam("acc", "cdr_start_id", "start") +</programlisting> + </example> + </section> + <section id="cdr_end_id"> + <title><varname>cdr_end_id</varname> (string)</title> + <para> + Modifying the end id which is used to store the end time. + </para> + <para> + Default value is 'et' + </para> + <example> + <title>cdr_end_id example</title> + <programlisting format="linespecific"> +modparam("acc", "cdr_end_id", "end") +</programlisting> + </example> + </section> + <section id="cdr_duration_id"> + <title><varname>cdr_duration_id</varname> (string)</title> + <para> + Modifying the duration id which is used to store the duration. + </para> + <para> + Default value is 'd' + </para> + <example> + <title>cdr_duration_id example</title> + <programlisting format="linespecific"> +modparam("acc", "cdr_duration_id", "start") +</programlisting> + </example> + </section> </section> <section>

1 1

git:master: modules_k/rls: Some cleanup of whitespace and diagnostics
by Peter Dunkley 23 Feb '12

23 Feb '12

Module: sip-router Branch: master Commit: dc82bad1538618af0a345a938ac590afa3f775c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc82bad… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Feb 23 23:04:39 2012 +0000 modules_k/rls: Some cleanup of whitespace and diagnostics --- modules_k/rls/rls.c | 2 +- modules_k/rls/subscribe.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 7b827cb..1d64e26 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -578,7 +578,7 @@ static int mod_init(void) if(pua.get_record_id == NULL) { - LM_ERR("Could not import send_subscribe\n"); + LM_ERR("Could not import get_record_id\n"); return -1; } pua_get_record_id= pua.get_record_id; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 42da091..eee4941 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -857,8 +857,10 @@ int send_resource_subs(char* uri, void* param) if (check_self(&parsed_pres_uri.host, 0, PROTO_NONE) != 1 && rls_disable_remote_presence != 0) { - LM_WARN("Unable to subscribe to remote contact %.*s\n", - pres_uri.len, pres_uri.s); + LM_WARN("Unable to subscribe to remote contact %.*s for watcher %.*s\n", + pres_uri.len, pres_uri.s, + ((subs_info_t*)param)->watcher_uri->len, + ((subs_info_t*)param)->watcher_uri->s); return 1; } @@ -872,7 +874,6 @@ int send_resource_subs(char* uri, void* param) */ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) { - char* uri= NULL; subs_info_t s; str wuri= {0, 0}; str extra_headers; @@ -932,8 +933,6 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) error: if(wuri.s) pkg_free(wuri.s); - if(uri) - xmlFree(uri); if(did_str.s) pkg_free(did_str.s); return -1; @@ -993,7 +992,6 @@ done: pkg_free(subs_copy); } - int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent) { str uri; @@ -1072,7 +1070,7 @@ int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent) { if (subs->from_user.len == parsed_uri.user.len && strncmp(subs->from_user.s, parsed_uri.user.s, parsed_uri.user.len) == 0 && - subs->from_domain.len == parsed_uri.host.len && + subs->from_domain.len == parsed_uri.host.len && strncmp(subs->from_domain.s, parsed_uri.host.s, parsed_uri.host.len) == 0 && subs->event->evp->type == e.type) {

1 0

git:master: modules_k/rls: Added modparam to limit the number of back-end subscribes
by Peter Dunkley 23 Feb '12

23 Feb '12

Module: sip-router Branch: master Commit: c014f8b02eba3ef08195a22269bbd3c9e9670b30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c014f8b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Feb 23 23:09:21 2012 +0000 modules_k/rls: Added modparam to limit the number of back-end subscribes - Specifically, the number of back-end subscribes per RLS subscribe is limited - By default there is no limit - Useful to help prevent a Kamailio server being overloaded when subscribers have huge contact lists. --- modules_k/rls/README | 32 ++++++++++++++++++++++++++------ modules_k/rls/doc/rls_admin.xml | 24 ++++++++++++++++++++++++ modules_k/rls/rls.c | 2 ++ modules_k/rls/rls.h | 1 + modules_k/rls/subscribe.c | 11 +++++++++++ 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/modules_k/rls/README b/modules_k/rls/README index e2d2ef9..d9da04f 100644 --- a/modules_k/rls/README +++ b/modules_k/rls/README @@ -45,6 +45,7 @@ Anca-Maria Vamanu 3.20. max_notify_body_length (int) 3.21. fetch_rows (integer) 3.22. disable_remote_presence (integer) + 3.23. max_backend_subs (integer) 4. Functions @@ -80,9 +81,10 @@ Anca-Maria Vamanu 1.20. Set max_notify_body_length parameter 1.21. Set fetch_rows parameter 1.22. Set disable_remote_presence parameter - 1.23. rls_handle_subscribe usage - 1.24. rls_handle_notify usage - 1.25. rls_update_subs usage + 1.23. Set max_backend_subscribes parameter + 1.24. rls_handle_subscribe usage + 1.25. rls_handle_notify usage + 1.26. rls_update_subs usage Chapter 1. Admin Guide @@ -118,6 +120,7 @@ Chapter 1. Admin Guide 3.20. max_notify_body_length (int) 3.21. fetch_rows (integer) 3.22. disable_remote_presence (integer) + 3.23. max_backend_subs (integer) 4. Functions @@ -198,6 +201,7 @@ Chapter 1. Admin Guide 3.20. max_notify_body_length (int) 3.21. fetch_rows (integer) 3.22. disable_remote_presence (integer) + 3.23. max_backend_subs (integer) 3.1. db_url(str) @@ -488,6 +492,22 @@ modparam("rls", "fetch_rows", 1000) modparam("rls", "disable_remote_presence", 1) ... +3.23. max_backend_subs (integer) + + When set to a non-zero value RLS will limit the number of back-end + SUBSCRIBEs for each RLS SUBSCRIBE to this value. Leaving this at the + default of zero means no limit. When people have large contact lists + RLS will make lots of back-end subscriptions. This can easily overload + a system. This option allows you to limit the number of back-end + SUBSCRIBEs to help prevent overload. + + Default value is 0 + + Example 1.23. Set max_backend_subscribes parameter +... +modparam("rls", "max_backend_subscribes", 30) +... + 4. Functions 4.1. rls_handle_subscribe() @@ -503,7 +523,7 @@ modparam("rls", "disable_remote_presence", 1) This function can be used from REQUEST_ROUTE. - Example 1.23. rls_handle_subscribe usage + Example 1.24. rls_handle_subscribe usage ... For presence and rls on the same machine: modparam("rls", "to_presence_code", 10) @@ -531,7 +551,7 @@ For rls only: This function can be used from REQUEST_ROUTE. - Example 1.24. rls_handle_notify usage + Example 1.25. rls_handle_notify usage ... if(method=="NOTIFY") rls_handle_notify(); @@ -550,7 +570,7 @@ if(method=="NOTIFY") This function can be used from ANY_ROUTE. - Example 1.25. rls_update_subs usage + Example 1.26. rls_update_subs usage ... Within event_route[xhttp:request]: case "PUT": diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index 72f1606..3bad25f 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -560,6 +560,30 @@ modparam("rls", "disable_remote_presence", 1) </programlisting> </example> </section> + <section> + <title><varname>max_backend_subs</varname> (integer)</title> + <para> + When set to a non-zero value RLS will limit the number of back-end + SUBSCRIBEs for each RLS SUBSCRIBE to this value. + Leaving this at the default of zero means no limit. + When people have large contact lists RLS will make lots of back-end + subscriptions. This can easily overload a system. This option allows + you to limit the number of back-end SUBSCRIBEs to help prevent overload. + </para> + <para> + <emphasis> + Default value is 0 + </emphasis> + </para> + <example> + <title>Set <varname>max_backend_subscribes</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rls", "max_backend_subscribes", 30) +... +</programlisting> + </example> + </section> </section> diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 1d64e26..be28c10 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -185,6 +185,7 @@ str rls_outbound_proxy = {0, 0}; int rls_fetch_rows = 500; int rls_disable_remote_presence = 0; +int rls_max_backend_subs = 0; /** module functions */ @@ -235,6 +236,7 @@ static param_export_t params[]={ { "expires_offset", INT_PARAM, &rls_expires_offset }, { "fetch_rows", INT_PARAM, &rls_fetch_rows }, { "disable_remote_presence",INT_PARAM, &rls_disable_remote_presence }, + { "max_backend_subs", INT_PARAM, &rls_max_backend_subs }, {0, 0, 0 } }; diff --git a/modules_k/rls/rls.h b/modules_k/rls/rls.h index 05f5ffb..8bb7a8a 100644 --- a/modules_k/rls/rls.h +++ b/modules_k/rls/rls.h @@ -104,6 +104,7 @@ extern int rls_max_notify_body_len; extern int rls_expires_offset; extern int rls_disable_remote_presence; +extern int rls_max_backend_subs; extern gen_lock_t *rls_update_subs_lock; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index eee4941..c1b73a8 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -864,6 +864,11 @@ int send_resource_subs(char* uri, void* param) return 1; } + /* Silently drop subscribes over the limit - will print a single warning + later */ + if (rls_max_backend_subs > 0 && ++counter > rls_max_backend_subs) + return 1; + ((subs_info_t*)param)->pres_uri = &pres_uri; ((subs_info_t*)param)->remote_target = &pres_uri; return pua_send_subscribe((subs_info_t*)param); @@ -917,6 +922,8 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) s.extra_headers = &extra_headers; s.internal_update_flag = subs->internal_update_flag; + + counter = 0; if(process_list_and_exec(xmlnode, subs->from_user, subs->from_domain, send_resource_subs, (void*)(&s))<0) @@ -925,6 +932,10 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) goto error; } + if (rls_max_backend_subs > 0 && counter > rls_max_backend_subs) + LM_WARN("%.*s has too many contacts. Max: %d, has: %d\n", + wuri.len, wuri.s, rls_max_backend_subs, counter); + pkg_free(wuri.s); pkg_free(did_str.s);

1 0

git:master: core: Setting max_while_loops to zero now allows infinite loops
by Peter Dunkley 23 Feb '12

23 Feb '12

Module: sip-router Branch: master Commit: d4396716a7f0c0472f37e4ce7c39e04394925583 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d439671… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Feb 23 22:56:46 2012 +0000 core: Setting max_while_loops to zero now allows infinite loops - I wanted to be able to have a Kamailio process running a configuration route all the time (sleeping itself using usleep). To do this I use rtimer to create a mode one timer (with timeout of one second - so the route is run very shortly after Kamailio starts). - In the route for this timer I had a while(1) loop, but the max_while_loops (defaulting to 100) meant that the loop wasn't really infinite. - Now setting max_while_loops to zero disables the infinite loop check. --- action.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 6d22bf2..e044f65 100644 --- a/action.c +++ b/action.c @@ -1401,7 +1401,9 @@ match_cleanup: ret=1; while(!(flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)) && (rval_expr_eval_int(h, msg, &v, rve) == 0) && v){ - i++; + if (cfg_get(core, core_cfg, max_while_loops) > 0) + i++; + if (unlikely(i > cfg_get(core, core_cfg, max_while_loops))){ LOG(L_ERR, "ERROR: runaway while (%d, %d): more then" " %d loops\n",

1 0

[tracker] Task opened: call_control() automatically engages mediaproxy on every call
by sip-router 23 Feb '12

23 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Reda Aouad (reda.aouad) Attached to Project - sip-router Summary - call_control() automatically engages mediaproxy on every call Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Kamailio Version: 3.2.0 Modules: call_control, mediaproxy Hi, When I use the function call_control( ) of the call_control module, it automatically engages mediaproxy for every call, even if postpaid and doesn't fall under its control, if it finds the mediaproxy module loaded. If the mediaproxy module is not loaded, call_control doesn't even try to engage it. I need mediaproxy for NAT traversal in some cases, but don't want it to be engaged on every call. For testing, my cfg file has a simple call to the call_control() function in request_route for the moment, and no call at all to any function from the mediaproxy module, which is loaded. I have written about the problem in the OpenSips mailing list: http://lists.opensips.org/pipermail/users/2012-February/020752.html It seems that the issue is not in the CallControl application, and is not a wanted behavior. They previously had this issue, which was related to the dialog module as they say, but fixed it in the latest version of OpenSips. The impact is, as you may guess, a heavier, not wanted load on the mediaproxy server. Thanks for looking into the issue Reda More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=205 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
2
3
4
5
6
7
...
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012