/*
- * $Id: cnid_metad.c,v 1.17 2009-10-18 18:25:13 didg Exp $
- *
* Copyright (C) Joerg Lenneis 2003
- * All Rights Reserved. See COPYING.
+ * Copyright (C) Frank Lahm 2009, 2010
*
+ * All Rights Reserved. See COPYING.
*/
/*
Result:
via TCP socket
4. afpd -------> cnid_dbd
+
+ cnid_metad and cnid_dbd have been converted to non-blocking IO in 2010.
*/
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#include <stdlib.h>
-
-#ifdef HAVE_UNISTD_H
-#define __USE_GNU
#include <unistd.h>
#undef __USE_GNU
-#endif /* HAVE_UNISTD_H */
+
+#include <stdlib.h>
#include <sys/param.h>
#include <errno.h>
#include <string.h>
#include <signal.h>
-#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
#include <sys/uio.h>
-#endif
#include <sys/un.h>
#define _XPG4_2 1
#include <sys/socket.h>
#define USE_SETRESUID 1
#define SWITCH_TO_GID(gid) ((setresgid(gid,gid,gid) < 0 || setgid(gid) < 0) ? -1 : 0)
#define SWITCH_TO_UID(uid) ((setresuid(uid,uid,uid) < 0 || setuid(uid) < 0) ? -1 : 0)
-#endif
-#else
+#endif /* USE_SETRESUID */
+#else /* ! linux */
#ifndef USE_SETEUID
#define USE_SETEUID 1
#define SWITCH_TO_GID(gid) ((setegid(gid) < 0 || setgid(gid) < 0) ? -1 : 0)
#define SWITCH_TO_UID(uid) ((setuid(uid) < 0 || seteuid(uid) < 0 || setuid(uid) < 0) ? -1 : 0)
-#endif
-#endif
+#endif /* USE_SETEUID */
+#endif /* linux */
#include <atalk/util.h>
#include <atalk/logger.h>
#include <atalk/cnid_dbd_private.h>
+#include <atalk/paths.h>
#include "db_param.h"
#include "usockfd.h"
static int srvfd;
static int rqstfd;
-static volatile sig_atomic_t alarmed = 0;
+static volatile sig_atomic_t sigchild = 0;
#define MAXSPAWN 3 /* Max times respawned in.. */
#define TESTTIME 42 /* this much seconds apfd client tries to *
* to reconnect every 5 secondes, catch it */
#define MAXVOLS 512
#define DEFAULTHOST "localhost"
-#define DEFAULTPORT 4700
+#define DEFAULTPORT "4700"
struct server {
char *name;
/* Default logging config: log to syslog with level log_note */
static char logconfig[MAXPATHLEN + 21 + 1] = "default log_note";
+static void daemon_exit(int i)
+{
+ server_unlock(_PATH_CNID_METAD_LOCK);
+ exit(i);
+}
+
+/* ------------------ */
+static void sigterm_handler(int sig)
+{
+ switch( sig ) {
+ case SIGTERM :
+ LOG(log_info, logtype_afpd, "shutting down on signal %d", sig );
+ break;
+ default :
+ LOG(log_error, logtype_afpd, "unexpected signal: %d", sig);
+ }
+ daemon_exit(0);
+}
+
static struct server *test_usockfn(char *dir)
{
int i;
else {
ret = execlp(dbdpn, dbdpn, dbdir, buf1, buf2, logconfig, NULL);
}
- if (ret < 0) {
- LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno));
- exit(0);
- }
+ /* Yikes! We're still here, so exec failed... */
+ LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno));
+ daemon_exit(0);
}
/*
* Parent.
}
/* ------------------ */
-static void catch_alarm(int sig _U_) {
- alarmed = 1;
+static void catch_child(int sig _U_)
+{
+ sigchild = 1;
+}
+
+/* ----------------------- */
+static void set_signal(void)
+{
+ struct sigaction sv;
+ sigset_t set;
+
+ memset(&sv, 0, sizeof(sv));
+
+ /* Catch SIGCHLD */
+ sv.sa_handler = catch_child;
+ sv.sa_flags = SA_NOCLDSTOP;
+ sigemptyset(&sv.sa_mask);
+ if (sigaction(SIGCHLD, &sv, NULL) < 0) {
+ LOG(log_error, logtype_cnid, "cnid_metad: sigaction: %s", strerror(errno));
+ daemon_exit(EXITERR_SYS);
+ }
+
+ /* Catch SIGTERM */
+ sv.sa_handler = sigterm_handler;
+ sigfillset(&sv.sa_mask );
+ if (sigaction(SIGTERM, &sv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "sigaction: %s", strerror(errno) );
+ daemon_exit(EXITERR_SYS);
+ }
+
+ /* Ignore the rest */
+ sv.sa_handler = SIG_IGN;
+ sigemptyset(&sv.sa_mask );
+ if (sigaction(SIGALRM, &sv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "sigaction: %s", strerror(errno) );
+ daemon_exit(EXITERR_SYS);
+ }
+ sv.sa_handler = SIG_IGN;
+ sigemptyset(&sv.sa_mask );
+ if (sigaction(SIGHUP, &sv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "sigaction: %s", strerror(errno) );
+ daemon_exit(EXITERR_SYS);
+ }
+ sv.sa_handler = SIG_IGN;
+ sigemptyset(&sv.sa_mask );
+ if (sigaction(SIGUSR1, &sv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "sigaction: %s", strerror(errno) );
+ daemon_exit(EXITERR_SYS);
+ }
+ sv.sa_handler = SIG_IGN;
+ sigemptyset(&sv.sa_mask );
+ if (sigaction(SIGUSR2, &sv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "sigaction: %s", strerror(errno) );
+ daemon_exit(EXITERR_SYS);
+ }
+ sv.sa_handler = SIG_IGN;
+ sigemptyset(&sv.sa_mask );
+ if (sigaction(SIGPIPE, &sv, NULL ) < 0 ) {
+ LOG(log_error, logtype_afpd, "sigaction: %s", strerror(errno) );
+ daemon_exit(EXITERR_SYS);
+ }
+
+ /* block everywhere but in pselect */
+ sigemptyset(&set);
+ sigaddset(&set, SIGCHLD);
+ sigprocmask(SIG_BLOCK, &set, NULL);
}
/* ------------------ */
int status;
char *dbdpn = _PATH_CNID_DBD;
char *host = DEFAULTHOST;
- u_int16_t port = DEFAULTPORT;
+ char *port = DEFAULTPORT;
struct db_param *dbp;
int i;
int cc;
int ret;
char *loglevel = NULL;
char *logfile = NULL;
+ sigset_t set;
set_processname("cnid_metad");
}
break;
case 'p':
- port = atoi(optarg);
+ port = strdup(optarg);
break;
case 's':
dbdpn = strdup(optarg);
if (err) {
LOG(log_error, logtype_cnid, "main: bad arguments");
- exit(1);
+ daemon_exit(1);
}
- if (!debug) {
-
- switch (fork()) {
- case 0 :
- fclose(stdin);
- fclose(stdout);
- fclose(stderr);
-
-#ifdef TIOCNOTTY
- {
- int i;
- if (( i = open( "/dev/tty", O_RDWR )) >= 0 ) {
- (void)ioctl( i, TIOCNOTTY, 0 );
- setpgid( 0, getpid());
- (void) close(i);
- }
- }
-#else
- setpgid( 0, getpid());
-#endif
- break;
- case -1 : /* error */
- LOG(log_error, logtype_cnid, "detach from terminal: %s", strerror(errno));
- exit(1);
- default : /* server */
- exit(0);
- }
+ /* Check PID lockfile and become a daemon */
+ switch(server_lock("cnid_metad", _PATH_CNID_METAD_LOCK, 0)) {
+ case -1: /* error */
+ daemon_exit(EXITERR_SYS);
+ case 0: /* child */
+ break;
+ default: /* server */
+ exit(0);
}
if ((srvfd = tsockfd_create(host, port, 10)) < 0)
- exit(1);
+ daemon_exit(1);
/* switch uid/gid */
if (uid || gid) {
- LOG(log_info, logtype_cnid, "Setting uid/gid to %i/%i", uid, gid);
+ LOG(log_debug, logtype_cnid, "Setting uid/gid to %i/%i", uid, gid);
if (gid) {
if (SWITCH_TO_GID(gid) < 0) {
LOG(log_info, logtype_cnid, "unable to switch to group %d", gid);
- exit(1);
+ daemon_exit(1);
}
}
if (uid) {
if (SWITCH_TO_UID(uid) < 0) {
LOG(log_info, logtype_cnid, "unable to switch to user %d", uid);
- exit(1);
+ daemon_exit(1);
}
}
}
- signal(SIGPIPE, SIG_IGN);
- signal(SIGALRM, catch_alarm);
+ set_signal();
+
+ sigemptyset(&set);
+ sigprocmask(SIG_SETMASK, NULL, &set);
+ sigdelset(&set, SIGCHLD);
while (1) {
- rqstfd = usockfd_check(srvfd, 10000000);
+ rqstfd = usockfd_check(srvfd, &set);
/* Collect zombie processes and log what happened to them */
- while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
+ if (sigchild) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
for (i = 0; i < MAXVOLS; i++) {
if (srv[i].pid == pid) {
srv[i].pid = 0;
LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with signal %i",
pid, WTERMSIG(status));
}
- /* FIXME should */
-
+ sigchild = 0;
}
if (rqstfd <= 0)
continue;
- /* TODO: Check out read errors, broken pipe etc. in libatalk. Is
- SIGIPE ignored there? Answer: Ignored for dsi, but not for asp ... */
- alarm(5); /* to prevent read from getting stuck */
- ret = read(rqstfd, &len, sizeof(int));
- alarm(0);
- if (alarmed) {
- alarmed = 0;
- LOG(log_severe, logtype_cnid, "Read(1) bailed with alarm (timeout)");
- goto loop_end;
- }
+ ret = readt(rqstfd, &len, sizeof(int), 1, 4);
if (!ret) {
/* already close */
goto loop_end;
}
else if (ret < 0) {
- LOG(log_error, logtype_cnid, "error read: %s", strerror(errno));
+ LOG(log_severe, logtype_cnid, "error read: %s", strerror(errno));
goto loop_end;
}
else if (ret != sizeof(int)) {
goto loop_end;
}
- alarm(5);
- actual_len = read(rqstfd, dbdir, len);
- alarm(0);
- if (alarmed) {
- alarmed = 0;
- LOG(log_severe, logtype_cnid, "Read(2) bailed with alarm (timeout)");
+ actual_len = readt(rqstfd, dbdir, len, 1);
+ if (actual_len < 0) {
+ LOG(log_severe, logtype_cnid, "Read(2) error : %s", strerror(errno));
goto loop_end;
}
if (actual_len != len) {
projects / netatalk.git / blobdiff