X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=1c5c4c425e4359e96e3ceea8539d574cbb52ef2c;hp=80b475b17e897690b05e9c22b1e28225a4875321;hb=d2da4b77412a33dc2d62c7877e7b331285dadab6;hpb=85eb0fd28ff87289d2f49a0230c07e7a7c56e101 diff --git a/etc/afpd/main.c b/etc/afpd/main.c index 80b475b1..1c5c4c42 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "afp_config.h" #include "status.h" @@ -43,7 +44,7 @@ unsigned char nologin = 0; -static AFPObj AFPObj; +static AFPObj obj; static server_child *server_children; static sig_atomic_t reloadconfig = 0; static sig_atomic_t gotsigchld = 0; @@ -55,12 +56,11 @@ 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 */ -/* This is registered with atexit() */ -static void afp_exit(void) +static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *server_children); + +static void afp_exit(int ret) { - if (parent_or_child == 0) - /* Only do this in the parent */ - server_unlock(default_options.pidfile); + exit(ret); } @@ -69,7 +69,7 @@ static void afp_exit(void) */ static void fd_set_listening_sockets(const AFPObj *config) { - const DSI *dsi; + DSI *dsi; for (dsi = config->dsi; dsi; dsi = dsi->next) { fdset_add_fd(config->options.connections + AFP_LISTENERS + FDSET_SAFETY, @@ -117,7 +117,7 @@ static void afp_goaway(int sig) LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM"); break; case SIGQUIT: - if (default_options.flags & OPTION_KEEPSESSIONS) { + 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"); @@ -128,9 +128,7 @@ static void afp_goaway(int sig) if (server_children) server_child_kill(server_children, CHILD_DSIFORK, sig); - dsi_cleanup(AFPObj); - server_unlock(AFPObj->options.pidfile); - exit(0); + _exit(0); break; case SIGUSR1 : @@ -219,35 +217,30 @@ int main(int ac, char **av) 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); + afp_options_parse_cmdline(&obj, ac, av); - if (!(AFPObj.options.flags & OPTION_DEBUG) && (daemonize(0, 0) != 0)) - exit(EXITERR_SYS); - - 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, CHILD_NFORKS))) { 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,7 +250,7 @@ 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 @@ -272,7 +265,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 +277,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 +289,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 +301,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 +313,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,9 +335,9 @@ int main(int ac, char **av) sigaddset(&sigs, SIGCHLD); pthread_sigmask(SIG_BLOCK, &sigs, NULL); - if (configinit(&AFPObj) != 0) { + 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); @@ -353,18 +346,18 @@ int main(int ac, char **av) /* watch atp, dsi sockets and ipc parent/child file descriptor. */ - if (AFPObj.options.flags & OPTION_KEEPSESSIONS) { - LOG(log_note, logtype_afpd, "Activating continous service"); + if (obj.options.flags & OPTION_KEEPSESSIONS) { + LOG(log_note, logtype_afpd, "Activating continuous service"); disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC); } - fd_set_listening_sockets(&AFPObj); + fd_set_listening_sockets(&obj); /* set limits */ (void)setlimits(); 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; @@ -390,19 +383,17 @@ int main(int ac, char **av) if (reloadconfig) { nologin++; auth_unload(); - fd_reset_listening_sockets(&AFPObj); + fd_reset_listening_sockets(&obj); 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); + 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); + fd_set_listening_sockets(&obj); nologin = 0; reloadconfig = 0; @@ -421,18 +412,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(AFPObj, (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(AFPObj.options.connections + AFP_LISTENERS + FDSET_SAFETY, + fdset_add_fd(obj.options.connections + AFP_LISTENERS + FDSET_SAFETY, &fdset, &polldata, &fdset_used, &fdset_size, - child->ipc_fds[0], + child->ipc_fd, IPC_FD, child); } @@ -442,11 +433,11 @@ int main(int ac, char **av) 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) { + 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); } @@ -455,28 +446,29 @@ int main(int ac, char **av) case DISASOCIATED_IPC_FD: LOG(log_debug, logtype_afpd, "main: IPC reconnect request"); - if ((fd[0] = accept(disasociated_ipc_fd, NULL, NULL)) == -1) { + if ((recon_ipc_fd = 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)) { + 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(fd[0]); + close(recon_ipc_fd); 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) { + + if ((child = server_child_add(server_children, CHILD_DSIFORK, pid, recon_ipc_fd)) == NULL) { LOG(log_error, logtype_afpd, "main: server_child_add"); - close(fd[0]); + close(recon_ipc_fd); break; } child->disasociated = 1; - fdset_add_fd(AFPObj.options.connections + AFP_LISTENERS + FDSET_SAFETY, + fdset_add_fd(obj.options.connections + AFP_LISTENERS + FDSET_SAFETY, &fdset, &polldata, &fdset_used, &fdset_size, - fd[0], + recon_ipc_fd, IPC_FD, child); break; @@ -491,3 +483,22 @@ int main(int ac, char **av) return 0; } + +static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *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; +}