aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-05-20 14:30:20 -0700
committerGuy Harris <guy@alum.mit.edu>2018-05-20 21:30:55 +0000
commit040b70364d73c4244e4010c22adb623385502abd (patch)
tree3eb68b46b3612d8b78d6704e114eb60973f40168 /wiretap/wtap.c
parentb6d24bf37d4b38b00470a5e5649ca55f680b3256 (diff)
Add entries for two WTAP_ENCAP_ types, and clean up another entry.
We didn't have entries for WTAP_ENCAP_JUNIPER_ST or WTAP_ENCAP_ETHERNET_MPACKET; add them. The entry for WTAP_ENCAP_DOCSIS31_XRA31 just called it "DOCSIS31 XRA31", not "DOCSIS with Excentis XRA pseudo-header", which is a more complete description. (That field is supposed to be a descriptive word or phrase, not just a short protocol name.) Change-Id: Ib2b30fccce2339a12d216466831a1786e14178b7 Reviewed-on: https://code.wireshark.org/review/27671 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 7e55135e47..58c8253d48 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -906,8 +906,14 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_MA_WFP_CAPTURE_AUTH_V6 */
{ "Message Analyzer WFP Capture Auth v6", "message_analyzer_wfp_capture_auth_v6" },
+ /* WTAP_ENCAP_JUNIPER_ST */
+ { "Juniper Secure Tunnel Information", "juniper-st" },
+
+ /* WTAP_ENCAP_ETHERNET_MPACKET */
+ { "IEEE 802.3br mPackets", "ether-mpacket" },
+
/* WTAP_ENCAP_DOCSIS31_XRA31 */
- { "DOCSIS31 XRA31", "docsis31_xra31" },
+ { "DOCSIS with Excentis XRA pseudo-header", "docsis31_xra31" },
};