OSPF: Update the option bit props.

Bit 0x10 was once going to be EA-bit, but eventually was allocated to
L-bit instead, so remove the EA-bit. Bit 0x01 was allocated to T-bit,
which was later renamed to MT-bit, so rename it. Make some indentation
consistent.

diff --git a/ospf.h b/ospf.h
index 40d33268277558d94cc113a65a4063b3e353d245..a4e90c8cfdcc19b14e3ca7215f043ac81fe4503a 100644 (file)
--- a/ospf.h
+++ b/ospf.h
@@ -34,11 +34,10 @@
  *
  */
 
-#define OSPF_OPTION_T  0x01    /* T bit: TOS support   */
-#define OSPF_OPTION_E  0x02    /* E bit: External routes advertised    */
+#define        OSPF_OPTION_MT  0x01    /* MT bit: multi-topology */
+#define        OSPF_OPTION_E   0x02    /* E bit: External routes advertised */
 #define        OSPF_OPTION_MC  0x04    /* MC bit: Multicast capable */
 #define        OSPF_OPTION_NP  0x08    /* N/P bit: NSSA capable */
-#define        OSPF_OPTION_EA  0x10    /* EA bit: External Attribute capable */
 #define        OSPF_OPTION_L   0x10    /* L bit: Packet contains LLS data block */
 #define        OSPF_OPTION_DC  0x20    /* DC bit: Demand circuit capable */
 #define        OSPF_OPTION_O   0x40    /* O bit: Opaque LSA capable */

diff --git a/print-ospf.c b/print-ospf.c
index 098763774ad53010454bbc6ae1e2b1dbdd254f94..f5f37a3b1c61f0c9e7e7a6ba4cbb9bbba9a0133d 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -38,11 +38,11 @@
 
 
 static const struct tok ospf_option_values[] = {
-        { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
+       { OSPF_OPTION_MT,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
        { OSPF_OPTION_E,        "External" },
        { OSPF_OPTION_MC,       "Multicast" },
        { OSPF_OPTION_NP,       "NSSA" },
-        { OSPF_OPTION_L,        "LLS" },
+       { OSPF_OPTION_L,        "LLS" },
        { OSPF_OPTION_DC,       "Demand Circuit" },
        { OSPF_OPTION_O,        "Opaque" },
        { OSPF_OPTION_DN,       "Up/Down" },