#include <atalk/util.h>
#include <atalk/server_child.h>
#include <atalk/server_ipc.h>
+#include <atalk/globals.h>
-#include "globals.h"
#include "afp_config.h"
#include "status.h"
#include "fork.h"
static char **argv = NULL;
#endif /* TRU64 */
-unsigned char nologin = 0;
+#define AFP_LISTENERS 32
+#define FDSET_SAFETY 5
+unsigned char nologin = 0;
struct afp_options default_options;
static AFPConfig *configs;
static server_child *server_children;
static sig_atomic_t reloadconfig = 0;
+static sig_atomic_t gotsigchld = 0;
/* Two pointers to dynamic allocated arrays which store pollfds and associated data */
static struct pollfd *fdset;
for (config = configs; config; config = config->next) {
if (config->fd < 0) /* for proxies */
continue;
- fdset_add_fd(&fdset, &polldata, &fdset_used, &fdset_size, config->fd, LISTEN_FD, config);
+ fdset_add_fd(default_options.connections + AFP_LISTENERS + FDSET_SAFETY,
+ &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);
+
+ if (default_options.flags & OPTION_KEEPSESSIONS)
+ fdset_add_fd(default_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(void)
continue;
fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, config->fd);
}
- fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, disasociated_ipc_fd);
+
+ if (default_options.flags & OPTION_KEEPSESSIONS)
+ fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, disasociated_ipc_fd);
}
/* ------------------ */
switch( sig ) {
- case SIGTERM :
- LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM");
-
+ 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;
+ }
if (server_children)
server_child_kill(server_children, CHILD_DSIFORK, sig);
exit(0);
break;
- case SIGQUIT:
- LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGQUIT, NOT disconnecting clients");
-
- for (config = configs; config; config = config->next)
- if (config->server_cleanup)
- config->server_cleanup(config);
-
- server_unlock(default_options.pidfile);
- exit(0);
- break;
-
case SIGUSR1 :
nologin++;
auth_unload();
reloadconfig = 1;
break;
+ case SIGCHLD:
+ /* w/ a configuration file, we can force a re-read if we want */
+ gotsigchld = 1;
+ break;
+
default :
LOG(log_error, logtype_afpd, "afp_goaway: bad signal" );
}
return;
}
-static void child_handler(int sig _U_)
+static void child_handler(void)
{
int fd;
int status, i;
}
#endif
- sv.sa_handler = child_handler;
+ sv.sa_handler = afp_goaway; /* handler for all sigs */
+
sigemptyset( &sv.sa_mask );
sigaddset(&sv.sa_mask, SIGALRM);
sigaddset(&sv.sa_mask, SIGHUP);
exit(EXITERR_SYS);
}
- sv.sa_handler = afp_goaway;
sigemptyset( &sv.sa_mask );
sigaddset(&sv.sa_mask, SIGALRM);
sigaddset(&sv.sa_mask, SIGTERM);
cnid_init();
/* watch atp, dsi sockets and ipc parent/child file descriptor. */
- disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC);
+
+ if (default_options.flags & OPTION_KEEPSESSIONS) {
+ LOG(log_note, logtype_afpd, "Activating continous service");
+ disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC);
+ }
+
fd_set_listening_sockets();
/* set limits */
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
* while the children get handled by afp_over_{asp,dsi}. this is
pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
ret = poll(fdset, fdset_used, -1);
pthread_sigmask(SIG_BLOCK, &sigs, NULL);
- int saveerrno = errno;
+ saveerrno = errno;
+
+ if (gotsigchld) {
+ gotsigchld = 0;
+ child_handler();
+ continue;
+ }
if (reloadconfig) {
nologin++;
/* 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);
+ fdset_add_fd(default_options.connections + AFP_LISTENERS + FDSET_SAFETY,
+ &fdset,
+ &polldata,
+ &fdset_used,
+ &fdset_size,
+ child->ipc_fds[0],
+ IPC_FD,
+ child);
}
break;
case IPC_FD:
child = (afp_child_t *)polldata[i].data;
- if (fdset[i].revents & POLLIN) {
- LOG(log_debug, logtype_afpd, "main: IPC request from child[%u]", child->pid);
- if ((ret = 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)
- server_child_remove(server_children, CHILD_DSIFORK, child->pid);
- }
- } else {
- if (child->disasociated) {
- fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, child->ipc_fds[0]);
- close(child->ipc_fds[0]);
- child->ipc_fds[0] = -1;
+ 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 ((default_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;
case DISASOCIATED_IPC_FD:
- LOG(log_note, logtype_afpd, "main: DISASOCIATED_IPC_FD request");
+ 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);
+ fdset_add_fd(default_options.connections + AFP_LISTENERS + FDSET_SAFETY,
+ &fdset,
+ &polldata,
+ &fdset_used,
+ &fdset_size,
+ fd[0],
+ IPC_FD,
+ child);
break;
default:
projects / netatalk.git / blobdiff