[svn-commits] kharwell: branch 12 r405694 - in /branches/12: ./ configs/ res/

[SVN commits to the Digium repositories]

Author: kharwell
Date: Thu Jan 16 13:06:57 2014
New Revision: 405694

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405694
Log:
res_fax: check_modem_rate() returned incorrect rate for V.27

According to the new standard for V.27 and V.32 they are able to transmit
at a bit rate of 4,800 or 9,600.  The check_mode_rate function needed to be
updated to reflect this.  Also, because of this change the default 'minrate'
value was updated to be 4800.

(closes issue ASTERISK-22790)
Reported by: Paolo Compagnini
Patches:
     res_fax.txt uploaded by looserouting (license 6548)
........

Merged revisions 405656 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 405693 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/UPGRADE.txt
    branches/12/configs/res_fax.conf.sample
    branches/12/res/res_fax.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/12/UPGRADE.txt?view=diff&rev=405694&r1=405693&r2=405694
==============================================================================
--- branches/12/UPGRADE.txt (original)
+++ branches/12/UPGRADE.txt Thu Jan 16 13:06:57 2014
@@ -20,7 +20,6 @@
 === UPGRADE-11.txt  -- Upgrade info for 10 to 11
 ===
 ===========================================================
-
 From 12.0 to 12.1:
 * The per console verbose level feature as previously implemented caused a
   large performance penalty.  The fix required some minor incompatibilities
@@ -46,6 +45,12 @@
    As a result, using the AMI Command action with "core set verbose" could
    again set the root console verbose level and affect the verbose level
    logged.
+
+ - res_fax now returns the correct rates for V.27ter (4800 or 9600 bit/s).
+   Because of this the default settings would not load, so the minrate (minimum
+   transmission rate) option in res_fax.conf was changed to default to 4800
+   since that is the minimum rate for v.27 which is included in the default
+   modem options.
 
 Realtime Configuration:
  * New columns have been added to realtime tables for 'support_path' on

Modified: branches/12/configs/res_fax.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/12/configs/res_fax.conf.sample?view=diff&rev=405694&r1=405693&r2=405694
==============================================================================
--- branches/12/configs/res_fax.conf.sample (original)
+++ branches/12/configs/res_fax.conf.sample Thu Jan 16 13:06:57 2014
@@ -8,8 +8,8 @@
 
 ; Minimum Transmission Rate
 ; Possible values are { 2400 | 4800 | 7200 | 9600 | 12000 | 14400 }
-; Set this value to the minimum desired transfer rate.  Default: 2400
-minrate=2400
+; Set this value to the minimum desired transfer rate.  Default: 4800
+minrate=4800
 
 ; Send Progress/Status events to manager session
 ; Manager events with 'call' class permissions will receive events indicating the

Modified: branches/12/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_fax.c?view=diff&rev=405694&r1=405693&r2=405694
==============================================================================
--- branches/12/res/res_fax.c (original)
+++ branches/12/res/res_fax.c Thu Jan 16 13:06:57 2014
@@ -333,7 +333,7 @@
 };
 static AST_RWLIST_HEAD_STATIC(faxmodules, fax_module);
 
-#define RES_FAX_MINRATE 2400
+#define RES_FAX_MINRATE 4800
 #define RES_FAX_MAXRATE 14400
 #define RES_FAX_STATUSEVENTS 0
 #define RES_FAX_MODEM (AST_FAX_MODEM_V17 | AST_FAX_MODEM_V27 | AST_FAX_MODEM_V29)
@@ -708,7 +708,7 @@
 {
 	switch (rate) {
 	case 2400:
-		if (!(modems & (AST_FAX_MODEM_V27 | AST_FAX_MODEM_V34))) {
+		if (!(modems & (AST_FAX_MODEM_V34))) {
 			return 1;
 		}
 		break;
@@ -718,8 +718,12 @@
 		}
 		break;
 	case 7200:
+		if (!(modems & (AST_FAX_MODEM_V17 | AST_FAX_MODEM_V29 | AST_FAX_MODEM_V34))) {
+			return 1;
+		}
+		break;
 	case 9600:
-		if (!(modems & (AST_FAX_MODEM_V17 | AST_FAX_MODEM_V29 | AST_FAX_MODEM_V34))) {
+		if (!(modems & (AST_FAX_MODEM_V17 | AST_FAX_MODEM_V27 | AST_FAX_MODEM_V29 | AST_FAX_MODEM_V34))) {
 			return 1;
 		}
 		break;