aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-08-06 08:13:42 +0000
committerGuy Harris <guy@alum.mit.edu>2002-08-06 08:13:42 +0000
commit518640292fd60d8ccbb389a2b22cf18cfcff0667 (patch)
tree643ab43436e43c15d702dd6d9746ed36f614994d
parent5ace0a806e369f1b8d6b6852ecf580734fc9be5c (diff)
Put in a comment noting that forcibly setting "pinfo->fd->lnk_t" means
you can't turn the "Treat all frames as DOCSIS frames" option off. svn path=/trunk/; revision=5958
-rw-r--r--packet-frame.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/packet-frame.c b/packet-frame.c
index 40c2d458aa..cd7f58c44d 100644
--- a/packet-frame.c
+++ b/packet-frame.c
@@ -2,7 +2,7 @@
*
* Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
*
- * $Id: packet-frame.c,v 1.27 2002/07/12 22:52:33 guy Exp $
+ * $Id: packet-frame.c,v 1.28 2002/08/06 08:13:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -96,6 +96,16 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if ((force_docsis_encap) && (docsis_handle)) {
+ /*
+ * XXX - setting it here makes it impossible to
+ * turn the "Treat all frames as DOCSIS frames"
+ * option off.
+ *
+ * The TCP Graph code currently uses "fd->lnk_t";
+ * it should eventually just get the information
+ * it needs from a full-blown dissection, so that
+ * can handle any link-layer type.
+ */
pinfo->fd->lnk_t = WTAP_ENCAP_DOCSIS;
}