]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ospf.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
DNS: Sync types with IANA
[tcpdump] / print-ospf.c
diff --git a/print-ospf.c b/print-ospf.c
index c7491617de0fb36cd309901aba80a8aadb0b4838..e6bebed374f820a1db57ba3bcd69b8c1ab4119a0 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -38,11 +38,11 @@
 
 
 static const struct tok ospf_option_values[] = {
 
 
 static const struct tok ospf_option_values[] = {
-        { OSPF_OPTION_T,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
+       { OSPF_OPTION_MT,       "MultiTopology" }, /* draft-ietf-ospf-mt-09 */
        { OSPF_OPTION_E,        "External" },
        { OSPF_OPTION_MC,       "Multicast" },
        { OSPF_OPTION_NP,       "NSSA" },
        { OSPF_OPTION_E,        "External" },
        { OSPF_OPTION_MC,       "Multicast" },
        { OSPF_OPTION_NP,       "NSSA" },
-        { OSPF_OPTION_L,        "LLS" },
+       { OSPF_OPTION_L,        "LLS" },
        { OSPF_OPTION_DC,       "Demand Circuit" },
        { OSPF_OPTION_O,        "Opaque" },
        { OSPF_OPTION_DN,       "Up/Down" },
        { OSPF_OPTION_DC,       "Demand Circuit" },
        { OSPF_OPTION_O,        "Opaque" },
        { OSPF_OPTION_DN,       "Up/Down" },
@@ -59,8 +59,10 @@ static const struct tok ospf_authtype_values[] = {
 static const struct tok ospf_rla_flag_values[] = {
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
 static const struct tok ospf_rla_flag_values[] = {
        { RLA_FLAG_B,           "ABR" },
        { RLA_FLAG_E,           "ASBR" },
-       { RLA_FLAG_W1,          "Virtual" },
-       { RLA_FLAG_W2,          "W2" },
+       { RLA_FLAG_V,           "Virtual" },
+       { RLA_FLAG_W,           "Wildcard" },
+       { RLA_FLAG_NT,          "Nt" },
+       { RLA_FLAG_H,           "Host" },
        { 0,                    NULL }
 };
 
        { 0,                    NULL }
 };
 
@@ -238,7 +240,7 @@ ospf_grace_lsa_print(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:
@@ -301,13 +303,12 @@ ospf_te_lsa_print(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;
                 }
                 if (tlv_length < 4) {
                     ND_PRINT("\n\t    Remaining TLV length %u < 4",
                            tlv_length);
                     return -1;
                 }
-                ND_TCHECK_4(tptr);
                 subtlv_type = GET_BE_U_2(tptr);
                 subtlv_length = GET_BE_U_2(tptr + 2);
                 tptr+=4;
                 subtlv_type = GET_BE_U_2(tptr);
                 subtlv_length = GET_BE_U_2(tptr + 2);
                 tptr+=4;
@@ -322,6 +323,11 @@ ospf_te_lsa_print(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:
@@ -338,11 +344,11 @@ ospf_te_lsa_print(netdissect_options *ndo,
                        goto invalid;
                    }
                     ND_PRINT(", %s (0x%08x)",
                        goto invalid;
                    }
                     ND_PRINT(", %s (0x%08x)",
-                           ipaddr_string(ndo, tptr),
+                           GET_IPADDR_STRING(tptr),
                            GET_BE_U_4(tptr));
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT(", %s (0x%08x)",
                            GET_BE_U_4(tptr));
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT(", %s (0x%08x)",
-                               ipaddr_string(ndo, tptr+4),
+                               GET_IPADDR_STRING(tptr+4),
                                GET_BE_U_4(tptr + 4));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                                GET_BE_U_4(tptr + 4));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
@@ -351,7 +357,7 @@ ospf_te_lsa_print(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:
@@ -471,6 +477,11 @@ ospf_te_lsa_print(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;
 
@@ -482,8 +493,7 @@ ospf_te_lsa_print(netdissect_options *ndo,
                 ND_PRINT("\n\t    TLV length %u < 4", tlv_length);
                 return -1;
             }
                 ND_PRINT("\n\t    TLV length %u < 4", tlv_length);
                 return -1;
             }
-            ND_TCHECK_4(tptr);
-            ND_PRINT(", %s", ipaddr_string(ndo, tptr));
+            ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
             break;
 
         default:
             break;
 
         default:
@@ -496,6 +506,11 @@ ospf_te_lsa_print(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;
     }
@@ -514,22 +529,17 @@ ospf_print_lshdr(netdissect_options *ndo,
         u_int ls_type;
         u_int ls_length;
 
         u_int ls_type;
         u_int ls_length;
 
-        ND_TCHECK_2(lshp->ls_length);
         ls_length = GET_BE_U_2(lshp->ls_length);
         if (ls_length < sizeof(struct lsa_hdr)) {
                 ND_PRINT("\n\t    Bogus length %u < header (%zu)", ls_length,
                     sizeof(struct lsa_hdr));
                 return(-1);
         }
         ls_length = GET_BE_U_2(lshp->ls_length);
         if (ls_length < 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",
-                  ipaddr_string(ndo, lshp->ls_router),
+        ND_PRINT("\n\t  Advertising Router %s, seq 0x%08x, age %us, length %zu",
+                  GET_IPADDR_STRING(lshp->ls_router),
                   GET_BE_U_4(lshp->ls_seq),
                   GET_BE_U_2(lshp->ls_age),
                   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 - sizeof(struct lsa_hdr));
         ls_type = GET_U_1(lshp->ls_type);
         switch (ls_type) {
         /* the LSA header for opaque LSAs was slightly changed */
         ls_type = GET_U_1(lshp->ls_type);
         switch (ls_type) {
         /* the LSA header for opaque LSAs was slightly changed */
@@ -554,17 +564,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;
         }
             break;
         }
-
-        ND_TCHECK_1(lshp->ls_options); /* XXX - ls_length check checked this */
         ND_PRINT("\n\t    Options: [%s]",
                 bittok2str(ospf_option_values, "none", GET_U_1(lshp->ls_options)));
 
         return (ls_length);
         ND_PRINT("\n\t    Options: [%s]",
                 bittok2str(ospf_option_values, "none", GET_U_1(lshp->ls_options)));
 
         return (ls_length);
-trunc:
-       return (-1);
 }
 
 /* draft-ietf-ospf-mt-09 */
 }
 
 /* draft-ietf-ospf-mt-09 */
@@ -578,7 +584,7 @@ static const struct tok ospf_topology_values[] = {
 /*
  * Print all the per-topology metrics.
  */
 /*
  * Print all the per-topology metrics.
  */
-static int
+static void
 ospf_print_tos_metrics(netdissect_options *ndo,
                        const union un_tos *tos)
 {
 ospf_print_tos_metrics(netdissect_options *ndo,
                        const union un_tos *tos)
 {
@@ -593,7 +599,6 @@ ospf_print_tos_metrics(netdissect_options *ndo,
      * All but the first metric contain a valid topology id.
      */
     while (toscount != 0) {
      * All but the first metric contain a valid topology id.
      */
     while (toscount != 0) {
-        ND_TCHECK_SIZE(tos);
         tos_type = GET_U_1(tos->metrics.tos_type);
         ND_PRINT("\n\t\ttopology %s (%u), metric %u",
                tok2str(ospf_topology_values, "Unknown",
         tos_type = GET_U_1(tos->metrics.tos_type);
         ND_PRINT("\n\t\ttopology %s (%u), metric %u",
                tok2str(ospf_topology_values, "Unknown",
@@ -604,9 +609,6 @@ ospf_print_tos_metrics(netdissect_options *ndo,
         tos++;
         toscount--;
     }
         tos++;
         toscount--;
     }
-    return 0;
-trunc:
-    return 1;
 }
 
 /*
 }
 
 /*
@@ -624,54 +626,58 @@ ospf_print_lsa(netdissect_options *ndo,
        const struct aslametric *almp;
        const struct mcla *mcp;
        const uint8_t *lp;
        const struct aslametric *almp;
        const struct mcla *mcp;
        const uint8_t *lp;
-       int j, tlv_type, tlv_length, topology;
-       int ls_length;
+       u_int tlv_type, tlv_length, rla_count, topology;
+       int ospf_print_lshdr_ret;
+       u_int ls_length;
        const uint8_t *tptr;
 
        tptr = (const uint8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
        const uint8_t *tptr;
 
        tptr = (const uint8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */
-        ls_length = ospf_print_lshdr(ndo, &lsap->ls_hdr);
-        if (ls_length == -1)
-                return(NULL);
+       ospf_print_lshdr_ret = ospf_print_lshdr(ndo, &lsap->ls_hdr);
+       if (ospf_print_lshdr_ret < 0)
+               return(NULL);
+       ls_length = (u_int)ospf_print_lshdr_ret;
        ls_end = (const uint8_t *)lsap + ls_length;
        ls_end = (const uint8_t *)lsap + ls_length;
+       /*
+        * ospf_print_lshdr() returns -1 if the length is too short,
+        * so we know ls_length is >= sizeof(struct lsa_hdr).
+        */
        ls_length -= sizeof(struct lsa_hdr);
 
        switch (GET_U_1(lsap->ls_hdr.ls_type)) {
 
        case LS_TYPE_ROUTER:
        ls_length -= sizeof(struct lsa_hdr);
 
        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]",
                          bittok2str(ospf_rla_flag_values, "none", GET_U_1(lsap->lsa_un.un_rla.rla_flags)));
 
                ND_PRINT("\n\t    Router LSA Options: [%s]",
                          bittok2str(ospf_rla_flag_values, "none", GET_U_1(lsap->lsa_un.un_rla.rla_flags)));
 
-               ND_TCHECK_2(lsap->lsa_un.un_rla.rla_count);
-               j = GET_BE_U_2(lsap->lsa_un.un_rla.rla_count);
+               rla_count = GET_BE_U_2(lsap->lsa_un.un_rla.rla_count);
                ND_TCHECK_SIZE(lsap->lsa_un.un_rla.rla_link);
                rlp = lsap->lsa_un.un_rla.rla_link;
                ND_TCHECK_SIZE(lsap->lsa_un.un_rla.rla_link);
                rlp = lsap->lsa_un.un_rla.rla_link;
-               while (j--) {
+               for (u_int i = rla_count; i != 0; i--) {
                        ND_TCHECK_SIZE(rlp);
                        switch (GET_U_1(rlp->un_tos.link.link_type)) {
 
                        case RLA_TYPE_VIRTUAL:
                                ND_PRINT("\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
                        ND_TCHECK_SIZE(rlp);
                        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",
-                                   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:
                                break;
 
                        default:
@@ -680,8 +686,7 @@ ospf_print_lsa(netdissect_options *ndo,
                                return (ls_end);
                        }
 
                                return (ls_end);
                        }
 
-                       if (ospf_print_tos_metrics(ndo, &rlp->un_tos))
-                               goto trunc;
+                       ospf_print_tos_metrics(ndo, &rlp->un_tos);
 
                        rlp = (const struct rlalink *)((const u_char *)(rlp + 1) +
                            (GET_U_1(rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
 
                        rlp = (const struct rlalink *)((const u_char *)(rlp + 1) +
                            (GET_U_1(rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
@@ -689,13 +694,11 @@ ospf_print_lsa(netdissect_options *ndo,
                break;
 
        case LS_TYPE_NETWORK:
                break;
 
        case LS_TYPE_NETWORK:
-               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) {
                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;
                        ++ap;
                }
                break;
@@ -703,13 +706,12 @@ ospf_print_lsa(netdissect_options *ndo,
        case LS_TYPE_SUM_IP:
                ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT("\n\t    Mask %s",
        case LS_TYPE_SUM_IP:
                ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT("\n\t    Mask %s",
-                   ipaddr_string(ndo, lsap->lsa_un.un_sla.sla_mask));
+                   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_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 = GET_BE_U_4(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
                        ND_PRINT("\n\t\ttopology %s (%u) metric %u",
                        ul = GET_BE_U_4(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
                        ND_PRINT("\n\t\ttopology %s (%u) metric %u",
@@ -726,7 +728,6 @@ ospf_print_lsa(netdissect_options *ndo,
                while (lp < ls_end) {
                        uint32_t ul;
 
                while (lp < ls_end) {
                        uint32_t ul;
 
-                       ND_TCHECK_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",
                        ul = GET_BE_U_4(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
                        ND_PRINT("\n\t\ttopology %s (%u) metric %u",
@@ -741,14 +742,13 @@ ospf_print_lsa(netdissect_options *ndo,
         case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */
                ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT("\n\t    Mask %s",
         case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */
                ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask);
                ND_PRINT("\n\t    Mask %s",
-                   ipaddr_string(ndo, lsap->lsa_un.un_asla.asla_mask));
+                   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;
                while ((const u_char *)almp < ls_end) {
                        uint32_t ul;
 
 
                ND_TCHECK_SIZE(lsap->lsa_un.un_sla.sla_tosmetric);
                almp = lsap->lsa_un.un_asla.asla_metric;
                while ((const u_char *)almp < ls_end) {
                        uint32_t ul;
 
-                       ND_TCHECK_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",
                        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",
@@ -760,13 +760,11 @@ 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 (GET_IPV4_TO_NETWORK_ORDER(almp->asla_forward) != 0) {
                        if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_forward) != 0) {
-                               ND_PRINT(", forward %s", ipaddr_string(ndo, almp->asla_forward));
+                               ND_PRINT(", forward %s", GET_IPADDR_STRING(almp->asla_forward));
                        }
                        }
-                       ND_TCHECK_4(almp->asla_tag);
                        if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) {
                        if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) {
-                               ND_PRINT(", tag %s", ipaddr_string(ndo, almp->asla_tag));
+                               ND_PRINT(", tag %s", GET_IPADDR_STRING(almp->asla_tag));
                        }
                        ++almp;
                }
                        }
                        ++almp;
                }
@@ -776,17 +774,16 @@ 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 (GET_BE_U_4(mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:
                                ND_PRINT("\n\t    Router Router-ID %s",
                        switch (GET_BE_U_4(mcp->mcla_vtype)) {
 
                        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:
                                break;
 
                        default:
@@ -806,25 +803,26 @@ ospf_print_lsa(netdissect_options *ndo,
             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) {
+               u_int ls_length_remaining = ls_length;
+               while (ls_length_remaining != 0) {
                     ND_TCHECK_4(tptr);
                     ND_TCHECK_4(tptr);
-                   if (ls_length < 4) {
-                        ND_PRINT("\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);
                     }
                     tlv_type = GET_BE_U_2(tptr);
                     tlv_length = GET_BE_U_2(tptr + 2);
                     tptr+=4;
                         return(ls_end);
                     }
                     tlv_type = GET_BE_U_2(tptr);
                     tlv_length = GET_BE_U_2(tptr + 2);
                     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);
@@ -847,7 +845,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
                     }
                     tptr+=tlv_length;
 
                     }
                     tptr+=tlv_length;
-                    ls_length-=tlv_length;
+                    ls_length_remaining-=tlv_length;
                 }
                 break;
 
                 }
                 break;
 
@@ -887,7 +885,7 @@ trunc:
        return (NULL);
 }
 
        return (NULL);
 }
 
-static int
+static void
 ospf_decode_lls(netdissect_options *ndo,
                 const struct ospfhdr *op, u_int length)
 {
 ospf_decode_lls(netdissect_options *ndo,
                 const struct ospfhdr *op, u_int length)
 {
@@ -901,16 +899,16 @@ ospf_decode_lls(netdissect_options *ndo,
 
     case OSPF_TYPE_HELLO:
         if (!(GET_U_1(op->ospf_hello.hello_options) & OSPF_OPTION_L))
 
     case OSPF_TYPE_HELLO:
         if (!(GET_U_1(op->ospf_hello.hello_options) & OSPF_OPTION_L))
-            return (0);
+            return;
         break;
 
     case OSPF_TYPE_DD:
         if (!(GET_U_1(op->ospf_db.db_options) & OSPF_OPTION_L))
         break;
 
     case OSPF_TYPE_DD:
         if (!(GET_U_1(op->ospf_db.db_options) & OSPF_OPTION_L))
-            return (0);
+            return;
         break;
 
     default:
         break;
 
     default:
-        return (0);
+        return;
     }
 
     /* dig deeper if LLS data is available; see RFC4813 */
     }
 
     /* dig deeper if LLS data is available; see RFC4813 */
@@ -919,31 +917,26 @@ ospf_decode_lls(netdissect_options *ndo,
     dataend = (const u_char *)op + length;
 
     if (GET_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
     dataend = (const u_char *)op + length;
 
     if (GET_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
-        dptr = dptr + op->ospf_authdata[3];
-        length2 += op->ospf_authdata[3];
+        dptr = dptr + GET_U_1(op->ospf_authdata + 3);
+        length2 += GET_U_1(op->ospf_authdata + 3);
     }
     if (length2 >= length) {
         ND_PRINT("\n\t[LLS truncated]");
     }
     if (length2 >= length) {
         ND_PRINT("\n\t[LLS truncated]");
-        return (1);
+        return;
     }
     }
-    ND_TCHECK_2(dptr);
     ND_PRINT("\n\t  LLS: checksum: 0x%04x", (u_int) GET_BE_U_2(dptr));
 
     dptr += 2;
     ND_PRINT("\n\t  LLS: checksum: 0x%04x", (u_int) GET_BE_U_2(dptr));
 
     dptr += 2;
-    ND_TCHECK_2(dptr);
     length2 = GET_BE_U_2(dptr);
     ND_PRINT(", length: %u", length2);
 
     dptr += 2;
     length2 = GET_BE_U_2(dptr);
     ND_PRINT(", length: %u", length2);
 
     dptr += 2;
-    ND_TCHECK_1(dptr);
     while (dptr < dataend) {
     while (dptr < dataend) {
-        ND_TCHECK_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;
         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);
         lls_len = GET_BE_U_2(dptr);
         ND_PRINT(", length: %u", lls_len);
         dptr += 2;
         lls_len = GET_BE_U_2(dptr);
         ND_PRINT(", length: %u", lls_len);
         dptr += 2;
@@ -954,7 +947,6 @@ ospf_decode_lls(netdissect_options *ndo,
                 ND_PRINT(" [should be 4]");
                 lls_len = 4;
             }
                 ND_PRINT(" [should be 4]");
                 lls_len = 4;
             }
-            ND_TCHECK_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));
             lls_flags = GET_BE_U_4(dptr);
             ND_PRINT("\n\t      Options: 0x%08x [%s]", lls_flags,
                    bittok2str(ospf_lls_eo_options, "?", lls_flags));
@@ -966,17 +958,12 @@ ospf_decode_lls(netdissect_options *ndo,
                 ND_PRINT(" [should be 20]");
                 lls_len = 20;
             }
                 ND_PRINT(" [should be 20]");
                 lls_len = 20;
             }
-            ND_TCHECK_4(dptr);
             ND_PRINT("\n\t      Sequence number: 0x%08x", GET_BE_U_4(dptr));
             break;
         }
 
         dptr += lls_len;
     }
             ND_PRINT("\n\t      Sequence number: 0x%08x", GET_BE_U_4(dptr));
             break;
         }
 
         dptr += lls_len;
     }
-
-    return (0);
-trunc:
-    return (1);
 }
 
 static int
 }
 
 static int
@@ -992,50 +979,41 @@ ospf_decode_v2(netdissect_options *ndo,
        switch (GET_U_1(op->ospf_type)) {
 
        case OSPF_TYPE_HELLO:
        switch (GET_U_1(op->ospf_type)) {
 
        case OSPF_TYPE_HELLO:
-               ND_TCHECK_1(op->ospf_hello.hello_options);
                ND_PRINT("\n\tOptions [%s]",
                          bittok2str(ospf_option_values,"none",GET_U_1(op->ospf_hello.hello_options)));
 
                ND_PRINT("\n\tOptions [%s]",
                          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",
                          GET_BE_U_2(op->ospf_hello.hello_helloint),
                          GET_BE_U_4(op->ospf_hello.hello_deadint),
                ND_PRINT("\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
                          GET_BE_U_2(op->ospf_hello.hello_helloint),
                          GET_BE_U_4(op->ospf_hello.hello_deadint),
-                         ipaddr_string(ndo, op->ospf_hello.hello_mask),
+                         GET_IPADDR_STRING(op->ospf_hello.hello_mask),
                          GET_U_1(op->ospf_hello.hello_priority));
 
                          GET_U_1(op->ospf_hello.hello_priority));
 
-               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",
                if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_dr) != 0)
                        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 (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_bdr) != 0)
                        ND_PRINT(", Backup Designated Router %s",
                if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_bdr) != 0)
                        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) {
 
                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 */
 
        case OSPF_TYPE_DD:
                        ++ap;
                }
                break;  /* HELLO */
 
        case OSPF_TYPE_DD:
-               ND_TCHECK_1(op->ospf_db.db_options);
                ND_PRINT("\n\tOptions [%s]",
                          bittok2str(ospf_option_values, "none", GET_U_1(op->ospf_db.db_options)));
                ND_PRINT("\n\tOptions [%s]",
                          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]",
                          bittok2str(ospf_dd_flag_values, "none", GET_U_1(op->ospf_db.db_flags)));
                ND_PRINT(", DD Flags [%s]",
                          bittok2str(ospf_dd_flag_values, "none", GET_U_1(op->ospf_db.db_flags)));
-               ND_TCHECK_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));
                }
                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_PRINT(", Sequence: 0x%08x", GET_BE_U_4(op->ospf_db.db_seq));
 
                /* Print all the LS adv's */
                ND_PRINT(", Sequence: 0x%08x", GET_BE_U_4(op->ospf_db.db_seq));
 
                /* Print all the LS adv's */
@@ -1051,7 +1029,7 @@ 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),
+                           GET_IPADDR_STRING(lsrp->ls_router),
                            tok2str(lsa_values,"unknown",GET_BE_U_4(lsrp->ls_type)),
                            GET_BE_U_4(lsrp->ls_type));
 
                            tok2str(lsa_values,"unknown",GET_BE_U_4(lsrp->ls_type)),
                            GET_BE_U_4(lsrp->ls_type));
 
@@ -1067,7 +1045,7 @@ ospf_decode_v2(netdissect_options *ndo,
                         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 +1055,6 @@ ospf_decode_v2(netdissect_options *ndo,
 
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
 
        case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
-                ND_TCHECK_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++) {
                 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++) {
@@ -1116,7 +1093,6 @@ ospf_print(netdissect_options *ndo,
        op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
        op = (const struct ospfhdr *)bp;
 
        /* XXX Before we do anything else, strip off the MD5 trailer */
-       ND_TCHECK_2(op->ospf_authtype);
        if (GET_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
                length -= OSPF_AUTH_MD5_LEN;
                ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
        if (GET_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) {
                length -= OSPF_AUTH_MD5_LEN;
                ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
@@ -1124,7 +1100,6 @@ 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 */
 
        /* 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", GET_U_1(op->ospf_type));
        ND_PRINT("OSPFv%u, %s, length %u", GET_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);
@@ -1135,7 +1110,6 @@ ospf_print(netdissect_options *ndo,
                return;
        }
 
                return;
        }
 
-       ND_TCHECK_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 != GET_BE_U_2(op->ospf_len)) {
                ND_PRINT(" [len %u]", GET_BE_U_2(op->ospf_len));
        }
@@ -1146,12 +1120,10 @@ ospf_print(netdissect_options *ndo,
                dataend = bp + length;
        }
 
                dataend = bp + length;
        }
 
-       ND_TCHECK_4(op->ospf_routerid);
-       ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, op->ospf_routerid));
+       ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf_routerid));
 
 
-       ND_TCHECK_4(op->ospf_areaid);
        if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0)
        if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0)
-               ND_PRINT(", Area %s", ipaddr_string(ndo, op->ospf_areaid));
+               ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf_areaid));
        else
                ND_PRINT(", Backbone Area");
 
        else
                ND_PRINT(", Backbone Area");
 
@@ -1170,13 +1142,13 @@ ospf_print(netdissect_options *ndo,
 
                case OSPF_AUTH_SIMPLE:
                        ND_PRINT("\n\tSimple text password: ");
 
                case OSPF_AUTH_SIMPLE:
                        ND_PRINT("\n\tSimple text password: ");
-                       (void)nd_printzp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN, NULL);
+                       nd_printjnp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN);
                        break;
 
                case OSPF_AUTH_MD5:
                        ND_PRINT("\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
                        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),
+                                 GET_U_1(op->ospf_authdata + 2),
+                                 GET_U_1(op->ospf_authdata + 3),
                                  GET_BE_U_4((op->ospf_authdata) + 4));
                        break;
 
                                  GET_BE_U_4((op->ospf_authdata) + 4));
                        break;
 
@@ -1191,10 +1163,8 @@ ospf_print(netdissect_options *ndo,
                /* ospf version 2 */
                if (ospf_decode_v2(ndo, op, dataend))
                        goto trunc;
                /* ospf version 2 */
                if (ospf_decode_v2(ndo, op, dataend))
                        goto trunc;
-               if (length > GET_BE_U_2(op->ospf_len)) {
-                       if (ospf_decode_lls(ndo, op, length))
-                               goto trunc;
-               }
+               if (length > GET_BE_U_2(op->ospf_len))
+                       ospf_decode_lls(ndo, op, length);
                break;
 
        default:
                break;
 
        default:
@@ -1204,5 +1174,5 @@ ospf_print(netdissect_options *ndo,
 
        return;
 trunc:
 
        return;
 trunc:
-       nd_print_trunc(ndo);
+       nd_trunc_longjmp(ndo);
 }
 }
[mirror] the TCPdump network dissector