]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use nd_ types.
[tcpdump] / print-ospf.c
diff --git a/print-ospf.c b/print-ospf.c
index e8bd31b9312c2b8dc17db5e86a7ce557abf6f247..921bed0cde7f8971e3615268a9d41594cacbce52 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -21,14 +21,15 @@
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Open Shortest Path First (OSPF) 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 "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "gmpls.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "gmpls.h"
@@ -65,7 +66,6 @@ static const struct tok ospf_rla_flag_values[] = {
 };
 
 static const struct tok type2str[] = {
 };
 
 static const struct tok type2str[] = {
-       { OSPF_TYPE_UMD,        "UMD" },
        { OSPF_TYPE_HELLO,      "Hello" },
        { OSPF_TYPE_DD,         "Database Description" },
        { OSPF_TYPE_LS_REQ,     "LS-Request" },
        { OSPF_TYPE_HELLO,      "Hello" },
        { OSPF_TYPE_DD,         "Database Description" },
        { OSPF_TYPE_LS_REQ,     "LS-Request" },
@@ -181,19 +181,19 @@ static const struct tok ospf_lls_eo_options[] = {
 
 int
 ospf_print_grace_lsa(netdissect_options *ndo,
 
 int
 ospf_print_grace_lsa(netdissect_options *ndo,
-                     const u_int8_t *tptr, u_int ls_length) {
-
+                     const uint8_t *tptr, u_int ls_length)
+{
     u_int tlv_type, tlv_length;
 
 
     while (ls_length > 0) {
     u_int tlv_type, tlv_length;
 
 
     while (ls_length > 0) {
-        ND_TCHECK2(*tptr, 4);
+        ND_TCHECK_4(tptr);
         if (ls_length < 4) {
             ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
             return -1;
         }
         if (ls_length < 4) {
             ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
             return -1;
         }
-        tlv_type = EXTRACT_16BITS(tptr);
-        tlv_length = EXTRACT_16BITS(tptr+2);
+        tlv_type = EXTRACT_BE_U_2(tptr);
+        tlv_length = EXTRACT_BE_U_2(tptr + 2);
         tptr+=4;
         ls_length-=4;
 
         tptr+=4;
         ls_length-=4;
 
@@ -213,7 +213,7 @@ ospf_print_grace_lsa(netdissect_options *ndo,
             return -1;
         }
 
             return -1;
         }
 
-        ND_TCHECK2(*tptr, tlv_length);
+        ND_TCHECK_LEN(tptr, tlv_length);
         switch(tlv_type) {
 
         case LS_OPAQUE_GRACE_TLV_PERIOD:
         switch(tlv_type) {
 
         case LS_OPAQUE_GRACE_TLV_PERIOD:
@@ -221,7 +221,7 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
                 return -1;
             }
                 ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
                 return -1;
             }
-            ND_PRINT((ndo, "%us", EXTRACT_32BITS(tptr)));
+            ND_PRINT((ndo, "%us", EXTRACT_BE_U_4(tptr)));
             break;
 
         case LS_OPAQUE_GRACE_TLV_REASON:
             break;
 
         case LS_OPAQUE_GRACE_TLV_REASON:
@@ -230,8 +230,8 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 return -1;
             }
             ND_PRINT((ndo, "%s (%u)",
                 return -1;
             }
             ND_PRINT((ndo, "%s (%u)",
-                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", *tptr),
-                   *tptr));
+                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", EXTRACT_U_1(tptr)),
+                   EXTRACT_U_1(tptr)));
             break;
 
         case LS_OPAQUE_GRACE_TLV_INT_ADDRESS:
             break;
 
         case LS_OPAQUE_GRACE_TLV_INT_ADDRESS:
@@ -264,23 +264,23 @@ trunc:
 
 int
 ospf_print_te_lsa(netdissect_options *ndo,
 
 int
 ospf_print_te_lsa(netdissect_options *ndo,
-                  const u_int8_t *tptr, u_int ls_length) {
-
+                  const uint8_t *tptr, u_int ls_length)
+{
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
     union { /* int to float conversion buffer for several subTLVs */
         float f;
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
     union { /* int to float conversion buffer for several subTLVs */
         float f;
-        u_int32_t i;
+        uint32_t i;
     } bw;
 
     while (ls_length != 0) {
     } bw;
 
     while (ls_length != 0) {
-        ND_TCHECK2(*tptr, 4);
+        ND_TCHECK_4(tptr);
         if (ls_length < 4) {
             ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
             return -1;
         }
         if (ls_length < 4) {
             ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
             return -1;
         }
-        tlv_type = EXTRACT_16BITS(tptr);
-        tlv_length = EXTRACT_16BITS(tptr+2);
+        tlv_type = EXTRACT_BE_U_2(tptr);
+        tlv_length = EXTRACT_BE_U_2(tptr + 2);
         tptr+=4;
         ls_length-=4;
 
         tptr+=4;
         ls_length-=4;
 
@@ -308,93 +308,151 @@ ospf_print_te_lsa(netdissect_options *ndo,
                            tlv_length));
                     return -1;
                 }
                            tlv_length));
                     return -1;
                 }
-                ND_TCHECK2(*tptr, 4);
-                subtlv_type = EXTRACT_16BITS(tptr);
-                subtlv_length = EXTRACT_16BITS(tptr+2);
+                ND_TCHECK_4(tptr);
+                subtlv_type = EXTRACT_BE_U_2(tptr);
+                subtlv_length = EXTRACT_BE_U_2(tptr + 2);
                 tptr+=4;
                 tlv_length-=4;
 
                 tptr+=4;
                 tlv_length-=4;
 
+               /* Infinite loop protection */
+               if (subtlv_type == 0 || subtlv_length == 0)
+                   goto invalid;
+
                 ND_PRINT((ndo, "\n\t      %s subTLV (%u), length: %u",
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
                        subtlv_length));
 
                 ND_PRINT((ndo, "\n\t      %s subTLV (%u), length: %u",
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
                        subtlv_length));
 
-                ND_TCHECK2(*tptr, subtlv_length);
+                ND_TCHECK_LEN(tptr, subtlv_length);
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
-                    ND_PRINT((ndo, ", 0x%08x", EXTRACT_32BITS(tptr)));
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
+                    ND_PRINT((ndo, ", 0x%08x", EXTRACT_BE_U_4(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID:
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID:
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID:
+                   if (subtlv_length != 4 && subtlv_length != 8) {
+                       ND_PRINT((ndo, " != 4 && != 8"));
+                       goto invalid;
+                   }
                     ND_PRINT((ndo, ", %s (0x%08x)",
                            ipaddr_string(ndo, tptr),
                     ND_PRINT((ndo, ", %s (0x%08x)",
                            ipaddr_string(ndo, tptr),
-                           EXTRACT_32BITS(tptr)));
+                           EXTRACT_BE_U_4(tptr)));
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT((ndo, ", %s (0x%08x)",
                                ipaddr_string(ndo, tptr+4),
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT((ndo, ", %s (0x%08x)",
                                ipaddr_string(ndo, tptr+4),
-                               EXTRACT_32BITS(tptr + 4)));
+                               EXTRACT_BE_U_4(tptr + 4)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                 case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                 case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
                     ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
                     ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
-                    bw.i = EXTRACT_32BITS(tptr);
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
+                    bw.i = EXTRACT_BE_U_4(tptr);
                     ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
                     ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
+                   if (subtlv_length != 32) {
+                       ND_PRINT((ndo, " != 32"));
+                       goto invalid;
+                   }
                     for (te_class = 0; te_class < 8; te_class++) {
                     for (te_class = 0; te_class < 8; te_class++) {
-                        bw.i = EXTRACT_32BITS(tptr+te_class*4);
+                        bw.i = EXTRACT_BE_U_4(tptr + te_class * 4);
                         ND_PRINT((ndo, "\n\t\tTE-Class %u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000));
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
                         ND_PRINT((ndo, "\n\t\tTE-Class %u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000));
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
+                   if (subtlv_length < 4) {
+                       ND_PRINT((ndo, " < 4"));
+                       goto invalid;
+                   }
+                   /* BC Model Id (1 octet) + Reserved (3 octets) */
                     ND_PRINT((ndo, "\n\t\tBandwidth Constraints Model ID: %s (%u)",
                     ND_PRINT((ndo, "\n\t\tBandwidth Constraints Model ID: %s (%u)",
-                           tok2str(diffserv_te_bc_values, "unknown", *tptr),
-                           *tptr));
+                           tok2str(diffserv_te_bc_values, "unknown", EXTRACT_U_1(tptr)),
+                           EXTRACT_U_1(tptr)));
+                   if (subtlv_length % 4 != 0) {
+                       ND_PRINT((ndo, "\n\t\tlength %u != N x 4", subtlv_length));
+                       goto invalid;
+                   }
+                   if (subtlv_length > 36) {
+                       ND_PRINT((ndo, "\n\t\tlength %u > 36", subtlv_length));
+                       goto invalid;
+                   }
                     /* decode BCs until the subTLV ends */
                     for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
                     /* decode BCs until the subTLV ends */
                     for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
-                        bw.i = EXTRACT_32BITS(tptr+4+te_class*4);
+                        bw.i = EXTRACT_BE_U_4(tptr + 4 + te_class * 4);
                         ND_PRINT((ndo, "\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000));
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
                         ND_PRINT((ndo, "\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000));
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
-                    ND_PRINT((ndo, ", Metric %u", EXTRACT_32BITS(tptr)));
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
+                    ND_PRINT((ndo, ", Metric %u", EXTRACT_BE_U_4(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
-                    ND_PRINT((ndo, ", %s, Priority %u",
-                           bittok2str(gmpls_link_prot_values, "none", *tptr),
-                           *(tptr + 1)));
+                   /* Protection Cap (1 octet) + Reserved ((3 octets) */
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
+                    ND_PRINT((ndo, ", %s",
+                             bittok2str(gmpls_link_prot_values, "none", EXTRACT_U_1(tptr))));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
+                   if (subtlv_length < 36) {
+                       ND_PRINT((ndo, " < 36"));
+                       goto invalid;
+                   }
+                   /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
                     ND_PRINT((ndo, "\n\t\tInterface Switching Capability: %s",
                     ND_PRINT((ndo, "\n\t\tInterface Switching Capability: %s",
-                           tok2str(gmpls_switch_cap_values, "Unknown", *(tptr))));
+                           tok2str(gmpls_switch_cap_values, "Unknown", EXTRACT_U_1((tptr)))));
                     ND_PRINT((ndo, "\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
                     ND_PRINT((ndo, "\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
-                           tok2str(gmpls_encoding_values, "Unknown", *(tptr + 1))));
+                           tok2str(gmpls_encoding_values, "Unknown", EXTRACT_U_1((tptr + 1)))));
                     for (priority_level = 0; priority_level < 8; priority_level++) {
                     for (priority_level = 0; priority_level < 8; priority_level++) {
-                        bw.i = EXTRACT_32BITS(tptr+4+(priority_level*4));
+                        bw.i = EXTRACT_BE_U_4(tptr + 4 + (priority_level * 4));
                         ND_PRINT((ndo, "\n\t\t  priority level %d: %.3f Mbps",
                                priority_level,
                                bw.f * 8 / 1000000));
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
                         ND_PRINT((ndo, "\n\t\t  priority level %d: %.3f Mbps",
                                priority_level,
                                bw.f * 8 / 1000000));
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
+                   if (subtlv_length != 1) {
+                       ND_PRINT((ndo, " != 1"));
+                       goto invalid;
+                   }
                     ND_PRINT((ndo, ", %s (%u)",
                     ND_PRINT((ndo, ", %s (%u)",
-                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",*tptr),
-                           *tptr));
+                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",EXTRACT_U_1(tptr)),
+                           EXTRACT_U_1(tptr)));
                     break;
 
                 case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
                     break;
 
                 case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
+                   if (subtlv_length % 4 != 0) {
+                       ND_PRINT((ndo, " != N x 4"));
+                       goto invalid;
+                   }
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
                         ND_PRINT((ndo, "\n\t\t  Shared risk group: "));
                     while (count_srlg > 0) {
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
                         ND_PRINT((ndo, "\n\t\t  Shared risk group: "));
                     while (count_srlg > 0) {
-                        bw.i = EXTRACT_32BITS(tptr);
+                        bw.i = EXTRACT_BE_U_4(tptr);
                         ND_PRINT((ndo, "%d", bw.i));
                         tptr+=4;
                         count_srlg--;
                         ND_PRINT((ndo, "%d", bw.i));
                         tptr+=4;
                         count_srlg--;
@@ -425,7 +483,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                 ND_PRINT((ndo, "\n\t    TLV length %u < 4", tlv_length));
                 return -1;
             }
                 ND_PRINT((ndo, "\n\t    TLV length %u < 4", tlv_length));
                 return -1;
             }
-            ND_TCHECK2(*tptr, 4);
+            ND_TCHECK_4(tptr);
             ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
             break;
 
             ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
             break;
 
@@ -445,16 +503,20 @@ ospf_print_te_lsa(netdissect_options *ndo,
     return 0;
 trunc:
     return -1;
     return 0;
 trunc:
     return -1;
+invalid:
+    ND_PRINT((ndo, "%s", istr));
+    return -1;
 }
 
 static int
 ospf_print_lshdr(netdissect_options *ndo,
 }
 
 static int
 ospf_print_lshdr(netdissect_options *ndo,
-                 register const struct lsa_hdr *lshp)
+                 const struct lsa_hdr *lshp)
 {
 {
+        u_int ls_type;
         u_int ls_length;
 
         ND_TCHECK(lshp->ls_length);
         u_int ls_length;
 
         ND_TCHECK(lshp->ls_length);
-        ls_length = EXTRACT_16BITS(&lshp->ls_length);
+        ls_length = EXTRACT_BE_U_2(lshp->ls_length);
         if (ls_length < sizeof(struct lsa_hdr)) {
                 ND_PRINT((ndo, "\n\t    Bogus length %u < header (%lu)", ls_length,
                     (unsigned long)sizeof(struct lsa_hdr)));
         if (ls_length < sizeof(struct lsa_hdr)) {
                 ND_PRINT((ndo, "\n\t    Bogus length %u < header (%lu)", ls_length,
                     (unsigned long)sizeof(struct lsa_hdr)));
@@ -464,25 +526,26 @@ ospf_print_lshdr(netdissect_options *ndo,
         ND_TCHECK(lshp->ls_seq); /* XXX - ls_length check checked this */
         ND_PRINT((ndo, "\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
                   ipaddr_string(ndo, &lshp->ls_router),
         ND_TCHECK(lshp->ls_seq); /* XXX - ls_length check checked this */
         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_BE_U_4(lshp->ls_seq),
+                  EXTRACT_BE_U_2(lshp->ls_age),
                   ls_length - (u_int)sizeof(struct lsa_hdr)));
 
         ND_TCHECK(lshp->ls_type); /* XXX - ls_length check checked this */
                   ls_length - (u_int)sizeof(struct lsa_hdr)));
 
         ND_TCHECK(lshp->ls_type); /* XXX - ls_length check checked this */
-        switch (lshp->ls_type) {
+        ls_type = EXTRACT_U_1(lshp->ls_type);
+        switch (ls_type) {
         /* the LSA header for opaque LSAs was slightly changed */
         case LS_TYPE_OPAQUE_LL:
         case LS_TYPE_OPAQUE_AL:
         case LS_TYPE_OPAQUE_DW:
             ND_PRINT((ndo, "\n\t    %s LSA (%d), Opaque-Type %s LSA (%u), Opaque-ID %u",
         /* the LSA header for opaque LSAs was slightly changed */
         case LS_TYPE_OPAQUE_LL:
         case LS_TYPE_OPAQUE_AL:
         case LS_TYPE_OPAQUE_DW:
             ND_PRINT((ndo, "\n\t    %s LSA (%d), Opaque-Type %s LSA (%u), Opaque-ID %u",
-                   tok2str(lsa_values,"unknown",lshp->ls_type),
-                   lshp->ls_type,
+                   tok2str(lsa_values,"unknown",ls_type),
+                   ls_type,
 
                   tok2str(lsa_opaque_values,
                           "unknown",
 
                   tok2str(lsa_opaque_values,
                           "unknown",
-                          *(&lshp->un_lsa_id.opaque_field.opaque_type)),
-                  *(&lshp->un_lsa_id.opaque_field.opaque_type),
-                  EXTRACT_24BITS(&lshp->un_lsa_id.opaque_field.opaque_id)
+                          EXTRACT_U_1(lshp->un_lsa_id.opaque_field.opaque_type)),
+                  EXTRACT_U_1(lshp->un_lsa_id.opaque_field.opaque_type),
+                  EXTRACT_BE_U_3(lshp->un_lsa_id.opaque_field.opaque_id)
 
                    ));
             break;
 
                    ));
             break;
@@ -490,14 +553,14 @@ ospf_print_lshdr(netdissect_options *ndo,
         /* all other LSA types use regular style LSA headers */
         default:
             ND_PRINT((ndo, "\n\t    %s LSA (%d), LSA-ID: %s",
         /* all other LSA types use regular style LSA headers */
         default:
             ND_PRINT((ndo, "\n\t    %s LSA (%d), LSA-ID: %s",
-                   tok2str(lsa_values,"unknown",lshp->ls_type),
-                   lshp->ls_type,
+                   tok2str(lsa_values,"unknown",ls_type),
+                   ls_type,
                    ipaddr_string(ndo, &lshp->un_lsa_id.lsa_id)));
             break;
         }
 
         ND_TCHECK(lshp->ls_options); /* XXX - ls_length check checked this */
                    ipaddr_string(ndo, &lshp->un_lsa_id.lsa_id)));
             break;
         }
 
         ND_TCHECK(lshp->ls_options); /* XXX - ls_length check checked this */
-        ND_PRINT((ndo, "\n\t    Options: [%s]", bittok2str(ospf_option_values, "none", lshp->ls_options)));
+        ND_PRINT((ndo, "\n\t    Options: [%s]", bittok2str(ospf_option_values, "none", EXTRACT_U_1(lshp->ls_options))));
 
         return (ls_length);
 trunc:
 
         return (ls_length);
 trunc:
@@ -506,38 +569,44 @@ trunc:
 
 /* draft-ietf-ospf-mt-09 */
 static const struct tok ospf_topology_values[] = {
 
 /* draft-ietf-ospf-mt-09 */
 static const struct tok ospf_topology_values[] = {
-    { 0, "default " },
-    { 1, "multicast " },
-    { 2, "management " },
+    { 0, "default" },
+    { 1, "multicast" },
+    { 2, "management" },
     { 0, NULL }
 };
 
 /*
  * Print all the per-topology metrics.
  */
     { 0, NULL }
 };
 
 /*
  * Print all the per-topology metrics.
  */
-static void
+static int
 ospf_print_tos_metrics(netdissect_options *ndo,
                        const union un_tos *tos)
 {
 ospf_print_tos_metrics(netdissect_options *ndo,
                        const union un_tos *tos)
 {
-    int metric_count;
-    int toscount;
+    u_int metric_count;
+    u_int toscount;
+    u_int tos_type;
 
 
-    toscount = tos->link.link_tos_count+1;
+    toscount = EXTRACT_U_1(tos->link.link_tos_count)+1;
     metric_count = 0;
 
     /*
      * All but the first metric contain a valid topology id.
      */
     metric_count = 0;
 
     /*
      * All but the first metric contain a valid topology id.
      */
-    while (toscount) {
-        ND_PRINT((ndo, "\n\t\ttopology %s(%u), metric %u",
-               tok2str(ospf_topology_values, "",
-                       metric_count ? tos->metrics.tos_type : 0),
-               metric_count ? tos->metrics.tos_type : 0,
-               EXTRACT_16BITS(&tos->metrics.tos_metric)));
+    while (toscount != 0) {
+        ND_TCHECK(*tos);
+        tos_type = EXTRACT_U_1(tos->metrics.tos_type);
+        ND_PRINT((ndo, "\n\t\ttopology %s (%u), metric %u",
+               tok2str(ospf_topology_values, "Unknown",
+                       metric_count ? tos_type : 0),
+               metric_count ? tos_type : 0,
+               EXTRACT_BE_U_2(tos->metrics.tos_metric)));
         metric_count++;
         tos++;
         toscount--;
     }
         metric_count++;
         tos++;
         toscount--;
     }
+    return 0;
+trunc:
+    return 1;
 }
 
 /*
 }
 
 /*
@@ -545,41 +614,41 @@ ospf_print_tos_metrics(netdissect_options *ndo,
  * field is less than the length of the LSA header, return NULl, else
  * return pointer to data past end of LSA.
  */
  * field is less than the length of the LSA header, return NULl, else
  * return pointer to data past end of LSA.
  */
-static const u_int8_t *
+static const uint8_t *
 ospf_print_lsa(netdissect_options *ndo,
 ospf_print_lsa(netdissect_options *ndo,
-               register const struct lsa *lsap)
+               const struct lsa *lsap)
 {
 {
-       register const u_int8_t *ls_end;
-       register const struct rlalink *rlp;
-       register const struct in_addr *ap;
-       register const struct aslametric *almp;
-       register const struct mcla *mcp;
-       register const u_int32_t *lp;
-       register int j, tlv_type, tlv_length, topology;
-       register int ls_length;
-       const u_int8_t *tptr;
-
-       tptr = (u_int8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
+       const uint8_t *ls_end;
+       const struct rlalink *rlp;
+       const struct in_addr *ap;
+       const struct aslametric *almp;
+       const struct mcla *mcp;
+       const uint8_t *lp;
+       int j, tlv_type, tlv_length, topology;
+       int ls_length;
+       const uint8_t *tptr;
+
+       tptr = (const uint8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
         ls_length = ospf_print_lshdr(ndo, &lsap->ls_hdr);
         if (ls_length == -1)
                 return(NULL);
         ls_length = ospf_print_lshdr(ndo, &lsap->ls_hdr);
         if (ls_length == -1)
                 return(NULL);
-       ls_end = (u_int8_t *)lsap + ls_length;
+       ls_end = (const uint8_t *)lsap + ls_length;
        ls_length -= sizeof(struct lsa_hdr);
 
        ls_length -= sizeof(struct lsa_hdr);
 
-       switch (lsap->ls_hdr.ls_type) {
+       switch (EXTRACT_U_1(lsap->ls_hdr.ls_type)) {
 
        case LS_TYPE_ROUTER:
                ND_TCHECK(lsap->lsa_un.un_rla.rla_flags);
                ND_PRINT((ndo, "\n\t    Router LSA Options: [%s]",
 
        case LS_TYPE_ROUTER:
                ND_TCHECK(lsap->lsa_un.un_rla.rla_flags);
                ND_PRINT((ndo, "\n\t    Router LSA Options: [%s]",
-                         bittok2str(ospf_rla_flag_values, "none", lsap->lsa_un.un_rla.rla_flags)));
+                         bittok2str(ospf_rla_flag_values, "none", EXTRACT_U_1(lsap->lsa_un.un_rla.rla_flags))));
 
                ND_TCHECK(lsap->lsa_un.un_rla.rla_count);
 
                ND_TCHECK(lsap->lsa_un.un_rla.rla_count);
-               j = EXTRACT_16BITS(&lsap->lsa_un.un_rla.rla_count);
+               j = EXTRACT_BE_U_2(lsap->lsa_un.un_rla.rla_count);
                ND_TCHECK(lsap->lsa_un.un_rla.rla_link);
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (j--) {
                        ND_TCHECK(*rlp);
                ND_TCHECK(lsap->lsa_un.un_rla.rla_link);
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (j--) {
                        ND_TCHECK(*rlp);
-                       switch (rlp->un_tos.link.link_type) {
+                       switch (EXTRACT_U_1(rlp->un_tos.link.link_type)) {
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT((ndo, "\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT((ndo, "\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
@@ -607,14 +676,15 @@ ospf_print_lsa(netdissect_options *ndo,
 
                        default:
                                ND_PRINT((ndo, "\n\t      Unknown Router Link Type (%u)",
 
                        default:
                                ND_PRINT((ndo, "\n\t      Unknown Router Link Type (%u)",
-                                   rlp->un_tos.link.link_type));
+                                   EXTRACT_U_1(rlp->un_tos.link.link_type)));
                                return (ls_end);
                        }
 
                                return (ls_end);
                        }
 
-                       ospf_print_tos_metrics(ndo, &rlp->un_tos);
+                       if (ospf_print_tos_metrics(ndo, &rlp->un_tos))
+                               goto trunc;
 
 
-                       rlp = (struct rlalink *)((u_char *)(rlp + 1) +
-                           ((rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
+                       rlp = (const struct rlalink *)((const u_char *)(rlp + 1) +
+                           (EXTRACT_U_1(rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
                }
                break;
 
                }
                break;
 
@@ -623,7 +693,7 @@ ospf_print_lsa(netdissect_options *ndo,
                ND_PRINT((ndo, "\n\t    Mask %s\n\t    Connected Routers:",
                    ipaddr_string(ndo, &lsap->lsa_un.un_nla.nla_mask)));
                ap = lsap->lsa_un.un_nla.nla_router;
                ND_PRINT((ndo, "\n\t    Mask %s\n\t    Connected Routers:",
                    ipaddr_string(ndo, &lsap->lsa_un.un_nla.nla_mask)));
                ap = lsap->lsa_un.un_nla.nla_router;
-               while ((u_char *)ap < ls_end) {
+               while ((const u_char *)ap < ls_end) {
                        ND_TCHECK(*ap);
                        ND_PRINT((ndo, "\n\t      %s", ipaddr_string(ndo, ap)));
                        ++ap;
                        ND_TCHECK(*ap);
                        ND_PRINT((ndo, "\n\t      %s", ipaddr_string(ndo, ap)));
                        ++ap;
@@ -635,35 +705,35 @@ ospf_print_lsa(netdissect_options *ndo,
                ND_PRINT((ndo, "\n\t    Mask %s",
                    ipaddr_string(ndo, &lsap->lsa_un.un_sla.sla_mask)));
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                ND_PRINT((ndo, "\n\t    Mask %s",
                    ipaddr_string(ndo, &lsap->lsa_un.un_sla.sla_mask)));
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
-               lp = lsap->lsa_un.un_sla.sla_tosmetric;
-               while ((u_char *)lp < ls_end) {
-                       register u_int32_t ul;
+               lp = (const uint8_t *)lsap->lsa_un.un_sla.sla_tosmetric;
+               while (lp < ls_end) {
+                       uint32_t ul;
 
 
-                       ND_TCHECK(*lp);
-                       ul = EXTRACT_32BITS(lp);
+                       ND_TCHECK_4(lp);
+                       ul = EXTRACT_BE_U_4(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
-                       ND_PRINT((ndo, "\n\t\ttopology %s(%u) metric %d",
-                               tok2str(ospf_topology_values, "", topology),
+                       ND_PRINT((ndo, "\n\t\ttopology %s (%u) metric %d",
+                               tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                ul & SLA_MASK_METRIC));
                                topology,
                                ul & SLA_MASK_METRIC));
-                       ++lp;
+                       lp += 4;
                }
                break;
 
        case LS_TYPE_SUM_ABR:
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                }
                break;
 
        case LS_TYPE_SUM_ABR:
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
-               lp = lsap->lsa_un.un_sla.sla_tosmetric;
-               while ((u_char *)lp < ls_end) {
-                       register u_int32_t ul;
+               lp = (const uint8_t *)lsap->lsa_un.un_sla.sla_tosmetric;
+               while (lp < ls_end) {
+                       uint32_t ul;
 
 
-                       ND_TCHECK(*lp);
-                       ul = EXTRACT_32BITS(lp);
+                       ND_TCHECK_4(lp);
+                       ul = EXTRACT_BE_U_4(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
-                       ND_PRINT((ndo, "\n\t\ttopology %s(%u) metric %d",
-                               tok2str(ospf_topology_values, "", topology),
+                       ND_PRINT((ndo, "\n\t\ttopology %s (%u) metric %d",
+                               tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                ul & SLA_MASK_METRIC));
                                topology,
                                ul & SLA_MASK_METRIC));
-                       ++lp;
+                       lp += 4;
                }
                break;
 
                }
                break;
 
@@ -675,14 +745,14 @@ ospf_print_lsa(netdissect_options *ndo,
 
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
 
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
-               while ((u_char *)almp < ls_end) {
-                       register u_int32_t ul;
+               while ((const u_char *)almp < ls_end) {
+                       uint32_t ul;
 
                        ND_TCHECK(almp->asla_tosmetric);
 
                        ND_TCHECK(almp->asla_tosmetric);
-                       ul = EXTRACT_32BITS(&almp->asla_tosmetric);
+                       ul = EXTRACT_BE_U_4(almp->asla_tosmetric);
                         topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
                         topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
-                       ND_PRINT((ndo, "\n\t\ttopology %s(%u), type %d, metric",
-                               tok2str(ospf_topology_values, "", topology),
+                       ND_PRINT((ndo, "\n\t\ttopology %s (%u), type %d, metric",
+                               tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1));
                        if ((ul & ASLA_MASK_METRIC) == 0xffffff)
                                topology,
                                (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1));
                        if ((ul & ASLA_MASK_METRIC) == 0xffffff)
@@ -705,9 +775,9 @@ ospf_print_lsa(netdissect_options *ndo,
        case LS_TYPE_GROUP:
                /* Multicast extensions as of 23 July 1991 */
                mcp = lsap->lsa_un.un_mcla;
        case LS_TYPE_GROUP:
                /* Multicast extensions as of 23 July 1991 */
                mcp = lsap->lsa_un.un_mcla;
-               while ((u_char *)mcp < ls_end) {
+               while ((const u_char *)mcp < ls_end) {
                        ND_TCHECK(mcp->mcla_vid);
                        ND_TCHECK(mcp->mcla_vid);
-                       switch (EXTRACT_32BITS(&mcp->mcla_vtype)) {
+                       switch (EXTRACT_BE_U_4(mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
                                ND_PRINT((ndo, "\n\t    Router Router-ID %s",
 
                        case MCLA_VERTEX_ROUTER:
                                ND_PRINT((ndo, "\n\t    Router Router-ID %s",
@@ -721,7 +791,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
                        default:
                                ND_PRINT((ndo, "\n\t    unknown VertexType (%u)",
 
                        default:
                                ND_PRINT((ndo, "\n\t    unknown VertexType (%u)",
-                                   EXTRACT_32BITS(&mcp->mcla_vtype)));
+                                   EXTRACT_BE_U_4(mcp->mcla_vtype)));
                                break;
                        }
                ++mcp;
                                break;
                        }
                ++mcp;
@@ -732,18 +802,18 @@ ospf_print_lsa(netdissect_options *ndo,
        case LS_TYPE_OPAQUE_AL:
        case LS_TYPE_OPAQUE_DW:
 
        case LS_TYPE_OPAQUE_AL:
        case LS_TYPE_OPAQUE_DW:
 
-           switch (*(&lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
+           switch (EXTRACT_U_1(lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
             case LS_OPAQUE_TYPE_RI:
             case LS_OPAQUE_TYPE_RI:
-               tptr = (u_int8_t *)(&lsap->lsa_un.un_ri_tlv.type);
+               tptr = (const uint8_t *)(lsap->lsa_un.un_ri_tlv);
 
                while (ls_length != 0) {
 
                while (ls_length != 0) {
-                    ND_TCHECK2(*tptr, 4);
+                    ND_TCHECK_4(tptr);
                    if (ls_length < 4) {
                         ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
                         return(ls_end);
                     }
                    if (ls_length < 4) {
                         ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
                         return(ls_end);
                     }
-                    tlv_type = EXTRACT_16BITS(tptr);
-                    tlv_length = EXTRACT_16BITS(tptr+2);
+                    tlv_type = EXTRACT_BE_U_2(tptr);
+                    tlv_length = EXTRACT_BE_U_2(tptr + 2);
                     tptr+=4;
                     ls_length-=4;
 
                     tptr+=4;
                     ls_length-=4;
 
@@ -757,7 +827,7 @@ ospf_print_lsa(netdissect_options *ndo,
                             ls_length));
                         return(ls_end);
                     }
                             ls_length));
                         return(ls_end);
                     }
-                    ND_TCHECK2(*tptr, tlv_length);
+                    ND_TCHECK_LEN(tptr, tlv_length);
                     switch(tlv_type) {
 
                     case LS_OPAQUE_RI_TLV_CAP:
                     switch(tlv_type) {
 
                     case LS_OPAQUE_RI_TLV_CAP:
@@ -766,7 +836,7 @@ ospf_print_lsa(netdissect_options *ndo,
                             return(ls_end);
                         }
                         ND_PRINT((ndo, "Capabilities: %s",
                             return(ls_end);
                         }
                         ND_PRINT((ndo, "Capabilities: %s",
-                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_32BITS(tptr))));
+                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_BE_U_4(tptr))));
                         break;
                     default:
                         if (ndo->ndo_vflag <= 1) {
                         break;
                     default:
                         if (ndo->ndo_vflag <= 1) {
@@ -782,14 +852,14 @@ ospf_print_lsa(netdissect_options *ndo,
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
-                if (ospf_print_grace_lsa(ndo, (u_int8_t *)(&lsap->lsa_un.un_grace_tlv.type),
+                if (ospf_print_grace_lsa(ndo, (const uint8_t *)(lsap->lsa_un.un_grace_tlv),
                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:
                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:
-                if (ospf_print_te_lsa(ndo, (u_int8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type),
+                if (ospf_print_te_lsa(ndo, (const uint8_t *)(lsap->lsa_un.un_te_lsa_tlv),
                                       ls_length) == -1) {
                     return(ls_end);
                 }
                                       ls_length) == -1) {
                     return(ls_end);
                 }
@@ -797,7 +867,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
             default:
                 if (ndo->ndo_vflag <= 1) {
 
             default:
                 if (ndo->ndo_vflag <= 1) {
-                    if (!print_unknown_data(ndo, (u_int8_t *)lsap->lsa_un.un_unknown,
+                    if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown,
                                            "\n\t    ", ls_length))
                         return(ls_end);
                 }
                                            "\n\t    ", ls_length))
                         return(ls_end);
                 }
@@ -807,7 +877,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
         /* do we want to see an additionally hexdump ? */
         if (ndo->ndo_vflag> 1)
 
         /* do we want to see an additionally hexdump ? */
         if (ndo->ndo_vflag> 1)
-            if (!print_unknown_data(ndo, (u_int8_t *)lsap->lsa_un.un_unknown,
+            if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown,
                                    "\n\t    ", ls_length)) {
                 return(ls_end);
             }
                                    "\n\t    ", ls_length)) {
                 return(ls_end);
             }
@@ -819,23 +889,23 @@ trunc:
 
 static int
 ospf_decode_lls(netdissect_options *ndo,
 
 static int
 ospf_decode_lls(netdissect_options *ndo,
-                register const struct ospfhdr *op, register u_int length)
+                const struct ospfhdr *op, u_int length)
 {
 {
-    register const u_char *dptr;
-    register const u_char *dataend;
-    register u_int length2;
-    register u_int16_t lls_type, lls_len;
-    register u_int32_t lls_flags;
+    const u_char *dptr;
+    const u_char *dataend;
+    u_int length2;
+    uint16_t lls_type, lls_len;
+    uint32_t lls_flags;
 
 
-    switch (op->ospf_type) {
+    switch (EXTRACT_U_1(op->ospf_type)) {
 
     case OSPF_TYPE_HELLO:
 
     case OSPF_TYPE_HELLO:
-        if (!(op->ospf_hello.hello_options & OSPF_OPTION_L))
+        if (!(EXTRACT_U_1(op->ospf_hello.hello_options) & OSPF_OPTION_L))
             return (0);
         break;
 
     case OSPF_TYPE_DD:
             return (0);
         break;
 
     case OSPF_TYPE_DD:
-        if (!(op->ospf_db.db_options & OSPF_OPTION_L))
+        if (!(EXTRACT_U_1(op->ospf_db.db_options) & OSPF_OPTION_L))
             return (0);
         break;
 
             return (0);
         break;
 
@@ -844,11 +914,11 @@ ospf_decode_lls(netdissect_options *ndo,
     }
 
     /* dig deeper if LLS data is available; see RFC4813 */
     }
 
     /* dig deeper if LLS data is available; see RFC4813 */
-    length2 = EXTRACT_16BITS(&op->ospf_len);
-    dptr = (u_char *)op + length2;
-    dataend = (u_char *)op + length;
+    length2 = EXTRACT_BE_U_2(op->ospf_len);
+    dptr = (const u_char *)op + length2;
+    dataend = (const u_char *)op + length;
 
 
-    if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
+    if (EXTRACT_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
         dptr = dptr + op->ospf_authdata[3];
         length2 += op->ospf_authdata[3];
     }
         dptr = dptr + op->ospf_authdata[3];
         length2 += op->ospf_authdata[3];
     }
@@ -856,25 +926,25 @@ ospf_decode_lls(netdissect_options *ndo,
         ND_PRINT((ndo, "\n\t[LLS truncated]"));
         return (1);
     }
         ND_PRINT((ndo, "\n\t[LLS truncated]"));
         return (1);
     }
-    ND_TCHECK2(*dptr, 2);
-    ND_PRINT((ndo, "\n\t  LLS: checksum: 0x%04x", (u_int)EXTRACT_16BITS(dptr)));
+    ND_TCHECK_2(dptr);
+    ND_PRINT((ndo, "\n\t  LLS: checksum: 0x%04x", (u_int) EXTRACT_BE_U_2(dptr)));
 
     dptr += 2;
 
     dptr += 2;
-    ND_TCHECK2(*dptr, 2);
-    length2 = EXTRACT_16BITS(dptr);
+    ND_TCHECK_2(dptr);
+    length2 = EXTRACT_BE_U_2(dptr);
     ND_PRINT((ndo, ", length: %u", length2));
 
     dptr += 2;
     ND_PRINT((ndo, ", length: %u", length2));
 
     dptr += 2;
-    ND_TCHECK(*dptr);
+    ND_TCHECK_1(dptr);
     while (dptr < dataend) {
     while (dptr < dataend) {
-        ND_TCHECK2(*dptr, 2);
-        lls_type = EXTRACT_16BITS(dptr);
+        ND_TCHECK_2(dptr);
+        lls_type = EXTRACT_BE_U_2(dptr);
         ND_PRINT((ndo, "\n\t    %s (%u)",
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                lls_type));
         dptr += 2;
         ND_PRINT((ndo, "\n\t    %s (%u)",
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                lls_type));
         dptr += 2;
-        ND_TCHECK2(*dptr, 2);
-        lls_len = EXTRACT_16BITS(dptr);
+        ND_TCHECK_2(dptr);
+        lls_len = EXTRACT_BE_U_2(dptr);
         ND_PRINT((ndo, ", length: %u", lls_len));
         dptr += 2;
         switch (lls_type) {
         ND_PRINT((ndo, ", length: %u", lls_len));
         dptr += 2;
         switch (lls_type) {
@@ -884,8 +954,8 @@ ospf_decode_lls(netdissect_options *ndo,
                 ND_PRINT((ndo, " [should be 4]"));
                 lls_len = 4;
             }
                 ND_PRINT((ndo, " [should be 4]"));
                 lls_len = 4;
             }
-            ND_TCHECK2(*dptr, 4);
-            lls_flags = EXTRACT_32BITS(dptr);
+            ND_TCHECK_4(dptr);
+            lls_flags = EXTRACT_BE_U_4(dptr);
             ND_PRINT((ndo, "\n\t      Options: 0x%08x [%s]", lls_flags,
                    bittok2str(ospf_lls_eo_options, "?", lls_flags)));
 
             ND_PRINT((ndo, "\n\t      Options: 0x%08x [%s]", lls_flags,
                    bittok2str(ospf_lls_eo_options, "?", lls_flags)));
 
@@ -896,8 +966,8 @@ ospf_decode_lls(netdissect_options *ndo,
                 ND_PRINT((ndo, " [should be 20]"));
                 lls_len = 20;
             }
                 ND_PRINT((ndo, " [should be 20]"));
                 lls_len = 20;
             }
-            ND_TCHECK2(*dptr, 4);
-            ND_PRINT((ndo, "\n\t      Sequence number: 0x%08x", EXTRACT_32BITS(dptr)));
+            ND_TCHECK_4(dptr);
+            ND_PRINT((ndo, "\n\t      Sequence number: 0x%08x", EXTRACT_BE_U_4(dptr)));
             break;
         }
 
             break;
         }
 
@@ -911,33 +981,27 @@ trunc:
 
 static int
 ospf_decode_v2(netdissect_options *ndo,
 
 static int
 ospf_decode_v2(netdissect_options *ndo,
-               register const struct ospfhdr *op, register const u_char *dataend)
+               const struct ospfhdr *op, const u_char *dataend)
 {
 {
-       register const struct in_addr *ap;
-       register const struct lsr *lsrp;
-       register const struct lsa_hdr *lshp;
-       register const struct lsa *lsap;
-       register u_int32_t lsa_count,lsa_count_max;
-
-       switch (op->ospf_type) {
-
-       case OSPF_TYPE_UMD:
-               /*
-                * Rob Coltun's special monitoring packets;
-                * do nothing
-                */
-               break;
+       const struct in_addr *ap;
+       const struct lsr *lsrp;
+       const struct lsa_hdr *lshp;
+       const struct lsa *lsap;
+       uint32_t lsa_count,lsa_count_max;
+
+       switch (EXTRACT_U_1(op->ospf_type)) {
 
        case OSPF_TYPE_HELLO:
 
        case OSPF_TYPE_HELLO:
+               ND_TCHECK(op->ospf_hello.hello_options);
                ND_PRINT((ndo, "\n\tOptions [%s]",
                ND_PRINT((ndo, "\n\tOptions [%s]",
-                         bittok2str(ospf_option_values,"none",op->ospf_hello.hello_options)));
+                         bittok2str(ospf_option_values,"none",EXTRACT_U_1(op->ospf_hello.hello_options))));
 
                ND_TCHECK(op->ospf_hello.hello_deadint);
                ND_PRINT((ndo, "\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
 
                ND_TCHECK(op->ospf_hello.hello_deadint);
                ND_PRINT((ndo, "\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
-                         EXTRACT_16BITS(&op->ospf_hello.hello_helloint),
-                         EXTRACT_32BITS(&op->ospf_hello.hello_deadint),
+                         EXTRACT_BE_U_2(op->ospf_hello.hello_helloint),
+                         EXTRACT_BE_U_4(op->ospf_hello.hello_deadint),
                          ipaddr_string(ndo, &op->ospf_hello.hello_mask),
                          ipaddr_string(ndo, &op->ospf_hello.hello_mask),
-                         op->ospf_hello.hello_priority));
+                         EXTRACT_U_1(op->ospf_hello.hello_priority)));
 
                ND_TCHECK(op->ospf_hello.hello_dr);
                if (op->ospf_hello.hello_dr.s_addr != 0)
 
                ND_TCHECK(op->ospf_hello.hello_dr);
                if (op->ospf_hello.hello_dr.s_addr != 0)
@@ -950,9 +1014,9 @@ ospf_decode_v2(netdissect_options *ndo,
                                  ipaddr_string(ndo, &op->ospf_hello.hello_bdr)));
 
                ap = op->ospf_hello.hello_neighbor;
                                  ipaddr_string(ndo, &op->ospf_hello.hello_bdr)));
 
                ap = op->ospf_hello.hello_neighbor;
-               if ((u_char *)ap < dataend)
+               if ((const u_char *)ap < dataend)
                        ND_PRINT((ndo, "\n\t  Neighbor List:"));
                        ND_PRINT((ndo, "\n\t  Neighbor List:"));
-               while ((u_char *)ap < dataend) {
+               while ((const u_char *)ap < dataend) {
                        ND_TCHECK(*ap);
                        ND_PRINT((ndo, "\n\t    %s", ipaddr_string(ndo, ap)));
                        ++ap;
                        ND_TCHECK(*ap);
                        ND_PRINT((ndo, "\n\t    %s", ipaddr_string(ndo, ap)));
                        ++ap;
@@ -962,43 +1026,43 @@ ospf_decode_v2(netdissect_options *ndo,
        case OSPF_TYPE_DD:
                ND_TCHECK(op->ospf_db.db_options);
                ND_PRINT((ndo, "\n\tOptions [%s]",
        case OSPF_TYPE_DD:
                ND_TCHECK(op->ospf_db.db_options);
                ND_PRINT((ndo, "\n\tOptions [%s]",
-                         bittok2str(ospf_option_values, "none", op->ospf_db.db_options)));
+                         bittok2str(ospf_option_values, "none", EXTRACT_U_1(op->ospf_db.db_options))));
                ND_TCHECK(op->ospf_db.db_flags);
                ND_PRINT((ndo, ", DD Flags [%s]",
                ND_TCHECK(op->ospf_db.db_flags);
                ND_PRINT((ndo, ", DD Flags [%s]",
-                         bittok2str(ospf_dd_flag_values, "none", op->ospf_db.db_flags)));
+                         bittok2str(ospf_dd_flag_values, "none", EXTRACT_U_1(op->ospf_db.db_flags))));
                ND_TCHECK(op->ospf_db.db_ifmtu);
                ND_TCHECK(op->ospf_db.db_ifmtu);
-               if (op->ospf_db.db_ifmtu) {
-                       ND_PRINT((ndo, ", MTU: %u", EXTRACT_16BITS(&op->ospf_db.db_ifmtu)));
+               if (EXTRACT_BE_U_2(op->ospf_db.db_ifmtu)) {
+                       ND_PRINT((ndo, ", MTU: %u", EXTRACT_BE_U_2(op->ospf_db.db_ifmtu)));
                }
                ND_TCHECK(op->ospf_db.db_seq);
                }
                ND_TCHECK(op->ospf_db.db_seq);
-               ND_PRINT((ndo, ", Sequence: 0x%08x", EXTRACT_32BITS(&op->ospf_db.db_seq)));
+               ND_PRINT((ndo, ", Sequence: 0x%08x", EXTRACT_BE_U_4(op->ospf_db.db_seq)));
 
                /* Print all the LS adv's */
                lshp = op->ospf_db.db_lshdr;
 
                /* Print all the LS adv's */
                lshp = op->ospf_db.db_lshdr;
-               while (((u_char *)lshp < dataend) && ospf_print_lshdr(ndo, lshp) != -1) {
+               while (((const u_char *)lshp < dataend) && ospf_print_lshdr(ndo, lshp) != -1) {
                        ++lshp;
                }
                break;
 
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
                        ++lshp;
                }
                break;
 
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
-                while ((u_char *)lsrp < dataend) {
+                while ((const u_char *)lsrp < dataend) {
                     ND_TCHECK(*lsrp);
 
                     ND_PRINT((ndo, "\n\t  Advertising Router: %s, %s LSA (%u)",
                            ipaddr_string(ndo, &lsrp->ls_router),
                     ND_TCHECK(*lsrp);
 
                     ND_PRINT((ndo, "\n\t  Advertising Router: %s, %s LSA (%u)",
                            ipaddr_string(ndo, &lsrp->ls_router),
-                           tok2str(lsa_values,"unknown",EXTRACT_32BITS(lsrp->ls_type)),
-                           EXTRACT_32BITS(&lsrp->ls_type)));
+                           tok2str(lsa_values,"unknown",EXTRACT_BE_U_4(lsrp->ls_type)),
+                           EXTRACT_BE_U_4(lsrp->ls_type)));
 
 
-                    switch (EXTRACT_32BITS(lsrp->ls_type)) {
+                    switch (EXTRACT_BE_U_4(lsrp->ls_type)) {
                         /* the LSA header for opaque LSAs was slightly changed */
                     case LS_TYPE_OPAQUE_LL:
                     case LS_TYPE_OPAQUE_AL:
                     case LS_TYPE_OPAQUE_DW:
                         ND_PRINT((ndo, ", Opaque-Type: %s LSA (%u), Opaque-ID: %u",
                         /* the LSA header for opaque LSAs was slightly changed */
                     case LS_TYPE_OPAQUE_LL:
                     case LS_TYPE_OPAQUE_AL:
                     case LS_TYPE_OPAQUE_DW:
                         ND_PRINT((ndo, ", Opaque-Type: %s LSA (%u), Opaque-ID: %u",
-                               tok2str(lsa_opaque_values, "unknown",lsrp->un_ls_stateid.opaque_field.opaque_type),
-                               lsrp->un_ls_stateid.opaque_field.opaque_type,
-                               EXTRACT_24BITS(&lsrp->un_ls_stateid.opaque_field.opaque_id)));
+                               tok2str(lsa_opaque_values, "unknown",EXTRACT_U_1(lsrp->un_ls_stateid.opaque_field.opaque_type)),
+                               EXTRACT_U_1(lsrp->un_ls_stateid.opaque_field.opaque_type),
+                               EXTRACT_BE_U_3(lsrp->un_ls_stateid.opaque_field.opaque_id)));
                         break;
                     default:
                         ND_PRINT((ndo, ", LSA-ID: %s",
                         break;
                     default:
                         ND_PRINT((ndo, ", LSA-ID: %s",
@@ -1013,7 +1077,7 @@ ospf_decode_v2(netdissect_options *ndo,
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
                 ND_TCHECK(op->ospf_lsu.lsu_count);
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
                 ND_TCHECK(op->ospf_lsu.lsu_count);
-                lsa_count_max = EXTRACT_32BITS(&op->ospf_lsu.lsu_count);
+                lsa_count_max = EXTRACT_BE_U_4(op->ospf_lsu.lsu_count);
                 ND_PRINT((ndo, ", %d LSA%s", lsa_count_max, PLURAL_SUFFIX(lsa_count_max)));
                 for (lsa_count=1;lsa_count <= lsa_count_max;lsa_count++) {
                     ND_PRINT((ndo, "\n\t  LSA #%u", lsa_count));
                 ND_PRINT((ndo, ", %d LSA%s", lsa_count_max, PLURAL_SUFFIX(lsa_count_max)));
                 for (lsa_count=1;lsa_count <= lsa_count_max;lsa_count++) {
                     ND_PRINT((ndo, "\n\t  LSA #%u", lsa_count));
@@ -1040,18 +1104,18 @@ trunc:
 
 void
 ospf_print(netdissect_options *ndo,
 
 void
 ospf_print(netdissect_options *ndo,
-           register const u_char *bp, register u_int length,
+           const u_char *bp, u_int length,
            const u_char *bp2 _U_)
 {
            const u_char *bp2 _U_)
 {
-       register const struct ospfhdr *op;
-       register const u_char *dataend;
-       register const char *cp;
+       const struct ospfhdr *op;
+       const u_char *dataend;
+       const char *cp;
 
 
-       op = (struct ospfhdr *)bp;
+       op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
        ND_TCHECK(op->ospf_authtype);
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
        ND_TCHECK(op->ospf_authtype);
-       if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
+       if (EXTRACT_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
                length -= OSPF_AUTH_MD5_LEN;
                ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
        }
                length -= OSPF_AUTH_MD5_LEN;
                ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
        }
@@ -1059,8 +1123,8 @@ ospf_print(netdissect_options *ndo,
        /* 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->ospf_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->ospf_type);
-       cp = tok2str(type2str, "unknown LS-type", op->ospf_type);
-       ND_PRINT((ndo, "OSPFv%u, %s, length %u", op->ospf_version, cp, length));
+       cp = tok2str(type2str, "unknown LS-type %u", EXTRACT_U_1(op->ospf_type));
+       ND_PRINT((ndo, "OSPFv%u, %s, length %u", EXTRACT_U_1(op->ospf_version), cp, length));
        if (*cp == 'u')
                return;
 
        if (*cp == 'u')
                return;
 
@@ -1069,12 +1133,12 @@ ospf_print(netdissect_options *ndo,
        }
 
        ND_TCHECK(op->ospf_len);
        }
 
        ND_TCHECK(op->ospf_len);
-       if (length != EXTRACT_16BITS(&op->ospf_len)) {
-               ND_PRINT((ndo, " [len %d]", EXTRACT_16BITS(&op->ospf_len)));
+       if (length != EXTRACT_BE_U_2(op->ospf_len)) {
+               ND_PRINT((ndo, " [len %d]", EXTRACT_BE_U_2(op->ospf_len)));
        }
 
        }
 
-       if (length > EXTRACT_16BITS(&op->ospf_len)) {
-               dataend = bp + EXTRACT_16BITS(&op->ospf_len);
+       if (length > EXTRACT_BE_U_2(op->ospf_len)) {
+               dataend = bp + EXTRACT_BE_U_2(op->ospf_len);
        } else {
                dataend = bp + length;
        }
        } else {
                dataend = bp + length;
        }
@@ -1090,13 +1154,13 @@ ospf_print(netdissect_options *ndo,
 
        if (ndo->ndo_vflag) {
                /* Print authentication data (should we really do this?) */
 
        if (ndo->ndo_vflag) {
                /* Print authentication data (should we really do this?) */
-               ND_TCHECK2(op->ospf_authdata[0], sizeof(op->ospf_authdata));
+               ND_TCHECK_LEN(op->ospf_authdata, sizeof(op->ospf_authdata));
 
                ND_PRINT((ndo, ", Authentication Type: %s (%u)",
 
                ND_PRINT((ndo, ", Authentication Type: %s (%u)",
-                         tok2str(ospf_authtype_values, "unknown", EXTRACT_16BITS(&op->ospf_authtype)),
-                         EXTRACT_16BITS(&op->ospf_authtype)));
+                         tok2str(ospf_authtype_values, "unknown", EXTRACT_BE_U_2(op->ospf_authtype)),
+                         EXTRACT_BE_U_2(op->ospf_authtype)));
 
 
-               switch (EXTRACT_16BITS(&op->ospf_authtype)) {
+               switch (EXTRACT_BE_U_2(op->ospf_authtype)) {
 
                case OSPF_AUTH_NONE:
                        break;
 
                case OSPF_AUTH_NONE:
                        break;
@@ -1110,7 +1174,7 @@ ospf_print(netdissect_options *ndo,
                        ND_PRINT((ndo, "\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
                                  *((op->ospf_authdata) + 2),
                                  *((op->ospf_authdata) + 3),
                        ND_PRINT((ndo, "\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
                                  *((op->ospf_authdata) + 2),
                                  *((op->ospf_authdata) + 3),
-                                 EXTRACT_32BITS((op->ospf_authdata) + 4)));
+                                 EXTRACT_BE_U_4((op->ospf_authdata) + 4)));
                        break;
 
                default:
                        break;
 
                default:
@@ -1118,20 +1182,20 @@ ospf_print(netdissect_options *ndo,
                }
        }
        /* Do rest according to version.         */
                }
        }
        /* Do rest according to version.         */
-       switch (op->ospf_version) {
+       switch (EXTRACT_U_1(op->ospf_version)) {
 
        case 2:
                /* ospf version 2 */
                if (ospf_decode_v2(ndo, op, dataend))
                        goto trunc;
 
        case 2:
                /* ospf version 2 */
                if (ospf_decode_v2(ndo, op, dataend))
                        goto trunc;
-               if (length > EXTRACT_16BITS(&op->ospf_len)) {
+               if (length > EXTRACT_BE_U_2(op->ospf_len)) {
                        if (ospf_decode_lls(ndo, op, length))
                                goto trunc;
                }
                break;
 
        default:
                        if (ospf_decode_lls(ndo, op, length))
                                goto trunc;
                }
                break;
 
        default:
-               ND_PRINT((ndo, " ospf [version %d]", op->ospf_version));
+               ND_PRINT((ndo, " ospf [version %u]", EXTRACT_U_1(op->ospf_version)));
                break;
        }                       /* end switch on version */
 
                break;
        }                       /* end switch on version */
 
[mirror] the TCPdump network dissector