Commit Graph

56 Commits

Author SHA1 Message Date
Guy Harris 0548e8d0f3 From Hannes Gredler: labeled unicast support for BGP.
svn path=/trunk/; revision=5481
2002-05-15 21:40:25 +00:00
Guy Harris 8ea7c346b8 From Laurent Rabret: print the correct length in the Extended
Communities attribute in a BGP Update message.

Also, get rid of an extra space before a colon in the display for that
attribute, which isn't in other attributes.

svn path=/trunk/; revision=4732
2002-02-14 05:28:44 +00:00
Guy Harris 8dc27bb184 Just use "val_to_str()" to generate names for communities whose values
are in the reserved region (which also fixes a bug where we weren't
printing the value for the NO_ADVERTISE community correctly).

svn path=/trunk/; revision=4638
2002-01-30 23:04:02 +00:00
Guy Harris ee5ca25d31 Include files from the "epan" directory and subdirectories thereof with
"epan/..." pathnames, so as to avoid collisions with header files in any
of the directories in which we look (e.g., "proto.h", as some other
package has its own "proto.h" file which it installs in the top-level
include directory).

Don't add "-I" flags to search "epan", as that's no longer necessary
(and we want includes of "epan" headers to fail if the "epan/" is left
out, so that we don't re-introduce includes lacking "epan/").

svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
Guy Harris cd172815f6 Do desegmentation.
Collapse the two loops through the TCP segment into one.

Use "tvb_reported_length()", not "tvb_length()", to find out how big the
TCP segment is ("tvb_length()" says how much of it was captured, not how
much of it there is).

svn path=/trunk/; revision=4557
2002-01-17 09:25:55 +00:00
Guy Harris e4f05dcac2 Correctly handle BGP attributes with lists of entries when the attribute
has the "extended length" flag set - the starting offset of the list
depends on whether the "extended length" bit was set or not.

svn path=/trunk/; revision=4544
2002-01-15 10:12:17 +00:00
Guy Harris 23319ff023 Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.

That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.

svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
Guy Harris bced8711f6 Make "dissector_add()", "dissector_delete()", and "dissector_change()"
take a dissector handle as an argument, rather than a pointer to a
dissector function and a protocol ID.  Associate dissector handles with
dissector table entries.

svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
Guy Harris ec322b8d52 Cooperative Route Filtering Capability support, and Route Refresh
Message bug fix, in BGP, from Motonori Shindo.

svn path=/trunk/; revision=4142
2001-11-03 21:25:12 +00:00
Guy Harris 42a6d1b152 Support for dissecting multiple capabilities, from Endoh Akira.
svn path=/trunk/; revision=3930
2001-09-13 22:06:55 +00:00
Guy Harris 681f73adb7 There is really no need to have the BGP dissector and the LDP dissector
have two independent "value_string" tables mapping RFC 1700 address
family numbers to names, nor is there any need to have the BGP dissector
and the PIM dissector have two independent sets of #defines for RFC 1700
address family numbers; put a single "value_string" table in "afn.c" and
put a declaration of it, and #defines for the address family numbers,
into "afn.h", and have the dissectors use that.

Move the #define for PGM into "ipproto.h", and add an entry for it in
the "value_string" table in "ipproto.c".

Have the PGM dissector use the standard Ethereal mechanisms for
resolving addresses, and have it use "value_string" tables for mapping
option types, the OPX bits, and packet types to strings.  Use
"bytes_to_str()" to turn byte arrays into strings of hex digits.  Pass
the packet type string to "dissect_pgmopts()" as an argument, rather
than making it a global.  Don't use "proto_tree_add_XXX_format" routines
if you can possibly just use "proto_tree_add_XXX"; give various fields
the correct radix and type, and VALS() strings if necessary, to make
that happen (and to make filtering on them more pleasant).  Put the
type, length, and total length of the options into the protocol tree as
separate fields.  Don't have separate type, length, and OPX fields for
every type of option; one field will suffice.  Don't format a string
with "sprintf()" and then pass that string to "col_add_fstr()" with a
format of "%s" and the string as an argument - "col_add_fstr()" can
format strings itself (that's what the "f" stands for).  Don't byte-swap
and then un-byte-swap IPv4 address fields in the header, just leave them
network byte order to start with.  Use the correct fields for
"proto_tree_add_XXX", rather than using the same field multiple times.
Quit early if an address family identifier isn't AFNUM_INET, as that
means the structure we use to dissect the header doesn't match the
actual header.

svn path=/trunk/; revision=3761
2001-07-21 10:27:13 +00:00
Guy Harris 6486a2216c Get rid of the unused zero-length "bgpext_osptf_rtype_metric" array -
not all compilers let you define an array with no explicit length and no
initializers.

svn path=/trunk/; revision=3670
2001-07-09 11:08:39 +00:00
Guy Harris 2c8be34f57 Support for draft-rosen-vpn-ospf-bgp-mpls and for additional BGP
extended communities, from Aamer Akhter.

svn path=/trunk/; revision=3667
2001-07-08 22:59:51 +00:00
Guy Harris cef2601087 And explain why the fact that RFC 2858 says you can't do what RFC 2545
suggests, and that RFC 2858 obsoletes RFC 2283 which says you can,
doesn't matter - Ethereal's job isn't to enforce protocol standards or
to refuse to dissect stuff that doesn't conform to the final version of
standards; if it can dissect stuff that's now illegal but that wasn't
illegal in the past, and do so without causing problems when dissecting
currently legal stuff, it should so so, so that if you have captures
that include now-illegal stuff (perhaps from old devices that haven't
been upgraded, or from old captures), you can still see what was
happening.

svn path=/trunk/; revision=3644
2001-07-03 02:49:38 +00:00
Guy Harris 0523cad51b Explain why we dissect more than one address in the MP_REACH_NLRI
attribute.

svn path=/trunk/; revision=3643
2001-07-03 02:38:27 +00:00
Guy Harris 8412393197 From Joerg Mayer: explicitly fill in all members of a
"header_field_info" structure, including the ones that are later set by
the routines to register fields.

svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
Guy Harris 738fe781f9 There can be more than one next hop network address in the
BGPTYPE_MP_REACH_NLRI stuff; dissect all of them.

svn path=/trunk/; revision=3553
2001-06-15 08:01:31 +00:00
Guy Harris e035695ede If "buf" is a "char *", "sizeof(buf)" evaluates to the size of a
"char *" variable, not to the size of the buffer to which it points.

svn path=/trunk/; revision=3552
2001-06-15 07:36:31 +00:00
Guy Harris 04734ec83d MP-BGP message support, from Thierry Stagiaire.
svn path=/trunk/; revision=3534
2001-06-10 02:08:11 +00:00
Guy Harris 31199a53a5 Get rid of some unnecessary settings of "pinfo->current_proto" - if the
dissector is called only through a handle or dissector table, the code
that handles those calls sets it for you.

svn path=/trunk/; revision=3480
2001-05-30 07:48:23 +00:00
Guy Harris a304fe6092 Support for Cisco-proprietary capabilities in BGP, from
<bgp4news@yahoo.com>.

svn path=/trunk/; revision=3416
2001-05-16 18:52:37 +00:00
Guy Harris 2cadc3ba3a Get rid of some unnecessary includes.
Fix up Gerald's e-mail address.

svn path=/trunk/; revision=3371
2001-04-23 18:19:03 +00:00
Guy Harris aa1b532612 Tvbuffified by Heikki Vatiainen.
svn path=/trunk/; revision=3317
2001-04-17 21:25:13 +00:00
Guy Harris 9f2c88966a Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.

Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.

Make the IP dissector static, as it's called only via dissector tables
or dissector handles.  Also make the "dissect the TOS field as the
DiffServ DS field" flag static, as it's not referred to outside of
"packet-ip.c".

In the NCP dissector, refer to the port type through "pinfo" rather than
through the global "pi", as it's a tvbuffified dissector.

svn path=/trunk/; revision=2929
2001-01-22 03:33:45 +00:00
Guy Harris 43ccfd8054 Add an additional "protocol index" argument to "{old_}dissector_add()",
"{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and
"register_dissector()", so that an entry in those tables has associated
with it the protocol index of the protocol the dissector handles (or -1,
if there is no protocol index for it).

This is for future use in a number of places.

(Arguably, "proto_register_protocol()" should take a dissector pointer
as an argument, but

	1) it'd have to handle both regular and heuristic dissectors;

	2) making it take either a "dissector_t" or a union of that and
	   a "heur_dissector_t" introduces some painful header-file
	   interdependencies

so I'm punting on that for now.  As with other Ethereal internal APIs,
these APIs are subject to change in the future, at least until Ethereal
1.0 comes out....)

svn path=/trunk/; revision=2849
2001-01-09 06:32:10 +00:00
Guy Harris 0e7c1de08a Have "proto_register_protocol()" build a list of data structures for
protocols, in addition to adding structures to the list of filterable
fields.  Give it an extra argument that specifies a "short name" for the
protocol, for use in such places as

	pinfo->current_proto;

	the dialog box for constructing filters;

	the preferences tab for the protocol;

and so on (although we're not yet using it in all those places).

Make the preference name that appears in the preferences file and the
command line for the DIAMETER protocol "diameter", not "Diameter"; the
convention is that the name in question be all-lower-case.

Make some routines and variables that aren't exported static.

Update a comment in the ICP dissector to make it clear that the
dissector won't see fragments other than the first fragment of a
fragmented datagram.

svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
Jun-ichiro itojun Hagino f69876eece >This patch adds a missing capabilities NOTIFICATION message, and support for
>RFC2385 (Protection of BGP Sessions via the TCP MD5 Signature Option).
From: Greg Hankins <gregh@twoguys.org>

svn path=/trunk/; revision=2791
2000-12-28 05:13:14 +00:00
Jun-ichiro itojun Hagino b56e34d396 bgp route refresh/MP capability option.
Greg Hankins <gregh@twoguys.org>

svn path=/trunk/; revision=2780
2000-12-25 05:28:40 +00:00
Guy Harris 252d55d80f For each column, have both a buffer into which strings for that column
can be put, and a pointer to the string for the column, which might or
might not point to that buffer.

Add a routine "col_set_str()", which sets the string for the column to
the string passed to it as an argument; it should only be handed a
static string (a string constant would be ideal).  It doesn't do any
copying, so it's faster than "col_add_str()".

Make the routines that append to columns check whether the pointer to
the string for the column points to the buffer for the column and, if
not, copy the string for the column to the buffer for the column so that
you can append to it (so you can use "col_set_str()" and then use
"col_append_str()" or "col_append_fstr()").

Convert a bunch of "col_add_str()" calls that take a string constant as
an argument to "col_set_str()" calls.

Convert some "col_add_fstr()" calls that take a string constant as the
only argument - i.e., the format string doesn't have any "%" slots into
which to put strings for subsequent arguments to "col_set_str()" calls
(those calls are just like "col_add_str()" calls).

Replace an END_OF_FRAME reference in a tvbuffified dissector with a
"tvb_length(tvb)" call.

svn path=/trunk/; revision=2670
2000-11-19 08:54:37 +00:00
Laurent Deniel 7440dd0ec8 - proto_bgp was not added in protocol tree, so "bgp" was not
working as display filter...

- add display filters.

svn path=/trunk/; revision=2310
2000-08-20 18:10:12 +00:00
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