- ifconfig - fixed virtual interface dropping (#162888)
This commit is contained in:
parent
54cc3942fd
commit
b4d0d93142
107
net-tools-1.60-ifconfig.patch
Normal file
107
net-tools-1.60-ifconfig.patch
Normal file
@ -0,0 +1,107 @@
|
||||
--- net-tools-1.60/ifconfig.c.new 2005-07-20 12:47:29.000000000 +0200
|
||||
+++ net-tools-1.60/ifconfig.c 2005-07-20 12:54:57.000000000 +0200
|
||||
@@ -175,6 +175,32 @@
|
||||
return (0);
|
||||
}
|
||||
|
||||
+/** test is a specified flag is set */
|
||||
+static int test_flag(char *ifname, short flags)
|
||||
+{
|
||||
+ struct ifreq ifr;
|
||||
+ int fd;
|
||||
+
|
||||
+ if (strchr(ifname, ':')) {
|
||||
+ /* This is a v4 alias interface. Downing it via a socket for
|
||||
+ another AF may have bad consequences. */
|
||||
+ fd = get_socket_for_af(AF_INET);
|
||||
+ if (fd < 0) {
|
||||
+ fprintf(stderr, _("No support for INET on this system.\n"));
|
||||
+ return -1;
|
||||
+ }
|
||||
+ } else
|
||||
+ fd = skfd;
|
||||
+
|
||||
+ safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
|
||||
+ if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
|
||||
+ fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"),
|
||||
+ ifname, strerror(errno));
|
||||
+ return -1;
|
||||
+ }
|
||||
+ return (ifr.ifr_flags & flags);
|
||||
+}
|
||||
+
|
||||
static void usage(void)
|
||||
{
|
||||
fprintf(stderr, _("Usage:\n ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
|
||||
@@ -249,7 +275,7 @@
|
||||
err = 1;
|
||||
}
|
||||
}
|
||||
- return 0;
|
||||
+ return err;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
@@ -415,6 +441,8 @@
|
||||
}
|
||||
if (!strcmp(*spp, "-promisc")) {
|
||||
goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
|
||||
+ if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0)
|
||||
+ fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name);
|
||||
spp++;
|
||||
continue;
|
||||
}
|
||||
@@ -425,6 +453,8 @@
|
||||
}
|
||||
if (!strcmp(*spp, "-multicast")) {
|
||||
goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
|
||||
+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
|
||||
+ fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name);
|
||||
spp++;
|
||||
continue;
|
||||
}
|
||||
@@ -435,6 +465,8 @@
|
||||
}
|
||||
if (!strcmp(*spp, "-allmulti")) {
|
||||
goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
|
||||
+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
|
||||
+ fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name);
|
||||
spp++;
|
||||
continue;
|
||||
}
|
||||
@@ -456,6 +488,8 @@
|
||||
}
|
||||
if (!strcmp(*spp, "-dynamic")) {
|
||||
goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC);
|
||||
+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
|
||||
+ fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name);
|
||||
spp++;
|
||||
continue;
|
||||
}
|
||||
@@ -513,6 +547,8 @@
|
||||
|
||||
if (!strcmp(*spp, "-broadcast")) {
|
||||
goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
|
||||
+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
|
||||
+ fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name);
|
||||
spp++;
|
||||
continue;
|
||||
}
|
||||
@@ -569,7 +605,7 @@
|
||||
continue;
|
||||
}
|
||||
didnetmask++;
|
||||
- goterr = set_netmask(ap->fd, &ifr, &sa, dobcast);
|
||||
+ goterr |= set_netmask(ap->fd, &ifr, &sa, dobcast);
|
||||
spp++;
|
||||
continue;
|
||||
}
|
||||
@@ -640,6 +676,8 @@
|
||||
}
|
||||
if (!strcmp(*spp, "-pointopoint")) {
|
||||
goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
|
||||
+ if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
|
||||
+ fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
|
||||
spp++;
|
||||
continue;
|
||||
}
|
@ -3,7 +3,7 @@
|
||||
Summary: Basic networking tools.
|
||||
Name: net-tools
|
||||
Version: 1.60
|
||||
Release: 54
|
||||
Release: 55
|
||||
License: GPL
|
||||
Group: System Environment/Base
|
||||
Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
|
||||
@ -53,6 +53,7 @@ Patch38: net-tools-1.60-ifaceopt.patch
|
||||
Patch39: net-tools-1.60-trim_iface.patch
|
||||
Patch40: net-tools-1.60-stdo.patch
|
||||
Patch41: net-tools-1.60-statistics.patch
|
||||
Patch42: net-tools-1.60-ifconfig.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
Requires(post,preun): chkconfig
|
||||
@ -102,6 +103,7 @@ ifconfig, netstat, route, and others.
|
||||
%patch39 -p1 -b .trim-iface
|
||||
%patch40 -p1 -b .stdo
|
||||
%patch41 -p1 -b .statistics
|
||||
%patch42 -p1 -b .iface_drop
|
||||
|
||||
cp %SOURCE2 ./config.h
|
||||
cp %SOURCE3 ./config.make
|
||||
@ -210,6 +212,9 @@ exit 0
|
||||
%{_sysconfdir}/rc.d/init.d/netplugd
|
||||
|
||||
%changelog
|
||||
* Wed Jul 20 2005 Radek Vokal <rvokal@redhat.com> 1.60-55
|
||||
- ifconfig - fixed virtual interface dropping (#162888)
|
||||
|
||||
* Wed Jun 22 2005 Radek Vokal <rvokal@redhat.com> 1.60-54
|
||||
- fr man pages are back (#159702)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user