[svn-commits] tilghman: branch 1.6.0 r127149 - in /branches/1.6.0: ./ build_tools/ channels/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Jul  1 15:29:53 2008
New Revision: 127149

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127149
Log:
Merged revisions 127143 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r127143 | tilghman | 2008-07-01 15:28:54 -0500 (Tue, 01 Jul 2008) | 10 lines

Merged revisions 127133 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r127133 | tilghman | 2008-07-01 15:25:37 -0500 (Tue, 01 Jul 2008) | 2 lines

Disable the old, slow search for matching callno in chan_iax2 (but allow it to be reenabled for debugging)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/cflags.xml
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/build_tools/cflags.xml?view=diff&rev=127149&r1=127148&r2=127149
==============================================================================
--- branches/1.6.0/build_tools/cflags.xml (original)
+++ branches/1.6.0/build_tools/cflags.xml Tue Jul  1 15:29:53 2008
@@ -46,4 +46,6 @@
 		<member name="BUSYDETECT_DEBUG" displayname="Enable additional busy detection debugging">
 			<defaultenabled>no</defaultenabled>
 		</member>
+		<member name="IAX_OLD_FIND" displayname="Use the old, slow method of searching for IAX callnos">
+		</member>
 	</category>

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=127149&r1=127148&r2=127149
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Tue Jul  1 15:29:53 2008
@@ -1650,6 +1650,18 @@
 			return res;
 		}
 
+#ifdef IAX_OLD_FIND
+		/* If we get here, we SHOULD NOT find a call structure for this
+		   callno; if we do, it means that there is a call structure that
+		   has a peer callno but did NOT get entered into the hash table,
+		   which is bad.
+
+		   If we find a call structure using this old, slow method, output a log
+		   message so we'll know about it. After a few months of leaving this in
+		   place, if we don't hear about people seeing these messages, we can
+		   remove this code for good.
+		*/
+
 		for (x = 1; !res && x < maxnontrunkcall; x++) {
 			ast_mutex_lock(&iaxsl[x]);
 			if (iaxs[x]) {
@@ -1672,6 +1684,7 @@
 			if (!res || !return_locked)
 				ast_mutex_unlock(&iaxsl[x]);
 		}
+#endif
 	}
 	if (!res && (new >= NEW_ALLOW)) {
 		int start, found = 0;