Merge master

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

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index e8365a2848770efd0366e0e78d78e77e0ab403cc..e858146752f25aa95d8c555f34b8cb5db199a528 100644 (file)
--- 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"
@@ -56,6 +57,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;
@@ -133,11 +135,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 ) {
 
@@ -393,9 +391,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. */
 
     if (default_options.flags & OPTION_KEEPSESSIONS) {