#include <atalk/server_ipc.h>
#include <atalk/errchk.h>
#include <atalk/globals.h>
+#include <atalk/netatalk_conf.h>
#include "afp_config.h"
#include "status.h"
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;
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);
+ server_unlock(_PATH_AFPDLOCK);
+ exit(ret);
}
*/
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,
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");
if (server_children)
server_child_kill(server_children, CHILD_DSIFORK, sig);
- dsi_cleanup(AFPObj);
- server_unlock(AFPObj->options.pidfile);
- exit(0);
+ server_unlock(_PATH_AFPDLOCK);
+ _exit(0);
break;
case SIGUSR1 :
int ret;
/* Parse argv args and initialize default options */
- AFPObj.argc = ac;
- AFPObj.argv = av;
- if (!afp_config_parse(&AFPObj))
- exit(EXITERR_CONF);
+ afp_options_parse_cmdline(&obj, ac, av);
if (check_lockfile("afpd", _PATH_AFPDLOCK) != 0)
exit(EXITERR_SYS);
- if (!(AFPObj.options.flags & OPTION_DEBUG) && (daemonize(0, 0) != 0))
+ if (!(obj.options.flags & OPTION_DEBUG) && (daemonize(0, 0) != 0))
exit(EXITERR_SYS);
if (create_lockfile("afpd", _PATH_AFPDLOCK) != 0)
/* Log SIGBUS/SIGSEGV SBT */
fault_setup(NULL);
- atexit(afp_exit);
+
+ if (afp_config_parse(&obj) != 0)
+ afp_exit(EXITERR_CONF);
+
+ set_processname("afpd");
+ setuplog(obj.options.logconfig, obj.options.logfile);
/* 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);
}
memset(&sv, 0, sizeof(sv));
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
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 );
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 );
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 );
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 );
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
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);
/* watch atp, dsi sockets and ipc parent/child file descriptor. */
- if (AFPObj.options.flags & OPTION_KEEPSESSIONS) {
+ if (obj.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(&AFPObj);
+ fd_set_listening_sockets(&obj);
/* set limits */
(void)setlimits();
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;
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_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 ((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;
}
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,
return 0;
}
+
+static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *server_children)
+{
+ afp_child_t *child = NULL;
+
+ if (!(child = dsi_getsession(dsi,
+ server_children,
+ obj->options.tickleval))) {
+ LOG(log_error, logtype_afpd, "dsi_start: session error: %s", strerror(errno));
+ return NULL;
+ }
+
+ /* we've forked. */
+ if (child->ipc_fds[0] == -1) {
+ configfree(obj, dsi);
+ obj->ipc_fd = child->ipc_fds[1];
+ free(child);
+ afp_over_dsi(obj); /* start a session */
+ exit (0);
+ }
+
+ return child;
+}
projects / netatalk.git / blobdiff