* utils/rquotad/rquotad.man: Updated for -p.
* utils/statd/statd.man: Likewise.
2001-03-10 Ion Badulescu <ionut@cs.columbia.edu>
* support/nfs/rpcmisc.[ch]: export makesock()
* utils/statd/statd.c: added longopts, added support for
specifying the port to bind to on the command line.
* utils/statd/statd.c: ditto, also specify port used for
outgoing connections.
* utils/statd/Makefile (LIBS): link with our own libnfs
+2001-03-10 Tavis Barr <tavis@boole.isetr.columbia.edu>
+
+ * utils/rquotad/rquotad.man: Updated for -p.
+ * utils/statd/statd.man: Likewise.
+
+2001-03-10 Ion Badulescu <ionut@cs.columbia.edu>
+
+ * support/nfs/rpcmisc.[ch]: export makesock()
+
+ * utils/statd/statd.c: added longopts, added support for
+ specifying the port to bind to on the command line.
+
+ * utils/statd/statd.c: ditto, also specify port used for
+ outgoing connections.
+
+ * utils/statd/Makefile (LIBS): link with our own libnfs
+
2001-03-09 H.J. Lu <hjl@lucon.org>
* etc/redhat/nfslock.init: Changed chkconfig line to 60 86.
* utils/mountd/auth.c (auth_authenticate_internal): Make sure a
non-NULL hostent is always returned.
-2000-09-11 Ion Badulescu <ionut@moisil.dev.hydraweb.com>
+2000-09-11 Ion Badulescu <ionut@cs.columbia.edu>
* etc/redhat/nfslock.init: don't kill lockd processes that do not
have an executable (i.e. kernel threads)
2000-08-25 Ion Badulescu <ionut@cs.columbia.edu>
- * utils/rquotad/rquotad.man, utils/statd/statd.man,
+ * utils/rquotad/rquotad.man, utils/statd/statd.man,
utils/mountd/mountd.man: updated
* utils/mountd/Makefile (LIBS): added -lmisc $(LIBWRAP) $(LIBNSL)
(xdrproc_t)xdr_##res_type, sizeof(res_type), \
}
+
+int makesock(int port, int proto);
void rpc_init(char *name, int prog, int vers,
void (*dispatch)(struct svc_req *, SVCXPRT *),
int defport);
#include "nfslib.h"
static void closedown(int sig);
-static int makesock(int port, int proto);
+int makesock(int port, int proto);
#define _RPCSVC_CLOSEDOWN 120
int _rpcpmstart = 0;
(void) alarm(_RPCSVC_CLOSEDOWN);
}
-static int makesock(port, proto)
-int port;
-int proto;
+int makesock(int port, int proto)
{
struct sockaddr_in sin;
int s;
#include <netinet/in.h>
#include <syslog.h>
#include <signal.h>
+#include <getopt.h>
+#include <rpcmisc.h>
#ifdef __STDC__
#define SIG_PF void(*)(int)
extern getquota_rslt *rquotaproc_getactivequota_2(ext_getquota_args *argp,
struct svc_req *rqstp);
+static struct option longopts[] =
+{
+ { "help", 0, 0, 'h' },
+ { "version", 0, 0, 'v' },
+ { "port", 1, 0, 'p' },
+ { NULL, 0, 0, 0 }
+};
+
/*
* Global authentication credentials.
*/
return;
}
+static void
+usage(const char *prog, int n)
+{
+ fprintf(stderr, "Usage: %s [-p|--port port] [-h|-?|--help] [-v|--version]\n", prog);
+ exit(n);
+}
+
int main(int argc, char **argv)
{
register SVCXPRT *transp;
+ char c;
+ int port = 0;
(void) pmap_unset(RQUOTAPROG, RQUOTAVERS);
(void) pmap_unset(RQUOTAPROG, EXT_RQUOTAVERS);
openlog("rquota", LOG_PID, LOG_DAEMON);
+ while ((c = getopt_long(argc, argv, "hp:v", longopts, NULL)) != EOF) {
+ switch (c) {
+ case '?':
+ case 'h':
+ usage(argv[0], 0);
+ break;
+ case 'p':
+ port = atoi(optarg);
+ if (port < 1 || port > 65535) {
+ fprintf(stderr, "%s: bad port number: %s\n",
+ argv[0], optarg);
+ usage(argv[0], 1);
+ }
+ break;
+ case 'v':
+ printf("rquotad %s\n", VERSION);
+ exit(0);
+ default:
+ usage(argv[0], 1);
+ }
+ }
+
/* WARNING: the following works on Linux and SysV, but not BSD! */
signal(SIGCHLD, SIG_IGN);
- transp = svcudp_create(RPC_ANYSOCK);
+ if (port)
+ transp = svcudp_create(makesock(port, IPPROTO_UDP));
+ else
+ transp = svcudp_create(RPC_ANYSOCK);
if (transp == NULL) {
syslog(LOG_ERR, "cannot create udp service.");
exit(1);
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 \
/*
* Initialize callback socket
*/
-static int
-get_socket(void)
+int
+statd_get_socket(int port)
{
struct sockaddr_in sin;
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");
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)) {
#include <string.h>
#include <rpc/rpc.h>
#include <rpc/pmap_clnt.h>
+#include <rpcmisc.h>
#include "statd.h"
#include "sim_sm_inter.h"
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);
}
#include <signal.h>
#include <unistd.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"
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
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 **);
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");
}
/*
extern char *optarg;
int pid;
int arg;
-
+ int port = 0, out_port = 0;
+
/* Default: daemon mode, no other options */
run_mode = 0;
}
/* 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. */
/* 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 ();
/* 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
}
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).");
-}
.\" Copyright (C) 1999 Olaf Kirch <okir@monad.swb.de>
.\" Modified by Jeffrey A. Uphoff, 1999.
.\" Modified by Lon Hohberger, 2000.
-.TH rpc.statd 8 "02 Feb 2001"
+.TH rpc.statd 8 "08 Mar 2001"
.SH NAME
rpc.statd \- NSM status monitor
.SH SYNOPSIS
-.B "/sbin/rpc.statd [-F] [-d] [-?] [-V]
+.B "/sbin/rpc.statd [-F] [-d] [-?] [-o " port "] [-p " port "] [-V]"
.SH DESCRIPTION
The
.B rpc.statd
.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
.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>
projects / nfs-utils.git / commitdiff