[asterisk-dev] [Code Review] Fix extension state callback references in chan_sip.

rmudgett reviewboard at asterisk.org
Tue Dec 20 16:00:12 CST 2011

This is an automatically generated e-mail. To reply, visit:

Review request for Asterisk Developers and Matt Jordan.


Fix extension state callback references in chan_sip.

Chan_sip gives a dialog reference to the extension state callback and
assumes that when ast_extension_state_del() returns, the callback cannot
happen anymore.  Chan_sip then reduces the dialog reference count
associated with the callback.  Recent changes (ASTERISK-17760) have
resulted in the potential for the callback to happen after
ast_extension_state_del() has returned.  For chan_sip, this could be very
bad because the dialog pointer could have already been destroyed.

* Added ast_extension_state_add_destroy() so chan_sip can account for the
sip_pvt reference given to the extension state callback when the extension
state callback is deleted.

* Fix pbx.c awkward statecbs handling in ast_extension_state_add_destroy()
and handle_statechange() now that the struct ast_state_cb has a destructor
to call.

* Ensure that ast_extension_state_add_destroy() will never return -1 or 0
for a successful registration.

* Fixed pbx.c statecbs_cmp() to compare the correct information.  The
passed in value to compare is a change_cb function pointer not an object

* Make pbx.c ast_merge_contexts_and_delete() not perform callbacks with
AST_EXTENSION_REMOVED with locks held.  Chan_sip is notorious for
deadlocking when those locks are held during the callback.

* Removed unused lock declaration for the pbx.c store_hints list.

This addresses bug ASTERISK-18844.


  /branches/1.8/channels/chan_sip.c 348734 
  /branches/1.8/include/asterisk/pbx.h 348734 
  /branches/1.8/main/pbx.c 348734 

Diff: https://reviewboard.asterisk.org/r/1635/diff


It compiles and basic call testing only.



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20111220/c89c3c68/attachment.htm>

More information about the asterisk-dev mailing list