summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhinay Ramesh <rabhinay@vmware.com>2021-06-22 16:41:25 +0000
committermergify-bot <noreply@mergify.io>2021-06-28 12:14:06 +0000
commit89e7788cea26bd6683153ef9ec4fde6cc9f5b512 (patch)
tree1c55bcb3f7ccd4a1bdf8427ba622102cf24620cb
parent8d42f3cc1044377058e198d9c7ff0bcd8b68c69d (diff)
ospf6d: Show neighbor displays twice for every neighbor.
Problem Statement: ================= When show ipv6 ospf6 neighbor is executed each neighbor gets displayed twice. frr# show ipv6 ospf6 neighbor Neighbor ID Pri DeadTime State/IfState Duration I/F[State] 1.1.1.1 1 00:00:39 Full/DR 00:00:10 ens192[BDR] 1.1.1.1 1 00:00:39 Full/DR 00:00:10 ens192[BDR] RCA: ==== Since ospf6_interface gets added twice to if_list we see multiple display output. Fix: ==== add ospf6_interface to if_list only when newly area gets attached to the interface. If its already added no need to add it again. Risk: ===== Low Tests Executed: =============== Have tested the defect scenario. frr# show ipv6 ospf6 neighbor Neighbor ID Pri DeadTime State/IfState Duration I/F[State] 1.1.1.1 1 00:00:35 Full/DR 00:36:04 ens192[BDR] frr# Signed-off-by: Abhinay Ramesh <rabhinay@vmware.com> (cherry picked from commit 40699728315d3c7a79059e55a7921308c80eb23d)
-rw-r--r--ospf6d/ospf6_interface.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 8f105f32b9..61e3ccefca 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -1602,6 +1602,9 @@ void ospf6_interface_start(struct ospf6_interface *oi)
if (oi->area_id_format == OSPF6_AREA_FMT_UNSET)
return;
+ if (oi->area)
+ return;
+
ospf6 = ospf6_lookup_by_vrf_id(oi->interface->vrf_id);
if (!ospf6)
return;