diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-06-23 19:46:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 19:46:39 -0400 |
| commit | a36898e7555036c786f7aa944b848966b45d5897 (patch) | |
| tree | fb34f0ca1836e09a8e89e73ebd6696a08b89b631 /zebra/if_ioctl.c | |
| parent | a12bb225a6681b7e7eb0aac105cbc8b745675131 (diff) | |
Revert "Ospf missing interface handling 2"
Diffstat (limited to 'zebra/if_ioctl.c')
| -rw-r--r-- | zebra/if_ioctl.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c index 6ce566262d..8bec256355 100644 --- a/zebra/if_ioctl.c +++ b/zebra/if_ioctl.c @@ -54,7 +54,6 @@ static int interface_list_ioctl(void) struct interface *ifp; int n; int lastlen; - struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); /* Normally SIOCGIFCONF works with AF_INET socket. */ sock = socket(AF_INET, SOCK_DGRAM, 0); @@ -111,7 +110,7 @@ static int interface_list_ioctl(void) unsigned int size; ifreq = (struct ifreq *)((caddr_t)ifconf.ifc_req + n); - ifp = if_get_by_name(ifreq->ifr_name, vrf); + ifp = if_get_by_name(ifreq->ifr_name, VRF_DEFAULT); if_add_update(ifp); size = ifreq->ifr_addr.sa_len; if (size < sizeof(ifreq->ifr_addr)) @@ -121,7 +120,7 @@ static int interface_list_ioctl(void) } #else for (n = 0; n < ifconf.ifc_len; n += sizeof(struct ifreq)) { - ifp = if_get_by_name(ifreq->ifr_name, vrf); + ifp = if_get_by_name(ifreq->ifr_name, VRF_DEFAULT); if_add_update(ifp); ifreq++; } @@ -152,8 +151,7 @@ static int if_get_hwaddr(struct interface *ifp) ifreq.ifr_addr.sa_family = AF_INET; /* Fetch Hardware address if available. */ - ret = vrf_if_ioctl(SIOCGIFHWADDR, (caddr_t)&ifreq, - vrf_to_id(ifp->vrf)); + ret = vrf_if_ioctl(SIOCGIFHWADDR, (caddr_t)&ifreq, ifp->vrf_id); if (ret < 0) ifp->hw_addr_len = 0; else { @@ -197,8 +195,7 @@ static int if_getaddrs(void) continue; } - ifp = if_lookup_by_name(ifap->ifa_name, - vrf_lookup_by_id(VRF_DEFAULT)); + ifp = if_lookup_by_name(ifap->ifa_name, VRF_DEFAULT); if (ifp == NULL) { flog_err(EC_LIB_INTERFACE, "if_getaddrs(): Can't lookup interface %s\n", |