[Asterisk-code-review] res fax: allow 2400 transmission rate according to v.27bis/t... (asterisk[11])

[Kevin Harwell]

Kevin Harwell has uploaded a new change for review.

  https://gerrit.asterisk.org/294

Change subject: res_fax: allow 2400 transmission rate according to v.27bis/ter standards
......................................................................

res_fax: allow 2400 transmission rate according to v.27bis/ter standards

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.27bis and v.27ter standards a rate of 2400 bits per second is supported.

ASTERISK-24955 #close
Reported by: Matt Jordan

Change-Id: I4b9dfb6bf7eff08463ab47ee1a74224f27cae733
---
M res/res_fax.c
1 file changed, 1 insertion(+), 16 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/94/294/1

diff --git a/res/res_fax.c b/res/res_fax.c
index 2b2c2fb..b498869 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -711,22 +711,14 @@
 {
 	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))) {
 			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;
@@ -3919,13 +3911,6 @@
 		ast_log(LOG_ERROR, "maxrate %u is less than minrate %u\n", options.maxrate, options.minrate);
 		res = -1;
 		goto end;
-	}
-
-	if (options.minrate == 2400 && (options.modems & AST_FAX_MODEM_V27) && !(options.modems & (AST_FAX_MODEM_V34))) {
-		ast_fax_modem_to_str(options.modems, modems, sizeof(modems));
-		ast_log(LOG_WARNING, "'modems' setting '%s' is no longer accepted with 'minrate' setting %u\n", modems, options.minrate);
-		ast_log(LOG_WARNING, "'minrate' has been reset to 4800, please update res_fax.conf.\n");
-		options.minrate = 4800;
 	}
 
 	if (check_modem_rate(options.modems, options.minrate)) {

-- 
To view, visit https://gerrit.asterisk.org/294
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b9dfb6bf7eff08463ab47ee1a74224f27cae733
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 11
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>