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/commview.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/commview.c')
| -rw-r--r-- | wiretap/commview.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/commview.c b/wiretap/commview.c index b45ba336f1..befa2399bf 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -86,13 +86,13 @@ static gboolean commview_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean commview_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header, - guchar *pd, int length, int *err, + guint8 *pd, int length, int *err, gchar **err_info); static gboolean commview_read_header(commview_header_t *cv_hdr, FILE_T fh, int *err, gchar **err_info); static gboolean commview_dump(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); int commview_open(wtap *wth, int *err, gchar **err_info) { @@ -223,7 +223,7 @@ commview_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) static gboolean commview_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header - *pseudo_header, guchar *pd, int length, int *err, + *pseudo_header, guint8 *pd, int length, int *err, gchar **err_info) { commview_header_t cv_hdr; @@ -327,7 +327,7 @@ gboolean commview_dump_open(wtap_dumper *wdh, int *err _U_) static gboolean commview_dump(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) { commview_header_t cv_hdr; struct tm *tm; |