Attachment 313676 Details for Bug 458252 – Patch to raise the limit of number of local interfaces handled.

[patch] Patch to raise the limit of number of local interfaces handled.

autofs-5.0.1-ifcbuf.patch (text/plain), 1.63 KB, created by Thomas Bellman on 2008-08-07 10:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Bellman

Created: 2008-08-07 10:22:59 UTC

Size: 1.63 KB

patch

obsolete

>diff -r -U5 autofs-5.0.1.ORIG/modules/replicated.c autofs-5.0.1/modules/replicated.c
>--- autofs-5.0.1.ORIG/modules/replicated.c	2008-08-07 00:47:11.000000000 +0200
>+++ autofs-5.0.1/modules/replicated.c	2008-08-07 02:32:59.000000000 +0200
>@@ -97,11 +97,11 @@
> 
> static unsigned int get_proximity(const char *host_addr, int addr_len)
> {
> 	struct sockaddr_in *msk_addr, *if_addr;
> 	struct in_addr *hst_addr;
>-	char tmp[20], buf[MAX_ERR_BUF], *ptr;
>+	char tmp[20], buf[MAX_ERR_BUF], ifcbuf[MAX_IFC_BUF], *ptr;
> 	struct ifconf ifc;
> 	struct ifreq *ifr, nmptr;
> 	int sock, cl_flags, ret, i;
> 	uint32_t mask, ha, ia;
> 
>@@ -120,12 +120,12 @@
> 	if ((cl_flags = fcntl(sock, F_GETFD, 0)) != -1) {
> 		cl_flags |= FD_CLOEXEC;
> 		fcntl(sock, F_SETFD, cl_flags);
> 	}
> 
>-	ifc.ifc_len = sizeof(buf);
>-	ifc.ifc_req = (struct ifreq *) buf;
>+	ifc.ifc_len = sizeof(ifcbuf);
>+	ifc.ifc_req = (struct ifreq *) ifcbuf;
> 	ret = ioctl(sock, SIOCGIFCONF, &ifc);
> 	if (ret == -1) {
> 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
> 		logerr("ioctl: %s", estr);
> 		close(sock);
>@@ -136,11 +136,11 @@
> 
> 	/* Is the address a local interface */
> 	i = 0;
> 	ptr = (char *) &ifc.ifc_buf[0];
> 
>-	while (ptr < buf + ifc.ifc_len) {
>+	while (ptr < ifcbuf + ifc.ifc_len) {
> 		ifr = (struct ifreq *) ptr;
> 
> 		switch (ifr->ifr_addr.sa_family) {
> 		case AF_INET:
> 			if_addr = (struct sockaddr_in *) &ifr->ifr_addr;
>@@ -160,11 +160,11 @@
> 	}
> 
> 	i = 0;
> 	ptr = (char *) &ifc.ifc_buf[0];
> 
>-	while (ptr < buf + ifc.ifc_len) {
>+	while (ptr < ifcbuf + ifc.ifc_len) {
> 		ifr = (struct ifreq *) ptr;
> 
> 		switch (ifr->ifr_addr.sa_family) {
> 		case AF_INET:
> 			if_addr = (struct sockaddr_in *) &ifr->ifr_addr;

Actions: View | Diff

Attachments on bug 458252: 313676