Page sent protocol trace fixes

If skipped pages are not counted, make sure to not trace skipped pages as
faxed and to use the same page number for sent pages as in the tagline.
(cherry picked from commit 9ffba03b5ba4f41999b6231c6a1850ccffcad8aa)

diff --git a/faxd/FaxSend.c++ b/faxd/FaxSend.c++
index c5e97c3af46e6f762eed555a2af9dcb8f8f0dd71..0c94942b51b0230b57940b3168fd60f69d758ea1 100644 (file)
--- a/faxd/FaxSend.c++
+++ b/faxd/FaxSend.c++
@@ -898,17 +898,24 @@ FaxServer::notifyPageSent(FaxRequest& req, const char*, PageType pt)
     }
     req.writeQFile();                  // update q file for clients
     u_short tpages = req.totpages;
+    u_short npages = req.npages;
+
     if (! modem->isCountingSkippedPages() )
+    {
        tpages -= req.skippages;
+       npages -= req.nskip;
+    }
 
-    traceProtocol("SEND FAX (%s): FROM %s TO %s (page %u of %u sent in %s)"
-       , (const char*) req.commid
-       , (const char*) req.mailaddr
-       , (const char*) req.external
-       , req.npages
-       , tpages
-       , fmtTime(now - pageStart)
-    );
+    if (pt != FaxModem::PAGE_SKIP || modem->isCountingSkippedPages())
+       traceProtocol("SEND FAX (%s): FROM %s TO %s (page %u of %u[%u,%u,%u,%u]  sent in %s)"
+           , (const char*) req.commid
+           , (const char*) req.mailaddr
+           , (const char*) req.external
+           , npages
+           , tpages
+           , req.npages, req.totpages, req.nskip, req.skippages
+           , fmtTime(now - pageStart)
+       );
     pageStart = now;                   // for next page
 }