diff options
| author | hannes <hannes> | 2005-01-25 16:22:56 +0000 |
|---|---|---|
| committer | hannes <hannes> | 2005-01-25 16:22:56 +0000 |
| commit | 36ff8749d399a5411b2f51593970824665a83cfd (patch) | |
| tree | 39e9934d91557e7ef8edc34e3f4fa6e135d5adad /print-ether.c | |
| parent | 3385db1b3a63a2174431c2c319d866331595e5a2 (diff) | |
| download | tcpdump-36ff8749d399a5411b2f51593970824665a83cfd.tar.gz | |
-resolve (print the name) the OUI field in the SNAP printer
-add the rfc 2684 PIDs as pseudo ethertypes
-display cosmetics:
place a ":" after the LLC printer to indicate that
a new proto layer starts
Diffstat (limited to 'print-ether.c')
| -rw-r--r-- | print-ether.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/print-ether.c b/print-ether.c index cb048862..0df63fd5 100644 --- a/print-ether.c +++ b/print-ether.c @@ -20,7 +20,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.93 2004-06-12 16:32:56 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.94 2005-01-25 16:22:56 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -37,8 +37,24 @@ static const char rcsid[] _U_ = #include "ethertype.h" #include "ether.h" +#include "llc.h" const struct tok ethertype_values[] = { + /* not really ethertypes but PIDs that are used + in the SNAP printer - its more convenient + to put them into a single tokentable */ + { PID_RFC2684_ETH_FCS, "Ethernet + FCS" }, + { PID_RFC2684_ETH_NOFCS, "Ethernet no FCS" }, + { PID_RFC2684_802_4_FCS, "802.4 + FCS" }, + { PID_RFC2684_802_4_NOFCS, "w/o FCS" }, + { PID_RFC2684_802_5_FCS, "Tokenring + FCS" }, + { PID_RFC2684_802_5_NOFCS, "Tokenring no FCS" }, + { PID_RFC2684_FDDI_FCS, "FDDI + FCS" }, + { PID_RFC2684_FDDI_NOFCS, "FDDI no FCS" }, + { PID_RFC2684_802_6_FCS, "802.6 + FCS" }, + { PID_RFC2684_802_6_NOFCS, "802.6 no FCS" }, + { PID_RFC2684_BPDU, "BPDU" }, + /* the real Ethertypes */ { ETHERTYPE_IP, "IPv4" }, { ETHERTYPE_MPLS, "MPLS unicast" }, { ETHERTYPE_MPLS_MULTI, "MPLS multicast" }, |