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=e2a353e9bb2630c5911876aa7e19b93a9d3951cd;hb=e9391ff790167e35ff92adc20d4779f1d9d651aa;hpb=32edf1c8a1cc9f061d8b8bb5fb9f179c34fa26f4 diff --git a/etc/afpd/main.c b/etc/afpd/main.c index e2a353e9..e612a01c 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -38,26 +38,19 @@ #include "fork.h" #include "uam_auth.h" #include "afp_zeroconf.h" -#include "spotlight.h" +#include "afpstats.h" -#define AFP_LISTENERS 32 -#define FDSET_SAFETY 5 +#define ASEV_THRESHHOLD 10 unsigned char nologin = 0; static AFPObj obj; -static server_child *server_children; +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 *server_children); +static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child_t *server_children); static void afp_exit(int ret) { @@ -68,42 +61,39 @@ static void afp_exit(int 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) { 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; } /* ------------------ */ @@ -113,22 +103,9 @@ 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 (obj.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); - + server_child_kill(server_children, SIGTERM); _exit(0); break; @@ -138,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 : @@ -160,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 @@ -168,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)); @@ -186,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); + } } } @@ -211,8 +189,6 @@ static int setlimits(void) int main(int ac, char **av) { - fd_set rfds; - void *ipc; struct sigaction sv; sigset_t sigs; int ret; @@ -235,7 +211,7 @@ int main(int ac, char **av) /* 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(obj.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) ); afp_exit(EXITERR_SYS); } @@ -254,6 +230,13 @@ int main(int ac, char **av) 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 */ @@ -336,6 +319,11 @@ int main(int ac, char **av) sigaddset(&sigs, SIGCHLD); pthread_sigmask(SIG_BLOCK, &sigs, NULL); +#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"); afp_exit(EXITERR_CONF); @@ -344,23 +332,17 @@ int main(int ac, char **av) /* Initialize */ cnid_init(); - sl_mod_load(_PATH_AFPDUAMPATH "mod_spotlight.so"); /* watch atp, dsi sockets and ipc parent/child file descriptor. */ - - if (obj.options.flags & OPTION_KEEPSESSIONS) { - LOG(log_note, logtype_afpd, "Activating continous service"); - disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC); + if (!(init_listening_sockets(&obj))) { + LOG(log_error, logtype_afpd, "main: couldn't initialize socket handler"); + afp_exit(EXITERR_CONF); } - fd_set_listening_sockets(&obj); - /* set limits */ (void)setlimits(); afp_child_t *child; - int recon_ipc_fd; - pid_t pid; int saveerrno; /* wait for an appleshare connection. parent remains in the loop @@ -370,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; @@ -384,18 +365,29 @@ int main(int ac, char **av) if (reloadconfig) { nologin++; - auth_unload(); - fd_reset_listening_sockets(&obj); + + 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(&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"); afp_exit(EXITERR_CONF); } - fd_set_listening_sockets(&obj); + if (!(init_listening_sockets(&obj))) { + LOG(log_error, logtype_afpd, "main: couldn't initialize socket handler"); + afp_exit(EXITERR_CONF); + } nologin = 0; reloadconfig = 0; @@ -413,66 +405,43 @@ int main(int ac, char **av) break; } - for (int i = 0; i < fdset_used; i++) { - if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP | POLLNVAL)) { - 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(&obj, (DSI *)polldata[i].data, server_children)) { - /* Add IPC fd to select fd set */ - fdset_add_fd(obj.options.connections + AFP_LISTENERS + FDSET_SAFETY, - &fdset, - &polldata, - &fdset_used, - &fdset_size, - child->ipc_fd, - 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 (ipc_server_read(server_children, child->ipc_fd) != 0) { - fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, child->ipc_fd); - close(child->ipc_fd); - child->ipc_fd = -1; - if ((obj.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); + 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 DISASOCIATED_IPC_FD: - LOG(log_debug, logtype_afpd, "main: IPC reconnect request"); - if ((recon_ipc_fd = accept(disasociated_ipc_fd, NULL, NULL)) == -1) { - LOG(log_error, logtype_afpd, "main: accept: %s", strerror(errno)); - break; - } - if (readt(recon_ipc_fd, &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) { - LOG(log_error, logtype_afpd, "main: readt: %s", strerror(errno)); - close(recon_ipc_fd); - break; - } - LOG(log_note, logtype_afpd, "main: IPC reconnect from pid [%u]", pid); + case IPC_FD: + child = (afp_child_t *)(asev->data[i].private); + LOG(log_debug, logtype_afpd, "main: IPC request from child[%u]", child->afpch_pid); - if ((child = server_child_add(server_children, CHILD_DSIFORK, pid, recon_ipc_fd)) == NULL) { - LOG(log_error, logtype_afpd, "main: server_child_add"); - close(recon_ipc_fd); - 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(obj.options.connections + AFP_LISTENERS + FDSET_SAFETY, - &fdset, - &polldata, - &fdset_used, - &fdset_size, - recon_ipc_fd, - IPC_FD, - child); break; default: @@ -486,7 +455,7 @@ int main(int ac, char **av) return 0; } -static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *server_children) +static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child_t *server_children) { afp_child_t *child = NULL;