diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-10-03 17:47:42 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-10-03 17:47:42 +0000 |
| commit | 0165c5f95aa058b0884f8dec8695237cb0bef186 (patch) | |
| tree | 9ca5505d80e72b574d9dad288351c760764fa8fb /include/asterisk/frame.h | |
| parent | 4967478d180f2a512cfb6ff83fa115aac43978c6 (diff) | |
chan_pjsip: Fix deadlock when masquerading PJSIP channels.
Performing a directed call pickup resulted in a deadlock when PJSIP
channels were involved.
A masquerade needs to hold onto the channel locks while it swaps channel
information between the two channels involved in the masquerade. With
PJSIP channels, the fixup routine needed to push a fixup task onto the
PJSIP channel's serializer. Unfortunately, if the serializer was also
processing a task that needed to lock the channel, you get deadlock.
* Added a new control frame that is used to notify the channels that a
masquerade is about to start and when it has completed.
* Added the ability to query taskprocessors if the current thread is the
taskprocessor thread.
* Added the ability to suspend/unsuspend the PJSIP serializer thread so a
masquerade could fixup the PJSIP channel without using the serializer.
ASTERISK-24356 #close
Reported by: rmudgett
Review: https://reviewboard.asterisk.org/r/4034/
........
Merged revisions 424471 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 424472 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/frame.h')
| -rw-r--r-- | include/asterisk/frame.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index a981c7e72..20f40f863 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -290,6 +290,7 @@ enum ast_control_frame_type { AST_CONTROL_MCID = 31, /*!< Indicate that the caller is being malicious. */ AST_CONTROL_UPDATE_RTP_PEER = 32, /*!< Interrupt the bridge and have it update the peer */ AST_CONTROL_PVT_CAUSE_CODE = 33, /*!< Contains an update to the protocol-specific cause-code stored for branching dials */ + AST_CONTROL_MASQUERADE_NOTIFY = 34, /*!< A masquerade is about to begin/end. (Never sent as a frame but directly with ast_indicate_data().) */ /* * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING |