sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

[tracker] Task opened: Problem with SUBSCRIBE presence status on WEBSOCKET protocol

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - oren avraham (orenav) Attached to Project - sip-router Summary - Problem with SUBSCRIBE presence status on WEBSOCKET protocol Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - on version 4.0.0 I was tring to subscribe PRESENCE status with a WEBSOCKET user agent (a js library) and got the following error messages: Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: : <core> [dns_cache.c:2746]: BUG: sip_resolvehost: unknown proto 5 Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: <core> [resolve.c:1727]: ERROR: sip_hostport2su: could not resolve hostname: "df7jal23ls0d.invalid" Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: tm [ut.h:337]: failed to resolve "df7jal23ls0d.invalid" Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: tm [uac.c:266]: t_uac: no socket found Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: presence [notify.c:1591]: in function tmb.t_request_within Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: presence [notify.c:1678]: sending Notify not successful Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: presence [subscribe.c:678]: Could not send notify Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: presence [subscribe.c:713]: occured Mar 17 01:57:47 oren-ubuntu /usr/sbin/kamailio[1963]: ERROR: presence [subscribe.c:994]: in update_subscription It seems the dns_cache doesn't familiar with WS PROTO, and it seems there are more problems with it. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=276 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.

11 years, 7 months

git:4.0: modules/sca: fix -Waddress warnings caused by static strs in SCA_STR_EMPTY

by Andrew Mortensen

Module: sip-router Branch: 4.0 Commit: 6d61484c6302bfd2ad74b3b92621e541405c3240 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d61484… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sat Mar 16 16:35:29 2013 -0400 modules/sca: fix -Waddress warnings caused by static strs in SCA_STR_EMPTY - Tested on Ubunut 12.04 LTS. Report from Konstantin Mosesov. --- modules/sca/sca_call_info.c | 40 +++++++++++++++++++--------------------- modules/sca/sca_common.h | 3 +-- modules/sca/sca_rpc.c | 4 +--- modules/sca/sca_subscribe.c | 2 +- 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index bf8db04..43c7f56 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -686,29 +686,27 @@ sca_call_info_seize_held_call( sip_msg_t *msg, sca_call_info *call_info, sca_hash_table_unlock_index( sca->appearances, slot_idx ); slot_idx = -1; - if ( !SCA_STR_EMPTY( &callee_aor )) { - if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) { - app = sca_appearance_for_tags_unsafe( sca, &callee_aor, - &prev_callid, &prev_totag, NULL, slot_idx ); - if ( app == NULL ) { - LM_ERR( "sca_call_info_seize_held_call: failed to find " - "appearance of %.*s with dialog %.*s;%.*s", - STR_FMT( &callee_aor ), STR_FMT( &prev_callid ), - STR_FMT( &prev_totag )); - goto done; - } + if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) { + app = sca_appearance_for_tags_unsafe( sca, &callee_aor, + &prev_callid, &prev_totag, NULL, slot_idx ); + if ( app == NULL ) { + LM_ERR( "sca_call_info_seize_held_call: failed to find " + "appearance of %.*s with dialog %.*s;%.*s", + STR_FMT( &callee_aor ), STR_FMT( &prev_callid ), + STR_FMT( &prev_totag )); + goto done; + } - app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING; + app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING; - if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) { - LM_ERR( "sca_call_info_seize_held_call: failed to update callee" ); - goto done; - } - if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body, - &to->tag_value, &from->tag_value ) < 0 ) { - LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" ); - goto done; - } + if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) { + LM_ERR( "sca_call_info_seize_held_call: failed to update callee" ); + goto done; + } + if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body, + &to->tag_value, &from->tag_value ) < 0 ) { + LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" ); + goto done; } } diff --git a/modules/sca/sca_common.h b/modules/sca/sca_common.h index c4c806f..daef534 100644 --- a/modules/sca/sca_common.h +++ b/modules/sca/sca_common.h @@ -93,8 +93,7 @@ memcmp((str1)->s, (str2)->s, (str1)->len) == 0) #define SCA_STR_EMPTY( str1 ) \ - (((str1) != NULL && ((str1)->s == NULL || (str1)->len <= 0 )) \ - || (str1) == NULL ) + ((str1) == NULL || ((str1)->s == NULL || (str1)->len <= 0 )) #define SCA_HEADER_EMPTY( hdr1 ) \ ((hdr1) == NULL || SCA_STR_EMPTY( &(hdr1)->body )) diff --git a/modules/sca/sca_rpc.c b/modules/sca/sca_rpc.c index 0fc0f40..f0ee345 100644 --- a/modules/sca/sca_rpc.c +++ b/modules/sca/sca_rpc.c @@ -366,9 +366,7 @@ sca_rpc_update_appearance( rpc_t *rpc, void *ctx ) return; } if ( rpc->scan( ctx, "*S", &app_uri ) == 1 ) { - if ( !SCA_STR_EMPTY( &app_uri )) { - app_uri_p = &app_uri; - } + app_uri_p = &app_uri; } app_state = sca_appearance_state_from_str( &app_state_str ); diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 36a4254..43c902f 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1017,7 +1017,7 @@ sca_subscription_from_request( sca_mod *scam, sip_msg_t *msg, int event_type, } to_tag = to->tag_value; - if ( SCA_STR_EMPTY( &to_tag )) { + if ( to_tag.s == NULL ) { /* * XXX need hook to detect when we have a subscription and the * subscriber sends an out-of-dialog SUBSCRIBE, which indicates the

11 years, 7 months

git:master: modules/sca: fix -Waddress warnings caused by static strs in SCA_STR_EMPTY

by Andrew Mortensen

Module: sip-router Branch: master Commit: d80b4afc7d0dddebd9ffe06e0174a79871daf822 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d80b4af… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sat Mar 16 16:35:29 2013 -0400 modules/sca: fix -Waddress warnings caused by static strs in SCA_STR_EMPTY - Tested on Ubunut 12.04 LTS. Report from Konstantin Mosesov. --- modules/sca/sca_call_info.c | 40 +++++++++++++++++++--------------------- modules/sca/sca_common.h | 3 +-- modules/sca/sca_rpc.c | 4 +--- modules/sca/sca_subscribe.c | 2 +- 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 7444bf9..8f681fd 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -700,29 +700,27 @@ sca_call_info_seize_held_call( sip_msg_t *msg, sca_call_info *call_info, sca_hash_table_unlock_index( sca->appearances, slot_idx ); slot_idx = -1; - if ( !SCA_STR_EMPTY( &callee_aor )) { - if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) { - app = sca_appearance_for_tags_unsafe( sca, &callee_aor, - &prev_callid, &prev_totag, NULL, slot_idx ); - if ( app == NULL ) { - LM_ERR( "sca_call_info_seize_held_call: failed to find " - "appearance of %.*s with dialog %.*s;%.*s", - STR_FMT( &callee_aor ), STR_FMT( &prev_callid ), - STR_FMT( &prev_totag )); - goto done; - } + if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) { + app = sca_appearance_for_tags_unsafe( sca, &callee_aor, + &prev_callid, &prev_totag, NULL, slot_idx ); + if ( app == NULL ) { + LM_ERR( "sca_call_info_seize_held_call: failed to find " + "appearance of %.*s with dialog %.*s;%.*s", + STR_FMT( &callee_aor ), STR_FMT( &prev_callid ), + STR_FMT( &prev_totag )); + goto done; + } - app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING; + app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING; - if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) { - LM_ERR( "sca_call_info_seize_held_call: failed to update callee" ); - goto done; - } - if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body, - &to->tag_value, &from->tag_value ) < 0 ) { - LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" ); - goto done; - } + if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) { + LM_ERR( "sca_call_info_seize_held_call: failed to update callee" ); + goto done; + } + if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body, + &to->tag_value, &from->tag_value ) < 0 ) { + LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" ); + goto done; } } diff --git a/modules/sca/sca_common.h b/modules/sca/sca_common.h index c4c806f..daef534 100644 --- a/modules/sca/sca_common.h +++ b/modules/sca/sca_common.h @@ -93,8 +93,7 @@ memcmp((str1)->s, (str2)->s, (str1)->len) == 0) #define SCA_STR_EMPTY( str1 ) \ - (((str1) != NULL && ((str1)->s == NULL || (str1)->len <= 0 )) \ - || (str1) == NULL ) + ((str1) == NULL || ((str1)->s == NULL || (str1)->len <= 0 )) #define SCA_HEADER_EMPTY( hdr1 ) \ ((hdr1) == NULL || SCA_STR_EMPTY( &(hdr1)->body )) diff --git a/modules/sca/sca_rpc.c b/modules/sca/sca_rpc.c index 0fc0f40..f0ee345 100644 --- a/modules/sca/sca_rpc.c +++ b/modules/sca/sca_rpc.c @@ -366,9 +366,7 @@ sca_rpc_update_appearance( rpc_t *rpc, void *ctx ) return; } if ( rpc->scan( ctx, "*S", &app_uri ) == 1 ) { - if ( !SCA_STR_EMPTY( &app_uri )) { - app_uri_p = &app_uri; - } + app_uri_p = &app_uri; } app_state = sca_appearance_state_from_str( &app_state_str ); diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 66e63c8..2e73b8a 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1017,7 +1017,7 @@ sca_subscription_from_request( sca_mod *scam, sip_msg_t *msg, int event_type, } to_tag = to->tag_value; - if ( SCA_STR_EMPTY( &to_tag )) { + if ( to_tag.s == NULL ) { /* * XXX need hook to detect when we have a subscription and the * subscriber sends an out-of-dialog SUBSCRIBE, which indicates the

11 years, 7 months

git:admorten/sca: modules/sca: fix -Waddress warnings caused by static strs in SCA_STR_EMPTY

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: 073bbd45093e100e3578462658fc134f8d28aff3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=073bbd4… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Sat Mar 16 16:35:29 2013 -0400 modules/sca: fix -Waddress warnings caused by static strs in SCA_STR_EMPTY - Tested on Ubunut 12.04 LTS. Report from Konstantin Mosesov. --- modules/sca/sca_call_info.c | 40 +++++++++++++++++++--------------------- modules/sca/sca_common.h | 3 +-- modules/sca/sca_rpc.c | 4 +--- modules/sca/sca_subscribe.c | 2 +- 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 7444bf9..8f681fd 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -700,29 +700,27 @@ sca_call_info_seize_held_call( sip_msg_t *msg, sca_call_info *call_info, sca_hash_table_unlock_index( sca->appearances, slot_idx ); slot_idx = -1; - if ( !SCA_STR_EMPTY( &callee_aor )) { - if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) { - app = sca_appearance_for_tags_unsafe( sca, &callee_aor, - &prev_callid, &prev_totag, NULL, slot_idx ); - if ( app == NULL ) { - LM_ERR( "sca_call_info_seize_held_call: failed to find " - "appearance of %.*s with dialog %.*s;%.*s", - STR_FMT( &callee_aor ), STR_FMT( &prev_callid ), - STR_FMT( &prev_totag )); - goto done; - } + if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) { + app = sca_appearance_for_tags_unsafe( sca, &callee_aor, + &prev_callid, &prev_totag, NULL, slot_idx ); + if ( app == NULL ) { + LM_ERR( "sca_call_info_seize_held_call: failed to find " + "appearance of %.*s with dialog %.*s;%.*s", + STR_FMT( &callee_aor ), STR_FMT( &prev_callid ), + STR_FMT( &prev_totag )); + goto done; + } - app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING; + app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING; - if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) { - LM_ERR( "sca_call_info_seize_held_call: failed to update callee" ); - goto done; - } - if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body, - &to->tag_value, &from->tag_value ) < 0 ) { - LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" ); - goto done; - } + if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) { + LM_ERR( "sca_call_info_seize_held_call: failed to update callee" ); + goto done; + } + if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body, + &to->tag_value, &from->tag_value ) < 0 ) { + LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" ); + goto done; } } diff --git a/modules/sca/sca_common.h b/modules/sca/sca_common.h index c4c806f..daef534 100644 --- a/modules/sca/sca_common.h +++ b/modules/sca/sca_common.h @@ -93,8 +93,7 @@ memcmp((str1)->s, (str2)->s, (str1)->len) == 0) #define SCA_STR_EMPTY( str1 ) \ - (((str1) != NULL && ((str1)->s == NULL || (str1)->len <= 0 )) \ - || (str1) == NULL ) + ((str1) == NULL || ((str1)->s == NULL || (str1)->len <= 0 )) #define SCA_HEADER_EMPTY( hdr1 ) \ ((hdr1) == NULL || SCA_STR_EMPTY( &(hdr1)->body )) diff --git a/modules/sca/sca_rpc.c b/modules/sca/sca_rpc.c index 0fc0f40..f0ee345 100644 --- a/modules/sca/sca_rpc.c +++ b/modules/sca/sca_rpc.c @@ -366,9 +366,7 @@ sca_rpc_update_appearance( rpc_t *rpc, void *ctx ) return; } if ( rpc->scan( ctx, "*S", &app_uri ) == 1 ) { - if ( !SCA_STR_EMPTY( &app_uri )) { - app_uri_p = &app_uri; - } + app_uri_p = &app_uri; } app_state = sca_appearance_state_from_str( &app_state_str ); diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 66e63c8..2e73b8a 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1017,7 +1017,7 @@ sca_subscription_from_request( sca_mod *scam, sip_msg_t *msg, int event_type, } to_tag = to->tag_value; - if ( SCA_STR_EMPTY( &to_tag )) { + if ( to_tag.s == NULL ) { /* * XXX need hook to detect when we have a subscription and the * subscriber sends an out-of-dialog SUBSCRIBE, which indicates the

11 years, 7 months

git:4.0: modules/registrar: outbound_mode=1 fix

by Juha Heinanen

Module: sip-router Branch: 4.0 Commit: e446aa58a89c60ef9449fc8f79492232c7ed6f7f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e446aa5… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Mar 16 06:33:13 2013 +0200 modules/registrar: outbound_mode=1 fix outbound_mode=1 now accepts REGISTER requests that either contain or do not contain a Supported: outbound header. a Supported: outbound header is always added to 200 OK reply and if request contained a Supported: outbound header, also a Require: outbound header is added. --- modules/registrar/doc/registrar_admin.xml | 14 +++++++++----- modules/registrar/reply.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index 47e52d5..cb55218 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -731,11 +731,15 @@ modparam("registrar", "gruu_enabled", 0) with the outbound options tag. </para> <para> - If set to 1 then this module will accept REGISTER requests - that do not contain a Supported: header with the outbound - options-tag. The 200 OK response to REGISTER requests that this - module generates will contain a Supported: header with the - outbound options tag. + If set to 1 this module will accept REGISTER requests that do + not contain a Supported: header with the outbound options-tag + and REGISTER requests that do contain a Supported: or a + Requires: header with the outbound options-tag. The 200 OK + response that this module generates, will contain a Supported: + header with the outbound options tag. The 200 OK response + will also contain a Require: header with the outbound options + tag if the REGISTER request contained a Supported: + header with the outbound options-tag. </para> <para> If set to 2 then this module will reject REGISTER requests diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 5903710..7ed2a05 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -658,11 +658,18 @@ int reg_send_reply(struct sip_msg* _m) if (add_flow_timer(_m) < 0) return -1; } - /* Fall-thru */ - case REG_OUTBOUND_SUPPORTED: if (add_supported(_m, &outbound_str) < 0) - return -1; + return -1; break; + case REG_OUTBOUND_SUPPORTED: + if ((parse_supported(_m) == 0) && + (((struct supported_body *)_m->supported->parsed)->supported_all & F_SUPPORTED_OUTBOUND)) { + if (add_require(_m, &outbound_str) < 0) + return -1; + } + if (add_supported(_m, &outbound_str) < 0) + return -1; + break; } break; case R_OB_UNSUP:

11 years, 7 months

git:master: modules/sca: process BYE without Call-Info from shared line.

by Andrew Mortensen

Module: sip-router Branch: master Commit: 287cccf2af17e5f2f8fe09c41025b4d27bb4fda9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=287cccf… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Mar 15 17:01:23 2013 -0400 modules/sca: process BYE without Call-Info from shared line. - Ciscos & Aastras don't seem include Call-Info header in BYE. Look up dialog by tags and release associated appearance-index. --- modules/sca/sca_call_info.c | 68 ++++++++++++++++++++++++------------------ modules/sca/sca_call_info.h | 22 ++++++++++++++ 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index dee4f87..7444bf9 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -842,7 +842,7 @@ sca_call_info_is_line_seize_reinvite( sip_msg_t *msg, sca_call_info *call_info, * a Call-Info header is present */ - if ( call_info == NULL ) { + if ( SCA_CALL_INFO_EMPTY( call_info )) { return( 0 ); } if ( !SCA_STR_EMPTY( &to->tag_value )) { @@ -961,7 +961,7 @@ sca_call_info_invite_request_handler( sip_msg_t *msg, sca_call_info *call_info, goto done; } - if ( call_info == NULL ) { + if ( !SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { /* caller isn't SCA, no more to do. update callee in reply handler. */ rc = 1; goto done; @@ -979,7 +979,6 @@ sca_call_info_invite_request_handler( sip_msg_t *msg, sca_call_info *call_info, goto done; } - if ( sca_call_is_held( msg )) { state = SCA_APPEARANCE_STATE_HELD; if ( call_info->state == SCA_APPEARANCE_STATE_HELD_PRIVATE ) { @@ -1204,13 +1203,12 @@ sca_call_info_invite_reply_200_handler( sip_msg_t *msg, int slot_idx = -1; int rc = -1; - if ( call_info != NULL ) { - /* this implies To-AoR is SCA */ + if ( SCA_CALL_INFO_IS_SHARED_CALLEE( call_info )) { rc = sca_call_info_uri_update( to_aor, call_info, from, to, contact_uri, &msg->callid->body ); } - if ( !sca_uri_is_shared_appearance( sca, from_aor )) { + if ( !SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { goto done; } @@ -1519,7 +1517,7 @@ sca_call_info_bye_handler( sip_msg_t *msg, sca_call_info *call_info, int rc = -1; if ( msg->first_line.type == SIP_REQUEST ) { - if ( call_info != NULL ) { + if ( SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { slot_idx = sca_uri_lock_shared_appearance( sca, from_aor ); if ( slot_idx < 0 ) { LM_ERR( "sca_call_info_bye_handler: failed to acquire " @@ -1528,13 +1526,26 @@ sca_call_info_bye_handler( sip_msg_t *msg, sca_call_info *call_info, goto done; } - app = sca_appearance_for_index_unsafe( sca, from_aor, - call_info->index, slot_idx ); - if ( app == NULL ) { - LM_ERR( "sca_call_info_bye_handler: %.*s " - "appearance-index %d is not active", - STR_FMT( from_aor ), call_info->index ); - goto done; + if ( call_info->index != SCA_CALL_INFO_APPEARANCE_INDEX_ANY ) { + app = sca_appearance_for_index_unsafe( sca, from_aor, + call_info->index, slot_idx ); + if ( app == NULL ) { + LM_ERR( "sca_call_info_bye_handler: %.*s " + "appearance-index %d is not active", + STR_FMT( from_aor ), call_info->index ); + goto done; + } + } else { + app = sca_appearance_for_tags_unsafe( sca, from_aor, + &msg->callid->body, &from->tag_value, NULL, slot_idx ); + if ( app == NULL ) { + LM_ERR( "sca_call_info_bye_handler: %.*s " + "dialog leg %.*s;%.*s is not active", + STR_FMT( from_aor ), + STR_FMT( &msg->callid->body ), + STR_FMT( &from->tag_value )); + goto done; + } } if ( SCA_STR_EQ( &app->dialog.call_id, &msg->callid->body )) { @@ -1600,7 +1611,7 @@ sca_call_info_bye_handler( sip_msg_t *msg, sca_call_info *call_info, } } } else { - if ( call_info != NULL ) { + if ( SCA_CALL_INFO_IS_SHARED_CALLEE( call_info )) { slot_idx = sca_hash_table_index_for_key( sca->appearances, to_aor ); sca_hash_table_lock_index( sca->appearances, slot_idx ); @@ -1664,7 +1675,7 @@ sca_call_info_cancel_handler( sip_msg_t *msg, sca_call_info *call_info, * find appearance by dialog if Call-Info not present. */ /* XXX also handle CANCEL w/ Call-Info header? Some UAs might send it */ - if ( sca_uri_is_shared_appearance( sca, from_aor )) { + if ( SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { app = sca_appearance_unlink_by_tags( sca, from_aor, &msg->callid->body, &from->tag_value, NULL ); if ( app ) { @@ -1806,7 +1817,7 @@ struct sca_call_info_dispatch call_info_dispatch[] = { int sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) { - sca_call_info call_info, *call_info_p = NULL; + sca_call_info call_info; hdr_field_t *call_info_hdr; struct to_body *from; struct to_body *to; @@ -1848,8 +1859,6 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) STR_FMT( &call_info_hdr->body )); return( -1 ); } - - call_info_p = &call_info; } if ( sca_get_msg_from_header( msg, &from ) < 0 ) { @@ -1925,18 +1934,19 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) } /* early check to see if we're dealing with any SCA endpoints */ - if ( call_info_p == NULL ) { - /* no Call-Info header in packet, check if AoRs are SCA */ - - if ( !sca_uri_is_shared_appearance( sca, &from_aor ) && - !sca_uri_is_shared_appearance( sca, &to_aor )) { - LM_DBG( "Neither %.*s nor %.*s are SCA AoRs", - STR_FMT( &from_aor ), STR_FMT( &to_aor )); - goto done; - } + if ( sca_uri_is_shared_appearance( sca, &from_aor )) { + call_info.ua_shared |= SCA_CALL_INFO_SHARED_CALLER; + } + if ( sca_uri_is_shared_appearance( sca, &to_aor )) { + call_info.ua_shared |= SCA_CALL_INFO_SHARED_CALLEE; + } + if ( call_info.ua_shared == SCA_CALL_INFO_SHARED_NONE ) { + LM_DBG( "Neither %.*s nor %.*s are SCA AoRs", + STR_FMT( &from_aor ), STR_FMT( &to_aor )); + goto done; } - rc = call_info_dispatch[ i ].handler( msg, call_info_p, from, to, + rc = call_info_dispatch[ i ].handler( msg, &call_info, from, to, &from_aor, &to_aor, &contact_uri ); if ( rc < 0 ) { LM_ERR( "Failed to update Call-Info state for %.*s", diff --git a/modules/sca/sca_call_info.h b/modules/sca/sca_call_info.h index b62207e..80d1265 100644 --- a/modules/sca/sca_call_info.h +++ b/modules/sca/sca_call_info.h @@ -30,14 +30,36 @@ /* pass to sca_notify_subscriber to include all appearances in Call-Info hdr */ #define SCA_CALL_INFO_APPEARANCE_INDEX_ANY 0 +enum { + SCA_CALL_INFO_SHARED_NONE = 0, + SCA_CALL_INFO_SHARED_CALLER = (1 << 0), + SCA_CALL_INFO_SHARED_CALLEE = (1 << 1), +}; + struct _sca_call_info { str sca_uri; int index; int state; str uri; + + /* mask tracking which endpoints in a call are shared */ + int ua_shared; }; typedef struct _sca_call_info sca_call_info; +#define SCA_CALL_INFO_EMPTY( ci1 ) \ + (!(ci1) && ((ci1)->index == SCA_CALL_INFO_APPEARANCE_INDEX_ANY && \ + (ci1)->state == SCA_APPEARANCE_STATE_UNKNOWN)) + +#define SCA_CALL_INFO_IS_SHARED_CALLER( ci1 ) \ + (!SCA_CALL_INFO_EMPTY((ci1)) && \ + (((sca_call_info *)(ci1))->ua_shared & SCA_CALL_INFO_SHARED_CALLER)) + +#define SCA_CALL_INFO_IS_SHARED_CALLEE( ci1 ) \ + (!SCA_CALL_INFO_EMPTY((ci1)) && \ + (((sca_call_info *)(ci1))->ua_shared & SCA_CALL_INFO_SHARED_CALLEE)) + + extern const str SCA_CALL_INFO_HEADER_STR;

11 years, 7 months

git:admorten/sca: modules/sca: process BYE without Call-Info from shared line.

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: 4142fbc22c7504b16a77637a37d41af795f648c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4142fbc… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Mar 15 17:01:23 2013 -0400 modules/sca: process BYE without Call-Info from shared line. - Ciscos & Aastras don't seem include Call-Info header in BYE. Look up dialog by tags and release associated appearance-index. --- modules/sca/sca_call_info.c | 68 ++++++++++++++++++++++++------------------ modules/sca/sca_call_info.h | 22 ++++++++++++++ 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index dee4f87..7444bf9 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -842,7 +842,7 @@ sca_call_info_is_line_seize_reinvite( sip_msg_t *msg, sca_call_info *call_info, * a Call-Info header is present */ - if ( call_info == NULL ) { + if ( SCA_CALL_INFO_EMPTY( call_info )) { return( 0 ); } if ( !SCA_STR_EMPTY( &to->tag_value )) { @@ -961,7 +961,7 @@ sca_call_info_invite_request_handler( sip_msg_t *msg, sca_call_info *call_info, goto done; } - if ( call_info == NULL ) { + if ( !SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { /* caller isn't SCA, no more to do. update callee in reply handler. */ rc = 1; goto done; @@ -979,7 +979,6 @@ sca_call_info_invite_request_handler( sip_msg_t *msg, sca_call_info *call_info, goto done; } - if ( sca_call_is_held( msg )) { state = SCA_APPEARANCE_STATE_HELD; if ( call_info->state == SCA_APPEARANCE_STATE_HELD_PRIVATE ) { @@ -1204,13 +1203,12 @@ sca_call_info_invite_reply_200_handler( sip_msg_t *msg, int slot_idx = -1; int rc = -1; - if ( call_info != NULL ) { - /* this implies To-AoR is SCA */ + if ( SCA_CALL_INFO_IS_SHARED_CALLEE( call_info )) { rc = sca_call_info_uri_update( to_aor, call_info, from, to, contact_uri, &msg->callid->body ); } - if ( !sca_uri_is_shared_appearance( sca, from_aor )) { + if ( !SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { goto done; } @@ -1519,7 +1517,7 @@ sca_call_info_bye_handler( sip_msg_t *msg, sca_call_info *call_info, int rc = -1; if ( msg->first_line.type == SIP_REQUEST ) { - if ( call_info != NULL ) { + if ( SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { slot_idx = sca_uri_lock_shared_appearance( sca, from_aor ); if ( slot_idx < 0 ) { LM_ERR( "sca_call_info_bye_handler: failed to acquire " @@ -1528,13 +1526,26 @@ sca_call_info_bye_handler( sip_msg_t *msg, sca_call_info *call_info, goto done; } - app = sca_appearance_for_index_unsafe( sca, from_aor, - call_info->index, slot_idx ); - if ( app == NULL ) { - LM_ERR( "sca_call_info_bye_handler: %.*s " - "appearance-index %d is not active", - STR_FMT( from_aor ), call_info->index ); - goto done; + if ( call_info->index != SCA_CALL_INFO_APPEARANCE_INDEX_ANY ) { + app = sca_appearance_for_index_unsafe( sca, from_aor, + call_info->index, slot_idx ); + if ( app == NULL ) { + LM_ERR( "sca_call_info_bye_handler: %.*s " + "appearance-index %d is not active", + STR_FMT( from_aor ), call_info->index ); + goto done; + } + } else { + app = sca_appearance_for_tags_unsafe( sca, from_aor, + &msg->callid->body, &from->tag_value, NULL, slot_idx ); + if ( app == NULL ) { + LM_ERR( "sca_call_info_bye_handler: %.*s " + "dialog leg %.*s;%.*s is not active", + STR_FMT( from_aor ), + STR_FMT( &msg->callid->body ), + STR_FMT( &from->tag_value )); + goto done; + } } if ( SCA_STR_EQ( &app->dialog.call_id, &msg->callid->body )) { @@ -1600,7 +1611,7 @@ sca_call_info_bye_handler( sip_msg_t *msg, sca_call_info *call_info, } } } else { - if ( call_info != NULL ) { + if ( SCA_CALL_INFO_IS_SHARED_CALLEE( call_info )) { slot_idx = sca_hash_table_index_for_key( sca->appearances, to_aor ); sca_hash_table_lock_index( sca->appearances, slot_idx ); @@ -1664,7 +1675,7 @@ sca_call_info_cancel_handler( sip_msg_t *msg, sca_call_info *call_info, * find appearance by dialog if Call-Info not present. */ /* XXX also handle CANCEL w/ Call-Info header? Some UAs might send it */ - if ( sca_uri_is_shared_appearance( sca, from_aor )) { + if ( SCA_CALL_INFO_IS_SHARED_CALLER( call_info )) { app = sca_appearance_unlink_by_tags( sca, from_aor, &msg->callid->body, &from->tag_value, NULL ); if ( app ) { @@ -1806,7 +1817,7 @@ struct sca_call_info_dispatch call_info_dispatch[] = { int sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) { - sca_call_info call_info, *call_info_p = NULL; + sca_call_info call_info; hdr_field_t *call_info_hdr; struct to_body *from; struct to_body *to; @@ -1848,8 +1859,6 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) STR_FMT( &call_info_hdr->body )); return( -1 ); } - - call_info_p = &call_info; } if ( sca_get_msg_from_header( msg, &from ) < 0 ) { @@ -1925,18 +1934,19 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) } /* early check to see if we're dealing with any SCA endpoints */ - if ( call_info_p == NULL ) { - /* no Call-Info header in packet, check if AoRs are SCA */ - - if ( !sca_uri_is_shared_appearance( sca, &from_aor ) && - !sca_uri_is_shared_appearance( sca, &to_aor )) { - LM_DBG( "Neither %.*s nor %.*s are SCA AoRs", - STR_FMT( &from_aor ), STR_FMT( &to_aor )); - goto done; - } + if ( sca_uri_is_shared_appearance( sca, &from_aor )) { + call_info.ua_shared |= SCA_CALL_INFO_SHARED_CALLER; + } + if ( sca_uri_is_shared_appearance( sca, &to_aor )) { + call_info.ua_shared |= SCA_CALL_INFO_SHARED_CALLEE; + } + if ( call_info.ua_shared == SCA_CALL_INFO_SHARED_NONE ) { + LM_DBG( "Neither %.*s nor %.*s are SCA AoRs", + STR_FMT( &from_aor ), STR_FMT( &to_aor )); + goto done; } - rc = call_info_dispatch[ i ].handler( msg, call_info_p, from, to, + rc = call_info_dispatch[ i ].handler( msg, &call_info, from, to, &from_aor, &to_aor, &contact_uri ); if ( rc < 0 ) { LM_ERR( "Failed to update Call-Info state for %.*s", diff --git a/modules/sca/sca_call_info.h b/modules/sca/sca_call_info.h index b62207e..80d1265 100644 --- a/modules/sca/sca_call_info.h +++ b/modules/sca/sca_call_info.h @@ -30,14 +30,36 @@ /* pass to sca_notify_subscriber to include all appearances in Call-Info hdr */ #define SCA_CALL_INFO_APPEARANCE_INDEX_ANY 0 +enum { + SCA_CALL_INFO_SHARED_NONE = 0, + SCA_CALL_INFO_SHARED_CALLER = (1 << 0), + SCA_CALL_INFO_SHARED_CALLEE = (1 << 1), +}; + struct _sca_call_info { str sca_uri; int index; int state; str uri; + + /* mask tracking which endpoints in a call are shared */ + int ua_shared; }; typedef struct _sca_call_info sca_call_info; +#define SCA_CALL_INFO_EMPTY( ci1 ) \ + (!(ci1) && ((ci1)->index == SCA_CALL_INFO_APPEARANCE_INDEX_ANY && \ + (ci1)->state == SCA_APPEARANCE_STATE_UNKNOWN)) + +#define SCA_CALL_INFO_IS_SHARED_CALLER( ci1 ) \ + (!SCA_CALL_INFO_EMPTY((ci1)) && \ + (((sca_call_info *)(ci1))->ua_shared & SCA_CALL_INFO_SHARED_CALLER)) + +#define SCA_CALL_INFO_IS_SHARED_CALLEE( ci1 ) \ + (!SCA_CALL_INFO_EMPTY((ci1)) && \ + (((sca_call_info *)(ci1))->ua_shared & SCA_CALL_INFO_SHARED_CALLEE)) + + extern const str SCA_CALL_INFO_HEADER_STR;

11 years, 7 months

Outbound forking and flows

by Hugh Waite

Hello, I have been researching the work needed to implement forking of outbound flows based on the discussions by Peter, Olle and others on this list. I suggest the following: A new route type "branch_failure_route" which can be called on a failure response for every branch created. Change t_next_contact_flows() so that it can only be called from the branch_failure route. Modify t_next_contact_flows() so that it will search the xavp of alternative flows and select the next instance that matches the failed instance. This will create another branch. t_relay() can be used in the branch_failure route to fork to the new branch. There will be a few more functions that can be called in the branch_failure route, including unregister_contact(). If no new flows are available, the response is passed on to be handled by the failure route handler. If a new flow is available, and a branch created, the failure response must not be passed on. A response from the new branch, plus all other branches must be received before the failure route is called with the best response. If the failure route is called, t_next_contacts() can be called to implement serial forking based on q-value, as before. Any comments before I start work? Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

11 years, 7 months

New commits on branch admorten/sca

by Andrew Mortensen

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df200e9… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Mar 15 10:22:26 2013 -0400 sca: reduce log level to DBG when replacing RURI when retrieving held call. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53721bc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 14:07:04 2013 +0000 modules/outbound: Fixed bug in outbound mod_init URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffc4ced… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 12:14:31 2013 +0000 modules/outbound: The flow-token key is now automatically generated - Uses OpenSSL RAND_bytes() to select 20 cryptographically strong pseudo-random bytes for the key. - Flow-token key can no longer be manually set. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1fe3e05… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 11:15:16 2013 +0000 modules/registrar: fixed lock usage in unregister() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd3ad2f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 11:14:06 2013 +0000 modules/pv: can only retrieve $ruid for a request - cache it in an avp for the request if you need it later URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0683be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 15 09:03:26 2013 +0100 ims_icscf: fix include list for BSD - patch by Victor V. Kustov URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af80446… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:55:14 2013 +0000 modules/pv: added new $ruid and $branch(ruid) PVs URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8665a8e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:35:02 2013 +0000 modules/xprint: updated use of get_branch() and next_branch() to cope with additional argument URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67547ab… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:34:48 2013 +0000 modules/tm: updated use of get_branch() and next_branch() to cope with additional argument URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dfe6eb… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:34:34 2013 +0000 modules/pv: updated use of get_branch() and next_branch() to cope with additional argument URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12ebd06… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:34:18 2013 +0000 modules/permissions: updated use of get_branch() and next_branch() to cope with additional argument URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af349ed… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:34:01 2013 +0000 modules/domain: updated use of get_branch() and next_branch() to cope with additional argument URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5abbf43… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:33:23 2013 +0000 core: updated use of get_branch() and next_branch() to cope with additional argument URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00873b6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:32:42 2013 +0000 core: updated get_branch() and next_branch() to return ruid (if set) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d391745… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:16:27 2013 +0000 modules/tm: updated t_serial to store/retrieve ruid URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bdef3a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 23:05:32 2013 +0000 modules/registrar: tidied up unregister() function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40e7add… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:58:44 2013 +0000 modules/ims_isc: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fcf1f96… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:58:24 2013 +0000 modules/ims_icscf: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bddcf8e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:58:04 2013 +0000 modules/exec: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0c1375… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:57:49 2013 +0000 modules/enum: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3696fc6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:57:30 2013 +0000 modules/dialplan: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66c9979… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:57:06 2013 +0000 modules/cpl-c: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d23d63e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:56:51 2013 +0000 modules/corex: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12ffbdd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:56:27 2013 +0000 modules/avpops: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16a07b4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:55:46 2013 +0000 modules/alias_db: updated to include new argument to append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dbb3bf1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:46:51 2013 +0000 core: updated to include new argument for append_branch() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb7a362… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:46:08 2013 +0000 modules/registrar: fill in ruid in msg and branch structures during lookup() URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af22412… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:42:16 2013 +0000 core: added ruid to msg and branch structures URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acaa268… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 22:00:54 2013 +0000 modules/registrar: fixed typo URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2afdaa… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:57:59 2013 +0000 parser: fixed typo URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2a2791… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:55:34 2013 +0000 parser: updated path for some of the includes in files moved from lib/kcore URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a86260… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:52:33 2013 +0000 modules/sst: updated path to parse_supported.h URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd2a540… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:52:18 2013 +0000 modules/rls: updated path to parse_supported.h URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4798ff… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:51:44 2013 +0000 modules/registrar: updated path to parse_(require|supported).h URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2f26be… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:51:11 2013 +0000 modules/ims_registrar_scscf: updated path to parse_supported.h URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39c1273… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 21:50:20 2013 +0000 lib/kcore, parser: moved parse_(options_tags|require|supported) to parser URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a10ce68… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Mar 14 12:16:32 2013 -0400 xhttp_pi: escape special characters URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac9d027… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 14:19:31 2013 +0000 modules/registrar: Updated documentation for outbound related modparams URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f319c44… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 14:19:05 2013 +0000 modules/register: Fixed mod init check of flow_timer modparam URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=915ca9c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 12:25:52 2013 +0000 modules/registrar: fixes to checking of Require: and Supported: headers for outbound URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3e7dc1… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Wed Mar 13 22:29:20 2013 +0200 Makefile.groups: Updated package group for app_java. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6025e7… Author: avamanu <avamanu(a)avamanu.(none)> Date: Wed Mar 13 17:49:21 2013 +0200 modules/permissions: DNS domain names in address table Added the possibility to check also against DNS domain names with allow_address() function. Now in the address table one group can have exact IPs, subnet IPs and DNS domain names. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0dd9016… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Wed Mar 13 17:53:54 2013 +0200 modules/app_java - New module app_java: Java Native Interface support. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed0ca54… Author: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Mar 12 09:43:57 2013 -0400 nathelper: Decrease ambiguity by renaming sipping_disable_bflag to natping_disable_bflag URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2569284… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Mon Mar 11 17:37:12 2013 +0000 registrar: New set_q_override function The set_q_override function will override the value of the q parameter from the Contact header in subsequent calls to the save() function for the current request. Currently exported as a C-API function URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=401f825… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Mon Mar 11 16:55:23 2013 +0000 parser,modules/pv,modules/sipcapture: Improved parsing of P-Asserted/Preferred-Identity headers parser: - Abstracted addr-spec parsing from parse_to.c into new file. (parse_addr_spec.c) - Added support for comma separated addr-spec values. - Created new P-Asserted-Identity and P-Preferred-Identity header parsers that parse all instances and allows comma separated values. modules/pv: - Added PV index to $ai, $pu, $pU, $pd and $pn variables to retreive the n'th URI instance. E.g. $(ai[1]) modules/sipcapture: - Updated to use the new structure - Maintains previous behaviour - only uses the first URI URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ace4acb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 11 15:57:31 2013 +0100 Makefile.dirs: updated the list with module directories URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30d7720… Author: Olle E. Johansson <oej(a)edvina.net> Date: Mon Mar 11 11:43:49 2013 +0100 NEWS Update with reference to Wiki URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51251b3… Author: Olle E. Johansson <oej(a)edvina.net> Date: Mon Mar 11 11:36:54 2013 +0100 INSTALL update for release URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b4db4a… Author: Olle E. Johansson <oej(a)edvina.net> Date: Mon Mar 11 11:16:09 2013 +0100 README - last minute small edits URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b450eda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 11 09:38:37 2013 +0100 tm: set proper buffer len when Max-Forward header is not added - reported by Juha Heinanen URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f83443… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 10 23:53:26 2013 +0100 core: try to detect ipv6 addresses only when USE_IPV6 is used - reported by Juha Heinanen URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27e0b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 10 22:46:50 2013 +0100 pkg: deb specs updated for v4.0.0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1e5792… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 10 22:07:11 2013 +0100 INSTALL: updates for v4.0.0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9976520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 8 23:22:06 2013 +0100 ChangeLog_k: removed obsolete file URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06133c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 8 23:20:06 2013 +0100 ChangeLog: updated content to prepare for v4.0.0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6239060… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 7 02:11:35 2013 +0000 pkg/kamailio/(centos|fedora): added docbook2X build requirement URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5e7ac1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 6 11:08:32 2013 +0000 pkg/kamailio/(centos|fedora): re-added perl files URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c4f39e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 5 18:35:08 2013 +0100 Makefile.groups: fixed typo in the name of perl mods list - reported by Peter Dunkley URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8635b53… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 5 17:08:54 2013 +0000 pkg/kamailio/(centos|fedora): updated .spec to match latest changes URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf15c57… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 5 15:53:46 2013 +0000 pkg/kamailio/(centos|fedora): updated rel and ver in .spec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=395ecb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 5 17:11:51 2013 +0100 Makefile.groups: mi_xmlrpc has a dedicated pkg grpup depending on xmlrpc-c library URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd8168d… Author: Olle E. Johansson <oej(a)edvina.net> Date: Tue Mar 5 12:09:42 2013 +0100 db_sqlite Make sure module compiles on BSD systems too Copied from db_unixodbc/Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2f2632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 23:41:31 2013 +0100 Makefile.groups: restored outbound as packaging group URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e5d297… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 1 11:41:18 2013 +0000 modules/registrar: updated module documentation - Added ruid parameter to unregister - Added missing attributes to $ulc() description URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffce9ba… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 1 11:19:42 2013 +0000 modules/registrar: added additional unregister() exported function to allow the removal of a specific contact - Contact is removed by using the ruid (unique ID for the location record) - Getting the ruid to use here is a problem still to be solved. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f582f4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Feb 28 14:40:41 2013 +0000 modules/registrar: RFC 5626 section 6 support - Behaviour when outbound in use but first edge proxy does not support it. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a88944… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 15:29:35 2013 +0000 modules/registrar: add Require: outbound to 200 OK when required by client and supported by server - Reported by @oej URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fb8674… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:03:27 2013 +0000 lib/kcore: added parser for Require: header URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1ad9a2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:03:13 2013 +0000 parser: updated for parse_supported refactoring URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=effd74c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:02:47 2013 +0000 modules/sst: updated for parse_supported refactoring URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c57a66b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:02:28 2013 +0000 modules/rls: updated for parse_supported refactoring URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21de236… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:02:05 2013 +0000 modules/registrar: updated for parse_supported refactoring URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a60b656… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 14:01:18 2013 +0000 modules/ims_registrar_scscf: updated for parse_supported refactoring URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1071636… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 27 13:59:56 2013 +0000 lib/kcore: abstracted the option-tag parsing code out of parse_supported.[ch] - This is to make it easier to add parsers for other similar headers (for example, Require:) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a1e7ca… Author: Jason Penton <jason.penton(a)smilecoms.com> Date: Fri Feb 22 15:25:01 2013 +0200 modules/dialog_ng: some code formatting fixes

11 years, 7 months

default failure, branch

by Hugh Waite

Hi, I've noticed that the config file parser allows for un-named branch and failure routes (see failure_route_stm and branch_route_stm in cfg.y) The core cookbook says that these routes are only run when armed with t_on_failure/t_on_branch, and a quick test confirms that. Should default failure and branch routes be removed from cfg.y? Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

11 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013