Commit Graph

26 Commits

Author SHA1 Message Date
Laurent Deniel cc36f0b931 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
2000-08-13 14:09:15 +00:00
Laurent Deniel 6a480953a9 Miscellaneous code cleaning
- add <stdarg.h> or <varargs.h> in snprintf.h
  and remove those inclusions in the other #ifdef NEED_SNPRINTF_H codes

- remove the check of multiple inclusions in source (.c)  code
  (there is a bit loss of _cpp_ performance, but I prefer the gain of
   code reading and maintenance; and nowadays, disk caches and VM are
   correctly optimized ;-).

- protect all (well almost) header files against multiple inclusions

- add header (i.e. GPL license) in some include files

- reorganize a bit the way header files are included:

  First:
  #include <system_include_files>
  #include <external_package_include_files (e.g. gtk, glib etc.)>
  Then
  #include "ethereal_include_files"

  with the correct HAVE_XXX or NEED_XXX protections.

- add some HAVE_XXX checks before including some system header files

- add the same HAVE_XXX in wiretap as in ethereal

Please forgive me, if I break something (I've only compiled and regression
tested on Linux).

svn path=/trunk/; revision=2254
2000-08-11 13:37:21 +00:00
Guy Harris 56b989e0ad Allow either old-style (pre-tvbuff) or new-style (tvbuffified)
dissectors to be registered as dissectors for particular ports,
registered as heuristic dissectors, and registered as dissectors for
conversations, and have routines to be used both by old-style and
new-style dissectors to call registered dissectors.

Have the code that calls those dissectors translate the arguments as
necessary.  (For conversation dissectors, replace
"find_conversation_dissector()", which just returns a pointer to the
dissector, with "old_try_conversation_dissector()" and
"try_conversation_dissector()", which actually call the dissector, so
that there's a single place at which we can do that translation.  Also
make "dissector_lookup()" static and, instead of calling it and, if it
returns a non-null pointer, calling that dissector, just use
"old_dissector_try_port()" or "dissector_try_port()", for the same
reason.)

This allows some dissectors that took old-style arguments and
immediately translated them to new-style arguments to just take
new-style arguments; make them do so.  It also allows some new-style
dissectors not to have to translate arguments before calling routines to
look up and call dissectors; make them not do so.

Get rid of checks for too-short frames in new-style dissectors - the
tvbuff code does those checks for you.

Give the routines to register old-style dissectors, and to call
dissectors from old-style dissectors, names beginning with "old_", with
the routines for new-style dissectors not having the "old_".  Update the
dissectors that use those routines appropriately.

Rename "dissect_data()" to "old_dissect_data()", and
"dissect_data_tvb()" to "dissect_data()".

svn path=/trunk/; revision=2218
2000-08-07 03:21:25 +00:00
Gilbert Ramirez 292e38e2c6 Add tvbuff class.
Add exceptions routines.
Convert proto_tree_add_*() routines to require tvbuff_t* argument.
Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as
the tvbuff_t* argument to proto_tree_add_*() routines.

dissect_packet() creates a tvbuff_t, wraps the next dissect call in
a TRY block, will print "Short Frame" on the proto_tree if a BoundsError
exception is caught.

The FDDI dissector is converted to use tvbuff's.

svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
Jun-ichiro itojun Hagino 3ae12aa496 BGP confederations support (RFC1965).
From: Greg Hankins <gregh@twoguys.org>

svn path=/trunk/; revision=1828
2000-04-11 14:21:37 +00:00
Guy Harris 42107e8614 Move calls to "dissector_add()" out of the register routines for TCP and
UDP and into the handoff registration routines for the protocols in
question.

Make the dissectors for those protocols static if they're not called
outside the dissector's source file.

Get rid of header files if all they did was declare dissectors that are
now static; remove declarations of now-static dissectors from header
files that do more than just declare the dissector.

svn path=/trunk/; revision=1823
2000-04-08 07:07:42 +00:00
Jun-ichiro itojun Hagino 01d2363d0e update RFC1966 (BGP route reflection) support.
From: Greg Hankins <gregh@twoguys.org>

svn path=/trunk/; revision=1759
2000-03-29 06:27:54 +00:00
Guy Harris 8c200212c7 Fix some "proto_tree_add_text()" calls.
svn path=/trunk/; revision=1695
2000-03-06 20:04:53 +00:00
Jun-ichiro itojun Hagino f95500d623 parse multiple COMMUNITIES value.
svn path=/trunk/; revision=1556
2000-01-25 09:24:42 +00:00
Guy Harris 7063b3ae25 Fix up a bunch of places where a pointer into the packet buffer was cast
to a type requiring 2-byte or better alignment and was then
dereferenced; doing that requires that the code generated by your
compiler not trap if it makes an unaligned reference, and on most RISC
processors the code generated by the compiler *will* trap on an
unaligned reference by default.

svn path=/trunk/; revision=1480
2000-01-15 04:17:37 +00:00
Gilbert Ramirez 1990d5fb5c Some initial changes for win32 support, but not all.
Added lots of #ifdef HAVE_*_H wrappers.
Added some #defines in config.h.win32
Check for more headers in configure.in
Added prototype for inet_aton() in inet_v6defs.h.
Changed "BYTE" token (i.e., #define) in ascend-gramamr.y because it
conflicts with a windows definition. Use HEXBYTE instead.

svn path=/trunk/; revision=1448
2000-01-10 17:33:17 +00:00
Guy Harris 7a943b7810 Fix Gerald's e-mail address.
svn path=/trunk/; revision=1437
2000-01-07 22:05:43 +00:00
Jun-ichiro itojun Hagino 08eb7a2b81 fix parser for option part in bgp open message.
struct for bgp open message is not round in size (29 bytes), so we can't
use sizeof for it.

svn path=/trunk/; revision=1310
1999-12-13 09:56:37 +00:00
Jun-ichiro itojun Hagino f877eb85c9 - don't print RFC1771 NLRI length if == 0
- don't do AS_PATH parsing if AS_PATH is empty, just print empty

From: Greg Hankins <gregh@twoguys.org>

svn path=/trunk/; revision=1241
1999-12-08 08:12:27 +00:00
Jun-ichiro itojun Hagino 57cffcde01 remove infinite loop in UPDATE dissector (happend during merge)
svn path=/trunk/; revision=1101
1999-11-23 20:56:49 +00:00
Jun-ichiro itojun Hagino d8c7fed186 bgp updates from Greg.
- now prints RFC1771 withdrawn prefixes
- COMMUNITIES are now fully supported
- AS_PATH fixes (output formatting, used snprintf and not sprintf,
                 AS_PATH broken into separate subtree, and for now will
                 ignore confederation types until we support them)
- AGGREGATOR fixes, now prints again in tree header
- made capitalization consistent (first words capitalized, rest lower
case)
- lots more commenting
- other minor corrections
- started work on route reflector attributes

From: Greg Hankins <gregh@arthur.twoguys.org>

svn path=/trunk/; revision=1090
1999-11-22 07:05:21 +00:00
Guy Harris a7aba0a288 Replace the ETT_ "enum" members, declared in "packet.h", with
dynamically-assigned "ett_" integer values, assigned by
"proto_register_subtree_array()"; this:

	obviates the need to update "packet.h" whenever you add a new
	subtree type - you only have to add a call to
	"proto_register_subtree_array()" to a "register" routine and an
	array of pointers to "ett_", if they're not already there, and
	add a pointer to the new "ett_" variable to the array, if they
	are there;

	would allow run-time-loaded dissectors to allocate subtree types
	when they're loaded.

svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Jun-ichiro itojun Hagino 1d554ab6c9 bgp improvements.
- a few more tree types
- RFC1771 NLRI printed on advertisements
- AS_PATH parsing
- lots of small cleanup on printing "byte" vs "bytes"

From: Greg Hankins <gregh@cc.gatech.edu>

svn path=/trunk/; revision=1015
1999-11-11 21:08:52 +00:00
Jun-ichiro itojun Hagino 004607a3fe more updates to bgp dissector.
- separate tree for each message
- added some comments
- merged my code for OPEN message, mainly just terminology updates
- searched all RFCs and defined known attributes

from: Greg Hankins <gregh@cc.gatech.edu>

svn path=/trunk/; revision=979
1999-11-06 01:28:50 +00:00
Jun-ichiro itojun Hagino 23b2385490 little bit more fixes to bgp dissector.
From: Greg Hankins <gregh@cc.gatech.edu>

svn path=/trunk/; revision=961
1999-11-02 00:11:58 +00:00
Jun-ichiro itojun Hagino 689e4b8151 tabify. fix BGP marker offsets.
svn path=/trunk/; revision=959
1999-11-01 09:51:59 +00:00
Jun-ichiro itojun Hagino be887ebafc separate bgp declaration into separate header file.
bgp message types will now appear on topmost frame.

From: gregh@cc.gatech.edu (Greg Hankins)

svn path=/trunk/; revision=958
1999-11-01 06:57:01 +00:00
Jun-ichiro itojun Hagino 10fdc90bb0 improve BGP path attribute decoding tree.
show detail of path attribute to outside of the tree, to help users
browse the structure.  BGP protocol header structure is very complex
and the previous code required users to click through the tree to check,
say, AS path.

svn path=/trunk/; revision=951
1999-10-31 00:20:44 +00:00
Jun-ichiro itojun Hagino a4e1535f19 upport BGP multiprotocol extension (required for IPv6 BGP exchange).
svn path=/trunk/; revision=858
1999-10-16 15:35:27 +00:00
Jun-ichiro itojun Hagino e77e86c543 improve decoding of unknown BGP attributes.
svn path=/trunk/; revision=849
1999-10-16 00:21:07 +00:00
Jun-ichiro itojun Hagino 3a27312b54 BGP decoding. more attributes and NLRIs needs to be added.
as BGP is a protocol on top of TCP, it may have trouble parsing
out-of-sync data (in most cases data is aligned on packet, it seems).

svn path=/trunk/; revision=843
1999-10-15 17:00:47 +00:00