|
@@ -42,11 +42,11 @@
|
|
|
#include "zebra/debug.h"
|
|
|
#include "zebra/irdp.h"
|
|
|
|
|
|
-#ifdef RTADV
|
|
|
+#if defined (HAVE_RTADV)
|
|
|
/* Order is intentional. Matches RFC4191. This array is also used for
|
|
|
command matching, so only modify with care. */
|
|
|
const char *rtadv_pref_strs[] = { "medium", "high", "INVALID", "low", 0 };
|
|
|
-#endif /* RTADV */
|
|
|
+#endif /* HAVE_RTADV */
|
|
|
|
|
|
/* Called when new interface is added. */
|
|
|
static int
|
|
@@ -59,7 +59,7 @@ if_zebra_new_hook (struct interface *ifp)
|
|
|
zebra_if->multicast = IF_ZEBRA_MULTICAST_UNSPEC;
|
|
|
zebra_if->shutdown = IF_ZEBRA_SHUTDOWN_OFF;
|
|
|
|
|
|
-#ifdef RTADV
|
|
|
+#if defined (HAVE_RTADV)
|
|
|
{
|
|
|
/* Set default router advertise values. */
|
|
|
struct rtadvconf *rtadv;
|
|
@@ -85,7 +85,7 @@ if_zebra_new_hook (struct interface *ifp)
|
|
|
|
|
|
rtadv->AdvPrefixList = list_new ();
|
|
|
}
|
|
|
-#endif /* RTADV */
|
|
|
+#endif /* HAVE_RTADV */
|
|
|
|
|
|
/* Initialize installed address chains tree. */
|
|
|
zebra_if->ipv4_subnets = route_table_init ();
|
|
@@ -638,7 +638,7 @@ connected_dump_vty (struct vty *vty, struct connected *connected)
|
|
|
vty_out (vty, "%s", VTY_NEWLINE);
|
|
|
}
|
|
|
|
|
|
-#ifdef RTADV
|
|
|
+#if defined (HAVE_RTADV)
|
|
|
/* Dump interface ND information to vty. */
|
|
|
static void
|
|
|
nd_dump_vty (struct vty *vty, struct interface *ifp)
|
|
@@ -699,7 +699,7 @@ nd_dump_vty (struct vty *vty, struct interface *ifp)
|
|
|
VTY_NEWLINE);
|
|
|
}
|
|
|
}
|
|
|
-#endif /* RTADV */
|
|
|
+#endif /* HAVE_RTADV */
|
|
|
|
|
|
/* Interface's information print out to vty interface. */
|
|
|
static void
|
|
@@ -806,9 +806,9 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
|
|
|
connected_dump_vty (vty, connected);
|
|
|
}
|
|
|
|
|
|
-#ifdef RTADV
|
|
|
+#if defined (HAVE_RTADV)
|
|
|
nd_dump_vty (vty, ifp);
|
|
|
-#endif /* RTADV */
|
|
|
+#endif /* HAVE_RTADV */
|
|
|
|
|
|
#ifdef HAVE_PROC_NET_DEV
|
|
|
/* Statistics print out using proc file system. */
|
|
@@ -1782,9 +1782,9 @@ if_config_write (struct vty *vty)
|
|
|
VTY_NEWLINE);
|
|
|
}
|
|
|
|
|
|
-#ifdef RTADV
|
|
|
+#if defined (HAVE_RTADV)
|
|
|
rtadv_config_write (vty, ifp);
|
|
|
-#endif /* RTADV */
|
|
|
+#endif /* HAVE_RTADV */
|
|
|
|
|
|
#ifdef HAVE_IRDP
|
|
|
irdp_config_write (vty, ifp);
|