[asterisk-commits] file: trunk r81210 - /trunk/res/res_features.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Aug 28 09:37:09 2007
New Revision: 81210

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81210
Log:
(closes issue #10579)
Reported by: ornati
Make sure the called channel during the attended transfer process becomes associated with the calling channel so that the ast_waitfor_* call works properly under epoll.

Modified:
    trunk/res/res_features.c

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=81210&r1=81209&r2=81210
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Aug 28 09:37:09 2007
@@ -1578,6 +1578,9 @@
 			x = 0;
 			started = ast_tvnow();
 			to = timeout;
+
+			ast_poll_channel_add(caller, chan);
+
 			while (!((transferee && ast_check_hangup(transferee)) && (!igncallerstate && ast_check_hangup(caller))) && timeout && (chan->_state != AST_STATE_UP)) {
 				struct ast_frame *f = NULL;
 
@@ -1665,6 +1668,9 @@
 				if (f)
 					ast_frfree(f);
 			} /* end while */
+
+			ast_poll_channel_del(caller, chan);
+
 		} else
 			ast_log(LOG_NOTICE, "Unable to call channel %s/%s\n", type, (char *)data);
 	} else {