Use the EXTRACT_U_1() macro in some utility functions

[tcpdump] / print-ospf6.c

diff --git a/print-ospf6.c b/print-ospf6.c
index a0ffa06cbcaf736f335a9d210486e94fdc7786a3..8704c25273e742ffa759f5156abe3b1e91c32cef 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -24,10 +24,10 @@
 /* \summary: IPv6 Open Shortest Path First (OSPFv3) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: IPv6 Open Shortest Path First (OSPFv3) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -389,8 +389,8 @@ ospf6_print_lshdr(netdissect_options *ndo,
 {
        if ((const u_char *)(lshp + 1) > dataend)
                goto trunc;
 {
        if ((const u_char *)(lshp + 1) > dataend)
                goto trunc;

-       ND_TCHECK(lshp->ls_type);
-       ND_TCHECK(lshp->ls_seq);
+       ND_TCHECK_2(lshp->ls_type);
+       ND_TCHECK_4(lshp->ls_seq);

 
        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 %u",
                ipaddr_string(ndo, &lshp->ls_router),


@@ -473,7 +473,7 @@ ospf6_print_lsa(netdissect_options *ndo,
 
        if (ospf6_print_lshdr(ndo, &lsap->ls_hdr, dataend))
                return (1);
 
        if (ospf6_print_lshdr(ndo, &lsap->ls_hdr, dataend))
                return (1);

-       ND_TCHECK(lsap->ls_hdr.ls_length);
+       ND_TCHECK_2(lsap->ls_hdr.ls_length);

         length = EXTRACT_BE_U_2(lsap->ls_hdr.ls_length);
 
        /*
         length = EXTRACT_BE_U_2(lsap->ls_hdr.ls_length);
 
        /*


@@ -492,7 +492,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (lsap->lsa_un.un_rla.rla_options))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_rla.rla_options);
                if (lsa_length < sizeof (lsap->lsa_un.un_rla.rla_options))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_rla.rla_options);

-               ND_TCHECK(lsap->lsa_un.un_rla.rla_options);
+               ND_TCHECK_4(lsap->lsa_un.un_rla.rla_options);

                ND_PRINT("\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(lsap->lsa_un.un_rla.rla_options)));
                ND_PRINT("\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(lsap->lsa_un.un_rla.rla_options)));


@@ -546,7 +546,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (lsap->lsa_un.un_nla.nla_options))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_nla.nla_options);
                if (lsa_length < sizeof (lsap->lsa_un.un_nla.nla_options))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_nla.nla_options);

-               ND_TCHECK(lsap->lsa_un.un_nla.nla_options);
+               ND_TCHECK_4(lsap->lsa_un.un_nla.nla_options);

                ND_PRINT("\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(lsap->lsa_un.un_nla.nla_options)));
                ND_PRINT("\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(lsap->lsa_un.un_nla.nla_options)));


@@ -567,7 +567,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);
                if (lsa_length < sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_inter_ap.inter_ap_metric);

-               ND_TCHECK(lsap->lsa_un.un_inter_ap.inter_ap_metric);
+               ND_TCHECK_4(lsap->lsa_un.un_inter_ap.inter_ap_metric);

                ND_PRINT(", metric %u",
                        EXTRACT_BE_U_4(lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC);
 
                ND_PRINT(", metric %u",
                        EXTRACT_BE_U_4(lsap->lsa_un.un_inter_ap.inter_ap_metric) & SLA_MASK_METRIC);
 


@@ -585,7 +585,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (lsap->lsa_un.un_asla.asla_metric))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);
                if (lsa_length < sizeof (lsap->lsa_un.un_asla.asla_metric))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_asla.asla_metric);

-               ND_TCHECK(lsap->lsa_un.un_asla.asla_metric);
+               ND_TCHECK_4(lsap->lsa_un.un_asla.asla_metric);

                flags32 = EXTRACT_BE_U_4(lsap->lsa_un.un_asla.asla_metric);
                ND_PRINT("\n\t     Flags [%s]",
                          bittok2str(ospf6_asla_flag_values, "none", flags32));
                flags32 = EXTRACT_BE_U_4(lsap->lsa_un.un_asla.asla_metric);
                ND_PRINT("\n\t     Flags [%s]",
                          bittok2str(ospf6_asla_flag_values, "none", flags32));


@@ -618,7 +618,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);

-                       ND_TCHECK(*(const uint32_t *)tptr);
+                       ND_TCHECK_4(tptr);

                        ND_PRINT(" tag %s",
                               ipaddr_string(ndo, (const uint32_t *)tptr));
                        tptr += sizeof(uint32_t);
                        ND_PRINT(" tag %s",
                               ipaddr_string(ndo, (const uint32_t *)tptr));
                        tptr += sizeof(uint32_t);


@@ -628,7 +628,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);
                        if (lsa_length < sizeof (uint32_t))
                                return (1);
                        lsa_length -= sizeof (uint32_t);

-                       ND_TCHECK(*(const uint32_t *)tptr);
+                       ND_TCHECK_4(tptr);

                        ND_PRINT(" RefLSID: %s",
                               ipaddr_string(ndo, (const uint32_t *)tptr));
                        tptr += sizeof(uint32_t);
                        ND_PRINT(" RefLSID: %s",
                               ipaddr_string(ndo, (const uint32_t *)tptr));
                        tptr += sizeof(uint32_t);


@@ -641,7 +641,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (llsap->llsa_priandopt))
                        return (1);
                lsa_length -= sizeof (llsap->llsa_priandopt);
                if (lsa_length < sizeof (llsap->llsa_priandopt))
                        return (1);
                lsa_length -= sizeof (llsap->llsa_priandopt);

-               ND_TCHECK(llsap->llsa_priandopt);
+               ND_TCHECK_SIZE(&llsap->llsa_priandopt);

                ND_PRINT("\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(llsap->llsa_options)));
                ND_PRINT("\n\t      Options [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(llsap->llsa_options)));


@@ -649,7 +649,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))
                        return (1);
                lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);
                if (lsa_length < sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix))
                        return (1);
                lsa_length -= sizeof (llsap->llsa_lladdr) + sizeof (llsap->llsa_nprefix);

-                ND_TCHECK(llsap->llsa_nprefix);
+                ND_TCHECK_4(llsap->llsa_nprefix);

                 prefixes = EXTRACT_BE_U_4(llsap->llsa_nprefix);
                ND_PRINT("\n\t      Priority %u, Link-local address %s, Prefixes %u:",
                        EXTRACT_U_1(llsap->llsa_priority),
                 prefixes = EXTRACT_BE_U_4(llsap->llsa_nprefix);
                ND_PRINT("\n\t      Priority %u, Link-local address %s, Prefixes %u:",
                        EXTRACT_U_1(llsap->llsa_priority),


@@ -672,7 +672,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid);
                if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_rtid);

-               ND_TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_rtid);
+               ND_TCHECK_4(lsap->lsa_un.un_intra_ap.intra_ap_rtid);

                ospf6_print_ls_type(ndo,
                        EXTRACT_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_lstype),
                        &lsap->lsa_un.un_intra_ap.intra_ap_lsid);
                ospf6_print_ls_type(ndo,
                        EXTRACT_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_lstype),
                        &lsap->lsa_un.un_intra_ap.intra_ap_lsid);


@@ -680,7 +680,7 @@ ospf6_print_lsa(netdissect_options *ndo,
                if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                if (lsa_length < sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix))
                        return (1);
                lsa_length -= sizeof (lsap->lsa_un.un_intra_ap.intra_ap_nprefix);

-               ND_TCHECK(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
+               ND_TCHECK_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);

                 prefixes = EXTRACT_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                ND_PRINT("\n\t      Prefixes %u:", prefixes);
 
                 prefixes = EXTRACT_BE_U_2(lsap->lsa_un.un_intra_ap.intra_ap_nprefix);
                ND_PRINT("\n\t      Prefixes %u:", prefixes);
 


@@ -742,18 +742,18 @@ ospf6_decode_v3(netdissect_options *ndo,
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(hellop->hello_options)));
 
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(hellop->hello_options)));
 

-               ND_TCHECK(hellop->hello_deadint);
+               ND_TCHECK_2(hellop->hello_deadint);

                ND_PRINT("\n\t  Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",
                          EXTRACT_BE_U_2(hellop->hello_helloint),
                          EXTRACT_BE_U_2(hellop->hello_deadint),
                          ipaddr_string(ndo, &hellop->hello_ifid),
                          EXTRACT_U_1(hellop->hello_priority));
 
                ND_PRINT("\n\t  Hello Timer %us, Dead Timer %us, Interface-ID %s, Priority %u",
                          EXTRACT_BE_U_2(hellop->hello_helloint),
                          EXTRACT_BE_U_2(hellop->hello_deadint),
                          ipaddr_string(ndo, &hellop->hello_ifid),
                          EXTRACT_U_1(hellop->hello_priority));
 

-               ND_TCHECK(hellop->hello_dr);
+               ND_TCHECK_4(hellop->hello_dr);

                if (EXTRACT_BE_U_4(hellop->hello_dr) != 0)
                        ND_PRINT("\n\t  Designated Router %s",
                            ipaddr_string(ndo, &hellop->hello_dr));
                if (EXTRACT_BE_U_4(hellop->hello_dr) != 0)
                        ND_PRINT("\n\t  Designated Router %s",
                            ipaddr_string(ndo, &hellop->hello_dr));

-               ND_TCHECK(hellop->hello_bdr);
+               ND_TCHECK_4(hellop->hello_bdr);

                if (EXTRACT_BE_U_4(hellop->hello_bdr) != 0)
                        ND_PRINT(", Backup Designated Router %s",
                            ipaddr_string(ndo, &hellop->hello_bdr));
                if (EXTRACT_BE_U_4(hellop->hello_bdr) != 0)
                        ND_PRINT(", Backup Designated Router %s",
                            ipaddr_string(ndo, &hellop->hello_bdr));


@@ -772,15 +772,15 @@ ospf6_decode_v3(netdissect_options *ndo,
        case OSPF_TYPE_DD: {
                const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 
        case OSPF_TYPE_DD: {
                const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 

-               ND_TCHECK(ddp->db_options);
+               ND_TCHECK_4(ddp->db_options);

                ND_PRINT("\n\tOptions [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(ddp->db_options)));
                ND_PRINT("\n\tOptions [%s]",
                          bittok2str(ospf6_option_values, "none",
                          EXTRACT_BE_U_4(ddp->db_options)));

-               ND_TCHECK(ddp->db_flags);
+               ND_TCHECK_1(ddp->db_flags);

                ND_PRINT(", DD Flags [%s]",
                          bittok2str(ospf6_dd_flag_values,"none",EXTRACT_U_1(ddp->db_flags)));
 
                ND_PRINT(", DD Flags [%s]",
                          bittok2str(ospf6_dd_flag_values,"none",EXTRACT_U_1(ddp->db_flags)));
 

-               ND_TCHECK(ddp->db_seq);
+               ND_TCHECK_4(ddp->db_seq);

                ND_PRINT(", MTU %u, DD-Sequence 0x%08x",
                        EXTRACT_BE_U_2(ddp->db_mtu),
                        EXTRACT_BE_U_4(ddp->db_seq));
                ND_PRINT(", MTU %u, DD-Sequence 0x%08x",
                        EXTRACT_BE_U_2(ddp->db_mtu),
                        EXTRACT_BE_U_4(ddp->db_seq));


@@ -814,7 +814,7 @@ ospf6_decode_v3(netdissect_options *ndo,
                if (ndo->ndo_vflag > 1) {
                        const struct lsu6 *lsup = (const struct lsu6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 
                if (ndo->ndo_vflag > 1) {
                        const struct lsu6 *lsup = (const struct lsu6 *)((const uint8_t *)op + OSPF6HDR_LEN);
 

-                       ND_TCHECK(lsup->lsu_count);
+                       ND_TCHECK_4(lsup->lsu_count);

                        i = EXTRACT_BE_U_4(lsup->lsu_count);
                        lsap = lsup->lsu_lsa;
                        while ((const u_char *)lsap < dataend && i--) {
                        i = EXTRACT_BE_U_4(lsup->lsu_count);
                        lsap = lsup->lsu_lsa;
                        while ((const u_char *)lsap < dataend && i--) {


@@ -939,12 +939,12 @@ ospf6_decode_v3_trailer(netdissect_options *ndo,
        type = EXTRACT_U_1(op->ospf6_type);
        if (type == OSPF_TYPE_HELLO) {
                const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);
        type = EXTRACT_U_1(op->ospf6_type);
        if (type == OSPF_TYPE_HELLO) {
                const struct hello6 *hellop = (const struct hello6 *)((const uint8_t *)op + OSPF6HDR_LEN);

-               ND_TCHECK(hellop->hello_options);
+               ND_TCHECK_4(hellop->hello_options);

                if (EXTRACT_BE_U_4(hellop->hello_options) & OSPF6_OPTION_L)
                        lls_hello = 1;
        } else if (type == OSPF_TYPE_DD) {
                const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);
                if (EXTRACT_BE_U_4(hellop->hello_options) & OSPF6_OPTION_L)
                        lls_hello = 1;
        } else if (type == OSPF_TYPE_DD) {
                const struct dd6 *ddp = (const struct dd6 *)((const uint8_t *)op + OSPF6HDR_LEN);

-               ND_TCHECK(ddp->db_options);
+               ND_TCHECK_4(ddp->db_options);

                if (EXTRACT_BE_U_4(ddp->db_options) & OSPF6_OPTION_L)
                        lls_dd = 1;
        }
                if (EXTRACT_BE_U_4(ddp->db_options) & OSPF6_OPTION_L)
                        lls_dd = 1;
        }


@@ -969,7 +969,7 @@ ospf6_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(op->ospf6_type);
+       ND_TCHECK_1(op->ospf6_type);

        cp = tok2str(ospf6_type_values, "unknown packet type (%u)", EXTRACT_U_1(op->ospf6_type));
        ND_PRINT("OSPFv%u, %s, length %u", EXTRACT_U_1(op->ospf6_version), cp, length);
        if (*cp == 'u') {
        cp = tok2str(ospf6_type_values, "unknown packet type (%u)", EXTRACT_U_1(op->ospf6_type));
        ND_PRINT("OSPFv%u, %s, length %u", EXTRACT_U_1(op->ospf6_version), cp, length);
        if (*cp == 'u') {


@@ -981,7 +981,7 @@ ospf6_print(netdissect_options *ndo,
        }
 
        /* OSPFv3 data always comes first and optional trailing data may follow. */
        }
 
        /* OSPFv3 data always comes first and optional trailing data may follow. */

-       ND_TCHECK(op->ospf6_len);
+       ND_TCHECK_2(op->ospf6_len);

        datalen = EXTRACT_BE_U_2(op->ospf6_len);
        if (datalen > length) {
                ND_PRINT(" [len %u]", datalen);
        datalen = EXTRACT_BE_U_2(op->ospf6_len);
        if (datalen > length) {
                ND_PRINT(" [len %u]", datalen);


@@ -989,15 +989,15 @@ ospf6_print(netdissect_options *ndo,
        }
        dataend = bp + datalen;
 
        }
        dataend = bp + datalen;
 

-       ND_TCHECK(op->ospf6_routerid);
+       ND_TCHECK_4(op->ospf6_routerid);

        ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf6_routerid));
 
        ND_PRINT("\n\tRouter-ID %s", ipaddr_string(ndo, &op->ospf6_routerid));
 

-       ND_TCHECK(op->ospf6_areaid);
+       ND_TCHECK_4(op->ospf6_areaid);

        if (EXTRACT_BE_U_4(op->ospf6_areaid) != 0)
                ND_PRINT(", Area %s", ipaddr_string(ndo, &op->ospf6_areaid));
        else
                ND_PRINT(", Backbone Area");
        if (EXTRACT_BE_U_4(op->ospf6_areaid) != 0)
                ND_PRINT(", Area %s", ipaddr_string(ndo, &op->ospf6_areaid));
        else
                ND_PRINT(", Backbone Area");

-       ND_TCHECK(op->ospf6_instanceid);
+       ND_TCHECK_1(op->ospf6_instanceid);

        if (EXTRACT_U_1(op->ospf6_instanceid))
                ND_PRINT(", Instance %u", EXTRACT_U_1(op->ospf6_instanceid));
 
        if (EXTRACT_U_1(op->ospf6_instanceid))
                ND_PRINT(", Instance %u", EXTRACT_U_1(op->ospf6_instanceid));