From 10de040b6e89e7c973c23353d477c5dd465a14df Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 18 Oct 2011 21:15:45 +0000 Subject: More parking issues. * Fix potential deadlocks in SIP and IAX blind transfer to parking. * Fix SIP, IAX, DAHDI analog, and MGCP channel drivers to respect the parkext_exclusive option with transfers (Park(,,,,,exclusive_lot) parameter). Created ast_park_call_exten() and ast_masq_park_call_exten() to maintian API compatibility. * Made masq_park_call() handle a failed ast_channel_masquerade() setup. * Reduced excessive struct parkeduser.peername[] size. ........ Merged revisions 341254 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 341255 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341256 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/sip/include/sip.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'channels/sip/include') diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index fc75ff4fa..c2924b710 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -805,7 +805,8 @@ struct sip_dual { struct ast_channel *chan2; /*!< Second channel involved */ struct sip_request req; /*!< Request that caused the transfer (REFER) */ int seqno; /*!< Sequence number */ - const char *parkexten; + char *park_exten; + char *park_context; }; /*! \brief Parameters to the transmit_invite function */ -- cgit v1.2.3