X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=516adf16c6f19d43941b9bf37071594fe2f219f0;hp=550a809f82a61ca7c8f85b3d001a16fc1d3e62cd;hb=42eb54de3f6373cd394fbd6abfb86d85c8dde935;hpb=b3c52ea7097b09cafe6002acca2c996f1f5ea2fb diff --git a/etc/afpd/main.c b/etc/afpd/main.c index 550a809f..516adf16 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -38,6 +38,7 @@ #include "fork.h" #include "uam_auth.h" #include "afp_zeroconf.h" +#include "afpstats.h" #define AFP_LISTENERS 32 #define FDSET_SAFETY 5 @@ -45,7 +46,7 @@ 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; @@ -54,9 +55,8 @@ 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) { @@ -81,16 +81,6 @@ static void fd_set_listening_sockets(const AFPObj *config) LISTEN_FD, dsi); } - - 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); } static void fd_reset_listening_sockets(const AFPObj *config) @@ -100,9 +90,6 @@ static void fd_reset_listening_sockets(const AFPObj *config) for (dsi = config->dsi; dsi; dsi = dsi->next) { fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, dsi->serversock); } - - if (config->options.flags & OPTION_KEEPSESSIONS) - fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, disasociated_ipc_fd); } /* ------------------ */ @@ -112,22 +99,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; @@ -137,7 +111,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 : @@ -167,11 +141,9 @@ 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 ((fd = server_child_remove(server_children, pid)) != -1) { + fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, fd); + break; } if (WIFEXITED(status)) { @@ -210,8 +182,6 @@ static int setlimits(void) int main(int ac, char **av) { - fd_set rfds; - void *ipc; struct sigaction sv; sigset_t sigs; int ret; @@ -234,7 +204,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); } @@ -253,6 +223,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 */ @@ -343,21 +320,21 @@ int main(int ac, char **av) /* Initialize */ cnid_init(); - - /* 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); - } + /* watch atp, dsi sockets and ipc parent/child file descriptor. */ fd_set_listening_sockets(&obj); /* set limits */ (void)setlimits(); +#ifdef HAVE_DBUS_GLIB + /* Run dbus AFP statics thread */ + if (obj.options.flags & OPTION_DBUS_AFPSTATS) + (void)afpstats_init(server_children); +#endif + afp_child_t *child; - int fd[2]; /* we only use one, but server_child_add expects [2] */ + int recon_ipc_fd; pid_t pid; int saveerrno; @@ -382,12 +359,17 @@ int main(int ac, char **av) if (reloadconfig) { nologin++; - auth_unload(); + fd_reset_listening_sockets(&obj); 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); @@ -412,18 +394,18 @@ int main(int ac, char **av) } for (int i = 0; i < fdset_used; i++) { - if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP)) { + if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP | POLLNVAL)) { switch (polldata[i].fdtype) { case LISTEN_FD: - if (child = dsi_start(&obj, (DSI *)polldata[i].data, server_children)) { + 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_fds[0], + child->afpch_ipc_fd, IPC_FD, child); } @@ -431,45 +413,13 @@ int main(int ac, char **av) 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 ((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); - } - } - break; + 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) { + fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, child->afpch_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, - fd[0], - IPC_FD, - child); break; default: @@ -483,22 +433,18 @@ 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; - if (!(child = dsi_getsession(dsi, - server_children, - obj->options.tickleval))) { + 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->ipc_fds[0] == -1) { + if (child == NULL) { configfree(obj, dsi); - obj->ipc_fd = child->ipc_fds[1]; - free(child); afp_over_dsi(obj); /* start a session */ exit (0); }