diff options
Diffstat (limited to 'utils/statd')
| -rw-r--r-- | utils/statd/Makefile | 2 | ||||
| -rw-r--r-- | utils/statd/rmtcall.c | 7 | ||||
| -rw-r--r-- | utils/statd/simulate.c | 5 | ||||
| -rw-r--r-- | utils/statd/statd.c | 123 | ||||
| -rw-r--r-- | utils/statd/statd.man | 33 |
5 files changed, 113 insertions, 57 deletions
diff --git a/utils/statd/Makefile b/utils/statd/Makefile index 211e22d..03e97e0 100644 --- a/utils/statd/Makefile +++ b/utils/statd/Makefile @@ -16,7 +16,7 @@ PROGRAM = statd PREFIX = rpc. OBJS = $(SRCS:.c=.o) CCOPTS = $(DEBUG) $(SIMUL) -LIBS = -lexport -lmisc $(LIBWRAP) $(LIBNSL) +LIBS = -lexport -lnfs -lmisc $(LIBWRAP) $(LIBNSL) SRCS = $(RPCSRCS) $(SIMSRCS) \ callback.c notlist.c log.c misc.c monitor.c notify.c simu.c \ diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c index b70e5bb..f01faba 100644 --- a/utils/statd/rmtcall.c +++ b/utils/statd/rmtcall.c @@ -47,8 +47,8 @@ static int sockfd = -1; /* notify socket */ /* * Initialize callback socket */ -static int -get_socket(void) +int +statd_get_socket(int port) { struct sockaddr_in sin; @@ -64,6 +64,7 @@ get_socket(void) memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; + sin.sin_port = port; if (bindresvport(sockfd, &sin) < 0) { dprintf(L_WARNING, "process_hosts: can't bind to reserved port\n"); @@ -394,7 +395,7 @@ process_notify_list(void) time_t now; int fd; - if ((fd = get_socket()) < 0) + if ((fd = statd_get_socket(0)) < 0) return 0; while ((entry = notify) != NULL && NL_WHEN(entry) < time(&now)) { diff --git a/utils/statd/simulate.c b/utils/statd/simulate.c index 4b8d59c..3bebfc7 100644 --- a/utils/statd/simulate.c +++ b/utils/statd/simulate.c @@ -18,6 +18,7 @@ #include <string.h> #include <rpc/rpc.h> #include <rpc/pmap_clnt.h> +#include <rpcmisc.h> #include "statd.h" #include "sim_sm_inter.h" @@ -207,8 +208,8 @@ daemon_simulator (void) signal (SIGINT, sim_killer); signal (SIGTERM, sim_killer); pmap_unset (sim_port, SIM_SM_VERS); - do_regist (sim_port, sim_sm_prog_1); -/* do_regist (sim_port, (__dispatch_fn_t)sim_sm_prog_1); */ + /* this registers both UDP and TCP services */ + rpc_init("statd", sim_port, SIM_SM_VERS, sim_sm_prog_1, 0); svc_run (); pmap_unset (sim_port, SIM_SM_VERS); } diff --git a/utils/statd/statd.c b/utils/statd/statd.c index a63a6a2..3d90d64 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -11,9 +11,12 @@ #include <limits.h> #include <signal.h> #include <unistd.h> +#include <fcntl.h> #include <string.h> +#include <getopt.h> #include <rpc/rpc.h> #include <rpc/pmap_clnt.h> +#include <rpcmisc.h> #include "statd.h" #include "version.h" @@ -23,9 +26,6 @@ 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 +34,19 @@ 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' }, + { 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 **); @@ -108,10 +120,12 @@ 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"); } /* @@ -122,7 +136,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; @@ -141,27 +156,51 @@ int main (int argc, char **argv) } /* Process command line switches */ - while ((arg = getopt(argc, argv, "h?VFd")) >= 0) { + while ((arg = getopt_long(argc, argv, "h?vVFdp:o:", 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 '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 '?': /* 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 +217,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 +230,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 +247,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 (); @@ -212,9 +259,10 @@ int main (int argc, char **argv) /* future: IP aliasing if (!(run_mode & MODE_NOTIFY_ONLY)) { - do_regist (SM_PROG, sm_prog_1); + rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); } */ - do_regist(SM_PROG,sm_prog_1); + /* this registers both UDP and TCP services */ + rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); /* * Handle incoming requests: SM_NOTIFY socket requests, as @@ -224,24 +272,3 @@ int main (int argc, char **argv) } 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)."); -} diff --git a/utils/statd/statd.man b/utils/statd/statd.man index 8a7bd8c..84199e8 100644 --- a/utils/statd/statd.man +++ b/utils/statd/statd.man @@ -4,11 +4,11 @@ .\" Copyright (C) 1999 Olaf Kirch <okir@monad.swb.de> .\" Modified by Jeffrey A. Uphoff, 1999. .\" Modified by Lon Hohberger, 2000. -.TH rpc.statd 8 "05 Oct 2000" +.TH rpc.statd 8 "08 Mar 2001" .SH NAME rpc.statd \- NSM status monitor .SH SYNOPSIS -.B "/usr/sbin/rpc.statd [-F] [-d] [-?] [-V] +.B "/sbin/rpc.statd [-F] [-d] [-?] [-o " port "] [-p " port "] [-V]" .SH DESCRIPTION The .B rpc.statd @@ -52,6 +52,32 @@ be used in conjunction with the .B -F parameter. .TP +.BI "\-o," "" " \-\-outgoing\-port " port +specify a port for +.B rpc.statd +to send outgoing status requests from. By default, +.BR rpc.statd +will ask +.BR portmap (8) +to assign it a port number. As of this writing, there is not +a standard port number that +.BR portmap +always or usually assigns. Specifying +a port may be useful when implementing a firewall. +.TP +.BI "\-p," "" " \-\-port " port +specify a port for +.B rpc.statd +to listen on. By default, +.BR rpc.statd +will ask +.BR portmap (8) +to assign it a port number. As of this writing, there is not +a standard port number that +.BR portmap +always or usually assigns. Specifying +a port may be useful when implementing a firewall. +.TP .B -? Causes .B rpc.statd @@ -96,7 +122,8 @@ manual pages. .br .BR /var/lib/nfs/sm.bak/* .SH SEE ALSO -.BR rpc.nfsd(8) +.BR rpc.nfsd(8), +.BR portmap(8) .SH AUTHORS .br Jeff Uphoff <juphoff@transmeta.com> |