zebra: Notice Optional Router Advertisement types that are not handled

Currently when zebra receives a RA with optional types, note
the optional types that we are ignoring.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index a8ec60844cdaf5fc340caf3053cc79474caba17a..2b9246515d32894d692ee3f278872368363770a5 100644 (file)
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -585,6 +585,28 @@ static void rtadv_process_solicit(struct interface *ifp)
                zif->rtadv.AdvIntervalTimer = MIN_DELAY_BETWEEN_RAS;
 }
 
+static const char *rtadv_optionalhdr2str(uint8_t opt_type)
+{
+       switch (opt_type) {
+       case ND_OPT_SOURCE_LINKADDR:
+               return "Optional Source Link Address";
+       case ND_OPT_TARGET_LINKADDR:
+               return "Optional Target Link Address";
+       case ND_OPT_PREFIX_INFORMATION:
+               return "Optional Prefix Information";
+       case ND_OPT_REDIRECTED_HEADER:
+               return "Optional Redirected Header";
+       case ND_OPT_MTU:
+               return "Optional MTU";
+       case ND_OPT_RTR_ADV_INTERVAL:
+               return "Optional Advertisement Interval";
+       case ND_OPT_HOME_AGENT_INFO:
+               return "Optional Home Agent Information";
+       }
+
+       return "Unknown Optional Type";
+}
+
 /*
  * This function processes optional attributes off of
  * end of a RA packet received.  At this point in
@@ -609,6 +631,13 @@ static void rtadv_process_optional(uint8_t *optional, unsigned int len,
                                                          &addr->sin6_addr, 1);
                        break;
                default:
+                       if (IS_ZEBRA_DEBUG_PACKET)
+                               zlog_debug(
+                                       "%s:Received Packet with optional Header type %s(%u) that is being ignored",
+                                       __func__,
+                                       rtadv_optionalhdr2str(
+                                               opt_hdr->nd_opt_type),
+                                       opt_hdr->nd_opt_type);
                        break;
                }
 

diff --git a/zebra/rtadv.h b/zebra/rtadv.h
index 26c7823747dc8814fbcfc865960c6effbcb3f5ac..2304af19d1da76671067c849408502035987bcda 100644 (file)
--- a/zebra/rtadv.h
+++ b/zebra/rtadv.h
@@ -308,6 +308,7 @@ struct rtadv_prefix {
 #define ND_OPT_HA_INFORMATION  8   /* HA Information Option */
 #endif
 
+
 #ifndef HAVE_STRUCT_ND_OPT_ADV_INTERVAL
 struct nd_opt_adv_interval { /* Advertisement interval option */
        uint8_t nd_opt_ai_type;
@@ -324,6 +325,12 @@ struct nd_opt_adv_interval { /* Advertisement interval option */
 #define nd_opt_ai_interval     nd_opt_adv_interval_ival
 #endif
 #endif
+#ifndef ND_OPT_RTR_ADV_INTERVAL
+#define ND_OPT_RTR_ADV_INTERVAL 7
+#endif
+#ifndef ND_OPT_HOME_AGENT_INFO
+#define ND_OPT_HOME_AGENT_INFO 8
+#endif
 
 #ifndef HAVE_STRUCT_ND_OPT_HOMEAGENT_INFO
 struct nd_opt_homeagent_info { /* Home Agent info */