X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=e612a01cae9615f3264378d4df11ff37a4832fa6;hp=80b475b17e897690b05e9c22b1e28225a4875321;hb=e9391ff790167e35ff92adc20d4779f1d9d651aa;hpb=85eb0fd28ff87289d2f49a0230c07e7a7c56e101 diff --git a/etc/afpd/main.c b/etc/afpd/main.c index 80b475b1..e612a01c 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -31,78 +31,69 @@ #include #include #include +#include #include "afp_config.h" #include "status.h" #include "fork.h" #include "uam_auth.h" #include "afp_zeroconf.h" +#include "afpstats.h" -#define AFP_LISTENERS 32 -#define FDSET_SAFETY 5 +#define ASEV_THRESHHOLD 10 unsigned char nologin = 0; -static AFPObj AFPObj; -static server_child *server_children; +static AFPObj obj; +static server_child_t *server_children; static sig_atomic_t reloadconfig = 0; static sig_atomic_t gotsigchld = 0; +static struct asev *asev; -/* 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 */ -static int disasociated_ipc_fd; /* disasociated sessions uses this fd for IPC */ +static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child_t *server_children); -/* This is registered with atexit() */ -static void afp_exit(void) +static void afp_exit(int ret) { - if (parent_or_child == 0) - /* Only do this in the parent */ - server_unlock(default_options.pidfile); + exit(ret); } /* ------------------ initialize fd set we are waiting for. */ -static void fd_set_listening_sockets(const AFPObj *config) +static bool init_listening_sockets(const AFPObj *config) { - const DSI *dsi; + DSI *dsi; + int numlisteners; + + for (numlisteners = 0, dsi = config->dsi; dsi; dsi = dsi->next) { + numlisteners++; + } + + asev = asev_init(config->options.connections + numlisteners + ASEV_THRESHHOLD); + if (asev == NULL) { + return false; + } for (dsi = config->dsi; dsi; dsi = dsi->next) { - fdset_add_fd(config->options.connections + AFP_LISTENERS + FDSET_SAFETY, - &fdset, - &polldata, - &fdset_used, - &fdset_size, - dsi->serversock, - LISTEN_FD, - dsi); + if (!(asev_add_fd(asev, dsi->serversock, LISTEN_FD, dsi))) { + return false; + } } - if (config->options.flags & OPTION_KEEPSESSIONS) - fdset_add_fd(config->options.connections + AFP_LISTENERS + FDSET_SAFETY, - &fdset, - &polldata, - &fdset_used, - &fdset_size, - disasociated_ipc_fd, - DISASOCIATED_IPC_FD, - NULL); + return true; } -static void fd_reset_listening_sockets(const AFPObj *config) +static bool reset_listening_sockets(const AFPObj *config) { const DSI *dsi; for (dsi = config->dsi; dsi; dsi = dsi->next) { - fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, dsi->serversock); + if (!(asev_del_fd(asev, dsi->serversock))) { + return false; + } } - - if (config->options.flags & OPTION_KEEPSESSIONS) - fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, disasociated_ipc_fd); + return true; } /* ------------------ */ @@ -112,25 +103,10 @@ static void afp_goaway(int sig) case SIGTERM: case SIGQUIT: - switch (sig) { - case SIGTERM: - LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM"); - break; - case SIGQUIT: - if (default_options.flags & OPTION_KEEPSESSIONS) { - LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGQUIT, NOT disconnecting clients"); - } else { - LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGQUIT"); - sig = SIGTERM; - } - break; - } + LOG(log_note, logtype_afpd, "AFP Server shutting down"); if (server_children) - server_child_kill(server_children, CHILD_DSIFORK, sig); - - dsi_cleanup(AFPObj); - server_unlock(AFPObj->options.pidfile); - exit(0); + server_child_kill(server_children, SIGTERM); + _exit(0); break; case SIGUSR1 : @@ -139,7 +115,7 @@ static void afp_goaway(int sig) LOG(log_info, logtype_afpd, "disallowing logins"); if (server_children) - server_child_kill(server_children, CHILD_DSIFORK, sig); + server_child_kill(server_children, sig); break; case SIGHUP : @@ -161,7 +137,7 @@ static void afp_goaway(int sig) static void child_handler(void) { int fd; - int status, i; + int status; pid_t pid; #ifndef WAIT_ANY @@ -169,13 +145,6 @@ static void child_handler(void) #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)); @@ -187,6 +156,14 @@ static void child_handler(void) else LOG(log_info, logtype_afpd, "child[%d]: died", pid); } + + fd = server_child_remove(server_children, pid); + if (fd == -1) { + continue; + } + if (!(asev_del_fd(asev, fd))) { + LOG(log_error, logtype_afpd, "child[%d]: asev_del_fd: %d", pid, fd); + } } } @@ -212,42 +189,35 @@ static int setlimits(void) int main(int ac, char **av) { - fd_set rfds; - void *ipc; struct sigaction sv; sigset_t sigs; int ret; /* Parse argv args and initialize default options */ - AFPObj.argc = ac; - AFPObj.argv = av; - if (!afp_config_parse(&AFPObj)) - exit(EXITERR_CONF); - - if (check_lockfile("afpd", _PATH_AFPDLOCK) != 0) - exit(EXITERR_SYS); - - if (!(AFPObj.options.flags & OPTION_DEBUG) && (daemonize(0, 0) != 0)) - exit(EXITERR_SYS); + afp_options_parse_cmdline(&obj, ac, av); - if (create_lockfile("afpd", _PATH_AFPDLOCK) != 0) + if (!(obj.cmdlineflags & OPTION_DEBUG) && (daemonize(0, 0) != 0)) exit(EXITERR_SYS); /* Log SIGBUS/SIGSEGV SBT */ fault_setup(NULL); - atexit(afp_exit); + + if (afp_config_parse(&obj, "afpd") != 0) + afp_exit(EXITERR_CONF); /* Save the user's current umask */ - AFPObj.options.save_mask = umask(AFPObj.options.umask); + obj.options.save_mask = umask(obj.options.umask); /* 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(AFPObj.options.connections, - CHILD_NFORKS))) { + if (!(server_children = server_child_alloc(obj.options.connections))) { LOG(log_error, logtype_afpd, "main: server_child alloc: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } + + sigemptyset(&sigs); + pthread_sigmask(SIG_SETMASK, &sigs, NULL); memset(&sv, 0, sizeof(sv)); /* linux at least up to 2.4.22 send a SIGXFZ for vfat fs, @@ -257,9 +227,16 @@ 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) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } #endif + + sv.sa_handler = SIG_IGN; + sigemptyset( &sv.sa_mask ); + if (sigaction(SIGPIPE, &sv, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); + afp_exit(EXITERR_SYS); + } sv.sa_handler = afp_goaway; /* handler for all sigs */ @@ -272,7 +249,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) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -284,7 +261,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) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -296,7 +273,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) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -308,7 +285,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) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -320,10 +297,10 @@ int main(int ac, char **av) sv.sa_flags = SA_RESTART; if (sigaction(SIGQUIT, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } - /* afpd.conf: not in config file: lockfile, connections, configfile + /* afp.conf: not in config file: lockfile, configfile * preference: command-line provides defaults. * config file over-writes defaults. * @@ -342,30 +319,30 @@ int main(int ac, char **av) sigaddset(&sigs, SIGCHLD); pthread_sigmask(SIG_BLOCK, &sigs, NULL); - if (configinit(&AFPObj) != 0) { +#ifdef HAVE_DBUS_GLIB + /* Run dbus AFP statics thread */ + if (obj.options.flags & OPTION_DBUS_AFPSTATS) + (void)afpstats_init(server_children); +#endif + if (configinit(&obj) != 0) { LOG(log_error, logtype_afpd, "main: no servers configured"); - exit(EXITERR_CONF); + afp_exit(EXITERR_CONF); } pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); /* Initialize */ cnid_init(); - - /* watch atp, dsi sockets and ipc parent/child file descriptor. */ - if (AFPObj.options.flags & OPTION_KEEPSESSIONS) { - LOG(log_note, logtype_afpd, "Activating continous service"); - disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC); + /* watch atp, dsi sockets and ipc parent/child file descriptor. */ + if (!(init_listening_sockets(&obj))) { + LOG(log_error, logtype_afpd, "main: couldn't initialize socket handler"); + afp_exit(EXITERR_CONF); } - fd_set_listening_sockets(&AFPObj); - /* set limits */ (void)setlimits(); afp_child_t *child; - int fd[2]; /* we only use one, but server_child_add expects [2] */ - pid_t pid; int saveerrno; /* wait for an appleshare connection. parent remains in the loop @@ -375,9 +352,8 @@ int main(int ac, char **av) * afterwards. establishing timeouts for logins is a possible * solution. */ while (1) { - LOG(log_maxdebug, logtype_afpd, "main: polling %i fds", fdset_used); pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); - ret = poll(fdset, fdset_used, -1); + ret = poll(asev->fdset, asev->used, -1); pthread_sigmask(SIG_BLOCK, &sigs, NULL); saveerrno = errno; @@ -389,20 +365,29 @@ int main(int ac, char **av) if (reloadconfig) { nologin++; - auth_unload(); - fd_reset_listening_sockets(&AFPObj); + + if (!(reset_listening_sockets(&obj))) { + LOG(log_error, logtype_afpd, "main: reset socket handlers"); + afp_exit(EXITERR_CONF); + } LOG(log_info, logtype_afpd, "re-reading configuration file"); - /* configfree close atp socket used for DDP tickle, there's an issue - * with atp tid. */ - configfree(&AFPObj); - if (configinit(&AFPObj) != 0) { + configfree(&obj, NULL); + afp_config_free(&obj); + + if (afp_config_parse(&obj, "afpd") != 0) + afp_exit(EXITERR_CONF); + + if (configinit(&obj) != 0) { LOG(log_error, logtype_afpd, "config re-read: no servers configured"); - exit(EXITERR_CONF); + afp_exit(EXITERR_CONF); } - fd_set_listening_sockets(&AFPObj); + if (!(init_listening_sockets(&obj))) { + LOG(log_error, logtype_afpd, "main: couldn't initialize socket handler"); + afp_exit(EXITERR_CONF); + } nologin = 0; reloadconfig = 0; @@ -420,65 +405,43 @@ int main(int ac, char **av) break; } - for (int i = 0; i < fdset_used; i++) { - if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP)) { - switch (polldata[i].fdtype) { + for (int i = 0; i < asev->used; i++) { + if (asev->fdset[i].revents & (POLLIN | POLLERR | POLLHUP | POLLNVAL)) { + switch (asev->data[i].fdtype) { case LISTEN_FD: - if (child = dsi_start(AFPObj, (DSI *)polldata[i].data, server_children)) { - /* Add IPC fd to select fd set */ - fdset_add_fd(AFPObj.options.connections + AFP_LISTENERS + FDSET_SAFETY, - &fdset, - &polldata, - &fdset_used, - &fdset_size, - child->ipc_fds[0], - IPC_FD, - child); + if ((child = dsi_start(&obj, (DSI *)(asev->data[i].private), server_children))) { + if (!(asev_add_fd(asev, child->afpch_ipc_fd, IPC_FD, child))) { + LOG(log_error, logtype_afpd, "out of asev slots"); + + /* + * Close IPC fd here and mark it as unused + */ + close(child->afpch_ipc_fd); + child->afpch_ipc_fd = -1; + + /* + * Being unfriendly here, but we really + * want to get rid of it. The 'child' + * handle gets cleaned up in the SIGCLD + * handler. + */ + kill(child->afpch_pid, SIGKILL); + } } 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 (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; - if ((AFPObj.options.flags & OPTION_KEEPSESSIONS) && child->disasociated) { - LOG(log_note, logtype_afpd, "main: removing reattached child[%u]", child->pid); - server_child_remove(server_children, CHILD_DSIFORK, child->pid); - } - } - break; + child = (afp_child_t *)(asev->data[i].private); + LOG(log_debug, logtype_afpd, "main: IPC request from child[%u]", child->afpch_pid); - case DISASOCIATED_IPC_FD: - LOG(log_debug, logtype_afpd, "main: IPC reconnect request"); - if ((fd[0] = accept(disasociated_ipc_fd, NULL, NULL)) == -1) { - LOG(log_error, logtype_afpd, "main: accept: %s", strerror(errno)); - break; - } - if (readt(fd[0], &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) { - LOG(log_error, logtype_afpd, "main: readt: %s", strerror(errno)); - close(fd[0]); - break; - } - LOG(log_note, logtype_afpd, "main: IPC reconnect from pid [%u]", pid); - if ((child = server_child_add(server_children, CHILD_DSIFORK, pid, fd)) == NULL) { - LOG(log_error, logtype_afpd, "main: server_child_add"); - close(fd[0]); - break; + if (ipc_server_read(server_children, child->afpch_ipc_fd) != 0) { + if (!(asev_del_fd(asev, child->afpch_ipc_fd))) { + LOG(log_error, logtype_afpd, "child[%u]: no IPC fd"); + } + close(child->afpch_ipc_fd); + child->afpch_ipc_fd = -1; } - child->disasociated = 1; - fdset_add_fd(AFPObj.options.connections + AFP_LISTENERS + FDSET_SAFETY, - &fdset, - &polldata, - &fdset_used, - &fdset_size, - fd[0], - IPC_FD, - child); break; default: @@ -491,3 +454,22 @@ int main(int ac, char **av) return 0; } + +static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child_t *server_children) +{ + afp_child_t *child = NULL; + + if (dsi_getsession(dsi, server_children, obj->options.tickleval, &child) != 0) { + LOG(log_error, logtype_afpd, "dsi_start: session error: %s", strerror(errno)); + return NULL; + } + + /* we've forked. */ + if (child == NULL) { + configfree(obj, dsi); + afp_over_dsi(obj); /* start a session */ + exit (0); + } + + return child; +}