]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf6.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make 1-element arrays for fields that may repeat.
[tcpdump] / print-ospf6.c
diff --git a/print-ospf6.c b/print-ospf6.c
index b85cfaa0fef334f38d317d796c0cd818ee86ba99..4cbcb889f7638f92449c4b19892273ab1b732f5e 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -21,16 +21,17 @@
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: IPv6 Open Shortest Path First (OSPFv3) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <string.h>
 
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -117,27 +118,27 @@
 #define OSPF6_AT_HDRLEN             16U
 #define OSPF6_AUTH_TYPE_HMAC        0x0001
 
 #define OSPF6_AT_HDRLEN             16U
 #define OSPF6_AUTH_TYPE_HMAC        0x0001
 
-typedef uint32_t rtrid_t;
+typedef nd_uint32_t rtrid_t;
 
 /* link state advertisement header */
 struct lsa6_hdr {
 
 /* link state advertisement header */
 struct lsa6_hdr {
-    uint16_t ls_age;
-    uint16_t ls_type;
+    nd_uint16_t ls_age;
+    nd_uint16_t ls_type;
     rtrid_t ls_stateid;
     rtrid_t ls_router;
     rtrid_t ls_stateid;
     rtrid_t ls_router;
-    uint32_t ls_seq;
-    uint16_t ls_chksum;
-    uint16_t ls_length;
+    nd_uint32_t ls_seq;
+    nd_uint16_t ls_chksum;
+    nd_uint16_t ls_length;
 };
 
 /* Length of an IPv6 address, in bytes. */
 #define IPV6_ADDR_LEN_BYTES (128/8)
 
 struct lsa6_prefix {
 };
 
 /* Length of an IPv6 address, in bytes. */
 #define IPV6_ADDR_LEN_BYTES (128/8)
 
 struct lsa6_prefix {
-    uint8_t lsa_p_len;
-    uint8_t lsa_p_opt;
-    uint16_t lsa_p_metric;
-    uint8_t lsa_p_prefix[IPV6_ADDR_LEN_BYTES]; /* maximum length */
+    nd_uint8_t lsa_p_len;
+    nd_uint8_t lsa_p_opt;
+    nd_uint16_t lsa_p_metric;
+    nd_byte lsa_p_prefix[IPV6_ADDR_LEN_BYTES]; /* maximum length */
 };
 
 /* link state advertisement */
 };
 
 /* link state advertisement */
@@ -149,36 +150,36 @@ struct lsa6 {
        /* Router links advertisements */
        struct {
            union {
        /* Router links advertisements */
        struct {
            union {
-               uint8_t flg;
-               uint32_t opt;
+               nd_uint8_t flg;
+               nd_uint32_t opt;
            } rla_flgandopt;
 #define rla_flags      rla_flgandopt.flg
 #define rla_options    rla_flgandopt.opt
            struct rlalink6 {
            } rla_flgandopt;
 #define rla_flags      rla_flgandopt.flg
 #define rla_options    rla_flgandopt.opt
            struct rlalink6 {
-               uint8_t link_type;
-               uint8_t link_zero[1];
-               uint16_t link_metric;
-               uint32_t link_ifid;
-               uint32_t link_nifid;
+               nd_uint8_t link_type;
+               nd_byte link_zero;
+               nd_uint16_t link_metric;
+               nd_uint32_t link_ifid;
+               nd_uint32_t link_nifid;
                rtrid_t link_nrtid;
            } rla_link[1];              /* may repeat   */
        } un_rla;
 
        /* Network links advertisements */
        struct {
                rtrid_t link_nrtid;
            } rla_link[1];              /* may repeat   */
        } un_rla;
 
        /* Network links advertisements */
        struct {
-           uint32_t nla_options;
+           nd_uint32_t nla_options;
            rtrid_t nla_router[1];      /* may repeat   */
        } un_nla;
 
        /* Inter Area Prefix LSA */
        struct {
            rtrid_t nla_router[1];      /* may repeat   */
        } un_nla;
 
        /* Inter Area Prefix LSA */
        struct {
-           uint32_t inter_ap_metric;
+           nd_uint32_t inter_ap_metric;
            struct lsa6_prefix inter_ap_prefix[1];
        } un_inter_ap;
 
        /* AS external links advertisements */
        struct {
            struct lsa6_prefix inter_ap_prefix[1];
        } un_inter_ap;
 
        /* AS external links advertisements */
        struct {
-           uint32_t asla_metric;
+           nd_uint32_t asla_metric;
            struct lsa6_prefix asla_prefix[1];
            /* some optional fields follow */
        } un_asla;
            struct lsa6_prefix asla_prefix[1];
            /* some optional fields follow */
        } un_asla;
@@ -187,12 +188,12 @@ struct lsa6 {
        /* Summary links advertisements */
        struct {
            struct in_addr sla_mask;
        /* Summary links advertisements */
        struct {
            struct in_addr sla_mask;
-           uint32_t sla_tosmetric[1];  /* may repeat   */
+           nd_uint32_t sla_tosmetric[1];       /* may repeat   */
        } un_sla;
 
        /* Multicast group membership */
        struct mcla {
        } un_sla;
 
        /* Multicast group membership */
        struct mcla {
-           uint32_t mcla_vtype;
+           nd_uint32_t mcla_vtype;
            struct in_addr mcla_vid;
        } un_mcla[1];
 #endif
            struct in_addr mcla_vid;
        } un_mcla[1];
 #endif
@@ -202,20 +203,20 @@ struct lsa6 {
        /* Link LSA */
        struct llsa {
            union {
        /* Link LSA */
        struct llsa {
            union {
-               uint8_t pri;
-               uint32_t opt;
+               nd_uint8_t pri;
+               nd_uint32_t opt;
            } llsa_priandopt;
 #define llsa_priority  llsa_priandopt.pri
 #define llsa_options   llsa_priandopt.opt
            struct in6_addr llsa_lladdr;
            } llsa_priandopt;
 #define llsa_priority  llsa_priandopt.pri
 #define llsa_options   llsa_priandopt.opt
            struct in6_addr llsa_lladdr;
-           uint32_t llsa_nprefix;
+           nd_uint32_t llsa_nprefix;
            struct lsa6_prefix llsa_prefix[1];
        } un_llsa;
 
        /* Intra-Area-Prefix */
        struct {
            struct lsa6_prefix llsa_prefix[1];
        } un_llsa;
 
        /* Intra-Area-Prefix */
        struct {
-           uint16_t intra_ap_nprefix;
-           uint16_t intra_ap_lstype;
+           nd_uint16_t intra_ap_nprefix;
+           nd_uint16_t intra_ap_lstype;
            rtrid_t intra_ap_lsid;
            rtrid_t intra_ap_rtid;
            struct lsa6_prefix intra_ap_prefix[1];
            rtrid_t intra_ap_lsid;
            rtrid_t intra_ap_rtid;
            struct lsa6_prefix intra_ap_prefix[1];
@@ -227,68 +228,61 @@ struct lsa6 {
  * the main header
  */
 struct ospf6hdr {
  * the main header
  */
 struct ospf6hdr {
-    uint8_t ospf6_version;
-    uint8_t ospf6_type;
-    uint16_t ospf6_len;
+    nd_uint8_t ospf6_version;
+    nd_uint8_t ospf6_type;
+    nd_uint16_t ospf6_len;
     rtrid_t ospf6_routerid;
     rtrid_t ospf6_areaid;
     rtrid_t ospf6_routerid;
     rtrid_t ospf6_areaid;
-    uint16_t ospf6_chksum;
-    uint8_t ospf6_instanceid;
-    uint8_t ospf6_rsvd;
-    union {
+    nd_uint16_t ospf6_chksum;
+    nd_uint8_t ospf6_instanceid;
+    nd_uint8_t ospf6_rsvd;
+};
 
 
-       /* Hello packet */
-       struct {
-           uint32_t hello_ifid;
-           union {
-               uint8_t pri;
-               uint32_t opt;
-           } hello_priandopt;
+/*
+ * The OSPF6 header length is 16 bytes, regardless of how your compiler
+ * might choose to pad the above structure.
+ */
+#define OSPF6HDR_LEN    16
+
+/* Hello packet */
+struct hello6 {
+    nd_uint32_t hello_ifid;
+    union {
+       nd_uint8_t pri;
+       nd_uint32_t opt;
+    } hello_priandopt;
 #define hello_priority hello_priandopt.pri
 #define hello_options  hello_priandopt.opt
 #define hello_priority hello_priandopt.pri
 #define hello_options  hello_priandopt.opt
-           uint16_t hello_helloint;
-           uint16_t hello_deadint;
-           rtrid_t hello_dr;
-           rtrid_t hello_bdr;
-           rtrid_t hello_neighbor[1]; /* may repeat    */
-       } un_hello;
-
-       /* Database Description packet */
-       struct {
-           uint32_t db_options;
-           uint16_t db_mtu;
-           uint8_t db_mbz;
-           uint8_t db_flags;
-           uint32_t db_seq;
-           struct lsa6_hdr db_lshdr[1]; /* may repeat  */
-       } un_db;
-
-       /* Link State Request */
-       struct lsr6 {
-           uint16_t ls_mbz;
-           uint16_t ls_type;
-           rtrid_t ls_stateid;
-           rtrid_t ls_router;
-       } un_lsr[1];            /* may repeat   */
-
-       /* Link State Update */
-       struct {
-           uint32_t lsu_count;
-           struct lsa6 lsu_lsa[1]; /* may repeat       */
-       } un_lsu;
+    nd_uint16_t hello_helloint;
+    nd_uint16_t hello_deadint;
+    rtrid_t hello_dr;
+    rtrid_t hello_bdr;
+    rtrid_t hello_neighbor[1]; /* may repeat   */
+};
 
 
-       /* Link State Acknowledgement */
-       struct {
-           struct lsa6_hdr lsa_lshdr[1]; /* may repeat */
-       } un_lsa ;
-    } ospf6_un ;
+/* Database Description packet */
+struct dd6 {
+    nd_uint32_t db_options;
+    nd_uint16_t db_mtu;
+    nd_uint8_t db_mbz;
+    nd_uint8_t db_flags;
+    nd_uint32_t db_seq;
+    struct lsa6_hdr db_lshdr[1]; /* may repeat */
 };
 
 };
 
-#define        ospf6_hello     ospf6_un.un_hello
-#define        ospf6_db        ospf6_un.un_db
-#define        ospf6_lsr       ospf6_un.un_lsr
-#define        ospf6_lsu       ospf6_un.un_lsu
-#define        ospf6_lsa       ospf6_un.un_lsa
+/* Link State Request */
+struct lsr6 {
+    nd_uint16_t ls_mbz;
+    nd_uint16_t ls_type;
+    rtrid_t ls_stateid;
+    rtrid_t ls_router;
+};
+
+/* Link State Update */
+struct lsu6 {
+    nd_uint32_t lsu_count;
+    struct lsa6 lsu_lsa[1]; /* may repeat      */
+};
 
 static const char tstr[] = " [|ospf3]";
 
 
 static const char tstr[] = " [|ospf3]";
 
@@ -379,7 +373,7 @@ static const struct tok ospf6_auth_type_str[] = {
 
 static void
 ospf6_print_ls_type(netdissect_options *ndo,
 
 static void
 ospf6_print_ls_type(netdissect_options *ndo,
-                    register u_int ls_type, register const rtrid_t *ls_stateid)
+                    u_int ls_type, const rtrid_t *ls_stateid)
 {
         ND_PRINT((ndo, "\n\t    %s LSA (%d), %s Scope%s, LSA-ID %s",
                tok2str(ospf6_lsa_values, "Unknown", ls_type & LS_TYPE_MASK),
 {
         ND_PRINT((ndo, "\n\t    %s LSA (%d), %s Scope%s, LSA-ID %s",
                tok2str(ospf6_lsa_values, "Unknown", ls_type & LS_TYPE_MASK),
@@ -391,20 +385,21 @@ ospf6_print_ls_type(netdissect_options *ndo,
 
 static int
 ospf6_print_lshdr(netdissect_options *ndo,
 
 static int
 ospf6_print_lshdr(netdissect_options *ndo,
-                  register const struct lsa6_hdr *lshp, const u_char *dataend)
+                  const struct lsa6_hdr *lshp, const u_char *dataend)
 {
 {
-       if ((u_char *)(lshp + 1) > dataend)
+       if ((const u_char *)(lshp + 1) > dataend)
                goto trunc;
        ND_TCHECK(lshp->ls_type);
        ND_TCHECK(lshp->ls_seq);
 
        ND_PRINT((ndo, "\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
                ipaddr_string(ndo, &lshp->ls_router),
                goto trunc;
        ND_TCHECK(lshp->ls_type);
        ND_TCHECK(lshp->ls_seq);
 
        ND_PRINT((ndo, "\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
                ipaddr_string(ndo, &lshp->ls_router),
-               EXTRACT_32BITS(&lshp->ls_seq),
-               EXTRACT_16BITS(&lshp->ls_age),
-               EXTRACT_16BITS(&lshp->ls_length)-(u_int)sizeof(struct lsa6_hdr)));
+               EXTRACT_BE_U_4(lshp->ls_seq),
+               EXTRACT_BE_U_2(lshp->ls_age),
+               EXTRACT_BE_U_2(lshp->ls_length)-(u_int)sizeof(struct lsa6_hdr)));
 
 
-       ospf6_print_ls_type(ndo, EXTRACT_16BITS(&lshp->ls_type), &lshp->ls_stateid);
+       ospf6_print_ls_type(ndo, EXTRACT_BE_U_2(lshp->ls_type),
+                           &lshp->ls_stateid);
 
        return (0);
 trunc:
 
        return (0);
 trunc:
@@ -415,33 +410,33 @@ static int
 ospf6_print_lsaprefix(netdissect_options *ndo,
                       const uint8_t *tptr, u_int lsa_length)
 {
 ospf6_print_lsaprefix(netdissect_options *ndo,
                       const uint8_t *tptr, u_int lsa_length)
 {
-       const struct lsa6_prefix *lsapp = (struct lsa6_prefix *)tptr;
+       const struct lsa6_prefix *lsapp = (const struct lsa6_prefix *)tptr;
        u_int wordlen;
        struct in6_addr prefix;
 
        if (lsa_length < sizeof (*lsapp) - IPV6_ADDR_LEN_BYTES)
                goto trunc;
        lsa_length -= sizeof (*lsapp) - IPV6_ADDR_LEN_BYTES;
        u_int wordlen;
        struct in6_addr prefix;
 
        if (lsa_length < sizeof (*lsapp) - IPV6_ADDR_LEN_BYTES)
                goto trunc;
        lsa_length -= sizeof (*lsapp) - IPV6_ADDR_LEN_BYTES;
-       ND_TCHECK2(*lsapp, sizeof (*lsapp) - IPV6_ADDR_LEN_BYTES);
-       wordlen = (lsapp->lsa_p_len + 31) / 32;
+       ND_TCHECK_LEN(lsapp, sizeof(*lsapp) - IPV6_ADDR_LEN_BYTES);
+       wordlen = (EXTRACT_U_1(lsapp->lsa_p_len) + 31) / 32;
        if (wordlen * 4 > sizeof(struct in6_addr)) {
        if (wordlen * 4 > sizeof(struct in6_addr)) {
-               ND_PRINT((ndo, " bogus prefixlen /%d", lsapp->lsa_p_len));
+               ND_PRINT((ndo, " bogus prefixlen /%u", EXTRACT_U_1(lsapp->lsa_p_len)));
                goto trunc;
        }
        if (lsa_length < wordlen * 4)
                goto trunc;
        lsa_length -= wordlen * 4;
                goto trunc;
        }
        if (lsa_length < wordlen * 4)
                goto trunc;
        lsa_length -= wordlen * 4;
-       ND_TCHECK2(lsapp->lsa_p_prefix, wordlen * 4);
+       ND_TCHECK_LEN(lsapp->lsa_p_prefix, wordlen * 4);
        memset(&prefix, 0, sizeof(prefix));
        memcpy(&prefix, lsapp->lsa_p_prefix, wordlen * 4);
        memset(&prefix, 0, sizeof(prefix));
        memcpy(&prefix, lsapp->lsa_p_prefix, wordlen * 4);
-       ND_PRINT((ndo, "\n\t\t%s/%d", ip6addr_string(ndo, &prefix),
-               lsapp->lsa_p_len));
-        if (lsapp->lsa_p_opt) {
+       ND_PRINT((ndo, "\n\t\t%s/%u", ip6addr_string(ndo, &prefix),
+               EXTRACT_U_1(lsapp->lsa_p_len)));
+        if (EXTRACT_U_1(lsapp->lsa_p_opt)) {
             ND_PRINT((ndo, ", Options [%s]",
                    bittok2str(ospf6_lsa_prefix_option_values,
             ND_PRINT((ndo, ", Options [%s]",
                    bittok2str(ospf6_lsa_prefix_option_values,
-                              "none", lsapp->lsa_p_opt)));
+                              "none", EXTRACT_U_1(lsapp->lsa_p_opt))));
         }
         }
-        ND_PRINT((ndo, ", metric %u", EXTRACT_16BITS(&lsapp->lsa_p_metric)));
+        ND_PRINT((ndo, ", metric %u", EXTRACT_BE_U_2(lsapp->lsa_p_metric)));
        return sizeof(*lsapp) - IPV6_ADDR_LEN_BYTES + wordlen * 4;
 
 trunc:
        return sizeof(*lsapp) - IPV6_ADDR_LEN_BYTES + wordlen * 4;
 
 trunc:
@@ -454,32 +449,32 @@ trunc:
  */
 static int
 ospf6_print_lsa(netdissect_options *ndo,
  */
 static int
 ospf6_print_lsa(netdissect_options *ndo,
-                register const struct lsa6 *lsap, const u_char *dataend)
+                const struct lsa6 *lsap, const u_char *dataend)
 {
 {
-       register const struct rlalink6 *rlp;
+       const struct rlalink6 *rlp;
 #if 0
 #if 0
-       register const struct tos_metric *tosp;
+       const struct tos_metric *tosp;
 #endif
 #endif
-       register const rtrid_t *ap;
+       const rtrid_t *ap;
 #if 0
 #if 0
-       register const struct aslametric *almp;
-       register const struct mcla *mcp;
+       const struct aslametric *almp;
+       const struct mcla *mcp;
 #endif
 #endif
-       register const struct llsa *llsap;
-       register const struct lsa6_prefix *lsapp;
+       const struct llsa *llsap;
+       const struct lsa6_prefix *lsapp;
 #if 0
 #if 0
-       register const uint32_t *lp;
+       const uint32_t *lp;
 #endif
 #endif
-       register u_int prefixes;
-       register int bytelen;
-       register u_int length, lsa_length;
+       u_int prefixes;
+       int bytelen;
+       u_int length, lsa_length;
        uint32_t flags32;
        const uint8_t *tptr;
 
        if (ospf6_print_lshdr(ndo, &lsap->ls_hdr, dataend))
                return (1);
        ND_TCHECK(lsap->ls_hdr.ls_length);
        uint32_t flags32;
        const uint8_t *tptr;
 
        if (ospf6_print_lshdr(ndo, &lsap->ls_hdr, dataend))
                return (1);
        ND_TCHECK(lsap->ls_hdr.ls_length);
-        length = EXTRACT_16BITS(&lsap->ls_hdr.ls_length);
+        length = EXTRACT_BE_U_2(lsap->ls_hdr.ls_length);
 
        /*
         * The LSA length includes the length of the header;
 
        /*
         * The LSA length includes the length of the header;
@@ -487,12 +482,12 @@ ospf6_print_lsa(netdissect_options *ndo,
         * If it does, find the length of what follows the
         * header.
         */
         * If it does, find the length of what follows the
         * header.
         */
-        if (length < sizeof(struct lsa6_hdr) || (u_char *)lsap + length > dataend)
+        if (length < sizeof(struct lsa6_hdr) || (const u_char *)lsap + length > dataend)
                return (1);
         lsa_length = length - sizeof(struct lsa6_hdr);
                return (1);
         lsa_length = length - sizeof(struct lsa6_hdr);
-        tptr = (uint8_t *)lsap+sizeof(struct lsa6_hdr);
+        tptr = (const uint8_t *)lsap+sizeof(struct lsa6_hdr);
 
 
-       switch (EXTRACT_16BITS(&lsap->ls_hdr.ls_type)) {
+       switch (EXTRACT_BE_U_2(lsap->ls_hdr.ls_type)) {
        case LS_TYPE_ROUTER | LS_SCOPE_AREA:
                if (lsa_length < sizeof (lsap->lsa_un.un_rla.rla_options))
                        return (1);
        case LS_TYPE_ROUTER | LS_SCOPE_AREA:
                if (lsa_length < sizeof (lsap->lsa_un.un_rla.rla_options))
                        return (1);
@@ -500,10 +495,10 @@ ospf6_print_lsa(netdissect_options *ndo,
                ND_TCHECK(lsap->lsa_un.un_rla.rla_options);
                ND_PRINT((ndo, "\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                ND_TCHECK(lsap->lsa_un.un_rla.rla_options);
                ND_PRINT((ndo, "\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
-                         EXTRACT_32BITS(&lsap->lsa_un.un_rla.rla_options))));
+                         EXTRACT_BE_U_4(lsap->lsa_un.un_rla.rla_options))));
                ND_PRINT((ndo, ", RLA-Flags [%s]",
                          bittok2str(ospf6_rla_flag_values, "none",
                ND_PRINT((ndo, ", RLA-Flags [%s]",
                          bittok2str(ospf6_rla_flag_values, "none",
-                         lsap->lsa_un.un_rla.rla_flags)));
+                         EXTRACT_U_1(lsap->lsa_un.un_rla.rla_flags))));
 
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (lsa_length != 0) {
 
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (lsa_length != 0) {
@@ -511,7 +506,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                                return (1);
                        lsa_length -= sizeof (*rlp);
                        ND_TCHECK(*rlp);
                                return (1);
                        lsa_length -= sizeof (*rlp);
                        ND_TCHECK(*rlp);
-                       switch (rlp->link_type) {
+                       switch (EXTRACT_U_1(rlp->link_type)) {
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT((ndo, "\n\t      Virtual Link: Neighbor Router-ID %s"
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT((ndo, "\n\t      Virtual Link: Neighbor Router-ID %s"
@@ -539,10 +534,10 @@ ospf6_print_lsa(netdissect_options *ndo,
 
                        default:
                                ND_PRINT((ndo, "\n\t      Unknown Router Links Type 0x%02x",
 
                        default:
                                ND_PRINT((ndo, "\n\t      Unknown Router Links Type 0x%02x",
-                                   rlp->link_type));
+                                   EXTRACT_U_1(rlp->link_type)));
                                return (0);
                        }
                                return (0);
                        }
-                       ND_PRINT((ndo, ", metric %d", EXTRACT_16BITS(&rlp->link_metric)));
+                       ND_PRINT((ndo, ", metric %d", EXTRACT_BE_U_2(rlp->link_metric)));
                        rlp++;
                }
                break;
                        rlp++;
                }
                break;
@@ -554,7 +549,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                ND_TCHECK(lsap->lsa_un.un_nla.nla_options);
                ND_PRINT((ndo, "\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                ND_TCHECK(lsap->lsa_un.un_nla.nla_options);
                ND_PRINT((ndo, "\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
-                         EXTRACT_32BITS(&lsap->lsa_un.un_nla.nla_options))));
+                         EXTRACT_BE_U_4(lsap->lsa_un.un_nla.nla_options))));
 
                ND_PRINT((ndo, "\n\t      Connected Routers:"));
                ap = lsap->lsa_un.un_nla.nla_router;
 
                ND_PRINT((ndo, "\n\t      Connected Routers:"));
                ap = lsap->lsa_un.un_nla.nla_router;
@@ -574,9 +569,9 @@ ospf6_print_lsa(netdissect_options *ndo,
                lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);
                ND_TCHECK(lsap->lsa_un.un_inter_ap.inter_ap_metric);
                ND_PRINT((ndo, ", metric %u",
                lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);
                ND_TCHECK(lsap->lsa_un.un_inter_ap.inter_ap_metric);
                ND_PRINT((ndo, ", metric %u",
-                       EXTRACT_32BITS(&lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC));
+                       EXTRACT_BE_U_4(lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC));
 
 
-               tptr = (uint8_t *)lsap->lsa_un.un_inter_ap.inter_ap_prefix;
+               tptr = (const uint8_t *)lsap->lsa_un.un_inter_ap.inter_ap_prefix;
                while (lsa_length != 0) {
                        bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                        if (bytelen < 0)
                while (lsa_length != 0) {
                        bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                        if (bytelen < 0)
@@ -591,15 +586,15 @@ ospf6_print_lsa(netdissect_options *ndo,
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);
                ND_TCHECK(lsap->lsa_un.un_asla.asla_metric);
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);
                ND_TCHECK(lsap->lsa_un.un_asla.asla_metric);
-               flags32 = EXTRACT_32BITS(&lsap->lsa_un.un_asla.asla_metric);
+               flags32 = EXTRACT_BE_U_4(lsap->lsa_un.un_asla.asla_metric);
                ND_PRINT((ndo, "\n\t     Flags [%s]",
                          bittok2str(ospf6_asla_flag_values, "none", flags32)));
                ND_PRINT((ndo, " metric %u",
                ND_PRINT((ndo, "\n\t     Flags [%s]",
                          bittok2str(ospf6_asla_flag_values, "none", flags32)));
                ND_PRINT((ndo, " metric %u",
-                      EXTRACT_32BITS(&lsap->lsa_un.un_asla.asla_metric) &
+                      EXTRACT_BE_U_4(lsap->lsa_un.un_asla.asla_metric) &
                       ASLA_MASK_METRIC));
 
                       ASLA_MASK_METRIC));
 
-               tptr = (uint8_t *)lsap->lsa_un.un_asla.asla_prefix;
-               lsapp = (struct lsa6_prefix *)tptr;
+               tptr = (const uint8_t *)lsap->lsa_un.un_asla.asla_prefix;
+               lsapp = (const struct lsa6_prefix *)tptr;
                bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                if (bytelen < 0)
                        goto trunc;
                bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                if (bytelen < 0)
                        goto trunc;
@@ -607,9 +602,9 @@ ospf6_print_lsa(netdissect_options *ndo,
                tptr += bytelen;
 
                if ((flags32 & ASLA_FLAG_FWDADDR) != 0) {
                tptr += bytelen;
 
                if ((flags32 & ASLA_FLAG_FWDADDR) != 0) {
-                       struct in6_addr *fwdaddr6;
+                       const struct in6_addr *fwdaddr6;
 
 
-                       fwdaddr6 = (struct in6_addr *)tptr;
+                       fwdaddr6 = (const struct in6_addr *)tptr;
                        if (lsa_length < sizeof (*fwdaddr6))
                                return (1);
                        lsa_length -= sizeof (*fwdaddr6);
                        if (lsa_length < sizeof (*fwdaddr6))
                                return (1);
                        lsa_length -= sizeof (*fwdaddr6);
@@ -623,19 +618,19 @@ ospf6_print_lsa(netdissect_options *ndo,
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);
-                       ND_TCHECK(*(uint32_t *)tptr);
+                       ND_TCHECK(*(const uint32_t *)tptr);
                        ND_PRINT((ndo, " tag %s",
                        ND_PRINT((ndo, " tag %s",
-                              ipaddr_string(ndo, (uint32_t *)tptr)));
+                              ipaddr_string(ndo, (const uint32_t *)tptr)));
                        tptr += sizeof(uint32_t);
                }
 
                        tptr += sizeof(uint32_t);
                }
 
-               if (lsapp->lsa_p_metric) {
+               if (EXTRACT_U_1(lsapp->lsa_p_metric)) {
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);
-                       ND_TCHECK(*(uint32_t *)tptr);
+                       ND_TCHECK(*(const uint32_t *)tptr);
                        ND_PRINT((ndo, " RefLSID: %s",
                        ND_PRINT((ndo, " RefLSID: %s",
-                              ipaddr_string(ndo, (uint32_t *)tptr)));
+                              ipaddr_string(ndo, (const uint32_t *)tptr)));
                        tptr += sizeof(uint32_t);
                }
                break;
                        tptr += sizeof(uint32_t);
                }
                break;
@@ -649,18 +644,19 @@ ospf6_print_lsa(netdissect_options *ndo,
                ND_TCHECK(llsap->llsa_priandopt);
                ND_PRINT((ndo, "\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                ND_TCHECK(llsap->llsa_priandopt);
                ND_PRINT((ndo, "\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
-                         EXTRACT_32BITS(&llsap->llsa_options))));
+                         EXTRACT_BE_U_4(llsap->llsa_options))));
 
                if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))
                        return (1);
                lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);
 
                if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))
                        return (1);
                lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);
-                prefixes = EXTRACT_32BITS(&llsap->llsa_nprefix);
+                ND_TCHECK(llsap->llsa_nprefix);
+                prefixes = EXTRACT_BE_U_4(llsap->llsa_nprefix);
                ND_PRINT((ndo, "\n\t      Priority %d, Link-local address %s, Prefixes %d:",
                ND_PRINT((ndo, "\n\t      Priority %d, Link-local address %s, Prefixes %d:",
-                       llsap->llsa_priority,
+                       EXTRACT_U_1(llsap->llsa_priority),
                        ip6addr_string(ndo, &llsap->llsa_lladdr),
                        prefixes));
 
                        ip6addr_string(ndo, &llsap->llsa_lladdr),
                        prefixes));
 
-               tptr = (uint8_t *)llsap->llsa_prefix;
+               tptr = (const uint8_t *)llsap->llsa_prefix;
                while (prefixes > 0) {
                        bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                        if (bytelen < 0)
                while (prefixes > 0) {
                        bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                        if (bytelen < 0)
@@ -678,17 +674,17 @@ ospf6_print_lsa(netdissect_options *ndo,
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid);
                ND_TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_rtid);
                ospf6_print_ls_type(ndo,
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid);
                ND_TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_rtid);
                ospf6_print_ls_type(ndo,
-                       EXTRACT_16BITS(&lsap->lsa_un.un_intra_ap.intra_ap_lstype),
+                       EXTRACT_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_lstype),
                        &lsap->lsa_un.un_intra_ap.intra_ap_lsid);
 
                if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                ND_TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                        &lsap->lsa_un.un_intra_ap.intra_ap_lsid);
 
                if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                ND_TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
-                prefixes = EXTRACT_16BITS(&lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
+                prefixes = EXTRACT_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                ND_PRINT((ndo, "\n\t      Prefixes %d:", prefixes));
 
                ND_PRINT((ndo, "\n\t      Prefixes %d:", prefixes));
 
-               tptr = (uint8_t *)lsap->lsa_un.un_intra_ap.intra_ap_prefix;
+               tptr = (const uint8_t *)lsap->lsa_un.un_intra_ap.intra_ap_prefix;
                while (prefixes > 0) {
                        bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                        if (bytelen < 0)
                while (prefixes > 0) {
                        bytelen = ospf6_print_lsaprefix(ndo, tptr, lsa_length);
                        if (bytelen < 0)
@@ -727,79 +723,87 @@ trunc:
 
 static int
 ospf6_decode_v3(netdissect_options *ndo,
 
 static int
 ospf6_decode_v3(netdissect_options *ndo,
-                register const struct ospf6hdr *op,
-                register const u_char *dataend)
+                const struct ospf6hdr *op,
+                const u_char *dataend)
 {
 {
-       register const rtrid_t *ap;
-       register const struct lsr6 *lsrp;
-       register const struct lsa6_hdr *lshp;
-       register const struct lsa6 *lsap;
-       register int i;
+       const rtrid_t *ap;
+       const struct lsr6 *lsrp;
+       const struct lsa6_hdr *lshp;
+       const struct lsa6 *lsap;
+       int i;
+
+       switch (EXTRACT_U_1(op->ospf6_type)) {
 
 
-       switch (op->ospf6_type) {
+       case OSPF_TYPE_HELLO: {
+               const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 
 
-       case OSPF_TYPE_HELLO:
+               ND_TCHECK_4(hellop->hello_options);
                ND_PRINT((ndo, "\n\tOptions [%s]",
                          bittok2str(ospf6_option_values, "none",
                ND_PRINT((ndo, "\n\tOptions [%s]",
                          bittok2str(ospf6_option_values, "none",
-                         EXTRACT_32BITS(&op->ospf6_hello.hello_options))));
+                         EXTRACT_BE_U_4(hellop->hello_options))));
 
 
-               ND_TCHECK(op->ospf6_hello.hello_deadint);
+               ND_TCHECK(hellop->hello_deadint);
                ND_PRINT((ndo, "\n\t  Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",
                ND_PRINT((ndo, "\n\t  Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",
-                         EXTRACT_16BITS(&op->ospf6_hello.hello_helloint),
-                         EXTRACT_16BITS(&op->ospf6_hello.hello_deadint),
-                         ipaddr_string(ndo, &op->ospf6_hello.hello_ifid),
-                         op->ospf6_hello.hello_priority));
+                         EXTRACT_BE_U_2(hellop->hello_helloint),
+                         EXTRACT_BE_U_2(hellop->hello_deadint),
+                         ipaddr_string(ndo, &hellop->hello_ifid),
+                         EXTRACT_U_1(hellop->hello_priority)));
 
 
-               ND_TCHECK(op->ospf6_hello.hello_dr);
-               if (EXTRACT_32BITS(&op->ospf6_hello.hello_dr) != 0)
+               ND_TCHECK(hellop->hello_dr);
+               if (EXTRACT_BE_U_4(hellop->hello_dr) != 0)
                        ND_PRINT((ndo, "\n\t  Designated Router %s",
                        ND_PRINT((ndo, "\n\t  Designated Router %s",
-                           ipaddr_string(ndo, &op->ospf6_hello.hello_dr)));
-               ND_TCHECK(op->ospf6_hello.hello_bdr);
-               if (EXTRACT_32BITS(&op->ospf6_hello.hello_bdr) != 0)
+                           ipaddr_string(ndo, &hellop->hello_dr)));
+               ND_TCHECK(hellop->hello_bdr);
+               if (EXTRACT_BE_U_4(hellop->hello_bdr) != 0)
                        ND_PRINT((ndo, ", Backup Designated Router %s",
                        ND_PRINT((ndo, ", Backup Designated Router %s",
-                           ipaddr_string(ndo, &op->ospf6_hello.hello_bdr)));
+                           ipaddr_string(ndo, &hellop->hello_bdr)));
                if (ndo->ndo_vflag > 1) {
                        ND_PRINT((ndo, "\n\t  Neighbor List:"));
                if (ndo->ndo_vflag > 1) {
                        ND_PRINT((ndo, "\n\t  Neighbor List:"));
-                       ap = op->ospf6_hello.hello_neighbor;
-                       while ((u_char *)ap < dataend) {
+                       ap = hellop->hello_neighbor;
+                       while ((const u_char *)ap < dataend) {
                                ND_TCHECK(*ap);
                                ND_PRINT((ndo, "\n\t    %s", ipaddr_string(ndo, ap)));
                                ++ap;
                        }
                }
                break;  /* HELLO */
                                ND_TCHECK(*ap);
                                ND_PRINT((ndo, "\n\t    %s", ipaddr_string(ndo, ap)));
                                ++ap;
                        }
                }
                break;  /* HELLO */
+       }
 
 
-       case OSPF_TYPE_DD:
-               ND_TCHECK(op->ospf6_db.db_options);
+       case OSPF_TYPE_DD: {
+               const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
+
+               ND_TCHECK(ddp->db_options);
                ND_PRINT((ndo, "\n\tOptions [%s]",
                          bittok2str(ospf6_option_values, "none",
                ND_PRINT((ndo, "\n\tOptions [%s]",
                          bittok2str(ospf6_option_values, "none",
-                         EXTRACT_32BITS(&op->ospf6_db.db_options))));
-               ND_TCHECK(op->ospf6_db.db_flags);
+                         EXTRACT_BE_U_4(ddp->db_options))));
+               ND_TCHECK(ddp->db_flags);
                ND_PRINT((ndo, ", DD Flags [%s]",
                ND_PRINT((ndo, ", DD Flags [%s]",
-                         bittok2str(ospf6_dd_flag_values,"none",op->ospf6_db.db_flags)));
+                         bittok2str(ospf6_dd_flag_values,"none",EXTRACT_U_1(ddp->db_flags))));
 
 
-               ND_TCHECK(op->ospf6_db.db_seq);
+               ND_TCHECK(ddp->db_seq);
                ND_PRINT((ndo, ", MTU %u, DD-Sequence 0x%08x",
                ND_PRINT((ndo, ", MTU %u, DD-Sequence 0x%08x",
-                       EXTRACT_16BITS(&op->ospf6_db.db_mtu),
-                       EXTRACT_32BITS(&op->ospf6_db.db_seq)));
+                       EXTRACT_BE_U_2(ddp->db_mtu),
+                       EXTRACT_BE_U_4(ddp->db_seq)));
                if (ndo->ndo_vflag > 1) {
                        /* Print all the LS adv's */
                if (ndo->ndo_vflag > 1) {
                        /* Print all the LS adv's */
-                       lshp = op->ospf6_db.db_lshdr;
-                       while ((u_char *)lshp < dataend) {
+                       lshp = ddp->db_lshdr;
+                       while ((const u_char *)lshp < dataend) {
                                if (ospf6_print_lshdr(ndo, lshp++, dataend))
                                        goto trunc;
                        }
                }
                break;
                                if (ospf6_print_lshdr(ndo, lshp++, dataend))
                                        goto trunc;
                        }
                }
                break;
+       }
 
        case OSPF_TYPE_LS_REQ:
                if (ndo->ndo_vflag > 1) {
 
        case OSPF_TYPE_LS_REQ:
                if (ndo->ndo_vflag > 1) {
-                       lsrp = op->ospf6_lsr;
-                       while ((u_char *)lsrp < dataend) {
+                       lsrp = (const struct lsr6 *)((const uint8_t *)op + OSPF6HDR_LEN);
+                       while ((const u_char *)lsrp < dataend) {
                                ND_TCHECK(*lsrp);
                                ND_PRINT((ndo, "\n\t  Advertising Router %s",
                                          ipaddr_string(ndo, &lsrp->ls_router)));
                                ND_TCHECK(*lsrp);
                                ND_PRINT((ndo, "\n\t  Advertising Router %s",
                                          ipaddr_string(ndo, &lsrp->ls_router)));
-                               ospf6_print_ls_type(ndo, EXTRACT_16BITS(&lsrp->ls_type),
+                               ospf6_print_ls_type(ndo,
+                                                    EXTRACT_BE_U_2(lsrp->ls_type),
                                                     &lsrp->ls_stateid);
                                ++lsrp;
                        }
                                                     &lsrp->ls_stateid);
                                ++lsrp;
                        }
@@ -808,23 +812,24 @@ ospf6_decode_v3(netdissect_options *ndo,
 
        case OSPF_TYPE_LS_UPDATE:
                if (ndo->ndo_vflag > 1) {
 
        case OSPF_TYPE_LS_UPDATE:
                if (ndo->ndo_vflag > 1) {
-                       lsap = op->ospf6_lsu.lsu_lsa;
-                       ND_TCHECK(op->ospf6_lsu.lsu_count);
-                       i = EXTRACT_32BITS(&op->ospf6_lsu.lsu_count);
-                       while ((u_char *)lsap < dataend && i--) {
+                       const struct lsu6 *lsup = (const struct lsu6 *)((const uint8_t *)op + OSPF6HDR_LEN);
+
+                       ND_TCHECK(lsup->lsu_count);
+                       i = EXTRACT_BE_U_4(lsup->lsu_count);
+                       lsap = lsup->lsu_lsa;
+                       while ((const u_char *)lsap < dataend && i--) {
                                if (ospf6_print_lsa(ndo, lsap, dataend))
                                        goto trunc;
                                if (ospf6_print_lsa(ndo, lsap, dataend))
                                        goto trunc;
-                               lsap = (struct lsa6 *)((u_char *)lsap +
-                                   EXTRACT_16BITS(&lsap->ls_hdr.ls_length));
+                               lsap = (const struct lsa6 *)((const u_char *)lsap +
+                                   EXTRACT_BE_U_2(lsap->ls_hdr.ls_length));
                        }
                }
                break;
 
                        }
                }
                break;
 
-
        case OSPF_TYPE_LS_ACK:
                if (ndo->ndo_vflag > 1) {
        case OSPF_TYPE_LS_ACK:
                if (ndo->ndo_vflag > 1) {
-                       lshp = op->ospf6_lsa.lsa_lshdr;
-                       while ((u_char *)lshp < dataend) {
+                       lshp = (const struct lsa6_hdr *)((const uint8_t *)op + OSPF6HDR_LEN);
+                       while ((const u_char *)lshp < dataend) {
                                if (ospf6_print_lshdr(ndo, lshp++, dataend))
                                        goto trunc;
                        }
                                if (ospf6_print_lshdr(ndo, lshp++, dataend))
                                        goto trunc;
                        }
@@ -851,18 +856,18 @@ ospf6_print_lls(netdissect_options *ndo,
        if (len < OSPF_LLS_HDRLEN)
                goto trunc;
        /* Checksum */
        if (len < OSPF_LLS_HDRLEN)
                goto trunc;
        /* Checksum */
-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, "\n\tLLS Checksum 0x%04x", EXTRACT_16BITS(cp)));
+       ND_TCHECK_2(cp);
+       ND_PRINT((ndo, "\n\tLLS Checksum 0x%04x", EXTRACT_BE_U_2(cp)));
        cp += 2;
        /* LLS Data Length */
        cp += 2;
        /* LLS Data Length */
-       ND_TCHECK2(*cp, 2);
-       llsdatalen = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       llsdatalen = EXTRACT_BE_U_2(cp);
        ND_PRINT((ndo, ", Data Length %u", llsdatalen));
        if (llsdatalen < OSPF_LLS_HDRLEN || llsdatalen > len)
                goto trunc;
        cp += 2;
        /* LLS TLVs */
        ND_PRINT((ndo, ", Data Length %u", llsdatalen));
        if (llsdatalen < OSPF_LLS_HDRLEN || llsdatalen > len)
                goto trunc;
        cp += 2;
        /* LLS TLVs */
-       ND_TCHECK2(*cp, llsdatalen - OSPF_LLS_HDRLEN);
+       ND_TCHECK_LEN(cp, llsdatalen - OSPF_LLS_HDRLEN);
        /* FIXME: code in print-ospf.c can be reused to decode the TLVs */
 
        return llsdatalen;
        /* FIXME: code in print-ospf.c can be reused to decode the TLVs */
 
        return llsdatalen;
@@ -882,33 +887,33 @@ ospf6_decode_at(netdissect_options *ndo,
        if (len < OSPF6_AT_HDRLEN)
                goto trunc;
        /* Authentication Type */
        if (len < OSPF6_AT_HDRLEN)
                goto trunc;
        /* Authentication Type */
-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, "\n\tAuthentication Type %s", tok2str(ospf6_auth_type_str, "unknown (0x%04x)", EXTRACT_16BITS(cp))));
+       ND_TCHECK_2(cp);
+       ND_PRINT((ndo, "\n\tAuthentication Type %s", tok2str(ospf6_auth_type_str, "unknown (0x%04x)", EXTRACT_BE_U_2(cp))));
        cp += 2;
        /* Auth Data Len */
        cp += 2;
        /* Auth Data Len */
-       ND_TCHECK2(*cp, 2);
-       authdatalen = EXTRACT_16BITS(cp);
+       ND_TCHECK_2(cp);
+       authdatalen = EXTRACT_BE_U_2(cp);
        ND_PRINT((ndo, ", Length %u", authdatalen));
        if (authdatalen < OSPF6_AT_HDRLEN || authdatalen > len)
                goto trunc;
        cp += 2;
        /* Reserved */
        ND_PRINT((ndo, ", Length %u", authdatalen));
        if (authdatalen < OSPF6_AT_HDRLEN || authdatalen > len)
                goto trunc;
        cp += 2;
        /* Reserved */
-       ND_TCHECK2(*cp, 2);
+       ND_TCHECK_2(cp);
        cp += 2;
        /* Security Association ID */
        cp += 2;
        /* Security Association ID */
-       ND_TCHECK2(*cp, 2);
-       ND_PRINT((ndo, ", SAID %u", EXTRACT_16BITS(cp)));
+       ND_TCHECK_2(cp);
+       ND_PRINT((ndo, ", SAID %u", EXTRACT_BE_U_2(cp)));
        cp += 2;
        /* Cryptographic Sequence Number (High-Order 32 Bits) */
        cp += 2;
        /* Cryptographic Sequence Number (High-Order 32 Bits) */
-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ", CSN 0x%08x", EXTRACT_32BITS(cp)));
+       ND_TCHECK_4(cp);
+       ND_PRINT((ndo, ", CSN 0x%08x", EXTRACT_BE_U_4(cp)));
        cp += 4;
        /* Cryptographic Sequence Number (Low-Order 32 Bits) */
        cp += 4;
        /* Cryptographic Sequence Number (Low-Order 32 Bits) */
-       ND_TCHECK2(*cp, 4);
-       ND_PRINT((ndo, ":%08x", EXTRACT_32BITS(cp)));
+       ND_TCHECK_4(cp);
+       ND_PRINT((ndo, ":%08x", EXTRACT_BE_U_4(cp)));
        cp += 4;
        /* Authentication Data */
        cp += 4;
        /* Authentication Data */
-       ND_TCHECK2(*cp, authdatalen - OSPF6_AT_HDRLEN);
+       ND_TCHECK_LEN(cp, authdatalen - OSPF6_AT_HDRLEN);
        if (ndo->ndo_vflag > 1)
                print_unknown_data(ndo,cp, "\n\tAuthentication Data ", authdatalen - OSPF6_AT_HDRLEN);
        return 0;
        if (ndo->ndo_vflag > 1)
                print_unknown_data(ndo,cp, "\n\tAuthentication Data ", authdatalen - OSPF6_AT_HDRLEN);
        return 0;
@@ -926,12 +931,23 @@ static int
 ospf6_decode_v3_trailer(netdissect_options *ndo,
                         const struct ospf6hdr *op, const u_char *cp, const unsigned len)
 {
 ospf6_decode_v3_trailer(netdissect_options *ndo,
                         const struct ospf6hdr *op, const u_char *cp, const unsigned len)
 {
+       uint8_t type;
        int llslen = 0;
        int llslen = 0;
-       u_char lls_hello = op->ospf6_type == OSPF_TYPE_HELLO &&
-                          EXTRACT_32BITS(&op->ospf6_hello.hello_options) & OSPF6_OPTION_L;
-       u_char lls_dd    = op->ospf6_type == OSPF_TYPE_DD &&
-                          EXTRACT_32BITS(&op->ospf6_db.db_options) & OSPF6_OPTION_L;
-
+       int lls_hello = 0;
+       int lls_dd = 0;
+
+       type = EXTRACT_U_1(op->ospf6_type);
+       if (type == OSPF_TYPE_HELLO) {
+               const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);
+               ND_TCHECK(hellop->hello_options);
+               if (EXTRACT_BE_U_4(hellop->hello_options) & OSPF6_OPTION_L)
+                       lls_hello = 1;
+       } else if (type == OSPF_TYPE_DD) {
+               const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
+               ND_TCHECK(ddp->db_options);
+               if (EXTRACT_BE_U_4(ddp->db_options) & OSPF6_OPTION_L)
+                       lls_dd = 1;
+       }
        if ((lls_hello || lls_dd) && (llslen = ospf6_print_lls(ndo, cp, len)) < 0)
                goto trunc;
        return ospf6_decode_at(ndo, cp + llslen, len - llslen);
        if ((lls_hello || lls_dd) && (llslen = ospf6_print_lls(ndo, cp, len)) < 0)
                goto trunc;
        return ospf6_decode_at(ndo, cp + llslen, len - llslen);
@@ -942,20 +958,20 @@ trunc:
 
 void
 ospf6_print(netdissect_options *ndo,
 
 void
 ospf6_print(netdissect_options *ndo,
-            register const u_char *bp, register u_int length)
+            const u_char *bp, u_int length)
 {
 {
-       register const struct ospf6hdr *op;
-       register const u_char *dataend;
-       register const char *cp;
+       const struct ospf6hdr *op;
+       const u_char *dataend;
+       const char *cp;
        uint16_t datalen;
 
        uint16_t datalen;
 
-       op = (struct ospf6hdr *)bp;
+       op = (const struct ospf6hdr *)bp;
 
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
        ND_TCHECK(op->ospf6_type);
 
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
        ND_TCHECK(op->ospf6_type);
-       cp = tok2str(ospf6_type_values, "unknown packet type (%u)", op->ospf6_type);
-       ND_PRINT((ndo, "OSPFv%u, %s, length %d", op->ospf6_version, cp, length));
+       cp = tok2str(ospf6_type_values, "unknown packet type (%u)", EXTRACT_U_1(op->ospf6_type));
+       ND_PRINT((ndo, "OSPFv%u, %s, length %u", EXTRACT_U_1(op->ospf6_version), cp, length));
        if (*cp == 'u') {
                return;
        }
        if (*cp == 'u') {
                return;
        }
@@ -966,7 +982,7 @@ ospf6_print(netdissect_options *ndo,
 
        /* OSPFv3 data always comes first and optional trailing data may follow. */
        ND_TCHECK(op->ospf6_len);
 
        /* OSPFv3 data always comes first and optional trailing data may follow. */
        ND_TCHECK(op->ospf6_len);
-       datalen = EXTRACT_16BITS(&op->ospf6_len);
+       datalen = EXTRACT_BE_U_2(op->ospf6_len);
        if (datalen > length) {
                ND_PRINT((ndo, " [len %d]", datalen));
                return;
        if (datalen > length) {
                ND_PRINT((ndo, " [len %d]", datalen));
                return;
@@ -977,16 +993,16 @@ ospf6_print(netdissect_options *ndo,
        ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf6_routerid)));
 
        ND_TCHECK(op->ospf6_areaid);
        ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf6_routerid)));
 
        ND_TCHECK(op->ospf6_areaid);
-       if (EXTRACT_32BITS(&op->ospf6_areaid) != 0)
+       if (EXTRACT_BE_U_4(op->ospf6_areaid) != 0)
                ND_PRINT((ndo, ", Area %s", ipaddr_string(ndo, &op->ospf6_areaid)));
        else
                ND_PRINT((ndo, ", Backbone Area"));
        ND_TCHECK(op->ospf6_instanceid);
                ND_PRINT((ndo, ", Area %s", ipaddr_string(ndo, &op->ospf6_areaid)));
        else
                ND_PRINT((ndo, ", Backbone Area"));
        ND_TCHECK(op->ospf6_instanceid);
-       if (op->ospf6_instanceid)
-               ND_PRINT((ndo, ", Instance %u", op->ospf6_instanceid));
+       if (EXTRACT_U_1(op->ospf6_instanceid))
+               ND_PRINT((ndo, ", Instance %u", EXTRACT_U_1(op->ospf6_instanceid)));
 
        /* Do rest according to version.         */
 
        /* Do rest according to version.         */
-       switch (op->ospf6_version) {
+       switch (EXTRACT_U_1(op->ospf6_version)) {
 
        case 3:
                /* ospf version 3 */
 
        case 3:
                /* ospf version 3 */
[mirror] the TCPdump network dissector