]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Another UN*Xism we need - isascii().
[tcpdump] / print-ospf.c
diff --git a/print-ospf.c b/print-ospf.c
index ef0e133a1a736a1d4f3cc996c545fae12addf548..a37b5b1fd4e8d7675d807eadf69d61111c599ed7 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -21,60 +21,43 @@
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.63 2007-09-23 23:01:33 guy Exp $ (LBL)";
-#endif
+/* \summary: Open Shortest Path First (OSPF) printer */
 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
+#include "netdissect-stdinc.h"
 
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "gmpls.h"
 
 #include "ospf.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 #include "gmpls.h"
 
 #include "ospf.h"
 
-#include "ip.h"
+static const char tstr[] = " [|ospf2]";
 
 
-static struct tok ospf_option_values[] = {
-       { OSPF_OPTION_T,        "TOS" },
+static const struct tok ospf_option_values[] = {
+        { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
        { OSPF_OPTION_E,        "External" },
        { OSPF_OPTION_MC,       "Multicast" },
        { OSPF_OPTION_NP,       "NSSA" },
        { OSPF_OPTION_E,        "External" },
        { OSPF_OPTION_MC,       "Multicast" },
        { OSPF_OPTION_NP,       "NSSA" },
-       { OSPF_OPTION_EA,       "Advertise External" },
+        { OSPF_OPTION_L,        "LLS" },
        { OSPF_OPTION_DC,       "Demand Circuit" },
        { OSPF_OPTION_O,        "Opaque" },
        { OSPF_OPTION_DN,       "Up/Down" },
        { 0,                    NULL }
 };
 
        { OSPF_OPTION_DC,       "Demand Circuit" },
        { OSPF_OPTION_O,        "Opaque" },
        { OSPF_OPTION_DN,       "Up/Down" },
        { 0,                    NULL }
 };
 
-static struct tok ospf_option_values2[] = {
-       { OSPF_OPTION_T,        "TOS" },
-       { OSPF_OPTION_E,        "External" },
-       { OSPF_OPTION_MC,       "Multicast" },
-       { OSPF_OPTION_NP,       "NSSA" },
-       { OSPF_OPTION_L,        "LLS" },
-       { OSPF_OPTION_DC,       "Demand Circuit" },
-       { OSPF_OPTION_O,        "Opaque" },
-       { OSPF_OPTION_DN,       "Up/Down" },
-       { 0,                    NULL }
-};
-
-static struct tok ospf_authtype_values[] = {
+static const struct tok ospf_authtype_values[] = {
        { OSPF_AUTH_NONE,       "none" },
        { OSPF_AUTH_SIMPLE,     "simple" },
        { OSPF_AUTH_MD5,        "MD5" },
        { 0,                    NULL }
 };
 
        { OSPF_AUTH_NONE,       "none" },
        { OSPF_AUTH_SIMPLE,     "simple" },
        { OSPF_AUTH_MD5,        "MD5" },
        { 0,                    NULL }
 };
 
-static struct tok ospf_rla_flag_values[] = {
+static const struct tok ospf_rla_flag_values[] = {
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
        { RLA_FLAG_W1,          "Virtual" },
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
        { RLA_FLAG_W1,          "Virtual" },
@@ -82,8 +65,7 @@ static struct tok ospf_rla_flag_values[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
-static struct tok type2str[] = {
-       { OSPF_TYPE_UMD,        "UMD" },
+static const struct tok type2str[] = {
        { 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" },
@@ -92,7 +74,7 @@ static struct tok type2str[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
-static struct tok lsa_values[] = {
+static const struct tok lsa_values[] = {
        { LS_TYPE_ROUTER,       "Router" },
        { LS_TYPE_NETWORK,      "Network" },
        { LS_TYPE_SUM_IP,       "Summary" },
        { LS_TYPE_ROUTER,       "Router" },
        { LS_TYPE_NETWORK,      "Network" },
        { LS_TYPE_SUM_IP,       "Summary" },
@@ -106,7 +88,7 @@ static struct tok lsa_values[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
-static struct tok ospf_dd_flag_values[] = {
+static const struct tok ospf_dd_flag_values[] = {
        { OSPF_DB_INIT,         "Init" },
        { OSPF_DB_MORE,         "More" },
        { OSPF_DB_MASTER,       "Master" },
        { OSPF_DB_INIT,         "Init" },
        { OSPF_DB_MORE,         "More" },
        { OSPF_DB_MASTER,       "Master" },
@@ -114,20 +96,20 @@ static struct tok ospf_dd_flag_values[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_values[] = {
+static const struct tok lsa_opaque_values[] = {
        { LS_OPAQUE_TYPE_TE,    "Traffic Engineering" },
        { LS_OPAQUE_TYPE_GRACE, "Graceful restart" },
        { LS_OPAQUE_TYPE_RI,    "Router Information" },
        { 0,                    NULL }
 };
 
        { LS_OPAQUE_TYPE_TE,    "Traffic Engineering" },
        { LS_OPAQUE_TYPE_GRACE, "Graceful restart" },
        { LS_OPAQUE_TYPE_RI,    "Router Information" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_te_tlv_values[] = {
+static const struct tok lsa_opaque_te_tlv_values[] = {
        { LS_OPAQUE_TE_TLV_ROUTER, "Router Address" },
        { LS_OPAQUE_TE_TLV_LINK,   "Link" },
        { 0,                    NULL }
 };
 
        { LS_OPAQUE_TE_TLV_ROUTER, "Router Address" },
        { LS_OPAQUE_TE_TLV_LINK,   "Link" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_te_link_tlv_subtlv_values[] = {
+static const struct tok lsa_opaque_te_link_tlv_subtlv_values[] = {
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE,            "Link Type" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID,              "Link ID" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP,             "Local Interface IP address" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE,            "Link Type" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID,              "Link ID" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP,             "Local Interface IP address" },
@@ -145,14 +127,14 @@ static struct tok lsa_opaque_te_link_tlv_subtlv_values[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_grace_tlv_values[] = {
+static const struct tok lsa_opaque_grace_tlv_values[] = {
        { LS_OPAQUE_GRACE_TLV_PERIOD,             "Grace Period" },
        { LS_OPAQUE_GRACE_TLV_REASON,             "Graceful restart Reason" },
        { LS_OPAQUE_GRACE_TLV_INT_ADDRESS,        "IPv4 interface address" },
        { 0,                    NULL }
 };
 
        { LS_OPAQUE_GRACE_TLV_PERIOD,             "Grace Period" },
        { LS_OPAQUE_GRACE_TLV_REASON,             "Graceful restart Reason" },
        { LS_OPAQUE_GRACE_TLV_INT_ADDRESS,        "IPv4 interface address" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_grace_tlv_reason_values[] = {
+static const struct tok lsa_opaque_grace_tlv_reason_values[] = {
        { LS_OPAQUE_GRACE_TLV_REASON_UNKNOWN,     "Unknown" },
        { LS_OPAQUE_GRACE_TLV_REASON_SW_RESTART,  "Software Restart" },
        { LS_OPAQUE_GRACE_TLV_REASON_SW_UPGRADE,  "Software Reload/Upgrade" },
        { LS_OPAQUE_GRACE_TLV_REASON_UNKNOWN,     "Unknown" },
        { LS_OPAQUE_GRACE_TLV_REASON_SW_RESTART,  "Software Restart" },
        { LS_OPAQUE_GRACE_TLV_REASON_SW_UPGRADE,  "Software Reload/Upgrade" },
@@ -160,18 +142,18 @@ static struct tok lsa_opaque_grace_tlv_reason_values[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_te_tlv_link_type_sub_tlv_values[] = {
+static const struct tok lsa_opaque_te_tlv_link_type_sub_tlv_values[] = {
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_PTP, "Point-to-point" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_MA,  "Multi-Access" },
        { 0,                    NULL }
 };
 
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_PTP, "Point-to-point" },
        { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_MA,  "Multi-Access" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_ri_tlv_values[] = {
+static const struct tok lsa_opaque_ri_tlv_values[] = {
        { LS_OPAQUE_RI_TLV_CAP, "Router Capabilities" },
        { 0,                    NULL }
 };
 
        { LS_OPAQUE_RI_TLV_CAP, "Router Capabilities" },
        { 0,                    NULL }
 };
 
-static struct tok lsa_opaque_ri_tlv_cap_values[] = {
+static const struct tok lsa_opaque_ri_tlv_cap_values[] = {
        { 1, "Reserved" },
        { 2, "Reserved" },
        { 4, "Reserved" },
        { 1, "Reserved" },
        { 2, "Reserved" },
        { 4, "Reserved" },
@@ -185,53 +167,43 @@ static struct tok lsa_opaque_ri_tlv_cap_values[] = {
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
-static struct tok ospf_lls_tlv_values[] = {
+static const struct tok ospf_lls_tlv_values[] = {
        { OSPF_LLS_EO,  "Extended Options" },
        { OSPF_LLS_MD5, "MD5 Authentication" },
        { 0,    NULL }
 };
 
        { OSPF_LLS_EO,  "Extended Options" },
        { OSPF_LLS_MD5, "MD5 Authentication" },
        { 0,    NULL }
 };
 
-static struct tok ospf_lls_eo_options[] = {
+static const struct tok ospf_lls_eo_options[] = {
        { OSPF_LLS_EO_LR,       "LSDB resync" },
        { OSPF_LLS_EO_RS,       "Restart" },
        { 0,    NULL }
 };
 
        { OSPF_LLS_EO_LR,       "LSDB resync" },
        { OSPF_LLS_EO_RS,       "Restart" },
        { 0,    NULL }
 };
 
-static char tstr[] = " [|ospf2]";
-
-#ifdef WIN32
-#define inline __inline
-#endif /* WIN32 */
-
-static int ospf_print_lshdr(const struct lsa_hdr *);
-static const u_char *ospf_print_lsa(const struct lsa *);
-static int ospf_decode_v2(const struct ospfhdr *, const u_char *);
-static int ospf_decode_lls(const struct ospfhdr *, register u_int);
-
 int
 int
-ospf_print_grace_lsa (u_int8_t *tptr, u_int ls_length) {
-
+ospf_print_grace_lsa(netdissect_options *ndo,
+                     const u_char *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) {
-        TCHECK2(*tptr, 4);
+        ND_TCHECK_4(tptr);
         if (ls_length < 4) {
         if (ls_length < 4) {
-            printf("\n\t    Remaining LS length %u < 4", ls_length);
+            ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
             return -1;
         }
             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;
-                    
-        printf("\n\t    %s TLV (%u), length %u, value: ",
+
+        ND_PRINT("\n\t    %s TLV (%u), length %u, value: ",
                tok2str(lsa_opaque_grace_tlv_values,"unknown",tlv_type),
                tlv_type,
                tlv_length);
 
         if (tlv_length > ls_length) {
                tok2str(lsa_opaque_grace_tlv_values,"unknown",tlv_type),
                tlv_type,
                tlv_length);
 
         if (tlv_length > ls_length) {
-            printf("\n\t    Bogus length %u > %u", tlv_length,
+            ND_PRINT("\n\t    Bogus length %u > %u", tlv_length,
                    ls_length);
             return -1;
         }
                    ls_length);
             return -1;
         }
@@ -241,38 +213,38 @@ ospf_print_grace_lsa (u_int8_t *tptr, u_int ls_length) {
             return -1;
         }
 
             return -1;
         }
 
-        TCHECK2(*tptr, tlv_length);
+        ND_TCHECK_LEN(tptr, tlv_length);
         switch(tlv_type) {
 
         case LS_OPAQUE_GRACE_TLV_PERIOD:
             if (tlv_length != 4) {
         switch(tlv_type) {
 
         case LS_OPAQUE_GRACE_TLV_PERIOD:
             if (tlv_length != 4) {
-                printf("\n\t    Bogus length %u != 4", tlv_length);
+                ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            printf("%us",EXTRACT_32BITS(tptr));
+            ND_PRINT("%us", EXTRACT_BE_U_4(tptr));
             break;
 
         case LS_OPAQUE_GRACE_TLV_REASON:
             if (tlv_length != 1) {
             break;
 
         case LS_OPAQUE_GRACE_TLV_REASON:
             if (tlv_length != 1) {
-                printf("\n\t    Bogus length %u != 1", tlv_length);
+                ND_PRINT("\n\t    Bogus length %u != 1", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            printf("%s (%u)",
-                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", *tptr),
-                   *tptr);
+            ND_PRINT("%s (%u)",
+                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", EXTRACT_U_1(tptr)),
+                   EXTRACT_U_1(tptr));
             break;
 
         case LS_OPAQUE_GRACE_TLV_INT_ADDRESS:
             if (tlv_length != 4) {
             break;
 
         case LS_OPAQUE_GRACE_TLV_INT_ADDRESS:
             if (tlv_length != 4) {
-                printf("\n\t    Bogus length %u != 4", tlv_length);
+                ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            printf("%s", ipaddr_string(tptr));
+            ND_PRINT("%s", ipaddr_string(ndo, tptr));
             break;
 
         default:
             break;
 
         default:
-            if (vflag <= 1) {
-                if(!print_unknown_data(tptr,"\n\t      ",tlv_length))
+            if (ndo->ndo_vflag <= 1) {
+                if (!print_unknown_data(ndo, tptr, "\n\t      ", tlv_length))
                     return -1;
             }
             break;
                     return -1;
             }
             break;
@@ -291,33 +263,34 @@ trunc:
 }
 
 int
 }
 
 int
-ospf_print_te_lsa (u_int8_t *tptr, u_int ls_length) {
-
+ospf_print_te_lsa(netdissect_options *ndo,
+                  const u_char *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 */
     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;
+        float f;
+        uint32_t i;
     } bw;
 
     while (ls_length != 0) {
     } bw;
 
     while (ls_length != 0) {
-        TCHECK2(*tptr, 4);
+        ND_TCHECK_4(tptr);
         if (ls_length < 4) {
         if (ls_length < 4) {
-            printf("\n\t    Remaining LS length %u < 4", ls_length);
+            ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
             return -1;
         }
             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;
-                    
-        printf("\n\t    %s TLV (%u), length: %u",
+
+        ND_PRINT("\n\t    %s TLV (%u), length: %u",
                tok2str(lsa_opaque_te_tlv_values,"unknown",tlv_type),
                tlv_type,
                tlv_length);
 
         if (tlv_length > ls_length) {
                tok2str(lsa_opaque_te_tlv_values,"unknown",tlv_type),
                tlv_type,
                tlv_length);
 
         if (tlv_length > ls_length) {
-            printf("\n\t    Bogus length %u > %u", tlv_length,
+            ND_PRINT("\n\t    Bogus length %u > %u", tlv_length,
                    ls_length);
             return -1;
         }
                    ls_length);
             return -1;
         }
@@ -331,108 +304,166 @@ ospf_print_te_lsa (u_int8_t *tptr, u_int ls_length) {
         case LS_OPAQUE_TE_TLV_LINK:
             while (tlv_length >= sizeof(subtlv_type) + sizeof(subtlv_length)) {
                 if (tlv_length < 4) {
         case LS_OPAQUE_TE_TLV_LINK:
             while (tlv_length >= sizeof(subtlv_type) + sizeof(subtlv_length)) {
                 if (tlv_length < 4) {
-                    printf("\n\t    Remaining TLV length %u < 4",
+                    ND_PRINT("\n\t    Remaining TLV length %u < 4",
                            tlv_length);
                     return -1;
                 }
                            tlv_length);
                     return -1;
                 }
-                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;
-                            
-                printf("\n\t      %s subTLV (%u), length: %u",
+
+               /* Infinite loop protection */
+               if (subtlv_type == 0 || subtlv_length == 0)
+                   goto invalid;
+
+                ND_PRINT("\n\t      %s subTLV (%u), length: %u",
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
                        subtlv_length);
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
                        subtlv_length);
-                            
-                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:
-                    printf(", 0x%08x", EXTRACT_32BITS(tptr));
+                   if (subtlv_length != 4) {
+                       ND_PRINT(" != 4");
+                       goto invalid;
+                   }
+                    ND_PRINT(", 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:
-                    printf(", %s (0x%08x)",
-                           ipaddr_string(tptr),
-                           EXTRACT_32BITS(tptr));
+                   if (subtlv_length != 4 && subtlv_length != 8) {
+                       ND_PRINT(" != 4 && != 8");
+                       goto invalid;
+                   }
+                    ND_PRINT(", %s (0x%08x)",
+                           ipaddr_string(ndo, tptr),
+                           EXTRACT_BE_U_4(tptr));
                     if (subtlv_length == 8) /* rfc4203 */
                     if (subtlv_length == 8) /* rfc4203 */
-                        printf(", %s (0x%08x)",
-                               ipaddr_string(tptr+4),
-                               EXTRACT_32BITS(tptr+4));
+                        ND_PRINT(", %s (0x%08x)",
+                               ipaddr_string(ndo, 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:
-                    printf(", %s", ipaddr_string(tptr));
+                   if (subtlv_length != 4) {
+                       ND_PRINT(" != 4");
+                       goto invalid;
+                   }
+                    ND_PRINT(", %s", ipaddr_string(ndo, tptr));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
-                    bw.i = EXTRACT_32BITS(tptr);
-                    printf(", %.3f Mbps", bw.f*8/1000000 );
+                   if (subtlv_length != 4) {
+                       ND_PRINT(" != 4");
+                       goto invalid;
+                   }
+                    bw.i = EXTRACT_BE_U_4(tptr);
+                    ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000);
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
+                   if (subtlv_length != 32) {
+                       ND_PRINT(" != 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);
-                        printf("\n\t\tTE-Class %u: %.3f Mbps",
+                        bw.i = EXTRACT_BE_U_4(tptr + te_class * 4);
+                        ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps",
                                te_class,
                                te_class,
-                               bw.f*8/1000000 );
+                               bw.f * 8 / 1000000);
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
-                    printf("\n\t\tBandwidth Constraints Model ID: %s (%u)",
-                           tok2str(diffserv_te_bc_values, "unknown", *tptr),
-                           *tptr);
+                   if (subtlv_length < 4) {
+                       ND_PRINT(" < 4");
+                       goto invalid;
+                   }
+                   /* BC Model Id (1 octet) + Reserved (3 octets) */
+                    ND_PRINT("\n\t\tBandwidth Constraints Model ID: %s (%u)",
+                           tok2str(diffserv_te_bc_values, "unknown", EXTRACT_U_1(tptr)),
+                           EXTRACT_U_1(tptr));
+                   if (subtlv_length % 4 != 0) {
+                       ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length);
+                       goto invalid;
+                   }
+                   if (subtlv_length > 36) {
+                       ND_PRINT("\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);
-                        printf("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
+                        bw.i = EXTRACT_BE_U_4(tptr + 4 + te_class * 4);
+                        ND_PRINT("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                                te_class,
                                te_class,
-                               bw.f*8/1000000 );
+                               bw.f * 8 / 1000000);
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
-                    printf(", Metric %u", EXTRACT_32BITS(tptr));
+                   if (subtlv_length != 4) {
+                       ND_PRINT(" != 4");
+                       goto invalid;
+                   }
+                    ND_PRINT(", 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:
-                    printf(", %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(" != 4");
+                       goto invalid;
+                   }
+                    ND_PRINT(", %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:
-                    printf("\n\t\tInterface Switching Capability: %s",
-                           tok2str(gmpls_switch_cap_values, "Unknown", *(tptr)));
-                    printf("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
-                           tok2str(gmpls_encoding_values, "Unknown", *(tptr+1)));
+                   if (subtlv_length < 36) {
+                       ND_PRINT(" < 36");
+                       goto invalid;
+                   }
+                   /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
+                    ND_PRINT("\n\t\tInterface Switching Capability: %s",
+                           tok2str(gmpls_switch_cap_values, "Unknown", EXTRACT_U_1((tptr))));
+                    ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
+                           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));
-                        printf("\n\t\t  priority level %d: %.3f Mbps",
+                        bw.i = EXTRACT_BE_U_4(tptr + 4 + (priority_level * 4));
+                        ND_PRINT("\n\t\t  priority level %u: %.3f Mbps",
                                priority_level,
                                priority_level,
-                               bw.f*8/1000000 );
+                               bw.f * 8 / 1000000);
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
-                    printf(", %s (%u)",
-                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",*tptr),
-                           *tptr);
+                   if (subtlv_length != 1) {
+                       ND_PRINT(" != 1");
+                       goto invalid;
+                   }
+                    ND_PRINT(", %s (%u)",
+                           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(" != N x 4");
+                       goto invalid;
+                   }
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
-                        printf("\n\t\t  Shared risk group: ");
+                        ND_PRINT("\n\t\t  Shared risk group: ");
                     while (count_srlg > 0) {
                     while (count_srlg > 0) {
-                        bw.i = EXTRACT_32BITS(tptr);
-                        printf("%d",bw.i);
+                        bw.i = EXTRACT_BE_U_4(tptr);
+                        ND_PRINT("%u", bw.i);
                         tptr+=4;
                         count_srlg--;
                         if (count_srlg > 0)
                         tptr+=4;
                         count_srlg--;
                         if (count_srlg > 0)
-                            printf(", ");
+                            ND_PRINT(", ");
                     }
                     break;
 
                 default:
                     }
                     break;
 
                 default:
-                    if (vflag <= 1) {
-                        if(!print_unknown_data(tptr,"\n\t\t",subtlv_length))
+                    if (ndo->ndo_vflag <= 1) {
+                        if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length))
                             return -1;
                     }
                     break;
                             return -1;
                     }
                     break;
@@ -440,25 +471,25 @@ ospf_print_te_lsa (u_int8_t *tptr, u_int ls_length) {
                 /* in OSPF everything has to be 32-bit aligned, including subTLVs */
                 if (subtlv_length%4 != 0)
                     subtlv_length+=4-(subtlv_length%4);
                 /* in OSPF everything has to be 32-bit aligned, including subTLVs */
                 if (subtlv_length%4 != 0)
                     subtlv_length+=4-(subtlv_length%4);
-                            
+
                 tlv_length-=subtlv_length;
                 tptr+=subtlv_length;
                 tlv_length-=subtlv_length;
                 tptr+=subtlv_length;
-                            
+
             }
             break;
             }
             break;
-                        
+
         case LS_OPAQUE_TE_TLV_ROUTER:
             if (tlv_length < 4) {
         case LS_OPAQUE_TE_TLV_ROUTER:
             if (tlv_length < 4) {
-                printf("\n\t    TLV length %u < 4", tlv_length);
+                ND_PRINT("\n\t    TLV length %u < 4", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            TCHECK2(*tptr, 4);
-            printf(", %s", ipaddr_string(tptr));
+            ND_TCHECK_4(tptr);
+            ND_PRINT(", %s", ipaddr_string(ndo, tptr));
             break;
             break;
-                        
+
         default:
         default:
-            if (vflag <= 1) {
-                if(!print_unknown_data(tptr,"\n\t      ",tlv_length))
+            if (ndo->ndo_vflag <= 1) {
+                if (!print_unknown_data(ndo, tptr, "\n\t      ", tlv_length))
                     return -1;
             }
             break;
                     return -1;
             }
             break;
@@ -472,233 +503,270 @@ ospf_print_te_lsa (u_int8_t *tptr, u_int ls_length) {
     return 0;
 trunc:
     return -1;
     return 0;
 trunc:
     return -1;
+invalid:
+    ND_PRINT("%s", istr);
+    return -1;
 }
 
 }
 
-
 static int
 static int
-ospf_print_lshdr(register const struct lsa_hdr *lshp)
+ospf_print_lshdr(netdissect_options *ndo,
+                 const struct lsa_hdr *lshp)
 {
 {
+        u_int ls_type;
         u_int ls_length;
 
         u_int ls_length;
 
-        TCHECK(lshp->ls_length);
-        ls_length = EXTRACT_16BITS(&lshp->ls_length);
+        ND_TCHECK_2(lshp->ls_length);
+        ls_length = EXTRACT_BE_U_2(lshp->ls_length);
         if (ls_length < sizeof(struct lsa_hdr)) {
         if (ls_length < sizeof(struct lsa_hdr)) {
-                printf("\n\t    Bogus length %u < header (%lu)", ls_length,
+                ND_PRINT("\n\t    Bogus length %u < header (%lu)", ls_length,
                     (unsigned long)sizeof(struct lsa_hdr));
                 return(-1);
         }
 
                     (unsigned long)sizeof(struct lsa_hdr));
                 return(-1);
         }
 
-        TCHECK(lshp->ls_seq);  /* XXX - ls_length check checked this */
-       printf("\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
-              ipaddr_string(&lshp->ls_router),
-              EXTRACT_32BITS(&lshp->ls_seq),
-              EXTRACT_16BITS(&lshp->ls_age),
-               ls_length-(u_int)sizeof(struct lsa_hdr));
-
-       TCHECK(lshp->ls_type);  /* XXX - ls_length check checked this */
-        switch (lshp->ls_type) {
-       /* the LSA header for opaque LSAs was slightly changed */
+        ND_TCHECK_4(lshp->ls_seq); /* XXX - ls_length check checked this */
+        ND_PRINT("\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
+                  ipaddr_string(ndo, &lshp->ls_router),
+                  EXTRACT_BE_U_4(lshp->ls_seq),
+                  EXTRACT_BE_U_2(lshp->ls_age),
+                  ls_length - (u_int)sizeof(struct lsa_hdr));
+
+        ND_TCHECK_1(lshp->ls_type); /* XXX - ls_length check checked this */
+        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:
         case LS_TYPE_OPAQUE_LL:
         case LS_TYPE_OPAQUE_AL:
         case LS_TYPE_OPAQUE_DW:
-            printf("\n\t    %s LSA (%d), Opaque-Type %s LSA (%u), Opaque-ID %u",
-                   tok2str(lsa_values,"unknown",lshp->ls_type),
-                   lshp->ls_type,
+            ND_PRINT("\n\t    %s LSA (%u), Opaque-Type %s LSA (%u), Opaque-ID %u",
+                   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;
 
-       /* all other LSA types use regular style LSA headers */
-       default:
-            printf("\n\t    %s LSA (%d), LSA-ID: %s",
-                   tok2str(lsa_values,"unknown",lshp->ls_type),
-                   lshp->ls_type,
-                   ipaddr_string(&lshp->un_lsa_id.lsa_id));
+        /* all other LSA types use regular style LSA headers */
+        default:
+            ND_PRINT("\n\t    %s LSA (%u), LSA-ID: %s",
+                   tok2str(lsa_values,"unknown",ls_type),
+                   ls_type,
+                   ipaddr_string(ndo, &lshp->un_lsa_id.lsa_id));
             break;
         }
 
             break;
         }
 
-       TCHECK(lshp->ls_options);       /* XXX - ls_length check checked this */
-        printf("\n\t    Options: [%s]", bittok2str(ospf_option_values,"none",lshp->ls_options));
+        ND_TCHECK_1(lshp->ls_options); /* XXX - ls_length check checked this */
+        ND_PRINT("\n\t    Options: [%s]", bittok2str(ospf_option_values, "none", EXTRACT_U_1(lshp->ls_options)));
 
         return (ls_length);
 trunc:
        return (-1);
 }
 
 
         return (ls_length);
 trunc:
        return (-1);
 }
 
+/* draft-ietf-ospf-mt-09 */
+static const struct tok ospf_topology_values[] = {
+    { 0, "default" },
+    { 1, "multicast" },
+    { 2, "management" },
+    { 0, NULL }
+};
+
+/*
+ * Print all the per-topology metrics.
+ */
+static int
+ospf_print_tos_metrics(netdissect_options *ndo,
+                       const union un_tos *tos)
+{
+    u_int metric_count;
+    u_int toscount;
+    u_int tos_type;
+
+    toscount = EXTRACT_U_1(tos->link.link_tos_count)+1;
+    metric_count = 0;
+
+    /*
+     * All but the first metric contain a valid topology id.
+     */
+    while (toscount != 0) {
+        ND_TCHECK_SIZE(tos);
+        tos_type = EXTRACT_U_1(tos->metrics.tos_type);
+        ND_PRINT("\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--;
+    }
+    return 0;
+trunc:
+    return 1;
+}
+
 /*
  * Print a single link state advertisement.  If truncated or if LSA length
  * field is less than the length of the LSA header, return NULl, else
  * return pointer to data past end of LSA.
  */
 /*
  * Print a single link state advertisement.  If truncated or if LSA length
  * 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 *
-ospf_print_lsa(register const struct lsa *lsap)
+static const uint8_t *
+ospf_print_lsa(netdissect_options *ndo,
+               const struct lsa *lsap)
 {
 {
-       register const u_int8_t *ls_end;
-       register const struct rlalink *rlp;
-       register const struct tos_metric *tosp;
-       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, k, tlv_type, tlv_length;
-       register int ls_length;
-       const u_int8_t *tptr;
-
-       tptr = (u_int8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
-        ls_length = ospf_print_lshdr(&lsap->ls_hdr);
+       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);
         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:
 
        case LS_TYPE_ROUTER:
-               TCHECK(lsap->lsa_un.un_rla.rla_flags);
-                printf("\n\t    Router LSA Options: [%s]", bittok2str(ospf_rla_flag_values,"none",lsap->lsa_un.un_rla.rla_flags));
+               ND_TCHECK_1(lsap->lsa_un.un_rla.rla_flags);
+               ND_PRINT("\n\t    Router LSA Options: [%s]",
+                         bittok2str(ospf_rla_flag_values, "none", EXTRACT_U_1(lsap->lsa_un.un_rla.rla_flags)));
 
 
-               TCHECK(lsap->lsa_un.un_rla.rla_count);
-               j = EXTRACT_16BITS(&lsap->lsa_un.un_rla.rla_count);
-               TCHECK(lsap->lsa_un.un_rla.rla_link);
+               ND_TCHECK_2(lsap->lsa_un.un_rla.rla_count);
+               j = EXTRACT_BE_U_2(lsap->lsa_un.un_rla.rla_count);
+               ND_TCHECK_SIZE(lsap->lsa_un.un_rla.rla_link);
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (j--) {
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (j--) {
-                       TCHECK(*rlp);
-                       switch (rlp->link_type) {
+                       ND_TCHECK_SIZE(rlp);
+                       switch (EXTRACT_U_1(rlp->un_tos.link.link_type)) {
 
                        case RLA_TYPE_VIRTUAL:
 
                        case RLA_TYPE_VIRTUAL:
-                               printf("\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data)); 
-                                break;
+                               ND_PRINT("\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data));
+                               break;
 
                        case RLA_TYPE_ROUTER:
 
                        case RLA_TYPE_ROUTER:
-                               printf("\n\t      Neighbor Router-ID: %s, Interface Address: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data));
+                               ND_PRINT("\n\t      Neighbor Router-ID: %s, Interface Address: %s",
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data));
                                break;
 
                        case RLA_TYPE_TRANSIT:
                                break;
 
                        case RLA_TYPE_TRANSIT:
-                               printf("\n\t      Neighbor Network-ID: %s, Interface Address: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data));
+                               ND_PRINT("\n\t      Neighbor Network-ID: %s, Interface Address: %s",
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data));
                                break;
 
                        case RLA_TYPE_STUB:
                                break;
 
                        case RLA_TYPE_STUB:
-                               printf("\n\t      Stub Network: %s, Mask: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data));
+                               ND_PRINT("\n\t      Stub Network: %s, Mask: %s",
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data));
                                break;
 
                        default:
                                break;
 
                        default:
-                               printf("\n\t      Unknown Router Link Type (%u)",
-                                   rlp->link_type);
+                               ND_PRINT("\n\t      Unknown Router Link Type (%u)",
+                                   EXTRACT_U_1(rlp->un_tos.link.link_type));
                                return (ls_end);
                        }
                                return (ls_end);
                        }
-                       printf(", tos 0, metric: %d", EXTRACT_16BITS(&rlp->link_tos0metric));
-                       tosp = (struct tos_metric *)
-                           ((sizeof rlp->link_tos0metric) + (u_char *) rlp);
-                       for (k = 0; k < (int) rlp->link_toscount; ++k, ++tosp) {
-                               TCHECK(*tosp);
-                               printf(", tos %d, metric: %d",
-                                   tosp->tos_type,
-                                   EXTRACT_16BITS(&tosp->tos_metric));
-                       }
-                       rlp = (struct rlalink *)((u_char *)(rlp + 1) +
-                           ((rlp->link_toscount) * sizeof(*tosp)));
+
+                       if (ospf_print_tos_metrics(ndo, &rlp->un_tos))
+                               goto trunc;
+
+                       rlp = (const struct rlalink *)((const u_char *)(rlp + 1) +
+                           (EXTRACT_U_1(rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
                }
                break;
 
        case LS_TYPE_NETWORK:
                }
                break;
 
        case LS_TYPE_NETWORK:
-               TCHECK(lsap->lsa_un.un_nla.nla_mask);
-               printf("\n\t    Mask %s\n\t    Connected Routers:",
-                   ipaddr_string(&lsap->lsa_un.un_nla.nla_mask));
+               ND_TCHECK_4(&lsap->lsa_un.un_nla.nla_mask);
+               ND_PRINT("\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;
                ap = lsap->lsa_un.un_nla.nla_router;
-               while ((u_char *)ap < ls_end) {
-                       TCHECK(*ap);
-                       printf("\n\t      %s", ipaddr_string(ap));
+               while ((const u_char *)ap < ls_end) {
+                       ND_TCHECK_SIZE(ap);
+                       ND_PRINT("\n\t      %s", ipaddr_string(ndo, ap));
                        ++ap;
                }
                break;
 
        case LS_TYPE_SUM_IP:
                        ++ap;
                }
                break;
 
        case LS_TYPE_SUM_IP:
-               TCHECK(lsap->lsa_un.un_nla.nla_mask);
-               printf("\n\t    Mask %s",
-                   ipaddr_string(&lsap->lsa_un.un_sla.sla_mask));
-               TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
-               lp = lsap->lsa_un.un_sla.sla_tosmetric;
-                /* suppress tos if its not supported */
-                if(!((lsap->ls_hdr.ls_options)&OSPF_OPTION_T)) {
-                    printf(", metric %u", EXTRACT_32BITS(lp)&SLA_MASK_METRIC);
-                    break;
-                }
-               while ((u_char *)lp < ls_end) {
-                       register u_int32_t ul;
-
-                       TCHECK(*lp);
-                       ul = EXTRACT_32BITS(lp);
-                       printf(", tos %d metric %d",
-                           (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS,
-                           ul & SLA_MASK_METRIC);
-                       ++lp;
+               ND_TCHECK_4(&lsap->lsa_un.un_nla.nla_mask);
+               ND_PRINT("\n\t    Mask %s",
+                   ipaddr_string(ndo, &lsap->lsa_un.un_sla.sla_mask));
+               ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric);
+               lp = (const uint8_t *)lsap->lsa_un.un_sla.sla_tosmetric;
+               while (lp < ls_end) {
+                       uint32_t ul;
+
+                       ND_TCHECK_4(lp);
+                       ul = EXTRACT_BE_U_4(lp);
+                        topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
+                       ND_PRINT("\n\t\ttopology %s (%u) metric %u",
+                               tok2str(ospf_topology_values, "Unknown", topology),
+                               topology,
+                               ul & SLA_MASK_METRIC);
+                       lp += 4;
                }
                break;
 
        case LS_TYPE_SUM_ABR:
                }
                break;
 
        case LS_TYPE_SUM_ABR:
-               TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
-               lp = lsap->lsa_un.un_sla.sla_tosmetric;
-                /* suppress tos if its not supported */
-                if(!((lsap->ls_hdr.ls_options)&OSPF_OPTION_T)) {
-                    printf(", metric: %u", EXTRACT_32BITS(lp)&SLA_MASK_METRIC);
-                    break;
-                }
-               while ((u_char *)lp < ls_end) {
-                       register u_int32_t ul;
-
-                       TCHECK(*lp);
-                       ul = EXTRACT_32BITS(lp);
-                       printf(", tos %d metric %d",
-                           (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS,
-                           ul & SLA_MASK_METRIC);
-                       ++lp;
+               ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric);
+               lp = (const uint8_t *)lsap->lsa_un.un_sla.sla_tosmetric;
+               while (lp < ls_end) {
+                       uint32_t ul;
+
+                       ND_TCHECK_4(lp);
+                       ul = EXTRACT_BE_U_4(lp);
+                        topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
+                       ND_PRINT("\n\t\ttopology %s (%u) metric %u",
+                               tok2str(ospf_topology_values, "Unknown", topology),
+                               topology,
+                               ul & SLA_MASK_METRIC);
+                       lp += 4;
                }
                break;
 
        case LS_TYPE_ASE:
         case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */
                }
                break;
 
        case LS_TYPE_ASE:
         case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */
-               TCHECK(lsap->lsa_un.un_nla.nla_mask);
-               printf("\n\t    Mask %s",
-                   ipaddr_string(&lsap->lsa_un.un_asla.asla_mask));
+               ND_TCHECK_4(&lsap->lsa_un.un_nla.nla_mask);
+               ND_PRINT("\n\t    Mask %s",
+                   ipaddr_string(ndo, &lsap->lsa_un.un_asla.asla_mask));
 
 
-               TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
+               ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
                almp = lsap->lsa_un.un_asla.asla_metric;
-               while ((u_char *)almp < ls_end) {
-                       register u_int32_t ul;
-
-                       TCHECK(almp->asla_tosmetric);
-                       ul = EXTRACT_32BITS(&almp->asla_tosmetric);
-                       printf(", type %d, tos %d metric:",
-                           (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1,
-                           (ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
-                        if ((ul & ASLA_MASK_METRIC)==0xffffff)
-                            printf(" infinite");
-                        else
-                            printf(" %d", (ul & ASLA_MASK_METRIC));
-
-                       TCHECK(almp->asla_forward);
+               while ((const u_char *)almp < ls_end) {
+                       uint32_t ul;
+
+                       ND_TCHECK_4(almp->asla_tosmetric);
+                       ul = EXTRACT_BE_U_4(almp->asla_tosmetric);
+                        topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
+                       ND_PRINT("\n\t\ttopology %s (%u), type %u, metric",
+                               tok2str(ospf_topology_values, "Unknown", topology),
+                               topology,
+                               (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1);
+                       if ((ul & ASLA_MASK_METRIC) == 0xffffff)
+                               ND_PRINT(" infinite");
+                       else
+                               ND_PRINT(" %u", (ul & ASLA_MASK_METRIC));
+
+                       ND_TCHECK_4(&almp->asla_forward);
                        if (almp->asla_forward.s_addr) {
                        if (almp->asla_forward.s_addr) {
-                               printf(", forward %s",
-                                   ipaddr_string(&almp->asla_forward));
+                               ND_PRINT(", forward %s", ipaddr_string(ndo, &almp->asla_forward));
                        }
                        }
-                       TCHECK(almp->asla_tag);
+                       ND_TCHECK_4(&almp->asla_tag);
                        if (almp->asla_tag.s_addr) {
                        if (almp->asla_tag.s_addr) {
-                               printf(", tag %s",
-                                   ipaddr_string(&almp->asla_tag));
+                               ND_PRINT(", tag %s", ipaddr_string(ndo, &almp->asla_tag));
                        }
                        ++almp;
                }
                        }
                        ++almp;
                }
@@ -707,23 +775,23 @@ ospf_print_lsa(register const struct lsa *lsap)
        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) {
-                       TCHECK(mcp->mcla_vid);
-                       switch (EXTRACT_32BITS(&mcp->mcla_vtype)) {
+               while ((const u_char *)mcp < ls_end) {
+                       ND_TCHECK_4(&mcp->mcla_vid);
+                       switch (EXTRACT_BE_U_4(mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
 
                        case MCLA_VERTEX_ROUTER:
-                               printf("\n\t    Router Router-ID %s",
-                                   ipaddr_string(&mcp->mcla_vid));
+                               ND_PRINT("\n\t    Router Router-ID %s",
+                                   ipaddr_string(ndo, &mcp->mcla_vid));
                                break;
 
                        case MCLA_VERTEX_NETWORK:
                                break;
 
                        case MCLA_VERTEX_NETWORK:
-                               printf("\n\t    Network Designated Router %s",
-                                   ipaddr_string(&mcp->mcla_vid));
+                               ND_PRINT("\n\t    Network Designated Router %s",
+                                   ipaddr_string(ndo, &mcp->mcla_vid));
                                break;
 
                        default:
                                break;
 
                        default:
-                               printf("\n\t    unknown VertexType (%u)",
-                                   EXTRACT_32BITS(&mcp->mcla_vtype));
+                               ND_PRINT("\n\t    unknown VertexType (%u)",
+                                   EXTRACT_BE_U_4(mcp->mcla_vtype));
                                break;
                        }
                ++mcp;
                                break;
                        }
                ++mcp;
@@ -731,48 +799,48 @@ ospf_print_lsa(register const struct lsa *lsap)
                break;
 
        case LS_TYPE_OPAQUE_LL: /* fall through */
                break;
 
        case LS_TYPE_OPAQUE_LL: /* fall through */
-       case LS_TYPE_OPAQUE_AL: 
+       case LS_TYPE_OPAQUE_AL:
        case LS_TYPE_OPAQUE_DW:
 
        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) {
-                    TCHECK2(*tptr, 4);
+                    ND_TCHECK_4(tptr);
                    if (ls_length < 4) {
                    if (ls_length < 4) {
-                        printf("\n\t    Remaining LS length %u < 4", ls_length);
+                        ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
                         return(ls_end);
                     }
                         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;
-                    
-                    printf("\n\t    %s TLV (%u), length: %u, value: ",
+
+                    ND_PRINT("\n\t    %s TLV (%u), length: %u, value: ",
                            tok2str(lsa_opaque_ri_tlv_values,"unknown",tlv_type),
                            tlv_type,
                            tlv_length);
 
                     if (tlv_length > ls_length) {
                            tok2str(lsa_opaque_ri_tlv_values,"unknown",tlv_type),
                            tlv_type,
                            tlv_length);
 
                     if (tlv_length > ls_length) {
-                        printf("\n\t    Bogus length %u > %u", tlv_length,
+                        ND_PRINT("\n\t    Bogus length %u > %u", tlv_length,
                             ls_length);
                         return(ls_end);
                     }
                             ls_length);
                         return(ls_end);
                     }
-                    TCHECK2(*tptr, tlv_length);
+                    ND_TCHECK_LEN(tptr, tlv_length);
                     switch(tlv_type) {
 
                     case LS_OPAQUE_RI_TLV_CAP:
                         if (tlv_length != 4) {
                     switch(tlv_type) {
 
                     case LS_OPAQUE_RI_TLV_CAP:
                         if (tlv_length != 4) {
-                            printf("\n\t    Bogus length %u != 4", tlv_length);
+                            ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                             return(ls_end);
                         }
                             return(ls_end);
                         }
-                        printf("Capabilities: %s",
-                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_32BITS(tptr)));
+                        ND_PRINT("Capabilities: %s",
+                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_BE_U_4(tptr)));
                         break;
                     default:
                         break;
                     default:
-                        if (vflag <= 1) {
-                            if(!print_unknown_data(tptr,"\n\t      ",tlv_length))
+                        if (ndo->ndo_vflag <= 1) {
+                            if (!print_unknown_data(ndo, tptr, "\n\t      ", tlv_length))
                                 return(ls_end);
                         }
                         break;
                                 return(ls_end);
                         }
                         break;
@@ -784,60 +852,60 @@ ospf_print_lsa(register const struct lsa *lsap)
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
-                if (ospf_print_grace_lsa((u_int8_t *)(&lsap->lsa_un.un_grace_tlv.type),
+                if (ospf_print_grace_lsa(ndo, (const u_char *)(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((u_int8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type),
+                if (ospf_print_te_lsa(ndo, (const u_char *)(lsap->lsa_un.un_te_lsa_tlv),
                                       ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
             default:
                                       ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
             default:
-                if (vflag <= 1) {
-                    if(!print_unknown_data((u_int8_t *)lsap->lsa_un.un_unknown,
+                if (ndo->ndo_vflag <= 1) {
+                    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);
-                } 
+                }
                 break;
             }
         }
 
         /* do we want to see an additionally hexdump ? */
                 break;
             }
         }
 
         /* do we want to see an additionally hexdump ? */
-        if (vflag> 1)
-            if(!print_unknown_data((u_int8_t *)lsap->lsa_un.un_unknown,
+        if (ndo->ndo_vflag> 1)
+            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);
             }
-        
+
        return (ls_end);
 trunc:
        return (NULL);
 }
 
 static int
        return (ls_end);
 trunc:
        return (NULL);
 }
 
 static int
-ospf_decode_lls(register const struct ospfhdr *op,
-    register u_int length)
+ospf_decode_lls(netdissect_options *ndo,
+                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;
 
@@ -846,60 +914,60 @@ ospf_decode_lls(register const struct ospfhdr *op,
     }
 
     /* 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];
     }
     if (length2 >= length) {
         dptr = dptr + op->ospf_authdata[3];
         length2 += op->ospf_authdata[3];
     }
     if (length2 >= length) {
-        printf("\n\t[LLS truncated]");
+        ND_PRINT("\n\t[LLS truncated]");
         return (1);
     }
         return (1);
     }
-    TCHECK2(*dptr, 2);
-    printf("\n\t  LLS: checksum: 0x%04x", (u_int)EXTRACT_16BITS(dptr));
+    ND_TCHECK_2(dptr);
+    ND_PRINT("\n\t  LLS: checksum: 0x%04x", (u_int) EXTRACT_BE_U_2(dptr));
 
     dptr += 2;
 
     dptr += 2;
-    TCHECK2(*dptr, 2);
-    length2 = EXTRACT_16BITS(dptr);
-    printf(", length: %u", length2);
+    ND_TCHECK_2(dptr);
+    length2 = EXTRACT_BE_U_2(dptr);
+    ND_PRINT(", length: %u", length2);
 
     dptr += 2;
 
     dptr += 2;
-    TCHECK(*dptr);
+    ND_TCHECK_1(dptr);
     while (dptr < dataend) {
     while (dptr < dataend) {
-        TCHECK2(*dptr, 2);
-        lls_type = EXTRACT_16BITS(dptr);
-        printf("\n\t    %s (%u)",
+        ND_TCHECK_2(dptr);
+        lls_type = EXTRACT_BE_U_2(dptr);
+        ND_PRINT("\n\t    %s (%u)",
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                lls_type);
         dptr += 2;
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                lls_type);
         dptr += 2;
-        TCHECK2(*dptr, 2);
-        lls_len = EXTRACT_16BITS(dptr);
-        printf(", length: %u", lls_len);
+        ND_TCHECK_2(dptr);
+        lls_len = EXTRACT_BE_U_2(dptr);
+        ND_PRINT(", length: %u", lls_len);
         dptr += 2;
         switch (lls_type) {
 
         case OSPF_LLS_EO:
             if (lls_len != 4) {
         dptr += 2;
         switch (lls_type) {
 
         case OSPF_LLS_EO:
             if (lls_len != 4) {
-                printf(" [should be 4]");
+                ND_PRINT(" [should be 4]");
                 lls_len = 4;
             }
                 lls_len = 4;
             }
-            TCHECK2(*dptr, 4);
-            lls_flags = EXTRACT_32BITS(dptr);
-            printf("\n\t      Options: 0x%08x [%s]", lls_flags,
-                   bittok2str(ospf_lls_eo_options,"?",lls_flags));
+            ND_TCHECK_4(dptr);
+            lls_flags = EXTRACT_BE_U_4(dptr);
+            ND_PRINT("\n\t      Options: 0x%08x [%s]", lls_flags,
+                   bittok2str(ospf_lls_eo_options, "?", lls_flags));
 
             break;
 
         case OSPF_LLS_MD5:
             if (lls_len != 20) {
 
             break;
 
         case OSPF_LLS_MD5:
             if (lls_len != 20) {
-                printf(" [should be 20]");
+                ND_PRINT(" [should be 20]");
                 lls_len = 20;
             }
                 lls_len = 20;
             }
-                       TCHECK2(*dptr, 4);
-            printf("\n\t      Sequence number: 0x%08x", EXTRACT_32BITS(dptr));
+            ND_TCHECK_4(dptr);
+            ND_PRINT("\n\t      Sequence number: 0x%08x", EXTRACT_BE_U_4(dptr));
             break;
         }
 
             break;
         }
 
@@ -912,114 +980,108 @@ trunc:
 }
 
 static int
 }
 
 static int
-ospf_decode_v2(register const struct ospfhdr *op,
-    register const u_char *dataend)
+ospf_decode_v2(netdissect_options *ndo,
+               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;
-
-       case OSPF_TYPE_HELLO:
-                printf("\n\tOptions [%s]",
-                       bittok2str(ospf_option_values2,"none",op->ospf_hello.hello_options));
+       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;
 
 
-                TCHECK(op->ospf_hello.hello_deadint);
-                printf("\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),
-                       ipaddr_string(&op->ospf_hello.hello_mask),
-                       op->ospf_hello.hello_priority);
+       switch (EXTRACT_U_1(op->ospf_type)) {
 
 
-               TCHECK(op->ospf_hello.hello_dr);
+       case OSPF_TYPE_HELLO:
+               ND_TCHECK_1(op->ospf_hello.hello_options);
+               ND_PRINT("\n\tOptions [%s]",
+                         bittok2str(ospf_option_values,"none",EXTRACT_U_1(op->ospf_hello.hello_options)));
+
+               ND_TCHECK_4(op->ospf_hello.hello_deadint);
+               ND_PRINT("\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
+                         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),
+                         EXTRACT_U_1(op->ospf_hello.hello_priority));
+
+               ND_TCHECK_4(&op->ospf_hello.hello_dr);
                if (op->ospf_hello.hello_dr.s_addr != 0)
                if (op->ospf_hello.hello_dr.s_addr != 0)
-                       printf("\n\t  Designated Router %s",
-                           ipaddr_string(&op->ospf_hello.hello_dr));
+                       ND_PRINT("\n\t  Designated Router %s",
+                           ipaddr_string(ndo, &op->ospf_hello.hello_dr));
 
 
-               TCHECK(op->ospf_hello.hello_bdr);
+               ND_TCHECK_4(&op->ospf_hello.hello_bdr);
                if (op->ospf_hello.hello_bdr.s_addr != 0)
                if (op->ospf_hello.hello_bdr.s_addr != 0)
-                       printf(", Backup Designated Router %s",
-                           ipaddr_string(&op->ospf_hello.hello_bdr));
-
-                ap = op->ospf_hello.hello_neighbor;
-                if ((u_char *)ap < dataend)
-                        printf("\n\t  Neighbor List:");
-                while ((u_char *)ap < dataend) {
-                        TCHECK(*ap);
-                        printf("\n\t    %s", ipaddr_string(ap));
-                        ++ap;
-                }
+                       ND_PRINT(", Backup Designated Router %s",
+                                 ipaddr_string(ndo, &op->ospf_hello.hello_bdr));
+
+               ap = op->ospf_hello.hello_neighbor;
+               if ((const u_char *)ap < dataend)
+                       ND_PRINT("\n\t  Neighbor List:");
+               while ((const u_char *)ap < dataend) {
+                       ND_TCHECK_SIZE(ap);
+                       ND_PRINT("\n\t    %s", ipaddr_string(ndo, ap));
+                       ++ap;
+               }
                break;  /* HELLO */
 
        case OSPF_TYPE_DD:
                break;  /* HELLO */
 
        case OSPF_TYPE_DD:
-               TCHECK(op->ospf_db.db_options);
-                printf("\n\tOptions [%s]",
-                       bittok2str(ospf_option_values2,"none",op->ospf_db.db_options));
-               TCHECK(op->ospf_db.db_flags);
-                printf(", DD Flags [%s]",
-                       bittok2str(ospf_dd_flag_values,"none",op->ospf_db.db_flags));
-                TCHECK(op->ospf_db.db_ifmtu);
-                if (op->ospf_db.db_ifmtu) {
-                        printf(", MTU: %u", ntohs(op->ospf_db.db_ifmtu));
-                }
-                TCHECK(op->ospf_db.db_seq);
-                printf(", Sequence: 0x%08x", ntohl(op->ospf_db.db_seq));
+               ND_TCHECK_1(op->ospf_db.db_options);
+               ND_PRINT("\n\tOptions [%s]",
+                         bittok2str(ospf_option_values, "none", EXTRACT_U_1(op->ospf_db.db_options)));
+               ND_TCHECK_1(op->ospf_db.db_flags);
+               ND_PRINT(", DD Flags [%s]",
+                         bittok2str(ospf_dd_flag_values, "none", EXTRACT_U_1(op->ospf_db.db_flags)));
+               ND_TCHECK_2(op->ospf_db.db_ifmtu);
+               if (EXTRACT_BE_U_2(op->ospf_db.db_ifmtu)) {
+                       ND_PRINT(", MTU: %u", EXTRACT_BE_U_2(op->ospf_db.db_ifmtu));
+               }
+               ND_TCHECK_4(op->ospf_db.db_seq);
+               ND_PRINT(", Sequence: 0x%08x", EXTRACT_BE_U_4(op->ospf_db.db_seq));
 
 
-                /* Print all the LS adv's */
-                lshp = op->ospf_db.db_lshdr;
-                while ((u_char *)lshp < dataend && ospf_print_lshdr(lshp) != -1) {
-                    ++lshp;
-                }
+               /* Print all the LS adv's */
+               lshp = op->ospf_db.db_lshdr;
+               while (((const u_char *)lshp < dataend) && ospf_print_lshdr(ndo, lshp) != -1) {
+                       ++lshp;
+               }
                break;
 
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
                break;
 
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
-                while ((u_char *)lsrp < dataend) {
-                    TCHECK(*lsrp);
+                while ((const u_char *)lsrp < dataend) {
+                    ND_TCHECK_SIZE(lsrp);
 
 
-                    printf("\n\t  Advertising Router: %s, %s LSA (%u)",
-                           ipaddr_string(&lsrp->ls_router),
-                           tok2str(lsa_values,"unknown",EXTRACT_32BITS(lsrp->ls_type)),
-                           EXTRACT_32BITS(&lsrp->ls_type));
+                    ND_PRINT("\n\t  Advertising Router: %s, %s LSA (%u)",
+                           ipaddr_string(ndo, &lsrp->ls_router),
+                           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:
                         /* the LSA header for opaque LSAs was slightly changed */
                     case LS_TYPE_OPAQUE_LL:
                     case LS_TYPE_OPAQUE_AL:
                     case LS_TYPE_OPAQUE_DW:
-                        printf(", 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));
+                        ND_PRINT(", Opaque-Type: %s LSA (%u), Opaque-ID: %u",
+                               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:
                         break;
                     default:
-                        printf(", LSA-ID: %s",
-                               ipaddr_string(&lsrp->un_ls_stateid.ls_stateid));
+                        ND_PRINT(", LSA-ID: %s",
+                               ipaddr_string(ndo, &lsrp->un_ls_stateid.ls_stateid));
                         break;
                     }
                         break;
                     }
-                    
+
                     ++lsrp;
                 }
                break;
 
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
                     ++lsrp;
                 }
                break;
 
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
-                TCHECK(op->ospf_lsu.lsu_count);
-                lsa_count_max = EXTRACT_32BITS(&op->ospf_lsu.lsu_count);
-                printf(", %d LSA%s",lsa_count_max, lsa_count_max > 1 ? "s" : "");
+                ND_TCHECK_4(op->ospf_lsu.lsu_count);
+                lsa_count_max = EXTRACT_BE_U_4(op->ospf_lsu.lsu_count);
+                ND_PRINT(", %u LSA%s", lsa_count_max, PLURAL_SUFFIX(lsa_count_max));
                 for (lsa_count=1;lsa_count <= lsa_count_max;lsa_count++) {
                 for (lsa_count=1;lsa_count <= lsa_count_max;lsa_count++) {
-                    printf("\n\t  LSA #%u",lsa_count);
-                        lsap = (const struct lsa *)ospf_print_lsa(lsap);
+                    ND_PRINT("\n\t  LSA #%u", lsa_count);
+                        lsap = (const struct lsa *)ospf_print_lsa(ndo, lsap);
                         if (lsap == NULL)
                                 goto trunc;
                 }
                         if (lsap == NULL)
                                 goto trunc;
                 }
@@ -1027,7 +1089,7 @@ ospf_decode_v2(register const struct ospfhdr *op,
 
        case OSPF_TYPE_LS_ACK:
                 lshp = op->ospf_lsa.lsa_lshdr;
 
        case OSPF_TYPE_LS_ACK:
                 lshp = op->ospf_lsa.lsa_lshdr;
-                while (ospf_print_lshdr(lshp) != -1) {
+                while (ospf_print_lshdr(ndo, lshp) != -1) {
                     ++lshp;
                 }
                 break;
                     ++lshp;
                 }
                 break;
@@ -1041,80 +1103,78 @@ trunc:
 }
 
 void
 }
 
 void
-ospf_print(register const u_char *bp, register u_int length,
-    const u_char *bp2 _U_)
+ospf_print(netdissect_options *ndo,
+           const u_char *bp, u_int length,
+           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 */
-        TCHECK(op->ospf_authtype);
-        if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
-                length -= OSPF_AUTH_MD5_LEN;
-                snapend -= OSPF_AUTH_MD5_LEN;
-        }
+       /* XXX Before we do anything else, strip off the MD5 trailer */
+       ND_TCHECK_2(op->ospf_authtype);
+       if (EXTRACT_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
+               length -= OSPF_AUTH_MD5_LEN;
+               ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
+       }
 
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
 
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
-       TCHECK(op->ospf_type);
-       cp = tok2str(type2str, "unknown LS-type", op->ospf_type);
-       printf("OSPFv%u, %s, length %u",
-              op->ospf_version,
-              cp,
-              length);
+       ND_TCHECK_1(op->ospf_type);
+       cp = tok2str(type2str, "unknown LS-type %u", EXTRACT_U_1(op->ospf_type));
+       ND_PRINT("OSPFv%u, %s, length %u", EXTRACT_U_1(op->ospf_version), cp, length);
        if (*cp == 'u')
                return;
 
        if (*cp == 'u')
                return;
 
-        if(!vflag) { /* non verbose - so lets bail out here */
-                return;
-        }
+       if (!ndo->ndo_vflag) { /* non verbose - so lets bail out here */
+               return;
+       }
 
 
-       TCHECK(op->ospf_len);
-       if (length != EXTRACT_16BITS(&op->ospf_len)) {
-               printf(" [len %d]", EXTRACT_16BITS(&op->ospf_len));
+       ND_TCHECK_2(op->ospf_len);
+       if (length != EXTRACT_BE_U_2(op->ospf_len)) {
+               ND_PRINT(" [len %u]", 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;
        }
 
-       TCHECK(op->ospf_routerid);
-        printf("\n\tRouter-ID %s", ipaddr_string(&op->ospf_routerid));
+       ND_TCHECK_4(&op->ospf_routerid);
+       ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf_routerid));
 
 
-       TCHECK(op->ospf_areaid);
+       ND_TCHECK_4(&op->ospf_areaid);
        if (op->ospf_areaid.s_addr != 0)
        if (op->ospf_areaid.s_addr != 0)
-               printf(", Area %s", ipaddr_string(&op->ospf_areaid));
+               ND_PRINT(", Area %s", ipaddr_string(ndo, &op->ospf_areaid));
        else
        else
-               printf(", Backbone Area");
+               ND_PRINT(", Backbone Area");
 
 
-       if (vflag) {
+       if (ndo->ndo_vflag) {
                /* Print authentication data (should we really do this?) */
                /* Print authentication data (should we really do this?) */
-               TCHECK2(op->ospf_authdata[0], sizeof(op->ospf_authdata));
+               ND_TCHECK_LEN(op->ospf_authdata, sizeof(op->ospf_authdata));
 
 
-                printf(", Authentication Type: %s (%u)",
-                       tok2str(ospf_authtype_values,"unknown",EXTRACT_16BITS(&op->ospf_authtype)),
-                       EXTRACT_16BITS(&op->ospf_authtype));
+               ND_PRINT(", Authentication Type: %s (%u)",
+                         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_SIMPLE:
 
                case OSPF_AUTH_NONE:
                        break;
 
                case OSPF_AUTH_SIMPLE:
-                        printf("\n\tSimple text password: ");
-                        safeputs((const char *)op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
+                       ND_PRINT("\n\tSimple text password: ");
+                       safeputs(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
                        break;
 
                case OSPF_AUTH_MD5:
                        break;
 
                case OSPF_AUTH_MD5:
-                        printf("\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));
+                       ND_PRINT("\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
+                                 *((op->ospf_authdata) + 2),
+                                 *((op->ospf_authdata) + 3),
+                                 EXTRACT_BE_U_4((op->ospf_authdata) + 4));
                        break;
 
                default:
                        break;
 
                default:
@@ -1122,24 +1182,24 @@ ospf_print(register const u_char *bp, register u_int length,
                }
        }
        /* 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 */
 
        case 2:
                /* ospf version 2 */
-               if (ospf_decode_v2(op, dataend))
+               if (ospf_decode_v2(ndo, op, dataend))
                        goto trunc;
                        goto trunc;
-               if (length > EXTRACT_16BITS(&op->ospf_len)) {
-                       if (ospf_decode_lls(op, length))
+               if (length > EXTRACT_BE_U_2(op->ospf_len)) {
+                       if (ospf_decode_lls(ndo, op, length))
                                goto trunc;
                }
                break;
 
        default:
                                goto trunc;
                }
                break;
 
        default:
-               printf(" ospf [version %d]", op->ospf_version);
+               ND_PRINT(" ospf [version %u]", EXTRACT_U_1(op->ospf_version));
                break;
        }                       /* end switch on version */
 
        return;
 trunc:
                break;
        }                       /* end switch on version */
 
        return;
 trunc:
-       fputs(tstr, stdout);
+       ND_PRINT("%s", tstr);
 }
 }
[mirror] the TCPdump network dissector