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/ngsniffer.c | |
| 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/ngsniffer.c')
| -rw-r--r-- | wiretap/ngsniffer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 995de9b7df..1a2322d319 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -489,7 +489,7 @@ static int process_rec_header2_v145(wtap *wth, unsigned char *buffer, static gboolean ngsniffer_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean ngsniffer_seek_read(wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size, + union wtap_pseudo_header *pseudo_header, guint8 *pd, int packet_size, int *err, gchar **err_info); static int ngsniffer_read_rec_header(wtap *wth, gboolean is_random, guint16 *typep, guint16 *lengthp, int *err, gchar **err_info); @@ -506,14 +506,14 @@ static gboolean ngsniffer_read_frame6(wtap *wth, gboolean is_random, static void set_pseudo_header_frame6(wtap *wth, union wtap_pseudo_header *pseudo_header, struct frame6_rec *frame6); static gboolean ngsniffer_read_rec_data(wtap *wth, gboolean is_random, - guchar *pd, unsigned int length, int *err, gchar **err_info); + guint8 *pd, unsigned int length, int *err, gchar **err_info); static int infer_pkt_encap(const guint8 *pd, int len); static int fix_pseudo_header(int encap, const guint8 *pd, int len, union wtap_pseudo_header *pseudo_header); static void ngsniffer_sequential_close(wtap *wth); static void ngsniffer_close(wtap *wth); static gboolean ngsniffer_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 ngsniffer_dump_close(wtap_dumper *wdh, int *err); static int SnifferDecompress( unsigned char * inbuf, size_t inlen, unsigned char * outbuf, size_t outlen, int *err ); @@ -1050,7 +1050,7 @@ ngsniffer_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) guint16 time_low, time_med, true_size, size; guint8 time_high, time_day; guint64 t, tsecs, tpsecs; - guchar *pd; + guint8 *pd; ngsniffer = (ngsniffer_t *)wth->priv; for (;;) { @@ -1248,7 +1248,7 @@ found: static gboolean ngsniffer_seek_read(wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size, + union wtap_pseudo_header *pseudo_header, guint8 *pd, int packet_size, int *err, gchar **err_info) { int ret; @@ -1777,7 +1777,7 @@ set_pseudo_header_frame6(wtap *wth, union wtap_pseudo_header *pseudo_header, } static gboolean -ngsniffer_read_rec_data(wtap *wth, gboolean is_random, guchar *pd, +ngsniffer_read_rec_data(wtap *wth, gboolean is_random, guint8 *pd, unsigned int length, int *err, gchar **err_info) { gint64 bytes_read; @@ -2084,7 +2084,7 @@ ngsniffer_dump_open(wtap_dumper *wdh, int *err) Returns TRUE on success, FALSE on failure. */ static gboolean ngsniffer_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) { ngsniffer_dump_t *ngsniffer = (ngsniffer_dump_t *)wdh->priv; struct frame2_rec rec_hdr; |