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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@405694 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 1b94f4912281c5f60976e7665f2ff2bc1af49ddc..7d0e9fca247645ceee84e280eaf538cd3200d1b8 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -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
@@ -47,6 +46,12 @@ Configuration Files:
    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
    ps_registrations and ps_aors and for 'path' on ps_contacts for the new

diff --git a/configs/res_fax.conf.sample b/configs/res_fax.conf.sample
index 19933e39d196b7a63b53f286059abeba37c12907..47ea35e04453578577f4a4e3b0094cf7cb5dcc78 100644 (file)
--- a/configs/res_fax.conf.sample
+++ b/configs/res_fax.conf.sample
@@ -8,8 +8,8 @@ maxrate=14400
 
 ; 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

diff --git a/res/res_fax.c b/res/res_fax.c
index 76fe0ca9813de27e71914dc528ad4b4d31ec1318..c4e64cd7176a6875a9862ae6454819aa6649c58b 100644 (file)
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -333,7 +333,7 @@ struct fax_module {
 };
 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 @@ static int check_modem_rate(enum ast_fax_modems modems, unsigned int rate)
 {
        switch (rate) {
        case 2400:
-               if (!(modems & (AST_FAX_MODEM_V27 | AST_FAX_MODEM_V34))) {
+               if (!(modems & (AST_FAX_MODEM_V34))) {
                        return 1;
                }
                break;
@@ -718,11 +718,15 @@ static int check_modem_rate(enum ast_fax_modems modems, unsigned int rate)
                }
                break;
        case 7200:
-       case 9600:
                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_V27 | AST_FAX_MODEM_V29 | AST_FAX_MODEM_V34))) {
+                       return 1;
+               }
+               break;
        case 12000:
        case 14400:
                if (!(modems & (AST_FAX_MODEM_V17 | AST_FAX_MODEM_V34))) {