[hylafax-devel] [Bug 358] FaxGetty missing action on the device

Now faxq sends faxgetty to LOCKWAIT after locking device for outgoing faxes,
so that the modem is certain to be reset after transmission

diff --git a/faxd/Modem.c++ b/faxd/Modem.c++
index 795b6c7e3d524c92d10190dd00ad05026653287c..72c128868c0e4d42addefc893420c99e6ba086b7 100644 (file)
--- a/faxd/Modem.c++
+++ b/faxd/Modem.c++
@@ -221,6 +221,7 @@ Modem::assign(Job& job)
     if (lock->lock()) {                // lock modem for use
        state = BUSY;           // mark in use
        job.modem = this;       // assign modem to job
+       send("L", 2, false);
        return (true);
     } else {
        /*

diff --git a/faxd/faxGettyApp.c++ b/faxd/faxGettyApp.c++
index 913f180b34a27e266da1d04e83f133a0d679b010..5fa20f2b7911ba8343213822e8f9d3e591ba12f0 100644 (file)
--- a/faxd/faxGettyApp.c++
+++ b/faxd/faxGettyApp.c++
@@ -814,6 +814,11 @@ faxGettyApp::FIFOMessage(const char* cp)
        traceServer("STATE \"%s\"", cp+1);
        setConfigItem("modemreadystate", cp+1);
        break;
+    case 'L':                          // set modem ready state
+       traceServer("LOCKWAIT");
+       discardModem(false);
+       changeState(LOCKWAIT, pollLockWait);
+       break;
     case 'Z':                          // abort send/receive
        FaxServer::abortSession();
        break;

diff --git a/man/Makefile.in b/man/Makefile.in
index ca70d82e7ae6c87b47f11b4ea5316672a613f8e5..710c51f6ddaab565db20cac177cae84a28557125 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -77,6 +77,7 @@ MANSAPP=sman.apps/cqtest.1m   \
        sman.apps/faxq.1m       \
        sman.apps/faxqclean.1m  \
        sman.apps/faxquit.1m    \
+       sman.apps/faxlock.1m    \
        sman.apps/faxrcvd.1m    \
        sman.apps/faxsend.1m    \
        sman.apps/faxsetup.1m   \
@@ -171,6 +172,7 @@ sman.apps/faxmodem.1m::     ${SRCDIR}/faxmodem.1m;  ${MANCVT}
 sman.apps/faxq.1m::    ${SRCDIR}/faxq.1m;      ${MANCVT}
 sman.apps/faxqclean.1m::${SRCDIR}/faxqclean.1m;        ${MANCVT}
 sman.apps/faxquit.1m:: ${SRCDIR}/faxquit.1m;   ${MANCVT}
+sman.apps/faxlock.1m:: ${SRCDIR}/faxlock.1m;   ${MANCVT}
 sman.apps/faxrcvd.1m:: ${SRCDIR}/faxrcvd.1m;   ${MANCVT}
 sman.apps/faxsend.1m:: ${SRCDIR}/faxsend.1m;   ${MANCVT}
 sman.apps/faxsetup.1m::        ${SRCDIR}/faxsetup.1m;  ${MANCVT}

diff --git a/man/faxgetty.1m b/man/faxgetty.1m
index 2530a8649c206734c0ce01a3383be1e71106020b..281ac42e1703804f040bf6b4903b2d3990aa1896 100644 (file)
--- a/man/faxgetty.1m
+++ b/man/faxgetty.1m
@@ -144,6 +144,7 @@ for a complete discussion of the structure and
 content of the spooling area.
 .SH "SEE ALSO"
 .IR faxabort (${MANNUM1_8}),
+.IR faxlock (${MANNUM1_8}),
 .IR faxanswer (${MANNUM1_8}),
 .IR faxconfig (${MANNUM1_8}),
 .IR faxstate (${MANNUM1_8}),

diff --git a/util/Makefile.in b/util/Makefile.in
index f734a237064998732d8fe6749035b69ff74516d8..c8c890817f21374d86dc2f98e3d0b9e565e68297 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -167,7 +167,7 @@ install: installClient
        ${PUTSBIN} -m 755 -O faxmsg faxadduser faxconfig faxdeluser faxmodem \
         faxstate faxwatch faxinfo tiffcheck
        ${PUTSBIN} -idb ${PRODUCT}.sw.server \
-           -ln ${SBIN}/faxmsg -O faxabort faxanswer faxquit
+           -ln ${SBIN}/faxmsg -O faxabort faxanswer faxquit faxlock
        ${PUTSBIN} -m 755 -O dialtest typetest
        ${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
        ${PUTSBIN} -m 755 -src recvstats.sh -O recvstats

diff --git a/util/faxmsg.c b/util/faxmsg.c
index 56e65491d9121a7721b1e25206ae63911d9c0512..746685278ccbb67679337474cc11a76bf9949713 100644 (file)
--- a/util/faxmsg.c
+++ b/util/faxmsg.c
@@ -93,6 +93,11 @@ main(int argc, char** argv)
        usage = "[-q queue-dir] modem";
        cmdfmt = "Z";
        modemRequired = 1;
+    } else if (strcmp(appname, "faxlock") == 0) {
+       opts = "q:";
+       usage = "[-q queue-dir] modem";
+       cmdfmt = "L";
+       modemRequired = 1;
     } else {
        fatal("Unrecognized command name %s", appname);
     }