18 years agoSupport for ANSI flavor of MTP3, from Jeff Morriss.
guy [Sat, 7 Jul 2001 09:06:40 +0000 (09:06 +0000)]
Support for ANSI flavor of MTP3, from Jeff Morriss.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3659 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoRemove a comment that no longer applies - we no longer seek forward in
guy [Fri, 6 Jul 2001 00:17:36 +0000 (00:17 +0000)]
Remove a comment that no longer applies - we no longer seek forward in
compressed Sniffer files by sequentially moving forward, and we no
longer seek backward by seeking to the beginning and then seeking
forward to the new position, we now seek to the beginning of the
compressed block that contains the target position, if we're not already
in that block, and then move to the appropriate position in that block.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3658 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agofixed some warning: comparison between signed and unsigned
oabad [Thu, 5 Jul 2001 22:10:09 +0000 (22:10 +0000)]
fixed some warning: comparison between signed and unsigned

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3657 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoDon't capitalize the names of programs in the summary lines of man pages
guy [Thu, 5 Jul 2001 21:27:11 +0000 (21:27 +0000)]
Don't capitalize the names of programs in the summary lines of man pages
- at least some versions of makewhatis (e.g., the Solaris version)
uses that name in a case-sensitive fashion, so you can't do "man
ethereal", say, you have to do "man Ethereal", and that doesn't work as
the man page file is "ethereal.1", not "Ethereal.1".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3656 f5534014-38df-0310-8fa8-9805f1628bb7

18 years ago"wtap_file()" is no longer in Wiretap, so don't try to export it from
guy [Thu, 5 Jul 2001 20:57:09 +0000 (20:57 +0000)]
"wtap_file()" is no longer in Wiretap, so don't try to export it from
the Wiretap DLL.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3655 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoUpdates from Frank Singleton - get rid of an option that was made
guy [Thu, 5 Jul 2001 20:54:56 +0000 (20:54 +0000)]
Updates from Frank Singleton - get rid of an option that was made
unnecessary as a result of the change that made subdissectors for
GIOP-based protocols register themselves with the GIOP dissector with
their protocol ID and had the GIOP dissector check whether the protocol
is enabled before calling its dissector, so that subdissectors can be
disabled from the "Edit->Protocols" dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3654 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFixed problem with handling empty parameters.
hagbard [Thu, 5 Jul 2001 04:27:10 +0000 (04:27 +0000)]
Fixed problem with handling empty parameters.
Problem was pointed out by Alejandro Vaquero who
provided a fix.  Implemented a slightly different fix.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3653 f5534014-38df-0310-8fa8-9805f1628bb7

18 years ago"open_cap_file()" in Ethereal and Tethereal don't use the FILE_T they
guy [Thu, 5 Jul 2001 00:34:42 +0000 (00:34 +0000)]
"open_cap_file()" in Ethereal and Tethereal don't use the FILE_T they
get from calling "wtap_file()", so get rid of the call and the
(otherwise unused) variable to which its result gets assigned.

That lets us get rid of "wtap_file()" in Wiretap.

It also lets us get rid of the include of "zlib.h" in "file.h"; the
#defines of "file_open()", "filed_open()", and "file_close()" are also
unnecessary, so we get rid of those as well.

However, that means we need to include <zlib.h> in "gtk/main.c" and
"tethereal.c", so that the version number of libz is defined and can
show up in the version string.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3652 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoSome minor changes to allow the mgcp plugin to be compiled
hagbard [Wed, 4 Jul 2001 22:01:22 +0000 (22:01 +0000)]
Some minor changes to allow the mgcp plugin to be compiled
into a static binary if desired.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3651 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoThe Perl script process-x11-fields.pl is in the $(srcdir) and not in the
girlich [Wed, 4 Jul 2001 06:25:03 +0000 (06:25 +0000)]
The Perl script process-x11-fields.pl is in the $(srcdir) and not in the
current directory.
The x11-fields file is in the $(srcdir) and not in the current directory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3650 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoAdded "-all-static" take to _LDADD for ethereal_static and tethereal_static
hagbard [Tue, 3 Jul 2001 23:39:55 +0000 (23:39 +0000)]
Added "-all-static" take to _LDADD for ethereal_static and tethereal_static
so that the static targets will link correctly using libtool.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3649 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFrom Frank Singleton: add subtrees for ServiceContextList and IOR.
guy [Tue, 3 Jul 2001 23:30:01 +0000 (23:30 +0000)]
From Frank Singleton: add subtrees for ServiceContextList and IOR.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3648 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoDon't base the protocol column setting in the WSP and WTP dissectors on
guy [Tue, 3 Jul 2001 09:53:22 +0000 (09:53 +0000)]
Don't base the protocol column setting in the WSP and WTP dissectors on
the port - instead, base it on whether the dissector was called directly
from UDP or called from another WAP dissector.

That way, if you explicitly say "decode this as WTP" because there was a
redirection (or if, in the future, the WSP dissector handles
redirections for you, although that won't handle the case of a capture
where the redirection wasn't captured), the column doesn't say "UDP", it
says the right thing.

Don't register the WTLS dissector by name - nobody calls it through a

Register the WTP dissector by name, as the WTLS dissector tries to get a
handle for it - although it doesn't actually call it, or the WSP
dissector, through a handle.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3647 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoUse "val_to_str()" to translate numerical values to strings, don't
guy [Tue, 3 Jul 2001 09:08:03 +0000 (09:08 +0000)]
Use "val_to_str()" to translate numerical values to strings, don't
invent something that's almost like "value_string" and almost like

Split the command-code field into client and server command code fields,
make them enumerated fields, and put that field into the tree when
dissecting it in the header, not when putting the body into the tree.

Put the body of both unknown client and server requests into the tree,
and just label it as "Body", as is done with the body of known requests.

Display the status code in the same fashion in all places where it's put
into the protocol tree.

When dissecting a SRV_MULTI message, keep dissecting until we run out of
submessages - don't quit when we run out of data in the packet, as that
means we won't throw an exception and won't take the frame as short.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3646 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoUse the "pinfo" argument, rather than the global "pi", to refer to the
guy [Tue, 3 Jul 2001 04:56:46 +0000 (04:56 +0000)]
Use the "pinfo" argument, rather than the global "pi", to refer to the
packet information in tvbuffified dissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3645 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoAnd explain why the fact that RFC 2858 says you can't do what RFC 2545
guy [Tue, 3 Jul 2001 02:49:38 +0000 (02:49 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3644 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoExplain why we dissect more than one address in the MP_REACH_NLRI
guy [Tue, 3 Jul 2001 02:38:27 +0000 (02:38 +0000)]
Explain why we dissect more than one address in the MP_REACH_NLRI

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3643 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoIf the reply status isn't handled, don't complain about an unknown
guy [Tue, 3 Jul 2001 02:27:29 +0000 (02:27 +0000)]
If the reply status isn't handled, don't complain about an unknown
exception, complain about an unknown reply status - it isn't necessarily
an exception.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3642 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoGet rid of "tvb_bytes_exist()" calls that aren't protecting against
guy [Tue, 3 Jul 2001 02:05:47 +0000 (02:05 +0000)]
Get rid of "tvb_bytes_exist()" calls that aren't protecting against
throwing an exception before we've decided whether a packet is an RPC
packet or not - dissectors shouldn't, by and large, carefully avoid
having tvbuff accessors throw exceptions, they should let them throw
exceptions so that the frame is properly flagged as having been too

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3641 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoDissect the bitfields in the frame control field, and put the text
guy [Tue, 3 Jul 2001 01:23:21 +0000 (01:23 +0000)]
Dissect the bitfields in the frame control field, and put the text
description of the frame type into the top-level line for that field.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3640 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoWhitespace cleanups in protocol tree and summary lines.
guy [Tue, 3 Jul 2001 00:49:57 +0000 (00:49 +0000)]
Whitespace cleanups in protocol tree and summary lines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3639 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFixes from Ronnie Sahlberg. (Yo, any CMU or Transarc^H^H^H^H^H^H^H^HIBM
guy [Tue, 3 Jul 2001 00:46:52 +0000 (00:46 +0000)]
Fixes from Ronnie Sahlberg.  (Yo, any CMU or Transarc^H^H^H^H^H^H^H^HIBM
types care to clean this stuff up, in case there's any documentation of
RX or AFS internal to CMU or Transarc/IBM?)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3638 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoTvbuffify the rlogin dissector.
guy [Tue, 3 Jul 2001 00:40:48 +0000 (00:40 +0000)]
Tvbuffify the rlogin dissector.

Get rid of some unneeded includes.

"info_framenum" is set from an Ethereal frame number, and those are
unsigned, so make it unsigned.  No frame will have zero as its frame
number, so start "info_framenum" as 0, not -1.

Fix some long-standing bugs in the packet processing found either as a
result of code inspection in the process of tvbuffifying or doing
regression tests.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3637 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoWith IP fragment reassembly, the current frame when we're dissecting a
guy [Mon, 2 Jul 2001 10:45:25 +0000 (10:45 +0000)]
With IP fragment reassembly, the current frame when we're dissecting a
packet isn't necessarily the first frame of the packet, so don't say
that a reply is to a request "starting in" a given frame, just say it's
in that frame.

Don't manually check whether the stuff we're about to fetch from the
tvbuff exists - just fetch it, and let the tvbuff accessors throw an
exception if we go past the end of the packet.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3636 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoPut the IGMP type field value into the PIM tree, as is done for other
guy [Mon, 2 Jul 2001 09:42:40 +0000 (09:42 +0000)]
Put the IGMP type field value into the PIM tree, as is done for other
on-top-of-IGMP protocols, e.g. DVMRP.

Label the PIM opcode field "Code" for PIMv1, to distinguish it from the
IGMP type field.

Make that field, and the PIMv2 opcode field, enumerated fields.

For unknown opcode values, put the value into the summary line.

Get rid of some unused variables.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3635 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoAdd PIMv1 support.
guy [Mon, 2 Jul 2001 09:23:02 +0000 (09:23 +0000)]
Add PIMv1 support.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3634 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFor DNS-over-TCP, put the length indicator into the tree for the DNS
guy [Mon, 2 Jul 2001 07:29:03 +0000 (07:29 +0000)]
For DNS-over-TCP, put the length indicator into the tree for the DNS

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3633 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoUpdate Gerald's e-mail address.
guy [Mon, 2 Jul 2001 07:17:29 +0000 (07:17 +0000)]
Update Gerald's e-mail address.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3632 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoTvbuffify the DNS, NBNS, NBDS, and NBSS dissectors.
guy [Mon, 2 Jul 2001 07:11:40 +0000 (07:11 +0000)]
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors.

Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3631 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoGet rid of a now-unused variable; it's the only variable of type
guy [Mon, 2 Jul 2001 02:09:26 +0000 (02:09 +0000)]
Get rid of a now-unused variable; it's the only variable of type
"isis_hdr_t", so we can get rid of the definition of that as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3630 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFetch fields from the ISIS header one at a time, rather than snarfing
guy [Mon, 2 Jul 2001 01:46:22 +0000 (01:46 +0000)]
Fetch fields from the ISIS header one at a time, rather than snarfing
the entire ISIS header into a structure - that way, if we run out of
packet data in the middle of the header, we at least dissect the stuff
for which we have packet data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3629 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFetch values only once from the tvbuff, and save them in a variable,
guy [Mon, 2 Jul 2001 01:41:25 +0000 (01:41 +0000)]
Fetch values only once from the tvbuff, and save them in a variable,
rather than calling the tvbuff accessor multiple times.

Use "proto_tree_add_item()" for fields whose values we don't care about
in the code.

BTW, apologies to Hannes Gredler - the changes with

More IS-IS updates.

HELLO message support in RSVP.

were from him, but I forgot to put that in the checkin message.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3628 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFix the file name in the comment, and update Gerald's e-mail address.
guy [Mon, 2 Jul 2001 00:46:21 +0000 (00:46 +0000)]
Fix the file name in the comment, and update Gerald's e-mail address.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3627 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoTvbuffified ISIS dissector, from Ronnie Sahlberg.
guy [Mon, 2 Jul 2001 00:19:34 +0000 (00:19 +0000)]
Tvbuffified ISIS dissector, from Ronnie Sahlberg.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3626 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFix a typo, discovered whilst testing the tvbuffified ISIS dissector
guy [Sun, 1 Jul 2001 20:37:02 +0000 (20:37 +0000)]
Fix a typo, discovered whilst testing the tvbuffified ISIS dissector
(the tvbuffified version is correct here; I'll check this in for
reference purposes, even though I plan to check in the tvbuffified
version later).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3625 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFrom Ronnie Sahlberg: fix the AFS macros to parse the element count in
guy [Sat, 30 Jun 2001 09:32:44 +0000 (09:32 +0000)]
From Ronnie Sahlberg: fix the AFS macros to parse the element count in
AFSCBFids and AFSCBs as a 32-bit integer rather than an 8-bit integer.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3624 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFrom Frank Singleton: when GIOP sub-dissectors register themselves, have
guy [Fri, 29 Jun 2001 20:49:29 +0000 (20:49 +0000)]
From Frank Singleton: when GIOP sub-dissectors register themselves, have
them supply a protocol ID, and have the code that calls the
subdissectors check if the protocol is enabled and, if it isn't, not
call the sub-dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3623 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoMSNIP support, from Ronnie Sahlberg.
guy [Fri, 29 Jun 2001 18:55:50 +0000 (18:55 +0000)]
MSNIP support, from Ronnie Sahlberg.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3622 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoCreate a routine to do the tvbuff-length-adjusting and
guy [Fri, 29 Jun 2001 09:46:54 +0000 (09:46 +0000)]
Create a routine to do the tvbuff-length-adjusting and
"pinfo->{len,captured_len}"-adjusting currently done by the IP
dissector, make the IP dissector call that rather than doing the work
itself, make the IPv6 dissector call that rather than just adjusting the
tvbuff length itself, and make the IPX dissector call that rather than
just adjusting "pi.{len,captured_len}" itself.

This cleans things up a bit, and causes trailers to be properly reported
in IPX-over-Ethernet frames.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3621 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoUpdate Gerald's e-mail address.
guy [Fri, 29 Jun 2001 09:42:45 +0000 (09:42 +0000)]
Update Gerald's e-mail address.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3620 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoInclude <string.h> to get "memcmp()" and "memcpy()" declared.
guy [Thu, 28 Jun 2001 19:15:11 +0000 (19:15 +0000)]
Include <string.h> to get "memcmp()" and "memcpy()" declared.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3619 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoUpdates from Mark Burton.
guy [Thu, 28 Jun 2001 08:05:26 +0000 (08:05 +0000)]
Updates from Mark Burton.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3618 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoHandle a few of the NCP types from the traces sent in by Pete,
gram [Thu, 28 Jun 2001 02:42:48 +0000 (02:42 +0000)]
Handle a few of the NCP types from the traces sent in by Pete,

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3617 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoImproved support for CORBA IDL "fixed" types, and other updates, from
guy [Wed, 27 Jun 2001 20:41:16 +0000 (20:41 +0000)]
Improved support for CORBA IDL "fixed" types, and other updates, from
Frank Singleton.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3616 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoImproved support for CORBA IDL "fixed" types, and fix to handling of
guy [Wed, 27 Jun 2001 20:38:56 +0000 (20:38 +0000)]
Improved support for CORBA IDL "fixed" types, and fix to handling of
explicit and heuristic GIOP dissectors, from Frank Singleton.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3615 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoMRDISC support, from Ronnie Sahlberg.
guy [Wed, 27 Jun 2001 20:19:19 +0000 (20:19 +0000)]
MRDISC support, from Ronnie Sahlberg.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3614 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoDon't offer the ability to edit capture filters if Ethereal wasn't
guy [Wed, 27 Jun 2001 10:00:14 +0000 (10:00 +0000)]
Don't offer the ability to edit capture filters if Ethereal wasn't
linked with libpcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3613 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFix a problem that shows up if you build without libpcap.
guy [Wed, 27 Jun 2001 08:36:08 +0000 (08:36 +0000)]
Fix a problem that shows up if you build without libpcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3612 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoReplace "--enable-pcap" with "--with-pcap", and if an argument is
guy [Wed, 27 Jun 2001 07:47:50 +0000 (07:47 +0000)]
Replace "--enable-pcap" with "--with-pcap", and if an argument is
specified to "--with-pcap", add that directory to the include file and
library search paths, so that you can use "--with-pcap=DIR" to search
for libpcap in a directory other than the standard ones (either because
it was installed somewhere other than under "/usr" or "/usr/local", or
because you want to use a special version you've installed rather than
the standard one).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3611 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoIf length arguments to "%*s" aren't of type "int", cast them to "int",
guy [Tue, 26 Jun 2001 20:52:19 +0000 (20:52 +0000)]
If length arguments to "%*s" aren't of type "int", cast them to "int",
as that's what C requires them to be.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3610 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoAdd HFILL to explicitly fill in some additional structure members.
guy [Tue, 26 Jun 2001 20:50:30 +0000 (20:50 +0000)]
Add HFILL to explicitly fill in some additional structure members.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3609 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoindentation consistencies.
itojun [Tue, 26 Jun 2001 17:31:36 +0000 (17:31 +0000)]
indentation consistencies.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3608 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoRemove second entry for Michael Rozhavsky - "Additional OSPF LSA types
guy [Mon, 25 Jun 2001 08:36:48 +0000 (08:36 +0000)]
Remove second entry for Michael Rozhavsky - "Additional OSPF LSA types
and opaque-options flag" falls under the broader heading of "OSPF

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3607 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoA better fix - we don't use "assigned" if the action was E_DECODE_NO, so
guy [Mon, 25 Jun 2001 08:10:38 +0000 (08:10 +0000)]
A better fix - we don't use "assigned" if the action was E_DECODE_NO, so
don't bother fetching it if the action is E_DECODE_NO; that means we can
also avoid fetching the currently selected row if the action is
E_DECODE_NO, so the fact that we've cleared the selection if the action
is E_DECODE_NO doesn't matter.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3606 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoIn "decode_network()", get the information about the currently selected
guy [Mon, 25 Jun 2001 07:57:50 +0000 (07:57 +0000)]
In "decode_network()", get the information about the currently selected
row *before* calling "decode_simple()", as, if the "Do not decode" radio
button is selected, "decode_simple()" will clear the current selection.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3605 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoMore IS-IS updates.
guy [Sat, 23 Jun 2001 19:45:12 +0000 (19:45 +0000)]
More IS-IS updates.

HELLO message support in RSVP.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3604 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoInclude "strerror.h" only on platforms that don't declare it in a
guy [Sat, 23 Jun 2001 19:14:42 +0000 (19:14 +0000)]
Include "strerror.h" only on platforms that don't declare it in a
standard header file, so we get the platform's declaration (which may
include, for example, "dllexport"-type declarations) rather than the
"workaround for platforms that lack it" declaration.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3603 f5534014-38df-0310-8fa8-9805f1628bb7

18 years ago"index()" is non-standard, and MSVC++ 6.0 complained about it; the ANSI
guy [Sat, 23 Jun 2001 19:10:27 +0000 (19:10 +0000)]
"index()" is non-standard, and MSVC++ 6.0 complained about it; the ANSI
C standard has "strchr()" instead, so use it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3602 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoSupport CIDR notation in IPv4 address filtering.
gram [Fri, 22 Jun 2001 16:29:15 +0000 (16:29 +0000)]
Support CIDR notation in IPv4 address filtering.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3601 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoAllow the 802.11 management-frame protocol to be disabled.
guy [Fri, 22 Jun 2001 08:12:11 +0000 (08:12 +0000)]
Allow the 802.11 management-frame protocol to be disabled.

Don't bother doing the WEP processing and child-tvbuff construction for
frames other than management and data frames, as they have no payload to
be WEP-encrypted or dissected.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3600 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoDissect the payload of a management frame as a separate protocol, so
guy [Fri, 22 Jun 2001 07:46:25 +0000 (07:46 +0000)]
Dissect the payload of a management frame as a separate protocol, so
that you can open up that protocol without opening up the 802.11 MAC
header; this can save some screen real estate.

Make the tree item for all the WEP parameters a text item, rather than a
"string" field with a null string pointer, as "strings" with null string
pointers give the filtering code gastric distress.

Dissect the WEP initialization vector as an FT_UINT24 (as it's a 3-byte
field), and dissect the key ID as part of an FT_UINT8 (as it's in an
8-bit byte).

After dissecting the frame control field, dissect the rest of the header
in one switch statement, and then:

handle WEP-encrypted frames with common code for all frame

handle the payload of other frames.

(If we can supply the relevant keys to Ethereal, we could perhaps add
code to decrypt the WEP payload and then dissect the decrypted payload
the same way we dissect un-encrypted payloads.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3599 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFix up some incorrect handling of the TO_DS and FROM_DS flags by
guy [Fri, 22 Jun 2001 06:03:50 +0000 (06:03 +0000)]
Fix up some incorrect handling of the TO_DS and FROM_DS flags by
#defining all the bits in the flags field, and using those #defines in
the macros to test the flag fields, the macros fot the data address
types, the value_string table for the data frame to/from DS
combinations, and the bitfields for the flag bits.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3598 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFix a typo.
guy [Thu, 21 Jun 2001 22:35:33 +0000 (22:35 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3597 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoM2PA support, from Jeff Morriss.
guy [Thu, 21 Jun 2001 22:25:53 +0000 (22:25 +0000)]
M2PA support, from Jeff Morriss.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3596 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agosome more dissectors of Uwe Girlich added
girlich [Thu, 21 Jun 2001 15:18:11 +0000 (15:18 +0000)]
some more dissectors of Uwe Girlich added

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3595 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agonew source files packet-quakeworld.c and packet-quake2.c added
girlich [Thu, 21 Jun 2001 15:16:43 +0000 (15:16 +0000)]
new source files packet-quakeworld.c and packet-quake2.c added

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3594 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoinitial checkin of the Quake II network protocol dissector
girlich [Thu, 21 Jun 2001 15:15:57 +0000 (15:15 +0000)]
initial checkin of the Quake II network protocol dissector

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3593 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoinitial checkin of the QuakeWorld network protocol dissector
girlich [Thu, 21 Jun 2001 15:15:02 +0000 (15:15 +0000)]
initial checkin of the QuakeWorld network protocol dissector

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3592 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agosigned/unsigned warning corrected
girlich [Thu, 21 Jun 2001 15:13:42 +0000 (15:13 +0000)]
signed/unsigned warning corrected
the server port is now configurable via preferences
code reformatting

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3591 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoGet rid of an unused #define.
guy [Thu, 21 Jun 2001 06:59:47 +0000 (06:59 +0000)]
Get rid of an unused #define.

Make routines not used outside this module static.

Make "find_header_length()" return the correct value for management and
control frames.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3590 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoDon't use "tvb_get_ptr()" and "pletohs()" just to fetch a 16-bit
guy [Thu, 21 Jun 2001 06:36:44 +0000 (06:36 +0000)]
Don't use "tvb_get_ptr()" and "pletohs()" just to fetch a 16-bit
integral value from a packet - "tvb_get_letohs()" can do that just fine.

Don't use "tvb_get_ptr()", casting the result to a "guint16 *", and
dereferencing that pointer, either: that doesn't handle byte order
correctly, and it may fail if the pointer isn't aligned on a 2-byte

For that matter, don't just use "tvb_get_ptr()" and dereference the
result to get an 8-bit quantity.

Use "proto_tree_add_item()" in many places where it's possible.

Reuse the results of "tvb_get_ptr()" calls when possible.

Show the fragment number and sequence number in decimal - they're just

Fix the blurb for the sequence number field.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3589 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoMake sure the top-level 802.11 item covers the entire frame.
guy [Wed, 20 Jun 2001 23:58:57 +0000 (23:58 +0000)]
Make sure the top-level 802.11 item covers the entire frame.

Give the type field values names, rather than just showing them as 0, 1,
and 2.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3588 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoMake the type/subtype field the very first entry in the protocol tree,
guy [Wed, 20 Jun 2001 23:29:16 +0000 (23:29 +0000)]
Make the type/subtype field the very first entry in the protocol tree,
and put it under the top-level 802.11 protocol item, so you don't have
to open the frame control field to see it.

Rename the variable for it, and the value_string array for it, to
indicate that it's made out of the type and subtype fields.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3587 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoAll four data frame types are now handled with identical code, so,
guy [Wed, 20 Jun 2001 23:12:05 +0000 (23:12 +0000)]
All four data frame types are now handled with identical code, so,
instead of having four identical copies of that code in switch
statements, just handle all four of them with the same case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3586 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoPut the combined type/subtype into the protocol tree, so you can look
guy [Wed, 20 Jun 2001 23:04:36 +0000 (23:04 +0000)]
Put the combined type/subtype into the protocol tree, so you can look
for all Association Request frames, or all frames except for
Clear-to-send frames, or....

Compute the composed frame type early in the dissection process, and set
the Info column as soon as you've done that, rather than doing it in the
later switch statement.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3585 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoIf it's not a protocol, it doesn't belong at the top level of the
guy [Wed, 20 Jun 2001 22:26:07 +0000 (22:26 +0000)]
If it's not a protocol, it doesn't belong at the top level of the
protocol tree; not only is putting it at the top level a little weird,
it upsets the heck out of the protocol-statistics code, causing it to
abort.  Put the fixed and tagged parameters under the top-level entry
for 802.11 (where one of the fixed-parameters entries already was).

Call the top-level item just "IEEE 802.11", not "IEEE 802.11 Header", as
it includes management-frame information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3584 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoClean up a string.
guy [Wed, 20 Jun 2001 06:22:33 +0000 (06:22 +0000)]
Clean up a string.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3583 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFix "COOK_ADDR_SELECTOR()" to extract the 2 bits that determine the
guy [Wed, 20 Jun 2001 06:15:07 +0000 (06:15 +0000)]
Fix "COOK_ADDR_SELECTOR()" to extract the 2 bits that determine the
interpretation of the address fields, in DATA_ADDR_T{1,2,3,4} format.

Clean up a bunch of other macros to enclose their argument in

Clean up "find_header_length()" - it only needs to take the frame
control field of the frame as an argument, and should just check whether

"tofrom_ds" is a value_string table, not a true_false_string table, so
wrap it in "VALS()", not "TFS()".

Don't fetch the header length in N different places in the main
dissector - just fetch it once and use it throughout.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3582 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoCatch TLVs with bogus lengths (i.e., less than the fixed-length header
guy [Wed, 20 Jun 2001 05:18:36 +0000 (05:18 +0000)]
Catch TLVs with bogus lengths (i.e., less than the fixed-length header
size); otherwise, we run the risk of looping forever.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3581 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoRTSP fixes, from nuf si.
guy [Wed, 20 Jun 2001 04:45:52 +0000 (04:45 +0000)]
RTSP fixes, from nuf si.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3580 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoHandle Negotiate Protocol replies with the "extended security"
guy [Wed, 20 Jun 2001 01:58:48 +0000 (01:58 +0000)]
Handle Negotiate Protocol replies with the "extended security"
capability flag set.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3579 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoMore signed vs. unsigned cleanups, and initialization cleanups, from
guy [Tue, 19 Jun 2001 23:08:57 +0000 (23:08 +0000)]
More signed vs.  unsigned cleanups, and initialization cleanups, from
Joerg Mayer.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3578 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoUpdates from Frank Singleton.
guy [Tue, 19 Jun 2001 20:10:51 +0000 (20:10 +0000)]
Updates from Frank Singleton.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3577 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFrom Frank Singleton: fix compiler warnings.
guy [Tue, 19 Jun 2001 18:50:33 +0000 (18:50 +0000)]
From Frank Singleton: fix compiler warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3576 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoIn a capture child process, *completely ignore* the preference setting
guy [Tue, 19 Jun 2001 08:47:48 +0000 (08:47 +0000)]
In a capture child process, *completely ignore* the preference setting
for promiscuous mode; just do what the parent process told you, i.e. do
a non-promiscuous capture iff a "-p" flag was specified.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3575 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoLabels must be followed by statements; GCC may let you get away without
guy [Tue, 19 Jun 2001 08:33:00 +0000 (08:33 +0000)]
Labels must be followed by statements; GCC may let you get away without
the statement, but MSVC++ doesn't.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3574 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoNot all Python scripts generate dissectors; "make-reg-dotc.py" generates
guy [Tue, 19 Jun 2001 08:29:32 +0000 (08:29 +0000)]
Not all Python scripts generate dissectors; "make-reg-dotc.py" generates
"register.c", and, as such, shouldn't stuff ", HFILL" into its output.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3573 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoGet rid of global references to "pi" - use "pinfo" instead.
guy [Tue, 19 Jun 2001 04:46:10 +0000 (04:46 +0000)]
Get rid of global references to "pi" - use "pinfo" instead.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3572 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoMany corrections and updates for connection-oriented WSP, from Alexandre
guy [Mon, 18 Jun 2001 22:27:30 +0000 (22:27 +0000)]
Many corrections and updates for connection-oriented WSP, from Alexandre
P. Ferreira.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3571 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFrom Frank Singleton: add code generation support for IDL array types.
guy [Mon, 18 Jun 2001 19:31:50 +0000 (19:31 +0000)]
From Frank Singleton: add code generation support for IDL array types.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3570 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoNFS file handle analysing works now for kernel based NFS v3 servers of
girlich [Mon, 18 Jun 2001 16:38:22 +0000 (16:38 +0000)]
NFS file handle analysing works now for kernel based NFS v3 servers of
Linux 2.4.0 too.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3569 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoDon't list the attribute-value pairs if the length field of the packet
guy [Mon, 18 Jun 2001 09:31:15 +0000 (09:31 +0000)]
Don't list the attribute-value pairs if the length field of the packet
says there aren't any (i.e., if the length field minus the size of the
stuff before the AVP's is less than or equal to 0).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3568 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFrom Craig Rodrigues: changes to handle current versions of RPM, which
guy [Mon, 18 Jun 2001 07:21:30 +0000 (07:21 +0000)]
From Craig Rodrigues: changes to handle current versions of RPM, which
compress man pages.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3567 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFix up the buffer size calculation - the starting offset isn't a
guy [Mon, 18 Jun 2001 06:31:05 +0000 (06:31 +0000)]
Fix up the buffer size calculation - the starting offset isn't a
multiple of 4, so making the size of the buffer a multiple of 4 isn't
the right thing to do.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3566 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoGet rid of an unnecessary declaration of "packet_list".
guy [Mon, 18 Jun 2001 06:18:03 +0000 (06:18 +0000)]
Get rid of an unnecessary declaration of "packet_list".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3565 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoThe ICQ decryption code works on 4 bytes at a time, so the amount of
guy [Mon, 18 Jun 2001 05:54:26 +0000 (05:54 +0000)]
The ICQ decryption code works on 4 bytes at a time, so the amount of
data it decrypts must be a multiple of 4; round the size of the ICQ data
to a multiple of 4, and use that as the size of the buffer into which to
put the decrypted data and as the byte count passed to the decryption

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3564 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoSupport for protocols running atop GIOP, from Frank Singleton.
guy [Mon, 18 Jun 2001 05:27:18 +0000 (05:27 +0000)]
Support for protocols running atop GIOP, from Frank Singleton.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3563 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoCrank up the warning level in GCC, from Joerg Mayer.
guy [Mon, 18 Jun 2001 02:26:00 +0000 (02:26 +0000)]
Crank up the warning level in GCC, from Joerg Mayer.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3562 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoFrom Joerg Mayer: explicitly fill in all members of a
guy [Mon, 18 Jun 2001 02:18:27 +0000 (02:18 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3561 f5534014-38df-0310-8fa8-9805f1628bb7

18 years agoVarious signed vs. unsigned fixes, from Joerg Mayer.
guy [Mon, 18 Jun 2001 01:49:17 +0000 (01:49 +0000)]
Various signed vs. unsigned fixes, from Joerg Mayer.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3560 f5534014-38df-0310-8fa8-9805f1628bb7