X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Frpcmisc.c;h=1c02364cecb153e6f33886b3b40499d97268d4ea;hp=7b182fd51ab7ab1f6147ae451b87c801eb960de7;hb=e36b61ba46d34841a6ad99857c7cc43fc8c1ee89;hpb=8b7ad01b14df1e7529b9ba8a1ea17df0d6004ef9

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 7b182fd..1c02364 100644
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -29,10 +29,11 @@
 #include <memory.h>
 #include <errno.h>
 #include <unistd.h>
+#include <time.h>
 #include "nfslib.h"
 
 static void	closedown(int sig);
-static int	makesock(int port, int proto, int socksz);
+int	makesock(int port, int proto);
 
 #define _RPCSVC_CLOSEDOWN	120
 int	_rpcpmstart = 0;
@@ -40,8 +41,7 @@ int	_rpcfdtype = 0;
 int	_rpcsvcdirty = 0;
 
 void
-rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport,
-							int bufsiz)
+rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport)
 {
 	struct sockaddr_in saddr;
 	SVCXPRT	*transp;
@@ -50,50 +50,84 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport,
 
 	asize = sizeof(saddr);
 	sock = 0;
-	_rpcfdtype = 0;
-	if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0) {
+	if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0
+	    && saddr.sin_family == AF_INET) {
 		int ssize = sizeof (int);
-		if (saddr.sin_family != AF_INET)
-			xlog(L_FATAL, "init: stdin is bound to non-inet addr");
+		int fdtype = 0;
 		if (getsockopt(0, SOL_SOCKET, SO_TYPE,
-				(char *)&_rpcfdtype, &ssize) == -1)
+				(char *)&fdtype, &ssize) == -1)
 			xlog(L_FATAL, "getsockopt failed: %s", strerror(errno));
-		_rpcpmstart = 1;
-	} else {
+		/* inetd passes a UDP socket or a listening TCP socket.
+		 * listen will fail on a connected TCP socket(passed by rsh).
+		 */
+		if (!(fdtype == SOCK_STREAM && listen(0,5) == -1)) {
+			_rpcfdtype = fdtype;
+			_rpcpmstart = 1;
+		}
+	}
+	if (!_rpcpmstart) {
 		pmap_unset(prog, vers);
 		sock = RPC_ANYSOCK;
 	}
 
 	if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_DGRAM)) {
-		if (_rpcfdtype == 0 && defport != 0 &&
-		    ((sock = makesock(defport, IPPROTO_UDP, bufsiz)) < 0)) {
-			xlog(L_FATAL, "%s: could not make a UDP socket\n",
-					name);
+		static SVCXPRT *last_transp = NULL;
+ 
+		if (_rpcpmstart == 0) {
+			if (last_transp
+			    && (!defport || defport == last_transp->xp_port)) {
+				transp = last_transp;
+				goto udp_transport;
+			}
+			if (defport == 0)
+				sock = RPC_ANYSOCK;
+			else if ((sock = makesock(defport, IPPROTO_UDP)) < 0) {
+				xlog(L_FATAL, "%s: cannot make a UDP socket\n",
+						name);
+			}
 		}
+		if (sock == RPC_ANYSOCK)
+			sock = svcudp_socket (prog, 1);
 		transp = svcudp_create(sock);
 		if (transp == NULL) {
 			xlog(L_FATAL, "cannot create udp service.");
 		}
+      udp_transport:
 		if (!svc_register(transp, prog, vers, dispatch, IPPROTO_UDP)) {
 			xlog(L_FATAL, "unable to register (%s, %d, udp).",
 					name, vers);
 		}
+		last_transp = transp;
 	}
 
 	if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_STREAM)) {
-		if (_rpcfdtype == 0 && defport != 0 &&
-		    ((sock = makesock(defport, IPPROTO_TCP, bufsiz)) < 0)) {
-			xlog(L_FATAL, "%s: could not make a TCP socket\n",
-					name);
+		static SVCXPRT *last_transp = NULL;
+
+		if (_rpcpmstart == 0) {
+			if (last_transp
+			    && (!defport || defport == last_transp->xp_port)) {
+				transp = last_transp;
+				goto tcp_transport;
+			}
+			if (defport == 0)
+				sock = RPC_ANYSOCK;
+			else if ((sock = makesock(defport, IPPROTO_TCP)) < 0) {
+				xlog(L_FATAL, "%s: cannot make a TCP socket\n",
+						name);
+			}
 		}
+		if (sock == RPC_ANYSOCK)
+			sock = svctcp_socket (prog, 1);
 		transp = svctcp_create(sock, 0, 0);
 		if (transp == NULL) {
 			xlog(L_FATAL, "cannot create tcp service.");
 		}
+      tcp_transport:
 		if (!svc_register(transp, prog, vers, dispatch, IPPROTO_TCP)) {
 			xlog(L_FATAL, "unable to register (%s, %d, tcp).",
 					name, vers);
 		}
+		last_transp = transp;
 	}
 
 	if (_rpcpmstart) {
@@ -107,7 +141,6 @@ int sig;
 {
 	(void) signal(sig, closedown);
 	if (_rpcsvcdirty == 0) {
-		extern fd_set svc_fdset;
 		static int size;
 		int i, openfd;
 
@@ -125,10 +158,7 @@ int sig;
 	(void) alarm(_RPCSVC_CLOSEDOWN);
 }
 
-static int makesock(port, proto, socksz)
-int port;
-int proto;
-int socksz;
+int makesock(int port, int proto)
 {
 	struct sockaddr_in sin;
 	int	s;
@@ -151,6 +181,9 @@ int socksz;
 	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0)
 		xlog(L_ERROR, "setsockopt failed: %s\n", strerror(errno));
 
+#if 0
+	/* I was told it didn't work with gigabit ethernet.
+	   Don't bothet with it.  H.J. */
 #ifdef SO_SNDBUF
 	{
 		int sblen, rblen;
@@ -162,6 +195,7 @@ int socksz;
 			xlog(L_ERROR, "setsockopt failed: %s\n", strerror(errno));
 	}
 #endif				/* SO_SNDBUF */
+#endif
 
 	if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
 		xlog(L_FATAL, "Could not bind name to socket: %s\n",