diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2024-04-23 16:13:46 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2024-04-23 16:13:46 +0200 |
| commit | 1ce626aea6f1f274da92478a8e487c229b08f9ce (patch) | |
| tree | 5d3e241a513f8f7af640776cedf2837d269e9c03 /ospfd/ospf_interface.c | |
| parent | Merge pull request #15813 from pguibert6WIND/isis_srv6_backup_endx (diff) | |
| download | frr-1ce626aea6f1f274da92478a8e487c229b08f9ce.tar.xz frr-1ce626aea6f1f274da92478a8e487c229b08f9ce.zip | |
vtysh: Show `ip ospf network ...` even if it's not the same as the interface type
ospfv3 shows this unconditionally, and ospfv2 does not show `ip ospf network ...` if the type of the interface matches the specified network.
Fixes: https://github.com/FRRouting/frr/issues/15817
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Diffstat (limited to 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 319db1efe..022e48f72 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -1382,7 +1382,8 @@ static int ospf_ifp_create(struct interface *ifp) (!OSPF_IF_PARAM_CONFIGURED(IF_DEF_PARAMS(ifp), type) || if_is_loopback(ifp))) { 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; |