]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
NTP: Use tstr for truncation indicator.
[tcpdump] / print-ospf.c
diff --git a/print-ospf.c b/print-ospf.c
index a6bd6c311ed2b96662a6820475dd2b7f13d7a052..8dad2eaa4b1fb1053855776b99e688aa36d56356 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -21,14 +21,15 @@
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
  * OSPF support contributed by Jeffrey Honig ([email protected])
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Open Shortest Path First (OSPF) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "gmpls.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "gmpls.h"
@@ -65,7 +66,6 @@ static const struct tok ospf_rla_flag_values[] = {
 };
 
 static const struct tok type2str[] = {
 };
 
 static const struct tok type2str[] = {
-       { OSPF_TYPE_UMD,        "UMD" },
        { OSPF_TYPE_HELLO,      "Hello" },
        { OSPF_TYPE_DD,         "Database Description" },
        { OSPF_TYPE_LS_REQ,     "LS-Request" },
        { OSPF_TYPE_HELLO,      "Hello" },
        { OSPF_TYPE_DD,         "Database Description" },
        { OSPF_TYPE_LS_REQ,     "LS-Request" },
@@ -181,8 +181,8 @@ static const struct tok ospf_lls_eo_options[] = {
 
 int
 ospf_print_grace_lsa(netdissect_options *ndo,
 
 int
 ospf_print_grace_lsa(netdissect_options *ndo,
-                     const u_int8_t *tptr, u_int ls_length) {
-
+                     const uint8_t *tptr, u_int ls_length)
+{
     u_int tlv_type, tlv_length;
 
 
     u_int tlv_type, tlv_length;
 
 
@@ -239,7 +239,7 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
                 return -1;
             }
                 ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
                 return -1;
             }
-            ND_PRINT((ndo, "%s", ipaddr_string(tptr)));
+            ND_PRINT((ndo, "%s", ipaddr_string(ndo, tptr)));
             break;
 
         default:
             break;
 
         default:
@@ -264,13 +264,13 @@ trunc:
 
 int
 ospf_print_te_lsa(netdissect_options *ndo,
 
 int
 ospf_print_te_lsa(netdissect_options *ndo,
-                  const u_int8_t *tptr, u_int ls_length) {
-
+                  const uint8_t *tptr, u_int ls_length)
+{
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
     union { /* int to float conversion buffer for several subTLVs */
         float f;
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
     union { /* int to float conversion buffer for several subTLVs */
         float f;
-        u_int32_t i;
+        uint32_t i;
     } bw;
 
     while (ls_length != 0) {
     } bw;
 
     while (ls_length != 0) {
@@ -314,6 +314,10 @@ ospf_print_te_lsa(netdissect_options *ndo,
                 tptr+=4;
                 tlv_length-=4;
 
                 tptr+=4;
                 tlv_length-=4;
 
+               /* Infinite loop protection */
+               if (subtlv_type == 0 || subtlv_length == 0)
+                   goto invalid;
+
                 ND_PRINT((ndo, "\n\t      %s subTLV (%u), length: %u",
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
                 ND_PRINT((ndo, "\n\t      %s subTLV (%u), length: %u",
                        tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type),
                        subtlv_type,
@@ -322,28 +326,48 @@ ospf_print_te_lsa(netdissect_options *ndo,
                 ND_TCHECK2(*tptr, subtlv_length);
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
                 ND_TCHECK2(*tptr, subtlv_length);
                 switch(subtlv_type) {
                 case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP:
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
                     ND_PRINT((ndo, ", 0x%08x", EXTRACT_32BITS(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID:
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID:
                     ND_PRINT((ndo, ", 0x%08x", EXTRACT_32BITS(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) {
+                       ND_PRINT((ndo, " != 4 && != 8"));
+                       goto invalid;
+                   }
                     ND_PRINT((ndo, ", %s (0x%08x)",
                     ND_PRINT((ndo, ", %s (0x%08x)",
-                           ipaddr_string(tptr),
+                           ipaddr_string(ndo, tptr),
                            EXTRACT_32BITS(tptr)));
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT((ndo, ", %s (0x%08x)",
                            EXTRACT_32BITS(tptr)));
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT((ndo, ", %s (0x%08x)",
-                               ipaddr_string(tptr+4),
+                               ipaddr_string(ndo, tptr+4),
                                EXTRACT_32BITS(tptr + 4)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                 case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
                                EXTRACT_32BITS(tptr + 4)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                 case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
-                    ND_PRINT((ndo, ", %s", ipaddr_string(tptr)));
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
+                    ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW:
                 case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW:
                     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"));
+                       goto invalid;
+                   }
                     bw.i = EXTRACT_32BITS(tptr);
                     ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
                     bw.i = EXTRACT_32BITS(tptr);
                     ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
+                   if (subtlv_length != 32) {
+                       ND_PRINT((ndo, " != 32"));
+                       goto invalid;
+                   }
                     for (te_class = 0; te_class < 8; te_class++) {
                         bw.i = EXTRACT_32BITS(tptr+te_class*4);
                         ND_PRINT((ndo, "\n\t\tTE-Class %u: %.3f Mbps",
                     for (te_class = 0; te_class < 8; te_class++) {
                         bw.i = EXTRACT_32BITS(tptr+te_class*4);
                         ND_PRINT((ndo, "\n\t\tTE-Class %u: %.3f Mbps",
@@ -352,9 +376,22 @@ ospf_print_te_lsa(netdissect_options *ndo,
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
+                   if (subtlv_length < 4) {
+                       ND_PRINT((ndo, " < 4"));
+                       goto invalid;
+                   }
+                   /* BC Model Id (1 octet) + Reserved (3 octets) */
                     ND_PRINT((ndo, "\n\t\tBandwidth Constraints Model ID: %s (%u)",
                            tok2str(diffserv_te_bc_values, "unknown", *tptr),
                            *tptr));
                     ND_PRINT((ndo, "\n\t\tBandwidth Constraints Model ID: %s (%u)",
                            tok2str(diffserv_te_bc_values, "unknown", *tptr),
                            *tptr));
+                   if (subtlv_length % 4 != 0) {
+                       ND_PRINT((ndo, "\n\t\tlength %u != N x 4", subtlv_length));
+                       goto invalid;
+                   }
+                   if (subtlv_length > 36) {
+                       ND_PRINT((ndo, "\n\t\tlength %u > 36", subtlv_length));
+                       goto invalid;
+                   }
                     /* decode BCs until the subTLV ends */
                     for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
                         bw.i = EXTRACT_32BITS(tptr+4+te_class*4);
                     /* decode BCs until the subTLV ends */
                     for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
                         bw.i = EXTRACT_32BITS(tptr+4+te_class*4);
@@ -364,14 +401,27 @@ ospf_print_te_lsa(netdissect_options *ndo,
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
                     ND_PRINT((ndo, ", Metric %u", EXTRACT_32BITS(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
                     ND_PRINT((ndo, ", Metric %u", EXTRACT_32BITS(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
-                    ND_PRINT((ndo, ", %s, Priority %u",
-                           bittok2str(gmpls_link_prot_values, "none", *tptr),
-                           *(tptr + 1)));
+                   /* Protection Cap (1 octet) + Reserved ((3 octets) */
+                   if (subtlv_length != 4) {
+                       ND_PRINT((ndo, " != 4"));
+                       goto invalid;
+                   }
+                    ND_PRINT((ndo, ", %s",
+                             bittok2str(gmpls_link_prot_values, "none", *tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR:
+                   if (subtlv_length < 36) {
+                       ND_PRINT((ndo, " < 36"));
+                       goto invalid;
+                   }
+                   /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
                     ND_PRINT((ndo, "\n\t\tInterface Switching Capability: %s",
                            tok2str(gmpls_switch_cap_values, "Unknown", *(tptr))));
                     ND_PRINT((ndo, "\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
                     ND_PRINT((ndo, "\n\t\tInterface Switching Capability: %s",
                            tok2str(gmpls_switch_cap_values, "Unknown", *(tptr))));
                     ND_PRINT((ndo, "\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
@@ -384,12 +434,20 @@ ospf_print_te_lsa(netdissect_options *ndo,
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
                     }
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
+                   if (subtlv_length != 1) {
+                       ND_PRINT((ndo, " != 1"));
+                       goto invalid;
+                   }
                     ND_PRINT((ndo, ", %s (%u)",
                            tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",*tptr),
                            *tptr));
                     break;
 
                 case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
                     ND_PRINT((ndo, ", %s (%u)",
                            tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",*tptr),
                            *tptr));
                     break;
 
                 case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP:
+                   if (subtlv_length % 4 != 0) {
+                       ND_PRINT((ndo, " != N x 4"));
+                       goto invalid;
+                   }
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
                         ND_PRINT((ndo, "\n\t\t  Shared risk group: "));
                     count_srlg = subtlv_length / 4;
                     if (count_srlg != 0)
                         ND_PRINT((ndo, "\n\t\t  Shared risk group: "));
@@ -426,7 +484,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                 return -1;
             }
             ND_TCHECK2(*tptr, 4);
                 return -1;
             }
             ND_TCHECK2(*tptr, 4);
-            ND_PRINT((ndo, ", %s", ipaddr_string(tptr)));
+            ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr)));
             break;
 
         default:
             break;
 
         default:
@@ -445,6 +503,9 @@ ospf_print_te_lsa(netdissect_options *ndo,
     return 0;
 trunc:
     return -1;
     return 0;
 trunc:
     return -1;
+invalid:
+    ND_PRINT((ndo, "%s", istr));
+    return -1;
 }
 
 static int
 }
 
 static int
@@ -463,7 +524,7 @@ ospf_print_lshdr(netdissect_options *ndo,
 
         ND_TCHECK(lshp->ls_seq); /* XXX - ls_length check checked this */
         ND_PRINT((ndo, "\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
 
         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(&lshp->ls_router),
+                  ipaddr_string(ndo, &lshp->ls_router),
                   EXTRACT_32BITS(&lshp->ls_seq),
                   EXTRACT_16BITS(&lshp->ls_age),
                   ls_length - (u_int)sizeof(struct lsa_hdr)));
                   EXTRACT_32BITS(&lshp->ls_seq),
                   EXTRACT_16BITS(&lshp->ls_age),
                   ls_length - (u_int)sizeof(struct lsa_hdr)));
@@ -492,7 +553,7 @@ ospf_print_lshdr(netdissect_options *ndo,
             ND_PRINT((ndo, "\n\t    %s LSA (%d), LSA-ID: %s",
                    tok2str(lsa_values,"unknown",lshp->ls_type),
                    lshp->ls_type,
             ND_PRINT((ndo, "\n\t    %s LSA (%d), LSA-ID: %s",
                    tok2str(lsa_values,"unknown",lshp->ls_type),
                    lshp->ls_type,
-                   ipaddr_string(&lshp->un_lsa_id.lsa_id)));
+                   ipaddr_string(ndo, &lshp->un_lsa_id.lsa_id)));
             break;
         }
 
             break;
         }
 
@@ -506,16 +567,16 @@ trunc:
 
 /* draft-ietf-ospf-mt-09 */
 static const struct tok ospf_topology_values[] = {
 
 /* draft-ietf-ospf-mt-09 */
 static const struct tok ospf_topology_values[] = {
-    { 0, "default " },
-    { 1, "multicast " },
-    { 2, "management " },
+    { 0, "default" },
+    { 1, "multicast" },
+    { 2, "management" },
     { 0, NULL }
 };
 
 /*
  * Print all the per-topology metrics.
  */
     { 0, NULL }
 };
 
 /*
  * Print all the per-topology metrics.
  */
-static void
+static int
 ospf_print_tos_metrics(netdissect_options *ndo,
                        const union un_tos *tos)
 {
 ospf_print_tos_metrics(netdissect_options *ndo,
                        const union un_tos *tos)
 {
@@ -528,9 +589,10 @@ ospf_print_tos_metrics(netdissect_options *ndo,
     /*
      * All but the first metric contain a valid topology id.
      */
     /*
      * All but the first metric contain a valid topology id.
      */
-    while (toscount) {
-        ND_PRINT((ndo, "\n\t\ttopology %s(%u), metric %u",
-               tok2str(ospf_topology_values, "",
+    while (toscount > 0) {
+        ND_TCHECK(*tos);
+        ND_PRINT((ndo, "\n\t\ttopology %s (%u), metric %u",
+               tok2str(ospf_topology_values, "Unknown",
                        metric_count ? tos->metrics.tos_type : 0),
                metric_count ? tos->metrics.tos_type : 0,
                EXTRACT_16BITS(&tos->metrics.tos_metric)));
                        metric_count ? tos->metrics.tos_type : 0),
                metric_count ? tos->metrics.tos_type : 0,
                EXTRACT_16BITS(&tos->metrics.tos_metric)));
@@ -538,6 +600,9 @@ ospf_print_tos_metrics(netdissect_options *ndo,
         tos++;
         toscount--;
     }
         tos++;
         toscount--;
     }
+    return 0;
+trunc:
+    return 1;
 }
 
 /*
 }
 
 /*
@@ -545,25 +610,25 @@ ospf_print_tos_metrics(netdissect_options *ndo,
  * field is less than the length of the LSA header, return NULl, else
  * return pointer to data past end of LSA.
  */
  * field is less than the length of the LSA header, return NULl, else
  * return pointer to data past end of LSA.
  */
-static const u_int8_t *
+static const uint8_t *
 ospf_print_lsa(netdissect_options *ndo,
                register const struct lsa *lsap)
 {
 ospf_print_lsa(netdissect_options *ndo,
                register const struct lsa *lsap)
 {
-       register const u_int8_t *ls_end;
+       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 struct rlalink *rlp;
        register const struct in_addr *ap;
        register const struct aslametric *almp;
        register const struct mcla *mcp;
-       register const u_int32_t *lp;
+       register const uint32_t *lp;
        register int j, tlv_type, tlv_length, topology;
        register int ls_length;
        register int j, tlv_type, tlv_length, topology;
        register int ls_length;
-       const u_int8_t *tptr;
+       const uint8_t *tptr;
 
 
-       tptr = (u_int8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
+       tptr = (const uint8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
         ls_length = ospf_print_lshdr(ndo, &lsap->ls_hdr);
         if (ls_length == -1)
                 return(NULL);
         ls_length = ospf_print_lshdr(ndo, &lsap->ls_hdr);
         if (ls_length == -1)
                 return(NULL);
-       ls_end = (u_int8_t *)lsap + ls_length;
+       ls_end = (const uint8_t *)lsap + ls_length;
        ls_length -= sizeof(struct lsa_hdr);
 
        switch (lsap->ls_hdr.ls_type) {
        ls_length -= sizeof(struct lsa_hdr);
 
        switch (lsap->ls_hdr.ls_type) {
@@ -583,26 +648,26 @@ ospf_print_lsa(netdissect_options *ndo,
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT((ndo, "\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT((ndo, "\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data)));
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data)));
                                break;
 
                        case RLA_TYPE_ROUTER:
                                ND_PRINT((ndo, "\n\t      Neighbor Router-ID: %s, Interface Address: %s",
                                break;
 
                        case RLA_TYPE_ROUTER:
                                ND_PRINT((ndo, "\n\t      Neighbor Router-ID: %s, Interface Address: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data)));
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data)));
                                break;
 
                        case RLA_TYPE_TRANSIT:
                                ND_PRINT((ndo, "\n\t      Neighbor Network-ID: %s, Interface Address: %s",
                                break;
 
                        case RLA_TYPE_TRANSIT:
                                ND_PRINT((ndo, "\n\t      Neighbor Network-ID: %s, Interface Address: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data)));
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data)));
                                break;
 
                        case RLA_TYPE_STUB:
                                ND_PRINT((ndo, "\n\t      Stub Network: %s, Mask: %s",
                                break;
 
                        case RLA_TYPE_STUB:
                                ND_PRINT((ndo, "\n\t      Stub Network: %s, Mask: %s",
-                                   ipaddr_string(&rlp->link_id),
-                                   ipaddr_string(&rlp->link_data)));
+                                   ipaddr_string(ndo, &rlp->link_id),
+                                   ipaddr_string(ndo, &rlp->link_data)));
                                break;
 
                        default:
                                break;
 
                        default:
@@ -611,9 +676,10 @@ ospf_print_lsa(netdissect_options *ndo,
                                return (ls_end);
                        }
 
                                return (ls_end);
                        }
 
-                       ospf_print_tos_metrics(ndo, &rlp->un_tos);
+                       if (ospf_print_tos_metrics(ndo, &rlp->un_tos))
+                               goto trunc;
 
 
-                       rlp = (struct rlalink *)((u_char *)(rlp + 1) +
+                       rlp = (const struct rlalink *)((const u_char *)(rlp + 1) +
                            ((rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
                }
                break;
                            ((rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
                }
                break;
@@ -621,11 +687,11 @@ ospf_print_lsa(netdissect_options *ndo,
        case LS_TYPE_NETWORK:
                ND_TCHECK(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT((ndo, "\n\t    Mask %s\n\t    Connected Routers:",
        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(&lsap->lsa_un.un_nla.nla_mask)));
+                   ipaddr_string(ndo, &lsap->lsa_un.un_nla.nla_mask)));
                ap = lsap->lsa_un.un_nla.nla_router;
                ap = lsap->lsa_un.un_nla.nla_router;
-               while ((u_char *)ap < ls_end) {
+               while ((const u_char *)ap < ls_end) {
                        ND_TCHECK(*ap);
                        ND_TCHECK(*ap);
-                       ND_PRINT((ndo, "\n\t      %s", ipaddr_string(ap)));
+                       ND_PRINT((ndo, "\n\t      %s", ipaddr_string(ndo, ap)));
                        ++ap;
                }
                break;
                        ++ap;
                }
                break;
@@ -633,17 +699,17 @@ ospf_print_lsa(netdissect_options *ndo,
        case LS_TYPE_SUM_IP:
                ND_TCHECK(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT((ndo, "\n\t    Mask %s",
        case LS_TYPE_SUM_IP:
                ND_TCHECK(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT((ndo, "\n\t    Mask %s",
-                   ipaddr_string(&lsap->lsa_un.un_sla.sla_mask)));
+                   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;
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                lp = lsap->lsa_un.un_sla.sla_tosmetric;
-               while ((u_char *)lp < ls_end) {
-                       register u_int32_t ul;
+               while ((const u_char *)lp < ls_end) {
+                       register uint32_t ul;
 
                        ND_TCHECK(*lp);
                        ul = EXTRACT_32BITS(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
 
                        ND_TCHECK(*lp);
                        ul = EXTRACT_32BITS(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
-                       ND_PRINT((ndo, "\n\t\ttopology %s(%u) metric %d",
-                               tok2str(ospf_topology_values, "", topology),
+                       ND_PRINT((ndo, "\n\t\ttopology %s (%u) metric %d",
+                               tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                ul & SLA_MASK_METRIC));
                        ++lp;
                                topology,
                                ul & SLA_MASK_METRIC));
                        ++lp;
@@ -653,14 +719,14 @@ ospf_print_lsa(netdissect_options *ndo,
        case LS_TYPE_SUM_ABR:
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                lp = lsap->lsa_un.un_sla.sla_tosmetric;
        case LS_TYPE_SUM_ABR:
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                lp = lsap->lsa_un.un_sla.sla_tosmetric;
-               while ((u_char *)lp < ls_end) {
-                       register u_int32_t ul;
+               while ((const u_char *)lp < ls_end) {
+                       register uint32_t ul;
 
                        ND_TCHECK(*lp);
                        ul = EXTRACT_32BITS(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
 
                        ND_TCHECK(*lp);
                        ul = EXTRACT_32BITS(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
-                       ND_PRINT((ndo, "\n\t\ttopology %s(%u) metric %d",
-                               tok2str(ospf_topology_values, "", topology),
+                       ND_PRINT((ndo, "\n\t\ttopology %s (%u) metric %d",
+                               tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                ul & SLA_MASK_METRIC));
                        ++lp;
                                topology,
                                ul & SLA_MASK_METRIC));
                        ++lp;
@@ -671,18 +737,18 @@ ospf_print_lsa(netdissect_options *ndo,
         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",
         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(&lsap->lsa_un.un_asla.asla_mask)));
+                   ipaddr_string(ndo, &lsap->lsa_un.un_asla.asla_mask)));
 
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
 
                ND_TCHECK(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
-               while ((u_char *)almp < ls_end) {
-                       register u_int32_t ul;
+               while ((const u_char *)almp < ls_end) {
+                       register uint32_t ul;
 
                        ND_TCHECK(almp->asla_tosmetric);
                        ul = EXTRACT_32BITS(&almp->asla_tosmetric);
                         topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
 
                        ND_TCHECK(almp->asla_tosmetric);
                        ul = EXTRACT_32BITS(&almp->asla_tosmetric);
                         topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
-                       ND_PRINT((ndo, "\n\t\ttopology %s(%u), type %d, metric",
-                               tok2str(ospf_topology_values, "", topology),
+                       ND_PRINT((ndo, "\n\t\ttopology %s (%u), type %d, metric",
+                               tok2str(ospf_topology_values, "Unknown", topology),
                                topology,
                                (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1));
                        if ((ul & ASLA_MASK_METRIC) == 0xffffff)
                                topology,
                                (ul & ASLA_FLAG_EXTERNAL) ? 2 : 1));
                        if ((ul & ASLA_MASK_METRIC) == 0xffffff)
@@ -692,11 +758,11 @@ ospf_print_lsa(netdissect_options *ndo,
 
                        ND_TCHECK(almp->asla_forward);
                        if (almp->asla_forward.s_addr) {
 
                        ND_TCHECK(almp->asla_forward);
                        if (almp->asla_forward.s_addr) {
-                               ND_PRINT((ndo, ", forward %s", ipaddr_string(&almp->asla_forward)));
+                               ND_PRINT((ndo, ", forward %s", ipaddr_string(ndo, &almp->asla_forward)));
                        }
                        ND_TCHECK(almp->asla_tag);
                        if (almp->asla_tag.s_addr) {
                        }
                        ND_TCHECK(almp->asla_tag);
                        if (almp->asla_tag.s_addr) {
-                               ND_PRINT((ndo, ", tag %s", ipaddr_string(&almp->asla_tag)));
+                               ND_PRINT((ndo, ", tag %s", ipaddr_string(ndo, &almp->asla_tag)));
                        }
                        ++almp;
                }
                        }
                        ++almp;
                }
@@ -705,18 +771,18 @@ ospf_print_lsa(netdissect_options *ndo,
        case LS_TYPE_GROUP:
                /* Multicast extensions as of 23 July 1991 */
                mcp = lsap->lsa_un.un_mcla;
        case LS_TYPE_GROUP:
                /* Multicast extensions as of 23 July 1991 */
                mcp = lsap->lsa_un.un_mcla;
-               while ((u_char *)mcp < ls_end) {
+               while ((const u_char *)mcp < ls_end) {
                        ND_TCHECK(mcp->mcla_vid);
                        switch (EXTRACT_32BITS(&mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
                                ND_PRINT((ndo, "\n\t    Router Router-ID %s",
                        ND_TCHECK(mcp->mcla_vid);
                        switch (EXTRACT_32BITS(&mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
                                ND_PRINT((ndo, "\n\t    Router Router-ID %s",
-                                   ipaddr_string(&mcp->mcla_vid)));
+                                   ipaddr_string(ndo, &mcp->mcla_vid)));
                                break;
 
                        case MCLA_VERTEX_NETWORK:
                                ND_PRINT((ndo, "\n\t    Network Designated Router %s",
                                break;
 
                        case MCLA_VERTEX_NETWORK:
                                ND_PRINT((ndo, "\n\t    Network Designated Router %s",
-                                   ipaddr_string(&mcp->mcla_vid)));
+                                   ipaddr_string(ndo, &mcp->mcla_vid)));
                                break;
 
                        default:
                                break;
 
                        default:
@@ -734,7 +800,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
            switch (*(&lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
             case LS_OPAQUE_TYPE_RI:
 
            switch (*(&lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
             case LS_OPAQUE_TYPE_RI:
-               tptr = (u_int8_t *)(&lsap->lsa_un.un_ri_tlv.type);
+               tptr = (const uint8_t *)(&lsap->lsa_un.un_ri_tlv.type);
 
                while (ls_length != 0) {
                     ND_TCHECK2(*tptr, 4);
 
                while (ls_length != 0) {
                     ND_TCHECK2(*tptr, 4);
@@ -782,14 +848,14 @@ ospf_print_lsa(netdissect_options *ndo,
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
-                if (ospf_print_grace_lsa(ndo, (u_int8_t *)(&lsap->lsa_un.un_grace_tlv.type),
+                if (ospf_print_grace_lsa(ndo, (const uint8_t *)(&lsap->lsa_un.un_grace_tlv.type),
                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:
                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:
-                if (ospf_print_te_lsa(ndo, (u_int8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type),
+                if (ospf_print_te_lsa(ndo, (const uint8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type),
                                       ls_length) == -1) {
                     return(ls_end);
                 }
                                       ls_length) == -1) {
                     return(ls_end);
                 }
@@ -797,7 +863,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
             default:
                 if (ndo->ndo_vflag <= 1) {
 
             default:
                 if (ndo->ndo_vflag <= 1) {
-                    if (!print_unknown_data(ndo, (u_int8_t *)lsap->lsa_un.un_unknown,
+                    if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown,
                                            "\n\t    ", ls_length))
                         return(ls_end);
                 }
                                            "\n\t    ", ls_length))
                         return(ls_end);
                 }
@@ -807,7 +873,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
         /* do we want to see an additionally hexdump ? */
         if (ndo->ndo_vflag> 1)
 
         /* do we want to see an additionally hexdump ? */
         if (ndo->ndo_vflag> 1)
-            if (!print_unknown_data(ndo, (u_int8_t *)lsap->lsa_un.un_unknown,
+            if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown,
                                    "\n\t    ", ls_length)) {
                 return(ls_end);
             }
                                    "\n\t    ", ls_length)) {
                 return(ls_end);
             }
@@ -824,8 +890,8 @@ ospf_decode_lls(netdissect_options *ndo,
     register const u_char *dptr;
     register const u_char *dataend;
     register u_int length2;
     register const u_char *dptr;
     register const u_char *dataend;
     register u_int length2;
-    register u_int16_t lls_type, lls_len;
-    register u_int32_t lls_flags;
+    register uint16_t lls_type, lls_len;
+    register uint32_t lls_flags;
 
     switch (op->ospf_type) {
 
 
     switch (op->ospf_type) {
 
@@ -845,8 +911,8 @@ ospf_decode_lls(netdissect_options *ndo,
 
     /* dig deeper if LLS data is available; see RFC4813 */
     length2 = EXTRACT_16BITS(&op->ospf_len);
 
     /* dig deeper if LLS data is available; see RFC4813 */
     length2 = EXTRACT_16BITS(&op->ospf_len);
-    dptr = (u_char *)op + length2;
-    dataend = (u_char *)op + length;
+    dptr = (const u_char *)op + length2;
+    dataend = (const u_char *)op + length;
 
     if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
         dptr = dptr + op->ospf_authdata[3];
 
     if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
         dptr = dptr + op->ospf_authdata[3];
@@ -917,18 +983,12 @@ ospf_decode_v2(netdissect_options *ndo,
        register const struct lsr *lsrp;
        register const struct lsa_hdr *lshp;
        register const struct lsa *lsap;
        register const struct lsr *lsrp;
        register const struct lsa_hdr *lshp;
        register const struct lsa *lsap;
-       register u_int32_t lsa_count,lsa_count_max;
+       register uint32_t lsa_count,lsa_count_max;
 
        switch (op->ospf_type) {
 
 
        switch (op->ospf_type) {
 
-       case OSPF_TYPE_UMD:
-               /*
-                * Rob Coltun's special monitoring packets;
-                * do nothing
-                */
-               break;
-
        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_PRINT((ndo, "\n\tOptions [%s]",
                          bittok2str(ospf_option_values,"none",op->ospf_hello.hello_options)));
 
@@ -936,25 +996,25 @@ ospf_decode_v2(netdissect_options *ndo,
                ND_PRINT((ndo, "\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
                          EXTRACT_16BITS(&op->ospf_hello.hello_helloint),
                          EXTRACT_32BITS(&op->ospf_hello.hello_deadint),
                ND_PRINT((ndo, "\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
                          EXTRACT_16BITS(&op->ospf_hello.hello_helloint),
                          EXTRACT_32BITS(&op->ospf_hello.hello_deadint),
-                         ipaddr_string(&op->ospf_hello.hello_mask),
+                         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",
                          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(&op->ospf_hello.hello_dr)));
+                           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",
 
                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(&op->ospf_hello.hello_bdr)));
+                                 ipaddr_string(ndo, &op->ospf_hello.hello_bdr)));
 
                ap = op->ospf_hello.hello_neighbor;
 
                ap = op->ospf_hello.hello_neighbor;
-               if ((u_char *)ap < dataend)
+               if ((const u_char *)ap < dataend)
                        ND_PRINT((ndo, "\n\t  Neighbor List:"));
                        ND_PRINT((ndo, "\n\t  Neighbor List:"));
-               while ((u_char *)ap < dataend) {
+               while ((const u_char *)ap < dataend) {
                        ND_TCHECK(*ap);
                        ND_TCHECK(*ap);
-                       ND_PRINT((ndo, "\n\t    %s", ipaddr_string(ap)));
+                       ND_PRINT((ndo, "\n\t    %s", ipaddr_string(ndo, ap)));
                        ++ap;
                }
                break;  /* HELLO */
                        ++ap;
                }
                break;  /* HELLO */
@@ -975,18 +1035,18 @@ ospf_decode_v2(netdissect_options *ndo,
 
                /* Print all the LS adv's */
                lshp = op->ospf_db.db_lshdr;
 
                /* Print all the LS adv's */
                lshp = op->ospf_db.db_lshdr;
-               while (((u_char *)lshp < dataend) && ospf_print_lshdr(ndo, lshp) != -1) {
+               while (((const u_char *)lshp < dataend) && ospf_print_lshdr(ndo, lshp) != -1) {
                        ++lshp;
                }
                break;
 
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
                        ++lshp;
                }
                break;
 
        case OSPF_TYPE_LS_REQ:
                 lsrp = op->ospf_lsr;
-                while ((u_char *)lsrp < dataend) {
+                while ((const u_char *)lsrp < dataend) {
                     ND_TCHECK(*lsrp);
 
                     ND_PRINT((ndo, "\n\t  Advertising Router: %s, %s LSA (%u)",
                     ND_TCHECK(*lsrp);
 
                     ND_PRINT((ndo, "\n\t  Advertising Router: %s, %s LSA (%u)",
-                           ipaddr_string(&lsrp->ls_router),
+                           ipaddr_string(ndo, &lsrp->ls_router),
                            tok2str(lsa_values,"unknown",EXTRACT_32BITS(lsrp->ls_type)),
                            EXTRACT_32BITS(&lsrp->ls_type)));
 
                            tok2str(lsa_values,"unknown",EXTRACT_32BITS(lsrp->ls_type)),
                            EXTRACT_32BITS(&lsrp->ls_type)));
 
@@ -1002,7 +1062,7 @@ ospf_decode_v2(netdissect_options *ndo,
                         break;
                     default:
                         ND_PRINT((ndo, ", LSA-ID: %s",
                         break;
                     default:
                         ND_PRINT((ndo, ", LSA-ID: %s",
-                               ipaddr_string(&lsrp->un_ls_stateid.ls_stateid)));
+                               ipaddr_string(ndo, &lsrp->un_ls_stateid.ls_stateid)));
                         break;
                     }
 
                         break;
                     }
 
@@ -1047,7 +1107,7 @@ ospf_print(netdissect_options *ndo,
        register const u_char *dataend;
        register const char *cp;
 
        register const u_char *dataend;
        register const char *cp;
 
-       op = (struct ospfhdr *)bp;
+       op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
        ND_TCHECK(op->ospf_authtype);
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
        ND_TCHECK(op->ospf_authtype);
@@ -1059,7 +1119,7 @@ ospf_print(netdissect_options *ndo,
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
        ND_TCHECK(op->ospf_type);
        /* If the type is valid translate it, or just print the type */
        /* value.  If it's not valid, say so and return */
        ND_TCHECK(op->ospf_type);
-       cp = tok2str(type2str, "unknown LS-type", op->ospf_type);
+       cp = tok2str(type2str, "unknown LS-type %u", op->ospf_type);
        ND_PRINT((ndo, "OSPFv%u, %s, length %u", op->ospf_version, cp, length));
        if (*cp == 'u')
                return;
        ND_PRINT((ndo, "OSPFv%u, %s, length %u", op->ospf_version, cp, length));
        if (*cp == 'u')
                return;
@@ -1080,11 +1140,11 @@ ospf_print(netdissect_options *ndo,
        }
 
        ND_TCHECK(op->ospf_routerid);
        }
 
        ND_TCHECK(op->ospf_routerid);
-       ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(&op->ospf_routerid)));
+       ND_PRINT((ndo, "\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf_routerid)));
 
        ND_TCHECK(op->ospf_areaid);
        if (op->ospf_areaid.s_addr != 0)
 
        ND_TCHECK(op->ospf_areaid);
        if (op->ospf_areaid.s_addr != 0)
-               ND_PRINT((ndo, ", Area %s", ipaddr_string(&op->ospf_areaid)));
+               ND_PRINT((ndo, ", Area %s", ipaddr_string(ndo, &op->ospf_areaid)));
        else
                ND_PRINT((ndo, ", Backbone Area"));
 
        else
                ND_PRINT((ndo, ", Backbone Area"));
 
[mirror] the TCPdump network dissector