sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
430 discussions

git:admorten/sca: sca: move SUBSCRIBE response handling to sca_subscription_reply
by Andrew Mortensen 03 Mar '13

03 Mar '13

Module: sip-router Branch: admorten/sca Commit: ceb7f0fa3c0da824cdd175de5fa6c17f26408131 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ceb7f0f… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sun Mar 3 17:01:53 2013 -0500 sca: move SUBSCRIBE response handling to sca_subscription_reply - create necessary headers, pass to newly generic sca_reply function. --- modules/sca/sca_subscribe.c | 102 +++++++++++++++++++++++++++++++++---------- modules/sca/sca_subscribe.h | 5 ++ 2 files changed, 83 insertions(+), 24 deletions(-) diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 6337eba..904a3c5 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1108,34 +1108,35 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( parse_headers( msg, HDR_EOH_F, 0 ) < 0 ) { LM_ERR( "header parsing failed: bad request" ); - SCA_REPLY_ERROR( sca, 400, "Bad Request", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request", msg ); return( -1 ); } if ( !STR_EQ( REQ_LINE( msg ).method, SCA_METHOD_SUBSCRIBE )) { LM_ERR( "bad request method %.*s", STR_FMT( &REQ_LINE( msg ).method )); - SCA_REPLY_ERROR( sca, 500, "Internal server error - config", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal server error - config", msg ); return( -1 ); } if ( SCA_HEADER_EMPTY( msg->event )) { - SCA_REPLY_ERROR( sca, 400, "Missing Event", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, "Missing Event", msg ); return( -1 ); } event_type = sca_event_from_str( &msg->event->body ); if ( event_type == SCA_EVENT_TYPE_UNKNOWN ) { - SCA_REPLY_ERROR( sca, 400, "Bad Event", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Event", msg ); return( -1 ); } if ( sca_subscription_from_request( sca, msg, event_type, &req_sub ) < 0 ) { - SCA_REPLY_ERROR( sca, 400, "Bad Shared Call Appearance Request", msg ); + SCA_SUB_REPLY_ERROR( sca, 400, + "Bad Shared Call Appearance Request", msg ); return( -1 ); } if ( sca_subscription_copy_subscription_key( &req_sub, &sub_key ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, - "Internal Server Error - copy dialog id", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "copy dialog id", msg ); goto done; } sca_subscription_print( &req_sub ); @@ -1156,13 +1157,13 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( call_info_hdr ) { if ( sca_call_info_body_parse( &call_info_hdr->body, &call_info ) < 0 ) { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request - " "Invalid Call-Info header", msg ); goto done; } app_idx = call_info.index; } else { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request - " "missing Call-Info header", msg ); goto done; } @@ -1176,8 +1177,8 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( sub != NULL ) { /* this will remove the subscription if expires == 0 */ if ( sca_subscription_update_unsafe( sca, sub, &req_sub, idx ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, - "Internal Server Error - update subscription", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "update subscription", msg ); goto done; } @@ -1185,15 +1186,15 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( req_sub.expires == 0 ) { /* release the seized appearance */ if ( call_info_hdr == NULL ) { - SCA_REPLY_ERROR( sca, 400, "Bad Request - " + SCA_SUB_REPLY_ERROR( sca, 400, "Bad Request - " "missing Call-Info header", msg ); goto done; } if ( sca_appearance_release_index( sca, &req_sub.target_aor, call_info.index ) != SCA_APPEARANCE_OK ) { - SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " - "release seized line", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "release seized line", msg ); goto done; } } else if ( SCA_STR_EMPTY( to_tag )) { @@ -1201,11 +1202,12 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, app_idx, &req_sub.subscriber ); if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { - SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + SCA_SUB_REPLY_ERROR( sca, 480, + "Temporarily Unavailable", msg ); goto done; } else if ( app_idx < 0 ) { - SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " - "seize appearance index", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, + "Internal Server Error - seize appearance index", msg ); goto done; } req_sub.index = app_idx; @@ -1214,7 +1216,7 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } else { /* in-dialog request, but we didn't find it. */ if ( !SCA_STR_EMPTY( to_tag )) { - SCA_REPLY_ERROR( sca, 481, + SCA_SUB_REPLY_ERROR( sca, 481, "Call Leg/Transaction Does Not Exist", msg ); goto done; } @@ -1224,10 +1226,11 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) app_idx = sca_appearance_seize_index( sca, &req_sub.target_aor, app_idx, &req_sub.subscriber ); if ( app_idx == SCA_APPEARANCE_INDEX_UNAVAILABLE ) { - SCA_REPLY_ERROR( sca, 480, "Temporarily Unavailable", msg ); + SCA_SUB_REPLY_ERROR( sca, 480, + "Temporarily Unavailable", msg ); goto done; } else if ( app_idx < 0 ) { - SCA_REPLY_ERROR( sca, 500, "Internal Server Error - " + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " "seize appearance index", msg ); goto done; } @@ -1236,8 +1239,8 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) if ( sca_subscription_save_unsafe( sca, &req_sub, idx, SCA_SUBSCRIPTION_CREATE_OPT_DEFAULT ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, - "Internal Server Error - save subscription", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal Server Error - " + "save subscription", msg ); goto done; } } else { @@ -1252,9 +1255,9 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) status = sca_ok_status_for_event( event_type ); status_text = sca_ok_text_for_event( event_type ); - if ( sca_reply( sca, status, status_text, event_type, + if ( sca_subscription_reply( sca, status, status_text, event_type, req_sub.expires, msg ) < 0 ) { - SCA_REPLY_ERROR( sca, 500, "Internal server error", msg ); + SCA_SUB_REPLY_ERROR( sca, 500, "Internal server error", msg ); goto done; } @@ -1296,6 +1299,57 @@ done: } int +sca_subscription_reply( sca_mod *scam, int status_code, char *status_msg, + int event_type, int expires, sip_msg_t *msg ) +{ + str extra_headers = STR_NULL; + char hdr_buf[ 1024 ]; + int len; + + if ( event_type != SCA_EVENT_TYPE_CALL_INFO && + event_type != SCA_EVENT_TYPE_LINE_SEIZE ) { + LM_ERR( "sca_subscription_reply: unrecognized event type %d", + event_type ); + return( -1 ); + } + + if ( status_code < 300 ) { + /* Add Event, Contact, Allow-Events and Expires headers */ + extra_headers.s = hdr_buf; + len = snprintf( extra_headers.s, sizeof( hdr_buf ), + "Event: %s%s", sca_event_name_from_type( event_type ), CRLF ); + if ( len >= sizeof( hdr_buf ) || len < 0 ) { + LM_ERR( "sca_subscription_reply: extra headers too long" ); + return( -1 ); + } + extra_headers.len = len; + + SCA_STR_APPEND_CSTR( &extra_headers, "Contact: " ); + SCA_STR_APPEND( &extra_headers, &REQ_LINE( msg ).uri ); + SCA_STR_APPEND_CSTR( &extra_headers, CRLF ); + + SCA_STR_COPY_CSTR( &extra_headers, + "Allow-Events: call-info, line-seize" CRLF ); + + len = snprintf( extra_headers.s + extra_headers.len, + sizeof( hdr_buf ) - extra_headers.len, + "Expires: %d%s", expires, CRLF ); + if ( len >= sizeof( hdr_buf ) || len < 0 ) { + LM_ERR( "sca_subscription_reply: extra headers too long" ); + return( -1 ); + } + } else if ( status_code == 480 ) { + /* tell loser of line-seize SUBSCRIBE race to try again shortly */ + extra_headers.s = hdr_buf; + len = snprintf( extra_headers.s, sizeof( hdr_buf ), + "Retry-After: %d%s", 1, CRLF ); + extra_headers.len = len; + } + + return( sca_reply( scam, status_code, status_msg, &extra_headers, msg )); +} + + int sca_subscription_terminate( sca_mod *scam, str *aor, int event, str *subscriber, int termination_state, int opts ) { diff --git a/modules/sca/sca_subscribe.h b/modules/sca/sca_subscribe.h index 2d36248..e238bf3 100644 --- a/modules/sca/sca_subscribe.h +++ b/modules/sca/sca_subscribe.h @@ -74,7 +74,12 @@ extern const str SCA_METHOD_SUBSCRIBE; ((sub1)->state >= SCA_SUBSCRIPTION_STATE_TERMINATED && \ (sub1)->state <= SCA_SUBSCRIPTION_STATE_TERMINATED_TIMEOUT ) +#define SCA_SUB_REPLY_ERROR( mod, scode, smsg, sreply ) \ + sca_subscription_reply((mod), (scode), (smsg), \ + SCA_EVENT_TYPE_CALL_INFO, -1, (sreply)) + int sca_handle_subscribe( sip_msg_t *, char *, char * ); +int sca_subscription_reply( sca_mod *, int, char *, int, int, sip_msg_t * ); int sca_subscription_from_db_result( db1_res_t *, sca_subscription * ); int sca_subscriptions_restore_from_db( sca_mod * );

1 0

git:admorten/sca: sca: make sca_reply a generic reply function.
by Andrew Mortensen 03 Mar '13

03 Mar '13

Module: sip-router Branch: admorten/sca Commit: 36b6571500880d046064ed05a22ce225bf45e9db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36b6571… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sun Mar 3 16:59:23 2013 -0500 sca: make sca_reply a generic reply function. - take a pre-filled extra_headers parameter instead, add with add_lump_rpl. --- modules/sca/sca_reply.c | 55 ++++++----------------------------------------- modules/sca/sca_reply.h | 5 +-- 2 files changed, 9 insertions(+), 51 deletions(-) diff --git a/modules/sca/sca_reply.c b/modules/sca/sca_reply.c index 8da3a6e..3e2f910 100644 --- a/modules/sca/sca_reply.c +++ b/modules/sca/sca_reply.c @@ -31,63 +31,22 @@ int sca_reply( sca_mod *scam, int status_code, char *status_msg, - int event_type, int expires, sip_msg_t *msg ) + str *extra_headers, sip_msg_t *msg ) { str status_str = STR_NULL; - str extra_headers = STR_NULL; - char hdr_buf[ 1024 ]; - int len; assert( scam != NULL && scam->sl_api != NULL ); assert( msg != NULL ); - if ( event_type != SCA_EVENT_TYPE_CALL_INFO && - event_type != SCA_EVENT_TYPE_LINE_SEIZE ) { - LM_ERR( "Unrecognized event type %d", event_type ); - return( -1 ); - } - status_str.s = status_msg; status_str.len = strlen( status_msg ); - if ( status_code < 300 ) { - /* Add Event, Contact, Allow-Events and Expires headers */ - extra_headers.s = hdr_buf; - len = snprintf( extra_headers.s, sizeof( hdr_buf ), - "Event: %s%s", sca_event_name_from_type( event_type ), CRLF ); - extra_headers.len = len; - - SCA_STR_APPEND_CSTR( &extra_headers, "Contact: " ); - SCA_STR_APPEND( &extra_headers, &REQ_LINE( msg ).uri ); - SCA_STR_APPEND_CSTR( &extra_headers, CRLF ); - - SCA_STR_COPY_CSTR( &extra_headers, - "Allow-Events: call-info, line-seize" CRLF ); - - SCA_STR_COPY_CSTR( &extra_headers, "Expires: " ); - - len = snprintf( extra_headers.s + extra_headers.len, - sizeof( hdr_buf ) - extra_headers.len, - "%d%s", expires, CRLF ); - extra_headers.len += len; - - if ( add_lump_rpl( msg, extra_headers.s, extra_headers.len, - LUMP_RPL_HDR ) == NULL ) { - LM_ERR( "Failed to add Allow-Events and Expires headers" ); - return( -1 ); - } - } else if ( status_code == 480 ) { - /* tell loser of line-seize SUBSCRIBE race to try again shortly */ - extra_headers.s = hdr_buf; - len = snprintf( extra_headers.s, sizeof( hdr_buf ), - "Retry-After: %d%s", 1, CRLF ); - extra_headers.len = len; - - if ( add_lump_rpl( msg, extra_headers.s, extra_headers.len, - LUMP_RPL_HDR ) == NULL ) { - LM_ERR( "sca_reply: failed to add Retry-After header" ); - return( -1 ); - } + if ( extra_headers && extra_headers->len ) { + if ( add_lump_rpl( msg, extra_headers->s, extra_headers->len, + LUMP_RPL_HDR ) == NULL ) { + LM_ERR("sca_subscription_reply: failed to add Retry-After header"); + return( -1 ); + } } if ( scam->sl_api->freply( msg, status_code, &status_str ) < 0 ) { diff --git a/modules/sca/sca_reply.h b/modules/sca/sca_reply.h index a8b1131..e2c5d1a 100644 --- a/modules/sca/sca_reply.h +++ b/modules/sca/sca_reply.h @@ -28,9 +28,8 @@ #include "sca.h" #define SCA_REPLY_ERROR( mod, scode, smsg, sreply ) \ - sca_reply((mod), (scode), (smsg), SCA_EVENT_TYPE_CALL_INFO, -1, \ - (sreply)) + sca_reply((mod), (scode), (smsg), NULL, (sreply)) -int sca_reply( sca_mod *, int, char *, int, int, sip_msg_t * ); +int sca_reply( sca_mod *, int, char *, str *, sip_msg_t * ); #endif /* SCA_REPLY_H */

1 0

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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013