Merge master

[netatalk.git] / etc / afpd / afp_dsi.c

diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index d030d72570ac36571080239f6f3d4325dac2f198..2766514b96933941820c6836a6ed906dfcd9233e 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -39,11 +39,6 @@
 #include "fork.h"
 #include "dircache.h"
 
-#ifdef FORCE_UIDGID
-#warning UIDGID
-#include "uid.h"
-#endif /* FORCE_UIDGID */
-
 /* 
  * We generally pass this from afp_over_dsi to all afp_* funcs, so it should already be
  * available everywhere. Unfortunately some funcs (eg acltoownermode) need acces to it
@@ -106,16 +101,6 @@ static void afp_dsi_close(AFPObj *obj)
 static void afp_dsi_die(int sig)
 {
     DSI *dsi = (DSI *)AFPobj->handle;
-    static volatile int in_handler;
-    
-    if (in_handler) {
-       return;
-    }
-    /* it's not atomic but we don't care because it's an exit function
-     * ie if a signal is received here, between the test and the affectation,
-     * it will not return.
-    */
-    in_handler = 1;
 
     if (dsi->flags & DSI_RECONINPROG) {
         /* Primary reconnect succeeded, got SIGTERM from afpd parent */
@@ -123,6 +108,11 @@ static void afp_dsi_die(int sig)
         return; /* this returns to afp_disconnect */
     }
 
+    if (dsi->flags & DSI_DISCONNECTED) {
+        LOG(log_note, logtype_afpd, "Disconnected session terminating");
+        exit(0);
+    }
+
     dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN);
     afp_dsi_close(AFPobj);
     if (sig) /* if no signal, assume dieing because logins are disabled &
@@ -136,6 +126,7 @@ static void afp_dsi_die(int sig)
     }
 }
 
+/* SIGURG handler (primary reconnect) */
 static void afp_dsi_transfer_session(int sig _U_)
 {
     uint16_t dsiID;
@@ -159,9 +150,10 @@ static void afp_dsi_transfer_session(int sig _U_)
     LOG(log_note, logtype_afpd, "afp_dsi_transfer_session: received socket fd: %i", socket);
 
     dsi->socket = socket;
-    dsi->flags |= DSI_RECONSOCKET;
-    dsi->flags &= ~DSI_DISCONNECTED;
+    dsi->flags = DSI_RECONSOCKET;
     dsi->datalen = 0;
+    dsi->eof = dsi->start = dsi->buffer;
+    dsi->in_write = 0;
     dsi->header.dsi_requestID = dsiID;
     dsi->header.dsi_command = DSIFUNC_CMD;
 
@@ -184,12 +176,6 @@ static void afp_dsi_transfer_session(int sig _U_)
     siglongjmp(recon_jmp, 1);
 }
 
-/* */
-static void afp_dsi_sleep(void)
-{
-    dsi_sleep(AFPobj->handle, 1);
-}
-
 /* ------------------- */
 static void afp_dsi_timedown(int sig _U_)
 {
@@ -276,14 +262,24 @@ static void alarm_handler(int sig _U_)
     /* we got some traffic from the client since the previous timer tick. */
     if ((dsi->flags & DSI_DATA)) {
         dsi->flags &= ~DSI_DATA;
-        dsi->flags &= ~DSI_DISCONNECTED;
-       return;
+        return;
     }
 
     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) {
+        if (dsi->tickle > AFPobj->options.sleep) {
             LOG(log_error, logtype_afpd, "afp_alarm: sleep time ended");
             afp_dsi_die(EXITERR_CLNT);
         }
@@ -299,8 +295,9 @@ static void alarm_handler(int sig _U_)
     }
 
     /* if we're in the midst of processing something, don't die. */        
-    if ( !(dsi->flags & DSI_RUNNING) && (dsi->tickle > AFPobj->options.timeout)) {
+    if ( !(dsi->flags & DSI_RUNNING) && (dsi->tickle >= AFPobj->options.timeout)) {
         LOG(log_error, logtype_afpd, "afp_alarm: child timed out, entering disconnected state");
+        dsi->proto_close(dsi);
         dsi->flags |= DSI_DISCONNECTED;
         return;
     }
@@ -352,7 +349,6 @@ void afp_over_dsi(AFPObj *obj)
     obj->exit = afp_dsi_die;
     obj->reply = (int (*)()) dsi_cmdreply;
     obj->attention = (int (*)(void *, AFPUserBytes)) dsi_attention;
-    obj->sleep = afp_dsi_sleep;
     dsi->tickle = 0;
 
     memset(&action, 0, sizeof(action));
@@ -457,15 +453,15 @@ void afp_over_dsi(AFPObj *obj)
 
     /* get stuck here until the end */
     while (1) {
-        if (sigsetjmp(recon_jmp, 1) != 0) {
-            LOG(log_note, logtype_afpd, "Resuming operation after succesfull primary reconnect");
-            dsi->flags &= ~(DSI_RUNNING | DSI_DATA);
-            dsi->eof = dsi->start = dsi->buffer;
-            dsi->in_write = 0;
+        if (sigsetjmp(recon_jmp, 1) != 0)
+            /* returning from SIGALARM handler for a primary reconnect */
             continue;
-        }
+
+        /* Blocking read on the network socket */
         cmd = dsi_receive(dsi);
+
         if (cmd == 0) {
+            /* cmd == 0 is the error condition */
             if (dsi->flags & DSI_RECONSOCKET) {
                 /* we just got a reconnect so we immediately try again to receive on the new fd */
                 dsi->flags &= ~DSI_RECONSOCKET;
@@ -485,8 +481,11 @@ void afp_over_dsi(AFPObj *obj)
             }
         }
 
-        dsi->tickle = 0;
-        dsi_sleep(dsi, 0); /* wake up */
+        if (!(dsi->flags & DSI_EXTSLEEP) && (dsi->flags & DSI_SLEEPING)) {
+            LOG(log_debug, logtype_afpd, "afp_over_dsi: got data, ending normal sleep");
+            dsi->flags &= ~DSI_SLEEPING;
+            dsi->tickle = 0;
+        }
 
         if (reload_request) {
             reload_request = 0;
@@ -570,11 +569,6 @@ void afp_over_dsi(AFPObj *obj)
 
                     dir_free_invalid_q();
 
-#ifdef FORCE_UIDGID
-                    /* bring everything back to old euid, egid */
-                    if (obj->force_uid)
-                        restore_uidgid ( &obj->uidgid );
-#endif /* FORCE_UIDGID */
                     dsi->flags &= ~DSI_RUNNING;
 
                     /* Add result to the AFP replay cache */
@@ -616,11 +610,6 @@ void afp_over_dsi(AFPObj *obj)
                     AfpNum2name(function), AfpErr2name(err));
 
                 dsi->flags &= ~DSI_RUNNING;
-#ifdef FORCE_UIDGID
-               /* bring everything back to old euid, egid */
-               if (obj->force_uid)
-                   restore_uidgid ( &obj->uidgid );
-#endif /* FORCE_UIDGID */
             } else {
                 LOG(log_error, logtype_afpd, "(write) bad function %x", function);
                 dsi->datalen = 0;