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-cosine.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-cosine.c')
| -rw-r--r-- | epan/dissectors/packet-cosine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index 2c8fa84666..8679904379 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -46,7 +46,7 @@ static int hf_err = -1; static gint ett_raw = -1; -static dissector_handle_t eth_handle; +static dissector_handle_t eth_withoutfcs_handle; static dissector_handle_t ppp_hdlc_handle; static dissector_handle_t llc_handle; static dissector_handle_t chdlc_handle; @@ -112,7 +112,7 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pseudo_header->cosine.encap) { case COSINE_ENCAP_ETH: - call_dissector(eth_handle, tvb_new_subset(tvb, 0, -1, -1), + call_dissector(eth_withoutfcs_handle, tvb_new_subset(tvb, 0, -1, -1), pinfo, tree); break; case COSINE_ENCAP_ATM: @@ -181,7 +181,7 @@ proto_reg_handoff_cosine(void) /* * Get handles for dissectors. */ - eth_handle = find_dissector("eth"); + eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); ppp_hdlc_handle = find_dissector("ppp_hdlc"); llc_handle = find_dissector("llc"); chdlc_handle = find_dissector("chdlc"); |