]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert partially the commit 21b1273
[tcpdump] / print-ospf.c
diff --git a/print-ospf.c b/print-ospf.c
index 37e829e3df91c1e9c232180716780455f17ba359..098763774ad53010454bbc6ae1e2b1dbdd254f94 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -24,10 +24,10 @@
 /* \summary: Open Shortest Path First (OSPF) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Open Shortest Path First (OSPF) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -36,7 +36,6 @@
 
 #include "ospf.h"
 
 
 #include "ospf.h"
 
-static const char tstr[] = " [|ospf2]";
 
 static const struct tok ospf_option_values[] = {
         { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
 
 static const struct tok ospf_option_values[] = {
         { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
@@ -180,8 +179,8 @@ static const struct tok ospf_lls_eo_options[] = {
 };
 
 int
 };
 
 int
-ospf_print_grace_lsa(netdissect_options *ndo,
-                     const uint8_t *tptr, u_int ls_length)
+ospf_grace_lsa_print(netdissect_options *ndo,
+                     const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length;
 
 {
     u_int tlv_type, tlv_length;
 
@@ -189,22 +188,22 @@ ospf_print_grace_lsa(netdissect_options *ndo,
     while (ls_length > 0) {
         ND_TCHECK_4(tptr);
         if (ls_length < 4) {
     while (ls_length > 0) {
         ND_TCHECK_4(tptr);
         if (ls_length < 4) {
-            ND_PRINT((ndo, "\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_BE_U_2(tptr);
-        tlv_length = EXTRACT_BE_U_2(tptr + 2);
+        tlv_type = GET_BE_U_2(tptr);
+        tlv_length = GET_BE_U_2(tptr + 2);
         tptr+=4;
         ls_length-=4;
 
         tptr+=4;
         ls_length-=4;
 
-        ND_PRINT((ndo, "\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,
                tok2str(lsa_opaque_grace_tlv_values,"unknown",tlv_type),
                tlv_type,
-               tlv_length));
+               tlv_length);
 
         if (tlv_length > ls_length) {
 
         if (tlv_length > ls_length) {
-            ND_PRINT((ndo, "\n\t    Bogus length %u > %u", tlv_length,
-                   ls_length));
+            ND_PRINT("\n\t    Bogus length %u > %u", tlv_length,
+                   ls_length);
             return -1;
         }
 
             return -1;
         }
 
@@ -213,33 +212,33 @@ 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:
             if (tlv_length != 4) {
         switch(tlv_type) {
 
         case LS_OPAQUE_GRACE_TLV_PERIOD:
             if (tlv_length != 4) {
-                ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
+                ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            ND_PRINT((ndo, "%us", EXTRACT_BE_U_4(tptr)));
+            ND_PRINT("%us", GET_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) {
-                ND_PRINT((ndo, "\n\t    Bogus length %u != 1", tlv_length));
+                ND_PRINT("\n\t    Bogus length %u != 1", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            ND_PRINT((ndo, "%s (%u)",
-                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", EXTRACT_U_1(tptr)),
-                   EXTRACT_U_1(tptr)));
+            ND_PRINT("%s (%u)",
+                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", GET_U_1(tptr)),
+                   GET_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) {
-                ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
+                ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            ND_PRINT((ndo, "%s", ipaddr_string(ndo, tptr)));
+            ND_PRINT("%s", GET_IPADDR_STRING(tptr));
             break;
 
         default:
             break;
 
         default:
@@ -263,8 +262,8 @@ trunc:
 }
 
 int
 }
 
 int
-ospf_print_te_lsa(netdissect_options *ndo,
-                  const uint8_t *tptr, u_int ls_length)
+ospf_te_lsa_print(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;
 {
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
@@ -276,22 +275,22 @@ ospf_print_te_lsa(netdissect_options *ndo,
     while (ls_length != 0) {
         ND_TCHECK_4(tptr);
         if (ls_length < 4) {
     while (ls_length != 0) {
         ND_TCHECK_4(tptr);
         if (ls_length < 4) {
-            ND_PRINT((ndo, "\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_BE_U_2(tptr);
-        tlv_length = EXTRACT_BE_U_2(tptr + 2);
+        tlv_type = GET_BE_U_2(tptr);
+        tlv_length = GET_BE_U_2(tptr + 2);
         tptr+=4;
         ls_length-=4;
 
         tptr+=4;
         ls_length-=4;
 
-        ND_PRINT((ndo, "\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,
                tok2str(lsa_opaque_te_tlv_values,"unknown",tlv_type),
                tlv_type,
-               tlv_length));
+               tlv_length);
 
         if (tlv_length > ls_length) {
 
         if (tlv_length > ls_length) {
-            ND_PRINT((ndo, "\n\t    Bogus length %u > %u", tlv_length,
-                   ls_length));
+            ND_PRINT("\n\t    Bogus length %u > %u", tlv_length,
+                   ls_length);
             return -1;
         }
 
             return -1;
         }
 
@@ -302,15 +301,14 @@ ospf_print_te_lsa(netdissect_options *ndo,
 
         switch(tlv_type) {
         case LS_OPAQUE_TE_TLV_LINK:
 
         switch(tlv_type) {
         case LS_OPAQUE_TE_TLV_LINK:
-            while (tlv_length >= sizeof(subtlv_type) + sizeof(subtlv_length)) {
+            while (tlv_length != 0) {
                 if (tlv_length < 4) {
                 if (tlv_length < 4) {
-                    ND_PRINT((ndo, "\n\t    Remaining TLV length %u < 4",
-                           tlv_length));
+                    ND_PRINT("\n\t    Remaining TLV length %u < 4",
+                           tlv_length);
                     return -1;
                 }
                     return -1;
                 }
-                ND_TCHECK_4(tptr);
-                subtlv_type = EXTRACT_BE_U_2(tptr);
-                subtlv_length = EXTRACT_BE_U_2(tptr + 2);
+                subtlv_type = GET_BE_U_2(tptr);
+                subtlv_length = GET_BE_U_2(tptr + 2);
                 tptr+=4;
                 tlv_length-=4;
 
                 tptr+=4;
                 tlv_length-=4;
 
@@ -318,146 +316,151 @@ ospf_print_te_lsa(netdissect_options *ndo,
                if (subtlv_type == 0 || subtlv_length == 0)
                    goto invalid;
 
                if (subtlv_type == 0 || subtlv_length == 0)
                    goto invalid;
 
-                ND_PRINT((ndo, "\n\t      %s subTLV (%u), length: %u",
+                ND_PRINT("\n\t      %s subTLV (%u), length: %u",
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
-                       subtlv_length));
+                       subtlv_length);
 
 
-                ND_TCHECK2(*tptr, subtlv_length);
+                if (tlv_length < subtlv_length) {
+                    ND_PRINT("\n\t    Remaining TLV length %u < %u",
+                           tlv_length + 4, subtlv_length + 4);
+                    return -1;
+                }
+                ND_TCHECK_LEN(tptr, subtlv_length);
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
                    if (subtlv_length != 4) {
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
                    if (subtlv_length != 4) {
-                       ND_PRINT((ndo, " != 4"));
+                       ND_PRINT(" != 4");
                        goto invalid;
                    }
                        goto invalid;
                    }
-                    ND_PRINT((ndo, ", 0x%08x", EXTRACT_BE_U_4(tptr)));
+                    ND_PRINT(", 0x%08x", GET_BE_U_4(tptr));
                     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) {
                     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"));
+                       ND_PRINT(" != 4 && != 8");
                        goto invalid;
                    }
                        goto invalid;
                    }
-                    ND_PRINT((ndo, ", %s (0x%08x)",
-                           ipaddr_string(ndo, tptr),
-                           EXTRACT_BE_U_4(tptr)));
+                    ND_PRINT(", %s (0x%08x)",
+                           GET_IPADDR_STRING(tptr),
+                           GET_BE_U_4(tptr));
                     if (subtlv_length == 8) /* rfc4203 */
                     if (subtlv_length == 8) /* rfc4203 */
-                        ND_PRINT((ndo, ", %s (0x%08x)",
-                               ipaddr_string(ndo, tptr+4),
-                               EXTRACT_BE_U_4(tptr + 4)));
+                        ND_PRINT(", %s (0x%08x)",
+                               GET_IPADDR_STRING(tptr+4),
+                               GET_BE_U_4(tptr + 4));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                 case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
                    if (subtlv_length != 4) {
                     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"));
+                       ND_PRINT(" != 4");
                        goto invalid;
                    }
                        goto invalid;
                    }
-                    ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
+                    ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
                    if (subtlv_length != 4) {
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
                    if (subtlv_length != 4) {
-                       ND_PRINT((ndo, " != 4"));
+                       ND_PRINT(" != 4");
                        goto invalid;
                    }
                        goto invalid;
                    }
-                    bw.i = EXTRACT_BE_U_4(tptr);
-                    ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000));
+                    bw.i = GET_BE_U_4(tptr);
+                    ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000);
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
                    if (subtlv_length != 32) {
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
                    if (subtlv_length != 32) {
-                       ND_PRINT((ndo, " != 32"));
+                       ND_PRINT(" != 32");
                        goto invalid;
                    }
                     for (te_class = 0; te_class < 8; te_class++) {
                        goto invalid;
                    }
                     for (te_class = 0; te_class < 8; te_class++) {
-                        bw.i = EXTRACT_BE_U_4(tptr + te_class * 4);
-                        ND_PRINT((ndo, "\n\t\tTE-Class %u: %.3f Mbps",
+                        bw.i = GET_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:
                    if (subtlv_length < 4) {
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
                    if (subtlv_length < 4) {
-                       ND_PRINT((ndo, " < 4"));
+                       ND_PRINT(" < 4");
                        goto invalid;
                    }
                    /* BC Model Id (1 octet) + Reserved (3 octets) */
                        goto invalid;
                    }
                    /* BC Model Id (1 octet) + Reserved (3 octets) */
-                    ND_PRINT((ndo, "\n\t\tBandwidth Constraints Model ID: %s (%u)",
-                           tok2str(diffserv_te_bc_values, "unknown", EXTRACT_U_1(tptr)),
-                           EXTRACT_U_1(tptr)));
+                    ND_PRINT("\n\t\tBandwidth Constraints Model ID: %s (%u)",
+                           tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)),
+                           GET_U_1(tptr));
                    if (subtlv_length % 4 != 0) {
                    if (subtlv_length % 4 != 0) {
-                       ND_PRINT((ndo, "\n\t\tlength %u != N x 4", subtlv_length));
+                       ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length);
                        goto invalid;
                    }
                    if (subtlv_length > 36) {
                        goto invalid;
                    }
                    if (subtlv_length > 36) {
-                       ND_PRINT((ndo, "\n\t\tlength %u > 36", subtlv_length));
+                       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++) {
                        goto invalid;
                    }
                     /* decode BCs until the subTLV ends */
                     for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
-                        bw.i = EXTRACT_BE_U_4(tptr + 4 + te_class * 4);
-                        ND_PRINT((ndo, "\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
+                        bw.i = GET_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:
                    if (subtlv_length != 4) {
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
                    if (subtlv_length != 4) {
-                       ND_PRINT((ndo, " != 4"));
+                       ND_PRINT(" != 4");
                        goto invalid;
                    }
                        goto invalid;
                    }
-                    ND_PRINT((ndo, ", Metric %u", EXTRACT_BE_U_4(tptr)));
+                    ND_PRINT(", Metric %u", GET_BE_U_4(tptr));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
                    /* Protection Cap (1 octet) + Reserved ((3 octets) */
                    if (subtlv_length != 4) {
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
                    /* Protection Cap (1 octet) + Reserved ((3 octets) */
                    if (subtlv_length != 4) {
-                       ND_PRINT((ndo, " != 4"));
+                       ND_PRINT(" != 4");
                        goto invalid;
                    }
                        goto invalid;
                    }
-                    ND_PRINT((ndo, ", %s",
-                             bittok2str(gmpls_link_prot_values, "none", EXTRACT_U_1(tptr))));
+                    ND_PRINT(", %s",
+                             bittok2str(gmpls_link_prot_values, "none", GET_U_1(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
                    if (subtlv_length < 36) {
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
                    if (subtlv_length < 36) {
-                       ND_PRINT((ndo, " < 36"));
+                       ND_PRINT(" < 36");
                        goto invalid;
                    }
                    /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
                        goto invalid;
                    }
                    /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
-                    ND_PRINT((ndo, "\n\t\tInterface Switching Capability: %s",
-                           tok2str(gmpls_switch_cap_values, "Unknown", EXTRACT_U_1((tptr)))));
-                    ND_PRINT((ndo, "\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
-                           tok2str(gmpls_encoding_values, "Unknown", EXTRACT_U_1((tptr + 1)))));
+                    ND_PRINT("\n\t\tInterface Switching Capability: %s",
+                           tok2str(gmpls_switch_cap_values, "Unknown", GET_U_1((tptr))));
+                    ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
+                           tok2str(gmpls_encoding_values, "Unknown", GET_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_BE_U_4(tptr + 4 + (priority_level * 4));
-                        ND_PRINT((ndo, "\n\t\t  priority level %d: %.3f Mbps",
+                        bw.i = GET_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:
                    if (subtlv_length != 1) {
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
                    if (subtlv_length != 1) {
-                       ND_PRINT((ndo, " != 1"));
+                       ND_PRINT(" != 1");
                        goto invalid;
                    }
                        goto invalid;
                    }
-                    ND_PRINT((ndo, ", %s (%u)",
-                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",EXTRACT_U_1(tptr)),
-                           EXTRACT_U_1(tptr)));
+                    ND_PRINT(", %s (%u)",
+                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",GET_U_1(tptr)),
+                           GET_U_1(tptr));
                     break;
 
                 case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
                    if (subtlv_length % 4 != 0) {
                     break;
 
                 case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
                    if (subtlv_length % 4 != 0) {
-                       ND_PRINT((ndo, " != N x 4"));
+                       ND_PRINT(" != N x 4");
                        goto invalid;
                    }
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
                        goto invalid;
                    }
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
-                        ND_PRINT((ndo, "\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_BE_U_4(tptr);
-                        ND_PRINT((ndo, "%d", bw.i));
+                        bw.i = GET_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)
-                            ND_PRINT((ndo, ", "));
+                            ND_PRINT(", ");
                     }
                     break;
 
                     }
                     break;
 
@@ -472,6 +475,11 @@ ospf_print_te_lsa(netdissect_options *ndo,
                 if (subtlv_length%4 != 0)
                     subtlv_length+=4-(subtlv_length%4);
 
                 if (subtlv_length%4 != 0)
                     subtlv_length+=4-(subtlv_length%4);
 
+                if (tlv_length < subtlv_length) {
+                    ND_PRINT("\n\t    Remaining TLV length %u < %u",
+                           tlv_length + 4, subtlv_length + 4);
+                    return -1;
+                }
                 tlv_length-=subtlv_length;
                 tptr+=subtlv_length;
 
                 tlv_length-=subtlv_length;
                 tptr+=subtlv_length;
 
@@ -480,11 +488,10 @@ ospf_print_te_lsa(netdissect_options *ndo,
 
         case LS_OPAQUE_TE_TLV_ROUTER:
             if (tlv_length < 4) {
 
         case LS_OPAQUE_TE_TLV_ROUTER:
             if (tlv_length < 4) {
-                ND_PRINT((ndo, "\n\t    TLV length %u < 4", tlv_length));
+                ND_PRINT("\n\t    TLV length %u < 4", tlv_length);
                 return -1;
             }
                 return -1;
             }
-            ND_TCHECK_4(tptr);
-            ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
+            ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
             break;
 
         default:
             break;
 
         default:
@@ -497,6 +504,11 @@ ospf_print_te_lsa(netdissect_options *ndo,
         /* in OSPF everything has to be 32-bit aligned, including TLVs */
         if (tlv_length%4 != 0)
             tlv_length+=4-(tlv_length%4);
         /* in OSPF everything has to be 32-bit aligned, including TLVs */
         if (tlv_length%4 != 0)
             tlv_length+=4-(tlv_length%4);
+        if (tlv_length > ls_length) {
+            ND_PRINT("\n\t    Bogus padded length %u > %u", tlv_length,
+                   ls_length);
+            return -1;
+        }
         ls_length-=tlv_length;
         tptr+=tlv_length;
     }
         ls_length-=tlv_length;
         tptr+=tlv_length;
     }
@@ -504,65 +516,59 @@ ospf_print_te_lsa(netdissect_options *ndo,
 trunc:
     return -1;
 invalid:
 trunc:
     return -1;
 invalid:
-    ND_PRINT((ndo, "%s", istr));
+    nd_print_invalid(ndo);
     return -1;
 }
 
 static int
 ospf_print_lshdr(netdissect_options *ndo,
     return -1;
 }
 
 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;
 
         u_int ls_length;
 
-        ND_TCHECK(lshp->ls_length);
-        ls_length = EXTRACT_BE_U_2(&lshp->ls_length);
+        ls_length = GET_BE_U_2(lshp->ls_length);
         if (ls_length < 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)));
+                ND_PRINT("\n\t    Bogus length %u < header (%zu)", ls_length,
+                    sizeof(struct lsa_hdr));
                 return(-1);
         }
                 return(-1);
         }
-
-        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_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 */
-        switch (lshp->ls_type) {
+        ND_PRINT("\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
+                  GET_IPADDR_STRING(lshp->ls_router),
+                  GET_BE_U_4(lshp->ls_seq),
+                  GET_BE_U_2(lshp->ls_age),
+                  ls_length - (u_int)sizeof(struct lsa_hdr));
+        ls_type = GET_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:
         /* 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,
+            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_BE_U_3(&lshp->un_lsa_id.opaque_field.opaque_id)
+                          GET_U_1(lshp->un_lsa_id.opaque_field.opaque_type)),
+                  GET_U_1(lshp->un_lsa_id.opaque_field.opaque_type),
+                  GET_BE_U_3(lshp->un_lsa_id.opaque_field.opaque_id)
 
 
-                   ));
+                   );
             break;
 
         /* all other LSA types use regular style LSA headers */
         default:
             break;
 
         /* 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,
-                   ipaddr_string(ndo, &lshp->un_lsa_id.lsa_id)));
+            ND_PRINT("\n\t    %s LSA (%u), LSA-ID: %s",
+                   tok2str(lsa_values,"unknown",ls_type),
+                   ls_type,
+                   GET_IPADDR_STRING(lshp->un_lsa_id.lsa_id));
             break;
         }
             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("\n\t    Options: [%s]",
+                bittok2str(ospf_option_values, "none", GET_U_1(lshp->ls_options)));
 
         return (ls_length);
 
         return (ls_length);
-trunc:
-       return (-1);
 }
 
 /* draft-ietf-ospf-mt-09 */
 }
 
 /* draft-ietf-ospf-mt-09 */
@@ -580,22 +586,24 @@ 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 = GET_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 > 0) {
-        ND_TCHECK(*tos);
-        ND_PRINT((ndo, "\n\t\ttopology %s (%u), metric %u",
+    while (toscount != 0) {
+        ND_TCHECK_SIZE(tos);
+        tos_type = GET_U_1(tos->metrics.tos_type);
+        ND_PRINT("\n\t\ttopology %s (%u), metric %u",
                tok2str(ospf_topology_values, "Unknown",
                tok2str(ospf_topology_values, "Unknown",
-                       metric_count ? tos->metrics.tos_type : 0),
-               metric_count ? tos->metrics.tos_type : 0,
-               EXTRACT_BE_U_2(&tos->metrics.tos_metric)));
+                       metric_count ? tos_type : 0),
+               metric_count ? tos_type : 0,
+               GET_BE_U_2(tos->metrics.tos_metric));
         metric_count++;
         tos++;
         toscount--;
         metric_count++;
         tos++;
         toscount--;
@@ -612,67 +620,71 @@ trunc:
  */
 static const uint8_t *
 ospf_print_lsa(netdissect_options *ndo,
  */
 static const uint8_t *
 ospf_print_lsa(netdissect_options *ndo,
-               register const struct lsa *lsap)
+               const struct lsa *lsap)
 {
 {
-       register const uint8_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 uint32_t *lp;
-       register int j, tlv_type, tlv_length, topology;
-       register int ls_length;
+       const uint8_t *ls_end;
+       const struct rlalink *rlp;
+       const nd_ipv4 *ap;
+       const struct aslametric *almp;
+       const struct mcla *mcp;
+       const uint8_t *lp;
+       u_int tlv_type, tlv_length, rla_count, topology;
+       int ospf_print_lshdr_ret;
+       u_int ls_length;
        const uint8_t *tptr;
 
        tptr = (const uint8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
        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);
+       ospf_print_lshdr_ret = ospf_print_lshdr(ndo, &lsap->ls_hdr);
+       if (ospf_print_lshdr_ret < 0)
+               return(NULL);
+       ls_length = (u_int)ospf_print_lshdr_ret;
        ls_end = (const uint8_t *)lsap + ls_length;
        ls_end = (const uint8_t *)lsap + ls_length;
+       /*
+        * ospf_print_lshdr() returns -1 if the length is too short,
+        * so we know ls_length is >= sizeof(struct lsa_hdr).
+        */
        ls_length -= sizeof(struct lsa_hdr);
 
        ls_length -= sizeof(struct lsa_hdr);
 
-       switch (lsap->ls_hdr.ls_type) {
+       switch (GET_U_1(lsap->ls_hdr.ls_type)) {
 
        case LS_TYPE_ROUTER:
 
        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)));
+               ND_PRINT("\n\t    Router LSA Options: [%s]",
+                         bittok2str(ospf_rla_flag_values, "none", GET_U_1(lsap->lsa_un.un_rla.rla_flags)));
 
 
-               ND_TCHECK(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);
+               rla_count = GET_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;
                rlp = lsap->lsa_un.un_rla.rla_link;
-               while (j--) {
-                       ND_TCHECK(*rlp);
-                       switch (rlp->un_tos.link.link_type) {
+               for (u_int i = rla_count; i != 0; i--) {
+                       ND_TCHECK_SIZE(rlp);
+                       switch (GET_U_1(rlp->un_tos.link.link_type)) {
 
                        case RLA_TYPE_VIRTUAL:
 
                        case RLA_TYPE_VIRTUAL:
-                               ND_PRINT((ndo, "\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
-                                   ipaddr_string(ndo, &rlp->link_id),
-                                   ipaddr_string(ndo, &rlp->link_data)));
+                               ND_PRINT("\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        case RLA_TYPE_ROUTER:
                                break;
 
                        case RLA_TYPE_ROUTER:
-                               ND_PRINT((ndo, "\n\t      Neighbor Router-ID: %s, Interface Address: %s",
-                                   ipaddr_string(ndo, &rlp->link_id),
-                                   ipaddr_string(ndo, &rlp->link_data)));
+                               ND_PRINT("\n\t      Neighbor Router-ID: %s, Interface Address: %s",
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        case RLA_TYPE_TRANSIT:
                                break;
 
                        case RLA_TYPE_TRANSIT:
-                               ND_PRINT((ndo, "\n\t      Neighbor Network-ID: %s, Interface Address: %s",
-                                   ipaddr_string(ndo, &rlp->link_id),
-                                   ipaddr_string(ndo, &rlp->link_data)));
+                               ND_PRINT("\n\t      Neighbor Network-ID: %s, Interface Address: %s",
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        case RLA_TYPE_STUB:
                                break;
 
                        case RLA_TYPE_STUB:
-                               ND_PRINT((ndo, "\n\t      Stub Network: %s, Mask: %s",
-                                   ipaddr_string(ndo, &rlp->link_id),
-                                   ipaddr_string(ndo, &rlp->link_data)));
+                               ND_PRINT("\n\t      Stub Network: %s, Mask: %s",
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        default:
                                break;
 
                        default:
-                               ND_PRINT((ndo, "\n\t      Unknown Router Link Type (%u)",
-                                   rlp->un_tos.link.link_type));
+                               ND_PRINT("\n\t      Unknown Router Link Type (%u)",
+                                   GET_U_1(rlp->un_tos.link.link_type));
                                return (ls_end);
                        }
 
                                return (ls_end);
                        }
 
@@ -680,89 +692,83 @@ ospf_print_lsa(netdissect_options *ndo,
                                goto trunc;
 
                        rlp = (const struct rlalink *)((const u_char *)(rlp + 1) +
                                goto trunc;
 
                        rlp = (const struct rlalink *)((const u_char *)(rlp + 1) +
-                           ((rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
+                           (GET_U_1(rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
                }
                break;
 
        case LS_TYPE_NETWORK:
                }
                break;
 
        case LS_TYPE_NETWORK:
-               ND_TCHECK(lsap->lsa_un.un_nla.nla_mask);
-               ND_PRINT((ndo, "\n\t    Mask %s\n\t    Connected Routers:",
-                   ipaddr_string(ndo, &lsap->lsa_un.un_nla.nla_mask)));
+               ND_PRINT("\n\t    Mask %s\n\t    Connected Routers:",
+                   GET_IPADDR_STRING(lsap->lsa_un.un_nla.nla_mask));
                ap = lsap->lsa_un.un_nla.nla_router;
                while ((const u_char *)ap < ls_end) {
                ap = lsap->lsa_un.un_nla.nla_router;
                while ((const u_char *)ap < ls_end) {
-                       ND_TCHECK(*ap);
-                       ND_PRINT((ndo, "\n\t      %s", ipaddr_string(ndo, ap)));
+                       ND_TCHECK_SIZE(ap);
+                       ND_PRINT("\n\t      %s", GET_IPADDR_STRING(*ap));
                        ++ap;
                }
                break;
 
        case LS_TYPE_SUM_IP:
                        ++ap;
                }
                break;
 
        case LS_TYPE_SUM_IP:
-               ND_TCHECK(lsap->lsa_un.un_nla.nla_mask);
-               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 ((const u_char *)lp < ls_end) {
-                       register uint32_t ul;
-
-                       ND_TCHECK(*lp);
-                       ul = EXTRACT_BE_U_4(lp);
+               ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
+               ND_PRINT("\n\t    Mask %s",
+                   GET_IPADDR_STRING(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;
+
+                       ul = GET_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",
+                       ND_PRINT("\n\t\ttopology %s (%u) metric %u",
                                tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
-                               ul & SLA_MASK_METRIC));
-                       ++lp;
+                               ul & SLA_MASK_METRIC);
+                       lp += 4;
                }
                break;
 
        case LS_TYPE_SUM_ABR:
                }
                break;
 
        case LS_TYPE_SUM_ABR:
-               ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
-               lp = lsap->lsa_un.un_sla.sla_tosmetric;
-               while ((const u_char *)lp < ls_end) {
-                       register uint32_t ul;
+               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(*lp);
-                       ul = EXTRACT_BE_U_4(lp);
+                       ul = GET_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",
+                       ND_PRINT("\n\t\ttopology %s (%u) metric %u",
                                tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
-                               ul & SLA_MASK_METRIC));
-                       ++lp;
+                               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 */
-               ND_TCHECK(lsap->lsa_un.un_nla.nla_mask);
-               ND_PRINT((ndo, "\n\t    Mask %s",
-                   ipaddr_string(ndo, &lsap->lsa_un.un_asla.asla_mask)));
+               ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
+               ND_PRINT("\n\t    Mask %s",
+                   GET_IPADDR_STRING(lsap->lsa_un.un_asla.asla_mask));
 
 
-               ND_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;
                while ((const u_char *)almp < ls_end) {
                almp = lsap->lsa_un.un_asla.asla_metric;
                while ((const u_char *)almp < ls_end) {
-                       register uint32_t ul;
+                       uint32_t ul;
 
 
-                       ND_TCHECK(almp->asla_tosmetric);
-                       ul = EXTRACT_BE_U_4(&almp->asla_tosmetric);
+                       ul = GET_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",
+                       ND_PRINT("\n\t\ttopology %s (%u), type %u, metric",
                                tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
-                               (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1));
+                               (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1);
                        if ((ul & ASLA_MASK_METRIC) == 0xffffff)
                        if ((ul & ASLA_MASK_METRIC) == 0xffffff)
-                               ND_PRINT((ndo, " infinite"));
+                               ND_PRINT(" infinite");
                        else
                        else
-                               ND_PRINT((ndo, " %d", (ul & ASLA_MASK_METRIC)));
+                               ND_PRINT(" %u", (ul & ASLA_MASK_METRIC));
 
 
-                       ND_TCHECK(almp->asla_forward);
-                       if (almp->asla_forward.s_addr) {
-                               ND_PRINT((ndo, ", forward %s", ipaddr_string(ndo, &almp->asla_forward)));
+                       if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_forward) != 0) {
+                               ND_PRINT(", forward %s", GET_IPADDR_STRING(almp->asla_forward));
                        }
                        }
-                       ND_TCHECK(almp->asla_tag);
-                       if (almp->asla_tag.s_addr) {
-                               ND_PRINT((ndo, ", tag %s", ipaddr_string(ndo, &almp->asla_tag)));
+                       if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) {
+                               ND_PRINT(", tag %s", GET_IPADDR_STRING(almp->asla_tag));
                        }
                        ++almp;
                }
                        }
                        ++almp;
                }
@@ -772,22 +778,21 @@ ospf_print_lsa(netdissect_options *ndo,
                /* Multicast extensions as of 23 July 1991 */
                mcp = lsap->lsa_un.un_mcla;
                while ((const u_char *)mcp < ls_end) {
                /* Multicast extensions as of 23 July 1991 */
                mcp = lsap->lsa_un.un_mcla;
                while ((const u_char *)mcp < ls_end) {
-                       ND_TCHECK(mcp->mcla_vid);
-                       switch (EXTRACT_BE_U_4(&mcp->mcla_vtype)) {
+                       switch (GET_BE_U_4(mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
 
                        case MCLA_VERTEX_ROUTER:
-                               ND_PRINT((ndo, "\n\t    Router Router-ID %s",
-                                   ipaddr_string(ndo, &mcp->mcla_vid)));
+                               ND_PRINT("\n\t    Router Router-ID %s",
+                                   GET_IPADDR_STRING(mcp->mcla_vid));
                                break;
 
                        case MCLA_VERTEX_NETWORK:
                                break;
 
                        case MCLA_VERTEX_NETWORK:
-                               ND_PRINT((ndo, "\n\t    Network Designated Router %s",
-                                   ipaddr_string(ndo, &mcp->mcla_vid)));
+                               ND_PRINT("\n\t    Network Designated Router %s",
+                                   GET_IPADDR_STRING(mcp->mcla_vid));
                                break;
 
                        default:
                                break;
 
                        default:
-                               ND_PRINT((ndo, "\n\t    unknown VertexType (%u)",
-                                   EXTRACT_BE_U_4(&mcp->mcla_vtype)));
+                               ND_PRINT("\n\t    unknown VertexType (%u)",
+                                   GET_BE_U_4(mcp->mcla_vtype));
                                break;
                        }
                ++mcp;
                                break;
                        }
                ++mcp;
@@ -798,41 +803,42 @@ 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 (GET_U_1(lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
             case LS_OPAQUE_TYPE_RI:
             case LS_OPAQUE_TYPE_RI:
-               tptr = (const uint8_t *)(&lsap->lsa_un.un_ri_tlv.type);
+               tptr = (const uint8_t *)(lsap->lsa_un.un_ri_tlv);
 
 
-               while (ls_length != 0) {
+               u_int ls_length_remaining = ls_length;
+               while (ls_length_remaining != 0) {
                     ND_TCHECK_4(tptr);
                     ND_TCHECK_4(tptr);
-                   if (ls_length < 4) {
-                        ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
+                   if (ls_length_remaining < 4) {
+                        ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length_remaining);
                         return(ls_end);
                     }
                         return(ls_end);
                     }
-                    tlv_type = EXTRACT_BE_U_2(tptr);
-                    tlv_length = EXTRACT_BE_U_2(tptr + 2);
+                    tlv_type = GET_BE_U_2(tptr);
+                    tlv_length = GET_BE_U_2(tptr + 2);
                     tptr+=4;
                     tptr+=4;
-                    ls_length-=4;
+                    ls_length_remaining-=4;
 
 
-                    ND_PRINT((ndo, "\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,
                            tok2str(lsa_opaque_ri_tlv_values,"unknown",tlv_type),
                            tlv_type,
-                           tlv_length));
+                           tlv_length);
 
 
-                    if (tlv_length > ls_length) {
-                        ND_PRINT((ndo, "\n\t    Bogus length %u > %u", tlv_length,
-                            ls_length));
+                    if (tlv_length > ls_length_remaining) {
+                        ND_PRINT("\n\t    Bogus length %u > remaining LS length %u", tlv_length,
+                            ls_length_remaining);
                         return(ls_end);
                     }
                         return(ls_end);
                     }
-                    ND_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) {
-                            ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
+                            ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                             return(ls_end);
                         }
                             return(ls_end);
                         }
-                        ND_PRINT((ndo, "Capabilities: %s",
-                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_BE_U_4(tptr))));
+                        ND_PRINT("Capabilities: %s",
+                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", GET_BE_U_4(tptr)));
                         break;
                     default:
                         if (ndo->ndo_vflag <= 1) {
                         break;
                     default:
                         if (ndo->ndo_vflag <= 1) {
@@ -843,19 +849,19 @@ ospf_print_lsa(netdissect_options *ndo,
 
                     }
                     tptr+=tlv_length;
 
                     }
                     tptr+=tlv_length;
-                    ls_length-=tlv_length;
+                    ls_length_remaining-=tlv_length;
                 }
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
                 }
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
-                if (ospf_print_grace_lsa(ndo, (const uint8_t *)(&lsap->lsa_un.un_grace_tlv.type),
+                if (ospf_grace_lsa_print(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(ndo, (const uint8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type),
+                if (ospf_te_lsa_print(ndo, (const u_char *)(lsap->lsa_un.un_te_lsa_tlv),
                                       ls_length) == -1) {
                     return(ls_end);
                 }
                                       ls_length) == -1) {
                     return(ls_end);
                 }
@@ -885,23 +891,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 uint16_t lls_type, lls_len;
-    register uint32_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 (GET_U_1(op->ospf_type)) {
 
     case OSPF_TYPE_HELLO:
 
     case OSPF_TYPE_HELLO:
-        if (!(op->ospf_hello.hello_options & OSPF_OPTION_L))
+        if (!(GET_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 (!(GET_U_1(op->ospf_db.db_options) & OSPF_OPTION_L))
             return (0);
         break;
 
             return (0);
         break;
 
@@ -910,60 +916,53 @@ 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_BE_U_2(&op->ospf_len);
+    length2 = GET_BE_U_2(op->ospf_len);
     dptr = (const u_char *)op + length2;
     dataend = (const u_char *)op + length;
 
     dptr = (const u_char *)op + length2;
     dataend = (const u_char *)op + length;
 
-    if (EXTRACT_BE_U_2(&op->ospf_authtype) == OSPF_AUTH_MD5) {
+    if (GET_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) {
-        ND_PRINT((ndo, "\n\t[LLS truncated]"));
+        ND_PRINT("\n\t[LLS truncated]");
         return (1);
     }
         return (1);
     }
-    ND_TCHECK_2(dptr);
-    ND_PRINT((ndo, "\n\t  LLS: checksum: 0x%04x", (u_int) EXTRACT_BE_U_2(dptr)));
+    ND_PRINT("\n\t  LLS: checksum: 0x%04x", (u_int) GET_BE_U_2(dptr));
 
     dptr += 2;
 
     dptr += 2;
-    ND_TCHECK_2(dptr);
-    length2 = EXTRACT_BE_U_2(dptr);
-    ND_PRINT((ndo, ", length: %u", length2));
+    length2 = GET_BE_U_2(dptr);
+    ND_PRINT(", length: %u", length2);
 
     dptr += 2;
 
     dptr += 2;
-    ND_TCHECK(*dptr);
     while (dptr < dataend) {
     while (dptr < dataend) {
-        ND_TCHECK_2(dptr);
-        lls_type = EXTRACT_BE_U_2(dptr);
-        ND_PRINT((ndo, "\n\t    %s (%u)",
+        lls_type = GET_BE_U_2(dptr);
+        ND_PRINT("\n\t    %s (%u)",
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
-               lls_type));
+               lls_type);
         dptr += 2;
         dptr += 2;
-        ND_TCHECK_2(dptr);
-        lls_len = EXTRACT_BE_U_2(dptr);
-        ND_PRINT((ndo, ", length: %u", lls_len));
+        lls_len = GET_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) {
-                ND_PRINT((ndo, " [should be 4]"));
+                ND_PRINT(" [should be 4]");
                 lls_len = 4;
             }
                 lls_len = 4;
             }
-            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)));
+            lls_flags = GET_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) {
-                ND_PRINT((ndo, " [should be 20]"));
+                ND_PRINT(" [should be 20]");
                 lls_len = 20;
             }
                 lls_len = 20;
             }
-            ND_TCHECK_4(dptr);
-            ND_PRINT((ndo, "\n\t      Sequence number: 0x%08x", EXTRACT_BE_U_4(dptr)));
+            ND_PRINT("\n\t      Sequence number: 0x%08x", GET_BE_U_4(dptr));
             break;
         }
 
             break;
         }
 
@@ -971,67 +970,58 @@ ospf_decode_lls(netdissect_options *ndo,
     }
 
     return (0);
     }
 
     return (0);
-trunc:
-    return (1);
 }
 
 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 uint32_t lsa_count,lsa_count_max;
+       const nd_ipv4 *ap;
+       const struct lsr *lsrp;
+       const struct lsa_hdr *lshp;
+       const struct lsa *lsap;
+       uint32_t lsa_count,lsa_count_max;
 
 
-       switch (op->ospf_type) {
+       switch (GET_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]",
-                         bittok2str(ospf_option_values,"none",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",
-                         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),
-                         op->ospf_hello.hello_priority));
-
-               ND_TCHECK(op->ospf_hello.hello_dr);
-               if (op->ospf_hello.hello_dr.s_addr != 0)
-                       ND_PRINT((ndo, "\n\t  Designated Router %s",
-                           ipaddr_string(ndo, &op->ospf_hello.hello_dr)));
-
-               ND_TCHECK(op->ospf_hello.hello_bdr);
-               if (op->ospf_hello.hello_bdr.s_addr != 0)
-                       ND_PRINT((ndo, ", Backup Designated Router %s",
-                                 ipaddr_string(ndo, &op->ospf_hello.hello_bdr)));
+               ND_PRINT("\n\tOptions [%s]",
+                         bittok2str(ospf_option_values,"none",GET_U_1(op->ospf_hello.hello_options)));
+
+               ND_PRINT("\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
+                         GET_BE_U_2(op->ospf_hello.hello_helloint),
+                         GET_BE_U_4(op->ospf_hello.hello_deadint),
+                         GET_IPADDR_STRING(op->ospf_hello.hello_mask),
+                         GET_U_1(op->ospf_hello.hello_priority));
+
+               if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_dr) != 0)
+                       ND_PRINT("\n\t  Designated Router %s",
+                           GET_IPADDR_STRING(op->ospf_hello.hello_dr));
+
+               if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_bdr) != 0)
+                       ND_PRINT(", Backup Designated Router %s",
+                                 GET_IPADDR_STRING(op->ospf_hello.hello_bdr));
 
                ap = op->ospf_hello.hello_neighbor;
                if ((const u_char *)ap < dataend)
 
                ap = op->ospf_hello.hello_neighbor;
                if ((const u_char *)ap < dataend)
-                       ND_PRINT((ndo, "\n\t  Neighbor List:"));
+                       ND_PRINT("\n\t  Neighbor List:");
                while ((const u_char *)ap < dataend) {
                while ((const u_char *)ap < dataend) {
-                       ND_TCHECK(*ap);
-                       ND_PRINT((ndo, "\n\t    %s", ipaddr_string(ndo, ap)));
+                       ND_TCHECK_SIZE(ap);
+                       ND_PRINT("\n\t    %s", GET_IPADDR_STRING(*ap));
                        ++ap;
                }
                break;  /* HELLO */
 
        case OSPF_TYPE_DD:
                        ++ap;
                }
                break;  /* HELLO */
 
        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)));
-               ND_TCHECK(op->ospf_db.db_flags);
-               ND_PRINT((ndo, ", DD Flags [%s]",
-                         bittok2str(ospf_dd_flag_values, "none", op->ospf_db.db_flags)));
-               ND_TCHECK(op->ospf_db.db_ifmtu);
-               if (op->ospf_db.db_ifmtu) {
-                       ND_PRINT((ndo, ", MTU: %u", EXTRACT_BE_U_2(&op->ospf_db.db_ifmtu)));
+               ND_PRINT("\n\tOptions [%s]",
+                         bittok2str(ospf_option_values, "none", GET_U_1(op->ospf_db.db_options)));
+               ND_PRINT(", DD Flags [%s]",
+                         bittok2str(ospf_dd_flag_values, "none", GET_U_1(op->ospf_db.db_flags)));
+               if (GET_BE_U_2(op->ospf_db.db_ifmtu)) {
+                       ND_PRINT(", MTU: %u",
+                                GET_BE_U_2(op->ospf_db.db_ifmtu));
                }
                }
-               ND_TCHECK(op->ospf_db.db_seq);
-               ND_PRINT((ndo, ", Sequence: 0x%08x", EXTRACT_BE_U_4(&op->ospf_db.db_seq)));
+               ND_PRINT(", Sequence: 0x%08x", GET_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;
@@ -1043,26 +1033,26 @@ ospf_decode_v2(netdissect_options *ndo,
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
                 while ((const u_char *)lsrp < dataend) {
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
                 while ((const u_char *)lsrp < dataend) {
-                    ND_TCHECK(*lsrp);
+                    ND_TCHECK_SIZE(lsrp);
 
 
-                    ND_PRINT((ndo, "\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)));
+                    ND_PRINT("\n\t  Advertising Router: %s, %s LSA (%u)",
+                           GET_IPADDR_STRING(lsrp->ls_router),
+                           tok2str(lsa_values,"unknown",GET_BE_U_4(lsrp->ls_type)),
+                           GET_BE_U_4(lsrp->ls_type));
 
 
-                    switch (EXTRACT_BE_U_4(lsrp->ls_type)) {
+                    switch (GET_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:
-                        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_BE_U_3(&lsrp->un_ls_stateid.opaque_field.opaque_id)));
+                        ND_PRINT(", Opaque-Type: %s LSA (%u), Opaque-ID: %u",
+                               tok2str(lsa_opaque_values, "unknown",GET_U_1(lsrp->un_ls_stateid.opaque_field.opaque_type)),
+                               GET_U_1(lsrp->un_ls_stateid.opaque_field.opaque_type),
+                               GET_BE_U_3(lsrp->un_ls_stateid.opaque_field.opaque_id));
                         break;
                     default:
                         break;
                     default:
-                        ND_PRINT((ndo, ", LSA-ID: %s",
-                               ipaddr_string(ndo, &lsrp->un_ls_stateid.ls_stateid)));
+                        ND_PRINT(", LSA-ID: %s",
+                               GET_IPADDR_STRING(lsrp->un_ls_stateid.ls_stateid));
                         break;
                     }
 
                         break;
                     }
 
@@ -1072,11 +1062,10 @@ ospf_decode_v2(netdissect_options *ndo,
 
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
 
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
-                ND_TCHECK(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)));
+                lsa_count_max = GET_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++) {
-                    ND_PRINT((ndo, "\n\t  LSA #%u", lsa_count));
+                    ND_PRINT("\n\t  LSA #%u", lsa_count);
                         lsap = (const struct lsa *)ospf_print_lsa(ndo, lsap);
                         if (lsap == NULL)
                                 goto trunc;
                         lsap = (const struct lsa *)ospf_print_lsa(ndo, lsap);
                         if (lsap == NULL)
                                 goto trunc;
@@ -1100,27 +1089,27 @@ 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;
 
 
+       ndo->ndo_protocol = "ospf2";
        op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
        op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
-       ND_TCHECK(op->ospf_authtype);
-       if (EXTRACT_BE_U_2(&op->ospf_authtype) == OSPF_AUTH_MD5) {
+       if (GET_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 */
                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 */
-       ND_TCHECK(op->ospf_type);
-       cp = tok2str(type2str, "unknown LS-type %u", op->ospf_type);
-       ND_PRINT((ndo, "OSPFv%u, %s, length %u", op->ospf_version, cp, length));
+       cp = tok2str(type2str, "unknown LS-type %u", GET_U_1(op->ospf_type));
+       ND_PRINT("OSPFv%u, %s, length %u", GET_U_1(op->ospf_version), cp,
+                length);
        if (*cp == 'u')
                return;
 
        if (*cp == 'u')
                return;
 
@@ -1128,49 +1117,46 @@ ospf_print(netdissect_options *ndo,
                return;
        }
 
                return;
        }
 
-       ND_TCHECK(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 != GET_BE_U_2(op->ospf_len)) {
+               ND_PRINT(" [len %u]", GET_BE_U_2(op->ospf_len));
        }
 
        }
 
-       if (length > EXTRACT_BE_U_2(&op->ospf_len)) {
-               dataend = bp + EXTRACT_BE_U_2(&op->ospf_len);
+       if (length > GET_BE_U_2(op->ospf_len)) {
+               dataend = bp + GET_BE_U_2(op->ospf_len);
        } else {
                dataend = bp + length;
        }
 
        } else {
                dataend = bp + length;
        }
 
-       ND_TCHECK(op->ospf_routerid);
-       ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf_routerid)));
+       ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf_routerid));
 
 
-       ND_TCHECK(op->ospf_areaid);
-       if (op->ospf_areaid.s_addr != 0)
-               ND_PRINT((ndo, ", Area %s", ipaddr_string(ndo, &op->ospf_areaid)));
+       if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0)
+               ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf_areaid));
        else
        else
-               ND_PRINT((ndo, ", Backbone Area"));
+               ND_PRINT(", Backbone Area");
 
        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)",
-                         tok2str(ospf_authtype_values, "unknown", EXTRACT_BE_U_2(&op->ospf_authtype)),
-                         EXTRACT_BE_U_2(&op->ospf_authtype)));
+               ND_PRINT(", Authentication Type: %s (%u)",
+                         tok2str(ospf_authtype_values, "unknown", GET_BE_U_2(op->ospf_authtype)),
+                         GET_BE_U_2(op->ospf_authtype));
 
 
-               switch (EXTRACT_BE_U_2(&op->ospf_authtype)) {
+               switch (GET_BE_U_2(op->ospf_authtype)) {
 
                case OSPF_AUTH_NONE:
                        break;
 
                case OSPF_AUTH_SIMPLE:
 
                case OSPF_AUTH_NONE:
                        break;
 
                case OSPF_AUTH_SIMPLE:
-                       ND_PRINT((ndo, "\n\tSimple text password: "));
-                       safeputs(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
+                       ND_PRINT("\n\tSimple text password: ");
+                       (void)nd_printzp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN, NULL);
                        break;
 
                case OSPF_AUTH_MD5:
                        break;
 
                case OSPF_AUTH_MD5:
-                       ND_PRINT((ndo, "\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
+                       ND_PRINT("\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
                                  *((op->ospf_authdata) + 2),
                                  *((op->ospf_authdata) + 3),
                                  *((op->ospf_authdata) + 2),
                                  *((op->ospf_authdata) + 3),
-                                 EXTRACT_BE_U_4((op->ospf_authdata) + 4)));
+                                 GET_BE_U_4((op->ospf_authdata) + 4));
                        break;
 
                default:
                        break;
 
                default:
@@ -1178,24 +1164,24 @@ ospf_print(netdissect_options *ndo,
                }
        }
        /* Do rest according to version.         */
                }
        }
        /* Do rest according to version.         */
-       switch (op->ospf_version) {
+       switch (GET_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_BE_U_2(&op->ospf_len)) {
+               if (length > GET_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(" ospf [version %u]", GET_U_1(op->ospf_version));
                break;
        }                       /* end switch on version */
 
        return;
 trunc:
                break;
        }                       /* end switch on version */
 
        return;
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       nd_print_trunc(ndo);
 }
 }
[mirror] the TCPdump network dissector