From e347f8bc701208c6f804ee94c93a24c619cabf25 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 1 Jul 2008 20:28:54 +0000
Subject: [PATCH] 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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
build_tools/cflags.xml | 2 ++
channels/chan_iax2.c | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 4a26bd0dd7..21f9abc2bf 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -42,4 +42,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>
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index e78a8b65dd..f16c66c429 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1657,6 +1657,18 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
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]) {
@@ -1679,6 +1691,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
if (!res || !return_locked)
ast_mutex_unlock(&iaxsl[x]);
}
+#endif
}
if (!res && (new >= NEW_ALLOW)) {
int start, found = 0;
--
GitLab