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/5views.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/5views.c')
| -rw-r--r-- | wiretap/5views.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c index 729c478caf..2e3011904d 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -105,17 +105,17 @@ typedef struct static gboolean _5views_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); -static gboolean _5views_read_rec_data(FILE_T fh, guchar *pd, int length, +static gboolean _5views_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err, gchar **err_info); static int _5views_read_header(wtap *wth, FILE_T fh, t_5VW_TimeStamped_Header *hdr, int *err, gchar **err_info); static gboolean _5views_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 _5views_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, - const union wtap_pseudo_header *pseudo_header, const guchar *pd, int *err); + const union wtap_pseudo_header *pseudo_header, const guint8 *pd, int *err); static gboolean _5views_dump_close(wtap_dumper *wdh, int *err); @@ -271,7 +271,7 @@ _5views_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) static gboolean -_5views_read_rec_data(FILE_T fh, guchar *pd, int length, int *err, +_5views_read_rec_data(FILE_T fh, guint8 *pd, int length, int *err, gchar **err_info) { int bytes_read; @@ -316,7 +316,7 @@ _5views_read_header(wtap *wth _U_, FILE_T fh, t_5VW_TimeStamped_Header *hdr, static gboolean _5views_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) { if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) @@ -406,7 +406,7 @@ gboolean _5views_dump_open(wtap_dumper *wdh, int *err) static gboolean _5views_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const union wtap_pseudo_header *pseudo_header _U_, - const guchar *pd, int *err) + const guint8 *pd, int *err) { _5views_dump_t *_5views = (_5views_dump_t *)wdh->priv; static t_5VW_TimeStamped_Header HeaderFrame; |