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/netscreen.c | |
| parent | d7ae273d7a2373ab6fcc1c58d235b4a7dc4df0e9 (diff) | |
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/netscreen.c')
| -rw-r--r-- | wiretap/netscreen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index 8eb1843fe9..15242777c8 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -63,7 +63,7 @@ static gboolean netscreen_check_file_type(wtap *wth, int *err, static gboolean netscreen_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean netscreen_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); static int parse_netscreen_rec_hdr(wtap *wth, const char *line, char *cap_int, gboolean *cap_dir, char *cap_dst, @@ -234,7 +234,7 @@ static gboolean netscreen_read(wtap *wth, int *err, gchar **err_info, /* Parse the header */ pkt_len = parse_netscreen_rec_hdr(wth, line, cap_int, &cap_dir, cap_dst, - &wth->pseudo_header, err, err_info); + &wth->phdr.pseudo_header, err, err_info); if (pkt_len == -1) return FALSE; @@ -297,9 +297,10 @@ static gboolean netscreen_read(wtap *wth, int *err, gchar **err_info, /* Used to read packets in random-access fashion */ static gboolean netscreen_seek_read (wtap *wth, gint64 seek_off, - union wtap_pseudo_header *pseudo_header, guint8 *pd, int len, + struct wtap_pkthdr *phdr, guint8 *pd, int len, int *err, gchar **err_info) { + union wtap_pseudo_header *pseudo_header = &phdr->pseudo_header; char line[NETSCREEN_LINE_LENGTH]; char cap_int[NETSCREEN_MAX_INT_NAME_LENGTH]; gboolean cap_dir; |