CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / addrtoname.h

diff --git a/addrtoname.h b/addrtoname.h
index 597f4e1edcf0d3b25302d1faa504b552f3a6b6c2..e17a1f4b6af02922d83a20efcca581a4a49e1799 100644 (file)
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -37,9 +37,9 @@ extern cap_channel_t *capdns;
 /* Name to address translation routines. */
 
 enum {
-    LINKADDR_ETHER,
+    LINKADDR_MAC48,
     LINKADDR_FRELAY,
-    LINKADDR_IEEE1394,
+    LINKADDR_EUI64,
     LINKADDR_ATM,
     LINKADDR_OTHER
 };
@@ -47,8 +47,9 @@ 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 *le64addr_string(netdissect_options *, const uint8_t *);
+extern const char *mac48_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);
@@ -78,19 +79,27 @@ 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_mac48_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 mac48_string(ndo, 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 *
@@ -119,8 +128,9 @@ 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_MAC48_STRING(p) get_mac48_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))