aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-atm.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-13 23:51:41 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-14 07:55:17 +0000
commit9a19c14062a7f9f689b1d5e6c67dec14f171927c (patch)
treec948e6013d6feda23374e3068cc631b54642396d /epan/dissectors/packet-atm.c
parent8572c6abe7db1d83b093a1944244bfe5c594fe55 (diff)
Expand a comment.
Change-Id: I9d749c43727291768a36adc0c1956f73a5374f91 Reviewed-on: https://code.wireshark.org/review/13283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-atm.c')
-rw-r--r--epan/dissectors/packet-atm.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 2368b4d771..381bd0dd93 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -982,7 +982,16 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
else if (pntoh16(octet) == 0x00)
{
- /* assume vc muxed bridged ethernet */
+ /*
+ * Assume VC multiplexed bridged Ethernet.
+ * Whether there's an FCS is an option negotiated
+ * over the VC, so we call the "do heuristic checks
+ * to see if there's an FCS" version of the Ethernet
+ * dissector.
+ *
+ * See RFC 2684 section 6.2 "VC Multiplexing of Bridged
+ * Protocols".
+ */
proto_tree_add_item(tree, hf_atm_padding, tvb, 0, 2, ENC_NA);
next_tvb = tvb_new_subset_remaining(tvb, 2);
call_dissector(eth_handle, next_tvb, pinfo, tree);