[Asterisk-cvs] asterisk/channels chan_sip.c,1.806,1.807

[kpfleming]

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

Modified Files:
	chan_sip.c 
Log Message:
handle BYE instead of CANCEL from callers (issue #4994)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -d -r1.806 -r1.807
--- chan_sip.c	9 Aug 2005 16:41:28 -0000	1.806
+++ chan_sip.c	22 Aug 2005 19:47:00 -0000	1.807
@@ -9339,12 +9339,15 @@
 }
 
 /*--- handle_request_bye: Handle incoming BYE request ---*/
-static int handle_request_bye(struct sip_pvt *p, struct sip_request *req, int debug)
+static int handle_request_bye(struct sip_pvt *p, struct sip_request *req, int debug, int ignore)
 {
 	struct ast_channel *c=NULL;
 	int res;
 	struct ast_channel *bridged_to;
 	char iabuf[INET_ADDRSTRLEN];
+	
+	if (p->pendinginvite && !ast_test_flag(p, SIP_OUTGOING) && !ignore)
+		transmit_response_reliable(p, "487 Request Terminated", &p->initreq, 1);
 
 	copy_request(&p->initreq, req);
 	check_via(p, req);
@@ -9668,7 +9671,7 @@
 		res = handle_request_cancel(p, req, debug, ignore);
 		break;
 	case SIP_BYE:
-		res = handle_request_bye(p, req, debug);
+		res = handle_request_bye(p, req, debug, ignore);
 		break;
 	case SIP_MESSAGE:
 		res = handle_request_message(p, req, debug, ignore);