aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-fr.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-12-14 19:25:31 -0500
committerMichael Mann <mmann78@netscape.net>2015-12-17 04:01:56 +0000
commitf342fdcdb83d960bd59ab7e42237c18f9282adcc (patch)
tree81c59810cd548e154d3c1fd95998b3ed0148db4e /epan/dissectors/packet-fr.c
parent8cb03d57a600bc092fd5670f37fb990784fffd96 (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-fr.c')
-rw-r--r--epan/dissectors/packet-fr.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 139bd78221..6f47348d6d 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -207,7 +207,7 @@ static const xdlc_cf_items fr_cf_items_ext = {
};
static gboolean
-capture_fr(const guchar *pd, int offset, int len, packet_counts *ld, const union wtap_pseudo_header *pseudo_header _U_)
+capture_fr(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
{
guint8 fr_octet;
guint32 addr;
@@ -328,16 +328,16 @@ capture_fr(const guchar *pd, int offset, int len, packet_counts *ld, const union
switch (fr_nlpid) {
case NLPID_IP:
- return capture_ip(pd, offset, len, ld, pseudo_header);
+ return capture_ip(pd, offset, len, cpinfo, pseudo_header);
case NLPID_IP6:
- return capture_ipv6(pd, offset, len, ld, pseudo_header);
+ return capture_ipv6(pd, offset, len, cpinfo, pseudo_header);
case NLPID_PPP:
- return capture_ppp_hdlc(pd, offset, len, ld, pseudo_header);
+ return capture_ppp_hdlc(pd, offset, len, cpinfo, pseudo_header);
case NLPID_SNAP:
- return capture_snap(pd, offset, len, ld, pseudo_header);
+ return capture_snap(pd, offset, len, cpinfo, pseudo_header);
default:
return FALSE;
@@ -367,7 +367,7 @@ capture_fr(const guchar *pd, int offset, int len, packet_counts *ld, const union
* If the data does not start with unnumbered information (03) and
* the DLCI# is not 0, then there may be Cisco Frame Relay encapsulation.
*/
- return capture_chdlc(pd, offset, len, ld, pseudo_header);
+ return capture_chdlc(pd, offset, len, cpinfo, pseudo_header);
}
break;
@@ -376,7 +376,7 @@ capture_fr(const guchar *pd, int offset, int len, packet_counts *ld, const union
case RAW_ETHER:
if (addr != 0)
- return capture_eth(pd, offset, len, ld, pseudo_header);
+ return capture_eth(pd, offset, len, cpinfo, pseudo_header);
return FALSE;
}