From: ckishimo Date: Tue, 16 Mar 2021 22:47:18 +0000 (+0100) Subject: ospf6d: fix iface commands lost when removing from area X-Git-Tag: base_8.0~254^2~4 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5ac69ec52a6eb92141deac6d930dddc6ac053e8e;p=mirror%2Ffrr.git ospf6d: fix iface commands lost when removing from area In OSPFv3 when removing the interface from an area, all ospf6 interface commands are lost, so when changing the area you need to reconfigure all ospf6 interface commands again r1# sh run interface r1-r2-eth0 ipv6 address 2013:12::1/64 ipv6 ospf6 dead-interval 4 ipv6 ospf6 hello-interval 1 ipv6 ospf6 network point-to-point ! router ospf6 ospf6 router-id 1.1.1.1 interface r1-r2-eth0 area 0.0.0.0 ! r1# conf t r1(config)# router ospf6 r1(config-ospf6)# no interface r1-r2-eth0 area 0.0.0.0 r1(config-ospf6)# exit r1# sh run interface r1-r2-eth0 ipv6 address 2013:12::1/64 ! <----- missing all ipv6 ospf6 commands router ospf6 ospf6 router-id 1.1.1.1 ! This is because the interface is being deleted instead of disabled (see PR#7717) I believe the interface should be left as disabled (not deleted) when removing the interface from the area Signed-off-by: ckishimo --- diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 3f72ec828e..88c242e79e 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -830,7 +830,6 @@ DEFUN (no_ospf6_interface_area, UNSET_FLAG(oa->flag, OSPF6_AREA_ENABLE); ospf6_abr_disable_area(oa); } - ospf6_interface_delete(oi); return CMD_SUCCESS; }