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 /epan/packet.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 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/packet.c b/epan/packet.c index cd0f6f1b49..a1287e112e 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -294,7 +294,7 @@ final_registration_all_protocols(void) /* Creates the top-most tvbuff and calls dissect_frame() */ void -dissect_packet(epan_dissect_t *edt, union wtap_pseudo_header *pseudo_header, +dissect_packet(epan_dissect_t *edt, struct wtap_pkthdr *phdr, const guchar *pd, frame_data *fd, column_info *cinfo) { if (cinfo != NULL) @@ -303,7 +303,8 @@ dissect_packet(epan_dissect_t *edt, union wtap_pseudo_header *pseudo_header, edt->pi.current_proto = "<Missing Protocol Name>"; edt->pi.cinfo = cinfo; edt->pi.fd = fd; - edt->pi.pseudo_header = pseudo_header; + edt->pi.phdr = phdr; + edt->pi.pseudo_header = &phdr->pseudo_header; edt->pi.dl_src.type = AT_NONE; edt->pi.dl_dst.type = AT_NONE; edt->pi.net_src.type = AT_NONE; |