------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <2693.951458734.1@coconut.itojun.org>
Content-Transfer-Encoding: 7bit

	recently I bringed in getifaddrs from BSDI4 (this is under BSD license).
	SIOCGIFCONF is too hard to use in LP64-friendly manner.
	I would like to start rewriting use of SIOCGIFCONF in the tree.

	Could anyone check if it works correctly?  I don't have YP server
	near here... (or can I just commit it?)

itojun


------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <2693.951458734.2@coconut.itojun.org>
Content-Transfer-Encoding: 7bit

Index: ypbind.c
===================================================================
RCS file: /cvsroot/basesrc/usr.sbin/ypbind/ypbind.c,v
retrieving revision 1.41
diff -u -r1.41 ypbind.c
--- ypbind.c	2000/02/20 14:31:28	1.41
+++ ypbind.c	2000/02/25 06:02:44
@@ -73,6 +73,7 @@
 #include <util.h>
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
+#include <ifaddrs.h>
 
 #include "pathnames.h"
 
@@ -837,74 +838,46 @@
 	char *buf;
 	int outlen;
 {
-	struct ifconf ifc;
-	struct ifreq ifreq, *ifr;
-	struct in_addr in;
-	int i, sock, len;
-	char inbuf[8192];
+	struct ifaddrs *ifap, *ifa;
 	struct sockaddr_in bindsin;
-
-	/* find all networks and send the RPC packet out them all */
-	if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
-		yp_log(LOG_WARNING, "broadcast: socket: %m");
-		return -1;
-	}
+	struct in_addr in;
 
 	memset(&bindsin, 0, sizeof bindsin);
 	bindsin.sin_family = AF_INET;
 	bindsin.sin_len = sizeof(bindsin);
 	bindsin.sin_port = htons(PMAPPORT);
 
-	ifc.ifc_len = sizeof inbuf;
-	ifc.ifc_buf = inbuf;
-	if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
-		yp_log(LOG_WARNING, "broadcast: ioctl(SIOCGIFCONF): %m");
-		(void)close(sock);
-		return -1;
-	}
-	ifr = ifc.ifc_req;
-	ifreq.ifr_name[0] = '\0';
-	for (i = 0; i < ifc.ifc_len; i += len, ifr = (struct ifreq *)((caddr_t)ifr + len)) {
-		memcpy(&ifreq, ifr, sizeof(ifreq));
-#if defined(BSD) && BSD >= 199103
-		len = sizeof ifreq.ifr_name + ifreq.ifr_addr.sa_len;
-#else
-		len = sizeof ifc.ifc_len / sizeof(struct ifreq);
-#endif
-		if (ifreq.ifr_addr.sa_family != AF_INET)
-			continue;
-		if (ioctl(sock, SIOCGIFFLAGS, &ifreq) < 0) {
-			yp_log(LOG_WARNING,
-			    "broadcast: ioctl(SIOCGIFFLAGS): %m");
+	if (getifaddrs(&ifap) != 0) {
+		yp_log(LOG_WARNING, "broadcast: getifaddrs: %m");
+		return (-1);
+	}
+	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+		if (ifa->ifa_addr->sa_family != AF_INET)
 			continue;
-		}
-		if ((ifreq.ifr_flags & IFF_UP) == 0)
+		if ((ifa->ifa_flags & IFF_UP) == 0)
 			continue;
 
-		ifreq.ifr_flags &= (IFF_LOOPBACK | IFF_BROADCAST);
-		if (ifreq.ifr_flags == IFF_BROADCAST) {
-			if (ioctl(sock, SIOCGIFBRDADDR, &ifreq) < 0) {
-				yp_log(LOG_WARNING, 
-				    "broadcast: ioctl(SIOCGIFBRDADDR): %m");
+		switch (ifa->ifa_flags & (IFF_LOOPBACK | IFF_BROADCAST)) {
+		case IFF_BROADCAST:
+			if (!ifa->ifa_broadaddr)
 				continue;
-			}
-		} else if (ifreq.ifr_flags == IFF_LOOPBACK) {
-			if (ioctl(sock, SIOCGIFADDR, &ifreq) < 0) {
-				yp_log(LOG_WARNING,
-				    "broadcast: ioctl(SIOCGIFADDR): %m");
-				continue;
-			}
-		} else
+			if (ifa->ifa_broadaddr->sa_family != AF_INET)
+			in = ((struct sockaddr_in *)&ifa->ifa_broadaddr)->sin_addr;
+			break;
+		case IFF_LOOPBACK:
+			in = ((struct sockaddr_in *)&ifa->ifa_addr)->sin_addr;
+			break;
+		default:
 			continue;
+		}
 
-		in = ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr;
 		bindsin.sin_addr = in;
 		if (sendto(rpcsock, buf, outlen, 0, (struct sockaddr *)&bindsin,
-			   sizeof bindsin) == -1)
+			   bindsin.sin_len) == -1)
 			yp_log(LOG_WARNING, "broadcast: sendto: %m");
 	}
-	(void)close(sock);
-	return 0;
+	freeifaddrs(ifap);
+	return (0);
 }
 
 static int

------- =_aaaaaaaaaa0--