diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-16 21:50:57 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-16 21:50:57 +0000 |
| commit | 78631020b83c7aab12934f0cff72dbb5e3f0ba4a (patch) | |
| tree | 826f6248fcdb37ec849abebc3bdcc650e0df6c61 /wiretap/iseries.c | |
| parent | d7ae273d7a2373ab6fcc1c58d235b4a7dc4df0e9 (diff) | |
| download | wireshark-78631020b83c7aab12934f0cff72dbb5e3f0ba4a.tar.gz | |
Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.
svn path=/trunk/; revision=45601
Diffstat (limited to 'wiretap/iseries.c')
| -rw-r--r-- | wiretap/iseries.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wiretap/iseries.c b/wiretap/iseries.c index 3dea66fd7f..ff8990c408 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -167,7 +167,7 @@ typedef struct { static gboolean iseries_read (wtap * wth, int *err, gchar ** err_info, gint64 *data_offset); static gboolean iseries_seek_read (wtap * wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, + struct wtap_pkthdr *phdr, guint8 * pd, int len, int *err, gchar ** err_info); static gboolean iseries_check_file_type (wtap * wth, int *err, gchar **err_info, @@ -420,7 +420,7 @@ iseries_read (wtap * wth, int *err, gchar ** err_info, gint64 *data_offset) * Parse the packet and extract the various fields */ pkt_len = - iseries_parse_packet (wth, wth->fh, &wth->pseudo_header, NULL, err, + iseries_parse_packet (wth, wth->fh, &wth->phdr.pseudo_header, NULL, err, err_info); if (pkt_len == -1) return FALSE; @@ -510,9 +510,10 @@ iseries_seek_next_packet (wtap * wth, int *err, gchar **err_info) */ static gboolean iseries_seek_read (wtap * wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guint8 * pd, + struct wtap_pkthdr *phdr, guint8 * pd, int len, int *err, gchar ** err_info) { + union wtap_pseudo_header *pseudo_header = &phdr->pseudo_header; int pkt_len; /* seek to packet location */ |