X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcnid_metad.c;h=aa214be6a60a41d9ba3a6b7a72625a1401a5b061;hb=9ebba6f4ae4965d0d63e4015fa5345fcd5eef9e0;hp=d0207cb8d64d77b38341a70112c24db34a3e8aca;hpb=c0b6c5214c32ed8dab853791679999ebd3c9a469;p=netatalk.git diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c index d0207cb8..aa214be6 100644 --- a/etc/cnid_dbd/cnid_metad.c +++ b/etc/cnid_dbd/cnid_metad.c @@ -1,9 +1,8 @@ /* - * $Id: cnid_metad.c,v 1.13 2009-07-21 13:41:16 didg Exp $ - * * Copyright (C) Joerg Lenneis 2003 - * All Rights Reserved. See COPYING. + * Copyright (C) Frank Lahm 2009, 2010 * + * All Rights Reserved. See COPYING. */ /* @@ -22,6 +21,8 @@ Result: via TCP socket 4. afpd -------> cnid_dbd + + cnid_metad and cnid_dbd have been converted to non-blocking IO in 2010. */ @@ -29,35 +30,24 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#include - -#ifdef HAVE_UNISTD_H -#define __USE_GNU #include #undef __USE_GNU -#endif /* HAVE_UNISTD_H */ + +#include #include #include #include #include -#ifdef HAVE_SYS_TYPES_H #include -#endif -#ifdef HAVE_SYS_TIME_H #include -#endif -#ifdef HAVE_SYS_WAIT_H +#include #include -#endif -#ifdef HAVE_SYS_UIO_H #include -#endif #include -#define _XPG4_2 1 +// #define _XPG4_2 1 #include #include #include -#include #ifndef WEXITSTATUS #define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) @@ -76,10 +66,6 @@ #define WTERMSIG(status) ((status) & 0x7f) #endif -#ifdef ATACC -#define fork aTaC_fork -#endif - /* functions for username and group */ #include #include @@ -90,20 +76,25 @@ #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 #include +#include +#include +#include +#include +#include +#include -#include "db_param.h" #include "usockfd.h" #define DBHOME ".AppleDB" @@ -111,17 +102,18 @@ static int srvfd; static int rqstfd; -volatile sig_atomic_t alarmed = 0; +static volatile sig_atomic_t sigchild = 0; +static uint maxvol; #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 MAXVOLS 4096 #define DEFAULTHOST "localhost" -#define DEFAULTPORT 4700 +#define DEFAULTPORT "4700" struct server { - char *name; + struct vol *vol; pid_t pid; time_t tm; /* When respawned last */ int count; /* Times respawned in the last TESTTIME secondes */ @@ -130,75 +122,42 @@ struct server { static struct server srv[MAXVOLS]; -/* Default logging config: log to syslog with level log_note */ -static char logconfig[MAXPATHLEN + 21 + 1] = "default log_note"; - -static struct server *test_usockfn(char *dir) +static void daemon_exit(int i) { - int i; - for (i = 0; i < MAXVOLS; i++) { - if (srv[i].name && !strcmp(srv[i].name, dir)) { - return &srv[i]; - } - } - return NULL; + server_unlock(_PATH_CNID_METAD_LOCK); + exit(i); } -/* -------------------- */ -static int send_cred(int socket, int fd) +/* ------------------ */ +static void sigterm_handler(int sig) { - int ret; - struct msghdr msgh; - struct iovec iov[1]; - struct cmsghdr *cmsgp = NULL; - char *buf; - size_t size; - int er=0; - - size = CMSG_SPACE(sizeof fd); - buf = malloc(size); - if (!buf) { - LOG(log_error, logtype_cnid, "error in sendmsg: %s", strerror(errno)); - return -1; + 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); +} - memset(&msgh,0,sizeof (msgh)); - memset(buf,0, size); - - msgh.msg_name = NULL; - msgh.msg_namelen = 0; - - msgh.msg_iov = iov; - msgh.msg_iovlen = 1; - - iov[0].iov_base = &er; - iov[0].iov_len = sizeof(er); - - msgh.msg_control = buf; - msgh.msg_controllen = size; - - cmsgp = CMSG_FIRSTHDR(&msgh); - cmsgp->cmsg_level = SOL_SOCKET; - cmsgp->cmsg_type = SCM_RIGHTS; - cmsgp->cmsg_len = CMSG_LEN(sizeof(fd)); +static struct server *test_usockfn(const struct vol *vol) +{ + int i; - *((int *)CMSG_DATA(cmsgp)) = fd; - msgh.msg_controllen = cmsgp->cmsg_len; + if (!(vol->v_flags & AFPVOL_OPEN)) + return NULL; - do { - ret = sendmsg(socket,&msgh, 0); - } while ( ret == -1 && errno == EINTR ); - if (ret == -1) { - LOG(log_error, logtype_cnid, "error in sendmsg: %s", strerror(errno)); - free(buf); - return -1; + for (i = 0; i < maxvol; i++) { + if (vol->v_vid == srv[i].vol->v_vid) + return &srv[i]; } - free(buf); - return 0; + + return NULL; } /* -------------------- */ -static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) +static int maybe_start_dbd(const AFPObj *obj, char *dbdpn, struct vol *vol) { pid_t pid; struct server *up; @@ -207,31 +166,34 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) time_t t; char buf1[8]; char buf2[8]; + char *volpath = vol->v_path; - LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: dbdir: '%s', UNIX socket file: '%s'", - dbdir, usockfn); + LOG(log_debug, logtype_cnid, "maybe_start_dbd: Volume: \"%s\"", volpath); - up = test_usockfn(dbdir); + up = test_usockfn(vol); if (up && up->pid) { /* we already have a process, send our fd */ - if (send_cred(up->control_fd, rqstfd) < 0) { + if (send_fd(up->control_fd, rqstfd) < 0) { /* FIXME */ return -1; } return 0; } - LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: no cnid_dbd for that volume yet. Starting one ..."); + LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: no cnid_dbd for that volume yet"); time(&t); if (!up) { - /* find an empty slot */ - for (i = 0; i < MAXVOLS; i++) { - if ( !srv[i].name ) { + /* find an empty slot (i < maxvol) or the first free slot (i == maxvol)*/ + for (i = 0; i <= maxvol; i++) { + if (srv[i].vol == NULL && i < MAXVOLS) { up = &srv[i]; + up->vol = vol; + vol->v_flags |= AFPVOL_OPEN; up->tm = t; up->count = 0; - up->name = strdup(dbdir); + if (i == maxvol) + maxvol++; break; } } @@ -239,8 +201,7 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) LOG(log_error, logtype_cnid, "no free slot for cnid_dbd child. Configured maximum: %d. Do you have so many volumes?", MAXVOLS); return -1; } - } - else { + } else { /* we have a slot but no process, check for respawn too fast */ if ( (t < (up->tm + TESTTIME)) /* We're in the respawn time window */ && @@ -248,11 +209,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); @@ -298,19 +258,17 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) sprintf(buf2, "%i", rqstfd); if (up->count == MAXSPAWN) { - /* there's a pb with the db inform child - * it will run recover, delete the db whatever - */ - LOG(log_error, logtype_cnid, "try with -d %s", up->name); - ret = execlp(dbdpn, dbdpn, "-d", dbdir, buf1, buf2, logconfig, NULL); - } - 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); + /* there's a pb with the db inform child, it will delete the db */ + LOG(log_warning, logtype_cnid, + "Multiple attempts to start CNID db daemon for \"%s\" failed, wiping the slate clean...", + up->vol->v_path); + ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, "-d", NULL); + } else { + ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, NULL); } + /* Yikes! We're still here, so exec failed... */ + LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno)); + daemon_exit(0); } /* * Parent. @@ -322,12 +280,12 @@ static int maybe_start_dbd(char *dbdpn, char *dbdir, char *usockfn) } /* ------------------ */ -static int set_dbdir(char *dbdir, int len) +static int set_dbdir(char *dbdir) { + int len; struct stat st; - if (!len) - return -1; + len = strlen(dbdir); if (stat(dbdir, &st) < 0 && mkdir(dbdir, 0755) < 0) { LOG(log_error, logtype_cnid, "set_dbdir: mkdir failed for %s", dbdir); @@ -347,8 +305,7 @@ static int set_dbdir(char *dbdir, int len) } /* ------------------ */ -uid_t user_to_uid ( username ) - char *username; +static uid_t user_to_uid (char *username) { struct passwd *this_passwd; @@ -367,8 +324,7 @@ uid_t user_to_uid ( username ) } /* ------------------ */ -gid_t group_to_gid ( group ) - char *group; +static gid_t group_to_gid ( char *group) { struct group *this_group; @@ -387,21 +343,104 @@ gid_t group_to_gid ( group ) } /* ------------------ */ -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); +} + +static int setlimits(void) +{ + struct rlimit rlim; + + if (getrlimit(RLIMIT_NOFILE, &rlim) != 0) { + LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno)); + exit(1); + } + if (rlim.rlim_cur != RLIM_INFINITY && rlim.rlim_cur < 65535) { + rlim.rlim_cur = 65535; + if (rlim.rlim_max != RLIM_INFINITY && rlim.rlim_max < 65535) + rlim.rlim_max = 65535; + if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { + LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno)); + exit(1); + } + } + return 0; } /* ------------------ */ int main(int argc, char *argv[]) { - char dbdir[MAXPATHLEN + 1]; + char volpath[MAXPATHLEN + 1]; int len, actual_len; pid_t pid; int status; char *dbdpn = _PATH_CNID_DBD; char *host = DEFAULTHOST; - u_int16_t port = DEFAULTPORT; - struct db_param *dbp; + char *port = DEFAULTPORT; int i; int cc; uid_t uid = 0; @@ -409,161 +448,108 @@ int main(int argc, char *argv[]) int err = 0; int debug = 0; int ret; - char *loglevel = NULL; - char *logfile = NULL; - - set_processname("cnid_metad"); + sigset_t set; + AFPObj obj = { 0 }; + struct vol *vol; - while (( cc = getopt( argc, argv, "ds:p:h:u:g:l:f:")) != -1 ) { + while (( cc = getopt( argc, argv, "dF:v")) != -1 ) { switch (cc) { case 'd': debug = 1; break; - case 'h': - host = strdup(optarg); - break; - case 'u': - uid = user_to_uid (optarg); - if (!uid) { - LOG(log_error, logtype_cnid, "main: bad user %s", optarg); - err++; - } - break; - case 'g': - gid =group_to_gid (optarg); - if (!gid) { - LOG(log_error, logtype_cnid, "main: bad group %s", optarg); - err++; - } - break; - case 'p': - port = atoi(optarg); - break; - case 's': - dbdpn = strdup(optarg); - break; - case 'l': - loglevel = strdup(optarg); - break; - case 'f': - logfile = strdup(optarg); + case 'F': + obj.cmdlineconfigfile = strdup(optarg); break; + case 'v': + printf("cnid_metad (Netatalk %s)\n", VERSION); + return -1; default: - err++; - break; + printf("cnid_metad [-dv] [-F alternate configfile ]\n"); + return -1; } } - if (loglevel) { - strlcpy(logconfig + 8, loglevel, 13); - free(loglevel); - strcat(logconfig, " "); - } - if (logfile) { - strlcat(logconfig, logfile, MAXPATHLEN); - free(logfile); - } - setuplog(logconfig); + /* Check for PID lockfile */ + if (check_lockfile("cnid_metad", _PATH_CNID_METAD_LOCK)) + return -1; - if (err) { - LOG(log_error, logtype_cnid, "main: bad arguments"); - exit(1); - } + if (!debug && daemonize(0, 0) != 0) + exit(EXITERR_SYS); - 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); - } - } + /* Create PID lockfile */ + if (create_lockfile("cnid_metad", _PATH_CNID_METAD_LOCK)) + return -1; + + if (afp_config_parse(&obj) != 0) + daemon_exit(1); + + set_processname("cnid_metad"); + setuplog(obj.options.logconfig, obj.options.logfile); + + if (load_volumes(&obj, NULL) != 0) + daemon_exit(1); + + (void)setlimits(); 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) { - for (i = 0; i < MAXVOLS; i++) { + if (sigchild) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { + for (i = 0; i < maxvol; i++) { if (srv[i].pid == pid) { srv[i].pid = 0; close(srv[i].control_fd); + srv[i].vol->v_flags &= ~AFPVOL_OPEN; break; } } if (WIFEXITED(status)) { - LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with exit code %i", + LOG(log_info, logtype_cnid, "cnid_dbd[%i] exited with exit code %i", pid, WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with signal %i", + LOG(log_info, logtype_cnid, "cnid_dbd[%i] got 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)) { @@ -579,30 +565,28 @@ 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)"); + actual_len = readt(rqstfd, volpath, len, 1, 5); + if (actual_len < 0) { + LOG(log_severe, logtype_cnid, "Read(2) error : %s", strerror(errno)); goto loop_end; } if (actual_len != len) { LOG(log_error, logtype_cnid, "error/short read (dir): %s", strerror(errno)); goto loop_end; } - dbdir[len] = '\0'; + volpath[len] = '\0'; + - if (set_dbdir(dbdir, len) < 0) { + if ((vol = getvolbypath(volpath)) == NULL) { + LOG(log_severe, logtype_cnid, "getvolbypath(\"%s\"): %s", volpath, strerror(errno)); goto loop_end; } - if ((dbp = db_param_read(dbdir, METAD)) == NULL) { - LOG(log_error, logtype_cnid, "Error reading config file"); + if (set_dbdir(vol->v_dbpath) < 0) { goto loop_end; } - maybe_start_dbd(dbdpn, dbdir, dbp->usock_file); + maybe_start_dbd(&obj, dbdpn, vol); loop_end: close(rqstfd); }