FPzzz tests work again

diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index 375891aaf011596a78bdb9a0346a34870cd9d273..134fa601f0c4a40b01484c17cd680b5132e7ce62 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -280,7 +280,17 @@ static void alarm_handler(int sig _U_)
     }
 
     dsi->tickle++;
-    LOG(log_note, logtype_afpd, "afp_alarm: tickle count: %i", dsi->tickle);
+    LOG(log_maxdebug, logtype_afpd, "alarm: tickles: %u, flags: %s|%s|%s|%s|%s|%s|%s|%s|%s",
+        dsi->tickle,
+        (dsi->flags & DSI_DATA) ?         "DSI_DATA" : "-",
+        (dsi->flags & DSI_RUNNING) ?      "DSI_RUNNING" : "-",
+        (dsi->flags & DSI_SLEEPING) ?     "DSI_SLEEPING" : "-",
+        (dsi->flags & DSI_EXTSLEEP) ?     "DSI_EXTSLEEP" : "-",
+        (dsi->flags & DSI_DISCONNECTED) ? "DSI_DISCONNECTED" : "-",
+        (dsi->flags & DSI_DIE) ?          "DSI_DIE" : "-",
+        (dsi->flags & DSI_NOREPLY) ?      "DSI_NOREPLY" : "-",
+        (dsi->flags & DSI_RECONSOCKET) ?  "DSI_RECONSOCKET" : "-",
+        (dsi->flags & DSI_RECONINPROG) ?  "DSI_RECONINPROG" : "-");
 
     if (dsi->flags & DSI_SLEEPING) {
         if (dsi->tickle > AFPobj->options.sleep) {
@@ -485,7 +495,8 @@ void afp_over_dsi(AFPObj *obj)
             }
         }
 
-        if (!dsi->flags & DSI_EXTSLEEP) {
+        if (!(dsi->flags & DSI_EXTSLEEP)) {
+            LOG(log_debug, logtype_afpd, "afp_over_dsi: got data, ending normal sleep");
             dsi->flags &= ~DSI_SLEEPING;
             dsi->tickle = 0;
         }

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index f6082fad16f0f51270bea2b54ff119d72bc7db49..cd2f73f3cfb7a384df8e7dc9f0ca8154eabba3af 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -456,13 +456,19 @@ int afp_zzz(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbu
 
     if (data & AFPZZZ_EXT_WAKEUP) {
         /* wakeup request from exetended sleep */
-        if (dsi->flags & DSI_EXTSLEEP)
+        if (dsi->flags & DSI_EXTSLEEP) {
+            LOG(log_debug, logtype_afpd, "afp_zzz: waking up from extended sleep");
             dsi->flags &= ~(DSI_SLEEPING | DSI_EXTSLEEP);
+        }
     } else {
         /* sleep request */
         dsi->flags |= DSI_SLEEPING;
-        if (data & AFPZZZ_EXT_SLEEP)
+        if (data & AFPZZZ_EXT_SLEEP) {
+            LOG(log_debug, logtype_afpd, "afp_zzz: entering extended sleep");
             dsi->flags |= DSI_EXTSLEEP;
+        } else {
+            LOG(log_debug, logtype_afpd, "afp_zzz: entering normal sleep");
+        }
     }
     /*
      * According to AFP 3.3 spec we should not return anything,