summaryrefslogtreecommitdiff
path: root/print-ether.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-12-16 19:57:14 -0800
committerGuy Harris <guy@alum.mit.edu>2017-12-16 19:57:14 -0800
commit6a58ce3ad1f0fc8b1bfe3f74435649b4f72b6955 (patch)
tree2e30151f15d70e6c338ddc9502c43e9cddc69695 /print-ether.c
parenta08e63fd7a8f5bfeb6b6f47adf580cd7f9af3dec (diff)
downloadtcpdump-6a58ce3ad1f0fc8b1bfe3f74435649b4f72b6955.tar.gz
Directly refer to ether_shost and ether_dhost; get rid of ESRC() and EDST().
They don't really add anything.
Diffstat (limited to 'print-ether.c')
-rw-r--r--print-ether.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/print-ether.c b/print-ether.c
index ce96e62e..7143830f 100644
--- 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",
- 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);