[PtP over ethernet] New peer flag allows much more addressing flexibility

[mirror_frr.git] / zebra / interface.c

diff --git a/zebra/interface.c b/zebra/interface.c
index 69124b3de8996b9f28c7a1b740c8208df155156f..ceee0e2b8dd05bc7df0d7364d1f9dab01f94917f 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -564,10 +564,6 @@ static void
 connected_dump_vty (struct vty *vty, struct connected *connected)
 {
   struct prefix *p;
-  struct interface *ifp;
-
-  /* Set interface pointer. */
-  ifp = connected->ifp;
 
   /* Print interface address. */
   p = connected->address;
@@ -576,21 +572,10 @@ connected_dump_vty (struct vty *vty, struct connected *connected)
   vty_out (vty, "/%d", p->prefixlen);
 
   /* If there is destination address, print it. */
-  p = connected->destination;
-  if (p)
+  if (connected->destination)
     {
-      if (p->family == AF_INET)
-       if (ifp->flags & IFF_BROADCAST)
-         {
-           vty_out (vty, " broadcast ");
-           prefix_vty_out (vty, p);
-         }
-
-      if (ifp->flags & IFF_POINTOPOINT)
-       {
-         vty_out (vty, " pointopoint ");
-         prefix_vty_out (vty, p);
-       }
+      vty_out (vty, (CONNECTED_PEER(connected) ? " peer " : " broadcast "));
+      prefix_vty_out (vty, connected->destination);
     }
 
   if (CHECK_FLAG (connected->flags, ZEBRA_IFA_SECONDARY))