sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
236 discussions

regex's as PVs in textops functions
by Hugh Waite 14 Jun '13

14 Jun '13

Hello, I need to run a text find-and-replace on the body of my requests and responses. The texops functions 'replace_body_all' and 'subst_body' work for fixed regular expressions, but mine need to be configurable i.e. loaded from a database. Trying to accept PVs in the regex parameter could intefere with regex's that contain $ characters, so this isn't as simple as inserting the spve fixup into these functions. What do you think is the best way to implement this and remain compatible with existing versions? New functions with different names? For example: route(FETCH_REGEX_FROM_DB); if ($var(regex) != $null) { replace_body_pv("$var(regex)", "$var(repl)"); } Regards, Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

2 1

git:admorten/sca: modules/sca: fix regression: restore purge expired timer
by Andrew Mortensen 13 Jun '13

13 Jun '13

Module: sip-router Branch: admorten/sca Commit: 5a057ebfa95800706fb0df9ebb6bfc28f00db9d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a057eb… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Jun 13 16:06:10 2013 -0400 modules/sca: fix regression: restore purge expired timer --- modules/sca/sca.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/sca/sca.c b/modules/sca/sca.c index d0db43b..f196c27 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -327,6 +327,8 @@ sca_mod_init( void ) sca_subscriptions_restore_from_db( sca ); + register_timer( sca_subscription_purge_expired, sca, + sca->cfg->purge_expired_interval ); register_timer( sca_appearance_purge_stale, sca, sca->cfg->purge_expired_interval );

1 0

git:admorten/sca: modules/sca: clear appearance on receipt of out-of-dialog SUBSCRIBE
by Andrew Mortensen 13 Jun '13

13 Jun '13

Module: sip-router Branch: admorten/sca Commit: 55dd3bb2f1f4c5675686d49012fcbe08f086d489 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55dd3bb… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Jun 13 15:34:00 2013 -0400 modules/sca: clear appearance on receipt of out-of-dialog SUBSCRIBE - If a call-info SUBSCRIBE with no To-tag arrives from a subscriber with an active subscription, release any appearances owned by the subscriber, on the assumption that the subscriber has lost track of SCA (reboot, power/network loss). --- modules/sca/sca_appearance.c | 54 ++++++++++++++++++++++++++++++++++++++++++ modules/sca/sca_appearance.h | 1 + modules/sca/sca_subscribe.c | 22 ++++++++++++++++- 3 files changed, 76 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_appearance.c b/modules/sca/sca_appearance.c index 7904abb..22d8413 100644 --- a/modules/sca/sca_appearance.c +++ b/modules/sca/sca_appearance.c @@ -1087,6 +1087,60 @@ done: return( rc ); } + int +sca_appearance_owner_release_all( str *aor, str *owner ) +{ + sca_appearance_list *app_list = NULL; + sca_appearance *app, **cur_app, **tmp_app; + sca_hash_slot *slot; + sca_hash_entry *ent; + int slot_idx = -1; + int released = -1; + + slot_idx = sca_uri_lock_shared_appearance( sca, aor ); + slot = sca_hash_table_slot_for_index( sca->appearances, slot_idx ); + + for ( ent = slot->entries; ent != NULL; ent = ent->next ) { + if ( ent->compare( aor, ent->value ) == 0 ) { + app_list = (sca_appearance_list *)ent->value; + break; + } + } + + released = 0; + + if ( app_list == NULL ) { + LM_DBG( "sca_appearance_owner_release_all: No appearances for %.*s", + STR_FMT( aor )); + goto done; + } + + for ( cur_app = &app_list->appearances; *cur_app != NULL; + cur_app = tmp_app ) { + tmp_app = &(*cur_app)->next; + + if ( !SCA_STR_EQ( owner, &(*cur_app)->owner )) { + continue; + } + + app = *cur_app; + *cur_app = (*cur_app)->next; + tmp_app = cur_app; + + if ( app ) { + sca_appearance_free( app ); + released++; + } + } + +done: + if ( slot_idx >= 0 ) { + sca_hash_table_unlock_index( sca->appearances, slot_idx ); + } + + return( released ); +} + sca_appearance * sca_appearance_for_index_unsafe( sca_mod *scam, str *aor, int app_idx, int slot_idx ) diff --git a/modules/sca/sca_appearance.h b/modules/sca/sca_appearance.h index a1feab7..74d6b39 100644 --- a/modules/sca/sca_appearance.h +++ b/modules/sca/sca_appearance.h @@ -140,6 +140,7 @@ int sca_appearance_update_unsafe( sca_appearance *, int, str *, str *, int sca_appearance_update_index( sca_mod *, str *, int, int, str *, str *, sca_dialog * ); int sca_appearance_release_index( sca_mod *, str *, int ); +int sca_appearance_owner_release_all( str *, str * ); int sca_appearance_state_for_index( sca_mod *, str *, int ); sca_appearance *sca_appearance_for_index_unsafe( sca_mod *, str *, int, int ); sca_appearance *sca_appearance_for_dialog_unsafe( sca_mod *, str *, diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index cf8feb7..1b8107e 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1120,6 +1120,7 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) int app_idx = SCA_CALL_INFO_APPEARANCE_INDEX_ANY; int idx = -1; int rc = -1; + int released = 0; if ( parse_headers( msg, HDR_EOH_F, 0 ) < 0 ) { LM_ERR( "header parsing failed: bad request" ); @@ -1227,6 +1228,22 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } req_sub.index = app_idx; } + } else { + if ( SCA_STR_EMPTY( to_tag )) { + /* + * if the subscriber owns any active appearances, clear them. + * we assume that an out-of-dialog SUBSCRIBE for a subscriber + * with active appearances is indicative of a reboot. + */ + released = sca_appearance_owner_release_all( + &req_sub.target_aor, + &req_sub.subscriber ); + if ( released ) { + LM_INFO( "sca_handle_subscribe: released %d appearances " + "for subscriber %.*s", released, + STR_FMT( &req_sub.subscriber )); + } + } } } else { /* in-dialog request, but we didn't find it. */ @@ -1268,6 +1285,9 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) } } + sca_hash_table_unlock_index( sca->subscriptions, idx ); + idx = -1; + status = sca_ok_status_for_event( event_type ); status_text = sca_ok_text_for_event( event_type ); if ( sca_subscription_reply( sca, status, status_text, event_type, @@ -1287,7 +1307,7 @@ sca_handle_subscribe( sip_msg_t *msg, char *p1, char *p2 ) goto done; } - if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE ) { + if ( req_sub.event == SCA_EVENT_TYPE_LINE_SEIZE || released ) { if ( sca_notify_call_info_subscribers( sca, &req_sub.target_aor) < 0 ) { LM_ERR( "SCA %s NOTIFY to all %.*s subscribers failed", sca_event_name_from_type( req_sub.event ),

1 0

git:admorten/sca: modules/sca: detect and clear orphaned appearances caused by answer glare
by Andrew Mortensen 13 Jun '13

13 Jun '13

Module: sip-router Branch: admorten/sca Commit: 49130d3aca2dcb9fc959455ee580ed02234e4171 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49130d3… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu Jun 13 15:30:40 2013 -0400 modules/sca: detect and clear orphaned appearances caused by answer glare - set appearance state created by SCA callee answer to ACTIVE_PENDING, and promote to ACTIVE on ACK from caller. If no ACK from caller is received within 30 seconds (enough time for retransmission to fail), the ACTIVE_PENDING appearance will be cleared by the sca_appearance_purge_stale timer. --- modules/sca/sca.c | 4 +- modules/sca/sca_appearance.c | 120 ++++++++++++++++++++++++++++++++++++++++++ modules/sca/sca_appearance.h | 10 ++++ modules/sca/sca_call_info.c | 20 ++++++- 4 files changed, 150 insertions(+), 4 deletions(-) diff --git a/modules/sca/sca.c b/modules/sca/sca.c index 9d407ad..d0db43b 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -30,6 +30,7 @@ #include "../../timer_proc.h" #include "sca.h" +#include "sca_appearance.h" #include "sca_db.h" #include "sca_call_info.h" #include "sca_rpc.h" @@ -326,8 +327,7 @@ sca_mod_init( void ) sca_subscriptions_restore_from_db( sca ); - /* start timer to clear expired subscriptions */ - register_timer( sca_subscription_purge_expired, sca, + register_timer( sca_appearance_purge_stale, sca, sca->cfg->purge_expired_interval ); /* diff --git a/modules/sca/sca_appearance.c b/modules/sca/sca_appearance.c index f9c750c..7904abb 100644 --- a/modules/sca/sca_appearance.c +++ b/modules/sca/sca_appearance.c @@ -28,6 +28,7 @@ #include "sca.h" #include "sca_appearance.h" #include "sca_hash.h" +#include "sca_notify.h" #include "sca_util.h" const str SCA_APPEARANCE_INDEX_STR = STR_STATIC_INIT( "appearance-index" ); @@ -44,12 +45,14 @@ const str SCA_APPEARANCE_STATE_STR_HELD_PRIVATE = STR_STATIC_INIT("held-private" const str SCA_APPEARANCE_STATE_STR_UNKNOWN = STR_STATIC_INIT( "unknown" ); +/* STR_ACTIVE is repeated, once for ACTIVE_PENDING, once for ACTIVE */ const str *state_names[] = { &SCA_APPEARANCE_STATE_STR_IDLE, &SCA_APPEARANCE_STATE_STR_SEIZED, &SCA_APPEARANCE_STATE_STR_PROGRESSING, &SCA_APPEARANCE_STATE_STR_ALERTING, &SCA_APPEARANCE_STATE_STR_ACTIVE, + &SCA_APPEARANCE_STATE_STR_ACTIVE, &SCA_APPEARANCE_STATE_STR_HELD, &SCA_APPEARANCE_STATE_STR_HELD_PRIVATE, }; @@ -1209,3 +1212,120 @@ done: return( app ); } + + void +sca_appearance_purge_stale( unsigned int ticks, void *param ) +{ + struct notify_list { + struct notify_list *next; + str aor; + }; + + sca_mod *scam = (sca_mod *)param; + sca_hash_table *ht; + sca_hash_entry *ent; + sca_appearance_list *app_list; + sca_appearance **cur_app, **tmp_app, *app = NULL; + struct notify_list *notify_list = NULL, *tmp_nl; + int i; + int unlinked; + time_t now; + + LM_INFO( "SCA: purging stale appearances" ); + + assert( scam != NULL ); + assert( scam->appearances != NULL ); + + now = time( NULL ); + + ht = scam->appearances; + for ( i = 0; i < ht->size; i++ ) { + sca_hash_table_lock_index( ht, i ); + + for ( ent = ht->slots[ i ].entries; ent != NULL; ent = ent->next ) { + app_list = (sca_appearance_list *)ent->value; + if ( app_list == NULL ) { + continue; + } + + unlinked = 0; + + for ( cur_app = &app_list->appearances; *cur_app != NULL; + cur_app = tmp_app ) { + tmp_app = &(*cur_app)->next; + + if ((*cur_app)->state != SCA_APPEARANCE_STATE_ACTIVE_PENDING ) { + continue; + } + if (( now - (*cur_app)->times.mtime ) < + SCA_APPEARANCE_STATE_PENDING_TTL ) { + continue; + } + + /* unlink stale appearance */ + app = *cur_app; + *cur_app = (*cur_app)->next; + tmp_app = cur_app; + + if ( app ) { + sca_appearance_free( app ); + } + + if ( unlinked ) { + /* we've already added this AoR to the NOTIFY list */ + continue; + } + unlinked++; + + /* + * can't notify while slot is locked. make a list of AoRs to + * notify after unlocking. + */ + tmp_nl = (struct notify_list *)pkg_malloc( + sizeof( struct notify_list )); + if ( tmp_nl == NULL ) { + LM_ERR( "sca_appearance_purge_stale: failed to pkg_malloc " + "notify list entry for %.*s", + STR_FMT( &app_list->aor )); + continue; + } + + tmp_nl->aor.s = (char *)pkg_malloc( app_list->aor.len ); + if ( tmp_nl->aor.s == NULL ) { + LM_ERR( "sca_appearance_purge_stale: failed to pkg_malloc " + "space for copy of %.*s", + STR_FMT( &app_list->aor )); + pkg_free( tmp_nl ); + continue; + } + SCA_STR_COPY( &tmp_nl->aor, &app_list->aor ); + + /* simple insert-at-head. order doesn't matter. */ + tmp_nl->next = notify_list; + notify_list = tmp_nl; + } + } + + sca_hash_table_unlock_index( ht, i ); + + for ( ; notify_list != NULL; notify_list = tmp_nl ) { + tmp_nl = notify_list->next; + + LM_INFO( "sca_appearance_purge_stale: notifying %.*s call-info " + "subscribers", STR_FMT( &notify_list->aor )); + + if ( sca_notify_call_info_subscribers( scam, + &notify_list->aor ) < 0 ) { + LM_ERR( "sca_appearance_purge_stale: failed to send " + "call-info NOTIFY %.*s subscribers", + STR_FMT( &notify_list->aor )); + /* fall through, free memory anyway */ + } + + if ( notify_list->aor.s ) { + pkg_free( notify_list->aor.s ); + } + pkg_free( notify_list ); + } + } +} diff --git a/modules/sca/sca_appearance.h b/modules/sca/sca_appearance.h index 5f8e1e6..a1feab7 100644 --- a/modules/sca/sca_appearance.h +++ b/modules/sca/sca_appearance.h @@ -33,6 +33,7 @@ enum { SCA_APPEARANCE_STATE_SEIZED, SCA_APPEARANCE_STATE_PROGRESSING, SCA_APPEARANCE_STATE_ALERTING, + SCA_APPEARANCE_STATE_ACTIVE_PENDING, SCA_APPEARANCE_STATE_ACTIVE, SCA_APPEARANCE_STATE_HELD, SCA_APPEARANCE_STATE_HELD_PRIVATE, @@ -58,6 +59,13 @@ enum { }; #define SCA_APPEARANCE_INDEX_UNAVAILABLE -2 +/* + * maximum lifetime of an active, pending appearance. + * enough to allow retransmissions of the caller's + * ACK. on receipt of the caller's ACK, we promote + * the SCA callee's state to active. + */ +#define SCA_APPEARANCE_STATE_PENDING_TTL 30 extern const str SCA_APPEARANCE_INDEX_STR; extern const str SCA_APPEARANCE_STATE_STR; @@ -154,4 +162,6 @@ void sca_appearance_free( sca_appearance * ); int sca_uri_is_shared_appearance( sca_mod *, str * ); int sca_uri_lock_shared_appearance( sca_mod *, str * ); int sca_uri_lock_if_shared_appearance( sca_mod *, str *, int * ); + +void sca_appearance_purge_stale( unsigned int, void * ); #endif /* SCA_APPEARANCE_H */ diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 344ea27..487baa4 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -812,7 +812,8 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info, STR_FMT( &to->uri ), STR_FMT( call_id ), STR_FMT( &app->dialog.id )); - if ( sca_appearance_update_unsafe( app, SCA_APPEARANCE_STATE_ACTIVE, + if ( sca_appearance_update_unsafe( app, + SCA_APPEARANCE_STATE_ACTIVE_PENDING, &from->display, &from->uri, &dialog, contact_uri, &from->uri ) < 0 ) { sca_appearance_state_to_str( call_info->state, &state_str ); @@ -1442,8 +1443,10 @@ done: sca_call_info_ack_cb( struct cell *t, int type, struct tmcb_params *params ) { struct to_body *to; + sca_appearance *app = NULL; str from_aor = STR_NULL; str to_aor = STR_NULL; + int slot_idx = -1; if ( !(type & TMCB_E2EACK_IN)) { return; @@ -1465,12 +1468,25 @@ sca_call_info_ack_cb( struct cell *t, int type, struct tmcb_params *params ) sca_call_info_ack_from_handler( params->req, &from_aor, &to_aor ); - if ( !sca_uri_is_shared_appearance( sca, &to_aor )) { + if ( !sca_uri_lock_if_shared_appearance( sca, &to_aor, &slot_idx )) { LM_DBG( "sca_call_info_ack_cb: %.*s is not a shared appearance", STR_FMT( &to_aor )); goto done; } + /* on ACK, ensure SCA callee state is promoted to ACTIVE. */ + app = sca_appearance_for_tags_unsafe( sca, &to_aor, + &params->req->callid->body, &to->tag_value, NULL, slot_idx ); + if ( app && app->state == SCA_APPEARANCE_STATE_ACTIVE_PENDING ) { + LM_DBG( "promoting %.*s appearance-index %d to active", + STR_FMT( &to_aor ), app->index ); + sca_appearance_update_state_unsafe( app, SCA_APPEARANCE_STATE_ACTIVE ); + } + + if ( slot_idx >= 0 ) { + sca_hash_table_unlock_index( sca->appearances, slot_idx ); + } + if ( sca_notify_call_info_subscribers( sca, &to_aor ) < 0 ) { LM_ERR( "sca_call_info_ack_cb: failed to call-info " "NOTIFY %.*s subscribers", STR_FMT( &to_aor ));

1 0

[tracker] Comment added: modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache (Attachment added)
by sip-router 13 Jun '13

13 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#307 - modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache User who did this - Víctor Seva (linuxmaniac) ---------- Reworked patch: - added more values on the documentation example - refresh the output on the documentation example - free the str_list items after been used. - removed commented debug log ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=307#comment956 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

[tracker] Comment added: modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache (Attachment added)
by sip-router 13 Jun '13

13 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#307 - modules/debugger: add dbg_pv_dump config function. It dumps on json format the content of pv_cache User who did this - Víctor Seva (linuxmaniac) ---------- Reworked patch. - avps: dump all the values as an array not just the last one - xavps: dump all the content ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=307#comment955 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

[tracker] Comment added: DNS failover bugs
by sip-router 12 Jun '13

12 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#313 - DNS failover bugs User who did this - Daniel-Constantin Mierla (miconda) ---------- I would find it also more consistent to use the receiving socket for new branches added by dns failover as done for the first forwarded branch. Anyhow we can add a mod param to control this if using '0' can bring benefits in some specific cases. Just to mention here, afaik, by first socket selected is actually the first socket which is not loopback. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=313#comment954 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

[tracker] Comment added: DNS failover bugs
by sip-router 12 Jun '13

12 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#313 - DNS failover bugs User who did this - Jasmin Schnatterbeck (jasmin) ---------- if that is intended, what is the reason for the original (non failover) request to make it behave differently (= use received socket if possible)? In my opinion it makes no sense to make orginal request behave differently than failover requests regarding the selection of send sockets.... failover means only contact another destination but do not change the rules for e.g. select the send socket. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=313#comment953 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

[tracker] Comment added: DNS failover bugs
by sip-router 12 Jun '13

12 Jun '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#313 - DNS failover bugs User who did this - Andrei Pelinescu-Onciul (andrei) ---------- The current failover behaviour is intended. If one does not force the socket, the socket will be elected on a per destination basis. When mhomed=0, the first socket is always choosen (but that might change in the future). If mhomed=1 the socket is choosen using the routing table (at some performance expense). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=313#comment952 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

Kamailio v4.0.2 Released
by Daniel-Constantin Mierla 12 Jun '13

12 Jun '13

Hello, Kamailio SIP Server v4.0.2 stable release is out. This is a maintenance release of the latest stable branch, 4.0, that includes fixes since release of v4.0.0. There is no change to database schema or configuration language structure that you have to do on installations of v4.0.0. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.0.2. For more details about version 4.0.2 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2013/06/kamailio-v4-0-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013