Adding support for ISO CALM FAST and ETSI GeoNetworking

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 5a1d58cbea0059449d0b015d80831e245732fb32..4bc8ad3a3d2e4738209c9065b143978bd1976693 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -85,6 +85,9 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_CFM,            "CFM" },
     { ETHERTYPE_LLDP,           "LLDP" },
     { ETHERTYPE_TIPC,           "TIPC"},       
+    { ETHERTYPE_GEONET_OLD,     "GeoNet (old)"},
+    { ETHERTYPE_GEONET,         "GeoNet"},
+    { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { 0, NULL}
 };
 
@@ -417,6 +420,15 @@ ethertype_print(netdissect_options *ndo,
                msnlb_print(ndo, p);
                return (1);
 
+        case ETHERTYPE_GEONET_OLD:
+        case ETHERTYPE_GEONET:
+                geonet_print(ndo, p-14, p, length);
+                return (1);
+
+        case ETHERTYPE_CALM_FAST:
+                calm_fast_print(ndo, p-14, p, length);
+                return (1);
+
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: