diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-14 19:25:31 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-17 04:01:56 +0000 |
| commit | f342fdcdb83d960bd59ab7e42237c18f9282adcc (patch) | |
| tree | 81c59810cd548e154d3c1fd95998b3ed0148db4e /epan/dissectors/packet-vlan.c | |
| parent | 8cb03d57a600bc092fd5670f37fb990784fffd96 (diff) | |
Create capture dissector "info" structure (capture_packet_info_t)
While it currently only contains packet_counts, it will hopefully stabilize the capture function signature if more fields are added.
Change-Id: I003552c58043c7c2d67aec458187b12b233057e2
Reviewed-on: https://code.wireshark.org/review/12690
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 6f65835825..ea0c66fe2e 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; static gboolean -capture_vlan(const guchar *pd, int offset, int len, packet_counts *ld, const union wtap_pseudo_header *pseudo_header _U_ ) { +capture_vlan(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_ ) { guint16 encap_proto; if ( !BYTES_ARE_IN_FRAME(offset,len,5) ) return FALSE; @@ -107,13 +107,13 @@ capture_vlan(const guchar *pd, int offset, int len, packet_counts *ld, const uni encap_proto = pntoh16( &pd[offset+2] ); if ( encap_proto <= IEEE_802_3_MAX_LEN) { if ( pd[offset+4] == 0xff && pd[offset+5] == 0xff ) { - return capture_ipx(pd,offset+4,len,ld, pseudo_header); + return capture_ipx(pd,offset+4,len, cpinfo, pseudo_header); } else { - return capture_llc(pd,offset+4,len,ld, pseudo_header); + return capture_llc(pd,offset+4,len, cpinfo, pseudo_header); } } - return try_capture_dissector("ethertype", encap_proto, pd, offset+4, len, ld, pseudo_header); + return try_capture_dissector("ethertype", encap_proto, pd, offset+4, len, cpinfo, pseudo_header); } static void |