diff options
| author | jhb <jhb@FreeBSD.org> | 2010-08-06 15:09:21 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2010-08-06 15:09:21 +0000 |
| commit | 7909344bdf3f86ce88f5a00d727704861218adc9 (patch) | |
| tree | 11983ee2e4b7413b7f213d4bf31d6ee03d26fe01 | |
| parent | 1e529a8eb9b20ba8d3270b4f13b348620eaa00a1 (diff) | |
| download | FreeBSD-src-7909344bdf3f86ce88f5a00d727704861218adc9.zip FreeBSD-src-7909344bdf3f86ce88f5a00d727704861218adc9.tar.gz | |
Ethernet vlan(4) interfaces have valid Ethernet link layer addresses but
use a different interface type (IFT_L2VLAN vs IFT_ETHER). Treat IFT_L2VLAN
interfaces like IFT_ETHER interfaces when handling link layer addresses.
Reviewed by: syrinx (bsnmpd)
MFC after: 1 week
| -rw-r--r-- | contrib/bsnmp/snmp_mibII/mibII.c | 1 | ||||
| -rw-r--r-- | sbin/ifconfig/af_link.c | 4 | ||||
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ndp/ndp.c | 1 | ||||
| -rw-r--r-- | usr.sbin/ppp/ipv6cp.c | 1 |
5 files changed, 9 insertions, 2 deletions
diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c index 8714695..ad56d7c 100644 --- a/contrib/bsnmp/snmp_mibII/mibII.c +++ b/contrib/bsnmp/snmp_mibII/mibII.c @@ -843,6 +843,7 @@ check_llbcast(struct mibif *ifp) case IFT_ETHER: case IFT_FDDI: case IFT_ISO88025: + case IFI_L2VLAN: if (mib_find_rcvaddr(ifp->index, ether_bcast, 6) == NULL && (rcv = mib_rcvaddr_create(ifp, ether_bcast, 6)) != NULL) rcv->flags |= MIBRCVADDR_BCAST; diff --git a/sbin/ifconfig/af_link.c b/sbin/ifconfig/af_link.c index f77515e..4a4b661 100644 --- a/sbin/ifconfig/af_link.c +++ b/sbin/ifconfig/af_link.c @@ -58,7 +58,9 @@ link_status(int s __unused, const struct ifaddrs *ifa) struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr; if (sdl != NULL && sdl->sdl_alen > 0) { - if (sdl->sdl_type == IFT_ETHER && + if ((sdl->sdl_type == IFT_ETHER || + sdl->sdl_type == IFT_L2VLAN || + sdl->sdl_type == IFT_BRIDGE) && sdl->sdl_alen == ETHER_ADDR_LEN) printf("\tether %s\n", ether_ntoa((struct ether_addr *)LLADDR(sdl))); diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index aa96175..8abe82b 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -319,7 +319,9 @@ main(int argc, char *argv[]) /* special case for "ether" address family */ if (!strcmp(afp->af_name, "ether")) { if (sdl == NULL || - sdl->sdl_type != IFT_ETHER || + (sdl->sdl_type != IFT_ETHER && + sdl->sdl_type != IFT_L2VLAN && + sdl->sdl_type != IFT_BRIDGE) || sdl->sdl_alen != ETHER_ADDR_LEN) continue; } else { diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index b701ead..6926a27 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -437,6 +437,7 @@ set(argc, argv) switch (sdl->sdl_type) { case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023: case IFT_ISO88024: case IFT_ISO88025: + case IFT_L2VLAN: case IFT_BRIDGE: goto overwrite; } } diff --git a/usr.sbin/ppp/ipv6cp.c b/usr.sbin/ppp/ipv6cp.c index 4557188..72c3b9a 100644 --- a/usr.sbin/ppp/ipv6cp.c +++ b/usr.sbin/ppp/ipv6cp.c @@ -148,6 +148,7 @@ SetInterfaceID(u_char *ifid, int userandom) switch(sdl->sdl_type) { case IFT_ETHER: case IFT_FDDI: + case IFT_L2VLAN: /* XXX need more cases? */ break; default: |
