sr-dev November 2012

sr-dev@lists.kamailio.org

28 participants
123 discussions

git:admorten/sca: sca: move to modules directory
by Andrew Mortensen 27 Nov '12

27 Nov '12

Module: sip-router Branch: admorten/sca Commit: 5908a9e88242a166c71b03bce77b326c2f27f5a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5908a9e… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Nov 27 00:28:28 2012 -0500 sca: move to modules directory - moved after removal of usrloc dependency per miconda's request on sr-dev --- {modules_s => modules}/sca/LICENSE | 0 {modules_s => modules}/sca/Makefile | 0 {modules_s => modules}/sca/NOTES | 0 {modules_s => modules}/sca/README | 0 {modules_s => modules}/sca/doc/Makefile | 0 {modules_s => modules}/sca/doc/sca.xml | 0 {modules_s => modules}/sca/doc/sca_admin.xml | 0 {modules_s => modules}/sca/sca.c | 0 {modules_s => modules}/sca/sca.h | 0 {modules_s => modules}/sca/sca.sql | 0 {modules_s => modules}/sca/sca_appearance.c | 0 {modules_s => modules}/sca/sca_appearance.h | 0 {modules_s => modules}/sca/sca_call_info.c | 0 {modules_s => modules}/sca/sca_call_info.h | 0 {modules_s => modules}/sca/sca_common.h | 0 {modules_s => modules}/sca/sca_db.c | 0 {modules_s => modules}/sca/sca_db.h | 0 {modules_s => modules}/sca/sca_dialog.c | 0 {modules_s => modules}/sca/sca_dialog.h | 0 {modules_s => modules}/sca/sca_event.c | 0 {modules_s => modules}/sca/sca_event.h | 0 {modules_s => modules}/sca/sca_hash.c | 0 {modules_s => modules}/sca/sca_hash.h | 0 {modules_s => modules}/sca/sca_notify.c | 0 {modules_s => modules}/sca/sca_notify.h | 0 {modules_s => modules}/sca/sca_reply.c | 0 {modules_s => modules}/sca/sca_reply.h | 0 {modules_s => modules}/sca/sca_rpc.c | 0 {modules_s => modules}/sca/sca_rpc.h | 0 {modules_s => modules}/sca/sca_subscribe.c | 0 {modules_s => modules}/sca/sca_subscribe.h | 0 {modules_s => modules}/sca/sca_util.c | 0 {modules_s => modules}/sca/sca_util.h | 0 33 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/sca/LICENSE b/modules/sca/LICENSE similarity index 100% rename from modules_s/sca/LICENSE rename to modules/sca/LICENSE diff --git a/modules_s/sca/Makefile b/modules/sca/Makefile similarity index 100% rename from modules_s/sca/Makefile rename to modules/sca/Makefile diff --git a/modules_s/sca/NOTES b/modules/sca/NOTES similarity index 100% rename from modules_s/sca/NOTES rename to modules/sca/NOTES diff --git a/modules_s/sca/README b/modules/sca/README similarity index 100% rename from modules_s/sca/README rename to modules/sca/README diff --git a/modules_s/sca/doc/Makefile b/modules/sca/doc/Makefile similarity index 100% rename from modules_s/sca/doc/Makefile rename to modules/sca/doc/Makefile diff --git a/modules_s/sca/doc/sca.xml b/modules/sca/doc/sca.xml similarity index 100% rename from modules_s/sca/doc/sca.xml rename to modules/sca/doc/sca.xml diff --git a/modules_s/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml similarity index 100% rename from modules_s/sca/doc/sca_admin.xml rename to modules/sca/doc/sca_admin.xml diff --git a/modules_s/sca/sca.c b/modules/sca/sca.c similarity index 100% rename from modules_s/sca/sca.c rename to modules/sca/sca.c diff --git a/modules_s/sca/sca.h b/modules/sca/sca.h similarity index 100% rename from modules_s/sca/sca.h rename to modules/sca/sca.h diff --git a/modules_s/sca/sca.sql b/modules/sca/sca.sql similarity index 100% rename from modules_s/sca/sca.sql rename to modules/sca/sca.sql diff --git a/modules_s/sca/sca_appearance.c b/modules/sca/sca_appearance.c similarity index 100% rename from modules_s/sca/sca_appearance.c rename to modules/sca/sca_appearance.c diff --git a/modules_s/sca/sca_appearance.h b/modules/sca/sca_appearance.h similarity index 100% rename from modules_s/sca/sca_appearance.h rename to modules/sca/sca_appearance.h diff --git a/modules_s/sca/sca_call_info.c b/modules/sca/sca_call_info.c similarity index 100% rename from modules_s/sca/sca_call_info.c rename to modules/sca/sca_call_info.c diff --git a/modules_s/sca/sca_call_info.h b/modules/sca/sca_call_info.h similarity index 100% rename from modules_s/sca/sca_call_info.h rename to modules/sca/sca_call_info.h diff --git a/modules_s/sca/sca_common.h b/modules/sca/sca_common.h similarity index 100% rename from modules_s/sca/sca_common.h rename to modules/sca/sca_common.h diff --git a/modules_s/sca/sca_db.c b/modules/sca/sca_db.c similarity index 100% rename from modules_s/sca/sca_db.c rename to modules/sca/sca_db.c diff --git a/modules_s/sca/sca_db.h b/modules/sca/sca_db.h similarity index 100% rename from modules_s/sca/sca_db.h rename to modules/sca/sca_db.h diff --git a/modules_s/sca/sca_dialog.c b/modules/sca/sca_dialog.c similarity index 100% rename from modules_s/sca/sca_dialog.c rename to modules/sca/sca_dialog.c diff --git a/modules_s/sca/sca_dialog.h b/modules/sca/sca_dialog.h similarity index 100% rename from modules_s/sca/sca_dialog.h rename to modules/sca/sca_dialog.h diff --git a/modules_s/sca/sca_event.c b/modules/sca/sca_event.c similarity index 100% rename from modules_s/sca/sca_event.c rename to modules/sca/sca_event.c diff --git a/modules_s/sca/sca_event.h b/modules/sca/sca_event.h similarity index 100% rename from modules_s/sca/sca_event.h rename to modules/sca/sca_event.h diff --git a/modules_s/sca/sca_hash.c b/modules/sca/sca_hash.c similarity index 100% rename from modules_s/sca/sca_hash.c rename to modules/sca/sca_hash.c diff --git a/modules_s/sca/sca_hash.h b/modules/sca/sca_hash.h similarity index 100% rename from modules_s/sca/sca_hash.h rename to modules/sca/sca_hash.h diff --git a/modules_s/sca/sca_notify.c b/modules/sca/sca_notify.c similarity index 100% rename from modules_s/sca/sca_notify.c rename to modules/sca/sca_notify.c diff --git a/modules_s/sca/sca_notify.h b/modules/sca/sca_notify.h similarity index 100% rename from modules_s/sca/sca_notify.h rename to modules/sca/sca_notify.h diff --git a/modules_s/sca/sca_reply.c b/modules/sca/sca_reply.c similarity index 100% rename from modules_s/sca/sca_reply.c rename to modules/sca/sca_reply.c diff --git a/modules_s/sca/sca_reply.h b/modules/sca/sca_reply.h similarity index 100% rename from modules_s/sca/sca_reply.h rename to modules/sca/sca_reply.h diff --git a/modules_s/sca/sca_rpc.c b/modules/sca/sca_rpc.c similarity index 100% rename from modules_s/sca/sca_rpc.c rename to modules/sca/sca_rpc.c diff --git a/modules_s/sca/sca_rpc.h b/modules/sca/sca_rpc.h similarity index 100% rename from modules_s/sca/sca_rpc.h rename to modules/sca/sca_rpc.h diff --git a/modules_s/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c similarity index 100% rename from modules_s/sca/sca_subscribe.c rename to modules/sca/sca_subscribe.c diff --git a/modules_s/sca/sca_subscribe.h b/modules/sca/sca_subscribe.h similarity index 100% rename from modules_s/sca/sca_subscribe.h rename to modules/sca/sca_subscribe.h diff --git a/modules_s/sca/sca_util.c b/modules/sca/sca_util.c similarity index 100% rename from modules_s/sca/sca_util.c rename to modules/sca/sca_util.c diff --git a/modules_s/sca/sca_util.h b/modules/sca/sca_util.h similarity index 100% rename from modules_s/sca/sca_util.h rename to modules/sca/sca_util.h

1 0

git:admorten/sca: sca: update docs
by Andrew Mortensen 27 Nov '12

27 Nov '12

Module: sip-router Branch: admorten/sca Commit: 95cf6e358b2be210b61e6d060df0604e3e36a043 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95cf6e3… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Nov 27 00:24:11 2012 -0500 sca: update docs - "domain" modparam no longer required. - usrloc no longer a dependency. --- modules_s/sca/README | 117 ++++++++++++++++----------------------- modules_s/sca/doc/sca_admin.xml | 30 ---------- 2 files changed, 48 insertions(+), 99 deletions(-) diff --git a/modules_s/sca/README b/modules_s/sca/README index 330f38e..aa6449e 100644 --- a/modules_s/sca/README +++ b/modules_s/sca/README @@ -19,14 +19,13 @@ Andrew Mortensen 3. Parameters - 3.1. domain (str) - 3.2. hash_table_size (integer) - 3.3. call_info_max_expires (integer) - 3.4. line_seize_max_expires (integer) - 3.5. purge_expired_interval (integer) - 3.6. db_url (str) - 3.7. subs_table (str) - 3.8. db_update_interval (integer) + 3.1. hash_table_size (integer) + 3.2. call_info_max_expires (integer) + 3.3. line_seize_max_expires (integer) + 3.4. purge_expired_interval (integer) + 3.5. db_url (str) + 3.6. subs_table (str) + 3.7. db_update_interval (integer) 4. Functions @@ -43,16 +42,15 @@ Andrew Mortensen List of Examples - 1.1. Set domain parameter: - 1.2. Set hash_table_size: - 1.3. Set call_info_max_expires: - 1.4. Set line_seize_max_expires: - 1.5. Set purge_expired_interval: - 1.6. Set db_url parameter: - 1.7. Set subs_table parameter: - 1.8. Set db_update_interval: - 1.9. sca_handle_subscribe usage: - 1.10. sca_call_info_update usage: + 1.1. Set hash_table_size: + 1.2. Set call_info_max_expires: + 1.3. Set line_seize_max_expires: + 1.4. Set purge_expired_interval: + 1.5. Set db_url parameter: + 1.6. Set subs_table parameter: + 1.7. Set db_update_interval: + 1.8. sca_handle_subscribe usage: + 1.9. sca_call_info_update usage: Chapter 1. Admin Guide @@ -65,14 +63,13 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. domain (str) - 3.2. hash_table_size (integer) - 3.3. call_info_max_expires (integer) - 3.4. line_seize_max_expires (integer) - 3.5. purge_expired_interval (integer) - 3.6. db_url (str) - 3.7. subs_table (str) - 3.8. db_update_interval (integer) + 3.1. hash_table_size (integer) + 3.2. call_info_max_expires (integer) + 3.3. line_seize_max_expires (integer) + 3.4. purge_expired_interval (integer) + 3.5. db_url (str) + 3.6. subs_table (str) + 3.7. db_update_interval (integer) 4. Functions @@ -142,36 +139,18 @@ Chapter 1. Admin Guide * a database module * sl * tm - * usrloc 3. Parameters - 3.1. domain (str) - 3.2. hash_table_size (integer) - 3.3. call_info_max_expires (integer) - 3.4. line_seize_max_expires (integer) - 3.5. purge_expired_interval (integer) - 3.6. db_url (str) - 3.7. subs_table (str) - 3.8. db_update_interval (integer) + 3.1. hash_table_size (integer) + 3.2. call_info_max_expires (integer) + 3.3. line_seize_max_expires (integer) + 3.4. purge_expired_interval (integer) + 3.5. db_url (str) + 3.6. subs_table (str) + 3.7. db_update_interval (integer) -3.1. domain (str) - - SIP domain to use in SCA NOTIFY Call-Info headers. - - The module uses this value as the SIP domain in Call-Info headers sent with - call-info and line-seize NOTIFYs. The domain must match the domain in the - SCA line's address-of-record. - - This parameter is required. A future update of the module may extract this - value from client SUBSCRIBEs. - - Example 1.1. Set domain parameter: -... -modparam( "sca", "domain", "voice.example.org" ) -... - -3.2. hash_table_size (integer) +3.1. hash_table_size (integer) Size, as a power of two, of the shared memory hash table containing the call-info subscriptions and the appearance state. A larger power of two @@ -180,24 +159,24 @@ modparam( "sca", "domain", "voice.example.org" ) Default value is 9 (2 ^ 9 == 512). - Example 1.2. Set hash_table_size: + Example 1.1. Set hash_table_size: ... # create shared memory hash table with 2^8 (256) slots modparam( "sca", "hash_table_size", 8 ) ... -3.3. call_info_max_expires (integer) +3.2. call_info_max_expires (integer) The maximum allowed call-info subscription time in seconds. Default value is 3600 (1 hour). - Example 1.3. Set call_info_max_expires: + Example 1.2. Set call_info_max_expires: ... modparam( "sca", "call_info_max_expires", 1800 ) ... -3.4. line_seize_max_expires (integer) +3.3. line_seize_max_expires (integer) The maximum allowed line-seize subscription time in seconds. @@ -208,12 +187,12 @@ modparam( "sca", "call_info_max_expires", 1800 ) prevent a client from seizing an appearance without making a call for extended periods of time. - Example 1.4. Set line_seize_max_expires: + Example 1.3. Set line_seize_max_expires: ... modparam( "sca", "line_seize_max_expires", 30 ) ... -3.5. purge_expired_interval (integer) +3.4. purge_expired_interval (integer) The period of time in seconds between purges of expired call-info and line-seize subscriptions. @@ -226,41 +205,41 @@ modparam( "sca", "line_seize_max_expires", 30 ) members of the group, in the event that the expired subscription was a line-seize. - Example 1.5. Set purge_expired_interval: + Example 1.4. Set purge_expired_interval: ... modparam( "sca", "purge_expired_interval", 60 ) ... -3.6. db_url (str) +3.5. db_url (str) URL of database to which subscribers will be written. - Default value is mysql://openser:openserrw@localhost/openser + Default value is mysql://kamailio:kamailiorw@localhost/kamailio - Example 1.6. Set db_url parameter: + Example 1.5. Set db_url parameter: ... -modparam( "sca", "db_url", "mysql://openser:openserrw@localhost/openser" ) +modparam( "sca", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio" ) ... -3.7. subs_table (str) +3.6. subs_table (str) Name of the database table where call-info subscriptions are written. Default value is “sca_subscriptions”. - Example 1.7. Set subs_table parameter: + Example 1.6. Set subs_table parameter: ... modparam( "sca", "subs_table", "call_info_subscriptions" ) ... -3.8. db_update_interval (integer) +3.7. db_update_interval (integer) Period in seconds between writes of call-info subscriber information to the database. Default value is 300 (5 minutes). - Example 1.8. Set db_update_interval: + Example 1.7. Set db_update_interval: ... modparam( "sca", "db_update_interval", 120 ) ... @@ -288,7 +267,7 @@ modparam( "sca", "db_update_interval", 120 ) * 1 - successful * -1 - failed, error logged - Example 1.9. sca_handle_subscribe usage: + Example 1.8. sca_handle_subscribe usage: ... if ( method == "SUBSCRIBE" && ( @hf_value.event == "call-info" || @hf_value.event == "line-seize" )) @@ -318,7 +297,7 @@ if ( method == "SUBSCRIBE" && * 1 - successful * -1 - failed, error logged - Example 1.10. sca_call_info_update usage: + Example 1.9. sca_call_info_update usage: ... route { diff --git a/modules_s/sca/doc/sca_admin.xml b/modules_s/sca/doc/sca_admin.xml index ef0f5e5..02d119e 100644 --- a/modules_s/sca/doc/sca_admin.xml +++ b/modules_s/sca/doc/sca_admin.xml @@ -95,11 +95,6 @@ <emphasis>tm</emphasis> </para> </listitem> - <listitem> - <para> - <emphasis>usrloc</emphasis> - </para> - </listitem> </itemizedlist> </para> </section> @@ -108,31 +103,6 @@ <section> <title>Parameters</title> <section> - <title><varname>domain</varname> (str)</title> - <para> - SIP domain to use in SCA NOTIFY Call-Info headers. - </para> - <para> - The module uses this value as the SIP domain in Call-Info - headers sent with call-info and line-seize NOTIFYs. The domain - must match the domain in the SCA line's address-of-record. - </para> - <para> - <emphasis>This parameter is required.</emphasis> A future - update of the module may extract this value from client - SUBSCRIBEs. - </para> - <example> - <title>Set <varname>domain</varname> parameter:</title> - <programlisting format="linespecific"> -... -modparam( "sca", "domain", "voice.example.org" ) -... - </programlisting> - </example> - </section> - - <section> <title><varname>hash_table_size</varname> (integer)</title> <para> Size, as a power of two, of the shared memory hash table

1 0

git:admorten/sca: sca: remove dependency on usrloc.
by Andrew Mortensen 27 Nov '12

27 Nov '12

Module: sip-router Branch: admorten/sca Commit: 959b2c423a70395c97437d0bcef7950762c4a9b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=959b2c4… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Tue Nov 27 00:09:06 2012 -0500 sca: remove dependency on usrloc. - usrloc callbacks in practice were only useful for expired registrations, and even in that case our expired subscription timer is likely to have purged the stale subscription. --- modules_s/sca/sca.c | 64 ------------------------------- modules_s/sca/sca_common.h | 1 - modules_s/sca/sca_usrloc_cb.c | 84 ----------------------------------------- modules_s/sca/sca_usrloc_cb.h | 26 ------------- 4 files changed, 0 insertions(+), 175 deletions(-) diff --git a/modules_s/sca/sca.c b/modules_s/sca/sca.c index c002241..b2a912d 100644 --- a/modules_s/sca/sca.c +++ b/modules_s/sca/sca.c @@ -26,7 +26,6 @@ #include <sys/types.h> #include <stdlib.h> -#include "../usrloc/usrloc.h" #include "../../timer.h" #include "../../timer_proc.h" @@ -35,7 +34,6 @@ #include "sca_call_info.h" #include "sca_rpc.h" #include "sca_subscribe.h" -#include "sca_usrloc_cb.h" MODULE_VERSION @@ -46,7 +44,6 @@ sca_mod *sca; /* EXTERNAL API */ db_func_t dbf; /* db api */ -usrloc_api_t ul; /* usrloc callbacks */ struct tm_binds tmb; /* tm functions for sending messages */ sl_api_t slb; /* sl callback, function for getting to-tag */ @@ -54,7 +51,6 @@ sl_api_t slb; /* sl callback, function for getting to-tag */ static int sca_mod_init( void ); static int sca_child_init( int ); static void sca_mod_destroy( void ); -static int sca_bind_usrloc( usrloc_api_t *, sca_mod ** ); static int sca_set_config( sca_mod * ); /* EXPORTED COMMANDS */ @@ -127,61 +123,6 @@ struct module_exports exports = { sca_child_init, /* per-child initialization function */ }; -/* - * bind usrloc API and register callbacks for events we care about. - */ - static int -sca_bind_usrloc( usrloc_api_t *ul_api, sca_mod **scam ) -{ - bind_usrloc_t bind_usrloc; - - assert( scam != NULL ); - - bind_usrloc = (bind_usrloc_t)find_export( "ul_bind_usrloc", 1, 0 ); - if ( !bind_usrloc ) { - LM_ERR( "Can't find exported usrloc functions" ); - return( -1 ); - } - - if ( bind_usrloc( ul_api ) < 0 ) { - LM_ERR( "Can't bind exported usrloc functions" ); - return( -1 ); - } - if ( ul_api->register_ulcb == NULL ) { - LM_ERR( "Failed to import usrloc register callback function" ); - return( -1 ); - } - - /* - * register callback functions for: - * 1. contact insertion (new REGISTER for an AoR); - * 2. contact expiration (registration expired); - * 3. contact re-registration; - * 4. contact deletion (REGISTER with Expires: 0) - */ - if ( ul_api->register_ulcb( UL_CONTACT_INSERT, - sca_contact_change_cb, NULL ) < 0 ) { - LM_ERR( "Failed to register for usrloc contact insert callback" ); - return( -1 ); - } - if ( ul_api->register_ulcb( UL_CONTACT_EXPIRE, - sca_contact_change_cb, NULL ) < 0 ) { - LM_ERR( "Failed to register for usrloc contact expire callback" ); - return( -1 ); - } - if ( ul_api->register_ulcb( UL_CONTACT_UPDATE, - sca_contact_change_cb, NULL ) < 0 ) { - LM_ERR( "Failed to register for usrloc contact update callback" ); - return( -1 ); - } - if ( ul_api->register_ulcb( UL_CONTACT_DELETE, - sca_contact_change_cb, NULL ) < 0 ) { - LM_ERR( "Failed to register for usrloc contact update callback" ); - return( -1 ); - } - - return( 0 ); -} static int sca_bind_sl( sca_mod *scam, sl_api_t *sl_api ) @@ -359,11 +300,6 @@ sca_mod_init( void ) return( -1 ); } - if ( sca_bind_usrloc( &ul, &sca ) != 0 ) { - LM_ERR( "Failed to initialize required usrloc API" ); - return( -1 ); - } - if ( load_tm_api( &tmb ) != 0 ) { LM_ERR( "Failed to initialize required tm API" ); return( -1 ); diff --git a/modules_s/sca/sca_common.h b/modules_s/sca/sca_common.h index 0ddff4d..d613773 100644 --- a/modules_s/sca/sca_common.h +++ b/modules_s/sca/sca_common.h @@ -49,7 +49,6 @@ #include "../../mem/shm_mem.h" /* bound API headers */ -#include "../usrloc/usrloc.h" #include "../../modules/sl/sl.h" #include "../../modules/tm/tm_load.h" diff --git a/modules_s/sca/sca_usrloc_cb.c b/modules_s/sca/sca_usrloc_cb.c deleted file mode 100644 index ae76ec2..0000000 --- a/modules_s/sca/sca_usrloc_cb.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2012 Andrew Mortensen - * - * This file is part of the sca module for sip-router, a free SIP server. - * - * The sca module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * The sca module is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * - */ -#include <sys/types.h> -#include <stdlib.h> - -#include "sca_common.h" - -#include "sca.h" -#include "sca_appearance.h" -#include "sca_event.h" -#include "sca_subscribe.h" -#include "sca_usrloc_cb.h" - - static const char * -sca_name_from_contact_event_type( int type ) -{ - static const char *name = "unknown contact change event"; - - switch ( type ) { - case UL_CONTACT_INSERT: - name = "insert"; - break; - - case UL_CONTACT_UPDATE: - name = "update"; - break; - - case UL_CONTACT_EXPIRE: - name = "expire"; - break; - - case UL_CONTACT_DELETE: - name = "delete"; - break; - - default: - break; - } - - return( name ); -} - - void -sca_contact_change_cb( ucontact_t *c, int type, void *param ) -{ - const char *event_name = sca_name_from_contact_event_type( type ); - - if ( type == UL_CONTACT_INSERT || type == UL_CONTACT_UPDATE ) { - return; - } - - if ( !sca_uri_is_shared_appearance( sca, &c->aor )) { - LM_DBG( "%.*s is not a shared appearance line", STR_FMT( &c->aor )); - return; - } - - if ( sca_subscription_delete_subscriber_for_event( sca, &c->c, - &SCA_EVENT_NAME_CALL_INFO, &c->aor ) < 0 ) { - LM_ERR( "Failed to delete %.*s %.*s subscription on %s", - STR_FMT( &c->c ), STR_FMT( &SCA_EVENT_NAME_CALL_INFO ), - event_name ); - } -} diff --git a/modules_s/sca/sca_usrloc_cb.h b/modules_s/sca/sca_usrloc_cb.h deleted file mode 100644 index a74cdc7..0000000 --- a/modules_s/sca/sca_usrloc_cb.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2012 Andrew Mortensen - * - * This file is part of the sca module for sip-router, a free SIP server. - * - * The sca module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * The sca module is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * - */ -#include "sca_common.h" - -void sca_contact_change_cb( ucontact_t *, int, void * );

1 0

git:master: socket_info: add #include "linux/types.h"
by Ovidiu Sas 27 Nov '12

27 Nov '12

Module: sip-router Branch: master Commit: 141fc56f5a46f26e40e8e19e4f5eb02844d192d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=141fc56… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Nov 26 23:18:02 2012 -0500 socket_info: add #include "linux/types.h" --- socket_info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/socket_info.c b/socket_info.c index 73dbc03..9defb2b 100644 --- a/socket_info.c +++ b/socket_info.c @@ -847,6 +847,7 @@ int add_listen_iface(char* name, struct name_lst* addr_l, } #ifdef __OS_linux +#include "linux/types.h" #include "linux/netlink.h" #include "linux/rtnetlink.h" #include "arpa/inet.h"

1 0

git:admorten/sca: sca: eliminate need for "domain" modparam
by Andrew Mortensen 26 Nov '12

26 Nov '12

Module: sip-router Branch: admorten/sca Commit: 0af64c92263b82dc4b487c4da5199c8b150b0517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0af64c9… Author: Andrew Mortensen <admorten(a)umich.edu> Committer: Andrew Mortensen <admorten(a)umich.edu> Date: Mon Nov 26 16:50:43 2012 -0500 sca: eliminate need for "domain" modparam - Extract domain to be used in idle appearance from subscription AoR instead. --- modules_s/sca/sca.c | 9 -------- modules_s/sca/sca.h | 1 - modules_s/sca/sca_call_info.c | 45 +++++++++++++--------------------------- 3 files changed, 15 insertions(+), 40 deletions(-) diff --git a/modules_s/sca/sca.c b/modules_s/sca/sca.c index 4ba82f1..c002241 100644 --- a/modules_s/sca/sca.c +++ b/modules_s/sca/sca.c @@ -91,7 +91,6 @@ static rpc_export_t sca_rpc[] = { }; /* EXPORTED PARAMETERS */ -str domain = STR_NULL; str outbound_proxy = STR_NULL; str db_url = STR_STATIC_INIT( DEFAULT_DB_URL ); str db_subs_table = STR_STATIC_INIT( "sca_subscriptions" ); @@ -103,7 +102,6 @@ int line_seize_max_expires = 15; int purge_expired_interval = 120; static param_export_t params[] = { - { "domain", STR_PARAM, &domain.s }, { "outbound_proxy", STR_PARAM, &outbound_proxy.s }, { "db_url", STR_PARAM, &db_url.s }, { "subs_table", STR_PARAM, &db_subs_table.s }, @@ -267,13 +265,6 @@ sca_set_config( sca_mod *scam ) return( -1 ); } - if ( domain.s == NULL ) { - LM_ERR( "SCA domain modparam is required in configuration script" ); - return( -1 ); - } - domain.len = strlen( domain.s ); - scam->cfg->domain = &domain; - if ( outbound_proxy.s ) { outbound_proxy.len = strlen( outbound_proxy.s ); scam->cfg->outbound_proxy = &outbound_proxy; diff --git a/modules_s/sca/sca.h b/modules_s/sca/sca.h index d241dce..c61bb52 100644 --- a/modules_s/sca/sca.h +++ b/modules_s/sca/sca.h @@ -30,7 +30,6 @@ #define SCA_H struct _sca_config { - str *domain; str *outbound_proxy; str *db_url; str *subs_table; diff --git a/modules_s/sca/sca_call_info.c b/modules_s/sca/sca_call_info.c index 0e77076..593f286 100644 --- a/modules_s/sca/sca_call_info.c +++ b/modules_s/sca/sca_call_info.c @@ -206,46 +206,31 @@ done: } static int -sca_call_info_header_length_for_idle_appearance( sca_mod *scam ) -{ - int given_length = 0; - - /* appearance-index=* */ - given_length += strlen( "*" ); - - /* appearance-state=idle */ - given_length += SCA_APPEARANCE_STATE_STR_IDLE.len; - - given_length += scam->cfg->domain->len; - - return( sca_call_info_header_length( given_length )); -} - - static int -sca_call_info_build_idle_value( sca_mod *scam, char *hdrbuf, int maxlen ) +sca_call_info_build_idle_value( sca_mod *scam, str *aor, + char *hdrbuf, int maxlen ) { + str idle_domain = STR_NULL; int len; - if ( sca_call_info_header_length_for_idle_appearance( scam ) >= maxlen ) { - LM_ERR( "Failed to add idle appearances: Call-Info header too long" ); + if ( sca_call_info_domain_from_uri( aor, &idle_domain ) < 0 ) { + LM_ERR( "Failed to extract domain from %.*s for idle domain", + STR_FMT( aor )); return( -1 ); } -#ifdef notdef - strcpy( hdrbuf, "<sip:" ); - len = strlen( "<sip:" ); - - memcpy( hdrbuf + len, scam->cfg->domain->s, scam->cfg->domain->len ); - len += scam->cfg->domain->len; -#endif /* notdef */ - /* the SCA_APPEARANCE_ strs' s member are literal C strings */ len = snprintf( hdrbuf, maxlen, - "<sip:%s>;%s=*;%s=%s%s", - scam->cfg->domain->s, + "<sip:%.*s>;%s=*;%s=%s%s", + STR_FMT( &idle_domain ), SCA_APPEARANCE_INDEX_STR.s, SCA_APPEARANCE_STATE_STR.s, SCA_APPEARANCE_STATE_STR_IDLE.s, CRLF ); + if ( len >= maxlen ) { + LM_ERR( "Failed to add idle appearance: Call-Info header too long" ); + len = -1; + + /* snprintf can also return negative. we catch that in the caller. */ + } return( len ); } @@ -273,7 +258,7 @@ sca_call_info_build_header( sca_mod *scam, sca_subscription *sub, /* line-seize NOTIFYs will contain only the seized appearance index */ if ( sub->event != SCA_EVENT_TYPE_LINE_SEIZE ) { /* if not all appearances in use, add *-index idle */ - len = sca_call_info_build_idle_value( scam, + len = sca_call_info_build_idle_value( scam, &sub->target_aor, hdrbuf + usedlen, maxlen - usedlen ); if ( len < 0 || len + usedlen >= maxlen ) { LM_ERR( "Cannot build idle Call-Info value: buffer too small" );

1 0

new developer: Andrew Mortensen
by Daniel-Constantin Mierla 26 Nov '12

26 Nov '12

Hello, I want to announce that a new developer got GIT write access to repository: Andrew Mortensen from University of Pennsylvania, USA - he has contributed a new module: sca (Shared Call Appearances for Broadsoft extensions). The module is right now in a personal branch, soon to me merged in master branch. His git commit id is: admorten My warm welcome and looking forward to future work within the project. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

3 2

git:admorten/sca: Use project-wide gitignore instead.
by Andrew Mortensen 26 Nov '12

26 Nov '12

Module: sip-router Branch: admorten/sca Commit: b8e877889a99b03f190a82acf101681a23ca11d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8e8778… Author: Andrew Mortensen <admorten(a)umich.edu> Committer: Andrew Mortensen <admorten(a)umich.edu> Date: Sun Nov 25 09:09:59 2012 -0500 Use project-wide gitignore instead. --- modules_s/sca/.gitignore | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/modules_s/sca/.gitignore b/modules_s/sca/.gitignore deleted file mode 100644 index 82ff0a4..0000000 --- a/modules_s/sca/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*~ -*.d -*.lst -*.o -*.so -*.swo -*.swp

2 2

[tracker] Task closed: uacreg functionality: kamailio sending zeroes in header
by sip-router 26 Nov '12

26 Nov '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#254 - uacreg functionality: kamailio sending zeroes in header User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=254 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: uacreg functionality: kamailio sending zeroes in header
by sip-router 26 Nov '12

26 Nov '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#254 - uacreg functionality: kamailio sending zeroes in header User who did this - Daniel-Constantin Mierla (miconda) ---------- No problem, it can happen to anyone. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=254#comment753 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

Re: [sr-dev] Dialog module: dlg_terminate_dlg and register_dlgcb function
by Daniel-Constantin Mierla 26 Nov '12

26 Nov '12

Hello, On 11/26/12 3:52 PM, Eduardo Lejarreta wrote: > > Good evening. > > I'm a rookie (not a developer), on users mailling list I've been > forwarded to this. Anyway, this is the case: > > Dialog, tm, rr and acc: 3.2.1 modules version > > When you finish externally a dialog, vía FIFO command with > "dlg_terminate_dlg: callid, from_tag" the callback register function > "register_dlgcb" on "/DLGCB_TERMINATED" event /returns a: > > dlg_cb_params * params->req with (NIL) value. > the request does not exist in this case, going to be generated locally. > This callback register function is used by "acc" module with acc_cdr > accounting enabled to track the end of the call. > > In this scenario acc module can not account the end of the call. -> > ERROR: acc [acc_cdr.c:480]: invalid values#012! > > If you try this scenario over TCP and with "RR" module with "enable_double_rr" enabled you will see that the "acc" module is able to track the end of the call because a double "Record-route" header is inserted by proxy. > > Do you think this could be an issue that it can be resolved in future? Or may be we're forgetting something. > > Any help, any idea?, Maybe you can solve it by storing dialog hash and id -- see the $dlg(...) class of variables. It should be solved in a way or another, to become useful, please open an issue on the tracker not to forget about it. I plan to look a bit at cdr accounting with dialog before the next major release. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2012