Fix for Bugzilla #108.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 64bddca098000d1de796b5a75d807ff9c092919d..53a278de5356ec04f3154bf9f7f71d3a80582baf 100644 (file)
--- 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 c930817acbec8b921e7de5abcb8f55ff6fafd59e..461574ae8f8e3ab21c5d25908d4cd6ea2acd9067 100644 (file)
--- 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 */