matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #15824 from opensourcerouting/fix/ospf_show_non_default

Browse source 
vtysh: Show `ip ospf network ...` even if it's not the same as the interface type
This commit is contained in:
Donald Sharp 2024-04-29 09:21:09 -04:00 committed by GitHub
parent 8421f6221a 1ce626aea6
commit edae839119
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ospfd/ospf_interface.c
View file

@ -1414,7 +1414,8 @@ static int ospf_ifp_create(struct interface *ifp)
(!OSPF_IF_PARAM_CONFIGURED(IF_DEF_PARAMS(ifp), type) || (!OSPF_IF_PARAM_CONFIGURED(IF_DEF_PARAMS(ifp), type) ||
if_is_loopback(ifp))) { if_is_loopback(ifp))) {
SET_IF_PARAM(IF_DEF_PARAMS(ifp), type); SET_IF_PARAM(IF_DEF_PARAMS(ifp), type);
IF_DEF_PARAMS(ifp)->type = ospf_default_iftype(ifp); if (!IF_DEF_PARAMS(ifp)->type_cfg)
IF_DEF_PARAMS(ifp)->type = ospf_default_iftype(ifp);
} }
ospf = ifp->vrf->info; ospf = ifp->vrf->info;

1
ospfd/ospf_interface.h
View file

@ -57,6 +57,7 @@ struct ospf_if_params {
DECLARE_IF_PARAM(struct in_addr, if_area); DECLARE_IF_PARAM(struct in_addr, if_area);
uint32_t if_area_id_fmt; uint32_t if_area_id_fmt;
bool type_cfg;
DECLARE_IF_PARAM(uint8_t, type); /* type of interface */ DECLARE_IF_PARAM(uint8_t, type); /* type of interface */
#define OSPF_IF_ACTIVE 0 #define OSPF_IF_ACTIVE 0
#define OSPF_IF_PASSIVE 1 #define OSPF_IF_PASSIVE 1

45
ospfd/ospf_vty.c
View file

@ -8537,6 +8537,8 @@ DEFUN(ip_ospf_network, ip_ospf_network_cmd,
IF_DEF_PARAMS(ifp)->ptp_dmvpn = 1; IF_DEF_PARAMS(ifp)->ptp_dmvpn = 1;
} }
IF_DEF_PARAMS(ifp)->type_cfg = true;
if (IF_DEF_PARAMS(ifp)->type == old_type && if (IF_DEF_PARAMS(ifp)->type == old_type &&
IF_DEF_PARAMS(ifp)->ptp_dmvpn == old_ptp_dmvpn && IF_DEF_PARAMS(ifp)->ptp_dmvpn == old_ptp_dmvpn &&
IF_DEF_PARAMS(ifp)->p2mp_delay_reflood == old_p2mp_delay_reflood && IF_DEF_PARAMS(ifp)->p2mp_delay_reflood == old_p2mp_delay_reflood &&
@ -8604,6 +8606,7 @@ DEFUN (no_ip_ospf_network,
struct route_node *rn; struct route_node *rn;
IF_DEF_PARAMS(ifp)->type = ospf_default_iftype(ifp); IF_DEF_PARAMS(ifp)->type = ospf_default_iftype(ifp);
IF_DEF_PARAMS(ifp)->type_cfg = false;
IF_DEF_PARAMS(ifp)->ptp_dmvpn = 0; IF_DEF_PARAMS(ifp)->ptp_dmvpn = 0;
IF_DEF_PARAMS(ifp)->p2mp_delay_reflood = IF_DEF_PARAMS(ifp)->p2mp_delay_reflood =
OSPF_P2MP_DELAY_REFLOOD_DEFAULT; OSPF_P2MP_DELAY_REFLOOD_DEFAULT;
@ -12205,29 +12208,25 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
do { do {
/* Interface Network print. */ /* Interface Network print. */
if (OSPF_IF_PARAM_CONFIGURED(params, type) if (OSPF_IF_PARAM_CONFIGURED(params, type) &&
&& params->type != OSPF_IFTYPE_LOOPBACK) { params->type != OSPF_IFTYPE_LOOPBACK &&
if (params->type != ospf_default_iftype(ifp)) { params->type_cfg) {
vty_out(vty, " ip ospf network %s", vty_out(vty, " ip ospf network %s",
ospf_int_type_str ospf_int_type_str[params->type]);
[params->type]); if (params->type == OSPF_IFTYPE_POINTOPOINT &&
if (params->type params->ptp_dmvpn)
== OSPF_IFTYPE_POINTOPOINT vty_out(vty, " dmvpn");
&& params->ptp_dmvpn) if (params->type ==
vty_out(vty, " dmvpn"); OSPF_IFTYPE_POINTOMULTIPOINT &&
if (params->type == params->p2mp_delay_reflood)
OSPF_IFTYPE_POINTOMULTIPOINT && vty_out(vty, " delay-reflood");
params->p2mp_delay_reflood) if (params->type ==
vty_out(vty, " delay-reflood"); OSPF_IFTYPE_POINTOMULTIPOINT &&
if (params->type == params->p2mp_non_broadcast)
OSPF_IFTYPE_POINTOMULTIPOINT && vty_out(vty, " non-broadcast");
params->p2mp_non_broadcast) if (params != IF_DEF_PARAMS(ifp) && rn)
vty_out(vty, " non-broadcast"); vty_out(vty, " %pI4", &rn->p.u.prefix4);
if (params != IF_DEF_PARAMS(ifp) && rn) vty_out(vty, "\n");
vty_out(vty, " %pI4",
&rn->p.u.prefix4);
vty_out(vty, "\n");
}
} }
/* OSPF interface authentication print */ /* OSPF interface authentication print */