X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fstatd.c;h=b1e73046c1285f5c64f6ed242a9f95c13c45b9c4;hp=a63a6a26a37bcbcef46a61582e06fcd1146cc461;hb=55ce21003ee0fb12fe5ef70909cdc8ce00b803e4;hpb=b63400dcb05eee79666bade57558279fd15f0318 diff --git a/utils/statd/statd.c b/utils/statd/statd.c index a63a6a2..b1e7304 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -11,9 +11,12 @@ #include #include #include +#include #include +#include #include #include +#include #include "statd.h" #include "version.h" @@ -21,11 +24,19 @@ #include #include +/* Added to enable specification of state directory path at run-time + * j_carlos_gomez@yahoo.com + */ + +char * DIR_BASE = DEFAULT_DIR_BASE; + +char * SM_DIR = DEFAULT_SM_DIR; +char * SM_BAK_DIR = DEFAULT_SM_BAK_DIR; +char * SM_STAT_PATH = DEFAULT_SM_STAT_PATH; + +/* ----- end of state directory path stuff ------- */ short int restart = 0; -int _rpcpmstart = 0; /* flags for tirpc rpcgen */ -int _rpcfdtype = 0; -int _rpcsvcdirty = 0; int run_mode = 0; /* foreground logging mode */ /* LH - I had these local to main, but it seemed silly to have @@ -34,7 +45,22 @@ int run_mode = 0; /* foreground logging mode */ char *name_p = NULL; char *version_p = NULL; +static struct option longopts[] = +{ + { "foreground", 0, 0, 'F' }, + { "no-syslog", 0, 0, 'd' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'v' }, + { "outgoing-port", 1, 0, 'o' }, + { "port", 1, 0, 'p' }, + { "name", 1, 0, 'n' }, + { "state-directory-path", 1, 0, 'P' }, + { "notify-mode", 0, 0, 'N' }, + { NULL, 0, 0, 0 } +}; + extern void sm_prog_1 (struct svc_req *, register SVCXPRT *); +extern int statd_get_socket(int port); #ifdef SIMULATIONS extern void simulator (int, char **); @@ -87,11 +113,11 @@ static void log_modes(void) strcat(buf,"No-Daemon "); if (run_mode & MODE_LOG_STDERR) strcat(buf,"Log-STDERR "); - /* future: IP aliasing + if (run_mode & MODE_NOTIFY_ONLY) { strcat(buf,"Notify-Only "); - } */ + } log(L_WARNING,buf); /* future: IP aliasing if (run_mode & MODE_NOTIFY_ONLY) @@ -108,10 +134,15 @@ static void usage() { fprintf(stderr,"usage: %s [options]\n", name_p); - fprintf(stderr," -h, -? Print this help screen.\n"); - fprintf(stderr," -F Foreground (no-daemon mode)\n"); - fprintf(stderr," -d Verbose logging to stderr. Foreground mode only.\n"); - fprintf(stderr," -V Display version information and exit.\n"); + fprintf(stderr," -h, -?, --help Print this help screen.\n"); + fprintf(stderr," -F, --foreground Foreground (no-daemon mode)\n"); + fprintf(stderr," -d, --no-syslog Verbose logging to stderr. Foreground mode only.\n"); + fprintf(stderr," -p, --port Port to listen on\n"); + fprintf(stderr," -o, --outgoing-port Port for outgoing connections\n"); + fprintf(stderr," -V, -v, --version Display version information and exit.\n"); + 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"); } /* @@ -122,7 +153,8 @@ int main (int argc, char **argv) extern char *optarg; int pid; int arg; - + int port = 0, out_port = 0; + /* Default: daemon mode, no other options */ run_mode = 0; @@ -140,28 +172,91 @@ int main (int argc, char **argv) version_p = VERSION; } + /* Set hostname */ + MY_NAME = NULL; + /* Process command line switches */ - while ((arg = getopt(argc, argv, "h?VFd")) >= 0) { + while ((arg = getopt_long(argc, argv, "h?vVFNdn:p:o:P:", longopts, NULL)) != EOF) { switch (arg) { - case 'V': /* Version */ - printf("%s version %s\n",name_p,version_p); - exit(0); - case 'F': /* Foreground/nodaemon mode */ - run_mode |= MODE_NODAEMON; - break; - case 'd': /* No daemon only - log to stderr */ - run_mode |= MODE_LOG_STDERR; - break; - case '?': /* heeeeeelllllllpppp? heh */ - case 'h': + case 'V': /* Version */ + case 'v': + printf("%s version %s\n",name_p,version_p); + exit(0); + case 'F': /* Foreground/nodaemon mode */ + run_mode |= MODE_NODAEMON; + break; + case 'N': + run_mode |= MODE_NOTIFY_ONLY; + break; + case 'd': /* No daemon only - log to stderr */ + run_mode |= MODE_LOG_STDERR; + break; + case 'o': + out_port = atoi(optarg); + if (out_port < 1 || out_port > 65535) { + fprintf(stderr, "%s: bad port number: %s\n", + argv[0], optarg); usage(); - exit (0); - default: /* oh dear ... heh */ + exit(1); + } + break; + case 'p': + port = atoi(optarg); + if (port < 1 || port > 65535) { + fprintf(stderr, "%s: bad port number: %s\n", + argv[0], optarg); usage(); - exit(-1); + exit(1); + } + break; + case 'n': /* Specify local hostname */ + MY_NAME = xstrdup(optarg); + break; + case 'P': + + if ((DIR_BASE = xstrdup(optarg)) == NULL) { + fprintf(stderr, "%s: xstrdup(%s) failed!\n", + argv[0], optarg); + exit(1); + } + + SM_DIR = xmalloc(strlen(DIR_BASE) + 1 + sizeof("sm")); + SM_BAK_DIR = xmalloc(strlen(DIR_BASE) + 1 + sizeof("sm.bak")); + SM_STAT_PATH = xmalloc(strlen(DIR_BASE) + 1 + sizeof("state")); + + if ((SM_DIR == NULL) + || (SM_BAK_DIR == NULL) + || (SM_STAT_PATH == NULL)) { + + fprintf(stderr, "%s: xmalloc() failed!\n", + argv[0]); + exit(1); + } + if (DIR_BASE[strlen(DIR_BASE)-1] == '/') { + sprintf(SM_DIR, "%ssm", DIR_BASE ); + sprintf(SM_BAK_DIR, "%ssm.bak", DIR_BASE ); + sprintf(SM_STAT_PATH, "%sstate", DIR_BASE ); + } else { + sprintf(SM_DIR, "%s/sm", DIR_BASE ); + sprintf(SM_BAK_DIR, "%s/sm.bak", DIR_BASE ); + sprintf(SM_STAT_PATH, "%s/state", DIR_BASE ); + } + break; + case '?': /* heeeeeelllllllpppp? heh */ + case 'h': + usage(); + exit (0); + default: /* oh dear ... heh */ + usage(); + exit(-1); } } + if (port == out_port && port != 0) { + fprintf(stderr, "Listening and outgoing ports cannot be the same!\n"); + exit(-1); + } + if (!(run_mode & MODE_NODAEMON)) { run_mode &= ~MODE_LOG_STDERR; /* Never log to console in daemon mode. */ @@ -178,7 +273,7 @@ int main (int argc, char **argv) #endif if (!(run_mode & MODE_NODAEMON)) { - int filedes; + int filedes, fdmax, tempfd; if ((pid = fork ()) < 0) { perror ("Could not fork"); @@ -191,7 +286,12 @@ int main (int argc, char **argv) setsid (); chdir (DIR_BASE); - for (filedes = 0; filedes < sysconf (_SC_OPEN_MAX); filedes++) { + 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++) { close (filedes); } } @@ -203,6 +303,9 @@ int main (int argc, char **argv) /* WARNING: the following works on Linux and SysV, but not BSD! */ signal(SIGCHLD, SIG_IGN); + /* initialize out_port */ + statd_get_socket(out_port); + for (;;) { pmap_unset (SM_PROG, SM_VERS); change_state (); @@ -210,38 +313,19 @@ int main (int argc, char **argv) notify_hosts (); /* Send out notify requests */ ++restart; - /* future: IP aliasing + /* this registers both UDP and TCP services */ if (!(run_mode & MODE_NOTIFY_ONLY)) { - do_regist (SM_PROG, sm_prog_1); - } */ - do_regist(SM_PROG,sm_prog_1); + rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); + } /* * Handle incoming requests: SM_NOTIFY socket requests, as * well as callbacks from lockd. */ my_svc_run(); /* I rolled my own, Olaf made it better... */ + + if ((run_mode & MODE_NOTIFY_ONLY)) + break; } return 0; } - - -/* - * Register services. - */ -void do_regist(u_long prog, void (*sm_prog_1)()) -{ - SVCXPRT *transp; - - if ((transp = svcudp_create(RPC_ANYSOCK)) == NULL) - die("cannot create udp service."); - - if (!svc_register(transp, prog, SM_VERS, sm_prog_1, IPPROTO_UDP)) - die("unable to register (SM_PROG, SM_VERS, udp)."); - - if ((transp = svctcp_create(RPC_ANYSOCK, 0, 0)) == NULL) - die("cannot create tcp service."); - - if (!svc_register(transp, prog, SM_VERS, sm_prog_1, IPPROTO_TCP)) - die("unable to register (SM_PROG, SM_VERS, tcp)."); -}