diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-04-03 12:05:05 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-04-03 12:05:05 +0000 |
| commit | 9f0d946003097f20dbc98004ac695941786c58f8 (patch) | |
| tree | cf3002f57d3b7f07a88dfe206789d5722e5a2375 /wiretap | |
| parent | 466c3e9c8d23fe1f1ebceaf516e9869bcf74a478 (diff) | |
Fix up the table of encapsulation type strings to match the new set of
encapsulation types.
svn path=/trunk/; revision=14007
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/wtap.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 78b629a4fa..9c5ff2042c 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -252,11 +252,11 @@ static const struct encap_type_info { /* WTAP_ENCAP_BACNET_MS_TP */ { "BACnet MS/TP", "bacnet-ms-tp" }, - /* WTAP_ENCAP_RAW_ICMP */ - { "Raw ICMP", "raw-icmp" }, + /* WTAP_ENCAP_NETTL_RAW_ICMP */ + { "Raw ICMP with nettl headers", "raw-icmp-nettl" }, - /* WTAP_ENCAP_RAW_ICMPV6 */ - { "Raw ICMPv6", "raw-icmpv6" }, + /* WTAP_ENCAP_NETTL_RAW_ICMPV6 */ + { "Raw ICMPv6 with nettl headers", "raw-icmpv6-nettl" }, /* WTAP_ENCAP_GPRS_LLC */ { "GPRS LLC", "gprs-llc" }, @@ -269,6 +269,21 @@ static const struct encap_type_info { /* WTAP_ENCAP_REDBACK */ { "Redback SmartEdge", "redback" }, + + /* WTAP_ENCAP_NETTL_RAW_IP */ + { "Raw IP with nettl headers", "rawip-nettl" }, + + /* WTAP_ENCAP_NETTL_ETHERNET */ + { "Ethernet with nettl headers", "ether-nettl" }, + + /* WTAP_ENCAP_NETTL_TOKEN_RING */ + { "Token Ring with nettl headers", "tr-nettl" }, + + /* WTAP_ENCAP_NETTL_FDDI */ + { "FDDI with nettl headers", "fddi-nettl" }, + + /* WTAP_ENCAP_NETTL_UNKNOWN */ + { "Unknown link-layer type with nettl headers", "unknown-nettl" }, }; /* Name that should be somewhat descriptive. */ |