diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-06-23 19:47:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 19:47:10 -0400 |
| commit | 0c3bbed4e670a24134bd0bcb18b56634c542fcf5 (patch) | |
| tree | fb34f0ca1836e09a8e89e73ebd6696a08b89b631 /ospfd/ospf_zebra.c | |
| parent | a12bb225a6681b7e7eb0aac105cbc8b745675131 (diff) | |
| parent | a36898e7555036c786f7aa944b848966b45d5897 (diff) | |
Merge pull request #4597 from FRRouting/revert-3775-ospf_missing_interface_handling_2
Revert "Ospf missing interface handling 2"
Diffstat (limited to 'ospfd/ospf_zebra.c')
| -rw-r--r-- | ospfd/ospf_zebra.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 33d2c82d03..c178e367d3 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -110,8 +110,8 @@ static int ospf_interface_add(ZAPI_CALLBACK_ARGS) if (IS_DEBUG_OSPF(zebra, ZEBRA_INTERFACE)) zlog_debug( "Zebra: interface add %s vrf %s[%u] index %d flags %llx metric %d mtu %d speed %u", - ifp->name, vrf_to_name(ifp->vrf), - vrf_to_id(ifp->vrf), ifp->ifindex, + ifp->name, ospf_vrf_id_to_name(ifp->vrf_id), + ifp->vrf_id, ifp->ifindex, (unsigned long long)ifp->flags, ifp->metric, ifp->mtu, ifp->speed); @@ -152,8 +152,8 @@ static int ospf_interface_delete(ZAPI_CALLBACK_ARGS) if (IS_DEBUG_OSPF(zebra, ZEBRA_INTERFACE)) zlog_debug( "Zebra: interface delete %s vrf %s[%u] index %d flags %llx metric %d mtu %d", - ifp->name, vrf_to_name(ifp->vrf), - vrf_to_id(ifp->vrf), ifp->ifindex, + ifp->name, ospf_vrf_id_to_name(ifp->vrf_id), + ifp->vrf_id, ifp->ifindex, (unsigned long long)ifp->flags, ifp->metric, ifp->mtu); hook_call(ospf_if_delete, ifp); @@ -175,8 +175,7 @@ static struct interface *zebra_interface_if_lookup(struct stream *s, stream_get(ifname_tmp, s, INTERFACE_NAMSIZ); /* And look it up. */ - return if_lookup_by_name(ifname_tmp, - vrf_lookup_by_id(vrf_id)); + return if_lookup_by_name(ifname_tmp, vrf_id); } static int ospf_interface_state_up(ZAPI_CALLBACK_ARGS) @@ -366,7 +365,7 @@ static int ospf_interface_vrf_update(ZAPI_CALLBACK_ARGS) ospf_vrf_id_to_name(new_vrf_id), new_vrf_id); /*if_update(ifp, ifp->name, strlen(ifp->name), new_vrf_id);*/ - if_update_to_new_vrf(ifp, vrf_lookup_by_id(new_vrf_id)); + if_update_to_new_vrf(ifp, new_vrf_id); return 0; } |