X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=0d552d6f73c77faa3478f4a37702fb630aa6e7a3;hb=25ca059b795321076af8d8d422ba6a473ef04cf6;hp=dde51781e429197a46a60838275205f613e64b30;hpb=ecfc96169ab669b578e53fa8e13592934fe37788;p=netatalk.git diff --git a/etc/afpd/main.c b/etc/afpd/main.c index dde51781..0d552d6f 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -1,6 +1,4 @@ /* - * $Id: main.c,v 1.22 2005-04-28 20:49:43 bfernhomberg Exp $ - * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ @@ -19,8 +17,9 @@ #include #include #include - +#include #include +#include #include @@ -40,6 +39,7 @@ #include "status.h" #include "fork.h" #include "uam_auth.h" +#include "afp_zeroconf.h" #ifdef TRU64 #include @@ -55,8 +55,14 @@ 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,30 +72,41 @@ 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) { @@ -98,63 +115,71 @@ static void afp_goaway(int sig) asp_kill(sig); #endif /* ! NO_DDP */ - dsi_kill(sig); + if (server_children) + server_child_kill(server_children, CHILD_DSIFORK, sig); + switch( sig ) { + case SIGTERM : - LOG(log_info, logtype_afpd, "shutting down on signal %d", sig ); + LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM"); + AFPConfig *config; + 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 : - case SIGHUP : - /* w/ a configuration file, we can force a re-read if we want */ nologin++; auth_unload(); - if (sig == SIGHUP || ((nologin + 1) & 1)) { - AFPConfig *config; - - LOG(log_info, logtype_afpd, "re-reading configuration file"); - for (config = configs; config; config = config->next) - if (config->server_cleanup) - config->server_cleanup(config); + LOG(log_info, logtype_afpd, "disallowing logins"); + break; - /* 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"); - afp_exit(EXITERR_CONF); - } - set_fd(Ipc_fd); - } else { - LOG(log_info, logtype_afpd, "disallowing logins"); - } - if (sig == SIGHUP) { - nologin = 0; - } + case SIGHUP : + /* w/ a configuration file, we can force a re-read if we want */ + reloadconfig = 1; break; + default : LOG(log_error, logtype_afpd, "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); - } 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; @@ -169,9 +194,12 @@ char **av; set_auth_parameters( ac, av ); #endif /* TRU64 */ -#ifdef DEBUG1 + /* Log SIGBUS/SIGSEGV SBT */ fault_setup(NULL); -#endif + + /* Default log setup: log to syslog */ + setuplog("default log_note"); + afp_options_init(&default_options); if (!afp_options_parse(ac, av, &default_options)) exit(EXITERR_CONF); @@ -189,9 +217,7 @@ char **av; default: /* server */ exit(0); } - - /* Register CNID */ - cnid_init(); + atexit(afp_exit); /* install child handler for asp and dsi. we do this before afp_goaway * as afp_goaway references stuff from here. @@ -199,18 +225,21 @@ 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); } - -#ifdef AFP3x + + 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 - signal(SIGXFSZ , SIG_IGN); + 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); + } #endif -#endif - memset(&sv, 0, sizeof(sv)); sv.sa_handler = child_handler; sigemptyset( &sv.sa_mask ); sigaddset(&sv.sa_mask, SIGALRM); @@ -219,9 +248,9 @@ char **av; sigaddset(&sv.sa_mask, SIGUSR1); sv.sa_flags = SA_RESTART; - if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) { + 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; @@ -231,9 +260,9 @@ char **av; sigaddset(&sv.sa_mask, SIGHUP); sigaddset(&sv.sa_mask, SIGCHLD); sv.sa_flags = SA_RESTART; - if ( sigaction( SIGUSR1, &sv, 0 ) < 0 ) { + 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 ); @@ -242,9 +271,9 @@ char **av; sigaddset(&sv.sa_mask, SIGUSR1); sigaddset(&sv.sa_mask, SIGCHLD); sv.sa_flags = SA_RESTART; - if ( sigaction( SIGHUP, &sv, 0 ) < 0 ) { + if ( sigaction( SIGHUP, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - afp_exit(EXITERR_SYS); + exit(EXITERR_SYS); } @@ -254,9 +283,9 @@ char **av; sigaddset(&sv.sa_mask, SIGUSR1); sigaddset(&sv.sa_mask, SIGCHLD); sv.sa_flags = SA_RESTART; - if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) { + 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 @@ -277,18 +306,20 @@ char **av; #endif sigaddset(&sigs, SIGCHLD); - sigprocmask(SIG_BLOCK, &sigs, NULL); + pthread_sigmask(SIG_BLOCK, &sigs, NULL); if (!(configs = configinit(&default_options))) { - LOG(log_error, logtype_afpd, "main: no servers configured: %s", strerror(errno)); - afp_exit(EXITERR_CONF); + 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. */ - 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 @@ -297,27 +328,71 @@ char **av; * afterwards. establishing timeouts for logins is a possible * solution. */ while (1) { - rfds = save_rfds; - sigprocmask(SIG_UNBLOCK, &sigs, NULL); - ret = select(FD_SETSIZE, &rfds, NULL, NULL, NULL); - sigprocmask(SIG_BLOCK, &sigs, NULL); + 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(); + + 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_reset_listening_sockets(); + nologin = 0; + reloadconfig = 0; + errno = saveerrno; + } + + 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; } - 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; }