Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index 9ef77a97a1340820ee9a024618925f32529911bd..205c4aed7cbee7e4708798ceda8ba6b61300506f 100644 (file)
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -40,7 +40,6 @@
 
 #include "netdissect.h"
 #include "extract.h"
-#include "ether.h"
 #include "addrtoname.h"
 
 static const char tstr[] = " [|loopback]";
@@ -78,28 +77,28 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
                        cp += 2;
                        /* data */
                        ND_PRINT((ndo, ", data (%u octets)", len - 4));
-                       ND_TCHECK2(*cp, len - 4);
+                       ND_TCHECK_LEN(cp, len - 4);
                        break;
                case LOOPBACK_FWDDATA:
                        if (len < 8)
                                goto invalid;
                        /* forwarding address */
-                       ND_TCHECK2(*cp, ETHER_ADDR_LEN);
+                       ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
                        ND_PRINT((ndo, ", forwarding address %s", etheraddr_string(ndo, cp)));
-                       cp += ETHER_ADDR_LEN;
+                       cp += MAC_ADDR_LEN;
                        /* data */
                        ND_PRINT((ndo, ", data (%u octets)", len - 8));
-                       ND_TCHECK2(*cp, len - 8);
+                       ND_TCHECK_LEN(cp, len - 8);
                        break;
                default:
-                       ND_TCHECK2(*cp, len - 2);
+                       ND_TCHECK_LEN(cp, len - 2);
                        break;
        }
        return;
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));
@@ -128,7 +127,7 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 
 invalid:
        ND_PRINT((ndo, "%s", istr));
-       ND_TCHECK2(*cp, ep - cp);
+       ND_TCHECK_LEN(cp, ep - cp);
        return;
 trunc:
        ND_PRINT((ndo, "%s", tstr));