diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-13 09:50:01 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-13 18:03:57 +0000 |
| commit | a7fd6f2083443a5e88b649aa4c54fe6322f8cbe0 (patch) | |
| tree | 2fd8bf10b2f7b45d8d2947f0314411296928876e /epan/dissectors/packet-vlan.c | |
| parent | 47756e6304199bd27a19dd962cc5a0b1312d1aa8 (diff) | |
Standardize the capture dissector function signature.
This will make it easier to mold into (capture) dissector tables.
Change-Id: Iad63f2c2869782977992a3a072adb020be4b1818
Reviewed-on: https://code.wireshark.org/review/12587
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-vlan.c')
| -rw-r--r-- | epan/dissectors/packet-vlan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index f2f9270f8a..778f512e6a 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -99,7 +99,7 @@ static gint ett_vlan = -1; static expert_field ei_vlan_len = EI_INIT; void -capture_vlan(const guchar *pd, int offset, int len, packet_counts *ld ) { +capture_vlan(const guchar *pd, int offset, int len, packet_counts *ld, const union wtap_pseudo_header *pseudo_header _U_ ) { guint16 encap_proto; if ( !BYTES_ARE_IN_FRAME(offset,len,5) ) { ld->other++; @@ -108,12 +108,12 @@ capture_vlan(const guchar *pd, int offset, int len, packet_counts *ld ) { encap_proto = pntoh16( &pd[offset+2] ); if ( encap_proto <= IEEE_802_3_MAX_LEN) { if ( pd[offset+4] == 0xff && pd[offset+5] == 0xff ) { - capture_ipx(ld); + capture_ipx(pd,offset+4,len,ld, pseudo_header); } else { - capture_llc(pd,offset+4,len,ld, NULL); + capture_llc(pd,offset+4,len,ld, pseudo_header); } } else { - capture_ethertype(encap_proto, pd, offset+4, len, ld); + capture_ethertype(encap_proto, pd, offset+4, len, ld, pseudo_header); } } |