From: David Vossel <dvossel@digium.com>
Date: Wed, 26 May 2010 18:37:11 +0000 (+0000)
Subject: Merged revisions 266006 via svnmerge from
X-Git-Tag: 1.6.2.9-rc1~2^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fda8817a9324a1519a649fd3f9381e930806d4f;p=thirdparty%2Fasterisk.git

Merged revisions 266006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r266006 | dvossel | 2010-05-26 13:32:51 -0500 (Wed, 26 May 2010) | 8 lines

  fixes failed SIP Directed pickup resulting in dead channel

  (closes issue #17339)
  Reported by: one47
  Patches:
        sip_magic_pickup2 uploaded by one47 (license 23)
  Tested by: one47, dvossel
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f7af488827..cb7cf3caf0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -20321,6 +20321,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
 
 			/* Let the caller know we're giving it a shot */
 			transmit_response(p, "100 Trying", req);
+			p->invitestate = INV_PROCEEDING;
 			ast_setstate(c, AST_STATE_RING);
 
 			/* Do the pickup itself */