summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso>2004-08-31 13:37:42 +0000
committerhasso <hasso>2004-08-31 13:37:42 +0000
commit7b90143f14ba21f6bd3ff2c8b60f69500f46c0e8 (patch)
treef226a2bf777f2396eb572b9cbdd4bb11429033b9
parentdf43a137236e7df433fbd3c633245459d4fd951b (diff)
Fix for Bugzilla #108.
-rw-r--r--ospfd/ChangeLog6
-rw-r--r--ospfd/ospf_vty.c15
2 files changed, 15 insertions, 6 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 64bddca0..53a278de 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-27 Hasso Tepper <hasso at quagga.net>
+
+ * ospf_vty.c: Don't print ospf network type under interface only
+ if interface is in broadcast mode and interface type really is
+ broadcast. Fixes Bugzilla #108.
+
2004-08-27 David Wiggins <dwiggins@bbn.com>
* ospf_spf.c (ospf_nexthop_calculation): Initialize address family
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index c930817a..461574ae 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -6713,14 +6713,17 @@ config_write_interface (struct vty *vty)
do {
/* Interface Network print. */
if (OSPF_IF_PARAM_CONFIGURED (params, type) &&
- params->type != OSPF_IFTYPE_BROADCAST &&
params->type != OSPF_IFTYPE_LOOPBACK)
{
- vty_out (vty, " ip ospf network %s",
- ospf_int_type_str[params->type]);
- if (params != IF_DEF_PARAMS (ifp))
- vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4));
- vty_out (vty, "%s", VTY_NEWLINE);
+ if ((!if_is_broadcast(ifp)) &&
+ (params->type != OSPF_IFTYPE_BROADCAST))
+ {
+ vty_out (vty, " ip ospf network %s",
+ ospf_int_type_str[params->type]);
+ if (params != IF_DEF_PARAMS (ifp))
+ vty_out (vty, " %s", inet_ntoa (rn->p.u.prefix4));
+ vty_out (vty, "%s", VTY_NEWLINE);
+ }
}
/* OSPF interface authentication print */