Make 1-element arrays for fields that may repeat.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index ce96e62ec214a3df9d9b56763467ca67e4c5f062..7143830f92a742e8bc90eb48e18f08e388a98ef8 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -114,8 +114,8 @@ ether_hdr_print(netdissect_options *ndo,
        ep = (const struct ether_header *)bp;
 
        ND_PRINT((ndo, "%s > %s",
        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) {
 
        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;
 
        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 

-       src.addr = ESRC(ep);
+       src.addr = ep->ether_shost;

        src.addr_string = etheraddr_string;
        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);
 
        dst.addr_string = etheraddr_string;
        length_type = EXTRACT_BE_U_2(ep->ether_length_type);