[Asterisk-cvs] asterisk/channels chan_sip.c,1.846,1.847

[twisted]

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

Modified Files:
	chan_sip.c 
Log Message:
don't send a 200 ACK before a 404 on invalid subscriptions (Bug #5198)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -d -r1.846 -r1.847
--- chan_sip.c	9 Sep 2005 19:54:34 -0000	1.846
+++ chan_sip.c	13 Sep 2005 01:38:00 -0000	1.847
@@ -10213,7 +10213,6 @@
 		}
 		if (sipdebug || option_debug > 1)
 			ast_log(LOG_DEBUG, "Adding subscription for extension %s context %s for peer %s\n", p->exten, p->context, p->username);
-		transmit_response(p, "200 OK", req);
 		if (p->autokillid > -1)
 			sip_cancel_destroy(p);	/* Remove subscription expiry for renewals */
 		sip_scheddestroy(p, (p->expiry + 10) * 1000);	/* Set timer for destruction of call at expiration */
@@ -10224,6 +10223,7 @@
 			ast_set_flag(p, SIP_NEEDDESTROY);	
 			return 0;
 		} else {
+			transmit_response(p, "200 OK", req);
 			transmit_state_notify(p, firststate, 1, 1);	/* Send first notification */
 			append_history(p, "Subscribestatus", ast_extension_state2str(firststate));
 		}