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/wtap.h | |
| 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/wtap.h')
| -rw-r--r-- | wiretap/wtap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 73f10e8321..968b68a6ba 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -597,7 +597,7 @@ struct k12_phdr { const gchar* stack_file; guint32 input_type; k12_input_info_t input_info; - guchar* extra_info; + guint8* extra_info; guint32 extra_length; void* stuff; }; @@ -938,7 +938,7 @@ wtap_dumper* wtap_dump_open(const char *filename, int filetype, int encap, wtap_dumper* wtap_dump_fdopen(int fd, int filetype, int encap, int snaplen, gboolean compressed, int *err); gboolean wtap_dump(wtap_dumper *, const struct wtap_pkthdr *, - const union wtap_pseudo_header *pseudo_header, const guchar *, int *err); + const union wtap_pseudo_header *pseudo_header, const guint8 *, int *err); void wtap_dump_flush(wtap_dumper *); gint64 wtap_get_bytes_dumped(wtap_dumper *); void wtap_set_bytes_dumped(wtap_dumper *wdh, gint64 bytes_dumped); |