[asterisk-commits] dvossel: branch 1.6.1 r238638 - in /branches/1.6.1: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Jan  8 13:44:28 2010
New Revision: 238638

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238638
Log:
Merged revisions 238635 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238635 | dvossel | 2010-01-08 13:39:30 -0600 (Fri, 08 Jan 2010) | 22 lines
  
  fixes AUDIOHOOK_INHERIT regression
  
  During the process of removing an audiohook from one channel
  and attaching it to another the audiohook's status is updated
  to DONE and then back to whatever it was previously.  Typically
  updating the status after setting it to DONE is not a good idea
  because DONE can trigger unrecoverable audiohook destruction
  events... because of this a conditional check was added to
  audiohook_update_status to explicitly prevent the audiohook
  from ever changing after being set to DONE.  It was this check
  that prevented audiohook inherit from work properly though.
  
  Now ast_audiohook_move_by_source is treated as a special exception,
  as the audiohook must be returned to its previous status after
  attaching it to the new channel.  This is only a safe operation
  because the audiohook's lock is held the entire time, otherwise
  this could cause trouble.
  
  (closes issue #16522)
  Reported by: corruptor
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/audiohook.h
    branches/1.6.1/main/audiohook.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/include/asterisk/audiohook.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/include/asterisk/audiohook.h?view=diff&rev=238638&r1=238637&r2=238638
==============================================================================
--- branches/1.6.1/include/asterisk/audiohook.h (original)
+++ branches/1.6.1/include/asterisk/audiohook.h Fri Jan  8 13:44:28 2010
@@ -205,6 +205,9 @@
 /*! \brief Update audiohook's status
  * \param audiohook Audiohook structure
  * \param audiohook status enum
+ *
+ * \note once status is updated to DONE, this function can not be used to set the
+ * status back to any other setting.  Setting DONE effectively locks the status as such.
  */
 void ast_audiohook_update_status(struct ast_audiohook *audiohook, enum ast_audiohook_status status);
 

Modified: branches/1.6.1/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/audiohook.c?view=diff&rev=238638&r1=238637&r2=238638
==============================================================================
--- branches/1.6.1/main/audiohook.c (original)
+++ branches/1.6.1/main/audiohook.c Fri Jan  8 13:44:28 2010
@@ -361,7 +361,11 @@
 /*! \brief Update audiohook's status
  * \param audiohook status enum
  * \param audiohook Audiohook structure
- */
+ *
+ * \note once status is updated to DONE, this function can not be used to set the
+ * status back to any other setting.  Setting DONE effectively locks the status as such.
+ */
+
 void ast_audiohook_update_status(struct ast_audiohook *audiohook, enum ast_audiohook_status status)
 {
 	ast_audiohook_lock(audiohook);
@@ -458,6 +462,7 @@
 void ast_audiohook_move_by_source(struct ast_channel *old_chan, struct ast_channel *new_chan, const char *source)
 {
 	struct ast_audiohook *audiohook;
+	enum ast_audiohook_status oldstatus;
 
 	if (!old_chan->audiohooks || !(audiohook = find_audiohook_by_source(old_chan->audiohooks, source))) {
 		return;
@@ -466,11 +471,15 @@
 	/* By locking both channels and the audiohook, we can assure that
 	 * another thread will not have a chance to read the audiohook's status
 	 * as done, even though ast_audiohook_remove signals the trigger
-	 * condition
+	 * condition.
 	 */
 	ast_audiohook_lock(audiohook);
+	oldstatus = audiohook->status;
+
 	ast_audiohook_remove(old_chan, audiohook);
 	ast_audiohook_attach(new_chan, audiohook);
+
+	audiohook->status = oldstatus;
 	ast_audiohook_unlock(audiohook);
 }