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-eth.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-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 8f5735b650..e57f395876 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -192,7 +192,7 @@ eth_build_filter(packet_info *pinfo) #define ETHERNET_SNAP 3 gboolean -capture_eth(const guchar *pd, int offset, int len, packet_counts *ld, const union wtap_pseudo_header *pseudo_header _U_) +capture_eth(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) { guint16 etype, length; int ethhdr_type; /* the type of ethernet frame */ @@ -210,7 +210,7 @@ capture_eth(const guchar *pd, int offset, int len, packet_counts *ld, const unio if ((pd[offset] == 0x01 || pd[offset] == 0x0C) && pd[offset+1] == 0x00 && pd[offset+2] == 0x0C && pd[offset+3] == 0x00 && pd[offset+4] == 0x00) { - return capture_isl(pd, offset, len, ld, pseudo_header); + return capture_isl(pd, offset, len, cpinfo, pseudo_header); } } @@ -267,11 +267,11 @@ capture_eth(const guchar *pd, int offset, int len, packet_counts *ld, const unio switch (ethhdr_type) { case ETHERNET_802_3: - return capture_ipx(pd, offset, len, ld, pseudo_header); + return capture_ipx(pd, offset, len, cpinfo, pseudo_header); case ETHERNET_802_2: - return capture_llc(pd, offset, len, ld, pseudo_header); + return capture_llc(pd, offset, len, cpinfo, pseudo_header); case ETHERNET_II: - return try_capture_dissector("ethertype", etype, pd, offset, len, ld, pseudo_header); + return try_capture_dissector("ethertype", etype, pd, offset, len, cpinfo, pseudo_header); } return FALSE; |