diff options
| author | ajs <ajs> | 2004-12-15 15:07:19 +0000 |
|---|---|---|
| committer | ajs <ajs> | 2004-12-15 15:07:19 +0000 |
| commit | bc18d616ad7d1d580e1e04c28eab2cd9afb67fad (patch) | |
| tree | 2177945097bf719604b066c35724b55606ad7eae /ospfd/ospf_vty.c | |
| parent | 766a0ca3dcb824fc9283be89bb57e47132b26826 (diff) | |
2004-12-15 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_interface.h: Declare new function ospf_default_iftype.
* ospf_interface.c: (ospf_default_iftype) New function to centralize
this logic in one place.
* ospf_zebra.c: (ospf_interface_add) Use new function
ospf_default_iftype.
* ospf_vty.c: (no_ip_ospf_network,config_write_interface) Fix logic
by using new function ospf_default_iftype.
Diffstat (limited to 'ospfd/ospf_vty.c')
| -rw-r--r-- | ospfd/ospf_vty.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 6a679f94..b9c554f4 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -4853,7 +4853,7 @@ DEFUN (no_ip_ospf_network, int old_type = IF_DEF_PARAMS (ifp)->type; struct route_node *rn; - IF_DEF_PARAMS (ifp)->type = OSPF_IFTYPE_BROADCAST; + IF_DEF_PARAMS (ifp)->type = ospf_default_iftype(ifp); if (IF_DEF_PARAMS (ifp)->type == old_type) return CMD_SUCCESS; @@ -6722,8 +6722,7 @@ config_write_interface (struct vty *vty) if (OSPF_IF_PARAM_CONFIGURED (params, type) && params->type != OSPF_IFTYPE_LOOPBACK) { - if ((!if_is_broadcast(ifp)) && - (params->type != OSPF_IFTYPE_BROADCAST)) + if (params->type != ospf_default_iftype(ifp)) { vty_out (vty, " ip ospf network %s", ospf_int_type_str[params->type]); |