diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-15 02:14:25 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-15 09:16:53 +0000 |
| commit | c6eeecff01653429c52571f5bc872b4b01b720b5 (patch) | |
| tree | d4aa8ad10505b25d03407807c7b3c50caade0118 | |
| parent | 6e694c67945145983000921387c3e510fdea1070 (diff) | |
| download | wireshark-c6eeecff01653429c52571f5bc872b4b01b720b5.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>
(cherry picked from commit ee0dde474c20afb4c493441400926ad7924ca458)
Reviewed-on: https://code.wireshark.org/review/22148
| -rw-r--r-- | wiretap/wtap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index aaf473307f..ddce9e57c2 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" }, }; WS_DLL_LOCAL |