From: Automerge Script <automerge@asterisk.org>
Date: Wed, 11 Jul 2007 23:27:32 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.22-netsec~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cf12e669e8656df2745a3e10d2554c94022b3ee;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@74811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c8007acbab..5bc629fa35 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6959,7 +6959,9 @@ retryowner:
 					check_provisioning(&sin, fd, ies.serviceident, ies.provver);
 				/* If we're in trunk mode, do it now, and update the trunk number in our frame before continuing */
 				if (ast_test_flag(iaxs[fr->callno], IAX_TRUNK)) {
-					fr->callno = make_trunk(fr->callno, 1);
+					int new_callno;
+					if ((new_callno = make_trunk(fr->callno, 1)) != -1)
+						fr->callno = new_callno;
 				}
 				/* For security, always ack immediately */
 				if (delayreject)
@@ -8072,8 +8074,11 @@ static struct ast_channel *iax2_request(const char *type, int format, void *data
 
 	/* If this is a trunk, update it now */
 	ast_copy_flags(iaxs[callno], &cai, IAX_TRUNK | IAX_SENDANI | IAX_NOTRANSFER | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF);	
-	if (ast_test_flag(&cai, IAX_TRUNK))
-		callno = make_trunk(callno, 1);
+	if (ast_test_flag(&cai, IAX_TRUNK)) {
+		int new_callno;
+		if ((new_callno = make_trunk(callno, 1)) != -1)
+			callno = new_callno;
+	}
 	iaxs[callno]->maxtime = cai.maxtime;
 	if (cai.found)
 		ast_copy_string(iaxs[callno]->host, pds.peer, sizeof(iaxs[callno]->host));