Merged revisions 44819 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44819 | file | 2006-10-10 13:21:44 -0400 (Tue, 10 Oct 2006) | 2 lines

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/trunk@44820 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6e20aff..3d03892 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12405,9 +12405,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 */
@@ -12508,8 +12506,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 */