diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-05-25 11:21:51 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-05-25 11:21:51 +0000 |
| commit | ee5c636603456244b8517239b75fa971b3f0482b (patch) | |
| tree | c5441e450e168755cb1c479c9887a4da9ff05895 /epan/proto.h | |
| parent | 2f0c4dde50a18d8d4f5acb4c5dd56576081ecab0 (diff) | |
Re-organise which FI bits are used to store expert severity and event info, in order to avoid clash with bit offset and length as added in 4413 (Improve bitview display).
The event info values were (mostly) done as though they were flags rather than values, but as it doesn't really make sense to combine events I changed them to use contiguous values. They now use the 8 m.s. bits, so there are now 9 unused bits available for new uses.
svn path=/trunk/; revision=32945
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/epan/proto.h b/epan/proto.h index 25dcb2d507..87c77a613a 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -370,38 +370,39 @@ typedef proto_node proto_item; */ /* expert severities */ -#define PI_SEVERITY_MASK 0x00000E00 /* mask usually for internal use only! */ +#define PI_SEVERITY_MASK 0x0000E000 /* mask usually for internal use only! */ /** Usual workflow, e.g. TCP connection establishing */ -#define PI_CHAT 0x00000200 +#define PI_CHAT 0x00002000 /** Notable messages, e.g. an application returned an "usual" error code like HTTP 404 */ -#define PI_NOTE 0x00000400 +#define PI_NOTE 0x00004000 /** Warning, e.g. application returned an "unusual" error code */ -#define PI_WARN 0x00000600 +#define PI_WARN 0x00006000 /** Serious problems, e.g. [Malformed Packet] */ -#define PI_ERROR 0x00000800 +#define PI_ERROR 0x00008000 /* expert "event groups" */ -#define PI_GROUP_MASK 0xFFFFF000 /* mask usually for internal use only! */ +#define PI_GROUP_MASK 0xFF000000 /* mask usually for internal use only! */ /** The protocol field has a bad checksum, usually PI_WARN */ -#define PI_CHECKSUM 0x00001000 + +#define PI_CHECKSUM 0x01000000 /** The protocol field indicates a sequence problem (e.g. TCP window is zero) */ -#define PI_SEQUENCE 0x00002000 +#define PI_SEQUENCE 0x02000000 /** The protocol field indicates a bad application response code (e.g. HTTP 404), usually PI_NOTE */ -#define PI_RESPONSE_CODE 0x00004000 +#define PI_RESPONSE_CODE 0x03000000 /** The protocol field indicates an application request (e.g. File Handle == xxxx), usually PI_CHAT */ -#define PI_REQUEST_CODE 0x00005000 +#define PI_REQUEST_CODE 0x04000000 /** The data is undecoded, the protocol dissection is incomplete here, usually PI_WARN */ -#define PI_UNDECODED 0x00008000 +#define PI_UNDECODED 0x05000000 /** The protocol field indicates a reassemble (e.g. DCE/RPC defragmentation), usually PI_CHAT (or PI_ERROR) */ -#define PI_REASSEMBLE 0x00010000 +#define PI_REASSEMBLE 0x06000000 /** The packet data is malformed, the dissector has "given up", usually PI_ERROR */ -#define PI_MALFORMED 0x00020000 +#define PI_MALFORMED 0x07000000 /** A generic debugging message (shouldn't remain in production code!), usually PI_ERROR */ -#define PI_DEBUG 0x00040000 +#define PI_DEBUG 0x08000000 /** The protocol field violates a protocol specification, usually PI_WARN */ -#define PI_PROTOCOL 0x00080000 +#define PI_PROTOCOL 0x09000000 /* The protocol field indicates a security probem (e.g. unsecure implementation) */ -#define PI_SECURITY 0x00100000 +#define PI_SECURITY 0x0a000000 /* add more, see http://wiki.wireshark.org/Development/ExpertInfo */ |