diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-12-24 20:18:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-12-24 20:18:01 +0000 |
| commit | f6f84ae1dc7ed8d5b0ade08454d157ad05a3dcd6 (patch) | |
| tree | 5b6c6b944443812d400c94fc96dab84d102b8754 /wiretap | |
| parent | dc3ed1f1e6624ee70d2ff85ce1dfdda2cfeb0ac7 (diff) | |
| download | wireshark-f6f84ae1dc7ed8d5b0ade08454d157ad05a3dcd6.tar.gz | |
Name changes to match libpcap name change of the corresponding DLT_
value.
svn path=/trunk/; revision=27113
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 10 | ||||
| -rw-r--r-- | wiretap/wtap.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index a7c804450b..74b85f1805 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -485,7 +485,7 @@ static const struct { /* IEEE 802.15.4 Wireless PAN non-ASK PHY */ { 215, WTAP_ENCAP_IEEE802_15_4_NONASK_PHY }, /* USB packets with padded Linux-specified header */ - { 220, WTAP_ENCAP_USB_LINUX_MMAP }, + { 220, WTAP_ENCAP_USB_LINUX_MMAPPED }, /* * To repeat: @@ -1449,7 +1449,7 @@ static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info, break; case WTAP_ENCAP_USB_LINUX: - case WTAP_ENCAP_USB_LINUX_MMAP: + case WTAP_ENCAP_USB_LINUX_MMAPPED: if (packet_size < sizeof (struct linux_usb_phdr)) { /* * Uh-oh, the packet isn't big enough to even @@ -1701,7 +1701,7 @@ libpcap_seek_read(wtap *wth, gint64 seek_off, break; case WTAP_ENCAP_USB_LINUX: - case WTAP_ENCAP_USB_LINUX_MMAP: + case WTAP_ENCAP_USB_LINUX_MMAPPED: if (!libpcap_read_linux_usb_pseudoheader(wth, wth->random_fh, pseudo_header, err)) return FALSE; /* Read error */ @@ -2632,7 +2632,7 @@ static gboolean libpcap_dump(wtap_dumper *wdh, break; case WTAP_ENCAP_USB_LINUX: - case WTAP_ENCAP_USB_LINUX_MMAP: + case WTAP_ENCAP_USB_LINUX_MMAPPED: hdrsize = sizeof (struct linux_usb_phdr); break; @@ -2876,7 +2876,7 @@ static gboolean libpcap_dump(wtap_dumper *wdh, break; case WTAP_ENCAP_USB_LINUX: - case WTAP_ENCAP_USB_LINUX_MMAP: + case WTAP_ENCAP_USB_LINUX_MMAPPED: /* * Write out the pseudo-header; it has the same format * as the Linux USB header, and that header is supposed diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 9599e7a87a..7fe8b04c58 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -205,7 +205,7 @@ extern "C" { #define WTAP_ENCAP_I2C 112 #define WTAP_ENCAP_IEEE802_15_4_NONASK_PHY 113 #define WTAP_ENCAP_TNEF 114 -#define WTAP_ENCAP_USB_LINUX_MMAP 115 +#define WTAP_ENCAP_USB_LINUX_MMAPPED 115 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |