summaryrefslogtreecommitdiff
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-06-15 02:14:25 -0700
committerGuy Harris <guy@alum.mit.edu>2017-06-15 09:14:57 +0000
commitee0dde474c20afb4c493441400926ad7924ca458 (patch)
treeb2551640f632caaf097f3142bd11ad9a91dc59dd /wiretap
parent6f8bc61c3323b959900f125234e7055018d62e4b (diff)
downloadwireshark-ee0dde474c20afb4c493441400926ad7924ca458.tar.gz
Make the short names for USB encspsulation types more regular.
Have them all be "usb-XXX", where XXX indicates the type of header. Change-Id: I7f1bfea7e264b17c57f94c484d64d1cce91b9b78 Reviewed-on: https://code.wireshark.org/review/22147 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/wtap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index e2d16877c7..2fc3303a1f 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -649,7 +649,7 @@ static struct encap_type_info encap_table_base[] = {
{ "Juniper Voice PIC", "juniper-vp" },
/* WTAP_ENCAP_USB_FREEBSD */
- { "USB packets with FreeBSD header", "usb" },
+ { "USB packets with FreeBSD header", "usb-freebsd" },
/* WTAP_ENCAP_IEEE802_16_MAC_CPS */
{ "IEEE 802.16 MAC Common Part Sublayer", "ieee-802-16-mac-cps" },
@@ -919,7 +919,7 @@ static struct encap_type_info encap_table_base[] = {
{ "Juniper VN", "juniper-vn" },
/* WTAP_ENCAP_USB_DARWIN */
- { "USB packets with Darwin (macOS, etc.) headers", "darwin-usb" },
+ { "USB packets with Darwin (macOS, etc.) headers", "usb-darwin" },
/* WTAP_ENCAP_LORATAP */
{ "LoRaTap", "loratap"},