diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-10-10 17:23:14 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-10-10 17:23:14 +0000 |
| commit | 832014a91b41a4263098c7fdf1fbb39b11c0d711 (patch) | |
| tree | dffa01f041eaa844a1ab67b84e63b42a51cfff92 /channels | |
| parent | 9ca7c56c7414ea752cd7726b54eef9f15555c791 (diff) | |
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
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 6e20afff3..3d03892f7 100644 --- 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 */ |