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/pppdump.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/pppdump.c')
| -rw-r--r-- | wiretap/pppdump.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c index 97e3edde47..0fc2e212c6 100644 --- a/wiretap/pppdump.c +++ b/wiretap/pppdump.c @@ -100,7 +100,7 @@ typedef enum { static gboolean pppdump_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean pppdump_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); /* @@ -361,7 +361,7 @@ pppdump_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wth->phdr.ts.nsecs = state->tenths * 100000000; wth->phdr.pkt_encap = WTAP_ENCAP_PPP_WITH_PHDR; - wth->pseudo_header.p2p.sent = (direction == DIRECTION_SENT ? TRUE : FALSE); + wth->phdr.pseudo_header.p2p.sent = (direction == DIRECTION_SENT ? TRUE : FALSE); return TRUE; } @@ -707,12 +707,13 @@ done: static gboolean pppdump_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) { + union wtap_pseudo_header *pseudo_header = &phdr->pseudo_header; int num_bytes; direction_enum direction; pppdump_t *state; |