Attachment 5057 Details for Bug 6970 – Patch for bug 6970

[patch] Patch for bug 6970

diff.patch (text/plain), 3.85 KB, created by Miguel Sanders (mail account dead) on 2009-12-05 13:04:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Sanders (mail account dead)

Created: 2009-12-05 13:04:59 UTC

Size: 3.85 KB

patch

obsolete

>--- getifaddrsOLD.c	2009-09-09 14:40:43.000000000 +0200
>+++ getifaddrsNEW.c	2009-12-05 19:50:35.000000000 +0100
>@@ -249,94 +249,95 @@
> #define _FOUND_IFACE_ANY
> #endif /* HAVE_IFACE_IFREQ */
> #ifdef HAVE_IFACE_AIX
> 
> /****************************************************************************
>-this one is for AIX (tested on 4.2)
>+this one is for AIX (tested on 5.3 / 6.1)
> ****************************************************************************/
> int rep_getifaddrs(struct ifaddrs **ifap)
> {
> 	char buff[8192];
>-	int fd, i;
>+	int fd, size;
> 	struct ifconf ifc;
>-	struct ifreq *ifr=NULL;
>+	struct ifreq *ifr = NULL;
> 	struct ifaddrs *curif;
> 	struct ifaddrs *lastif = NULL;
>+	void *current, *end;
> 
> 	*ifap = NULL;
> 
> 	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
> 		return -1;
> 	}
> 
>-	ifc.ifc_len = sizeof(buff);
>-	ifc.ifc_buf = buff;
>+	if (ioctl(fd, SIOCGSIZIFCONF, &size) != 0) {
>+		return -1;
>+	}
>+
>+	ifc.ifc_len = size;
>+	ifc.ifc_buf = (struct ifreq *)buff;
> 
> 	if (ioctl(fd, SIOCGIFCONF, &ifc) != 0) {
> 		close(fd);
> 		return -1;
> 	}
> 
> 	ifr = ifc.ifc_req;
>+	current = (void *)ifr;
>+	end = (void *)ifr + ifc.ifc_len;
> 
>-	/* Loop through interfaces */
>-	i = ifc.ifc_len;
>-
>-	while (i > 0) {
>-		uint_t inc;
>+	while (current < end) {
>+		ifr = (struct ifreq *)current;
>+                struct sockaddr *sa=(struct sockaddr *)&(ifr->ifr_addr);
>+
>+                if(((struct sockaddr_in *)sa)->sin_family == AF_INET) {
>+			curif = calloc(1, sizeof(struct ifaddrs));
>+			if (lastif == NULL) {
>+				*ifap = curif;
>+			} else {
>+				lastif->ifa_next = curif;
>+			}
>+
>+			curif->ifa_name = strdup(ifr->ifr_name);
>+			curif->ifa_addr = sockaddr_dup(&ifr->ifr_addr);
>+			curif->ifa_dstaddr = NULL;
>+			curif->ifa_data = NULL;
>+			curif->ifa_netmask = NULL;
>+			curif->ifa_next = NULL;
>+
>+			if (ioctl(fd, SIOCGIFFLAGS, ifr) != 0) {
>+				freeaddrinfo(*ifap);
>+				return -1;
>+			}
>+
>+			curif->ifa_flags = ifr->ifr_flags;
>+
>+			if (ioctl(fd, SIOCGIFNETMASK, ifr) != 0) {
>+				freeaddrinfo(*ifap);
>+				return -1;
>+			}
> 
>-		inc = ifr->ifr_addr.sa_len;
>+			curif->ifa_netmask = sockaddr_dup(&ifr->ifr_addr);
> 
>-		if (ioctl(fd, SIOCGIFADDR, ifr) != 0) {
>-			freeaddrinfo(*ifap);
>-			return -1;
>+			lastif = curif;
> 		}
> 
>-		curif = calloc(1, sizeof(struct ifaddrs));
>-		if (lastif == NULL) {
>-			*ifap = curif;
>-		} else {
>-			lastif->ifa_next = curif;
>-		}
>-
>-		curif->ifa_name = strdup(ifr->ifr_name);
>-		curif->ifa_addr = sockaddr_dup(&ifr->ifr_addr);
>-		curif->ifa_dstaddr = NULL;
>-		curif->ifa_data = NULL;
>-		curif->ifa_netmask = NULL;
>-		curif->ifa_next = NULL;
>-
>-		if (ioctl(fd, SIOCGIFFLAGS, ifr) != 0) {
>-			freeaddrinfo(*ifap);
>-			return -1;
>-		}
>-
>-		curif->ifa_flags = ifr->ifr_flags;
>-
>-		if (ioctl(fd, SIOCGIFNETMASK, ifr) != 0) {
>-			freeaddrinfo(*ifap);
>-			return -1;
>-		}
>-
>-		curif->ifa_netmask = sockaddr_dup(&ifr->ifr_addr);
>-
>-		lastif = curif;
>-
>-	next:
>-		/*
>-		 * Patch from Archie Cobbs (archie@whistle.com).  The
>-		 * addresses in the SIOCGIFCONF interface list have a
>-		 * minimum size. Usually this doesn't matter, but if
>-		 * your machine has tunnel interfaces, etc. that have
>-		 * a zero length "link address", this does matter.  */
>-
>-		if (inc < sizeof(ifr->ifr_addr))
>-			inc = sizeof(ifr->ifr_addr);
>-		inc += IFNAMSIZ;
>+                /*
>+                 * Patch from Archie Cobbs (archie@whistle.com).  The
>+                 * addresses in the SIOCGIFCONF interface list have a
>+                 * minimum size. Usually this doesn't matter, but if
>+                 * your machine has tunnel interfaces, etc. that have
>+                 * a zero length "link address", this does matter.  
>+		*/
>+
>+		int inc = ifr->ifr_addr.sa_len;
>+		if (inc < sizeof(ifr->ifr_addr)) {
>+                        inc = sizeof(ifr->ifr_addr);
>+                }
>+                inc += IFNAMSIZ;
> 
>-		ifr = (struct ifreq*) (((char*) ifr) + inc);
>-		i -= inc;
>+		current += inc;
> 	}
> 
> 	close(fd);
> 	return 0;
> }

Actions: View

Attachments on bug 6970: 5057 | 5060 | 8357 | 13270 | 13811 | 13814 | 13815 | 14082