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-etherip.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-etherip.c')
| -rw-r--r-- | epan/dissectors/packet-etherip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c index b24e2e89dd..9d75436be3 100644 --- a/epan/dissectors/packet-etherip.c +++ b/epan/dissectors/packet-etherip.c @@ -37,7 +37,7 @@ static int hf_etherip_ver = -1; static gint ett_etherip = -1; -static dissector_handle_t eth_handle; +static dissector_handle_t eth_withoutfcs_handle; #ifndef offsetof #define offsetof(type, member) ((size_t)(&((type *)0)->member)) @@ -92,7 +92,7 @@ dissect_etherip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set the tvbuff for the payload after the header */ next_tvb = tvb_new_subset(tvb, sizeof(etheriph), -1, -1); - call_dissector(eth_handle, next_tvb, pinfo, tree); + call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree); } void @@ -120,7 +120,7 @@ proto_reg_handoff_etherip(void) { dissector_handle_t etherip_handle; - eth_handle = find_dissector("eth"); + eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); etherip_handle = find_dissector("etherip"); dissector_add("ip.proto", IP_PROTO_ETHERIP, etherip_handle); } |