reassign 335099 net-tools merge 145004 186208 180367 122792 87784 335099 tags upstream patch thanks
On Fri, Oct 21, 2005 at 11:35:04PM +0100, Carlos Rodrigues wrote: > Let me extend this a bit: > > This Debian machine has other interfaces configured statically. These > interfaces have private network addresses which also get wrong > broadcast address guesses: > > 10.1.92.0/22 - ifupdown chooses 10.255.255.255 instead of 10.1.95.255 > 10.1.96.0/22 - ifupdown chooses 10.255.255.255 instead of 10.1.99.255 > 172.16.0.0/21 - ifup down chooses 172.16.255.255 instead of 172.16.7.255 It's not ifupdown which chooses that, it's ifconfig. Ifupdown passes on your arguments to ifconfig. This is not actually ifup¡s fault, but net tools. See the following Debian bugs: #87784, #122792, #145004, #186208, #180367 Also see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=157319 The attached patch, from Fedora, might fix this issue. How many times has this to get reported before the maintainer takes action? Regards Javier
--- net-tools-1.60/ifconfig.c.broadcast 2004-11-03 12:05:30.000000000 +0100
+++ net-tools-1.60/ifconfig.c 2004-11-04 15:39:32.817077232 +0100
@@ -36,6 +36,7 @@
#include <sys/ioctl.h>
#include <netinet/in.h>
#include <net/if.h>
+#include <netinet/ip.h>
#include <net/if_arp.h>
#include <stdio.h>
#include <errno.h>
@@ -138,6 +139,7 @@
perror("SIOCSIFFLAGS");
return -1;
}
+
return (0);
}
@@ -212,17 +214,41 @@
exit(0);
}
-static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa)
+static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa, int
new_bcast)
{
int err = 0;
-
- memcpy((char *) &ifr->ifr_netmask, (char *) sa,
- sizeof(struct sockaddr));
+ struct sockaddr_in * ip_addr, * netmask, *bcast;
+ struct ifreq ifraddr;
+ struct ifreq ifrbcast;
+
+ memcpy((char *) &ifr->ifr_netmask, (char *) sa,
+ sizeof(struct sockaddr));
if (ioctl(skfd, SIOCSIFNETMASK, ifr) < 0) {
fprintf(stderr, "SIOCSIFNETMASK: %s\n",
strerror(errno));
err = 1;
}
+
+ if (new_bcast) {
+ memcpy(&ifraddr,ifr,sizeof(struct ifreq));
+ memcpy(&ifrbcast,ifr,sizeof(struct ifreq));
+
+ if (ioctl(skfd, SIOCGIFADDR, &ifraddr) < 0) {
+ fprintf(stderr, "SIOCGIFADDR: %s\n", strerror(errno));
+ err = 1;
+ }
+
+ ip_addr = (struct sockaddr_in *)&ifraddr.ifr_addr;
+ netmask = (struct sockaddr_in *)&ifr->ifr_netmask;
+ bcast = (struct sockaddr_in *)&ifrbcast.ifr_broadaddr;
+ /* calculate new broadcast adress */
+ bcast->sin_addr.s_addr = ip_addr->sin_addr.s_addr |
~netmask->sin_addr.s_addr;
+ /* set new broadcast adress */
+ if (ioctl(skfd, SIOCSIFBRDADDR, &ifrbcast) < 0) {
+ fprintf(stderr, "SIOCSIFBROADCAST: %s\n",
strerror(errno));
+ err = 1;
+ }
+ }
return 0;
}
@@ -234,7 +260,7 @@
struct aftype *ap;
struct hwtype *hw;
struct ifreq ifr;
- int goterr = 0, didnetmask = 0, donetmask = 0;
+ int goterr = 0, didnetmask = 0, donetmask = 0, dobcast = 1;
char **spp;
int fd;
#if HAVE_AFINET6
@@ -506,6 +532,7 @@
strerror(errno));
goterr = 1;
}
+ dobcast = 0;
spp++;
}
goterr |= set_flag(ifr.ifr_name, IFF_BROADCAST);
@@ -542,7 +569,7 @@
continue;
}
didnetmask++;
- goterr = set_netmask(ap->fd, &ifr, &sa);
+ goterr = set_netmask(ap->fd, &ifr, &sa, dobcast);
spp++;
continue;
}
@@ -964,7 +991,7 @@
/* set CIDR netmask */
if (donetmask) {
donetmask = 0;
- goterr = set_netmask(skfd, &ifr, &sa_netmask);
+ goterr = set_netmask(skfd, &ifr, &sa_netmask, dobcast);
didnetmask++;
}
signature.asc
Description: Digital signature
