Bug 701: change Class1TCFResponseDelay to Class1SwitchingCmd

diff --git a/CHANGES b/CHANGES
index 8606d26edbeb5a8a4c9765b708f60ee8c789d37a..f315c7e0cfd1c5a3d5fdee6689642b6afcbb5284 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* replace Class1TCFResponseDelay with Class1SwitchingCmd (20 Oct 2005)
 * disable client programs from looking for UNIX socket
   when the CONFIG_UNIXTRANSPORT is not enabled (20 Oct 2005)
 * improve security technique when creating temporary files (20 Oct 2005)

diff --git a/config/class1 b/config/class1
index 405838434289bf26c0d64a2ef4a70803f92d4771..cb6a7d4c194e79871090130fb04fac4eb1302c88 100644 (file)
--- a/config/class1
+++ b/config/class1
@@ -112,7 +112,6 @@ Class1Cmd:          AT+FCLASS=1     # command to enter class 1
 Class1PPMWaitCmd:      AT+FTS=7        # command to stop and wait before PPM
 Class1TCFWaitCmd:      AT+FTS=7        # command to stop and wait before TCF
 Class1EOPWaitCmd:      AT+FTS=9        # command to stop and wait before EOP
-Class1TCFResponseDelay:        75              # 75ms delay between recv TCF & response
 Class1SendMsgDelay:    200             # 75ms delay after training
 Class1SwitchingCmd:    AT+FRS=7        # silence between HDLC recv and trans
 Class1TrainingRecovery:        1500            # 1.5sec delay after training failure

diff --git a/config/class1.0 b/config/class1.0
index 20ed65b110260bae327d63b90fed9bdbb1016a7d..fc08f5d5d2f808aaaa1f7607c82b0740fb1f54d4 100644 (file)
--- a/config/class1.0
+++ b/config/class1.0
@@ -114,7 +114,6 @@ Class1Cmd:          AT+FCLASS=1.0   # command to enter class 1.0
 Class1PPMWaitCmd:      AT+FTS=7        # command to stop and wait before PPM
 Class1TCFWaitCmd:      AT+FTS=7        # command to stop and wait before TCF
 Class1EOPWaitCmd:      AT+FTS=9        # command to stop and wait before EOP
-Class1TCFResponseDelay:        75              # 75ms delay between recv TCF & response
 Class1SendMsgDelay:    200             # 75ms delay after training
 Class1SwitchingDelay:  75              # 150ms delay in switching transmission direction
 Class1TrainingRecovery:        1500            # 1.5sec delay after training failure

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index baac2c460ebed6fd3a04704b4684c74b9aa14a5a..d9f7f353378a37fdf66ad8d2bc99492c59460f12 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -1339,7 +1339,6 @@ Class1Parameters="
     Class1TCFMaxNonZero
     Class1TCFMinRun
     Class1TCFRecvTimeout
-    Class1TCFResponseDelay
     Class1TrainingRecovery
 "
 Class2Parameters="
@@ -1608,7 +1607,6 @@ AT        Class1EOPWaitCmd        \
 #      Class1SwitchingCmd      \
        Command to ensure silence after receiving HDLC and before sending
 #      Class1TCFRecvTimeout    Timeout for receiving TCF (ms)
-#      Class1TCFResponseDelay  Delay before sending DCS and TCF (ms)
 #      Class1TrainingRecovery  Delay after failed training (ms)
 EOF
        ;;

diff --git a/faxd/Class1Recv.c++ b/faxd/Class1Recv.c++
index 2c44ee414d1ad5a4716338d3e495dc62ec238cd3..f6aee577eb732abd3195f35871b1d4b6dcaba887 100644 (file)
--- a/faxd/Class1Recv.c++
+++ b/faxd/Class1Recv.c++
@@ -408,7 +408,7 @@ Class1Modem::recvTraining()
      * Send training response; we follow the spec
      * by delaying 75ms before switching carriers.
      */
-    pause(conf.class1TCFResponseDelay);
+    if (!atCmd(conf.class1SwitchingCmd, AT_OK)) return (false);
     if (ok) {
        /*
         * Send CFR later so that we can cancel

diff --git a/faxd/ModemConfig.c++ b/faxd/ModemConfig.c++
index 480bf0a08bfe3bc932b73598f0881901776b13cd..fa922c630bb49c8c463c6943cd4d7aa624021f32 100644 (file)
--- a/faxd/ModemConfig.c++
+++ b/faxd/ModemConfig.c++
@@ -199,7 +199,6 @@ static struct {
 { "modemringsbeforeresponse",  &ModemConfig::ringsBeforeResponse,   0 },
 { "modemsoftresetcmddelay",    &ModemConfig::softResetCmdDelay,     3000 },
 { "class1tcfrecvtimeout",      &ModemConfig::class1TCFRecvTimeout,  4500 },
-{ "class1tcfresponsedelay",    &ModemConfig::class1TCFResponseDelay,75 },
 { "class1sendmsgdelay",                &ModemConfig::class1SendMsgDelay,    200 },
 { "class1trainingrecovery",    &ModemConfig::class1TrainingRecovery,1500 },
 { "class1recvabortok",         &ModemConfig::class1RecvAbortOK,     200 },

diff --git a/faxd/ModemConfig.h b/faxd/ModemConfig.h
index c6e4cd755b5f711f68c9d7ae2e8222b97756d730..54f8a2f5dfe4f513ab3da8cee5f3b795bc6c40fb 100644 (file)
--- a/faxd/ModemConfig.h
+++ b/faxd/ModemConfig.h
@@ -150,7 +150,6 @@ public:
     fxStr      class1SwitchingCmd;     // after recv HDLC and before sending
     fxStr      class1MsgRecvHackCmd;   // cmd to avoid +FCERROR before image
     u_int      class1TCFRecvTimeout;   // timeout receiving TCF
-    u_int      class1TCFResponseDelay; // delay (ms) btwn TCF & ack/nak
     u_int      class1SendMsgDelay;     // delay (ms) after training
     u_int      class1TrainingRecovery; // delay (ms) after failed training
     u_int      class1RecvAbortOK;      // if non-zero, OK sent after recv abort

diff --git a/man/hylafax-config.4f b/man/hylafax-config.4f
index 54fd74a3b228d6b8edac72a5ae62e49fe9481925..719ecbdb17ec2f71c8c8d4ad4d9dfad37872317b 100644 (file)
--- a/man/hylafax-config.4f
+++ b/man/hylafax-config.4f
@@ -306,7 +306,6 @@ Class1TCFMaxNonZero integer \s-110\s+1      Class 1/1.0: max% of non-zero data in goo
 Class1TCFMinRun        integer \s-11000\s+1    Class 1/1.0: minimum zero run in good \s-1TCF\s+1
 Class1TCFRecvHack      boolean \s-1No\s+1      Class 1/1.0: deliberately look for carrier loss before TCF
 Class1TCFRecvTimeout   integer \s-14500\s+1    Class 1/1.0: max wait (ms) for \s-1TCF\s+1
-Class1TCFResponseDelay integer \s-175\s+1      Class 1/1.0: delay between \s-1TCF\s+1 and ack/nak
 Class1TMConnectDelay   integer \s-10\s+1       Class 1/1.0: delay between +FTM CONNECT and data transmission
 Class1SendMsgDelay     integer \s-1200\s+1     Class 1/1.0: delay before sending image data
 Class1SwitchingCmd     string  \s-1AT+FRS=7\s+1        Class 1/1.0: command to ensure silence after HDLC reception
@@ -2485,12 +2484,6 @@ the Training Check (\c
 ) message data that is received during the
 training phase of the facsimile reception protocol.
 .TP
-.B Class1TCFResponseDelay
-The time, in milliseconds, to delay between receiving
-.SM TCF
-and sending a response on the v.21 carrier to indicate whether or not
-training was successful.
-.TP
 .B Class1TMConnectDelay
 The time, in milliseconds, to delay after receiving CONNECT following +FTM
 before sending image data.  T.31 8.3.3 requires the modem to respond with