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

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index 1c3caa7f8d..a1274b2e4d 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -45,7 +45,7 @@ static const value_string encaps_vals[] = {
   {ASCEND_PFX_WDD,   "Ethernet"    },
   {0,                NULL          } };
 
-static dissector_handle_t eth_handle;
+static dissector_handle_t eth_withoutfcs_handle;
 static dissector_handle_t ppp_hdlc_handle;
 
 static void
@@ -108,7 +108,7 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       call_dissector(ppp_hdlc_handle, tvb, pinfo, tree);
       break;
     case ASCEND_PFX_WDD:
-      call_dissector(eth_handle, tvb, pinfo, tree);
+      call_dissector(eth_withoutfcs_handle, tvb, pinfo, tree);
       break;
     default:
       break;
@@ -161,7 +161,7 @@ proto_reg_handoff_ascend(void)
   /*
    * Get handles for the Ethernet and PPP-in-HDLC-like-framing dissectors.
    */
-  eth_handle = find_dissector("eth");
+  eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
   ppp_hdlc_handle = find_dissector("ppp_hdlc");
 
   ascend_handle = create_dissector_handle(dissect_ascend, proto_ascend);