Merge master

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

diff --git a/libatalk/util/server_ipc.c b/libatalk/util/server_ipc.c
index 8d305ba8bcecb905aaddb8f07a0556bfb0e6817e..c258398d847d242944eb989d6348e59c84d2290e 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>
@@ -137,7 +135,7 @@ EC_CLEANUP:
     if (ret != 0) {
         return -1;
     }
-    LOG(log_note, logtype_afpd, "ipc_server_uds: fd: %d", fd);
+
     return fd;
 }
 
@@ -164,19 +162,18 @@ int ipc_client_uds(const char *name)
     address_length = sizeof(address.sun_family) + sprintf(address.sun_path, name);
 
     EC_ZERO_LOG( connect(fd, (struct sockaddr *)&address, address_length) ); /* 1 */
-    LOG(log_note, logtype_afpd, "ipc_client_uds: connected to master");
+    LOG(log_debug, logtype_afpd, "ipc_client_uds: connected to master");
 
     if (writet(fd, &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) {
         LOG(log_error, logtype_afpd, "ipc_client_uds: writet: %s", strerror(errno));
         EC_FAIL;
     }
-    LOG(log_note, logtype_afpd, "ipc_client_uds: sent pid");
 
 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;
 }
 
@@ -184,13 +181,13 @@ int reconnect_ipc(AFPObj *obj)
 {
     int retrycount = 0;
 
-    LOG(log_note, logtype_afpd, "reconnect_ipc: start");
+    LOG(log_debug, logtype_afpd, "reconnect_ipc: start");
 
     close(obj->ipc_fd);
     obj->ipc_fd = -1;
 
     srandom(getpid());
-    sleep((random() % 10) + 5);  /* give it enough time to start */
+    sleep((random() % 5) + 5);  /* give it enough time to start */
 
     while (retrycount++ < 10) {
         if ((obj->ipc_fd = ipc_client_uds(_PATH_AFP_IPC)) == -1) {
@@ -198,7 +195,7 @@ int reconnect_ipc(AFPObj *obj)
             sleep(1);
             continue;
         }
-        LOG(log_note, logtype_afpd, "reconnect_ipc: succesfull IPC reconnect");
+        LOG(log_debug, logtype_afpd, "reconnect_ipc: succesfull IPC reconnect");
         return 0;
     }
     return -1;
@@ -337,10 +334,9 @@ int 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)) != -len+IPC_HEADERLEN) {
+   if ((ret = writet(fd, block, len+IPC_HEADERLEN, 0, 1)) != len + IPC_HEADERLEN) {
        return -1;
    }
 
    return 0;
 }
-