diff options
author | Laurent Deniel <laurent.deniel@free.fr> | 2000-08-13 14:09:15 +0000 |
---|---|---|
committer | Laurent Deniel <laurent.deniel@free.fr> | 2000-08-13 14:09:15 +0000 |
commit | cc36f0b9312fc36778bf227cbaaf02c89baf09b3 (patch) | |
tree | 0aff9b70a00a628a713030dc9000f3b5492d492b /packet-x25.c | |
parent | db31ba13c8b9f82c1b96b5444fe3b7e8ff109ce1 (diff) | |
download | wireshark-cc36f0b9312fc36778bf227cbaaf02c89baf09b3.tar.gz wireshark-cc36f0b9312fc36778bf227cbaaf02c89baf09b3.tar.bz2 wireshark-cc36f0b9312fc36778bf227cbaaf02c89baf09b3.zip |
Add the "Edit:Protocols..." feature which currently only implements
the following:
It is now possible to enable/disable a particular protocol decoding
(i.e. the protocol dissector is void or not). When a protocol
is disabled, it is displayed as Data and of course, all linked
sub-protocols are disabled as well.
Disabling a protocol could be interesting:
- in case of buggy dissectors
- in case of wrong heuristics
- for performance reasons
- to decode the data as another protocol (TODO)
Currently (if I am not wrong), all dissectors but NFS can be disabled
(and dissectors that do not register protocols :-)
I do not like the way the RPC sub-dissectors are disabled (in the
sub-dissectors) since this could be done in the RPC dissector itself,
knowing the sub-protocol hfinfo entry (this is why, I've not modified
the NFS one yet).
Two functions are added in proto.c :
gboolean proto_is_protocol_enabled(int n);
void proto_set_decoding(int n, gboolean enabled);
and two MACROs which can be used in dissectors:
OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree)
CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree)
See also the XXX in proto_dlg.c and proto.c around the new functions.
svn path=/trunk/; revision=2267
Diffstat (limited to 'packet-x25.c')
-rw-r--r-- | packet-x25.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packet-x25.c b/packet-x25.c index eb94c96f81..d1e78263d8 100644 --- a/packet-x25.c +++ b/packet-x25.c @@ -2,7 +2,7 @@ * Routines for x25 packet disassembly * Olivier Abad <oabad@cybercable.fr> * - * $Id: packet-x25.c,v 1.34 2000/08/07 03:21:23 guy Exp $ + * $Id: packet-x25.c,v 1.35 2000/08/13 14:09:13 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1412,6 +1412,12 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) modulo = ((bytes0_1 & 0x2000) ? 128 : 8); vc = (int)(bytes0_1 & 0x0FFF); + if (modulo == 8) { + CHECK_DISPLAY_AS_DATA(proto_x25, tvb, pinfo, tree); + } else { + CHECK_DISPLAY_AS_DATA(proto_ex25, tvb, pinfo, tree); + } + if (bytes0_1 & 0x8000) toa = TRUE; else toa = FALSE; |