diff options
author | Don Slice <dslice@cumulusnetworks.com> | 2016-04-22 02:12:26 +0200 |
---|---|---|
committer | Don Slice <dslice@cumulusnetworks.com> | 2016-04-22 14:26:12 +0200 |
commit | 4fe5171412a8d9b93d07495acfec37684f53018d (patch) | |
tree | fa11e116ef208fb92f008a05a4a9f2158dcb145a /ospfd/ospf_zebra.c | |
parent | Addition on hidden command "bfd multihop/singlehop" and "ptm-enable" per inte... (diff) | |
download | frr-4fe5171412a8d9b93d07495acfec37684f53018d.tar.xz frr-4fe5171412a8d9b93d07495acfec37684f53018d.zip |
zebra: Change interface handling so non-vrf aware protocols correctly handle them
Changed interaction between zebra and routing protocols so that they correctly
fill in the vrf_iflist even for vrfs they're not responsible for. In that way,
when they get callbacks from zebra they can correctly understand whether they need
to create them or not.
Ticket: CM-10427
Signed-off-by: Don Slice
Reviewed-by:
Diffstat (limited to 'ospfd/ospf_zebra.c')
-rw-r--r-- | ospfd/ospf_zebra.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 725bdeb4c..49a35a11c 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -95,8 +95,8 @@ ospf_interface_add (int command, struct zclient *zclient, zebra_size_t length, ifp = zebra_interface_add_read (zclient->ibuf, vrf_id); if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE)) - zlog_debug ("Zebra: interface add %s index %d flags %llx metric %d mtu %d", - ifp->name, ifp->ifindex, (unsigned long long)ifp->flags, + zlog_debug ("Zebra: interface add %s[%u] index %d flags %llx metric %d mtu %d", + ifp->name, ifp->vrf_id, ifp->ifindex, (unsigned long long)ifp->flags, ifp->metric, ifp->mtu); assert (ifp->info); @@ -137,8 +137,8 @@ ospf_interface_delete (int command, struct zclient *zclient, if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE)) zlog_debug - ("Zebra: interface delete %s index %d flags %llx metric %d mtu %d", - ifp->name, ifp->ifindex, (unsigned long long)ifp->flags, ifp->metric, ifp->mtu); + ("Zebra: interface delete %s[%u] index %d flags %llx metric %d mtu %d", + ifp->name, ifp->vrf_id, ifp->ifindex, (unsigned long long)ifp->flags, ifp->metric, ifp->mtu); #ifdef HAVE_SNMP ospf_snmp_if_delete (ifp); |