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-llc.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-llc.c')
| -rw-r--r-- | epan/dissectors/packet-llc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 588f5c2581..402fa94f76 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -282,27 +282,27 @@ capture_llc(const guchar *pd, int offset, int len, packet_counts *ld, const unio return; } if (is_snap) - capture_snap(pd, offset+llc_header_len, len, ld); + capture_snap(pd, offset+llc_header_len, len, ld, pseudo_header); else { /* non-SNAP */ switch (pd[offset]) { case SAP_IP: - capture_ip(pd, offset + llc_header_len, len, ld); + capture_ip(pd, offset + llc_header_len, len, ld, pseudo_header); break; case SAP_NETWARE1: case SAP_NETWARE2: - capture_ipx(ld); + capture_ipx(pd, offset + llc_header_len, len, ld, pseudo_header); break; case SAP_NETBIOS: - capture_netbios(ld); + capture_netbios(pd, offset + llc_header_len, len, ld, pseudo_header); break; case SAP_VINES1: case SAP_VINES2: - capture_vines(ld); + capture_vines(pd, offset + llc_header_len, len, ld, pseudo_header); break; default: @@ -313,7 +313,7 @@ capture_llc(const guchar *pd, int offset, int len, packet_counts *ld, const unio } void -capture_snap(const guchar *pd, int offset, int len, packet_counts *ld) +capture_snap(const guchar *pd, int offset, int len, packet_counts *ld, const union wtap_pseudo_header *pseudo_header _U_) { guint32 oui; guint16 etype; @@ -337,11 +337,11 @@ capture_snap(const guchar *pd, int offset, int len, packet_counts *ld) AppleTalk data packets - but used OUI_ENCAP_ETHER and an Ethernet packet type for AARP packets. */ - capture_ethertype(etype, pd, offset+5, len, ld); + capture_ethertype(etype, pd, offset+5, len, ld, pseudo_header); break; case OUI_CISCO: - capture_ethertype(etype, pd, offset+5, len, ld); + capture_ethertype(etype, pd, offset+5, len, ld, pseudo_header); break; case OUI_MARVELL: @@ -351,7 +351,7 @@ capture_snap(const guchar *pd, int offset, int len, packet_counts *ld) * the payload. (We assume the header is * 5 bytes, for now). */ - capture_ethertype(etype, pd, offset+5+5, len, ld); + capture_ethertype(etype, pd, offset+5+5, len, ld, pseudo_header); break; default: |