Use more ND_TCHECK_n()/ND_TTEST_n() macros

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index 47afe503596c5a06a630ab7b103856839a1e13ce..cccc266ebd80b7dc3e9f4ae4359b15fd1c652afb 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -99,7 +99,7 @@
 #endif
 
 #include <netdissect-stdinc.h>
-#include <netdissect.h>
+#include "netdissect.h"
 #include <string.h>
 #include <stdlib.h>
 
@@ -229,7 +229,8 @@ static void lisp_hdr_flag(netdissect_options *, const lisp_map_register_hdr *);
 static void action_flag(netdissect_options *, uint8_t);
 static void loc_hdr_flag(netdissect_options *, uint16_t);
 
-void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
+void
+lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        uint8_t type;
        uint8_t mask_len;
@@ -262,13 +263,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
        xtr_present = is_xtr_data_present(type, lisp_hdr->type_and_flag);
 
        /* Extract the number of EID records present */
-       auth_data_len = EXTRACT_16BITS(&lisp_hdr->auth_data_len);
+       auth_data_len = EXTRACT_BE_U_2(&lisp_hdr->auth_data_len);
        packet_iterator = (const u_char *)(lisp_hdr);
        packet_offset = MAP_REGISTER_HDR_LEN;
        record_count = lisp_hdr->record_count;
 
        if (ndo->ndo_vflag) {
-               key_id = EXTRACT_16BITS(&lisp_hdr->key_id);
+               key_id = EXTRACT_BE_U_2(&lisp_hdr->key_id);
                ND_PRINT((ndo, "\n    %u record(s), ", record_count));
                ND_PRINT((ndo, "Authentication %s,",
                        tok2str(auth_type, "unknown-type", key_id)));
@@ -291,11 +292,11 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                ((const u_char *)lisp_hdr + packet_offset);
                packet_offset += MAP_REGISTER_EID_LEN;
                mask_len = lisp_eid->eid_prefix_mask_length;
-               eid_afi = EXTRACT_16BITS(&lisp_eid->eid_prefix_afi);
+               eid_afi = EXTRACT_BE_U_2(&lisp_eid->eid_prefix_afi);
                loc_count = lisp_eid->locator_count;
 
                if (ndo->ndo_vflag) {
-                       ttl = EXTRACT_32BITS(&lisp_eid->ttl);
+                       ttl = EXTRACT_BE_U_4(&lisp_eid->ttl);
                        ND_PRINT((ndo, "      Record TTL %u,", ttl));
                        action_flag(ndo, lisp_eid->act_auth_inc_res);
                        map_version = (((lisp_eid->reserved_version_hi) & 15 ) * 255) +
@@ -305,13 +306,13 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
                switch (eid_afi) {
                case IPv4_AFI:
-                       ND_TCHECK2(*(packet_iterator + packet_offset), 4);
+                       ND_TCHECK_4(packet_iterator + packet_offset);
                        ND_PRINT((ndo, " EID %s/%u,", ipaddr_string(ndo,
                                packet_iterator + packet_offset), mask_len));
                        packet_offset += 4;
                        break;
                case IPv6_AFI:
-                       ND_TCHECK2(*(packet_iterator + packet_offset), 16);
+                       ND_TCHECK_16(packet_iterator + packet_offset);
                        ND_PRINT((ndo, " EID %s/%u,", ip6addr_string(ndo,
                                packet_iterator + packet_offset), mask_len));
                        packet_offset += 16;
@@ -331,19 +332,19 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset);
                        loc_ip_pointer = (const u_char *) (lisp_loc + 1);
                        packet_offset += MAP_REGISTER_LOC_LEN;
-                       loc_afi = EXTRACT_16BITS(&lisp_loc->locator_afi);
+                       loc_afi = EXTRACT_BE_U_2(&lisp_loc->locator_afi);
 
                        if (ndo->ndo_vflag)
                                ND_PRINT((ndo, "\n       "));
 
                        switch (loc_afi) {
                        case IPv4_AFI:
-                               ND_TCHECK2(*(packet_iterator + packet_offset), 4);
+                               ND_TCHECK_4(packet_iterator + packet_offset);
                                ND_PRINT((ndo, " LOC %s", ipaddr_string(ndo, loc_ip_pointer)));
                                packet_offset += 4;
                                break;
                        case IPv6_AFI:
-                               ND_TCHECK2(*(packet_iterator + packet_offset), 16);
+                               ND_TCHECK_16(packet_iterator + packet_offset);
                                ND_PRINT((ndo, " LOC %s", ip6addr_string(ndo, loc_ip_pointer)));
                                packet_offset += 16;
                                break;
@@ -355,7 +356,8 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                                                " Multicast Priority/Weight %u/%u,",
                                                lisp_loc->priority, lisp_loc->weight,
                                                lisp_loc->m_priority, lisp_loc->m_weight));
-                               loc_hdr_flag(ndo, EXTRACT_16BITS(&lisp_loc->unused_and_flag));
+                               loc_hdr_flag(ndo,
+                                            EXTRACT_BE_U_2(&lisp_loc->unused_and_flag));
                        }
                }
        }
@@ -370,7 +372,7 @@ void lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        goto invalid;
                hex_print_with_offset(ndo, "\n    xTR-ID: ", packet_iterator + packet_offset, 16, 0);
                ND_PRINT((ndo, "\n    SITE-ID: %" PRIu64,
-                       EXTRACT_64BITS(packet_iterator + packet_offset + 16)));
+                       EXTRACT_BE_U_8(packet_iterator + packet_offset + 16)));
        } else {
                /* Check if packet isn't over yet */
                if (packet_iterator + packet_offset < ndo->ndo_snapend) {
@@ -417,10 +419,10 @@ static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr *
 
        if (type == LISP_MAP_REGISTER) {
                ND_PRINT((ndo, " flags [%s],", bittok2str(map_register_hdr_flag,
-                        "none", EXTRACT_32BITS(lisp_hdr))));
+                        "none", EXTRACT_BE_U_4(lisp_hdr))));
        } else if (type == LISP_MAP_NOTIFY) {
                ND_PRINT((ndo, " flags [%s],", bittok2str(map_notify_hdr_flag,
-                        "none", EXTRACT_32BITS(lisp_hdr))));
+                        "none", EXTRACT_BE_U_4(lisp_hdr))));
        }
 
        return;