Clean up handling of EUI-64 addresses.

Add an nd_eui64 type, and use it.

Have routines to convert EUI-64s to a string for both the "rightmost
octet first" and "rightmost octet last" format.  Use the former for IEEE
802.14.4 addresses and the latter for IEEE 1394 addresses in the "Apple
IP over FireWire" header.

Author: guyharris

addrtoname.c

@@ -641,7 +641,16 @@ etheraddr_string(netdissect_options *ndo, const uint8_t *ep)
 }
 
 const char *
-le64addr_string(netdissect_options *ndo, const uint8_t *ep)
+eui64_string(netdissect_options *ndo, const uint8_t *ep)
+{
+	return (linkaddr_string(ndo, ep, LINKADDR_EUI64, EUI64_LEN));
+}
+
+/*
+ * EUI-64 with the rightmost octet first.
+ */
+const char *
+eui64le_string(netdissect_options *ndo, const uint8_t *ep)
 {
 	const unsigned int len = 8;
 	u_int i;

addrtoname.h

@@ -39,7 +39,7 @@ extern cap_channel_t *capdns;
 enum {
     LINKADDR_ETHER,
     LINKADDR_FRELAY,
-    LINKADDR_IEEE1394,
+    LINKADDR_EUI64,
     LINKADDR_ATM,
     LINKADDR_OTHER
 };
@@ -48,7 +48,8 @@ enum {
 
 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 *le64addr_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);
 extern const char *udpport_string(netdissect_options *, u_short);
 extern const char *isonsap_string(netdissect_options *, const uint8_t *, u_int);
@@ -86,11 +87,19 @@ get_etheraddr_string(netdissect_options *ndo, const uint8_t *p)
 }
 
 static inline const char *
-get_le64addr_string(netdissect_options *ndo, const u_char *p)
+get_eui64_string(netdissect_options *ndo, const uint8_t *p)
 {
-        if (!ND_TTEST_8(p))
+        if (!ND_TTEST_LEN(p, EUI64_LEN))
                 nd_trunc_longjmp(ndo);
-        return le64addr_string(ndo, p);
+        return eui64_string(ndo, p);
+}
+
+static inline const char *
+get_eui64le_string(netdissect_options *ndo, const uint8_t *p)
+{
+        if (!ND_TTEST_LEN(p, EUI64_LEN))
+                nd_trunc_longjmp(ndo);
+        return eui64le_string(ndo, p);
 }
 
 static inline const char *
@@ -120,7 +129,8 @@ 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_LE64ADDR_STRING(p) get_le64addr_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)
 #define GET_IPADDR_STRING(p) get_ipaddr_string(ndo, (const u_char *)(p))
 #define GET_IP6ADDR_STRING(p) get_ip6addr_string(ndo, (const u_char *)(p))

netdissect.h

@@ -105,6 +105,12 @@ typedef unsigned char nd_ipv6[16];
 #define MAC_ADDR_LEN	6U		/* length of MAC addresses */
 typedef unsigned char nd_mac_addr[MAC_ADDR_LEN];
 
+/*
+ * Use this for EUI64s.
+ */
+#define EUI64_LEN	8U
+typedef unsigned char nd_eui64[EUI64_LEN];
+
 /*
  * Use this for blobs of bytes; make them arrays of nd_byte.
  */

print-802_15_4.c

@@ -546,7 +546,7 @@ ieee802_15_4_print_addr(netdissect_options *ndo, const u_char *p,
 		ND_PRINT("%04x", GET_LE_U_2(p));
 		break;
 	case 8:
-		ND_PRINT("%s", GET_LE64ADDR_STRING(p));
+		ND_PRINT("%s", GET_EUI64LE_STRING(p));
 		break;
 	}
 }
@@ -1576,7 +1576,7 @@ ieee802_15_4_print_aux_sec_header(netdissect_options *ndo,
 			return -1;
 		}
 		if (ndo->ndo_vflag > 1) {
-			ND_PRINT("KeySource %s, ", GET_LE64ADDR_STRING(p));
+			ND_PRINT("KeySource %s, ", GET_EUI64LE_STRING(p));
 		}
 		p += 4;
 		caplen -= 4;

print-ap1394.c

@@ -36,26 +36,21 @@
 /*
  * Structure of a header for Apple's IP-over-IEEE 1384 BPF header.
  */
-#define FIREWIRE_EUI64_LEN	8
 struct firewire_header {
-	nd_byte     firewire_dhost[FIREWIRE_EUI64_LEN];
-	nd_byte     firewire_shost[FIREWIRE_EUI64_LEN];
+	nd_eui64    firewire_dhost;
+	nd_eui64    firewire_shost;
 	nd_uint16_t firewire_type;
 };
 
 /*
  * Length of that header; note that some compilers may pad
  * "struct firewire_header" to a multiple of 4 bytes, for example, so
  * "sizeof (struct firewire_header)" may not give the right answer.
+ * (That could be true even though we're using nd_ types, none of
+ * which should require anything more than byte alignment.)
  */
 #define FIREWIRE_HDRLEN		18
 
-static const char *
-fwaddr_string(netdissect_options *ndo, const u_char *addr)
-{
-	return GET_LINKADDR_STRING(addr, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN);
-}
-
 static void
 ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
@@ -65,8 +60,8 @@ ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	fp = (const struct firewire_header *)bp;
 
 	ND_PRINT("%s > %s",
-		     fwaddr_string(ndo, fp->firewire_shost),
-		     fwaddr_string(ndo, fp->firewire_dhost));
+		     eui64_string(ndo, fp->firewire_shost),
+		     eui64_string(ndo, fp->firewire_dhost));
 
 	firewire_type = GET_BE_U_2(fp->firewire_type);
 	if (!ndo->ndo_qflag) {
@@ -109,9 +104,9 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 
 	ether_type = GET_BE_U_2(fp->firewire_type);
 	src.addr = fp->firewire_shost;
-	src.addr_string = fwaddr_string;
+	src.addr_string = eui64_string;
 	dst.addr = fp->firewire_dhost;
-	dst.addr_string = fwaddr_string;
+	dst.addr_string = eui64_string;
 	if (ethertype_print(ndo, ether_type, p, length, caplen, &src, &dst) == 0) {
 		/* ether_type not known, print raw packet */
 		if (!ndo->ndo_eflag)