[asterisk-commits] qwell: branch qwell/fun_with_transports r383719 - in /team/qwell/fun_with_tra...

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Mar 25 10:45:22 2013
New Revision: 383719

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383719
Log:
Multiple revisions 383707,383717

........
  r383707 | file | 2013-03-25 09:08:15 -0500 (Mon, 25 Mar 2013) | 8 lines
  
  Add support for domains, domain aliases, inbound registrations, and outbound registrations.
  
  Contacts can now be dynamically manipulated on AORs using the registrar module and by registering
  from a device. Outbound registrations can now be configured and are refreshed as expected. Since
  outbound authentication has not yet been merged, it is not yet possible to authenticate.
  
  Review: https://reviewboard.asterisk.org/r/2398/
........
  r383717 | file | 2013-03-25 10:43:57 -0500 (Mon, 25 Mar 2013) | 2 lines
  
  I forgot to add this ;(
........

Merged revisions 383707,383717 from http://svn.asterisk.org/svn/asterisk/team/group/pimp_my_sip

Added:
    team/qwell/fun_with_transports/res/res_sip/config_domain_aliases.c
      - copied unchanged from r383717, team/group/pimp_my_sip/res/res_sip/config_domain_aliases.c
    team/qwell/fun_with_transports/res/res_sip_outbound_registration.c
      - copied unchanged from r383717, team/group/pimp_my_sip/res/res_sip_outbound_registration.c
    team/qwell/fun_with_transports/res/res_sip_registrar.c
      - copied unchanged from r383717, team/group/pimp_my_sip/res/res_sip_registrar.c
Modified:
    team/qwell/fun_with_transports/   (props changed)
    team/qwell/fun_with_transports/include/asterisk/res_sip.h
    team/qwell/fun_with_transports/res/res_sip/location.c

Propchange: team/qwell/fun_with_transports/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 25 10:45:22 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-383510,383523-383672 /trunk:1-383466
+/team/group/pimp_my_sip:1-383510,383523-383672,383707-383717 /trunk:1-383466

Modified: team/qwell/fun_with_transports/include/asterisk/res_sip.h
URL: http://svnview.digium.com/svn/asterisk/team/qwell/fun_with_transports/include/asterisk/res_sip.h?view=diff&rev=383719&r1=383718&r2=383719
==============================================================================
--- team/qwell/fun_with_transports/include/asterisk/res_sip.h (original)
+++ team/qwell/fun_with_transports/include/asterisk/res_sip.h Mon Mar 25 10:45:22 2013
@@ -82,7 +82,7 @@
 /*! \brief Maximum number of ciphers supported for a TLS transport */
 #define SIP_TLS_MAX_CIPHERS 64
 
-/*!
+/*
  * \brief Transport to bind to
  */
 struct ast_sip_transport {
@@ -164,12 +164,10 @@
 	unsigned int default_expiration;
 	/*! Maximum number of external contacts, 0 to disable */
 	unsigned int max_contacts;
+	/*! Whether to remove any existing contacts not related to an incoming REGISTER when it comes in */
+	unsigned int remove_existing;
 	/*! Any permanent configured contacts */
 	struct ao2_container *permanent_contacts;
-	/*! Whether to remove any existing contacts not related to an incoming REGISTER when it comes in */
-	unsigned int remove_existing;
-	/*! Any statically configured contacts */
-	struct ao2_container *static_contacts;
 };
 
 /*!

Modified: team/qwell/fun_with_transports/res/res_sip/location.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/fun_with_transports/res/res_sip/location.c?view=diff&rev=383719&r1=383718&r2=383719
==============================================================================
--- team/qwell/fun_with_transports/res/res_sip/location.c (original)
+++ team/qwell/fun_with_transports/res/res_sip/location.c Mon Mar 25 10:45:22 2013
@@ -199,8 +199,8 @@
 	ast_sorcery_object_field_register(sorcery, "aor", "maximum_expiration", "7200", OPT_UINT_T, 0, FLDSET(struct ast_sip_aor, maximum_expiration));
 	ast_sorcery_object_field_register(sorcery, "aor", "default_expiration", "3600", OPT_UINT_T, 0, FLDSET(struct ast_sip_aor, default_expiration));
 	ast_sorcery_object_field_register(sorcery, "aor", "max_contacts", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_aor, max_contacts));
+	ast_sorcery_object_field_register(sorcery, "aor", "remove_existing", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_aor, remove_existing));
 	ast_sorcery_object_field_register_custom(sorcery, "aor", "contact", "", permanent_uri_handler, NULL, 0, 0);
-	ast_sorcery_object_field_register(sorcery, "aor", "remove_existing", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_aor, remove_existing));
 
 	return 0;
 }