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/iptrace.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/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index e4e0500195..e1f1858bdf 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -35,13 +35,13 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean iptrace_seek_read_1_0(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 gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean iptrace_seek_read_2_0(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 iptrace_read_rec_header(FILE_T fh, guint8 *header, int header_len, @@ -131,7 +131,7 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info, guint8 header[IPTRACE_1_0_PHDR_SIZE]; guint8 *data_ptr; iptrace_1_0_phdr pkt_hdr; - guchar fddi_padding[3]; + guint8 fddi_padding[3]; /* Read the descriptor data */ *data_offset = wth->data_offset; @@ -214,13 +214,13 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info, } static gboolean iptrace_seek_read_1_0(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; guint8 header[IPTRACE_1_0_PHDR_SIZE]; int pkt_encap; - guchar fddi_padding[3]; + guint8 fddi_padding[3]; if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; @@ -314,7 +314,7 @@ static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, guint8 header[IPTRACE_2_0_PHDR_SIZE]; guint8 *data_ptr; iptrace_2_0_phdr pkt_hdr; - guchar fddi_padding[3]; + guint8 fddi_padding[3]; /* Read the descriptor data */ *data_offset = wth->data_offset; @@ -397,13 +397,13 @@ static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, } static gboolean iptrace_seek_read_2_0(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; guint8 header[IPTRACE_2_0_PHDR_SIZE]; int pkt_encap; - guchar fddi_padding[3]; + guint8 fddi_padding[3]; if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; |