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-lwapp.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-lwapp.c')
| -rw-r--r-- | epan/dissectors/packet-lwapp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index f2d87cd933..cdba063454 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -74,7 +74,7 @@ static gint hf_lwapp_control_type = -1; static gint hf_lwapp_control_seq_no = -1; static gint hf_lwapp_control_length = -1; -static dissector_handle_t eth_handle; +static dissector_handle_t eth_withoutfcs_handle; static dissector_handle_t wlan_handle; static dissector_handle_t wlan_bsfc_handle; static dissector_handle_t data_handle; @@ -331,7 +331,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo, /* Dissect as Ethernet */ next_client = tvb_new_subset(tvb, 0, -1, -1); - call_dissector(eth_handle, next_client, pinfo, tree); + call_dissector(eth_withoutfcs_handle, next_client, pinfo, tree); return; } /* dissect_lwapp_l3*/ @@ -543,7 +543,7 @@ proto_reg_handoff_lwapp(void) /* * Get handles for the Ethernet and wireless dissectors. */ - eth_handle = find_dissector("eth"); + eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); wlan_handle = find_dissector("wlan"); wlan_bsfc_handle = find_dissector("wlan_bsfc"); data_handle = find_dissector("data"); |