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

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 7b182fd..457d642 100644
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -65,35 +65,55 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport,
 	}
 
 	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 (_rpcfdtype == 0) {
+			if (last_transp
+			    && (!defport || defport == last_transp->xp_port)) {
+				transp = last_transp;
+				goto udp_transport;
+			}
+			if ((sock = makesock(defport, IPPROTO_UDP, bufsiz)) < 0) {
+				xlog(L_FATAL, "%s: cannot make a UDP socket\n",
+						name);
+			}
 		}
 		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 (_rpcfdtype == 0) {
+			if (last_transp
+			    && (!defport || defport == last_transp->xp_port)) {
+				transp = last_transp;
+				goto tcp_transport;
+			}
+			if ((sock = makesock(defport, IPPROTO_TCP, bufsiz)) < 0) {
+				xlog(L_FATAL, "%s: cannot make a TCP socket\n",
+						name);
+			}
 		}
 		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) {