]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ospf: clean up some length checks.
[tcpdump] / print-ospf.c
diff --git a/print-ospf.c b/print-ospf.c
index a37b5b1fd4e8d7675d807eadf69d61111c599ed7..7d3578004c8946ffe5d9622ed9df1ba1a48d330e 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -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,7 +179,7 @@ static const struct tok ospf_lls_eo_options[] = {
 };
 
 int
 };
 
 int
-ospf_print_grace_lsa(netdissect_options *ndo,
+ospf_grace_lsa_print(netdissect_options *ndo,
                      const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length;
                      const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length;
@@ -192,8 +191,8 @@ ospf_print_grace_lsa(netdissect_options *ndo,
             ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
             return -1;
         }
             ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
             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;
 
@@ -221,7 +220,7 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
                 ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
-            ND_PRINT("%us", EXTRACT_BE_U_4(tptr));
+            ND_PRINT("%us", GET_BE_U_4(tptr));
             break;
 
         case LS_OPAQUE_GRACE_TLV_REASON:
             break;
 
         case LS_OPAQUE_GRACE_TLV_REASON:
@@ -230,8 +229,8 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 return -1;
             }
             ND_PRINT("%s (%u)",
                 return -1;
             }
             ND_PRINT("%s (%u)",
-                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", EXTRACT_U_1(tptr)),
-                   EXTRACT_U_1(tptr));
+                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", GET_U_1(tptr)),
+                   GET_U_1(tptr));
             break;
 
         case LS_OPAQUE_GRACE_TLV_INT_ADDRESS:
             break;
 
         case LS_OPAQUE_GRACE_TLV_INT_ADDRESS:
@@ -239,7 +238,7 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
                 ND_PRINT("\n\t    Bogus length %u != 4", tlv_length);
                 return -1;
             }
-            ND_PRINT("%s", ipaddr_string(ndo, tptr));
+            ND_PRINT("%s", GET_IPADDR_STRING(tptr));
             break;
 
         default:
             break;
 
         default:
@@ -263,7 +262,7 @@ trunc:
 }
 
 int
 }
 
 int
-ospf_print_te_lsa(netdissect_options *ndo,
+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;
                   const u_char *tptr, u_int ls_length)
 {
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
@@ -279,8 +278,8 @@ ospf_print_te_lsa(netdissect_options *ndo,
             ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
             return -1;
         }
             ND_PRINT("\n\t    Remaining LS length %u < 4", ls_length);
             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;
 
@@ -302,15 +301,15 @@ 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) {
                     ND_PRINT("\n\t    Remaining TLV length %u < 4",
                            tlv_length);
                     return -1;
                 }
                 ND_TCHECK_4(tptr);
                 if (tlv_length < 4) {
                     ND_PRINT("\n\t    Remaining TLV length %u < 4",
                            tlv_length);
                     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;
 
@@ -323,6 +322,11 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        subtlv_type,
                        subtlv_length);
 
                        subtlv_type,
                        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:
                 ND_TCHECK_LEN(tptr, subtlv_length);
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
@@ -330,7 +334,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
-                    ND_PRINT(", 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:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID:
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID:
@@ -339,12 +343,12 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        goto invalid;
                    }
                     ND_PRINT(", %s (0x%08x)",
                        goto invalid;
                    }
                     ND_PRINT(", %s (0x%08x)",
-                           ipaddr_string(ndo, tptr),
-                           EXTRACT_BE_U_4(tptr));
+                           GET_IPADDR_STRING(tptr),
+                           GET_BE_U_4(tptr));
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT(", %s (0x%08x)",
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT(", %s (0x%08x)",
-                               ipaddr_string(ndo, tptr+4),
-                               EXTRACT_BE_U_4(tptr + 4));
+                               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:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                 case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
@@ -352,7 +356,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
-                    ND_PRINT(", %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:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
@@ -360,7 +364,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
-                    bw.i = EXTRACT_BE_U_4(tptr);
+                    bw.i = GET_BE_U_4(tptr);
                     ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000);
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
                     ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000);
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
@@ -369,7 +373,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        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);
+                        bw.i = GET_BE_U_4(tptr + te_class * 4);
                         ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000);
                         ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000);
@@ -382,8 +386,8 @@ ospf_print_te_lsa(netdissect_options *ndo,
                    }
                    /* BC Model Id (1 octet) + Reserved (3 octets) */
                     ND_PRINT("\n\t\tBandwidth Constraints Model ID: %s (%u)",
                    }
                    /* 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));
+                           tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)),
+                           GET_U_1(tptr));
                    if (subtlv_length % 4 != 0) {
                        ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length);
                        goto invalid;
                    if (subtlv_length % 4 != 0) {
                        ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length);
                        goto invalid;
@@ -394,7 +398,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                    }
                     /* 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_BE_U_4(tptr + 4 + te_class * 4);
+                        bw.i = GET_BE_U_4(tptr + 4 + te_class * 4);
                         ND_PRINT("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000);
                         ND_PRINT("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000);
@@ -405,7 +409,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
                        ND_PRINT(" != 4");
                        goto invalid;
                    }
-                    ND_PRINT(", 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) */
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
                    /* Protection Cap (1 octet) + Reserved ((3 octets) */
@@ -414,7 +418,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        goto invalid;
                    }
                     ND_PRINT(", %s",
                        goto invalid;
                    }
                     ND_PRINT(", %s",
-                             bittok2str(gmpls_link_prot_values, "none", EXTRACT_U_1(tptr)));
+                             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) {
@@ -423,11 +427,11 @@ ospf_print_te_lsa(netdissect_options *ndo,
                    }
                    /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
                     ND_PRINT("\n\t\tInterface Switching Capability: %s",
                    }
                    /* 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))));
+                           tok2str(gmpls_switch_cap_values, "Unknown", GET_U_1((tptr))));
                     ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
                     ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
-                           tok2str(gmpls_encoding_values, "Unknown", EXTRACT_U_1((tptr + 1))));
+                           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));
+                        bw.i = GET_BE_U_4(tptr + 4 + (priority_level * 4));
                         ND_PRINT("\n\t\t  priority level %u: %.3f Mbps",
                                priority_level,
                                bw.f * 8 / 1000000);
                         ND_PRINT("\n\t\t  priority level %u: %.3f Mbps",
                                priority_level,
                                bw.f * 8 / 1000000);
@@ -439,8 +443,8 @@ ospf_print_te_lsa(netdissect_options *ndo,
                        goto invalid;
                    }
                     ND_PRINT(", %s (%u)",
                        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));
+                           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:
                     break;
 
                 case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
@@ -452,7 +456,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                     if (count_srlg != 0)
                         ND_PRINT("\n\t\t  Shared risk group: ");
                     while (count_srlg > 0) {
                     if (count_srlg != 0)
                         ND_PRINT("\n\t\t  Shared risk group: ");
                     while (count_srlg > 0) {
-                        bw.i = EXTRACT_BE_U_4(tptr);
+                        bw.i = GET_BE_U_4(tptr);
                         ND_PRINT("%u", bw.i);
                         tptr+=4;
                         count_srlg--;
                         ND_PRINT("%u", bw.i);
                         tptr+=4;
                         count_srlg--;
@@ -472,6 +476,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;
 
@@ -484,7 +493,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                 return -1;
             }
             ND_TCHECK_4(tptr);
                 return -1;
             }
             ND_TCHECK_4(tptr);
-            ND_PRINT(", %s", ipaddr_string(ndo, tptr));
+            ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
             break;
 
         default:
             break;
 
         default:
@@ -497,6 +506,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,7 +518,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 trunc:
     return -1;
 invalid:
 trunc:
     return -1;
 invalid:
-    ND_PRINT("%s", istr);
+    nd_print_invalid(ndo);
     return -1;
 }
 
     return -1;
 }
 
@@ -516,22 +530,22 @@ ospf_print_lshdr(netdissect_options *ndo,
         u_int ls_length;
 
         ND_TCHECK_2(lshp->ls_length);
         u_int ls_length;
 
         ND_TCHECK_2(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("\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);
         }
 
         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",
                 return(-1);
         }
 
         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),
+                  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));
 
         ND_TCHECK_1(lshp->ls_type); /* XXX - ls_length check checked this */
                   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);
+        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:
         switch (ls_type) {
         /* the LSA header for opaque LSAs was slightly changed */
         case LS_TYPE_OPAQUE_LL:
@@ -543,9 +557,9 @@ ospf_print_lshdr(netdissect_options *ndo,
 
                   tok2str(lsa_opaque_values,
                           "unknown",
 
                   tok2str(lsa_opaque_values,
                           "unknown",
-                          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)
+                          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;
 
                    );
             break;
@@ -555,12 +569,13 @@ ospf_print_lshdr(netdissect_options *ndo,
             ND_PRINT("\n\t    %s LSA (%u), LSA-ID: %s",
                    tok2str(lsa_values,"unknown",ls_type),
                    ls_type,
             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));
+                   GET_IPADDR_STRING(lshp->un_lsa_id.lsa_id));
             break;
         }
 
         ND_TCHECK_1(lshp->ls_options); /* XXX - ls_length check checked this */
             break;
         }
 
         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)));
+        ND_PRINT("\n\t    Options: [%s]",
+                bittok2str(ospf_option_values, "none", GET_U_1(lshp->ls_options)));
 
         return (ls_length);
 trunc:
 
         return (ls_length);
 trunc:
@@ -586,7 +601,7 @@ ospf_print_tos_metrics(netdissect_options *ndo,
     u_int toscount;
     u_int tos_type;
 
     u_int toscount;
     u_int tos_type;
 
-    toscount = EXTRACT_U_1(tos->link.link_tos_count)+1;
+    toscount = GET_U_1(tos->link.link_tos_count)+1;
     metric_count = 0;
 
     /*
     metric_count = 0;
 
     /*
@@ -594,12 +609,12 @@ ospf_print_tos_metrics(netdissect_options *ndo,
      */
     while (toscount != 0) {
         ND_TCHECK_SIZE(tos);
      */
     while (toscount != 0) {
         ND_TCHECK_SIZE(tos);
-        tos_type = EXTRACT_U_1(tos->metrics.tos_type);
+        tos_type = GET_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,
         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));
+               GET_BE_U_2(tos->metrics.tos_metric));
         metric_count++;
         tos++;
         toscount--;
         metric_count++;
         tos++;
         toscount--;
@@ -620,7 +635,7 @@ ospf_print_lsa(netdissect_options *ndo,
 {
        const uint8_t *ls_end;
        const struct rlalink *rlp;
 {
        const uint8_t *ls_end;
        const struct rlalink *rlp;
-       const struct in_addr *ap;
+       const nd_ipv4 *ap;
        const struct aslametric *almp;
        const struct mcla *mcp;
        const uint8_t *lp;
        const struct aslametric *almp;
        const struct mcla *mcp;
        const uint8_t *lp;
@@ -635,48 +650,48 @@ ospf_print_lsa(netdissect_options *ndo,
        ls_end = (const uint8_t *)lsap + ls_length;
        ls_length -= sizeof(struct lsa_hdr);
 
        ls_end = (const uint8_t *)lsap + ls_length;
        ls_length -= sizeof(struct lsa_hdr);
 
-       switch (EXTRACT_U_1(lsap->ls_hdr.ls_type)) {
+       switch (GET_U_1(lsap->ls_hdr.ls_type)) {
 
        case LS_TYPE_ROUTER:
                ND_TCHECK_1(lsap->lsa_un.un_rla.rla_flags);
                ND_PRINT("\n\t    Router LSA Options: [%s]",
 
        case LS_TYPE_ROUTER:
                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)));
+                         bittok2str(ospf_rla_flag_values, "none", GET_U_1(lsap->lsa_un.un_rla.rla_flags)));
 
                ND_TCHECK_2(lsap->lsa_un.un_rla.rla_count);
 
                ND_TCHECK_2(lsap->lsa_un.un_rla.rla_count);
-               j = EXTRACT_BE_U_2(lsap->lsa_un.un_rla.rla_count);
+               j = 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;
                while (j--) {
                        ND_TCHECK_SIZE(rlp);
                ND_TCHECK_SIZE(lsap->lsa_un.un_rla.rla_link);
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (j--) {
                        ND_TCHECK_SIZE(rlp);
-                       switch (EXTRACT_U_1(rlp->un_tos.link.link_type)) {
+                       switch (GET_U_1(rlp->un_tos.link.link_type)) {
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT("\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
 
                        case RLA_TYPE_VIRTUAL:
                                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));
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        case RLA_TYPE_ROUTER:
                                ND_PRINT("\n\t      Neighbor Router-ID: %s, Interface Address: %s",
                                break;
 
                        case RLA_TYPE_ROUTER:
                                ND_PRINT("\n\t      Neighbor Router-ID: %s, Interface Address: %s",
-                                   ipaddr_string(ndo, &rlp->link_id),
-                                   ipaddr_string(ndo, &rlp->link_data));
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        case RLA_TYPE_TRANSIT:
                                ND_PRINT("\n\t      Neighbor Network-ID: %s, Interface Address: %s",
                                break;
 
                        case RLA_TYPE_TRANSIT:
                                ND_PRINT("\n\t      Neighbor Network-ID: %s, Interface Address: %s",
-                                   ipaddr_string(ndo, &rlp->link_id),
-                                   ipaddr_string(ndo, &rlp->link_data));
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        case RLA_TYPE_STUB:
                                ND_PRINT("\n\t      Stub Network: %s, Mask: %s",
                                break;
 
                        case RLA_TYPE_STUB:
                                ND_PRINT("\n\t      Stub Network: %s, Mask: %s",
-                                   ipaddr_string(ndo, &rlp->link_id),
-                                   ipaddr_string(ndo, &rlp->link_data));
+                                   GET_IPADDR_STRING(rlp->link_id),
+                                   GET_IPADDR_STRING(rlp->link_data));
                                break;
 
                        default:
                                ND_PRINT("\n\t      Unknown Router Link Type (%u)",
                                break;
 
                        default:
                                ND_PRINT("\n\t      Unknown Router Link Type (%u)",
-                                   EXTRACT_U_1(rlp->un_tos.link.link_type));
+                                   GET_U_1(rlp->un_tos.link.link_type));
                                return (ls_end);
                        }
 
                                return (ls_end);
                        }
 
@@ -684,33 +699,33 @@ 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) +
-                           (EXTRACT_U_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_4(&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:",
                ND_PRINT("\n\t    Mask %s\n\t    Connected Routers:",
-                   ipaddr_string(ndo, &lsap->lsa_un.un_nla.nla_mask));
+                   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) {
                        ND_TCHECK_SIZE(ap);
                ap = lsap->lsa_un.un_nla.nla_router;
                while ((const u_char *)ap < ls_end) {
                        ND_TCHECK_SIZE(ap);
-                       ND_PRINT("\n\t      %s", ipaddr_string(ndo, 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_4(&lsap->lsa_un.un_nla.nla_mask);
+               ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT("\n\t    Mask %s",
                ND_PRINT("\n\t    Mask %s",
-                   ipaddr_string(ndo, &lsap->lsa_un.un_sla.sla_mask));
+                   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;
 
                        ND_TCHECK_4(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);
+                       ul = GET_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_TOS) >> SLA_SHIFT_TOS;
                        ND_PRINT("\n\t\ttopology %s (%u) metric %u",
                                tok2str(ospf_topology_values, "Unknown", topology),
@@ -727,7 +742,7 @@ ospf_print_lsa(netdissect_options *ndo,
                        uint32_t ul;
 
                        ND_TCHECK_4(lp);
                        uint32_t ul;
 
                        ND_TCHECK_4(lp);
-                       ul = EXTRACT_BE_U_4(lp);
+                       ul = GET_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_TOS) >> SLA_SHIFT_TOS;
                        ND_PRINT("\n\t\ttopology %s (%u) metric %u",
                                tok2str(ospf_topology_values, "Unknown", topology),
@@ -739,9 +754,9 @@ ospf_print_lsa(netdissect_options *ndo,
 
        case LS_TYPE_ASE:
         case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */
 
        case LS_TYPE_ASE:
         case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */
-               ND_TCHECK_4(&lsap->lsa_un.un_nla.nla_mask);
+               ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT("\n\t    Mask %s",
                ND_PRINT("\n\t    Mask %s",
-                   ipaddr_string(ndo, &lsap->lsa_un.un_asla.asla_mask));
+                   GET_IPADDR_STRING(lsap->lsa_un.un_asla.asla_mask));
 
                ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
 
                ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
@@ -749,7 +764,7 @@ ospf_print_lsa(netdissect_options *ndo,
                        uint32_t ul;
 
                        ND_TCHECK_4(almp->asla_tosmetric);
                        uint32_t ul;
 
                        ND_TCHECK_4(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);
                        ND_PRINT("\n\t\ttopology %s (%u), type %u, metric",
                                tok2str(ospf_topology_values, "Unknown", topology),
                         topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
                        ND_PRINT("\n\t\ttopology %s (%u), type %u, metric",
                                tok2str(ospf_topology_values, "Unknown", topology),
@@ -760,13 +775,13 @@ ospf_print_lsa(netdissect_options *ndo,
                        else
                                ND_PRINT(" %u", (ul & ASLA_MASK_METRIC));
 
                        else
                                ND_PRINT(" %u", (ul & ASLA_MASK_METRIC));
 
-                       ND_TCHECK_4(&almp->asla_forward);
-                       if (almp->asla_forward.s_addr) {
-                               ND_PRINT(", forward %s", ipaddr_string(ndo, &almp->asla_forward));
+                       ND_TCHECK_4(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_4(&almp->asla_tag);
-                       if (almp->asla_tag.s_addr) {
-                               ND_PRINT(", tag %s", ipaddr_string(ndo, &almp->asla_tag));
+                       ND_TCHECK_4(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;
                }
@@ -776,22 +791,22 @@ 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_4(&mcp->mcla_vid);
-                       switch (EXTRACT_BE_U_4(mcp->mcla_vtype)) {
+                       ND_TCHECK_4(mcp->mcla_vid);
+                       switch (GET_BE_U_4(mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
                                ND_PRINT("\n\t    Router Router-ID %s",
 
                        case MCLA_VERTEX_ROUTER:
                                ND_PRINT("\n\t    Router Router-ID %s",
-                                   ipaddr_string(ndo, &mcp->mcla_vid));
+                                   GET_IPADDR_STRING(mcp->mcla_vid));
                                break;
 
                        case MCLA_VERTEX_NETWORK:
                                ND_PRINT("\n\t    Network Designated Router %s",
                                break;
 
                        case MCLA_VERTEX_NETWORK:
                                ND_PRINT("\n\t    Network Designated Router %s",
-                                   ipaddr_string(ndo, &mcp->mcla_vid));
+                                   GET_IPADDR_STRING(mcp->mcla_vid));
                                break;
 
                        default:
                                ND_PRINT("\n\t    unknown VertexType (%u)",
                                break;
 
                        default:
                                ND_PRINT("\n\t    unknown VertexType (%u)",
-                                   EXTRACT_BE_U_4(mcp->mcla_vtype));
+                                   GET_BE_U_4(mcp->mcla_vtype));
                                break;
                        }
                ++mcp;
                                break;
                        }
                ++mcp;
@@ -802,29 +817,30 @@ 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 (EXTRACT_U_1(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:
                tptr = (const uint8_t *)(lsap->lsa_un.un_ri_tlv);
 
             case LS_OPAQUE_TYPE_RI:
                tptr = (const uint8_t *)(lsap->lsa_un.un_ri_tlv);
 
-               while (ls_length != 0) {
+               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("\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("\n\t    %s TLV (%u), length: %u, value: ",
                            tok2str(lsa_opaque_ri_tlv_values,"unknown",tlv_type),
                            tlv_type,
                            tlv_length);
 
 
                     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) {
-                        ND_PRINT("\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);
                     }
                     ND_TCHECK_LEN(tptr, tlv_length);
                         return(ls_end);
                     }
                     ND_TCHECK_LEN(tptr, tlv_length);
@@ -836,7 +852,7 @@ ospf_print_lsa(netdissect_options *ndo,
                             return(ls_end);
                         }
                         ND_PRINT("Capabilities: %s",
                             return(ls_end);
                         }
                         ND_PRINT("Capabilities: %s",
-                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_BE_U_4(tptr)));
+                               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) {
@@ -847,19 +863,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 u_char *)(lsap->lsa_un.un_grace_tlv),
+                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 u_char *)(lsap->lsa_un.un_te_lsa_tlv),
+                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);
                 }
@@ -897,15 +913,15 @@ ospf_decode_lls(netdissect_options *ndo,
     uint16_t lls_type, lls_len;
     uint32_t lls_flags;
 
     uint16_t lls_type, lls_len;
     uint32_t lls_flags;
 
-    switch (EXTRACT_U_1(op->ospf_type)) {
+    switch (GET_U_1(op->ospf_type)) {
 
     case OSPF_TYPE_HELLO:
 
     case OSPF_TYPE_HELLO:
-        if (!(EXTRACT_U_1(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 (!(EXTRACT_U_1(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;
 
@@ -914,11 +930,11 @@ ospf_decode_lls(netdissect_options *ndo,
     }
 
     /* dig deeper if LLS data is available; see RFC4813 */
     }
 
     /* dig deeper if LLS data is available; see RFC4813 */
-    length2 = EXTRACT_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];
     }
         dptr = dptr + op->ospf_authdata[3];
         length2 += op->ospf_authdata[3];
     }
@@ -927,24 +943,24 @@ ospf_decode_lls(netdissect_options *ndo,
         return (1);
     }
     ND_TCHECK_2(dptr);
         return (1);
     }
     ND_TCHECK_2(dptr);
-    ND_PRINT("\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;
     ND_TCHECK_2(dptr);
 
     dptr += 2;
     ND_TCHECK_2(dptr);
-    length2 = EXTRACT_BE_U_2(dptr);
+    length2 = GET_BE_U_2(dptr);
     ND_PRINT(", length: %u", length2);
 
     dptr += 2;
     ND_TCHECK_1(dptr);
     while (dptr < dataend) {
         ND_TCHECK_2(dptr);
     ND_PRINT(", length: %u", length2);
 
     dptr += 2;
     ND_TCHECK_1(dptr);
     while (dptr < dataend) {
         ND_TCHECK_2(dptr);
-        lls_type = EXTRACT_BE_U_2(dptr);
+        lls_type = GET_BE_U_2(dptr);
         ND_PRINT("\n\t    %s (%u)",
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                lls_type);
         dptr += 2;
         ND_TCHECK_2(dptr);
         ND_PRINT("\n\t    %s (%u)",
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                lls_type);
         dptr += 2;
         ND_TCHECK_2(dptr);
-        lls_len = EXTRACT_BE_U_2(dptr);
+        lls_len = GET_BE_U_2(dptr);
         ND_PRINT(", length: %u", lls_len);
         dptr += 2;
         switch (lls_type) {
         ND_PRINT(", length: %u", lls_len);
         dptr += 2;
         switch (lls_type) {
@@ -955,7 +971,7 @@ ospf_decode_lls(netdissect_options *ndo,
                 lls_len = 4;
             }
             ND_TCHECK_4(dptr);
                 lls_len = 4;
             }
             ND_TCHECK_4(dptr);
-            lls_flags = EXTRACT_BE_U_4(dptr);
+            lls_flags = GET_BE_U_4(dptr);
             ND_PRINT("\n\t      Options: 0x%08x [%s]", lls_flags,
                    bittok2str(ospf_lls_eo_options, "?", lls_flags));
 
             ND_PRINT("\n\t      Options: 0x%08x [%s]", lls_flags,
                    bittok2str(ospf_lls_eo_options, "?", lls_flags));
 
@@ -967,7 +983,7 @@ ospf_decode_lls(netdissect_options *ndo,
                 lls_len = 20;
             }
             ND_TCHECK_4(dptr);
                 lls_len = 20;
             }
             ND_TCHECK_4(dptr);
-            ND_PRINT("\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;
         }
 
@@ -983,42 +999,42 @@ static int
 ospf_decode_v2(netdissect_options *ndo,
                const struct ospfhdr *op, const u_char *dataend)
 {
 ospf_decode_v2(netdissect_options *ndo,
                const struct ospfhdr *op, const u_char *dataend)
 {
-       const struct in_addr *ap;
+       const nd_ipv4 *ap;
        const struct lsr *lsrp;
        const struct lsa_hdr *lshp;
        const struct lsa *lsap;
        uint32_t lsa_count,lsa_count_max;
 
        const struct lsr *lsrp;
        const struct lsa_hdr *lshp;
        const struct lsa *lsap;
        uint32_t lsa_count,lsa_count_max;
 
-       switch (EXTRACT_U_1(op->ospf_type)) {
+       switch (GET_U_1(op->ospf_type)) {
 
        case OSPF_TYPE_HELLO:
                ND_TCHECK_1(op->ospf_hello.hello_options);
                ND_PRINT("\n\tOptions [%s]",
 
        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)));
+                         bittok2str(ospf_option_values,"none",GET_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",
 
                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));
+                         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));
 
 
-               ND_TCHECK_4(&op->ospf_hello.hello_dr);
-               if (op->ospf_hello.hello_dr.s_addr != 0)
+               ND_TCHECK_4(op->ospf_hello.hello_dr);
+               if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_dr) != 0)
                        ND_PRINT("\n\t  Designated Router %s",
                        ND_PRINT("\n\t  Designated Router %s",
-                           ipaddr_string(ndo, &op->ospf_hello.hello_dr));
+                           GET_IPADDR_STRING(op->ospf_hello.hello_dr));
 
 
-               ND_TCHECK_4(&op->ospf_hello.hello_bdr);
-               if (op->ospf_hello.hello_bdr.s_addr != 0)
+               ND_TCHECK_4(op->ospf_hello.hello_bdr);
+               if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_bdr) != 0)
                        ND_PRINT(", Backup Designated Router %s",
                        ND_PRINT(", Backup Designated Router %s",
-                                 ipaddr_string(ndo, &op->ospf_hello.hello_bdr));
+                                 GET_IPADDR_STRING(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);
 
                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));
+                       ND_PRINT("\n\t    %s", GET_IPADDR_STRING(*ap));
                        ++ap;
                }
                break;  /* HELLO */
                        ++ap;
                }
                break;  /* HELLO */
@@ -1026,16 +1042,17 @@ ospf_decode_v2(netdissect_options *ndo,
        case OSPF_TYPE_DD:
                ND_TCHECK_1(op->ospf_db.db_options);
                ND_PRINT("\n\tOptions [%s]",
        case OSPF_TYPE_DD:
                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)));
+                         bittok2str(ospf_option_values, "none", GET_U_1(op->ospf_db.db_options)));
                ND_TCHECK_1(op->ospf_db.db_flags);
                ND_PRINT(", DD Flags [%s]",
                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)));
+                         bittok2str(ospf_dd_flag_values, "none", GET_U_1(op->ospf_db.db_flags)));
                ND_TCHECK_2(op->ospf_db.db_ifmtu);
                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));
+               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_4(op->ospf_db.db_seq);
                }
                ND_TCHECK_4(op->ospf_db.db_seq);
-               ND_PRINT(", 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;
@@ -1050,23 +1067,23 @@ ospf_decode_v2(netdissect_options *ndo,
                     ND_TCHECK_SIZE(lsrp);
 
                     ND_PRINT("\n\t  Advertising Router: %s, %s LSA (%u)",
                     ND_TCHECK_SIZE(lsrp);
 
                     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));
+                           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:
                         ND_PRINT(", Opaque-Type: %s LSA (%u), Opaque-ID: %u",
                         /* the LSA header for opaque LSAs was slightly changed */
                     case LS_TYPE_OPAQUE_LL:
                     case LS_TYPE_OPAQUE_AL:
                     case LS_TYPE_OPAQUE_DW:
                         ND_PRINT(", 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));
+                               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:
                         ND_PRINT(", LSA-ID: %s",
                         break;
                     default:
                         ND_PRINT(", LSA-ID: %s",
-                               ipaddr_string(ndo, &lsrp->un_ls_stateid.ls_stateid));
+                               GET_IPADDR_STRING(lsrp->un_ls_stateid.ls_stateid));
                         break;
                     }
 
                         break;
                     }
 
@@ -1077,7 +1094,7 @@ ospf_decode_v2(netdissect_options *ndo,
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
                 ND_TCHECK_4(op->ospf_lsu.lsu_count);
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
                 ND_TCHECK_4(op->ospf_lsu.lsu_count);
-                lsa_count_max = EXTRACT_BE_U_4(op->ospf_lsu.lsu_count);
+                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++) {
                     ND_PRINT("\n\t  LSA #%u", lsa_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++) {
                     ND_PRINT("\n\t  LSA #%u", lsa_count);
@@ -1111,11 +1128,12 @@ ospf_print(netdissect_options *ndo,
        const u_char *dataend;
        const char *cp;
 
        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 */
        ND_TCHECK_2(op->ospf_authtype);
        op = (const struct ospfhdr *)bp;
 
        /* 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) {
+       if (GET_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
                length -= OSPF_AUTH_MD5_LEN;
                ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
        }
                length -= OSPF_AUTH_MD5_LEN;
                ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
        }
@@ -1123,8 +1141,9 @@ ospf_print(netdissect_options *ndo,
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
        ND_TCHECK_1(op->ospf_type);
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
        ND_TCHECK_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);
+       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;
 
@@ -1133,22 +1152,22 @@ ospf_print(netdissect_options *ndo,
        }
 
        ND_TCHECK_2(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 != 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_4(&op->ospf_routerid);
-       ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf_routerid));
+       ND_TCHECK_4(op->ospf_routerid);
+       ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf_routerid));
 
 
-       ND_TCHECK_4(&op->ospf_areaid);
-       if (op->ospf_areaid.s_addr != 0)
-               ND_PRINT(", Area %s", ipaddr_string(ndo, &op->ospf_areaid));
+       ND_TCHECK_4(op->ospf_areaid);
+       if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0)
+               ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf_areaid));
        else
                ND_PRINT(", Backbone Area");
 
        else
                ND_PRINT(", Backbone Area");
 
@@ -1157,24 +1176,24 @@ ospf_print(netdissect_options *ndo,
                ND_TCHECK_LEN(op->ospf_authdata, sizeof(op->ospf_authdata));
 
                ND_PRINT(", Authentication Type: %s (%u)",
                ND_TCHECK_LEN(op->ospf_authdata, sizeof(op->ospf_authdata));
 
                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));
+                         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:
                        ND_PRINT("\n\tSimple text password: ");
 
                case OSPF_AUTH_NONE:
                        break;
 
                case OSPF_AUTH_SIMPLE:
                        ND_PRINT("\n\tSimple text password: ");
-                       safeputs(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
+                       (void)nd_printzp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN, NULL);
                        break;
 
                case OSPF_AUTH_MD5:
                        ND_PRINT("\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
                                  *((op->ospf_authdata) + 2),
                                  *((op->ospf_authdata) + 3),
                        break;
 
                case OSPF_AUTH_MD5:
                        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));
+                                 GET_BE_U_4((op->ospf_authdata) + 4));
                        break;
 
                default:
                        break;
 
                default:
@@ -1182,24 +1201,24 @@ ospf_print(netdissect_options *ndo,
                }
        }
        /* Do rest according to version.         */
                }
        }
        /* Do rest according to version.         */
-       switch (EXTRACT_U_1(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(" ospf [version %u]", EXTRACT_U_1(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("%s", tstr);
+       nd_print_trunc(ndo);
 }
 }
[mirror] the TCPdump network dissector