[asterisk-commits] russell: branch group/sip-object-matching r179167 - in /team/group/sip-object...

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Feb 27 15:51:59 2009
New Revision: 179167

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179167
Log:
sync with trunk

Modified:
    team/group/sip-object-matching/   (props changed)
    team/group/sip-object-matching/UPGRADE.txt
    team/group/sip-object-matching/cdr/cdr_sqlite3_custom.c
    team/group/sip-object-matching/configs/ais.conf.sample
    team/group/sip-object-matching/doc/distributed_devstate.txt
    team/group/sip-object-matching/res/res_ais.c

Propchange: team/group/sip-object-matching/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 27 15:51:59 2009
@@ -1,1 +1,1 @@
-/trunk:1-179138
+/trunk:1-179166

Modified: team/group/sip-object-matching/UPGRADE.txt
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/UPGRADE.txt?view=diff&rev=179167&r1=179166&r2=179167
==============================================================================
--- team/group/sip-object-matching/UPGRADE.txt (original)
+++ team/group/sip-object-matching/UPGRADE.txt Fri Feb 27 15:51:59 2009
@@ -45,6 +45,13 @@
   operations.
 
 From 1.6.0.x to 1.6.1:
+
+* In previous versions of Asterisk, due to the way objects were arranged in
+  memory by chan_sip, the order of entries in sip.conf could be adjusted to
+  control the behavior of matching against peers and users.  The way objects
+  are managed has been significantly changed for reasons involving performance
+  and stability.  A side effect of these changes is that the order of entries
+  in sip.conf can no longer be relied upon to control behavior.
 
 * The following core commands dealing with dialplan have been deprecated: 'core
   show globals', 'core set global' and 'core set chanvar'. Use the equivalent

Modified: team/group/sip-object-matching/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/cdr/cdr_sqlite3_custom.c?view=diff&rev=179167&r1=179166&r2=179167
==============================================================================
--- team/group/sip-object-matching/cdr/cdr_sqlite3_custom.c (original)
+++ team/group/sip-object-matching/cdr/cdr_sqlite3_custom.c Fri Feb 27 15:51:59 2009
@@ -172,7 +172,7 @@
 		/* Nothing configured */
 		ast_mutex_unlock(&lock);
 		ast_config_destroy(cfg);
-		return 0;
+		return -1;
 	}
 
 	/* Mapping must have a table name */

Modified: team/group/sip-object-matching/configs/ais.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/configs/ais.conf.sample?view=diff&rev=179167&r1=179166&r2=179167
==============================================================================
--- team/group/sip-object-matching/configs/ais.conf.sample (original)
+++ team/group/sip-object-matching/configs/ais.conf.sample Fri Feb 27 15:51:59 2009
@@ -9,6 +9,15 @@
 ; the openais website for downloads and more information.
 ;   * http://www.openais.org/
 ;
+
+;
+;                            *** NOTE ***
+; This document includes some information about using the res_ais module for
+; distributed events.  However, it is important to note that res_ais is still
+; considered experimental, as the module exposes the binary format of events
+; over the network between servers.  This format is still subject to change
+; between 1.6.X releases.
+;                            ************
 
 ;
 ; [general]

Modified: team/group/sip-object-matching/doc/distributed_devstate.txt
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/doc/distributed_devstate.txt?view=diff&rev=179167&r1=179166&r2=179167
==============================================================================
--- team/group/sip-object-matching/doc/distributed_devstate.txt (original)
+++ team/group/sip-object-matching/doc/distributed_devstate.txt Fri Feb 27 15:51:59 2009
@@ -6,6 +6,16 @@
 === Russell Bryant <russell at digium.com>
 ===
 ===============================================================================
+
+-------------------------------------------------------------------------------
+--- IMPORTANT NOTE
+-------------------------------------------------------------------------------
+
+This document includes some information about using the res_ais module for
+distributed events.  However, it is important to note that res_ais is still
+considered experimental, as the module exposes the binary format of events
+over the network between servers.  This format is still subject to change
+between 1.6.X releases.
 
 -------------------------------------------------------------------------------
 --- INTRODUCTION

Modified: team/group/sip-object-matching/res/res_ais.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/res/res_ais.c?view=diff&rev=179167&r1=179166&r2=179167
==============================================================================
--- team/group/sip-object-matching/res/res_ais.c (original)
+++ team/group/sip-object-matching/res/res_ais.c Fri Feb 27 15:51:59 2009
@@ -26,6 +26,10 @@
  *
  * This file contains the common code between the uses of the different AIS
  * services.
+ *
+ * \note This module is still considered experimental, as it exposes the
+ * internal binary format of events between Asterisk servers over a network.
+ * However, this format is still subject to change between 1.6.X releases.
  */
 
 /*** MODULEINFO