[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r319200 - in /team/irroot/dist...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon May 16 12:43:12 2011
New Revision: 319200

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319200
Log:
Changes to res_fax to support REJECTED


Modified:
    team/irroot/distrotech-customers-1.8/   (props changed)
    team/irroot/distrotech-customers-1.8/CHANGES
    team/irroot/distrotech-customers-1.8/res/res_fax.c

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
    automerge = *

Modified: team/irroot/distrotech-customers-1.8/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/CHANGES?view=diff&rev=319200&r1=319199&r2=319200
==============================================================================
--- team/irroot/distrotech-customers-1.8/CHANGES (original)
+++ team/irroot/distrotech-customers-1.8/CHANGES Mon May 16 12:43:12 2011
@@ -77,7 +77,7 @@
    res_stun_monitor module support in chan_sip.
  * Addition of the 'auth_options_requests' option for turning on and off
    authentication for OPTIONS requests in chan_sip.
-
+ * Add T38 support for REJECTED state where T.38 Negotiation is explicitly rejected.
 
 IAX2 Changes
 -----------

Modified: team/irroot/distrotech-customers-1.8/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_fax.c?view=diff&rev=319200&r1=319199&r2=319200
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_fax.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_fax.c Mon May 16 12:43:12 2011
@@ -1085,6 +1085,7 @@
 	case T38_STATE_UNKNOWN:
 		details->caps |= AST_FAX_TECH_T38;
 		break;
+	case T38_STATE_REJECTED:
 	case T38_STATE_UNAVAILABLE:
 		details->caps |= AST_FAX_TECH_AUDIO;
 		/* The T.38 Gateway provides T.38 so if its active T.38 is a valid option*/
@@ -1599,6 +1600,7 @@
 	);
 	struct ast_flags opts = { 0, };
 	struct manager_event_info info;
+	enum ast_t38_state t38state;
 
 	/* initialize output channel variables */
 	pbx_builtin_setvar_helper(chan, "FAXSTATUS", "FAILED");
@@ -1731,7 +1733,8 @@
 		details->option.statusevents = AST_FAX_OPTFLAG_TRUE;
 	}
 
-	if ((ast_channel_get_t38_state(chan) == T38_STATE_UNAVAILABLE) ||
+	t38state = ast_channel_get_t38_state(chan);
+	if ((t38state == T38_STATE_UNAVAILABLE) || (t38state == T38_STATE_REJECTED) ||
 	    ast_test_flag(&opts, OPT_ALLOWAUDIO)) {
 		details->option.allow_audio = AST_FAX_OPTFLAG_TRUE;
 	}
@@ -2069,6 +2072,7 @@
 	);
 	struct ast_flags opts = { 0, };
 	struct manager_event_info info;
+	enum ast_t38_state t38state;
 
 	/* initialize output channel variables */
 	pbx_builtin_setvar_helper(chan, "FAXSTATUS", "FAILED");
@@ -2221,7 +2225,8 @@
 		details->option.statusevents = AST_FAX_OPTFLAG_TRUE;
 	}
 
-	if ((ast_channel_get_t38_state(chan) == T38_STATE_UNAVAILABLE) ||
+	t38state = ast_channel_get_t38_state(chan);
+	if ((t38state == T38_STATE_UNAVAILABLE) || (t38state == T38_STATE_REJECTED) ||
 	    ast_test_flag(&opts, OPT_ALLOWAUDIO)) {
 		details->option.allow_audio = AST_FAX_OPTFLAG_TRUE;
 	}