Merge master

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

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 9e34712e79f6b12887dd15a52f39a8c707b7b47d..37bb4bd4a0916ba6c54ce5b074fa081edca47fe1 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -11,28 +11,30 @@
 #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>
 #include <errno.h>
 #include <sys/wait.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 "event2/event.h"
+#include "event2/http.h"
+#include "event2/rpc.h"
 
 #include "globals.h"
 #include "afp_config.h"
@@ -53,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;
@@ -109,12 +112,6 @@ static void fd_reset_listening_sockets(void)
 /* ------------------ */
 static void afp_goaway(int sig)
 {
-
-#ifndef NO_DDP
-    asp_kill(sig);
-#endif /* ! NO_DDP */
-
-
     switch( sig ) {
 
     case SIGTERM :
@@ -317,9 +314,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. */
     fd_set_listening_sockets();