OSPFv3: refresh options and flags

diff --git a/ospf6.h b/ospf6.h
index e2eabee1815cc21e9da1c4d037b7420a5a1e85fd..b081064d1ff7674f30eb635396fd3d679cdfd995 100644 (file)
--- a/ospf6.h
+++ b/ospf6.h
@@ -34,6 +34,10 @@
 #define OSPF6_OPTION_N 0x08    /* N bit: For type-7 LSA */
 #define OSPF6_OPTION_R 0x10    /* R bit: Router bit */
 #define OSPF6_OPTION_DC        0x20    /* DC bit: Demand circuits */
 #define OSPF6_OPTION_N 0x08    /* N bit: For type-7 LSA */
 #define OSPF6_OPTION_R 0x10    /* R bit: Router bit */
 #define OSPF6_OPTION_DC        0x20    /* DC bit: Demand circuits */

+/* The field is actually 24-bit (RFC5340 Section A.2). */
+#define OSPF6_OPTION_AF        0x0100  /* AF bit: Multiple address families */
+#define OSPF6_OPTION_L 0x0200  /* L bit: Link-local signaling (LLS) */
+#define OSPF6_OPTION_AT        0x0400  /* AT bit: Authentication trailer */

 
 
 /* db_flags    */
 
 
 /* db_flags    */

diff --git a/print-ospf6.c b/print-ospf6.c
index b0a6f272e8121f570852dbdfa17e46a2009c5ab6..0b28248f38877956b65f1bfa9fe675b311891db0 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -45,10 +45,13 @@ static const char rcsid[] _U_ =
 static const struct tok ospf6_option_values[] = {
        { OSPF6_OPTION_V6,      "V6" },
        { OSPF6_OPTION_E,       "External" },
 static const struct tok ospf6_option_values[] = {
        { OSPF6_OPTION_V6,      "V6" },
        { OSPF6_OPTION_E,       "External" },

-       { OSPF6_OPTION_MC,      "Multicast" },
+       { OSPF6_OPTION_MC,      "Deprecated" },

        { OSPF6_OPTION_N,       "NSSA" },
        { OSPF6_OPTION_R,       "Router" },
        { OSPF6_OPTION_DC,      "Demand Circuit" },
        { OSPF6_OPTION_N,       "NSSA" },
        { OSPF6_OPTION_R,       "Router" },
        { OSPF6_OPTION_DC,      "Demand Circuit" },

+       { OSPF6_OPTION_AF,      "AFs Support" },
+       { OSPF6_OPTION_L,       "LLS" },
+       { OSPF6_OPTION_AT,      "Authentication Trailer" },

        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 


@@ -63,7 +66,7 @@ static const struct tok ospf6_rla_flag_values[] = {
 
 static const struct tok ospf6_asla_flag_values[] = {
        { ASLA_FLAG_EXTERNAL,   "External Type 2" },
 
 static const struct tok ospf6_asla_flag_values[] = {
        { ASLA_FLAG_EXTERNAL,   "External Type 2" },

-       { ASLA_FLAG_FWDADDR,    "Fforwarding" },
+       { ASLA_FLAG_FWDADDR,    "Forwarding" },

        { ASLA_FLAG_ROUTETAG,   "Tag" },
        { 0,                    NULL }
 };
        { ASLA_FLAG_ROUTETAG,   "Tag" },
        { 0,                    NULL }
 };