diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-10 21:00:35 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-10 21:00:35 +0000 |
| commit | 26f642778f062f25bdf3811e02c06516951902f5 (patch) | |
| tree | acf6607ed4899a623d95c58f5b65fb4c479a7746 /wiretap | |
| parent | aba9c21960cca46a4987b742967aa0a5214f3178 (diff) | |
From Paolo Abeni
USB dissector
svn path=/trunk/; revision=19480
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 1878c1ab4c..d6d721685e 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -410,6 +410,8 @@ static const struct { { 181, WTAP_ENCAP_JUNIPER_CHDLC }, /* VOIP Frames prepended with meta-information */ { 183, WTAP_ENCAP_JUNIPER_VP }, + /* raw USB packets */ + { 186, WTAP_ENCAP_USB }, /* diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 11c94b6da0..05246628b8 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -363,6 +363,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_JUNIPER_VP */ { "Juniper Voice PIC", "juniper-vp" }, + + /* WTAP_ENCAP_USB */ + { "Raw USB packets", "usb" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 750d0d647d..ebae43f763 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -182,9 +182,10 @@ #define WTAP_ENCAP_CATAPULT_DCT2000 89 #define WTAP_ENCAP_BER 90 #define WTAP_ENCAP_JUNIPER_VP 91 +#define WTAP_ENCAP_USB 92 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 92 +#define WTAP_NUM_ENCAP_TYPES 93 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |