From: Joshua Colp <jcolp@digium.com>
Date: Tue, 10 Oct 2006 17:21:44 +0000 (+0000)
Subject: Move some stuff around so that a NOTIFY dialog won't hang around until the end of... 
X-Git-Tag: 1.4.0-beta3~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0dbc80f61c5cbc98ca4319092ad89e702c52e21;p=thirdparty%2Fasterisk.git

Move some stuff around so that a NOTIFY dialog won't hang around until the end of the world under certain circumstances


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6c10416b2a..812071b4a0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12455,9 +12455,7 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str
 		/* We don't understand this event. */
 		/* Here's room to implement incoming voicemail notifications :-) */
 		transmit_response(p, "489 Bad event", req);
-		if (!p->lastinvite) 
-			sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-		return -1;
+		res = -1;
 	} else {
 		/* Save nesting depth for now, since there might be other events we will
 			support in the future */
@@ -12558,8 +12556,12 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str
 		
 		/* Confirm that we received this packet */
 		transmit_response(p, "200 OK", req);
-		return res;
 	};
+
+	if (!p->lastinvite)
+		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+
+	return res;
 }
 
 /*! \brief Handle incoming OPTIONS request */