X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=9e34712e79f6b12887dd15a52f39a8c707b7b47d;hb=75f0882aca367c96283169457942696927fbd8fd;hp=c521ce5ffce0453ac2d8ff0631283f23c71b69a8;hpb=458fcac4e6aee7eb54ba744f57169f70cce12505;p=netatalk.git

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index c521ce5f..9e34712e 100644
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -5,175 +5,293 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <signal.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/uio.h>
-#include <sys/syslog.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/adouble.h>
 
-#include <netatalk/endian.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/adouble.h>
 #include <atalk/paths.h>
 #include <atalk/util.h>
 #include <atalk/server_child.h>
+#include <atalk/server_ipc.h>
 
 #include "globals.h"
 #include "afp_config.h"
 #include "status.h"
 #include "fork.h"
 #include "uam_auth.h"
+#include "afp_zeroconf.h"
+
+#ifdef TRU64
+#include <sys/security.h>
+#include <prot.h>
+#include <sia.h>
+
+static int argc = 0;
+static char **argv = NULL;
+#endif /* TRU64 */
 
 unsigned char	nologin = 0;
 
-static struct afp_options default_options;
+struct afp_options default_options;
 static AFPConfig *configs;
 static server_child *server_children;
-static fd_set save_rfds;
+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)
+{
+    *ac = argc;
+    *av = argv;
+}
+#endif /* TRU64 */
+
+/* This is registered with atexit() */
+static void afp_exit(void)
+{
+    if (parent_or_child == 0)
+        /* Only do this in the parent */
+        server_unlock(default_options.pidfile);
+}
 
-#ifdef CAPDIR
-int addr_net, addr_node, addr_uid;
-char addr_name[32];
-#endif CAPDIR
 
-static void afp_exit(const int i)
+/* ------------------
+   initialize fd set we are waiting for.
+*/
+static void fd_set_listening_sockets(void)
+{
+    AFPConfig   *config;
+
+    for (config = configs; config; config = config->next) {
+        if (config->fd < 0) /* for proxies */
+            continue;
+        fdset_add_fd(&fdset, &polldata, &fdset_used, &fdset_size, config->fd, LISTEN_FD, config);
+    }
+}
+ 
+static void fd_reset_listening_sockets(void)
 {
-  server_unlock(default_options.pidfile);
-  exit(i);
+    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);
+    }
 }
 
+/* ------------------ */
 static void afp_goaway(int sig)
 {
+
 #ifndef NO_DDP
     asp_kill(sig);
-#endif
-    dsi_kill(sig);
+#endif /* ! NO_DDP */
+
+
     switch( sig ) {
+
     case SIGTERM :
-      syslog( LOG_INFO, "shutting down on signal %d", sig );
-      break;
+        LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM");
+        AFPConfig *config;
+
+        if (server_children)
+            server_child_kill(server_children, CHILD_DSIFORK, sig);
+
+        for (config = configs; config; config = config->next)
+            if (config->server_cleanup)
+                config->server_cleanup(config);
+        server_unlock(default_options.pidfile);
+        exit(0);
+        break;
+
+    case SIGUSR1 :
+        nologin++;
+        auth_unload();
+        LOG(log_info, logtype_afpd, "disallowing logins");        
+
+        if (server_children)
+            server_child_kill(server_children, CHILD_DSIFORK, sig);
+        break;
+
     case SIGHUP :
-      /* w/ a configuration file, we can force a re-read if we want */
-      nologin++;
-      if ((nologin + 1) & 1) {
-	AFPConfig *config;
-
-	syslog(LOG_INFO, "re-reading configuration file");
-	for (config = configs; config; config = config->next)
-	  if (config->server_cleanup)
-	    config->server_cleanup(config);
-
-	configfree(configs, NULL);
-	if (!(configs = configinit(&default_options))) {
-	  syslog(LOG_ERR, "config re-read: no servers configured");
-	  afp_exit(1);
-	}
-	FD_ZERO(&save_rfds);
-	for (config = configs; config; config = config->next) {
-	  if (config->fd < 0)
-	    continue;
-	  FD_SET(config->fd, &save_rfds);
-	}
-      } else {
-	syslog(LOG_INFO, "disallowing logins");
-	auth_unload();
-      }
-      break;
+        /* w/ a configuration file, we can force a re-read if we want */
+        reloadconfig = 1;
+        break;
+
     default :
-	syslog( LOG_ERR, "afp_goaway: bad signal" );
-    }
-    if ( sig == SIGTERM ) {
-      AFPConfig *config;
-      
-      for (config = configs; config; config = config->next) 
-	if (config->server_cleanup) 
-	  config->server_cleanup(config);
-
-      afp_exit(0);
+        LOG(log_error, logtype_afpd, "afp_goaway: bad signal" );
     }
     return;
 }
 
-static void child_handler()
+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( ac, av )
-    int		ac;
-    char	**av;
+int main(int ac, char **av)
 {
     AFPConfig           *config;
     fd_set              rfds;
+    void                *ipc;
     struct sigaction	sv;
     sigset_t            sigs;
+    int                 ret;
+
+#ifdef TRU64
+    argc = ac;
+    argv = av;
+    set_auth_parameters( ac, av );
+#endif /* TRU64 */
+
+    /* Log SIGBUS/SIGSEGV SBT */
+    fault_setup(NULL);
 
-    umask( 0 );		/* so inherited file permissions work right */
+    /* Default log setup: log to syslog */
+    setuplog("default log_note");
 
     afp_options_init(&default_options);
     if (!afp_options_parse(ac, av, &default_options))
-      exit(1);
-    
-    switch(server_lock("afpd", default_options.pidfile, 
-		       default_options.flags & OPTION_DEBUG)) {
+        exit(EXITERR_CONF);
+
+    /* Save the user's current umask for use with CNID (and maybe some 
+     * other things, too). */
+    default_options.save_mask = umask( default_options.umask );
+
+    switch(server_lock("afpd", default_options.pidfile,
+                       default_options.flags & OPTION_DEBUG)) {
     case -1: /* error */
-      exit(1);
+        exit(EXITERR_SYS);
     case 0: /* child */
-      break;
+        break;
     default: /* server */
-      exit(0);
+        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. 
      * XXX: this should really be setup after the initial connections. */
     if (!(server_children = server_child_alloc(default_options.connections,
-					       CHILD_NFORKS))) {
-      syslog(LOG_ERR, "main: server_child alloc: %m");
-      afp_exit(1);
+                            CHILD_NFORKS))) {
+        LOG(log_error, logtype_afpd, "main: server_child alloc: %s", strerror(errno) );
+        exit(EXITERR_SYS);
+    }
+
+    memset(&sv, 0, sizeof(sv));    
+    /* 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
+    sv.sa_handler = SIG_IGN;
+    sigemptyset( &sv.sa_mask );
+    if (sigaction(SIGXFSZ, &sv, NULL ) < 0 ) {
+        LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+        exit(EXITERR_SYS);
     }
-      
-    memset(&sv, 0, sizeof(sv));
+#endif
+    
     sv.sa_handler = child_handler;
     sigemptyset( &sv.sa_mask );
+    sigaddset(&sv.sa_mask, SIGALRM);
+    sigaddset(&sv.sa_mask, SIGHUP);
+    sigaddset(&sv.sa_mask, SIGTERM);
+    sigaddset(&sv.sa_mask, SIGUSR1);
+    
     sv.sa_flags = SA_RESTART;
-    if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) {
-	syslog( LOG_ERR, "main: sigaction: %m" );
-	afp_exit(1);
+    if ( sigaction( SIGCHLD, &sv, NULL ) < 0 ) {
+        LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+        exit(EXITERR_SYS);
     }
 
     sv.sa_handler = afp_goaway;
     sigemptyset( &sv.sa_mask );
+    sigaddset(&sv.sa_mask, SIGALRM);
+    sigaddset(&sv.sa_mask, SIGTERM);
     sigaddset(&sv.sa_mask, SIGHUP);
+    sigaddset(&sv.sa_mask, SIGCHLD);
+    sv.sa_flags = SA_RESTART;
+    if ( sigaction( SIGUSR1, &sv, NULL ) < 0 ) {
+        LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+        exit(EXITERR_SYS);
+    }
+
+    sigemptyset( &sv.sa_mask );
+    sigaddset(&sv.sa_mask, SIGALRM);
     sigaddset(&sv.sa_mask, SIGTERM);
+    sigaddset(&sv.sa_mask, SIGUSR1);
+    sigaddset(&sv.sa_mask, SIGCHLD);
     sv.sa_flags = SA_RESTART;
-    if ( sigaction( SIGHUP, &sv, 0 ) < 0 ) {
-	syslog( LOG_ERR, "main: sigaction: %m" );
-	afp_exit(1);
+    if ( sigaction( SIGHUP, &sv, NULL ) < 0 ) {
+        LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+        exit(EXITERR_SYS);
     }
-    if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
-	syslog( LOG_ERR, "main: sigaction: %m" );
-	afp_exit(1);
+
+
+    sigemptyset( &sv.sa_mask );
+    sigaddset(&sv.sa_mask, SIGALRM);
+    sigaddset(&sv.sa_mask, SIGHUP);
+    sigaddset(&sv.sa_mask, SIGUSR1);
+    sigaddset(&sv.sa_mask, SIGCHLD);
+    sv.sa_flags = SA_RESTART;
+    if ( sigaction( SIGTERM, &sv, NULL ) < 0 ) {
+        LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+        exit(EXITERR_SYS);
     }
-    
+
     /* afpd.conf: not in config file: lockfile, connections, configfile
      *            preference: command-line provides defaults.
      *                        config file over-writes defaults.
@@ -183,23 +301,30 @@ int main( ac, av )
      */
 
     sigemptyset(&sigs);
+    sigaddset(&sigs, SIGALRM);
     sigaddset(&sigs, SIGHUP);
+    sigaddset(&sigs, SIGUSR1);
+#if 0
+    /* don't block SIGTERM */
     sigaddset(&sigs, SIGTERM);
-    sigprocmask(SIG_BLOCK, &sigs, NULL);
+#endif
+    sigaddset(&sigs, SIGCHLD);
+
+    pthread_sigmask(SIG_BLOCK, &sigs, NULL);
     if (!(configs = configinit(&default_options))) {
-      syslog(LOG_ERR, "main: no servers configured: %m\n");
-      afp_exit(1);
+        LOG(log_error, logtype_afpd, "main: no servers configured");
+        exit(EXITERR_CONF);
     }
-    sigprocmask(SIG_UNBLOCK, &sigs, NULL);
+    pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
+
+    /* Register CNID  */
+    cnid_init();
+
+    /* watch atp, dsi sockets and ipc parent/child file descriptor. */
+    fd_set_listening_sockets();
+
+    afp_child_t *child;
 
-    /* watch atp and dsi sockets. */
-    FD_ZERO(&save_rfds);
-    for (config = configs; config; config = config->next) {
-      if (config->fd < 0) /* for proxies */
-	continue;
-      FD_SET(config->fd, &save_rfds);
-    }
-    
     /* wait for an appleshare connection. parent remains in the loop
      * while the children get handled by afp_over_{asp,dsi}.  this is
      * currently vulnerable to a denial-of-service attack if a
@@ -207,21 +332,75 @@ int main( ac, av )
      * afterwards. establishing timeouts for logins is a possible 
      * solution. */
     while (1) {
-      rfds = save_rfds;
-      if (select(FD_SETSIZE, &rfds, NULL, NULL, NULL) < 0) {
-	if (errno == EINTR)
-	  continue;
-	syslog(LOG_ERR, "main: can't wait for input: %m");
-	break;
-      }
-      
-      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); 
-      }
-    }
+        LOG(log_maxdebug, logtype_afpd, "main: polling %i fds", fdset_used);
+        pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
+        ret = poll(fdset, fdset_used, -1);
+        pthread_sigmask(SIG_BLOCK, &sigs, NULL);
+        int saveerrno = errno;
+
+        if (reloadconfig) {
+            nologin++;
+            auth_unload();
+            fd_reset_listening_sockets();
+
+            LOG(log_info, logtype_afpd, "re-reading configuration file");
+            for (config = configs; config; config = config->next)
+                if (config->server_cleanup)
+                    config->server_cleanup(config);
+
+            /* configfree close atp socket used for DDP tickle, there's an issue
+             * with atp tid. */
+            configfree(configs, NULL);
+            if (!(configs = configinit(&default_options))) {
+                LOG(log_error, logtype_afpd, "config re-read: no servers configured");
+                exit(EXITERR_CONF);
+            }
+
+            fd_set_listening_sockets();
+
+            nologin = 0;
+            reloadconfig = 0;
+            errno = saveerrno;
+            continue;
+        }
+
+        if (ret == 0)
+            continue;
+        
+        if (ret < 0) {
+            if (errno == EINTR)
+                continue;
+            LOG(log_error, logtype_afpd, "main: can't wait for input: %s", strerror(errno));
+            break;
+        }
+
+        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;
 }