sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
246 discussions

[tracker] Task opened: bugs in uac_redirect module (Attachment added)
by sip-router 23 Jul '13

23 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Federico Cabiddu (lester) Attached to Project - sip-router Summary - bugs in uac_redirect module Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - Hi, working with kamailio 4.0.2 and uac_redirect module I found several problems. I have a script with two failure routes each calling get_redirects("MAX", "REASON"): when the 2nd of those routes is executed kamailio crashes in acc module (in acc_log_request function). Digging the problem I found that the function get_redirect_fixup, for the second call, exits before setting the acc_param. This causes the acc module to crash: the function which crashes is acc_log_request (acc.c: 244, maybe it would be worth adding a null pointer check before calling memcpy). The 2nd problem is related to the uac_redirect "acc_db_table" parameter: there is no fixup of the parameter so, when uac_redirect calls acc_db_request, the table ens up with a totally wrong name. The 3rd problem is in acc module, in acc_db_set_table_name function: even if env_set_text set the s and the len component all the following operations on the table name are done using the s part. This brings a problem when acc_db_request is called with table names which have different length. The solution I found for this problem is (quite rough, I admit) to put a '\0' at the end of the table name. And last, the accounting records generated by get_redirects don't contain the error code: in this case I just added to get_redirect the code to put the reply code into the acc_param struct. I attach two patches against release 4.0.2. Best regards, Federico Cabiddu 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=327 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

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 23 Jul '13

23 Jul '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 45008b65a57fd5b543bbdeb63bd9446272b05144 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45008b6… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jul 23 11:42:50 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

git:master: modules/sipcapture: Added support for multiple capture modes.
by Alexandr Dubovikov 23 Jul '13

23 Jul '13

Module: sip-router Branch: master Commit: da057e5730dd9f82101437e0ee3ceca02b64602c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da057e5… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Tue Jul 23 10:37:03 2013 +0200 modules/sipcapture: Added support for multiple capture modes. (c) Dragos Dinu (1and1) --- modules/sipcapture/doc/sipcapture_admin.xml | 20 + modules/sipcapture/sipcapture.c | 609 ++++++++++++++++++++++----- 2 files changed, 530 insertions(+), 99 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=da0…

1 0

removing unresponsive watcher
by Juha Heinanen 22 Jul '13

22 Jul '13

in a setup where presence server is behind sip proxy and sip proxy is restarted, notifys from presence server to tcp watchers stop working. what would it take for presence server to remove an active watcher if it gets an 4xx response from sip proxy to the notify it sent to the watcher? -- juha

1 0

New developer: Lucian Balaceanu
by Henning Westerholt 22 Jul '13

22 Jul '13

Hello, I am pleased to announce a new developer for the Kamailio project: Lucian Balaceanu. Lucian works in our 1&1 office in Bucharest and is for some years with us in the company. He worked on several internal projects with our Kamailio stack and will contribute some fixes to the sipcapture and carrierroute module. He will also probably commit some other smaller fixes from time to time. Welcome Lucian and all the best, Henning

3 2

git:master: Makefile: sercmd renamed to kamcmd in uninstall option
by Daniel-Constantin Mierla 22 Jul '13

22 Jul '13

Module: sip-router Branch: master Commit: ab601ea9a1b2561c2eaa860583cdeed478b9ea8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab601ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jul 20 10:01:25 2013 +0200 Makefile: sercmd renamed to kamcmd in uninstall option --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index ca4fcff..d0e00b9 100644 --- a/Makefile +++ b/Makefile @@ -1103,7 +1103,7 @@ uninstall: echo "rm ${bin_prefix}/${bin_dir}kamctl" ; \ echo "rm ${bin_prefix}/${bin_dir}kamdbctl" ; \ fi ; \ - echo "rm ${bin_prefix}/${bin_dir}sercmd" ; \ + echo "rm ${bin_prefix}/${bin_dir}kamcmd" ; \ echo "rm ${man_prefix}/${man_dir}man5/$(MAIN_NAME).cfg.5" ; \ echo "rm ${man_prefix}/${man_dir}man8/$(MAIN_NAME).8" ; \ if [ "${FLAVOUR}" = "kamailio" ] ; then \

1 0

git:admorten/sca: modules/sca: restore missing prototype.
by Andrew Mortensen 22 Jul '13

22 Jul '13

Module: sip-router Branch: admorten/sca Commit: 4f9333a41c0dfff331546053438c1c26a2238686 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f9333a… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Jul 22 00:48:46 2013 -0400 modules/sca: restore missing prototype. sca_subscription_aor_has_subscribers --- modules/sca/sca_subscribe.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/sca/sca_subscribe.h b/modules/sca/sca_subscribe.h index e238bf3..a540d8b 100644 --- a/modules/sca/sca_subscribe.h +++ b/modules/sca/sca_subscribe.h @@ -88,6 +88,7 @@ void sca_subscription_db_update_timer( unsigned, void * ); void sca_subscription_purge_expired( unsigned int, void * ); void sca_subscription_state_to_str( int, str * ); +int sca_subscription_aor_has_subscribers( int, str * ); int sca_subscription_delete_subscriber_for_event( sca_mod *, str *, str *, str * ); int sca_subscription_terminate( sca_mod *, str *, int, str *, int, int );

1 0

git:admorten/sca: modules/sca: detect when an AoR is no longer SCA.
by Andrew Mortensen 22 Jul '13

22 Jul '13

Module: sip-router Branch: admorten/sca Commit: c29404ad8e9130d0989efee8bccddf1b6c0f2897 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c29404a… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Jul 22 00:42:18 2013 -0400 modules/sca: detect when an AoR is no longer SCA. Don't, for example, create an appearance for callees that do not send a Call-Info header, and whose AoR also has no subscribers. --- modules/sca/sca_call_info.c | 27 +++++++++++++++++++++---- modules/sca/sca_subscribe.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index 487baa4..5b6b2c7 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1946,11 +1946,6 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) /* reset rc to -1 so we don't end up returning 0 to the script */ rc = -1; - if ( sca_call_info_header_remove( msg ) < 0 ) { - LM_ERR( "Failed to remove Call-Info header" ); - return( -1 ); - } - /* reconcile mismatched Contact users and To/From URIs */ if ( msg->first_line.type == SIP_REQUEST ) { if ( sca_create_canonical_aor( msg, &from_aor ) < 0 ) { @@ -1982,6 +1977,28 @@ sca_call_info_update( sip_msg_t *msg, char *p1, char *p2 ) if ( sca_uri_is_shared_appearance( sca, &to_aor )) { call_info.ua_shared |= SCA_CALL_INFO_SHARED_CALLEE; } + + if ( call_info_hdr == NULL ) { + if ( SCA_CALL_INFO_IS_SHARED_CALLER( &call_info ) && + msg->first_line.type == SIP_REQUEST ) { + if ( !sca_subscription_aor_has_subscribers( + SCA_EVENT_TYPE_CALL_INFO, &from_aor )) { + call_info.ua_shared &= ~SCA_CALL_INFO_SHARED_CALLER; + } + } else if ( SCA_CALL_INFO_IS_SHARED_CALLEE( &call_info ) && + msg->first_line.type == SIP_REPLY ) { + if ( !sca_subscription_aor_has_subscribers( + SCA_EVENT_TYPE_CALL_INFO, &to_aor )) { + call_info.ua_shared &= ~SCA_CALL_INFO_SHARED_CALLEE; + } + } + } + + if ( sca_call_info_header_remove( msg ) < 0 ) { + LM_ERR( "Failed to remove Call-Info header" ); + return( -1 ); + } + 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 )); diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 1b8107e..7d34491 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -558,6 +558,50 @@ sca_subscription_db_update_timer( unsigned int ticks, void *param ) } } + int +sca_subscription_aor_has_subscribers( int event, str *aor ) +{ + sca_hash_slot *slot; + sca_hash_entry *e; + sca_subscription *sub; + str sub_key = STR_NULL; + char *event_name; + int len; + int subscribers = 0; + int slot_idx = -1; + + event_name = sca_event_name_from_type( event ); + len = aor->len + strlen( event_name ); + sub_key.s = (char *)pkg_malloc( len ); + if ( sub_key.s == NULL ) { + LM_ERR( "Failed to pkg_malloc key to look up %s " + "subscription for %.*s", event_name, STR_FMT( aor )); + return( -1 ); + } + SCA_STR_COPY( &sub_key, aor ); + SCA_STR_APPEND_CSTR( &sub_key, event_name ); + + slot_idx = sca_hash_table_index_for_key( sca->subscriptions, &sub_key ); + pkg_free( sub_key.s ); + sub_key.len = 0; + + slot = sca_hash_table_slot_for_index( sca->subscriptions, slot_idx ); + sca_hash_table_lock_index( sca->subscriptions, slot_idx ); + + for ( e = slot->entries; e != NULL; e = e->next ) { + sub = (sca_subscription *)e->value; + + if ( SCA_STR_EQ( &sub->target_aor, aor )) { + subscribers = 1; + break; + } + } + + sca_hash_table_unlock_index( sca->subscriptions, slot_idx ); + + return( subscribers ); +} + sca_subscription * sca_subscription_create( str *aor, int event, str *subscriber, unsigned int notify_cseq, unsigned int subscribe_cseq, int expire_delta,

1 0

git:admorten/sca: modules/sca: Clear stale line-seize appearances via timer .
by Andrew Mortensen 22 Jul '13

22 Jul '13

Module: sip-router Branch: admorten/sca Commit: d70b1119cf9fabf7de24ec981580f527b8f0bb79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d70b111… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Jul 22 00:37:32 2013 -0400 modules/sca: Clear stale line-seize appearances via timer. Some badly behaved/buggy UAs don't know when to say when. --- modules/sca/sca_appearance.c | 20 +++++++++++++++----- modules/sca/sca_appearance.h | 8 +++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/sca/sca_appearance.c b/modules/sca/sca_appearance.c index 22d8413..ca26735 100644 --- a/modules/sca/sca_appearance.c +++ b/modules/sca/sca_appearance.c @@ -1283,7 +1283,7 @@ sca_appearance_purge_stale( unsigned int ticks, void *param ) struct notify_list *notify_list = NULL, *tmp_nl; int i; int unlinked; - time_t now; + time_t now, ttl; LM_INFO( "SCA: purging stale appearances" ); @@ -1308,11 +1308,21 @@ sca_appearance_purge_stale( unsigned int ticks, void *param ) cur_app = tmp_app ) { tmp_app = &(*cur_app)->next; - if ((*cur_app)->state != SCA_APPEARANCE_STATE_ACTIVE_PENDING ) { - continue; + switch ((*cur_app)->state ) { + case SCA_APPEARANCE_STATE_ACTIVE_PENDING: + ttl = SCA_APPEARANCE_STATE_PENDING_TTL; + break; + + case SCA_APPEARANCE_STATE_SEIZED: + ttl = SCA_APPEARANCE_STATE_SEIZED_TTL; + break; + + default: + /* XXX for now just skip other appearances */ + ttl = now + 60; + break; } - if (( now - (*cur_app)->times.mtime ) < - SCA_APPEARANCE_STATE_PENDING_TTL ) { + if (( now - (*cur_app)->times.mtime ) < ttl ) { continue; } diff --git a/modules/sca/sca_appearance.h b/modules/sca/sca_appearance.h index 74d6b39..9fa9a10 100644 --- a/modules/sca/sca_appearance.h +++ b/modules/sca/sca_appearance.h @@ -65,7 +65,13 @@ enum { * ACK. on receipt of the caller's ACK, we promote * the SCA callee's state to active. */ -#define SCA_APPEARANCE_STATE_PENDING_TTL 30 +enum { + /* Polycoms aggressively resubscribe line-seizes, give them time */ + SCA_APPEARANCE_STATE_SEIZED_TTL = 120, + + /* enough time to allow retransmissions (~32s) */ + SCA_APPEARANCE_STATE_PENDING_TTL = 35, +}; extern const str SCA_APPEARANCE_INDEX_STR; extern const str SCA_APPEARANCE_STATE_STR;

1 0

Doing automatic unregister when a WEBSOCKET connection is closed
by Juha Heinanen 20 Jul '13

20 Jul '13

i'm returning to this old thread where peter wrote: The way to get this working is: 1) Use Git master so that unregister() with ruid is supported 2) Modify save() so that upon successful creation of new contact it copies the ruid created by usrloc into the sip_msg.ruid variable for the current SIP message. This means that on return from save() the $ruid PV will work. ... and Actually save() can store the ruid in an xavp, one has to set the module parameter: http://kamailio.org/docs/modules/stable/modules/registrar.html#idp1752184 my understanding is that a single register request may contain more than one contact and if so, several ruids would be generated, one per contact. if so, what would $ruid contain after save()? regarding xavp_rcd, after reading registrar module code, it seems that it is only set upon lookup(), not upon save(). -- juha

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013