[Asterisk-cvs] asterisk/channels chan_sip.c,1.448,1.449

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv23907/channels

Modified Files:
	chan_sip.c 
Log Message:
If we get 200 OK back on INVITE after we send CANCEL, send ACK *and* send BYE


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -d -r1.448 -r1.449
--- chan_sip.c	13 Jul 2004 02:44:11 -0000	1.448
+++ chan_sip.c	14 Jul 2004 11:10:05 -0000	1.449
@@ -6423,7 +6423,9 @@
 						struct ast_frame af = { AST_FRAME_NULL, };
 						ast_queue_frame(p->owner, &af);
 					}
-				}
+				} else /* It's possible we're getting an ACK after we've tried to disconnect
+						  by sending CANCEL */
+					p->pendingbye = 1;
 				p->authtries = 0;
 				/* If I understand this right, the branch is different for a non-200 ACK only */
 				transmit_request(p, "ACK", seqno, 0, 1);