Merge 2-2

[netatalk.git] / libatalk / util / server_ipc.c

diff --git a/libatalk/util/server_ipc.c b/libatalk/util/server_ipc.c
index 1060fde81f7f4be5af4ab4733f01b3e8a07ec6ab..d40e3a49ea4cb07bf1b7984fc418cb5ec11521ee 100644 (file)
--- a/libatalk/util/server_ipc.c
+++ b/libatalk/util/server_ipc.c
@@ -9,9 +9,7 @@
 #endif 
 
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,6 +17,7 @@
 #include <sys/un.h>
 #include <errno.h>
 #include <signal.h>
+#include <time.h>
 
 #include <atalk/server_child.h>
 #include <atalk/server_ipc.h>
@@ -26,6 +25,8 @@
 #include <atalk/util.h>
 #include <atalk/errchk.h>
 #include <atalk/paths.h>
+#include <atalk/globals.h>
+#include <atalk/dsi.h>
 
 #define IPC_HEADERLEN 14
 #define IPC_MAXMSGSIZE 90
@@ -68,8 +69,8 @@ static int ipc_kill_token(struct ipc_header *ipc, server_child *children)
 /* ----------------- */
 static int ipc_get_session(struct ipc_header *ipc, server_child *children)
 {
-    u_int32_t boottime;
-    u_int32_t idlen;
+    uint32_t boottime;
+    uint32_t idlen;
     char     *clientid, *p;
 
     
@@ -126,7 +127,7 @@ int ipc_server_uds(const char *name)
     EC_ZERO_LOG( setnonblock(fd, 1) );
     unlink(name);
     address.sun_family = AF_UNIX;
-    address_length = sizeof(address.sun_family) + sprintf(address.sun_path, name);
+    address_length = sizeof(address.sun_family) + sprintf(address.sun_path, "%s", name);
     EC_ZERO_LOG( bind(fd, (struct sockaddr *)&address, address_length) );
     EC_ZERO_LOG( listen(fd, 1024) );
 
@@ -134,7 +135,7 @@ EC_CLEANUP:
     if (ret != 0) {
         return -1;
     }
-    LOG(log_note, logtype_afpd, "ipc_server_uds: fd: %d", fd);
+
     return fd;
 }
 
@@ -156,11 +157,13 @@ int ipc_client_uds(const char *name)
     pid_t pid = getpid();
 
     EC_NEG1_LOG( fd = socket(PF_UNIX, SOCK_STREAM, 0) );
-    EC_ZERO_LOG( setnonblock(fd, 1) );
     address.sun_family = AF_UNIX;
-    address_length = sizeof(address.sun_family) + sprintf(address.sun_path, name);
+    address_length = sizeof(address.sun_family) + sprintf(address.sun_path, "%s", name);
 
     EC_ZERO_LOG( connect(fd, (struct sockaddr *)&address, address_length) ); /* 1 */
+    LOG(log_debug, logtype_afpd, "ipc_client_uds: connected to master");
+
+    EC_ZERO_LOG( setnonblock(fd, 1) );
 
     if (writet(fd, &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) {
         LOG(log_error, logtype_afpd, "ipc_client_uds: writet: %s", strerror(errno));
@@ -171,10 +174,33 @@ EC_CLEANUP:
     if (ret != 0) {
         return -1;
     }
-    LOG(log_note, logtype_afpd, "ipc_client_uds: fd: %d", fd);
+    LOG(log_debug, logtype_afpd, "ipc_client_uds: fd: %d", fd);
     return fd;
 }
 
+int reconnect_ipc(AFPObj *obj)
+{
+    int retrycount = 0;
+
+    LOG(log_debug, logtype_afpd, "reconnect_ipc: start");
+
+    close(obj->ipc_fd);
+    obj->ipc_fd = -1;
+
+    sleep((getpid() % 5) + 15);  /* give it enough time to start */
+
+    while (retrycount++ < 10) {
+        if ((obj->ipc_fd = ipc_client_uds(_PATH_AFP_IPC)) == -1) {
+            LOG(log_error, logtype_afpd, "reconnect_ipc: cant reconnect to master");
+            sleep(1);
+            continue;
+        }
+        LOG(log_debug, logtype_afpd, "reconnect_ipc: succesfull IPC reconnect");
+        return 0;
+    }
+    return -1;
+}
+
 /* ----------------- 
  * Ipc format
  * command
@@ -186,21 +212,27 @@ EC_CLEANUP:
 /*!
  * Read a IPC message from a child
  *
+ * This is using an fd with non-blocking IO, so EAGAIN is not an error
+ *
  * @args children  (rw) pointer to our structure with all childs
  * @args fd        (r)  IPC socket with child
  *
- * @returns number of bytes transfered, -1 on error, 0 on EOF
+ * @returns -1 on error, 0 on success
  */
 int ipc_server_read(server_child *children, int fd)
 {
-    int       ret = 0;
+    int       ret;
     struct ipc_header ipc;
     char      buf[IPC_MAXMSGSIZE], *p;
 
     if ((ret = read(fd, buf, IPC_HEADERLEN)) != IPC_HEADERLEN) {
-        LOG(log_error, logtype_afpd, "Reading IPC header failed (%i of %u bytes read): %s",
-            ret, IPC_HEADERLEN, strerror(errno));
-        return ret;
+        if (ret != 0) {
+            if (errno == EAGAIN)
+                return 0;
+            LOG(log_error, logtype_afpd, "Reading IPC header failed (%i of %u bytes read): %s",
+                ret, IPC_HEADERLEN, strerror(errno));
+        }
+        return -1;
     }
 
     p = buf;
@@ -227,7 +259,7 @@ int ipc_server_read(server_child *children, int fd)
            if ((ret = read(fd, buf, ipc.len)) != (int) ipc.len) {
             LOG(log_info, logtype_afpd, "Reading IPC message failed (%u of %u  bytes read): %s",
                 ret, ipc.len, strerror(errno));
-            return ret;
+            return -1;
        }        
     }
     ipc.msg = buf;
@@ -243,6 +275,7 @@ int ipc_server_read(server_child *children, int fd)
         if (readt(fd, &ipc.DSI_requestID, 2, 0, 2) != 2) {
             LOG (log_error, logtype_afpd, "ipc_read(%s:child[%u]): couldnt read DSI id: %s",
                  ipc_cmd_str[ipc.command], ipc.child_pid, strerror(errno));
+            return -1;
         }
         if ((ipc.afp_socket = recv_fd(fd, 1)) == -1) {
             LOG (log_error, logtype_afpd, "ipc_read(%s:child[%u]): recv_fd: %s",
@@ -268,13 +301,12 @@ int ipc_server_read(server_child *children, int fd)
                return -1;
     }
 
-    return ret;
+    return 0;
 }
 
 /* ----------------- */
-ssize_t ipc_child_write(int *fd, uint16_t command, int len, void *msg)
+int ipc_child_write(int fd, uint16_t command, int len, void *msg)
 {
-   static int fd_saved = -1;
    char block[IPC_MAXMSGSIZE], *p;
    pid_t pid;
    uid_t uid;
@@ -282,9 +314,6 @@ ssize_t ipc_child_write(int *fd, uint16_t command, int len, void *msg)
 
    p = block;
 
-   if (fd_saved == -1)
-       fd_saved = *fd;
-
    memset ( p, 0 , IPC_MAXMSGSIZE);
    if (len + IPC_HEADERLEN > IPC_MAXMSGSIZE)
        return -1;
@@ -312,16 +341,9 @@ ssize_t ipc_child_write(int *fd, uint16_t command, int len, void *msg)
 
    LOG(log_debug, logtype_afpd, "ipc_child_write(%s)", ipc_cmd_str[command]);
 
-   if ((ret = writet(*fd, block, len+IPC_HEADERLEN, 0, 1)) == -1) {
-       if (*fd == fd_saved && getppid() == 1) {
-           /* still using original socketpair IPC fd, master was possibly restarted, try reestablish connection across uds */
-           if ((*fd = ipc_client_uds(_PATH_AFP_IPC)) == -1)
-               return -1;
-           /* now try again */
-           ret = writet(*fd, block, len+IPC_HEADERLEN, 0, 1);
-       }
+   if ((ret = writet(fd, block, len+IPC_HEADERLEN, 0, 1)) != len + IPC_HEADERLEN) {
+       return -1;
    }
 
-   return ret;
+   return 0;
 }
-