ospfd: 'ip ospf network' interface should down iface before changing type
* ospf_vty.c: (ip_ospf_network) This function changes the interface type
and only then downs/ups the interface if already up. So the down happens
with the interface type already altered. However, the interface type
can have major ramifications for how underlying state is stored/indexed,
which may cause problems.
Further, bit of an encapsulation violation to twiddle state here.
(no_ip_ospf_network) ditto.
* ospf_interface.c: (ospf_if_reset_type) New function to reset the OSPF
interface type on an interface. Ensure the interface is downed before
the type is changed.
* ospf_interface.h: (ospf_if_reset_type) Export, for ospf_vty.c
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index f31355e..478d4ff 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -5418,7 +5418,6 @@
{
struct interface *ifp = vty->index;
int old_type = IF_DEF_PARAMS (ifp)->type;
- struct route_node *rn;
if (old_type == OSPF_IFTYPE_LOOPBACK)
{
@@ -5439,23 +5438,7 @@
return CMD_SUCCESS;
SET_IF_PARAM (IF_DEF_PARAMS (ifp), type);
-
- for (rn = route_top (IF_OIFS (ifp)); rn; rn = route_next (rn))
- {
- struct ospf_interface *oi = rn->info;
-
- if (!oi)
- continue;
-
- oi->type = IF_DEF_PARAMS (ifp)->type;
-
- if (oi->state > ISM_Down)
- {
- OSPF_ISM_EVENT_EXECUTE (oi, ISM_InterfaceDown);
- OSPF_ISM_EVENT_EXECUTE (oi, ISM_InterfaceUp);
- }
- }
-
+ ospf_if_reset_type (ifp, IF_DEF_PARAMS (ifp)->type);
return CMD_SUCCESS;
}
@@ -5479,29 +5462,14 @@
{
struct interface *ifp = vty->index;
int old_type = IF_DEF_PARAMS (ifp)->type;
- struct route_node *rn;
IF_DEF_PARAMS (ifp)->type = ospf_default_iftype(ifp);
if (IF_DEF_PARAMS (ifp)->type == old_type)
return CMD_SUCCESS;
-
- for (rn = route_top (IF_OIFS (ifp)); rn; rn = route_next (rn))
- {
- struct ospf_interface *oi = rn->info;
-
- if (!oi)
- continue;
-
- oi->type = IF_DEF_PARAMS (ifp)->type;
-
- if (oi->state > ISM_Down)
- {
- OSPF_ISM_EVENT_EXECUTE (oi, ISM_InterfaceDown);
- OSPF_ISM_EVENT_EXECUTE (oi, ISM_InterfaceUp);
- }
- }
-
+
+ ospf_if_reset_type (ifp, IF_DEF_PARAMS (ifp)->type);
+
return CMD_SUCCESS;
}