[svn-commits] file: branch 1.6.2 r235522 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Dec 17 17:22:01 2009
New Revision: 235522

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

........
  r235521 | file | 2009-12-17 19:21:07 -0400 (Thu, 17 Dec 2009) | 3 lines
  
  Remove some old code for going to the 'fax' extension when a T.38 switchover occurs. This would have
  already happened when we detected the CNG tone so this was basically a noop.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_sip.c

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

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=235522&r1=235521&r2=235522
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Thu Dec 17 17:22:01 2009
@@ -5054,28 +5054,6 @@
 	/* Woot we got a message, create a control frame and send it on! */
 	if (parameters.request_response)
 		ast_queue_control_data(chan, AST_CONTROL_T38_PARAMETERS, &parameters, sizeof(parameters));
-
-	if (ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT) && !p->outgoing_call) {
-		/* fax detection is enabled and this is an incoming call */
-		ast_channel_lock(chan);
-		if (strcmp(chan->exten, "fax") && state == T38_ENABLED) {
-			const char *target_context = S_OR(chan->macrocontext, chan->context);
-			ast_channel_unlock(chan);
-			if (ast_exists_extension(chan, target_context, "fax", 1, chan->cid.cid_num)) {
-				/* save the DID/DNIS when we transfer the fax call to a 'fax' extension */
-				ast_verb(3, "Redirecting '%s' to fax extension\n", chan->name);
-				pbx_builtin_setvar_helper(chan, "FAXEXTEN", chan->exten);
-				if (ast_async_goto(chan, target_context, "fax", 1)) {
-					ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", chan->name, target_context);
-				}
-			} else {
-				ast_log(LOG_NOTICE, "Fax detected but no fax extension.\n");
-			}
-		} else {
-			ast_channel_unlock(chan);
-			ast_debug(1, "Already in a fax extension (or T38 was not enabled, state: '%d'), not redirecting.\n", state);
-		}
-	}
 }
 
 /*! \brief Set the global T38 capabilities on a SIP dialog structure */