X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=06f3ee168967cff731e20debefb6f7f1cb72c561;hb=5a338fdcf3a5f33c7bebba55373172cf0bf2e00e;hp=30a32346238aefc4425c0ba14062ef18dd21aa26;hpb=90b522de5fcc6a95c3352a76d774833a2f1f22c7;p=netatalk.git diff --git a/etc/afpd/main.c b/etc/afpd/main.c index 30a32346..06f3ee16 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -17,8 +17,10 @@ #include #include #include - +#include #include +#include +#include #include @@ -32,8 +34,8 @@ #include #include #include +#include -#include "globals.h" #include "afp_config.h" #include "status.h" #include "fork.h" @@ -54,10 +56,15 @@ 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 */ +static int disasociated_ipc_fd; /* disasociated sessions uses this fd for IPC */ + #ifdef TRU64 void afp_get_cmdline( int *ac, char ***av) { @@ -66,54 +73,80 @@ 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); } + fdset_add_fd(&fdset, &polldata, &fdset_used, &fdset_size, disasociated_ipc_fd, DISASOCIATED_IPC_FD, NULL); } +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); + } + fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, disasociated_ipc_fd); +} + /* ------------------ */ static void afp_goaway(int sig) { + AFPConfig *config; #ifndef NO_DDP asp_kill(sig); #endif /* ! NO_DDP */ - dsi_kill(sig); switch( sig ) { - case SIGTERM : - LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM"); - AFPConfig *config; + case SIGTERM: + case SIGQUIT: + switch (sig) { + case SIGTERM: + LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM"); + break; + case SIGQUIT: + LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGQUIT, NOT disconnecting clients"); + break; + } + if (server_children) + server_child_kill(server_children, CHILD_DSIFORK, sig); + for (config = configs; config; config = config->next) if (config->server_cleanup) config->server_cleanup(config); - afp_exit(0); + server_unlock(default_options.pidfile); + exit(0); break; case SIGUSR1 : nologin++; auth_unload(); LOG(log_info, logtype_afpd, "disallowing logins"); + + if (server_children) + server_child_kill(server_children, CHILD_DSIFORK, sig); break; case SIGHUP : @@ -129,7 +162,54 @@ static void afp_goaway(int sig) 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); + } + } +} + +static int setlimits(void) +{ + struct rlimit rlim; + + if (getrlimit(RLIMIT_NOFILE, &rlim) != 0) { + LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno)); + exit(1); + } + if (rlim.rlim_cur != RLIM_INFINITY && rlim.rlim_cur < 65535) { + rlim.rlim_cur = 65535; + if (rlim.rlim_max != RLIM_INFINITY && rlim.rlim_max < 65535) + rlim.rlim_max = 65535; + if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { + LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno)); + exit(1); + } + } + return 0; } int main(int ac, char **av) @@ -170,6 +250,7 @@ int main(int ac, char **av) default: /* server */ exit(0); } + atexit(afp_exit); /* install child handler for asp and dsi. we do this before afp_goaway * as afp_goaway references stuff from here. @@ -177,11 +258,10 @@ int main(int ac, 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); } memset(&sv, 0, sizeof(sv)); -#ifdef AFP3x /* 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 @@ -189,9 +269,8 @@ 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) ); - afp_exit(EXITERR_SYS); + exit(EXITERR_SYS); } -#endif #endif sv.sa_handler = child_handler; @@ -200,11 +279,11 @@ int main(int ac, char **av) sigaddset(&sv.sa_mask, SIGHUP); sigaddset(&sv.sa_mask, SIGTERM); sigaddset(&sv.sa_mask, SIGUSR1); - + sigaddset(&sv.sa_mask, SIGQUIT); sv.sa_flags = SA_RESTART; 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; @@ -213,10 +292,11 @@ int main(int ac, char **av) sigaddset(&sv.sa_mask, SIGTERM); sigaddset(&sv.sa_mask, SIGHUP); sigaddset(&sv.sa_mask, SIGCHLD); + sigaddset(&sv.sa_mask, SIGQUIT); sv.sa_flags = SA_RESTART; 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 ); @@ -224,10 +304,11 @@ int main(int ac, char **av) sigaddset(&sv.sa_mask, SIGTERM); sigaddset(&sv.sa_mask, SIGUSR1); sigaddset(&sv.sa_mask, SIGCHLD); + sigaddset(&sv.sa_mask, SIGQUIT); sv.sa_flags = SA_RESTART; if ( sigaction( SIGHUP, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - afp_exit(EXITERR_SYS); + exit(EXITERR_SYS); } @@ -236,10 +317,23 @@ int main(int ac, char **av) sigaddset(&sv.sa_mask, SIGHUP); sigaddset(&sv.sa_mask, SIGUSR1); sigaddset(&sv.sa_mask, SIGCHLD); + sigaddset(&sv.sa_mask, SIGQUIT); sv.sa_flags = SA_RESTART; if ( sigaction( SIGTERM, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - afp_exit(EXITERR_SYS); + exit(EXITERR_SYS); + } + + sigemptyset( &sv.sa_mask ); + sigaddset(&sv.sa_mask, SIGALRM); + sigaddset(&sv.sa_mask, SIGHUP); + sigaddset(&sv.sa_mask, SIGUSR1); + sigaddset(&sv.sa_mask, SIGCHLD); + sigaddset(&sv.sa_mask, SIGTERM); + sv.sa_flags = SA_RESTART; + if (sigaction(SIGQUIT, &sv, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); + exit(EXITERR_SYS); } /* afpd.conf: not in config file: lockfile, connections, configfile @@ -263,7 +357,7 @@ int main(int ac, char **av) pthread_sigmask(SIG_BLOCK, &sigs, NULL); if (!(configs = configinit(&default_options))) { LOG(log_error, logtype_afpd, "main: no servers configured"); - afp_exit(EXITERR_CONF); + exit(EXITERR_CONF); } pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); @@ -271,10 +365,15 @@ int main(int ac, char **av) 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); + disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC); + fd_set_listening_sockets(); + + /* set limits */ + (void)setlimits(); + + afp_child_t *child; + int fd[2]; /* we only use one, but server_child_add expects [2] */ + pid_t pid; /* wait for an appleshare connection. parent remains in the loop * while the children get handled by afp_over_{asp,dsi}. this is @@ -283,16 +382,16 @@ int main(int ac, char **av) * afterwards. establishing timeouts for logins is a possible * solution. */ while (1) { - rfds = save_rfds; + LOG(log_maxdebug, logtype_afpd, "main: polling %i fds", fdset_used); pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); - ret = select(FD_SETSIZE, &rfds, NULL, NULL, NULL); + ret = poll(fdset, fdset_used, -1); pthread_sigmask(SIG_BLOCK, &sigs, NULL); int saveerrno = errno; if (reloadconfig) { nologin++; auth_unload(); - AFPConfig *config; + fd_reset_listening_sockets(); LOG(log_info, logtype_afpd, "re-reading configuration file"); for (config = configs; config; config = config->next) @@ -304,13 +403,19 @@ int main(int ac, char **av) configfree(configs, NULL); if (!(configs = configinit(&default_options))) { LOG(log_error, logtype_afpd, "config re-read: no servers configured"); - afp_exit(EXITERR_CONF); + exit(EXITERR_CONF); } - set_fd(Ipc_fd); + + fd_set_listening_sockets(); + nologin = 0; reloadconfig = 0; errno = saveerrno; + continue; } + + if (ret == 0) + continue; if (ret < 0) { if (errno == EINTR) @@ -318,17 +423,63 @@ int main(int ac, char **av) 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 | POLLERR | POLLHUP)) { + 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 (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 (child->disasociated) { + LOG(log_note, logtype_afpd, "main: removing reattached child[%u]", child->pid); + server_child_remove(server_children, CHILD_DSIFORK, child->pid); + } + } + break; + + 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; + } + child->disasociated = 1; + fdset_add_fd(&fdset, &polldata, &fdset_used, &fdset_size, fd[0], IPC_FD, child); + break; + + default: + LOG(log_debug, logtype_afpd, "main: IPC request for unknown type"); + break; + } /* switch */ + } /* if */ + } /* for (i)*/ + } /* while (1) */ return 0; }