X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcnid_metad.c;h=d6b62469bcefe066bfdfa6701d665f1ce8f93df9;hp=709e694facecf3a55f9ab02d426671d8c75e2eaa;hb=75fe310224dffb96868d7f2cb1ec9125a84f2a08;hpb=008eac9cd4113c38090c803b1236335158fcc64c diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c index 709e694f..d6b62469 100644 --- a/etc/cnid_dbd/cnid_metad.c +++ b/etc/cnid_dbd/cnid_metad.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_metad.c,v 1.16 2009-10-14 01:38:28 didg Exp $ + * $Id: cnid_metad.c,v 1.21 2009-11-05 14:38:07 franklahm Exp $ * * Copyright (C) Joerg Lenneis 2003 * All Rights Reserved. See COPYING. @@ -29,13 +29,13 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include - -#ifdef HAVE_UNISTD_H -#define __USE_GNU +#ifdef linux +#define _GNU_SOURCE +#endif #include #undef __USE_GNU -#endif /* HAVE_UNISTD_H */ + +#include #include #include #include @@ -86,14 +86,14 @@ #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 #include @@ -107,14 +107,14 @@ 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; @@ -244,11 +244,10 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) 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) ) { /* drop slot */ - LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: respawn window ended, dropping slot"); - free(up->name); - up->name = NULL; - return -1; /* next time we'll try again with a new slot */ + 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); @@ -381,8 +380,30 @@ static gid_t group_to_gid ( char *group) } /* ------------------ */ -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; + + 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); } /* ------------------ */ @@ -394,7 +415,7 @@ int main(int argc, char *argv[]) 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; @@ -405,6 +426,7 @@ int main(int argc, char *argv[]) int ret; char *loglevel = NULL; char *logfile = NULL; + sigset_t set; set_processname("cnid_metad"); @@ -431,7 +453,7 @@ int main(int argc, char *argv[]) } break; case 'p': - port = atoi(optarg); + port = strdup(optarg); break; case 's': dbdpn = strdup(optarg); @@ -513,13 +535,16 @@ int main(int argc, char *argv[]) } } - 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; @@ -535,29 +560,20 @@ int main(int argc, char *argv[]) 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)) { @@ -573,12 +589,9 @@ int main(int argc, char *argv[]) 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) {