diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-11-24 09:13:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-11-24 09:13:52 +0000 |
| commit | 7c3027c5e9b169e6c4eaba78b4815123113ea398 (patch) | |
| tree | 8a078ef2bb27f034ded036ea017e2b910df7de81 /epan/dissectors/packet-sflow.c | |
| parent | b3b1679a577c1b282bf65dd2995d5a2227bbe52c (diff) | |
Export two versions of the Ethereal dissector, for use with encapsulated
Ethernet frames, one for encapsulated frames that include an FCS and one
for encapsulated frames that don't include an FCS. Use the appropriate
versions.
In the ISL dissector, do the same sort of processing we do in the
Ethernet dissector to figure out whether the frame has a trailer or not
and whether it has an FCS or not.
svn path=/trunk/; revision=12593
Diffstat (limited to 'epan/dissectors/packet-sflow.c')
| -rw-r--r-- | epan/dissectors/packet-sflow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 9177a7be74..a144219b42 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -307,7 +307,7 @@ static gint ett_sflow_extended_data = -1; static gint ett_sflow_sampled_header = -1; /* dissectors for other protocols */ -static dissector_handle_t eth_handle; +static dissector_handle_t eth_withoutfcs_handle; static dissector_handle_t tr_handle; static dissector_handle_t fddi_handle; static dissector_handle_t fr_handle; @@ -375,7 +375,7 @@ dissect_sflow_sampled_header(tvbuff_t *tvb, packet_info *pinfo, TRY { switch (header_proto) { case SFLOW_HEADER_ETHERNET: - call_dissector(eth_handle, next_tvb, pinfo, sflow_header_tree); + call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, sflow_header_tree); break; case SFLOW_HEADER_TOKENRING: call_dissector(tr_handle, next_tvb, pinfo, sflow_header_tree); @@ -1050,7 +1050,7 @@ proto_reg_handoff_sflow(void) { dissector_handle_t sflow_handle; - eth_handle = find_dissector("eth"); + eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); tr_handle = find_dissector("tr"); fddi_handle = find_dissector("fddi"); fr_handle = find_dissector("fr"); |