X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=c926c36899ebeaa529e0d8ec81bc752057c41b64;hp=30a32346238aefc4425c0ba14062ef18dd21aa26;hb=cdb7047fb6897c1ad8b4ac264001d44154bf144d;hpb=df4786e567fddb4b238f658d43e2662f488f73ba

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 30a32346..c926c368 100644
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -11,27 +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"
@@ -52,12 +55,18 @@ static char **argv = NULL;
 unsigned char	nologin = 0;
 
 struct afp_options default_options;
+
 static AFPConfig *configs;
 static server_child *server_children;
-static fd_set save_rfds;
-static int    Ipc_fd = -1;
 static sig_atomic_t reloadconfig = 0;
 
+/* Two pointers to dynamic allocated arrays which store pollfds and associated data */
+static struct pollfd *fdset;
+static struct polldata *polldata;
+static int fdset_size;          /* current allocated size */
+static int fdset_used;          /* number of used elements */
+
+
 #ifdef TRU64
 void afp_get_cmdline( int *ac, char ***av)
 {
@@ -66,39 +75,47 @@ void afp_get_cmdline( int *ac, char ***av)
 }
 #endif /* TRU64 */
 
-static void afp_exit(const int i)
+/* This is registered with atexit() */
+static void afp_exit(void)
 {
-    server_unlock(default_options.pidfile);
-    exit(i);
+    if (parent_or_child == 0)
+        /* Only do this in the parent */
+        server_unlock(default_options.pidfile);
 }
 
+
 /* ------------------
    initialize fd set we are waiting for.
 */
-static void set_fd(int ipc_fd)
+static void fd_set_listening_sockets(void)
 {
     AFPConfig   *config;
 
-    FD_ZERO(&save_rfds);
     for (config = configs; config; config = config->next) {
         if (config->fd < 0) /* for proxies */
             continue;
-        FD_SET(config->fd, &save_rfds);
-    }
-    if (ipc_fd >= 0) {
-        FD_SET(ipc_fd, &save_rfds);
+        fdset_add_fd(&fdset, &polldata, &fdset_used, &fdset_size, config->fd, LISTEN_FD, config);
     }
 }
  
+static void fd_reset_listening_sockets(void)
+{
+    AFPConfig   *config;
+
+    for (config = configs; config; config = config->next) {
+        if (config->fd < 0) /* for proxies */
+            continue;
+        fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, config->fd);
+    }
+    fd_set_listening_sockets();
+}
+
 /* ------------------ */
 static void afp_goaway(int sig)
 {
+    if (server_children)
+        server_child_kill(server_children, CHILD_DSIFORK, sig);
 
-#ifndef NO_DDP
-    asp_kill(sig);
-#endif /* ! NO_DDP */
-
-    dsi_kill(sig);
     switch( sig ) {
 
     case SIGTERM :
@@ -107,7 +124,8 @@ static void afp_goaway(int sig)
         for (config = configs; config; config = config->next)
             if (config->server_cleanup)
                 config->server_cleanup(config);
-        afp_exit(0);
+        server_unlock(default_options.pidfile);
+        exit(0);
         break;
 
     case SIGUSR1 :
@@ -129,7 +147,34 @@ static void afp_goaway(int sig)
 
 static void child_handler(int sig _U_)
 {
-    server_child_handler(server_children);
+    int fd;
+    int status, i;
+    pid_t pid;
+  
+#ifndef WAIT_ANY
+#define WAIT_ANY (-1)
+#endif /* ! WAIT_ANY */
+
+    while ((pid = waitpid(WAIT_ANY, &status, WNOHANG)) > 0) {
+        for (i = 0; i < server_children->nforks; i++) {
+            if ((fd = server_child_remove(server_children, i, pid)) != -1) {
+                fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, fd);        
+                break;
+            }
+        }
+
+        if (WIFEXITED(status)) {
+            if (WEXITSTATUS(status))
+                LOG(log_info, logtype_afpd, "child[%d]: exited %d", pid, WEXITSTATUS(status));
+            else
+                LOG(log_info, logtype_afpd, "child[%d]: done", pid);
+        } else {
+            if (WIFSIGNALED(status))
+                LOG(log_info, logtype_afpd, "child[%d]: killed by signal %d", pid, WTERMSIG(status));
+            else
+                LOG(log_info, logtype_afpd, "child[%d]: died", pid);
+        }
+    }
 }
 
 int main(int ac, char **av)
@@ -170,6 +215,7 @@ int main(int ac, char **av)
     default: /* server */
         exit(0);
     }
+    atexit(afp_exit);
 
     /* install child handler for asp and dsi. we do this before afp_goaway
      * as afp_goaway references stuff from here. 
@@ -177,11 +223,10 @@ int main(int ac, char **av)
     if (!(server_children = server_child_alloc(default_options.connections,
                             CHILD_NFORKS))) {
         LOG(log_error, logtype_afpd, "main: server_child alloc: %s", strerror(errno) );
-        afp_exit(EXITERR_SYS);
+        exit(EXITERR_SYS);
     }
 
     memset(&sv, 0, sizeof(sv));    
-#ifdef AFP3x
     /* linux at least up to 2.4.22 send a SIGXFZ for vfat fs,
        even if the file is open with O_LARGEFILE ! */
 #ifdef SIGXFSZ
@@ -189,9 +234,8 @@ int main(int ac, char **av)
     sigemptyset( &sv.sa_mask );
     if (sigaction(SIGXFSZ, &sv, NULL ) < 0 ) {
         LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
-        afp_exit(EXITERR_SYS);
+        exit(EXITERR_SYS);
     }
-#endif
 #endif
     
     sv.sa_handler = child_handler;
@@ -204,7 +248,7 @@ int main(int ac, char **av)
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGCHLD, &sv, NULL ) < 0 ) {
         LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
-        afp_exit(EXITERR_SYS);
+        exit(EXITERR_SYS);
     }
 
     sv.sa_handler = afp_goaway;
@@ -216,7 +260,7 @@ int main(int ac, char **av)
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGUSR1, &sv, NULL ) < 0 ) {
         LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
-        afp_exit(EXITERR_SYS);
+        exit(EXITERR_SYS);
     }
 
     sigemptyset( &sv.sa_mask );
@@ -227,7 +271,7 @@ int main(int ac, char **av)
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGHUP, &sv, NULL ) < 0 ) {
         LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
-        afp_exit(EXITERR_SYS);
+        exit(EXITERR_SYS);
     }
 
 
@@ -239,7 +283,7 @@ int main(int ac, char **av)
     sv.sa_flags = SA_RESTART;
     if ( sigaction( SIGTERM, &sv, NULL ) < 0 ) {
         LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
-        afp_exit(EXITERR_SYS);
+        exit(EXITERR_SYS);
     }
 
     /* afpd.conf: not in config file: lockfile, connections, configfile
@@ -263,18 +307,23 @@ int main(int ac, char **av)
     pthread_sigmask(SIG_BLOCK, &sigs, NULL);
     if (!(configs = configinit(&default_options))) {
         LOG(log_error, logtype_afpd, "main: no servers configured");
-        afp_exit(EXITERR_CONF);
+        exit(EXITERR_CONF);
     }
     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 ((ipc = server_ipc_create())) {
-        Ipc_fd = server_ipc_parent(ipc);
-    }
-    set_fd(Ipc_fd);
+    fd_set_listening_sockets();
+
+    afp_child_t *child;
 
     /* wait for an appleshare connection. parent remains in the loop
      * while the children get handled by afp_over_{asp,dsi}.  this is
@@ -283,16 +332,15 @@ int main(int ac, char **av)
      * afterwards. establishing timeouts for logins is a possible 
      * solution. */
     while (1) {
-        rfds = save_rfds;
+        LOG(log_maxdebug, logtype_afpd, "main: polling %i fds", fdset_used);
         pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
-        ret = select(FD_SETSIZE, &rfds, NULL, NULL, NULL);
+        ret = poll(fdset, fdset_used, -1);
         pthread_sigmask(SIG_BLOCK, &sigs, NULL);
         int saveerrno = errno;
 
         if (reloadconfig) {
             nologin++;
             auth_unload();
-            AFPConfig *config;
 
             LOG(log_info, logtype_afpd, "re-reading configuration file");
             for (config = configs; config; config = config->next)
@@ -304,13 +352,16 @@ int main(int ac, char **av)
             configfree(configs, NULL);
             if (!(configs = configinit(&default_options))) {
                 LOG(log_error, logtype_afpd, "config re-read: no servers configured");
-                afp_exit(EXITERR_CONF);
+                exit(EXITERR_CONF);
             }
-            set_fd(Ipc_fd);
+            fd_reset_listening_sockets();
             nologin = 0;
             reloadconfig = 0;
             errno = saveerrno;
         }
+
+        if (ret == 0)
+            continue;
         
         if (ret < 0) {
             if (errno == EINTR)
@@ -318,17 +369,34 @@ int main(int ac, char **av)
             LOG(log_error, logtype_afpd, "main: can't wait for input: %s", strerror(errno));
             break;
         }
-        if (Ipc_fd >=0 && FD_ISSET(Ipc_fd, &rfds)) {
-            server_ipc_read(server_children);
-        }
-        for (config = configs; config; config = config->next) {
-            if (config->fd < 0)
-                continue;
-            if (FD_ISSET(config->fd, &rfds)) {
-                config->server_start(config, configs, server_children);
-            }
-        }
-    }
+
+        for (int i = 0; i < fdset_used; i++) {
+            if (fdset[i].revents & POLLIN) {
+                switch (polldata[i].fdtype) {
+                case LISTEN_FD:
+                    config = (AFPConfig *)polldata[i].data;
+                    /* config->server_start is afp_config.c:dsi_start() for DSI */
+                    if (child = config->server_start(config, configs, server_children)) {
+                        /* Add IPC fd to select fd set */
+                        fdset_add_fd(&fdset, &polldata, &fdset_used, &fdset_size, child->ipc_fds[0], IPC_FD, child);
+                    }
+                    break;
+                case IPC_FD:
+                    child = (afp_child_t *)polldata[i].data;
+                    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]);
+                        close(child->ipc_fds[0]);
+                        child->ipc_fds[0] = -1;
+                    }
+                    break;
+                default:
+                    LOG(log_debug, logtype_afpd, "main: IPC request for unknown type");
+                    break;
+                } /* switch */
+            }  /* if */
+        } /* for (i)*/
+    } /* while (1) */
 
     return 0;
 }