/*
- * $Id: cnid_metad.c,v 1.9 2009-05-18 09:54:14 franklahm Exp $
+ * $Id: cnid_metad.c,v 1.22 2009-11-16 02:04:47 didg Exp $
*
* Copyright (C) Joerg Lenneis 2003
* All Rights Reserved. See COPYING.
#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>
#define WTERMSIG(status) ((status) & 0x7f)
#endif
-#ifdef ATACC
-#define fork aTaC_fork
-#endif
-
/* functions for username and group */
#include <pwd.h>
#include <grp.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>
static int srvfd;
static int rqstfd;
-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 TESTTIME 22 /* this much seconds apfd client tries to
- * to reconnect every 5 secondes, catch it
- */
+#define DEFAULTPORT "4700"
struct server {
char *name;
pid_t pid;
time_t tm; /* When respawned last */
int count; /* Times respawned in the last TESTTIME secondes */
- int toofast;
int control_fd; /* file descriptor to child cnid_dbd process */
};
static struct server srv[MAXVOLS];
/* Default logging config: log to syslog with level log_note */
-static char *logconfig = "default log_note";
+static char logconfig[MAXPATHLEN + 21 + 1] = "default log_note";
static struct server *test_usockfn(char *dir)
{
if (!up) {
/* find an empty slot */
for (i = 0; i < MAXVOLS; i++) {
- if ( !srv[i].pid ) {
+ if ( !srv[i].name ) {
up = &srv[i];
up->tm = t;
up->count = 0;
- up->toofast = 0;
up->name = strdup(dbdir);
break;
}
/* we have a slot but no process, check for respawn too fast */
if ( (t < (up->tm + TESTTIME)) /* We're in the respawn time window */
&&
- (up->count > MAXSPAWN) ) /* ...and already tried to fork too often */
+ (up->count > MAXSPAWN) ) { /* ...and already tried to fork too often */
+ LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn too fast just exiting");
return -1; /* just exit, dont sleep, because we might have work to do for another client */
-
- if ( t >= (up->tm + TESTTIME) ) { /* "reset" timer and count */
- up->count = 0;
- up->tm = t;
+ }
+ if ( t >= (up->tm + TESTTIME) ) { /* out of respawn too fast windows reset the count */
+ LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn window ended");
+ up->tm = t;
+ up->count = 0;
}
up->count++;
+ LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn count now is: %u", up->count);
+ if (up->count > MAXSPAWN) {
+ /* We spawned too fast. From now until the first time we tried + TESTTIME seconds
+ we will just return -1 above */
+ LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: reached MAXSPAWN threshhold");
+ }
}
/*
}
/* ------------------ */
-uid_t user_to_uid ( username )
- char *username;
+static uid_t user_to_uid (char *username)
{
struct passwd *this_passwd;
}
/* ------------------ */
-gid_t group_to_gid ( group )
- char *group;
+static gid_t group_to_gid ( char *group)
{
struct group *this_group;
}
/* ------------------ */
-void catch_alarm(int sig) {
- alarmed = 1;
+static void catch_child(int sig _U_)
+{
+ sigchild = 1;
+}
+
+/* ----------------------- */
+static void set_signal(void)
+{
+ struct sigaction sv;
+ sigset_t set;
+
+ signal(SIGPIPE, SIG_IGN);
+
+ 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));
+ exit(1);
+ }
+ /* 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 err = 0;
int debug = 0;
int ret;
+ char *loglevel = NULL;
+ char *logfile = NULL;
+ sigset_t set;
set_processname("cnid_metad");
- while (( cc = getopt( argc, argv, "ds:p:h:u:g:l:")) != -1 ) {
+ while (( cc = getopt( argc, argv, "ds:p:h:u:g:l:f:")) != -1 ) {
switch (cc) {
case 'd':
debug = 1;
}
break;
case 'p':
- port = atoi(optarg);
+ port = strdup(optarg);
break;
case 's':
dbdpn = strdup(optarg);
break;
case 'l':
- logconfig = strdup(optarg);
+ loglevel = strdup(optarg);
+ break;
+ case 'f':
+ logfile = strdup(optarg);
break;
default:
err++;
}
}
+ if (loglevel) {
+ strlcpy(logconfig + 8, loglevel, 13);
+ free(loglevel);
+ strcat(logconfig, " ");
+ }
+ if (logfile) {
+ strlcat(logconfig, logfile, MAXPATHLEN);
+ free(logfile);
+ }
setuplog(logconfig);
if (err) {
}
}
- 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;
- }
-
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)");
+ 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