sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:admorten/sca: sca: reject out-of-dialog attempts to seize privately held call.
by Andrew Mortensen 03 Mar '13

03 Mar '13

Module: sip-router Branch: admorten/sca Commit: d18a51a4ddec40e20cec2d28a1c2a42352396733 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d18a51a… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sun Mar 3 17:00:44 2013 -0500 sca: reject out-of-dialog attempts to seize privately held call. - per spec, reject with 403 Forbidden. --- modules/sca/sca_call_info.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index de79f38..0195b0e 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -31,6 +31,7 @@ #include "sca_dialog.h" #include "sca_event.h" #include "sca_notify.h" +#include "sca_reply.h" #include "sca_subscribe.h" #include "sca_util.h" @@ -564,6 +565,19 @@ sca_call_info_seize_held_call( sip_msg_t *msg, sca_call_info *call_info, goto done; } + if ( app->state == SCA_APPEARANCE_STATE_HELD_PRIVATE ) { + /* + * spec calls for "403 Forbidden" when non-owner tries to + * seize a privately held call. if we get here, there's no + * to-tag in the INVITE, meaning this isn't a reINVITE + * from the owner to take the call off private hold. + */ + SCA_REPLY_ERROR( sca, 403, "Forbidden - private call", msg ); + + /* rc bubbles up to script. 0 tells script to stop processing. */ + rc = 0; + goto done; + } LM_DBG( "sca_call_info_seize_held_call: seizing %.*s index %d, callee %.*s", STR_FMT( from_aor ), app->index, STR_FMT( &app->callee )); @@ -980,10 +994,12 @@ sca_call_info_invite_request_handler( sip_msg_t *msg, sca_call_info *call_info, from, to, from_aor, to_aor )) { rc = sca_call_info_seize_held_call( msg, call_info, from, to, from_aor, to_aor, contact_uri ); + if ( rc <= 0 ) { + goto done; + } } /* otherwise, this is an initial INVITE */ - dialog.id.s = dlg_buf; if ( sca_dialog_build_from_tags( &dialog, sizeof( dlg_buf ), &msg->callid->body, &from->tag_value, &to->tag_value ) < 0 ) {

1 0

When to rewrite o= in SDP ?
by Khoa Pham 03 Mar '13

03 Mar '13

Hi, I read in http://kamailio.org/docs/modules/1.4.x/nathelper.html that Kamailio might rewrite ip address in o= in SDP to facilitate NAT traversal. It may decide to use to original IP or use IP of RTP server. What factors affect its decision ? -- Khoa Pham HCMC University of Science Faculty of Information Technology

4 6

git:master: pv Minor doc update
by Olle E. Johansson 02 Mar '13

02 Mar '13

Module: sip-router Branch: master Commit: 7c940fa74dd0d39d798b5ed63edf8079f24f2bde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c940fa… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Mar 2 16:25:24 2013 +0100 pv Minor doc update --- modules/pv/README | 2 ++ modules/pv/doc/pv.xml | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/pv/README b/modules/pv/README index 7c5f40e..64a9030 100644 --- a/modules/pv/README +++ b/modules/pv/README @@ -14,6 +14,8 @@ Daniel-Constantin Mierla Copyright � 2008-2011 Daniel-Constantin Mierla (asipto.com) Copyright � 2011 Juha Heinanen + + Copyright � 2013 Olle E. Johansson, Edvina AB __________________________________________________________________ Table of Contents diff --git a/modules/pv/doc/pv.xml b/modules/pv/doc/pv.xml index 1ca758a..acae2e8 100644 --- a/modules/pv/doc/pv.xml +++ b/modules/pv/doc/pv.xml @@ -38,6 +38,10 @@ <year>2011</year> <holder>Juha Heinanen</holder> </copyright> + <copyright> + <year>2013</year> + <holder>Olle E. Johansson, Edvina AB</holder> + </copyright> </bookinfo> <toc></toc>

1 0

git:master: pv Add RPC commands shvGet and shvSet to manipulate and list shared variables
by Olle E. Johansson 02 Mar '13

02 Mar '13

Module: sip-router Branch: master Commit: ab1d5bf573b43daf204eb1572083c8f12791a3e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab1d5bf… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Mar 2 15:53:08 2013 +0100 pv Add RPC commands shvGet and shvSet to manipulate and list shared variables --- modules/pv/README | 41 +++++++++++- modules/pv/doc/pv_admin.xml | 34 ++++++++++ modules/pv/pv.c | 35 ++++++++++ modules/pv/pv_shv.c | 147 +++++++++++++++++++++++++++++++++++++++++++ modules/pv/pv_shv.h | 3 + 5 files changed, 257 insertions(+), 3 deletions(-) diff --git a/modules/pv/README b/modules/pv/README index 162b7f0..7c5f40e 100644 --- a/modules/pv/README +++ b/modules/pv/README @@ -45,6 +45,11 @@ Daniel-Constantin Mierla 5.1. shv_set 5.2. shv_get + 6. RPC Commands + + 6.1. pv.shvSet + 6.2. pv.shvGet + List of Examples 1.1. shvset parameter usage @@ -87,6 +92,11 @@ Chapter 1. Admin Guide 5.1. shv_set 5.2. shv_get + 6. RPC Commands + + 6.1. pv.shvSet + 6.2. pv.shvGet + 1. Overview This module collects the core pseudo-variables that can be used in @@ -207,7 +217,7 @@ if(pv_isset("$avp("s:x")")) pv_unset("$avp("s:x")"); ... -4.3. is_int(pvar) +4.3. is_int(pvar) Function checks if pvar argument contains integer value and returns 1 if it does and -1 otherwise. @@ -221,7 +231,7 @@ if (is_int("$var(foo)")) { } ... -4.4. typeof(pvar, vtype) +4.4. typeof(pvar, vtype) Returns true if the type of pseudo-variable matches the second parameter. The second parameter can be: 'int' - type is integer; 'str' @@ -236,7 +246,7 @@ if (typeof("$var(foo)", "str")) { } ... -4.5. not_empty(pvar) +4.5. not_empty(pvar) Returns true if the pseudo-variables has the type string and is not empty value. @@ -296,3 +306,28 @@ $ kamctl fifo shv_set debug int 0 $ kamctl fifo shv_get debug $ kamctl fifo shv_get ... + +6. RPC Commands + + 6.1. pv.shvSet + 6.2. pv.shvGet + +6.1. pv.shvSet + + Set the value of a shared variable ($shv(name)). + + Parameters: + * _name_: shared variable name + * _type_: type of the value + + "int": integer value + + "str": string value + * _value_: value to be set + +6.2. pv.shvGet + + Get the value of a shared variable ($shv(name)). + + Parameters: + * _name_: shared variable name + + If no name is given, all shared variables are listed diff --git a/modules/pv/doc/pv_admin.xml b/modules/pv/doc/pv_admin.xml index 68bbc9c..884e1ad 100644 --- a/modules/pv/doc/pv_admin.xml +++ b/modules/pv/doc/pv_admin.xml @@ -336,5 +336,39 @@ $ &ctltool; fifo shv_get </example> </section> </section> + <section> + <title>RPC Commands</title> + <section> + <title><function moreinfo="none">pv.shvSet</function></title> + <para> + Set the value of a shared variable ($shv(name)). + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_name_: shared variable name</para></listitem> + + <listitem><para>_type_: type of the value</para> + <itemizedlist> + <listitem><para> <quote>int</quote>: integer value </para></listitem> + <listitem><para> <quote>str</quote>: string value </para></listitem> + </itemizedlist> + </listitem> + + <listitem><para>_value_: value to be set</para></listitem> + </itemizedlist> + </section> + <section> + <title><function moreinfo="none">pv.shvGet</function></title> + <para> + Get the value of a shared variable ($shv(name)). + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_name_: shared variable name</para></listitem> + </itemizedlist> + <para>If no name is given, all shared variables are listed</para> + </section> + </section> + </chapter> diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 0b22faf..d1d4b2b 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -28,6 +28,9 @@ #include "../../pvar.h" #include "../../mod_fix.h" #include "../../lib/kmi/mi.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" + #include "pv_branch.h" #include "pv_core.h" @@ -448,6 +451,7 @@ static int pv_unset(struct sip_msg* msg, char* pvid, char *foo); static int is_int(struct sip_msg* msg, char* pvar, char* s2); static int pv_typeof(sip_msg_t *msg, char *pv, char *t); static int pv_not_empty(sip_msg_t *msg, char *pv, char *s2); +static int pv_init_rpc(void); static cmd_export_t cmds[]={ {"pv_isset", (cmd_function)pv_isset, 1, fixup_pvar_null, 0, @@ -495,6 +499,11 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(pv_init_rpc()!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } return 0; } @@ -629,3 +638,29 @@ static int is_int(struct sip_msg* msg, char* pvar, char* s2) return -1; } + +static const char* rpc_shv_set_doc[2] = { + "Set a shared variable (args: name type value)", + 0 +}; + +static const char* rpc_shv_get_doc[2] = { + "Get the value of a shared variable. If no argument, dumps all", + 0 +}; + +rpc_export_t pv_rpc[] = { + {"pv.shvSet", rpc_shv_set, rpc_shv_set_doc, 0}, + {"pv.shvGet", rpc_shv_get, rpc_shv_get_doc, 0}, + {0, 0, 0, 0} +}; + +static int pv_init_rpc(void) +{ + if (rpc_register_array(pv_rpc)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +} diff --git a/modules/pv/pv_shv.c b/modules/pv/pv_shv.c index 548ab04..dc0109f 100644 --- a/modules/pv/pv_shv.c +++ b/modules/pv/pv_shv.c @@ -2,6 +2,7 @@ * $Id$ * * Copyright (C) 2007 Elena-Ramona Modroiu + * Copyright (C) 2013 Olle E. Johansson * * This file is part of Kamailio, a free SIP server. * @@ -615,6 +616,152 @@ error: return NULL; } + +void rpc_shv_get(rpc_t* rpc, void* c) +{ + str varname; + int allvars = 0; + sh_var_t *shv = NULL; + void* th; + void* ih; + void* vh; + + if (rpc->scan(c, "S", &varname) != 1) { + allvars = 1; + } + + if (!allvars) { + /* Get one variable value */ + shv = get_shvar_by_name(&varname); + if(shv==NULL) { + rpc->fault(c, 404, "Variable not found"); + return; + } + if (rpc->add(c, "{", &ih) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + + lock_shvar(shv); + if(shv->v.flags&VAR_VAL_STR) + { + if(rpc->struct_add(ih, "sss", "name", varname.s, "type", "string", "value", shv->v.value.s.s) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc data (str)"); + unlock_shvar(shv); + return; + } + } else { + if(rpc->struct_add(ih, "ssd", "name", varname.s, "type", "int", "value", shv->v.value.n) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc data (int)"); + unlock_shvar(shv); + return; + } + } + unlock_shvar(shv); + + return; + } + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + + if(rpc->struct_add(th, "{", "items", &ih) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc th"); + return; + } + + for(shv=sh_vars; shv; shv=shv->next) + { + lock_shvar(shv); + if(rpc->struct_add(ih, "{", "shv", &vh) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc th"); + return; + } + if(shv->v.flags&VAR_VAL_STR) + { + if(rpc->struct_add(vh, "sss", "name", shv->name.s, "type", "string", "value", shv->v.value.s.s) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc data"); + unlock_shvar(shv); + return; + } + } else { + if(rpc->struct_add(vh, "ssd", "name", shv->name.s, "type", "int", "value", shv->v.value.n) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc data"); + unlock_shvar(shv); + return; + } + } + unlock_shvar(shv); + } + + return ; +} + +void rpc_shv_set(rpc_t* rpc, void* c) +{ + str varname, type, value; + int ival = 0; + int_str isv; + sh_var_t *shv = NULL; + int flags = 0; + LM_DBG("Entering SHV_set\n"); + + if (rpc->scan(c, "S", &varname) != 1) { + rpc->fault(c, 500, "Missing parameter varname (Parameters: varname type value)"); + return; + } + LM_DBG("SHV_set Varname %.*s \n", varname.len, varname.s); + if (rpc->scan(c, "S", &type) != 1) { + rpc->fault(c, 500, "Missing parameter type (Parameters: varname type value)"); + return; + } + if (strcasecmp(type.s, "int") == 0 ) { + if (rpc->scan(c, "d", &ival) != 1) { + rpc->fault(c, 500, "Missing integer parameter value (Parameters: varname type value)"); + return; + } + isv.n = ival; + } else if (strcasecmp(type.s, "str") == 0 ) { + /* String value */ + if (rpc->scan(c, "S", &value) != 1) { + rpc->fault(c, 500, "Missing parameter value (Parameters: varname type value)"); + return; + } + isv.s = value; + flags = VAR_VAL_STR; + } else { + rpc->fault(c, 500, "Unknown parameter type (Types: int or str)"); + return; + } + + shv = get_shvar_by_name(&varname); + if(shv==NULL) { + rpc->fault(c, 404, "Variable not found"); + return; + } + + lock_shvar(shv); + if(set_shvar_value(shv, &isv, flags)==NULL) + { + rpc->fault(c, 500, "Cannot set shared variable value"); + LM_ERR("cannot set shv value\n"); + } else { + rpc->printf(c, "Ok. Variable set to new value."); + } + + unlock_shvar(shv); + return; +} + int param_set_xvar( modparam_t type, void* val, int mode) { str s; diff --git a/modules/pv/pv_shv.h b/modules/pv/pv_shv.h index d47b0ac..0db4800 100644 --- a/modules/pv/pv_shv.h +++ b/modules/pv/pv_shv.h @@ -69,5 +69,8 @@ struct mi_root* mi_shvar_set(struct mi_root* cmd_tree, void* param); int param_set_var( modparam_t type, void* val); int param_set_shvar( modparam_t type, void* val); +void rpc_shv_get(rpc_t* rpc, void* c); +void rpc_shv_set(rpc_t* rpc, void* c); + #endif

1 0

Asterisk realtime with kamailio Load balancing issue for sip user
by Prakash N 02 Mar '13

02 Mar '13

Hi All, We have finished the Kamailio & Asterisk real time integration and load balancing also done using dispatcher module. Queue and voice mails are load balancing as well.When we are calling extension to extension it is showing in all the servers.It seems extension are not load balancing as per our knowledge. I have attached the kamailio.cfg for your reference,Find my coding below as mentioned. *# -- dispatcher params for DB support --* *modparam("dispatcher","db_url", "mysql:// openser:openserrw@192.168.1.170/openser")* *modparam("dispatcher", "table_name", "dispatcher")* *modparam("dispatcher", "setid_col", "setid")* *modparam("dispatcher", "destination_col", "destination")* *modparam("dispatcher", "flags_col", "flags")* *modparam("dispatcher", "priority_col", "priority")* * * * ----------------------------------------------------------------------------------------- * *# Dispatch requests* *route[DISPATCH] {* *if ( method=="INVITE" ) {* *# dst_select( "GROUP", "HASH METHOD")* * ds_select_dst("1","4");* * sl_send_reply("100","Trying");* * forward();#uri:host, uri:port);* * exit();* *}}* Kindly suggest the solution for the same. Thanks in advance. Regards, N.Prakash

2 3

git:master: presence Add RPC command presence.cleanup
by Olle E. Johansson 02 Mar '13

02 Mar '13

Module: sip-router Branch: master Commit: 68094dd3639d1f4cc497e4affb1a89909947c7b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68094dd… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Mar 2 09:41:18 2013 +0100 presence Add RPC command presence.cleanup --- modules/presence/README | 70 ++++++++++++++++++++----------- modules/presence/doc/presence_admin.xml | 19 ++++++++ modules/presence/presence.c | 41 ++++++++++++++++++ 3 files changed, 106 insertions(+), 24 deletions(-) diff --git a/modules/presence/README b/modules/presence/README index 1c202a8..f8681e4 100644 --- a/modules/presence/README +++ b/modules/presence/README @@ -16,9 +16,9 @@ Edited by Juha Heinanen - Copyright © 2006 Voice Sistem SRL + Copyright � 2006 Voice Sistem SRL - Copyright © 2009 Juha Heinanen + Copyright � 2009 Juha Heinanen __________________________________________________________________ Table of Contents @@ -70,7 +70,11 @@ Juha Heinanen 5.1. refreshWatchers 5.2. cleanup - 6. Installation + 6. RPC Commands + + 6.1. presence.cleanup + + 7. Installation 2. Developer Guide @@ -170,7 +174,11 @@ Chapter 1. Admin Guide 5.1. refreshWatchers 5.2. cleanup - 6. Installation + 6. RPC Commands + + 6.1. presence.cleanup + + 7. Installation 1. Overview @@ -245,19 +253,19 @@ Chapter 1. Admin Guide If set, the module is a fully operational presence server. Otherwise, it is used as a 'library', for its exported functions. - Default value is “NULL”. + Default value is "NULL". Example 1.1. Set db_url parameter ... modparam("presence", "db_url", - "mysql://openser:openserrw@localhost/openser") + "mysql://kamailio:kamailiorw@localhost/kamailio") ... 3.2. presentity_table(str) The name of the db table where PUBLISH presence information is stored. - Default value is “presentity”. + Default value is "presentity". Example 1.2. Set presentity_table parameter ... @@ -269,7 +277,7 @@ modparam("presence", "presentity_table", "presentity") The name of the db table where active subscription information is stored. - Default value is “active_watchers”. + Default value is "active_watchers". Example 1.3. Set active_watchers_table parameter ... @@ -280,7 +288,7 @@ modparam("presence", "active_watchers_table", "active_watchers") The name of the db table where subscription states are stored. - Default value is “watchers”. + Default value is "watchers". Example 1.4. Set watchers_table parameter ... @@ -292,7 +300,7 @@ modparam("presence", "watchers_table", "watchers") The period in seconds between checks if there are expired messages stored in database. - Default value is “100”. A zero or negative value disables this + Default value is "100". A zero or negative value disables this activity. Example 1.5. Set clean_period parameter @@ -305,7 +313,7 @@ modparam("presence", "clean_period", 100) The period at which to synchronize cached subscriber info with the database. - Default value is “100”. A zero or negative value disables + Default value is "100". A zero or negative value disables synchronization. Example 1.6. Set db_update_period parameter @@ -323,7 +331,7 @@ modparam("presence", "db_update_period", 100) than 0. When notifier_processes is less than or equal to 0 NOTIFY requests are sent immediately. - Default value is “5”. + Default value is "5". Example 1.7. Set waitn_time parameter ... @@ -340,7 +348,7 @@ modparam("presence", "waitn_time", 10) Separate notifier processes are only run when subs_db_mode is 3 (DB only mode). - Default value is “10”. + Default value is "10". Example 1.8. Set notifier_poll_rate parameter ... @@ -360,7 +368,7 @@ modparam("presence", "notifier_poll_rate", 20) NOTIFY requests can be sent on a dialog at the same time, there are race conditions which result in CSeq re-use. - Default value is “1”. + Default value is "1". Example 1.9. Set notifier_processes parameter ... @@ -372,7 +380,7 @@ modparam("presence", "notifier_processes", 2) The prefix used when generating to_tag when sending replies for SUBSCRIBE requests. - Default value is “10”. + Default value is "10". Example 1.10. Set to_tag_pref parameter ... @@ -385,7 +393,7 @@ modparam("presence", "to_tag_pref", 'pres') when sending a 200OK for a publish. It is used for forcing the client to send an update before the old publish expires. - Default value is “0”. + Default value is "0". Example 1.11. Set expires_offset parameter ... @@ -397,7 +405,7 @@ modparam("presence", "expires_offset", 10) The the maximum admissible expires value for PUBLISH/SUBSCRIBE message (in seconds). - Default value is “3600”. + Default value is "3600". Example 1.12. Set max_expires parameter ... @@ -468,7 +476,7 @@ modparam("presence", "subs_db_mode", 1) database or there are other external entities inserting data into the presentity table. - Default value is “1”. + Default value is "1". Example 1.15. Set publ_cache parameter ... @@ -481,7 +489,7 @@ modparam("presence", "publ_cache", 0) This parameter will be used as the power of 2 when computing table size. - Default value is “9 (512)”. + Default value is "9 (512)". Example 1.16. Set subs_htable_size parameter ... @@ -493,7 +501,7 @@ modparam("presence", "subs_htable_size", 11) The size of the in-memory hash table to store publish records. This parameter will be used as the power of 2 when computing table size. - Default value is “9 (512)”. + Default value is "9 (512)". Example 1.17. Set pres_htable_size parameter ... @@ -508,7 +516,7 @@ modparam("presence", "pres_htable_size", 11) empty NOTIFY to an message-summary event. This parameter is enabled by default, thus addering to the standard. - Default value is “1 ”. + Default value is "1 ". Example 1.18. Set send_fast_notify parameter ... @@ -523,7 +531,7 @@ modparam("presence", "send_fast_notify", 0) this check requires extra processing that should be avoided if this feature is not supported by the clients. - Default value is “0 ”. + Default value is "0 ". Example 1.19. Set enable_sphere_check parameter ... @@ -538,7 +546,7 @@ modparam("presence", "enable_sphere_check", 1) on. Disabling this will keep subscriptions active on unreliable networks. - Default value is “1”. + Default value is "1". Example 1.20. Set timeout_rm_subs parameter ... @@ -740,7 +748,21 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); :cleanup:fifo_reply _empty_line_ -6. Installation +6. RPC Commands + + 6.1. presence.cleanup + +6.1. presence.cleanup + + Manually triggers the cleanup functions for the active_watchers, + presentity, and watchers tables. Useful if you have set clean_period + and/or db_update_period to zero or less. + + Name: presence.cleanup + + Parameters: none + +7. Installation The module requires 3 tables in the Kamailio database: "presentity", "active_watchers" and "watchers". The SQL syntax to create them can be diff --git a/modules/presence/doc/presence_admin.xml b/modules/presence/doc/presence_admin.xml index b2fcf6e..02b3562 100644 --- a/modules/presence/doc/presence_admin.xml +++ b/modules/presence/doc/presence_admin.xml @@ -902,6 +902,25 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); </section> <section> + <title>RPC Commands</title> + <section> + <title> + <function moreinfo="none">presence.cleanup</function> + </title> + <para> + Manually triggers the cleanup functions for the active_watchers, presentity, + and watchers tables. Useful if you have set <varname>clean_period</varname> + and/or <varname>db_update_period</varname> to zero or less. + </para> + <para> + Name: <emphasis>presence.cleanup</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + + </section> +</section> + +<section> <title>Installation</title> <para> The module requires 3 tables in the &kamailio; database: "presentity", diff --git a/modules/presence/presence.c b/modules/presence/presence.c index ed7f4d1..067a1e1 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -73,6 +73,8 @@ #include "notify.h" #include "../../mod_fix.h" #include "../../timer_proc.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" MODULE_VERSION @@ -127,6 +129,7 @@ static int w_pres_update_watchers(struct sip_msg *msg, char *puri, char *pevent); static int fixup_refresh_watchers(void** param, int param_no); static int fixup_update_watchers(void** param, int param_no); +static int presence_init_rpc(void); int counter =0; int pid = 0; @@ -231,6 +234,11 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(presence_init_rpc()!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } db_url.len = db_url.s ? strlen(db_url.s) : 0; LM_DBG("db_url=%s/%d/%p\n", ZSW(db_url.s), db_url.len,db_url.s); @@ -1780,4 +1788,37 @@ static int fixup_update_watchers(void** param, int param_no) return fixup_spve_null(param, 1); } return 0; + +} + +void rpc_presence_cleanup(rpc_t* rpc, void* c) +{ + LM_DBG("rpc_presence_cleanup:start\n"); + + (void) msg_watchers_clean(0,0); + (void) msg_presentity_clean(0,0); + (void) timer_db_update(0,0); + + rpc->printf(c, "Reload OK"); + return; +} + +static const char* rpc_presence_cleanup_doc[2] = { + "Manually triggers the cleanup functions for the active_watchers, presentity, and watchers tables.", + 0 +}; + +rpc_export_t presence_rpc[] = { + {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, + {0, 0, 0, 0} +}; + +static int presence_init_rpc(void) +{ + if (rpc_register_array(presence_rpc)!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; }

1 0

git:master: cfgutils Add functions for checking if a route exists
by Olle E. Johansson 02 Mar '13

02 Mar '13

Module: sip-router Branch: master Commit: c2c4c393a3c68ed3fb6fd53a71febdd93398f77c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2c4c39… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Mar 2 07:56:48 2013 +0100 cfgutils Add functions for checking if a route exists Adding check_route_exists() and route_if_exists() functions. --- modules/cfgutils/cfgutils.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/modules/cfgutils/cfgutils.c b/modules/cfgutils/cfgutils.c index 37c106a..98d10fa 100644 --- a/modules/cfgutils/cfgutils.c +++ b/modules/cfgutils/cfgutils.c @@ -1,6 +1,7 @@ /* * $Id$ * + * Copyright (C) 2012 Edvina AB * Copyright (C) 2007 1&1 Internet AG * Copyright (C) 2007 BASIS AudioNet GmbH * Copyright (C) 2004 FhG @@ -70,6 +71,7 @@ #include "../../globals.h" #include "../../hashes.h" #include "../../locking.h" +#include "../../route.h" #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -91,6 +93,8 @@ static int dbg_pkg_status(struct sip_msg*, char*,char*); static int dbg_shm_status(struct sip_msg*, char*,char*); static int dbg_pkg_summary(struct sip_msg*, char*,char*); static int dbg_shm_summary(struct sip_msg*, char*,char*); +static int route_exists(struct sip_msg*, char*); +static int check_route_exists(struct sip_msg*, char*); static int set_gflag(struct sip_msg*, char *, char *); static int reset_gflag(struct sip_msg*, char *, char *); @@ -178,6 +182,10 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"core_hash", (cmd_function)w_core_hash, 3, fixup_core_hash, 0, ANY_ROUTE}, + {"check_route_exists", (cmd_function)check_route_exists, 1, 0, 0, + ANY_ROUTE}, + {"route_if_exists", (cmd_function)route_exists, 1, 0, 0, + ANY_ROUTE}, {"bind_cfgutils", (cmd_function)bind_cfgutils, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -737,6 +745,32 @@ static int cfg_unlock(struct sip_msg *msg, char *key, char *s2) return cfg_lock_wrapper(msg, (gparam_p)key, 1); } +/*! Check if a route block exists - only request routes + */ +static int check_route_exists(struct sip_msg *msg, char *route) +{ + if (route_lookup(&main_rt, route)) + return 1; + return 0; +} + +/*! Run a request route block if it exists + */ +static int route_exists(struct sip_msg *msg, char *route) +{ + struct run_act_ctx ctx; + int newroute, backup_rt; + + if (!(newroute = route_lookup(&main_rt, route))) { + return 0; + } + backup_rt = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(main_rt.rlist[newroute], msg, 0); + set_route_type(backup_rt); + return 0; +} static int mod_init(void) {

1 0

git:master: cfgutils documentation
by Olle E. Johansson 02 Mar '13

02 Mar '13

Module: sip-router Branch: master Commit: 0d69ffe84069e9cd9e41de194cbeff002e3d31b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d69ffe… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Mar 2 07:56:21 2013 +0100 cfgutils documentation --- modules/cfgutils/README | 117 +++++++++++++++++++++--------- modules/cfgutils/doc/cfgutils.xml | 7 ++ modules/cfgutils/doc/cfgutils_admin.xml | 47 ++++++++++++ 3 files changed, 136 insertions(+), 35 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0d6…

1 0

New commits on branch admorten/sca
by Andrew Mortensen 01 Mar '13

01 Mar '13

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6eb29d1… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Mar 1 16:33:59 2013 -0500 sca: fix private hold handling - private hold call-info was being ignored in hold reINVITEs, causing inaccurate "active" notifications to go to subscribers. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f35503c… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Feb 22 14:45:58 2013 -0500 sca: return true if no Contact header is found in an INVITE packet - stop spurious log messages when receiving a 100 Trying with no Contact. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0fcbb87… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 22:56:37 2013 -0500 sca: log at debug level when reporting lack of Contact header URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51c8020… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 22:32:23 2013 -0500 sca: ensure SCA caller has correct callee CLI when callee is non-SCA. - previously only set when callee was also SCA URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf0cbc1… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 18:55:02 2013 -0500 sca: remove misleading comment. - suggestion in comment has long since been implemented URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=530a28d… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Fri Feb 22 00:51:33 2013 +0200 app_python: Bugfix for rewrite_ruri *) Fixed a bug in msg_rewrite_ruri discovered by "V Tone" <vtone001(a)gmail.com>. *) Removed 'python exception' when do_action returns error. Reason: it is not an exception. *) Removed abort() if first_line type is invalid. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da69a75… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Feb 21 17:00:31 2013 -0500 sca: prevent possible NULL-dereference in log message when NOTIFY fails. - sub struct may be NULL outside of else block. Use non-shmem req_sub from incoming SUBSCRIBE packet instead. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc80bbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 21 11:34:25 2013 +0100 kamailio.cfg: fixed typos to speeddial - patch by Thilo Bangert, FS#268 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf14bc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 21 11:25:39 2013 +0100 tm: add Max-Forwards header to local requests if not given as parameter - add the header to local generated CANCEL and ACK - based on a patch by Morten Tryfoss URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f54c6ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 21 10:40:07 2013 +0100 core: dns - prevent queries for IPv4/6 address literals - prevent A queries for IPv6 address literals or AAAA queries for IPv4 address literals - patch by Simon Perreault URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8706c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 20 11:29:06 2013 +0100 Makefile.defs: version set to 4.0.0-pre2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4774168… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 20 09:59:56 2013 +0000 modules/outbound: Fix core dump crash - Reported by oej URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d9331f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 20 09:49:44 2013 +0000 modules/outbound: Fixes the crash but is logically incorrect for outbound - Not sure why the crash happened at all - but this fix breaks the outbound logic Revert "outbound Fix core dump crash" This reverts commit 6369444761d44526ded2620e33438abb182d2bdc. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94596ce… Author: Olle E. Johansson <oej(a)edvina.net> Date: Tue Feb 19 23:08:13 2013 +0100 outbound Fix core dump crash When we got a CANCEL without Contact the parse_contact was sent a null pointer. Changing the "or" to "and" fixed this and Kamailio no longer cores on Cancel coming on over websockets from jssip. Tested at SIPit 30. Core dumps and backtraces available. Pdunkley - please check this patch URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=603da43… Author: Olle E. Johansson <oej(a)edvina.net> Date: Mon Feb 18 22:36:45 2013 +0100 maxfwd The default value is not 256, it's 16 in the source code. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fda5e7… Author: Richard Good <richard.good(a)smilecoms.com> Date: Mon Feb 18 09:48:22 2013 +0200 dialog_ng: changed LM_ERR to LM_DBG in dlg_hash.c - dlg_set_leg_info() line 416 was incorrectly logged as ERR when it should be only DBG URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d06b55… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 21:13:29 2013 -0500 rtpproxy: when adding ICE relay candidates, always include RTCP candidate URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36609ac… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 20:12:56 2013 -0500 sdp: fix TABS and whitespaces URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a73f992… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 12:08:20 2013 -0500 xhttp_rpc: cosmetic updates to header's web page URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=542cbc7… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Feb 15 11:27:15 2013 -0500 xhttp_pi: fix default value for xhttp_pi_root param

1 0

[tracker] Task opened: FIFO deadlock after dispatcher reload
by sip-router 01 Mar '13

01 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Dmitry (dmdm21) Attached to Project - sip-router Summary - FIFO deadlock after dispatcher reload Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - High Priority - Normal Reported Version - 3.3 Due in Version - Undecided Due Date - Undecided Details - kamailio-3.3.4 /usr/local/kamailio/sbin/kamctl fifo ds_reload After couple of reloads FIFO interface stops responding. After that command like bellow hangs. /usr/local/kamailio/sbin/kamctl fifo ds_list Normaly when FIFO is alive the process is running: # strace -p 15519 Process 15519 attached - interrupt to quit read(6, ^C <unfinished ...> Process 15519 detached After it's locked, it in this stage: # strace -p 15519 Process 15519 attached - interrupt to quit futex(0xaf0c8f10, FUTEX_WAIT, 2, NULL^C <unfinished ...> Process 15519 detached # gdb -p 15519 ... (gdb) bt #0 0xb7732430 in __kernel_vsyscall () #1 0xb76826e7 in syscall () from /lib/tls/i686/cmov/libc.so.6 #2 0xaee41036 in futex_get (dsht=0xaf0c8b30) at #../../mem/../futexlock.h:110 #3 ds_ht_clear_slots (dsht=0xaf0c8b30) at ds_ht.c:162 #4 0xaee38556 in ds_load_list (lfile=0xb71c2840 #"/usr/local/kamailio/etc/kamailio/dispatcher.list") at dispatch.c:601 #5 0xaee3c050 in ds_mi_reload (cmd_tree=0xa1dee18, param=0x0) at #dispatcher.c:776 #6 0xb71a76f2 in run_mi_cmd (fifo_stream=0xa1ddad0) at #../../lib/kmi/mi.h:77 #7 mi_fifo_server (fifo_stream=0xa1ddad0) at fifo_fnc.c:509 #8 0xb71a96b0 in fifo_process (rank=1) at mi_fifo.c:247 #9 0xb71a9a18 in mi_child_init (rank=0) at mi_fifo.c:211 #10 0x08123c5f in init_mod_child (m=0xb71ba5d8, rank=0) at sr_module.c:893 #11 0x08123bd0 in init_mod_child (m=0xb71ba6f0, rank=0) at sr_module.c:890 #12 0x08123bd0 in init_mod_child (m=0xb71baac8, rank=0) at sr_module.c:890 #13 0x08123bd0 in init_mod_child (m=0xb71bb798, rank=0) at sr_module.c:890 #14 0x08123bd0 in init_mod_child (m=0xb71bbb48, rank=0) at sr_module.c:890 #15 0x08123bd0 in init_mod_child (m=0xb71bbd88, rank=0) at sr_module.c:890 #16 0x08123bd0 in init_mod_child (m=0xb71bc0e0, rank=0) at sr_module.c:890 #17 0x08123bd0 in init_mod_child (m=0xb71bdbc8, rank=0) at sr_module.c:890 #18 0x08123bd0 in init_mod_child (m=0xb71bdd68, rank=0) at sr_module.c:890 #19 0x08123bd0 in init_mod_child (m=0xb71bded0, rank=0) at sr_module.c:890 #20 0x08123bd0 in init_mod_child (m=0xb71be1e8, rank=0) at sr_module.c:890 #21 0x08123bd0 in init_mod_child (m=0xb71be828, rank=0) at sr_module.c:890 #22 0x08123bd0 in init_mod_child (m=0xb71bec88, rank=0) at sr_module.c:890 #23 0x08123bd0 in init_mod_child (m=0xb71bef48, rank=0) at sr_module.c:890 #24 0x08123bd0 in init_mod_child (m=0xb71bf0c8, rank=0) at sr_module.c:890 #25 0x08123bd0 in init_mod_child (m=0xb71bf378, rank=0) at sr_module.c:890 #26 0x08123bd0 in init_mod_child (m=0xb71bffb0, rank=0) at sr_module.c:890 #27 0x08123bd0 in init_mod_child (m=0xb71c0220, rank=0) at sr_module.c:890 #28 0x08123bd0 in init_mod_child (m=0xb71c1ac0, rank=0) at sr_module.c:890 #29 0x08123bd0 in init_mod_child (m=0xb71c1c28, rank=0) at sr_module.c:890 #30 0x08123bd0 in init_mod_child (m=0xb71c2218, rank=0) at sr_module.c:890 #31 0x08123bd0 in init_mod_child (m=0xb71c24d0, rank=0) at sr_module.c:890 #32 0x08123bd0 in init_mod_child (m=0xb71c38c8, rank=0) at sr_module.c:890 #33 0x080a8ccd in main_loop () at main.c:1710 #34 0x080ab337 in main (argc=13, argv=0xbfc04964) at main.c:2546 (gdb) quit More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=275 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013