X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fstatd.c;h=8ebb8083b5832545dc4ea2fee9e71a715fbd2d16;hp=dbd73b313e074600f3428419d52a1632613c6878;hb=ac5b03be829b4c9369ebfb07a688308721103228;hpb=8b5bc63a7d56666950d4e3cd0937ab5187e84730 diff --git a/utils/statd/statd.c b/utils/statd/statd.c index dbd73b3..8ebb808 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -7,7 +7,11 @@ * NSM for Linux. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif + +#include #include #include #include @@ -18,9 +22,11 @@ #include #include #include +#include #include #include "statd.h" #include "version.h" +#include "nfslib.h" /* Socket operations */ #include @@ -47,6 +53,11 @@ int run_mode = 0; /* foreground logging mode */ char *name_p = NULL; char *version_p = NULL; +/* PRC: a high-availability callout program can be specified with -H + * When this is done, the program will receive callouts whenever clients + * are added or deleted to the notify list */ +char *ha_callout_prog = NULL; + static struct option longopts[] = { { "foreground", 0, 0, 'F' }, @@ -58,6 +69,7 @@ static struct option longopts[] = { "name", 1, 0, 'n' }, { "state-directory-path", 1, 0, 'P' }, { "notify-mode", 0, 0, 'N' }, + { "ha-callout", 1, 0, 'H' }, { NULL, 0, 0, 0 } }; @@ -94,13 +106,21 @@ sm_prog_1_wrapper (struct svc_req *rqstp, register SVCXPRT *transp) static void killer (int sig) { - log (L_FATAL, "Caught signal %d, un-registering and exiting.", sig); + note (N_FATAL, "Caught signal %d, un-registering and exiting.", sig); if (!(run_mode & MODE_NOTIFY_ONLY)) pmap_unset (SM_PROG, SM_VERS); exit (0); } +static void +sigusr (int sig) +{ + dprintf (N_DEBUG, "Caught signal %d, re-notifying (state %d).", sig, + MY_STATE); + re_notify = 1; +} + /* * Startup information. */ @@ -122,11 +142,11 @@ static void log_modes(void) { strcat(buf,"Notify-Only "); } - log(L_WARNING,buf); + note(N_WARNING,buf); /* future: IP aliasing if (run_mode & MODE_NOTIFY_ONLY) { - dprintf(L_DEBUG,"Notify IP: %s",svr_addr); + dprintf(N_DEBUG,"Notify IP: %s",svr_addr); } */ } @@ -147,6 +167,7 @@ usage() fprintf(stderr," -n, --name Specify a local hostname.\n"); fprintf(stderr," -P State directory path.\n"); fprintf(stderr," -N Run in notify only mode.\n"); + fprintf(stderr," -H Specify a high-availability callout program.\n"); } static const char *pidfile = "/var/run/rpc.statd.pid"; @@ -164,7 +185,7 @@ static void create_pidfile(void) fprintf(fp, "%d\n", getpid()); pidfd = dup(fileno(fp)); if (fclose(fp) < 0) - log(L_WARNING, "Flushing pid file failed.\n"); + note(N_WARNING, "Flushing pid file failed.\n"); } static void truncate_pidfile(void) @@ -178,11 +199,13 @@ static void drop_privs(void) struct stat st; if (stat(SM_DIR, &st) == -1 && - stat(DIR_BASE, &st) == -1) + stat(DIR_BASE, &st) == -1) { st.st_uid = 0; + st.st_gid = 0; + } if (st.st_uid == 0) { - log(L_WARNING, "statd running as root. chown %s to choose different user\n", + note(N_WARNING, "statd running as root. chown %s to choose different user\n", SM_DIR); return; } @@ -195,7 +218,7 @@ static void drop_privs(void) setgroups(0, NULL); if (setgid(st.st_gid) == -1 || setuid(st.st_uid) == -1) { - log(L_ERROR, "Fail to drop privileges"); + note(N_ERROR, "Fail to drop privileges"); exit(1); } } @@ -209,6 +232,7 @@ int main (int argc, char **argv) int pid; int arg; int port = 0, out_port = 0; + struct rlimit rlim; int pipefds[2] = { -1, -1}; char status; @@ -234,7 +258,7 @@ int main (int argc, char **argv) MY_NAME = NULL; /* Process command line switches */ - while ((arg = getopt_long(argc, argv, "h?vVFNdn:p:o:P:", longopts, NULL)) != EOF) { + while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:", longopts, NULL)) != EOF) { switch (arg) { case 'V': /* Version */ case 'v': @@ -268,6 +292,7 @@ int main (int argc, char **argv) } break; case 'n': /* Specify local hostname */ + run_mode |= STATIC_HOSTNAME; MY_NAME = xstrdup(optarg); break; case 'P': @@ -300,6 +325,13 @@ int main (int argc, char **argv) sprintf(SM_STAT_PATH, "%s/state", DIR_BASE ); } break; + case 'H': /* PRC: specify the ha-callout program */ + if ((ha_callout_prog = xstrdup(optarg)) == NULL) { + fprintf(stderr, "%s: xstrdup(%s) failed!\n", + argv[0], optarg); + exit(1); + } + break; case '?': /* heeeeeelllllllpppp? heh */ case 'h': usage(); @@ -320,6 +352,21 @@ int main (int argc, char **argv) daemon mode. */ } + if (getrlimit (RLIMIT_NOFILE, &rlim) != 0) + fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n", + argv [0], strerror(errno)); + else { + /* glibc sunrpc code dies if getdtablesize > FD_SETSIZE */ + if (rlim.rlim_cur > FD_SETSIZE) { + rlim.rlim_cur = FD_SETSIZE; + + if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) { + fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n", + argv [0], strerror(errno)); + } + } + } + #ifdef SIMULATIONS if (argc > 1) /* LH - I _really_ need to update simulator... */ @@ -361,14 +408,12 @@ int main (int argc, char **argv) } } tempfd = open("/dev/null", O_RDWR); - close(0); dup2(tempfd, 0); - close(1); dup2(tempfd, 1); - close(2); dup2(tempfd, 2); - fdmax = sysconf (_SC_OPEN_MAX); - for (filedes = 3; filedes < fdmax; filedes++) - if (filedes != pipefds[1]) - close (filedes); - + dup2(tempfd, 0); + dup2(tempfd, 1); + dup2(tempfd, 2); + dup2(pipefds[1], 3); + pipefds[1] = 3; + closeall(4); } /* Child. */ @@ -380,8 +425,15 @@ int main (int argc, char **argv) signal (SIGHUP, killer); signal (SIGINT, killer); signal (SIGTERM, killer); + /* PRC: trap SIGUSR1 to re-read notify list from disk */ + signal(SIGUSR1, sigusr); /* WARNING: the following works on Linux and SysV, but not BSD! */ signal(SIGCHLD, SIG_IGN); + /* + * Ignore SIGPIPE to avoid statd dying when peers close their + * TCP connection while we're trying to reply to them. + */ + signal(SIGPIPE, SIG_IGN); /* initialize out_port */ statd_get_socket(out_port);