Allow rpc.nfsd to suppress tcp or udp, and listen on a specific address.

 -T       - will suppressing listening for TCP connection.
 -U       - will suppress UDP
 -H host  - will only listen on that local address
 -p port  - will listen on that port.

This requires kernel patches which will hopefully be in 2.6.19 and possibly some
earlier test and vendor kernels.

3 files changed, 95 insertions, 4 deletions

diff --git a/support/include/nfs/nfs.h b/support/include/nfs/nfs.h
index 2cf6857..f0286b2 100644
--- a/support/include/nfs/nfs.h
+++ b/support/include/nfs/nfs.h
@@ -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)
 
diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 50892e2..3e25761 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -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);
diff --git a/support/nfs/nfssvc.c b/support/nfs/nfssvc.c
index c51ace1..a6ea410 100644
--- a/support/nfs/nfssvc.c
+++ b/support/nfs/nfssvc.c
@@ -10,13 +10,97 @@
 #include <config.h>
 #endif
 
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <syslog.h>
 
+
 #include "nfslib.h"
 
+#define NFSD_PORTS_FILE     "/proc/fs/nfsd/portlist"
+#define NFSD_VERS_FILE    "/proc/fs/nfsd/versions"
+#define NFSD_THREAD_FILE  "/proc/fs/nfsd/threads"
+
+static void
+nfssvc_setfds(int port, unsigned int ctlbits, char *haddr)
+{
+	int fd, on=1;
+	char buf[BUFSIZ];
+	int udpfd = -1, tcpfd = -1;
+	struct sockaddr_in sin;
+
+	fd = open(NFSD_PORTS_FILE, 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);
+		}
+	}
+	if (udpfd >= 0) {
+		snprintf(buf, BUFSIZ,"%d\n", udpfd); 
+		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);
+		fd = -1;
+	}
+	if (tcpfd >= 0) {
+		if (fd < 0)
+			fd = open(NFSD_PORTS_FILE, O_WRONLY);
+		snprintf(buf, BUFSIZ,"%d\n", 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)
 {
@@ -25,7 +109,7 @@ nfssvc_versbits(unsigned int ctlbits)
 
 	ptr = buf;
 	off = 0;
-	fd = open("/proc/fs/nfsd/versions", O_WRONLY);
+	fd = open(NFSD_VERS_FILE, O_WRONLY);
 	if (fd < 0)
 		return;
 
@@ -45,14 +129,17 @@ 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);
+	fd = open(NFSD_THREAD_FILE, O_WRONLY);
 	if (fd < 0)
 		fd = open("/proc/fs/nfs/threads", O_WRONLY);
 	if (fd >= 0) {