Commit Graph

75 Commits

Author SHA1 Message Date
Guy Harris 37de5150f2 Separate the scan for the BGP header from the scan through the BGP
packets, and mark any stuff before the first BGP header as continuation
data.

Make the main loop for dissecting the BGP packets similar to the loop in
"tcp_dissect_pdus()" (if "tcp_dissect_pdus()" took a starting offset as
an argument, we could use it), so that it handles a BGP header split
between TCP segments.

svn path=/trunk/; revision=7405
2003-04-05 11:20:54 +00:00
Guy Harris 18b4e25c95 Fix up the construct of AS strings (the opening curly bracket wasn't
being put in for sets).

svn path=/trunk/; revision=7064
2003-01-31 08:09:24 +00:00
Guy Harris d798b5065d From Akira Endoh: BGP support for draft-ietf-idr-as4bytes-06.txt and
draft-ietf-idr-dynamic-cap-03.txt.

Fix his AUTHORS entry to put the (presumed) given name first and family
name last.

svn path=/trunk/; revision=7014
2003-01-28 05:25:18 +00:00
Guy Harris 421688098e From Hannes Gredler:
support dissecting of v6 VPN NLRIs;

	fix a little bug for displaying v4 nexthops using type 1 RD
	style [dissecting started at wrong offset].

svn path=/trunk/; revision=6561
2002-11-04 22:00:14 +00:00
Guy Harris a03e90ad09 From Hannes Gredler: dissect the graceful restart capability in BGP OPEN
messages.

svn path=/trunk/; revision=6430
2002-10-15 17:19:06 +00:00
Gerald Combs efe9c01caf Fix more typing issues. Pull the marker, length, and type individually
instead of copying them into a struct.  Remove the "bgp" struct, as it is
no longer used.  Gracefuly (more than before, at least) handle a zero
packet length.

svn path=/trunk/; revision=6421
2002-10-15 03:47:47 +00:00
Gerald Combs 9afeafe88e Fix signed/unsigned type mismatches, as pointed out by Silvio.
Add BGP output to randpkt.

svn path=/trunk/; revision=6420
2002-10-15 02:29:54 +00:00
Gerald Combs 0a0aeffdb5 Properly check the return value of decode_prefix4(). This prevents an
infinite loop caused by a malformed packet.

svn path=/trunk/; revision=6392
2002-10-10 01:36:53 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris 867c6e5833 From Hannes Gredler:
open up a subtree when decoding l2info extd communities;

	some bugfixes in the extd community dissector.

svn path=/trunk/; revision=6098
2002-08-27 19:12:35 +00:00
Guy Harris 1f869adf58 From Hannes Gredler:
more complete support for L2VPNs as described in
	draft-kompella-ppvpn-l2vpn;

	fix a segfault in the extd_community decoder;

	more consistent SAFI strings (tcpdump);

	more robust V6 decoding (the assumption that v6 may come
	only in unlabeled form is wrong :-|)

svn path=/trunk/; revision=6093
2002-08-27 08:41:43 +00:00
Guy Harris bce49e3238 Properly check for an address family that's neither AFNUM_INET nor
AFNUM_INET6.

Properly check for "mp_addr_to_str()" indicating that it doesn't know
the address family being parsed.

svn path=/trunk/; revision=6082
2002-08-24 21:58:57 +00:00
Guy Harris 210b46429b From Hannes Gredler:
Basic support for AFI & Extd communities in
	    draft-kompella-ppvpn-l2vpn

	More robust handling for unknown AFIs in BGP MP(UN)REACH NLRIs

Fix typos.

svn path=/trunk/; revision=6079
2002-08-24 10:22:29 +00:00
Guy Harris e31383db8e From Jian Yu:
a small fix for displaying unrecognized capabilities;

	ORF support (draft-ietf-idr-route-filter-06.txt).

svn path=/trunk/; revision=5998
2002-08-15 18:52:04 +00:00
Guy Harris f7cf55cccd We don't use anything from <arpa/inet.h>, so we don't need to include
it.

svn path=/trunk/; revision=5938
2002-08-03 19:47:50 +00:00
Jörg Mayer 173fe5aef4 Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.

svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
Guy Harris 66e28fbb4a Fixes to BGP problems, from Dirk Steinberg.
Add some additional bounds checking to "decode_MPLS_stack()" so as not
to overflow the buffer handed to it.

svn path=/trunk/; revision=5518
2002-05-21 21:55:47 +00:00
Guy Harris 2667dfed9a From Hannes Gredler: fix misuse of "&&" when "&" was intended.
svn path=/trunk/; revision=5517
2002-05-21 21:44:28 +00:00
Guy Harris 04b133f82e From Hannes Gredler: fix to label stack handling for withdrawn routes.
svn path=/trunk/; revision=5511
2002-05-20 01:01:11 +00:00
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