ZeroMQ initial support (ZMTP/1.0 framing)

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 087b0e4d9d4943bdeb6c41538302e16de4ebd031..e2f487c2a36ac49bbb486789e6b0ac4ef74b0418 100644 (file)
--- 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[] = { 
@@ -84,6 +83,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_CFM_OLD,        "CFM (old)" },
     { ETHERTYPE_CFM,            "CFM" },
     { ETHERTYPE_LLDP,           "LLDP" },
+    { ETHERTYPE_TIPC,           "TIPC"},       
     { 0, NULL}
 };
 
@@ -258,18 +258,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 +285,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 +408,10 @@ 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_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: