Use nd_ types, clean up signed vs. unsigned.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 7e7216c4cd1e7cb0213e4454bf4b1d8f658ef5b2..7143830f92a742e8bc90eb48e18f08e388a98ef8 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -108,14 +108,14 @@ static inline void
 ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {
-       register const struct ether_header *ep;
+       const struct ether_header *ep;
        uint16_t length_type;
 
        ep = (const struct ether_header *)bp;
 
        ND_PRINT((ndo, "%s > %s",
-                    etheraddr_string(ndo, ESRC(ep)),
-                    etheraddr_string(ndo, EDST(ep))));
+                    etheraddr_string(ndo, ep->ether_shost),
+                    etheraddr_string(ndo, ep->ether_dhost)));
 
        length_type = EXTRACT_BE_U_2(ep->ether_length_type);
        if (!ndo->ndo_qflag) {
@@ -179,9 +179,9 @@ ether_print(netdissect_options *ndo,
        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 
-       src.addr = ESRC(ep);
+       src.addr = ep->ether_shost;
        src.addr_string = etheraddr_string;
-       dst.addr = EDST(ep);
+       dst.addr = ep->ether_dhost;
        dst.addr_string = etheraddr_string;
        length_type = EXTRACT_BE_U_2(ep->ether_length_type);