From bc18d616ad7d1d580e1e04c28eab2cd9afb67fad Mon Sep 17 00:00:00 2001 From: ajs Date: Wed, 15 Dec 2004 15:07:19 +0000 Subject: 2004-12-15 Andrew J. Schorr * 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. --- ospfd/ospf_zebra.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ospfd/ospf_zebra.c') diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 44b59503..8468aed9 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -95,14 +95,7 @@ ospf_interface_add (int command, struct zclient *zclient, zebra_size_t length) if (!OSPF_IF_PARAM_CONFIGURED (IF_DEF_PARAMS (ifp), type)) { SET_IF_PARAM (IF_DEF_PARAMS (ifp), type); - IF_DEF_PARAMS (ifp)->type = OSPF_IFTYPE_BROADCAST; - - if (if_is_broadcast (ifp)) - IF_DEF_PARAMS (ifp)->type = OSPF_IFTYPE_BROADCAST; - else if (if_is_pointopoint (ifp)) - IF_DEF_PARAMS (ifp)->type = OSPF_IFTYPE_POINTOPOINT; - else if (if_is_loopback (ifp)) - IF_DEF_PARAMS (ifp)->type = OSPF_IFTYPE_LOOPBACK; + IF_DEF_PARAMS (ifp)->type = ospf_default_iftype(ifp); } ospf = ospf_lookup (); -- cgit v1.2.1