From 7b90143f14ba21f6bd3ff2c8b60f69500f46c0e8 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Tue, 31 Aug 2004 13:37:42 +0000
Subject: Fix for Bugzilla #108.

---
 ospfd/ChangeLog  |  6 ++++++
 ospfd/ospf_vty.c | 15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'ospfd')

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 */
-- 
cgit v1.2.1