res_fax: allow 2400 transmission rate according to v.27ter standard

A previous set of patches (see: ASTERISK-22790 & ASTERISK-23231) made it so
a v.27 modem was not allowed to have a minimum transmission rate of 2400 bits
per second. This reverts all or some of those patches since according to the
v.27ter standard a rate of 2400 bits per second is also supported.

One of the original patches also added 9600 bits per second support for v.27.
This patch also removes that since v.27ter only supports 2400/4800 bits per
second.

Also, since Asterisk specifically supports v.27ter the enum was renamed to
better reflect this.

ASTERISK-24955 #close
Reported by: Matt Jordan

Change-Id: I4b9dfb6bf7eff08463ab47ee1a74224f27cae733

diff --git a/include/asterisk/res_fax.h b/include/asterisk/res_fax.h
index 746518b95213b066660331083e8918b2bc954a3f..2304da734d2ad2ba1c88f22acb4528138f1b3149 100644 (file)
--- a/include/asterisk/res_fax.h
+++ b/include/asterisk/res_fax.h
@@ -53,8 +53,8 @@ enum ast_fax_capabilities {
 enum ast_fax_modems {
        /*! V.17 */
        AST_FAX_MODEM_V17 = (1 << 0),
-       /*! V.27 */
-       AST_FAX_MODEM_V27 = (1 << 1),
+       /*! V.27ter */
+       AST_FAX_MODEM_V27TER = (1 << 1),
        /*! V.29 */
        AST_FAX_MODEM_V29 = (1 << 2),
        /*! V.34 */

diff --git a/res/res_fax.c b/res/res_fax.c
index 39cb3b369073322e7db0ee7cef4f0677d0451069..29ec315f759aa0bdd8b81272b8cb6eb85fcffe54 100644 (file)
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -523,7 +523,7 @@ static AST_RWLIST_HEAD_STATIC(faxmodules, fax_module);
 #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)
+#define RES_FAX_MODEM (AST_FAX_MODEM_V17 | AST_FAX_MODEM_V27TER | AST_FAX_MODEM_V29)
 #define RES_FAX_T38TIMEOUT 5000
 
 struct fax_options {
@@ -828,7 +828,7 @@ static int update_modem_bits(enum ast_fax_modems *bits, const char *value)
                if (!strcasecmp(m[j], "v17")) {
                        *bits |= AST_FAX_MODEM_V17;
                } else if (!strcasecmp(m[j], "v27")) {
-                       *bits |= AST_FAX_MODEM_V27;
+                       *bits |= AST_FAX_MODEM_V27TER;
                } else if (!strcasecmp(m[j], "v29")) {
                        *bits |= AST_FAX_MODEM_V29;
                } else if (!strcasecmp(m[j], "v34")) {
@@ -907,7 +907,7 @@ static int ast_fax_modem_to_str(enum ast_fax_modems bits, char *tbuf, size_t buf
                strcat(tbuf, "V17");
                count++;
        }
-       if (bits & AST_FAX_MODEM_V27) {
+       if (bits & AST_FAX_MODEM_V27TER) {
                if (count) {
                        strcat(tbuf, ",");
                }
@@ -936,22 +936,14 @@ static int check_modem_rate(enum ast_fax_modems modems, unsigned int rate)
 {
        switch (rate) {
        case 2400:
-               if (!(modems & (AST_FAX_MODEM_V34))) {
-                       return 1;
-               }
-               break;
        case 4800:
-               if (!(modems & (AST_FAX_MODEM_V27 | AST_FAX_MODEM_V34))) {
+               if (!(modems & (AST_FAX_MODEM_V27TER | AST_FAX_MODEM_V34))) {
                        return 1;
                }
                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_V27 | AST_FAX_MODEM_V29 | AST_FAX_MODEM_V34))) {
+               if (!(modems & (AST_FAX_MODEM_V17 | AST_FAX_MODEM_V29 | AST_FAX_MODEM_V34))) {
                        return 1;
                }
                break;

diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 7a58799f99c61213da4846abe59173b1a4643721..288f91dac098f116cab2344c1c445cba14ca7b19 100644 (file)
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -502,7 +502,7 @@ static int spandsp_modems(struct ast_fax_session_details *details)
        if (AST_FAX_MODEM_V17 & details->modems) {
                modems |= T30_SUPPORT_V17;
        }
-       if (AST_FAX_MODEM_V27 & details->modems) {
+       if (AST_FAX_MODEM_V27TER & details->modems) {
                modems |= T30_SUPPORT_V27TER;
        }
        if (AST_FAX_MODEM_V29 & details->modems) {