[svn-commits] jpeeler: trunk r249538 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Mar  1 11:11:31 2010
New Revision: 249538

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249538
Log:
Merged revisions 249536 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r249536 | jpeeler | 2010-03-01 11:02:03 -0600 (Mon, 01 Mar 2010) | 11 lines
  
  Modify queued frames from local channels to not set the other side to up
  
  In this case, attended transfers were broken due to ast_feature_request_and_dial
  detecting the channel being set to up before the answer frame could be read and
  therefore failing to mark the channel as ready. This fix is a regression fix for
  244785, which should continue to work properly as well.
  
  (closes issue #16816)
  Reported by: jamhed
  Tested by: jamhed, corruptor
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_local.c?view=diff&rev=249538&r1=249537&r2=249538
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Mon Mar  1 11:11:31 2010
@@ -257,44 +257,8 @@
 	}
 
 	if (other) {
-		if (f->frametype == AST_FRAME_CONTROL) {
-			switch (f->subclass.integer) {
-			case AST_CONTROL_RINGING:
-				ast_setstate(other, AST_STATE_RINGING);
-				break;
-			case AST_CONTROL_ANSWER:
-				ast_setstate(other, AST_STATE_UP);
-				break;
-			case AST_CONTROL_BUSY:
-				ast_setstate(other, AST_STATE_BUSY);
-				break;
-
-			/* not going to handle these */
-			case AST_CONTROL_HANGUP:
-			case AST_CONTROL_RING:
-			case AST_CONTROL_TAKEOFFHOOK:
-			case AST_CONTROL_OFFHOOK:
-			case AST_CONTROL_CONGESTION:
-			case AST_CONTROL_FLASH:
-			case AST_CONTROL_WINK:
-			case AST_CONTROL_OPTION:
-			case AST_CONTROL_RADIO_KEY:
-			case AST_CONTROL_RADIO_UNKEY:
-			case AST_CONTROL_PROGRESS:
-			case AST_CONTROL_PROCEEDING:
-			case AST_CONTROL_HOLD:
-			case AST_CONTROL_UNHOLD:
-			case AST_CONTROL_VIDUPDATE:
-			case AST_CONTROL_SRCUPDATE:
-			case AST_CONTROL_TRANSFER:
-			case AST_CONTROL_CONNECTED_LINE:
-			case AST_CONTROL_REDIRECTING:
-			case AST_CONTROL_T38_PARAMETERS:
-				break;
-			default:
-				/* since we're switching on an int, we can't rely on the compiler */
-				ast_log(LOG_WARNING, "New unhandled control frame added!!!\n");
-			}
+		if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_RINGING) {
+			ast_setstate(other, AST_STATE_RINGING);
 		}
 		ast_queue_frame(other, f);
 		ast_channel_unlock(other);