X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Frpcmisc.c;h=eb5629aec07af9297f95385d2f26d1e8a38fe2d5;hp=40c21025c1e5766fc8947057afa3b1c5f34c266a;hb=ec2e72c3e6f13dfa049598427c56115f1cbed16c;hpb=a663cf4c59e9b4fa56d8ca976c582ccf929140d2

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 40c2102..eb5629a 100644
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -39,7 +39,7 @@
 #endif
 
 static void	closedown(int sig);
-int	makesock(int port, int proto);
+static int	makesock(int port, int proto);
 
 #define _RPCSVC_CLOSEDOWN	120
 int	_rpcpmstart = 0;
@@ -89,10 +89,8 @@ rpc_init(char *name, int prog, int vers,
 			}
 			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);
-			}
+			else
+				sock = makesock(defport, IPPROTO_UDP);
 		}
 		if (sock == RPC_ANYSOCK)
 			sock = svcudp_socket (prog, 1);
@@ -119,10 +117,8 @@ rpc_init(char *name, int prog, int vers,
 			}
 			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);
-			}
+			else
+				sock = makesock(defport, IPPROTO_TCP);
 		}
 		if (sock == RPC_ANYSOCK)
 			sock = svctcp_socket (prog, 1);
@@ -166,36 +162,42 @@ int sig;
 	(void) alarm(_RPCSVC_CLOSEDOWN);
 }
 
-int makesock(int port, int proto)
+/*
+ * Create listener socket for a given port
+ *
+ * Return an open network socket on success; otherwise return -1
+ * if some error occurs.
+ */
+static int
+makesock(int port, int proto)
 {
 	struct sockaddr_in sin;
-	int	s;
-	int	sock_type;
-	int	val;
+	int	sock, sock_type, val;
 
 	sock_type = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
-	s = socket(AF_INET, sock_type, proto);
-	if (s < 0) {
-		xlog(L_FATAL, "Could not make a socket: %s\n",
+	sock = socket(AF_INET, sock_type, proto);
+	if (sock < 0) {
+		xlog(L_FATAL, "Could not make a socket: %s",
 					strerror(errno));
-		return (-1);
+		return -1;
 	}
 	memset((char *) &sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
+	sin.sin_addr.s_addr = htonl(INADDR_ANY);
 	sin.sin_port = htons(port);
 
 	val = 1;
 	if (proto == IPPROTO_TCP)
-		if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+		if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
 			       &val, sizeof(val)) < 0)
-			xlog(L_ERROR, "setsockopt failed: %s\n",
+			xlog(L_ERROR, "setsockopt failed: %s",
 			     strerror(errno));
 
-	if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
-		xlog(L_FATAL, "Could not bind name to socket: %s\n",
+	if (bind(sock, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
+		xlog(L_FATAL, "Could not bind name to socket: %s",
 					strerror(errno));
-		return (-1);
+		return -1;
 	}
-	return (s);
+
+ 	return sock;
 }