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 /plugins/docsis | |
| 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 'plugins/docsis')
| -rw-r--r-- | plugins/docsis/packet-docsis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 75ecacb1c5..cd7ed7943f 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -122,7 +122,7 @@ static int hf_docsis_ehdr_grants = -1; static int hf_docsis_reserved = -1; static dissector_handle_t docsis_handle; -static dissector_handle_t eth_handle; +static dissector_handle_t eth_withoutfcs_handle; static dissector_handle_t data_handle; static dissector_handle_t docsis_mgmt_handle; static dissector_table_t docsis_dissector_table; @@ -513,7 +513,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (pdulen > 0) { next_tvb = tvb_new_subset (tvb, hdrlen, captured_length, pdulen); - call_dissector (eth_handle, next_tvb, pinfo, tree); + call_dissector (eth_withoutfcs_handle, next_tvb, pinfo, tree); } if (concatlen > 0) { @@ -765,7 +765,7 @@ proto_reg_handoff_docsis (void) dissector_add ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle); docsis_mgmt_handle = find_dissector ("docsis_mgmt"); - eth_handle = find_dissector ("eth"); + eth_withoutfcs_handle = find_dissector ("eth_withoutfcs"); } /* Start the functions we need for the plugin stuff */ |