--- nfs-utils-1.0.8/support/include/nfs/nfs.h.ports 2006-06-24 13:25:48.000000000 -0400 +++ nfs-utils-1.0.8/support/include/nfs/nfs.h 2006-06-24 13:27:31.000000000 -0400 @@ -44,8 +44,12 @@ struct nfs_fh_old { #define LOCKDCTL_SVC NFSCTL_LOCKD #define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1))) +#define NFSCTL_UDPUNSET(_cltbits) ((_cltbits) &= ~(1 << (17 - 1))) +#define NFSCTL_TCPUNSET(_cltbits) ((_cltbits) &= ~(1 << (18 - 1))) #define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1))) +#define NFSCTL_UDPISSET(_cltbits) ((_cltbits) & (1 << (17 - 1))) +#define NFSCTL_TCPISSET(_cltbits) ((_cltbits) & (1 << (18 - 1))) #define NFSCTL_ALLBITS (~0) --- nfs-utils-1.0.8/support/include/nfslib.h.ports 2006-06-24 13:25:48.000000000 -0400 +++ nfs-utils-1.0.8/support/include/nfslib.h 2006-06-24 14:34:57.000000000 -0400 @@ -120,7 +120,7 @@ int wildmat(char *text, char *pattern) * nfsd library functions. */ int nfsctl(int, struct nfsctl_arg *, union nfsctl_res *); -int nfssvc(int port, int nrservs, unsigned int versbits); +int nfssvc(int port, int nrservs, unsigned int versbits, unsigned int portbits, char *haddr); int nfsaddclient(struct nfsctl_client *clp); int nfsdelclient(struct nfsctl_client *clp); int nfsexport(struct nfsctl_export *exp); --- nfs-utils-1.0.8/support/nfs/nfssvc.c.ports 2006-06-24 13:25:48.000000000 -0400 +++ nfs-utils-1.0.8/support/nfs/nfssvc.c 2006-06-26 06:01:35.000000000 -0400 @@ -10,14 +10,80 @@ #include #endif +#include +#include +#include #include #include #include #include + #include "nfslib.h" static void +nfssvc_setfds(int port, unsigned int ctlbits, char *haddr) +{ + int fd, n, errout=0, on=1; + char buf[BUFSIZ], *udp, *tcp; + int udpfd = 0, tcpfd = 0, off=0;; + struct sockaddr_in sin; + + fd = open("/proc/fs/nfsd/fds", O_WRONLY); + if (fd < 0) + return; + sin.sin_family = AF_INET; + sin.sin_port = htons(port); + sin.sin_addr.s_addr = inet_addr(haddr); + + if (NFSCTL_UDPISSET(ctlbits)) { + udpfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (udpfd < 0) { + syslog(LOG_ERR, "nfssvc: unable to create UPD socket: " + "errno %d (%s)\n", errno, strerror(errno)); + exit(1); + } + if (bind(udpfd, (struct sockaddr *)&sin, sizeof(sin)) < 0){ + syslog(LOG_ERR, "nfssvc: unable to bind UPD socket: " + "errno %d (%s)\n", errno, strerror(errno)); + exit(1); + } + } + + if (NFSCTL_TCPISSET(ctlbits)) { + tcpfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (tcpfd < 0) { + syslog(LOG_ERR, "nfssvc: unable to createt tcp socket: " + "errno %d (%s)\n", errno, strerror(errno)); + exit(1); + } + if (setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) { + syslog(LOG_ERR, "nfssvc: unable to set SO_REUSEADDR: " + "errno %d (%s)\n", errno, strerror(errno)); + exit(1); + } + if (bind(tcpfd, (struct sockaddr *)&sin, sizeof(sin)) < 0){ + syslog(LOG_ERR, "nfssvc: unable to bind TCP socket: " + "errno %d (%s)\n", errno, strerror(errno)); + exit(1); + } + if (listen(tcpfd, 64) < 0){ + syslog(LOG_ERR, "nfssvc: unable to create listening socket: " + "errno %d (%s)\n", errno, strerror(errno)); + exit(1); + } + } + snprintf(buf, BUFSIZ,"%d %d\n", udpfd, tcpfd); + if (write(fd, buf, strlen(buf)) != strlen(buf)) { + syslog(LOG_ERR, + "nfssvc: writting fds to kernel failed: errno %d (%s)", + errno, strerror(errno)); + } + close(fd); + + return; +} +static void nfssvc_versbits(unsigned int ctlbits) { int fd, n, off; @@ -45,11 +111,14 @@ nfssvc_versbits(unsigned int ctlbits) return; } int -nfssvc(int port, int nrservs, unsigned int versbits) +nfssvc(int port, int nrservs, unsigned int versbits, unsigned protobits, + char *haddr) { struct nfsctl_arg arg; int fd; + nfssvc_setfds(port, protobits, haddr); + nfssvc_versbits(versbits); fd = open("/proc/fs/nfsd/threads", O_WRONLY); --- nfs-utils-1.0.8/utils/nfsd/nfsd.c.ports 2006-06-24 13:25:48.000000000 -0400 +++ nfs-utils-1.0.8/utils/nfsd/nfsd.c 2006-06-25 22:18:58.000000000 -0400 @@ -20,23 +20,35 @@ #include #include #include +#include +#include +#include + #include "nfslib.h" static void usage(const char *); static struct option longopts[] = { + { "host", 1, 0, 'H' }, { "help", 0, 0, 'h' }, { "no-nfs-version", 1, 0, 'N' }, + { "no-tcp", 0, 0, 'T' }, + { "no-udp", 0, 0, 'U' }, + { "port", 1, 0, 'P' }, + { "port", 1, 0, 'p' }, { NULL, 0, 0, 0 } }; +unsigned int protobits = NFSCTL_ALLBITS; unsigned int versbits = NFSCTL_ALLBITS; +char *haddr = NULL; int main(int argc, char **argv) { int count = 1, c, error, port, fd, found_one; struct servent *ent; + struct hostent *hp; ent = getservbyname ("nfs", "udp"); if (ent != NULL) @@ -44,8 +56,19 @@ main(int argc, char **argv) else port = 2049; - while ((c = getopt_long(argc, argv, "hN:p:P:", longopts, NULL)) != EOF) { + while ((c = getopt_long(argc, argv, "H:hN:p:P:TU", longopts, NULL)) != EOF) { switch(c) { + case 'H': + if (inet_addr(optarg) != INADDR_NONE) { + haddr = strdup(optarg); + } else if ((hp = gethostbyname(optarg)) != NULL) { + haddr = inet_ntoa((*(struct in_addr*)(hp->h_addr_list[0]))); + } else { + fprintf(stderr, "%s: Unknown hostname: %s\n", + argv[0], optarg); + usage(argv [0]); + } + break; case 'P': /* XXX for nfs-server compatibility */ case 'p': port = atoi(optarg); @@ -67,6 +90,12 @@ main(int argc, char **argv) exit(1); } break; + case 'T': + NFSCTL_TCPUNSET(protobits); + break; + case 'U': + NFSCTL_UDPUNSET(protobits); + break; default: fprintf(stderr, "Invalid argument: '%c'\n", c); case 'h': @@ -76,6 +105,10 @@ main(int argc, char **argv) /* * Do some sanity checking, if the ctlbits are set */ + if (!NFSCTL_UDPISSET(protobits) && !NFSCTL_TCPISSET(protobits)) { + fprintf(stderr, "invalid protocol specified\n"); + exit(1); + } found_one = 0; for (c = NFSD_MINVERS; c <= NFSD_MAXVERS; c++) { if (NFSCTL_VERISSET(versbits, c)) @@ -85,6 +118,14 @@ main(int argc, char **argv) fprintf(stderr, "no version specified\n"); exit(1); } + if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(versbits)) { + fprintf(stderr, "version 4 requires the TCP protocol\n"); + exit(1); + } + if (haddr == NULL) { + struct in_addr in = {INADDR_ANY}; + haddr = strdup(inet_ntoa(in)); + } if (chdir(NFS_STATEDIR)) { fprintf(stderr, "%s: chdir(%s) failed: %s\n", @@ -116,7 +157,7 @@ main(int argc, char **argv) closeall(3); openlog("nfsd", LOG_PID, LOG_DAEMON); - if ((error = nfssvc(port, count, versbits)) < 0) { + if ((error = nfssvc(port, count, versbits, protobits, haddr)) < 0) { int e = errno; syslog(LOG_ERR, "nfssvc: %s", strerror(e)); closelog(); @@ -129,7 +170,7 @@ static void usage(const char *prog) { fprintf(stderr, "Usage:\n" - "%s [-p|-P|--port] [-N|no-nfs-version] nrservs\n", + "%s [-H hostname] [-p|-P|--port] [-N|no-nfs-version] [-T|--no-tcp] [-U|--no-udp] nrservs\n", prog); exit(2); } --- nfs-utils-1.0.8/utils/nfsd/nfsd.man.ports 2006-06-24 13:25:48.000000000 -0400 +++ nfs-utils-1.0.8/utils/nfsd/nfsd.man 2006-06-24 13:27:31.000000000 -0400 @@ -34,6 +34,16 @@ does not offer certain versions of NFS. .B rpc.nfsd can support both NFS version 2,3 and the newer version 4. .TP +.B \-T " or " \-\-no-tcp +Disable +.B rpc.nfsd +from accepting TCP connections from clients. +.TP +.B \-U " or " \-\-no-udp +Disable +.B rpc.nfsd +from accepting UDP connections from clients. +.TP .I nproc specify the number of NFS server threads. By default, just one thread is started. However, for optimum performance several threads