X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=68785537e3d7c945e7035577989a5aa3e73a47f7;hb=b0bcb8f6b0571592a50ce039882c9319e012a270;hp=eb9791400602ebc0331241dcb8480d7894f53271;hpb=465246e257d9aff9855e3e35d8fd5983db932b45;p=netatalk.git

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index eb979140..68785537 100644
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -11,10 +11,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
-
 #include <sys/param.h>
 #include <sys/uio.h>
-#include <atalk/logger.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/poll.h>
@@ -22,20 +20,23 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 
+#include <atalk/logger.h>
 #include <atalk/adouble.h>
-
-#include <netatalk/at.h>
 #include <atalk/compat.h>
 #include <atalk/dsi.h>
-#include <atalk/atp.h>
-#include <atalk/asp.h>
 #include <atalk/afp.h>
 #include <atalk/paths.h>
 #include <atalk/util.h>
 #include <atalk/server_child.h>
 #include <atalk/server_ipc.h>
+#include <atalk/errchk.h>
+#include <atalk/locking.h>
 #include <atalk/globals.h>
 
+#include "event2/event.h"
+#include "event2/http.h"
+#include "event2/rpc.h"
+
 #include "afp_config.h"
 #include "status.h"
 #include "fork.h"
@@ -54,6 +55,7 @@ static char **argv = NULL;
 unsigned char	nologin = 0;
 
 struct afp_options default_options;
+
 static AFPConfig *configs;
 static server_child *server_children;
 static sig_atomic_t reloadconfig = 0;
@@ -112,11 +114,7 @@ static void fd_reset_listening_sockets(void)
 /* ------------------ */
 static void afp_goaway(int sig)
 {
-        AFPConfig *config;
-
-#ifndef NO_DDP
-    asp_kill(sig);
-#endif /* ! NO_DDP */
+    AFPConfig *config;
 
     switch( sig ) {
 
@@ -361,9 +359,15 @@ int main(int ac, char **av)
     }
     pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
 
-    /* Register CNID  */
+    /* Initialize */
     cnid_init();
-
+    if (locktable_init("XXX") != 0)
+        exit(EXITERR_SYS);
+#if 0
+    if (rpc_init("127.0.0.1", 4701) != 0)
+        exit(EXITERR_SYS);
+#endif
+    
     /* watch atp, dsi sockets and ipc parent/child file descriptor. */
     disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC);
     fd_set_listening_sockets();
@@ -439,7 +443,7 @@ int main(int ac, char **av)
 
                 case IPC_FD:
                     child = (afp_child_t *)polldata[i].data;
-                    LOG(log_note, logtype_afpd, "main: IPC request from child[%u]", child->pid);
+                    LOG(log_debug, logtype_afpd, "main: IPC request from child[%u]", child->pid);
 
                     if ((ret = ipc_server_read(server_children, child->ipc_fds[0])) == 0) {
                         fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, child->ipc_fds[0]);
@@ -453,7 +457,7 @@ int main(int ac, char **av)
                     break;
 
                 case DISASOCIATED_IPC_FD:
-                    LOG(log_note, logtype_afpd, "main: DISASOCIATED_IPC_FD request");
+                    LOG(log_debug, logtype_afpd, "main: IPC reconnect request");
                     if ((fd[0] = accept(disasociated_ipc_fd, NULL, NULL)) == -1) {
                         LOG(log_error, logtype_afpd, "main: accept: %s", strerror(errno));
                         break;
@@ -462,7 +466,7 @@ int main(int ac, char **av)
                         LOG(log_error, logtype_afpd, "main: readt: %s", strerror(errno));
                         close(fd[0]);
                     }
-                    LOG(log_note, logtype_afpd, "main: welcome back child[%u]", pid);
+                    LOG(log_note, logtype_afpd, "main: IPC reconnect from [%u]", pid);
                     if ((child = server_child_add(server_children, CHILD_DSIFORK, pid, fd)) == NULL) {
                         LOG(log_error, logtype_afpd, "main: server_child_add");
                         close(fd[0]);