X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Frmtcall.c;h=eb1919ab363d221d481069d6ca9b722577729110;hp=362e1f6c7b13eadadae836c07f98abb5b79ceccd;hb=0210f16cf1bd2f87b7fe4336311c6dfd88030f8b;hpb=f113db5225e2954a53fd7eecccfc08326904909f

diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
index 362e1f6..eb1919a 100644
--- a/utils/statd/rmtcall.c
+++ b/utils/statd/rmtcall.c
@@ -62,83 +62,39 @@ int
 statd_get_socket(void)
 {
 	struct sockaddr_in	sin;
+	struct servent *se;
+	int loopcnt = 100;
 
 	if (sockfd >= 0)
 		return sockfd;
 
-	if ((sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
-		note(N_CRIT, "Can't create socket: %m");
-		return -1;
-	}
-
-	FD_SET(sockfd, &SVC_FDSET);
+	while (loopcnt-- > 0) {
 
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
-
-	if (bindresvport(sockfd, &sin) < 0) {
-		dprintf(N_WARNING,
-			"process_hosts: can't bind to reserved port\n");
-	}
-	return sockfd;
-}
+		if (sockfd >= 0) close(sockfd);
 
-/*
- * Try to resolve host name for notify/callback request
- *
- * When compiled with RESTRICTED_STATD defined, we expect all
- * host names to be dotted quads. See monitor.c for details. --okir
- */
-#ifdef RESTRICTED_STATD
-static int
-try_to_resolve(notify_list *lp)
-{
-	char		*hname;
-
-	hname = NL_MY_NAME(lp);
-	if (!inet_aton(hname, &(NL_ADDR(lp)))) {
-		note(N_ERROR, "%s is not an dotted-quad address", hname);
-		NL_TIMES(lp) = 0;
-		return 0;
-	}
-
-	/* XXX: In order to handle multi-homed hosts, we could do
-	 * a reverse lookup, a forward lookup, and cycle through
-	 * all the addresses.
-	 */
-	return 1;
-}
-#else
-static int
-try_to_resolve(notify_list *lp)
-{
-	struct hostent	*hp;
-	char		*hname;
+		if ((sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+			note(N_CRIT, "Can't create socket: %m");
+			return -1;
+		}
 
-	hname = NL_MY_NAME(lp);
 
-	dprintf(N_DEBUG, "Trying to resolve %s.", hname);
-	if (!(hp = gethostbyname(hname))) {
-		herror("gethostbyname");
-		NL_TIMES(lp) -= 1;
-		return 0;
-	}
+		memset(&sin, 0, sizeof(sin));
+		sin.sin_family = AF_INET;
+		sin.sin_addr.s_addr = INADDR_ANY;
 
-	if (hp->h_addrtype != AF_INET) {
-		note(N_ERROR, "%s is not an AF_INET address", hname);
-		NL_TIMES(lp) = 0;
-		return 0;
+		if (bindresvport(sockfd, &sin) < 0) {
+			dprintf(N_WARNING,
+				"process_hosts: can't bind to reserved port\n");
+			break;
+		}
+		se = getservbyport(sin.sin_port, "udp");
+		if (se == NULL)
+			break;
+		/* rather not use that port, try again */
 	}
-
-	/* FIXME: should try all addresses for multi-homed hosts in
-	 * alternation because one interface might be down/unreachable. */
-	NL_ADDR(lp) = *(struct in_addr *) hp->h_addr;
-
-	dprintf(N_DEBUG, "address of %s is %s", hname, inet_ntoa(NL_ADDR(lp)));
-	return 1;
+	FD_SET(sockfd, &SVC_FDSET);
+	return sockfd;
 }
-#endif
 
 static unsigned long
 xmit_call(int sockfd, struct sockaddr_in *sin,
@@ -292,8 +248,6 @@ process_entry(int sockfd, notify_list *lp)
 	u_int32_t		proc, vers, prog;
 /* 	__u32			proc, vers, prog; */
 
-	if (lp->addr.s_addr == INADDR_ANY && !try_to_resolve(lp))
-		return NL_TIMES(lp);
 	if (NL_TIMES(lp) == 0) {
 		note(N_DEBUG, "Cannot notify %s, giving up.\n",
 					inet_ntoa(NL_ADDR(lp)));
@@ -321,8 +275,8 @@ process_entry(int sockfd, notify_list *lp)
 
 	lp->xid = xmit_call(sockfd, &sin, prog, vers, proc, func, objp);
 	if (!lp->xid) {
-		note(N_WARNING, "notify_host: failed to notify %s\n",
-				inet_ntoa(lp->addr));
+		note(N_WARNING, "notify_host: failed to notify port %d\n",
+				ntohs(lp->port));
 	}
 	NL_TIMES(lp) -= 1;