From 7b96f3ceadf472281c02090b3517803c0ff97d9d Mon Sep 17 00:00:00 2001 From: oej Date: Wed, 23 Jan 2008 21:07:16 +0000 Subject: Second attempt. Don't change invitestate when receiving 18x messages in CANCEL state. (issue #11736) Reported by: MVF Patch by oej. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@99978 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2ed95f926..1cd25b516 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12042,7 +12042,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru } } if (find_sdp(req)) { - p->invitestate = INV_EARLY_MEDIA; + if (p->invitestate != INV_CANCELLED) + p->invitestate = INV_EARLY_MEDIA; res = process_sdp(p, req); if (!ast_test_flag(req, SIP_PKT_IGNORE) && p->owner) { /* Queue a progress frame only if we have SDP in 180 or 182 */ @@ -12057,7 +12058,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru sip_cancel_destroy(p); /* Ignore 183 Session progress without SDP */ if (find_sdp(req)) { - p->invitestate = INV_EARLY_MEDIA; + if (p->invitestate != INV_CANCELLED) + p->invitestate = INV_EARLY_MEDIA; res = process_sdp(p, req); if (!ast_test_flag(req, SIP_PKT_IGNORE) && p->owner) { /* Queue a progress frame */ -- cgit v1.2.3