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/visual.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/visual.c')
| -rw-r--r-- | wiretap/visual.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/visual.c b/wiretap/visual.c index 9c48fe22be..e6998ce3d4 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -165,12 +165,12 @@ struct visual_write_info static gboolean visual_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean visual_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 void visual_set_pseudo_header(int encap, struct visual_pkt_hdr *vpkt_hdr, struct visual_atm_hdr *vatm_hdr, union wtap_pseudo_header *pseudo_header); static gboolean visual_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 visual_dump_close(wtap_dumper *wdh, int *err); static void visual_dump_free(wtap_dumper *wdh); @@ -702,7 +702,7 @@ gboolean visual_dump_open(wtap_dumper *wdh, int *err) /* Write a packet to a Visual dump file. Returns TRUE on success, FALSE on failure. */ static gboolean visual_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) { struct visual_write_info * visual = wdh->priv; struct visual_pkt_hdr vpkt_hdr; |