[asterisk-commits] trunk - r7918 in /trunk: ./ channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan  9 17:06:28 2006
New Revision: 7918

URL: http://svn.digium.com/view/asterisk?rev=7918&view=rev
Log:
Merged revisions 7917 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7917 | kpfleming | 2006-01-09 16:48:48 -0600 (Mon, 09 Jan 2006) | 2 lines

re-initialize _all_ sequence numbers when transfer completes

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan  9 17:06:28 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7829,7831,7848,7904,7908
+/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7869,7872-7897,7901-7914,7916-7917

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?rev=7918&r1=7917&r2=7918&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Jan  9 17:06:28 2006
@@ -5372,6 +5372,7 @@
 	memset(&pvt->transfer, 0, sizeof(pvt->transfer));
 	/* Reset sequence numbers */
 	pvt->oseqno = 0;
+	pvt->rseqno = 0;
 	pvt->iseqno = 0;
 	pvt->aseqno = 0;
 	pvt->peercallno = peercallno;
@@ -6582,8 +6583,8 @@
 		/* Handle implicit ACKing unless this is an INVAL, and only if this is 
 		   from the real peer, not the transfer peer */
 		if (!inaddrcmp(&sin, &iaxs[fr.callno]->addr) && 
-			(((f.subclass != IAX_COMMAND_INVAL)) ||
-			(f.frametype != AST_FRAME_IAX))) {
+		    ((f.subclass != IAX_COMMAND_INVAL) ||
+		     (f.frametype != AST_FRAME_IAX))) {
 			unsigned char x;
 			/* XXX This code is not very efficient.  Surely there is a better way which still
 			       properly handles boundary conditions? XXX */