Use more the ND_TTEST_1() macro

[tcpdump] / ospf.h

diff --git a/ospf.h b/ospf.h
index 7d9bef2f104b0c9f6f3b13bb950f4fba9e68343f..4dca0af38b1951136655e5c1d169d21b144e64b8 100644 (file)
--- a/ospf.h
+++ b/ospf.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.20 2007-09-23 23:01:33 guy Exp $ (LBL) */

 /*
  * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
  *     The Regents of the University of California.  All rights reserved.
 /*
  * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
  *     The Regents of the University of California.  All rights reserved.


@@ -21,7 +20,6 @@
  *
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
  *
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */

-#define        OSPF_TYPE_UMD           0       /* UMd's special monitoring packets */

 #define        OSPF_TYPE_HELLO         1       /* Hello */
 #define        OSPF_TYPE_DD            2       /* Database Description */
 #define        OSPF_TYPE_LS_REQ        3       /* Link State Request */
 #define        OSPF_TYPE_HELLO         1       /* Hello */
 #define        OSPF_TYPE_DD            2       /* Database Description */
 #define        OSPF_TYPE_LS_REQ        3       /* Link State Request */


@@ -29,17 +27,13 @@
 #define        OSPF_TYPE_LS_ACK        5       /* Link State Ack */
 
 /* Options field
 #define        OSPF_TYPE_LS_ACK        5       /* Link State Ack */
 
 /* Options field

- *
- * +-------------------------------------+
- * | DN | O | DC | EA | N/P | MC | E | T |
- * +-------------------------------------+

  *
  * +------------------------------------+
  * | DN | O | DC | L | N/P | MC | E | T |
  * +------------------------------------+
  *
  */
  *
  * +------------------------------------+
  * | DN | O | DC | L | N/P | MC | E | T |
  * +------------------------------------+
  *
  */

-                
+

 #define OSPF_OPTION_T  0x01    /* T bit: TOS support   */
 #define OSPF_OPTION_E  0x02    /* E bit: External routes advertised    */
 #define        OSPF_OPTION_MC  0x04    /* MC bit: Multicast capable */
 #define OSPF_OPTION_T  0x01    /* T bit: TOS support   */
 #define OSPF_OPTION_E  0x02    /* E bit: External routes advertised    */
 #define        OSPF_OPTION_MC  0x04    /* MC bit: Multicast capable */


@@ -58,10 +52,10 @@
 #define OSPF_AUTH_MD5_LEN      16      /* length of MD5 authentication */
 
 /* db_flags    */
 #define OSPF_AUTH_MD5_LEN      16      /* length of MD5 authentication */
 
 /* db_flags    */

-#define        OSPF_DB_INIT            0x04        /*  */
+#define        OSPF_DB_INIT            0x04

 #define        OSPF_DB_MORE            0x02
 #define        OSPF_DB_MORE            0x02

-#define        OSPF_DB_MASTER          0x01
-#define OSPF_DB_RESYNC         0x08            /* RFC4811 */
+#define        OSPF_DB_MASTER          0x01
+#define OSPF_DB_RESYNC          0x08  /* RFC4811 */

 
 /* ls_type     */
 #define        LS_TYPE_ROUTER          1   /* router link */
 
 /* ls_type     */
 #define        LS_TYPE_ROUTER          1   /* router link */


@@ -141,29 +135,48 @@
 #define        MCLA_VERTEX_NETWORK     2
 
 /* Link-Local-Signaling */
 #define        MCLA_VERTEX_NETWORK     2
 
 /* Link-Local-Signaling */

-#define OSPF_LLS_EO            1       /* RFC4811, RFC4812 */
-#define OSPF_LLS_MD5   2       /* RFC4813 */
+#define OSPF_LLS_HDRLEN         4U /* RFC5613 Section 2.2 */
+
+#define OSPF_LLS_EO             1  /* RFC4811, RFC4812 */
+#define OSPF_LLS_MD5            2  /* RFC4813 */

 
 #define OSPF_LLS_EO_LR         0x00000001              /* RFC4811 */
 #define OSPF_LLS_EO_RS         0x00000002              /* RFC4812 */
 
 
 #define OSPF_LLS_EO_LR         0x00000001              /* RFC4811 */
 #define OSPF_LLS_EO_RS         0x00000002              /* RFC4812 */
 

+/*
+ * TOS metric struct (will be 0 or more in router links update)
+ */
+struct tos_metric {
+    nd_uint8_t  tos_type;
+    nd_uint8_t  reserved;
+    nd_uint16_t tos_metric;
+};
+struct tos_link {
+    nd_uint8_t  link_type;
+    nd_uint8_t  link_tos_count;
+    nd_uint16_t tos_metric;
+};
+union un_tos {
+    struct tos_link link;
+    struct tos_metric metrics;
+};

 
 /* link state advertisement header */
 struct lsa_hdr {
 
 /* link state advertisement header */
 struct lsa_hdr {

-    u_int16_t ls_age;
-    u_int8_t ls_options;
-    u_int8_t ls_type;
+    nd_uint16_t ls_age;
+    nd_uint8_t  ls_options;
+    nd_uint8_t  ls_type;

     union {
         struct in_addr lsa_id;
         struct { /* opaque LSAs change the LSA-ID field */
     union {
         struct in_addr lsa_id;
         struct { /* opaque LSAs change the LSA-ID field */

-            u_int8_t opaque_type;
-            u_int8_t opaque_id[3];
+            nd_uint8_t  opaque_type;
+            nd_uint24_t opaque_id;

        } opaque_field;
     } un_lsa_id;
     struct in_addr ls_router;
        } opaque_field;
     } un_lsa_id;
     struct in_addr ls_router;

-    u_int32_t ls_seq;
-    u_int16_t ls_chksum;
-    u_int16_t ls_length;
+    nd_uint32_t ls_seq;
+    nd_uint16_t ls_chksum;
+    nd_uint16_t ls_length;

 };
 
 /* link state advertisement */
 };
 
 /* link state advertisement */


@@ -174,15 +187,13 @@ struct lsa {
     union {
        /* Router links advertisements */
        struct {
     union {
        /* Router links advertisements */
        struct {

-           u_int8_t rla_flags;
-           u_int8_t rla_zero[1];
-           u_int16_t rla_count;
+           nd_uint8_t  rla_flags;
+           nd_byte     rla_zero;
+           nd_uint16_t rla_count;

            struct rlalink {
                struct in_addr link_id;
                struct in_addr link_data;
            struct rlalink {
                struct in_addr link_id;
                struct in_addr link_data;

-               u_int8_t link_type;
-               u_int8_t link_toscount;
-               u_int16_t link_tos0metric;
+                union un_tos un_tos;

            } rla_link[1];              /* may repeat   */
        } un_rla;
 
            } rla_link[1];              /* may repeat   */
        } un_rla;
 


@@ -195,14 +206,14 @@ struct lsa {
        /* Summary links advertisements */
        struct {
            struct in_addr sla_mask;
        /* Summary links advertisements */
        struct {
            struct in_addr sla_mask;

-           u_int32_t sla_tosmetric[1]; /* may repeat   */
+           nd_uint32_t sla_tosmetric[1];       /* may repeat   */

        } un_sla;
 
        /* AS external links advertisements */
        struct {
            struct in_addr asla_mask;
            struct aslametric {
        } un_sla;
 
        /* AS external links advertisements */
        struct {
            struct in_addr asla_mask;
            struct aslametric {

-               u_int32_t asla_tosmetric;
+               nd_uint32_t asla_tosmetric;

                struct in_addr asla_forward;
                struct in_addr asla_tag;
            } asla_metric[1];           /* may repeat   */
                struct in_addr asla_forward;
                struct in_addr asla_tag;
            } asla_metric[1];           /* may repeat   */


@@ -210,72 +221,62 @@ struct lsa {
 
        /* Multicast group membership */
        struct mcla {
 
        /* Multicast group membership */
        struct mcla {

-           u_int32_t mcla_vtype;
+           nd_uint32_t mcla_vtype;

            struct in_addr mcla_vid;
        } un_mcla[1];
 
         /* Opaque TE LSA */
         struct {
            struct in_addr mcla_vid;
        } un_mcla[1];
 
         /* Opaque TE LSA */
         struct {

-           u_int16_t type;
-           u_int16_t length;
-           u_int8_t data[1]; /* may repeat   */
+           nd_uint16_t type;
+           nd_uint16_t length;
+           nd_byte     data[1]; /* may repeat   */

        } un_te_lsa_tlv;
 
         /* Opaque Grace LSA */
         struct {
        } un_te_lsa_tlv;
 
         /* Opaque Grace LSA */
         struct {

-           u_int16_t type;
-           u_int16_t length;
-           u_int8_t data[1]; /* may repeat   */
+           nd_uint16_t type;
+           nd_uint16_t length;
+           nd_byte     data[1]; /* may repeat   */

        } un_grace_tlv;
 
         /* Opaque Router information LSA */
         struct {
        } un_grace_tlv;
 
         /* Opaque Router information LSA */
         struct {

-           u_int16_t type;
-           u_int16_t length;
-           u_int8_t data[1]; /* may repeat   */
+           nd_uint16_t type;
+           nd_uint16_t length;
+           nd_byte     data[1]; /* may repeat   */

        } un_ri_tlv;
 
         /* Unknown LSA */
         struct unknown {
        } un_ri_tlv;
 
         /* Unknown LSA */
         struct unknown {

-           u_int8_t data[1]; /* may repeat   */
+           nd_byte data[1]; /* may repeat   */

        } un_unknown[1];
 
     } lsa_un;
 };
 
        } un_unknown[1];
 
     } lsa_un;
 };
 

-
-/*
- * TOS metric struct (will be 0 or more in router links update)
- */
-struct tos_metric {
-    u_int8_t tos_type;
-    u_int8_t tos_zero;
-    u_int16_t tos_metric;
-};
-

 #define        OSPF_AUTH_SIZE  8
 
 /*
  * the main header
  */
 struct ospfhdr {
 #define        OSPF_AUTH_SIZE  8
 
 /*
  * the main header
  */
 struct ospfhdr {

-    u_int8_t ospf_version;
-    u_int8_t ospf_type;
-    u_int16_t ospf_len;
+    nd_uint8_t  ospf_version;
+    nd_uint8_t  ospf_type;
+    nd_uint16_t ospf_len;

     struct in_addr ospf_routerid;
     struct in_addr ospf_areaid;
     struct in_addr ospf_routerid;
     struct in_addr ospf_areaid;

-    u_int16_t ospf_chksum;
-    u_int16_t ospf_authtype;
-    u_int8_t ospf_authdata[OSPF_AUTH_SIZE];
+    nd_uint16_t ospf_chksum;
+    nd_uint16_t ospf_authtype;
+    nd_byte     ospf_authdata[OSPF_AUTH_SIZE];

     union {
 
        /* Hello packet */
        struct {
            struct in_addr hello_mask;
     union {
 
        /* Hello packet */
        struct {
            struct in_addr hello_mask;

-           u_int16_t hello_helloint;
-           u_int8_t hello_options;
-           u_int8_t hello_priority;
-           u_int32_t hello_deadint;
+           nd_uint16_t hello_helloint;
+           nd_uint8_t  hello_options;
+           nd_uint8_t  hello_priority;
+           nd_uint32_t hello_deadint;

            struct in_addr hello_dr;
            struct in_addr hello_bdr;
            struct in_addr hello_neighbor[1]; /* may repeat     */
            struct in_addr hello_dr;
            struct in_addr hello_bdr;
            struct in_addr hello_neighbor[1]; /* may repeat     */


@@ -283,21 +284,21 @@ struct ospfhdr {
 
        /* Database Description packet */
        struct {
 
        /* Database Description packet */
        struct {

-           u_int16_t db_ifmtu;
-           u_int8_t db_options;
-           u_int8_t db_flags;
-           u_int32_t db_seq;
+           nd_uint16_t db_ifmtu;
+           nd_uint8_t  db_options;
+           nd_uint8_t  db_flags;
+           nd_uint32_t db_seq;

            struct lsa_hdr db_lshdr[1]; /* may repeat   */
        } un_db;
 
        /* Link State Request */
        struct lsr {
            struct lsa_hdr db_lshdr[1]; /* may repeat   */
        } un_db;
 
        /* Link State Request */
        struct lsr {

-           u_int8_t ls_type[4];
+           nd_uint32_t ls_type;

             union {
                 struct in_addr ls_stateid;
                 struct { /* opaque LSAs change the LSA-ID field */
             union {
                 struct in_addr ls_stateid;
                 struct { /* opaque LSAs change the LSA-ID field */

-                    u_int8_t opaque_type;
-                    u_int8_t opaque_id[3];
+                    nd_uint8_t  opaque_type;
+                    nd_uint24_t opaque_id;

                 } opaque_field;
             } un_ls_stateid;
            struct in_addr ls_router;
                 } opaque_field;
             } un_ls_stateid;
            struct in_addr ls_router;


@@ -305,8 +306,8 @@ struct ospfhdr {
 
        /* Link State Update */
        struct {
 
        /* Link State Update */
        struct {

-           u_int32_t lsu_count;
-           struct lsa lsu_lsa[1]; /* may repeat        */
+           nd_uint32_t lsu_count;
+           struct lsa  lsu_lsa[1]; /* may repeat       */

        } un_lsu;
 
        /* Link State Acknowledgement */
        } un_lsu;
 
        /* Link State Acknowledgement */


@@ -321,7 +322,3 @@ struct ospfhdr {
 #define        ospf_lsr        ospf_un.un_lsr
 #define        ospf_lsu        ospf_un.un_lsu
 #define        ospf_lsa        ospf_un.un_lsa
 #define        ospf_lsr        ospf_un.un_lsr
 #define        ospf_lsu        ospf_un.un_lsu
 #define        ospf_lsa        ospf_un.un_lsa

-
-/* Functions shared by ospf and ospf6 */
-extern int ospf_print_te_lsa(u_int8_t *, u_int);
-extern int ospf_print_grace_lsa(u_int8_t *, u_int);