osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2002-08-06 08:13:42 +00:00
parent 5ace0a806e
commit 518640292f
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packet-frame.c
View File

@ -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;
}