diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-09-01 09:43:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-09-01 09:43:10 +0000 |
| commit | e9fc1b72aabaae01cd6cad613dfc88168d8aed9a (patch) | |
| tree | c1bdbe16d5579966f05db9cb334a115e011e08ff /wiretap/btsnoop.c | |
| parent | 10a3cb6e0f30290ccce97c01d482f05d083915a6 (diff) | |
Use guint8 rather than guchar for raw octets and pointers to arrays of
same.
Add to wiretap/pcap-common.c a routine to fill in the pseudo-header for
ATM (by looking at the VPI, VCI, and packet data, and guessing) and
Ethernet (setting the FCS length appropriately). Use it for both pcap
and pcap-ng files.
svn path=/trunk/; revision=38840
Diffstat (limited to 'wiretap/btsnoop.c')
| -rw-r--r-- | wiretap/btsnoop.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 52f232646f..374ea83db5 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -76,9 +76,9 @@ const gint64 KUnixTimeBase = G_GINT64_CONSTANT(0x00dcddb30f2f8000); /* offset fr static gboolean btsnoop_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean btsnoop_seek_read(wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guchar *pd, int length, + union wtap_pseudo_header *pseudo_header, guint8 *pd, int length, int *err, gchar **err_info); -static gboolean snoop_read_rec_data(FILE_T fh, guchar *pd, int length, int *err, +static gboolean snoop_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err, gchar **err_info); int btsnoop_open(wtap *wth, int *err, gchar **err_info) @@ -237,7 +237,7 @@ static gboolean btsnoop_read(wtap *wth, int *err, gchar **err_info, } static gboolean btsnoop_seek_read(wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guchar *pd, int length, + union wtap_pseudo_header *pseudo_header, guint8 *pd, int length, int *err, gchar **err_info) { int bytes_read; struct btsnooprec_hdr hdr; @@ -289,7 +289,7 @@ static gboolean btsnoop_seek_read(wtap *wth, gint64 seek_off, } static gboolean -snoop_read_rec_data(FILE_T fh, guchar *pd, int length, int *err, +snoop_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err, gchar **err_info) { int bytes_read; @@ -355,7 +355,7 @@ static guint8 btsnoop_lookup_flags(guint8 hci_type, gboolean sent, guint8 *flags static gboolean btsnoop_dump_partial_rec_hdr(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phdr, const union wtap_pseudo_header *pseudo_header, - const guchar *pd, int *err, + const guint8 *pd, int *err, struct btsnooprec_hdr *rec_hdr) { gint64 ts_usec; @@ -380,7 +380,7 @@ static gboolean btsnoop_dump_partial_rec_hdr(wtap_dumper *wdh _U_, static gboolean btsnoop_dump_h1(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const union wtap_pseudo_header *pseudo_header, - const guchar *pd, int *err) + const guint8 *pd, int *err) { struct btsnooprec_hdr rec_hdr; @@ -409,7 +409,7 @@ static gboolean btsnoop_dump_h1(wtap_dumper *wdh, static gboolean btsnoop_dump_h4(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const union wtap_pseudo_header *pseudo_header, - const guchar *pd, int *err) + const guint8 *pd, int *err) { struct btsnooprec_hdr rec_hdr; |