X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9c7d7c8a5c28a5af26bfbdc96d34ab282802251a..b71c02f6b36c11c1e9d1ef5e8855f31965d3298b:/print-ether.c?ds=inline

diff --git a/print-ether.c b/print-ether.c
index 087b0e4d..5a1d58cb 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -37,7 +37,6 @@ static const char rcsid[] _U_ =
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
-
 #include "ether.h"
 
 const struct tok ethertype_values[] = { 
@@ -77,6 +76,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_PPPOES,         "PPPoE S" },
     { ETHERTYPE_EAPOL,          "EAPOL" },
     { ETHERTYPE_RRCP,           "RRCP" },
+    { ETHERTYPE_MS_NLB_HB,      "MS NLB heartbeat" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
@@ -84,6 +84,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_CFM_OLD,        "CFM (old)" },
     { ETHERTYPE_CFM,            "CFM" },
     { ETHERTYPE_LLDP,           "LLDP" },
+    { ETHERTYPE_TIPC,           "TIPC"},    	
     { 0, NULL}
 };
 
@@ -258,18 +259,18 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  *
- * This is for DLT_ETHERNET_HILSCHER, which has a 4-byte pseudo-header
+ * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header
  * before the Ethernet header.
  */
 u_int
-ether_hilscher_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
-                        const u_char *p)
+netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
+                     const u_char *p)
 {
 	/*
 	 * Fail if we don't have enough data for the Hilscher pseudo-header.
 	 */
 	if (h->len < 4 || h->caplen < 4) {
-		printf("[|hilscher]");
+		printf("[|netanalyzer]");
 		return (h->caplen);
 	}
 
@@ -285,21 +286,21 @@ ether_hilscher_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  *
- * This is for DLT_ETHERNET_HILSCHER_TRANSPARENT, which has a 4-byte
+ * This is for DLT_NETANALYZER_TRANSPARENT, which has a 4-byte
  * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF
  * before the Ethernet header.
  */
 u_int
-ether_hilscher_transparent_if_print(netdissect_options *ndo,
-                                    const struct pcap_pkthdr *h,
-                                    const u_char *p)
+netanalyzer_transparent_if_print(netdissect_options *ndo,
+                                 const struct pcap_pkthdr *h,
+                                 const u_char *p)
 {
 	/*
 	 * Fail if we don't have enough data for the Hilscher pseudo-header,
 	 * preamble, and SOF.
 	 */
 	if (h->len < 12 || h->caplen < 12) {
-		printf("[|hilscher-transparent]");
+		printf("[|netanalyzer-transparent]");
 		return (h->caplen);
 	}
 
@@ -408,6 +409,14 @@ ethertype_print(netdissect_options *ndo,
 		mpls_print(/*ndo,*/p, length);
 		return (1);
 
+	case ETHERTYPE_TIPC:
+		tipc_print(ndo, p, length, caplen);
+		return (1);
+
+	case ETHERTYPE_MS_NLB_HB:
+		msnlb_print(ndo, p);
+		return (1);
+
 	case ETHERTYPE_LAT:
 	case ETHERTYPE_SCA:
 	case ETHERTYPE_MOPRC: