aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-01 16:52:29 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-01 16:52:29 +0000
commit2198289d03c636a2a927a773d4c0ed01a4acb489 (patch)
treea24267745ebcfcd3b62691478d23aed986cb0b28 /channels
parentf254ada71893dd86890a1add54501435d7e635de (diff)
Merged revisions 126999 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r126999 | tilghman | 2008-07-01 11:50:46 -0500 (Tue, 01 Jul 2008) | 2 lines Suppress annoying warning by finding the remaining cases where the callno is not in the hash. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@127000 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 2432a6bb4..62764418f 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1650,6 +1650,15 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
}
}
+ /* This will occur on the first response to a message that we initiated,
+ * such as a PING. */
+ if (callno && dcallno && iaxs[dcallno] && !iaxs[dcallno]->peercallno && match(sin, callno, dcallno, iaxs[dcallno], check_dcallno)) {
+ iaxs[dcallno]->peercallno = callno;
+ res = dcallno;
+ store_by_peercallno(iaxs[dcallno]);
+ return res;
+ }
+
for (x = 1; !res && x < maxnontrunkcall; x++) {
ast_mutex_lock(&iaxsl[x]);
if (iaxs[x]) {