summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ovsienko <denis@ovsienko.info>2020-10-17 20:44:27 +0100
committerDenis Ovsienko <denis@ovsienko.info>2020-10-17 20:44:27 +0100
commit47d80a1f1bb915e0eb3d844a19f0d3178db88412 (patch)
tree6398698536006ca28239a8c0ac3bd50033f534e6
parent0c0fca776b174b66460c3f8430b56e663abc4221 (diff)
downloadtcpdump-47d80a1f1bb915e0eb3d844a19f0d3178db88412.tar.gz
Use nd_mac_addr where it belongs. [skip ci]
-rw-r--r--addrtoname.c2
-rw-r--r--print-atalk.c4
-rw-r--r--print-decnet.c2
-rw-r--r--print-ipx.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/addrtoname.c b/addrtoname.c
index 9891a7ad..e4251a18 100644
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -927,7 +927,7 @@ init_protoidarray(netdissect_options *ndo)
}
static const struct etherlist {
- const u_char addr[MAC_ADDR_LEN];
+ const nd_mac_addr addr;
const char *name;
} etherlist[] = {
{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, "Broadcast" },
diff --git a/print-atalk.c b/print-atalk.c
index c921dc1a..d9f86c72 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -51,9 +51,9 @@ struct aarp {
nd_uint16_t htype, ptype;
nd_uint8_t halen, palen;
nd_uint16_t op;
- uint8_t hsaddr[MAC_ADDR_LEN];
+ nd_mac_addr hsaddr;
uint8_t psaddr[4];
- uint8_t hdaddr[MAC_ADDR_LEN];
+ nd_mac_addr hdaddr;
uint8_t pdaddr[4];
};
diff --git a/print-decnet.c b/print-decnet.c
index d39a768a..e1eaec32 100644
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -52,7 +52,7 @@ typedef nd_uint32_t longword; /* 4 bytes field */
* Definitions for DECNET Phase IV protocol headers
*/
typedef union {
- nd_byte dne_addr[MAC_ADDR_LEN]; /* full Ethernet address */
+ nd_mac_addr dne_addr; /* full Ethernet address */
struct {
nd_byte dne_hiord[4]; /* DECnet HIORD prefix */
nd_byte dne_nodeaddr[2]; /* DECnet node address */
diff --git a/print-ipx.c b/print-ipx.c
index 8adb4fe0..0e12c252 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -52,10 +52,10 @@ struct ipxHdr {
nd_uint8_t tCtl; /* Transport Control (i.e. hop count) */
nd_uint8_t pType; /* Packet Type (i.e. level 2 protocol) */
nd_uint32_t dstNet; /* destination net */
- nd_byte dstNode[MAC_ADDR_LEN]; /* destination node */
+ nd_mac_addr dstNode; /* destination node */
nd_uint16_t dstSkt; /* destination socket */
nd_uint32_t srcNet; /* source net */
- nd_byte srcNode[MAC_ADDR_LEN]; /* source node */
+ nd_mac_addr srcNode; /* source node */
nd_uint16_t srcSkt; /* source socket */
};