Speak of MAC-48s rather than MAC or Ethernet addresses.

Not all MAC-48s are Ethernet addresses; a lot of them are IEEE 802.11
addresses, for example.

Use the IEEE term.

Author: guyharris

addrtoname.c

@@ -71,7 +71,7 @@
     #else /* HAVE_STRUCT_ETHER_ADDR */
 	struct ether_addr {
 		/* Beware FreeBSD calls this "octet". */
-		unsigned char ether_addr_octet[MAC_ADDR_LEN];
+		unsigned char ether_addr_octet[MAC48_LEN];
 	};
     #endif /* HAVE_STRUCT_ETHER_ADDR */
   #endif /* what declares ether_ntohost() */
@@ -589,7 +589,7 @@ lookup_protoid(netdissect_options *ndo, const u_char *pi)
 }
 
 const char *
-etheraddr_string(netdissect_options *ndo, const uint8_t *ep)
+mac64_string(netdissect_options *ndo, const uint8_t *ep)
 {
 	int i;
 	char *cp;
@@ -610,7 +610,7 @@ etheraddr_string(netdissect_options *ndo, const uint8_t *ep)
 		 */
 		struct ether_addr ea;
 
-		memcpy (&ea, ep, MAC_ADDR_LEN);
+		memcpy (&ea, ep, MAC48_LEN);
 		if (ether_ntohost(buf2, &ea) == 0) {
 			tp->e_name = strdup(buf2);
 			if (tp->e_name == NULL)
@@ -690,8 +690,8 @@ linkaddr_string(netdissect_options *ndo, const uint8_t *ep,
 	if (len == 0)
 		return ("<empty>");
 
-	if (type == LINKADDR_ETHER && len == MAC_ADDR_LEN)
-		return (etheraddr_string(ndo, ep));
+	if (type == LINKADDR_MAC48 && len == MAC48_LEN)
+		return (mac64_string(ndo, ep));
 
 	if (type == LINKADDR_FRELAY)
 		return (q922_string(ndo, ep, len));
@@ -938,7 +938,7 @@ init_protoidarray(netdissect_options *ndo)
 }
 
 static const struct etherlist {
-	const nd_mac_addr addr;
+	const nd_mac48 addr;
 	const char *name;
 } etherlist[] = {
 	{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, "Broadcast" },
@@ -949,7 +949,7 @@ static const struct etherlist {
  * Initialize the ethers hash table.  We take two different approaches
  * depending on whether or not the system provides the ethers name
  * service.  If it does, we just wire in a few names at startup,
- * and etheraddr_string() fills in the table on demand.  If it doesn't,
+ * and mac64_string() fills in the table on demand.  If it doesn't,
  * then we suck in the entire /etc/ethers file at startup.  The idea
  * is that parsing the local file will be fast, but spinning through
  * all the ethers entries via NIS & next_etherent might be very slow.
@@ -995,9 +995,9 @@ init_etherarray(netdissect_options *ndo)
 		/*
 		 * Use YP/NIS version of name if available.
 		 */
-		/* Same workaround as in etheraddr_string(). */
+		/* Same workaround as in mac64_string(). */
 		struct ether_addr ea;
-		memcpy (&ea, el->addr, MAC_ADDR_LEN);
+		memcpy (&ea, el->addr, MAC48_LEN);
 		if (ether_ntohost(name, &ea) == 0) {
 			tp->e_name = strdup(name);
 			if (tp->e_name == NULL)

addrtoname.h

@@ -37,7 +37,7 @@ extern cap_channel_t *capdns;
 /* Name to address translation routines. */
 
 enum {
-    LINKADDR_ETHER,
+    LINKADDR_MAC48,
     LINKADDR_FRELAY,
     LINKADDR_EUI64,
     LINKADDR_ATM,
@@ -47,7 +47,7 @@ enum {
 #define BUFSIZE 128
 
 extern const char *linkaddr_string(netdissect_options *, const uint8_t *, const unsigned int, const unsigned int);
-extern const char *etheraddr_string(netdissect_options *, const uint8_t *);
+extern const char *mac64_string(netdissect_options *, const uint8_t *);
 extern const char *eui64_string(netdissect_options *, const uint8_t *);
 extern const char *eui64le_string(netdissect_options *, const uint8_t *);
 extern const char *tcpport_string(netdissect_options *, u_short);
@@ -79,11 +79,11 @@ get_linkaddr_string(netdissect_options *ndo, const uint8_t *p,
 }
 
 static inline const char *
-get_etheraddr_string(netdissect_options *ndo, const uint8_t *p)
+get_mac64_string(netdissect_options *ndo, const uint8_t *p)
 {
-        if (!ND_TTEST_LEN(p, MAC_ADDR_LEN))
+        if (!ND_TTEST_LEN(p, MAC48_LEN))
                 nd_trunc_longjmp(ndo);
-        return etheraddr_string(ndo, p);
+        return mac64_string(ndo, p);
 }
 
 static inline const char *
@@ -128,7 +128,7 @@ get_ip6addr_string(netdissect_options *ndo, const u_char *p)
 }
 
 #define GET_LINKADDR_STRING(p, type, len) get_linkaddr_string(ndo, (const u_char *)(p), type, len)
-#define GET_ETHERADDR_STRING(p) get_etheraddr_string(ndo, (const u_char *)(p))
+#define GET_MAC48_STRING(p) get_mac64_string(ndo, (const u_char *)(p))
 #define GET_EUI64_STRING(p) get_eui64_string(ndo, (const u_char *)(p))
 #define GET_EUI64LE_STRING(p) get_eui64le_string(ndo, (const u_char *)(p))
 #define GET_ISONSAP_STRING(nsap, nsap_length) get_isonsap_string(ndo, (const u_char *)(nsap), nsap_length)

netdissect.h

@@ -102,8 +102,8 @@ typedef unsigned char nd_ipv6[16];
 /*
  * Use this for MAC addresses.
  */
-#define MAC_ADDR_LEN	6U		/* length of MAC addresses */
-typedef unsigned char nd_mac_addr[MAC_ADDR_LEN];
+#define MAC48_LEN	6U		/* length of MAC addresses */
+typedef unsigned char nd_mac48[MAC48_LEN];
 
 /*
  * Use this for EUI64s.