aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2007-07-12 19:55:12 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2007-07-12 19:55:12 +0000
commit6d6affd85972652b9d4af0a98c5a1345965e8482 (patch)
tree98568f0c60c80ce45c99c552488f08ec6dc87392 /wiretap/wtap.c
parent26695e6a188b821f824d4afff03b63774695a4ab (diff)
From Jim Paris:
The encap_table_base in wcap.c is missing an entry. This causes e.g. "dumpcap -i usb3 -L" to output: Data link types (use option -y to set): USB_LINUX (MPEG) svn path=/trunk/; revision=22292
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index ce606b02f6..6170668e7e 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -375,11 +375,14 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_NETTL_RAW_TELNET */
{ "Raw telnet with nettl headers", "raw-telnet-nettl" },
+ /* WTAP_ENCAP_USB_LINUX */
+ { "USB packets with Linux header", "usb-linux" },
+
/* WTAP_ENCAP_MPEG */
{ "MPEG", "mpeg" },
/* WTAP_ENCAP_PPI */
- { "Per-Packet Information header", "ppi" },
+ { "Per-Packet Information header", "ppi" }
};
gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);