Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-lisp.c

diff --git a/print-lisp.c b/print-lisp.c
index 6a25b27b91a5269e31e9952b6f028e21e39ff9cd..cccc266ebd80b7dc3e9f4ae4359b15fd1c652afb 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -306,13 +306,13 @@ 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;
@@ -339,12 +339,12 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
                        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;