DNS: Sync types with IANA

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index 7d3578004c8946ffe5d9622ed9df1ba1a48d330e..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 }
 };
 


@@ -307,7 +309,6 @@ ospf_te_lsa_print(netdissect_options *ndo,
                            tlv_length);
                     return -1;
                 }
                            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;


@@ -492,7 +493,6 @@ 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", GET_IPADDR_STRING(tptr));
             break;
 
             ND_PRINT(", %s", GET_IPADDR_STRING(tptr));
             break;
 


@@ -529,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",
+        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_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 - 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 */


@@ -572,14 +567,10 @@ ospf_print_lshdr(netdissect_options *ndo,
                    GET_IPADDR_STRING(lshp->un_lsa_id.lsa_id));
             break;
         }
                    GET_IPADDR_STRING(lshp->un_lsa_id.lsa_id));
             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 */


@@ -593,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)
 {


@@ -608,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",


@@ -619,9 +609,6 @@ ospf_print_tos_metrics(netdissect_options *ndo,
         tos++;
         toscount--;
     }
         tos++;
         toscount--;
     }

-    return 0;
-trunc:
-    return 1;

 }
 
 /*
 }
 
 /*


@@ -639,29 +626,33 @@ 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)) {
 
                        ND_TCHECK_SIZE(rlp);
                        switch (GET_U_1(rlp->un_tos.link.link_type)) {
 


@@ -695,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)));


@@ -704,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:",
                    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_PRINT("\n\t    Mask %s\n\t    Connected Routers:",
                    GET_IPADDR_STRING(lsap->lsa_un.un_nla.nla_mask));
                ap = lsap->lsa_un.un_nla.nla_router;
                while ((const u_char *)ap < ls_end) {

-                       ND_TCHECK_SIZE(ap);
-                       ND_PRINT("\n\t      %s", GET_IPADDR_STRING(*ap));
+                       ND_PRINT("\n\t      %s", GET_IPADDR_STRING(ap));

                        ++ap;
                }
                break;
                        ++ap;
                }
                break;


@@ -724,7 +712,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,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",


@@ -763,7 +749,6 @@ ospf_print_lsa(netdissect_options *ndo,
                while ((const u_char *)almp < ls_end) {
                        uint32_t ul;
 
                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",


@@ -775,11 +760,9 @@ 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) {
                                ND_PRINT(", forward %s", GET_IPADDR_STRING(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 (GET_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) {
                                ND_PRINT(", tag %s", GET_IPADDR_STRING(almp->asla_tag));
                        }
                        if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) {
                                ND_PRINT(", tag %s", GET_IPADDR_STRING(almp->asla_tag));
                        }


@@ -791,7 +774,6 @@ 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:
                        switch (GET_BE_U_4(mcp->mcla_vtype)) {
 
                        case MCLA_VERTEX_ROUTER:


@@ -821,7 +803,7 @@ 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);
 

-               int ls_length_remaining = ls_length;
+               u_int ls_length_remaining = ls_length;

                while (ls_length_remaining != 0) {
                     ND_TCHECK_4(tptr);
                    if (ls_length_remaining < 4) {
                while (ls_length_remaining != 0) {
                     ND_TCHECK_4(tptr);
                    if (ls_length_remaining < 4) {


@@ -903,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)
 {


@@ -917,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 */


@@ -935,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;


@@ -970,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));


@@ -982,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


@@ -1008,23 +979,19 @@ 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),
                          GET_IPADDR_STRING(op->ospf_hello.hello_mask),
                          GET_U_1(op->ospf_hello.hello_priority));
 
                ND_PRINT("\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
                          GET_BE_U_2(op->ospf_hello.hello_helloint),
                          GET_BE_U_4(op->ospf_hello.hello_deadint),
                          GET_IPADDR_STRING(op->ospf_hello.hello_mask),
                          GET_U_1(op->ospf_hello.hello_priority));
 

-               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",
                            GET_IPADDR_STRING(op->ospf_hello.hello_dr));
 
                if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_dr) != 0)
                        ND_PRINT("\n\t  Designated Router %s",
                            GET_IPADDR_STRING(op->ospf_hello.hello_dr));
 

-               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",
                                  GET_IPADDR_STRING(op->ospf_hello.hello_bdr));
                if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_bdr) != 0)
                        ND_PRINT(", Backup Designated Router %s",
                                  GET_IPADDR_STRING(op->ospf_hello.hello_bdr));


@@ -1033,25 +1000,20 @@ ospf_decode_v2(netdissect_options *ndo,
                if ((const u_char *)ap < dataend)
                        ND_PRINT("\n\t  Neighbor List:");
                while ((const u_char *)ap < dataend) {
                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", GET_IPADDR_STRING(*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 */


@@ -1093,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++) {


@@ -1132,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;


@@ -1140,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);


@@ -1151,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));
        }


@@ -1162,10 +1120,8 @@ ospf_print(netdissect_options *ndo,
                dataend = bp + length;
        }
 
                dataend = bp + length;
        }
 

-       ND_TCHECK_4(op->ospf_routerid);

        ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(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)
                ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf_areaid));
        else
        if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0)
                ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf_areaid));
        else


@@ -1186,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;
 


@@ -1207,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:


@@ -1220,5 +1174,5 @@ ospf_print(netdissect_options *ndo,
 
        return;
 trunc:
 
        return;
 trunc:

-       nd_print_trunc(ndo);
+       nd_trunc_longjmp(ndo);

 }
 }