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/packetlogger.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/packetlogger.c')
| -rw-r--r-- | wiretap/packetlogger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index 5d00d492d7..79e67cfaf1 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -52,7 +52,7 @@ static gboolean packetlogger_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean packetlogger_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header _U_, - guchar *pd, int length, int *err, + guint8 *pd, int length, int *err, gchar **err_info); static gboolean packetlogger_read_header(packetlogger_header_t *pl_hdr, FILE_T fh, int *err, gchar **err_info); @@ -132,7 +132,7 @@ packetlogger_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) static gboolean packetlogger_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header - *pseudo_header _U_, guchar *pd, int length, int *err, + *pseudo_header _U_, guint8 *pd, int length, int *err, gchar **err_info) { packetlogger_header_t pl_hdr; |