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/i4btrace.c | |
parent | 10a3cb6e0f30290ccce97c01d482f05d083915a6 (diff) | |
download | wireshark-e9fc1b72aabaae01cd6cad613dfc88168d8aed9a.tar.gz |
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/i4btrace.c')
-rw-r--r-- | wiretap/i4btrace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index 6c39798683..e4155b5e6b 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -40,12 +40,12 @@ typedef struct { static gboolean i4btrace_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean i4btrace_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 int i4b_read_rec_header(FILE_T fh, i4b_trace_hdr_t *hdr, int *err, gchar **err_info); static void i4b_byte_swap_header(wtap *wth, i4b_trace_hdr_t *hdr); -static gboolean i4b_read_rec_data(FILE_T fh, guchar *pd, int length, int *err, +static gboolean i4b_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err, gchar **err_info); static void i4b_set_pseudo_header(i4b_trace_hdr_t *hdr, union wtap_pseudo_header *pseudo_header); @@ -189,7 +189,7 @@ static gboolean i4btrace_read(wtap *wth, int *err, gchar **err_info, static gboolean i4btrace_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 ret; @@ -259,7 +259,7 @@ i4b_byte_swap_header(wtap *wth, i4b_trace_hdr_t *hdr) } static gboolean -i4b_read_rec_data(FILE_T fh, guchar *pd, int length, int *err, gchar **err_info) +i4b_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err, gchar **err_info) { int bytes_read; |