19 years agoX.25 over TCP support, from Paul Ionescu.
guy [Sun, 17 Dec 2000 07:38:14 +0000 (07:38 +0000)]
X.25 over TCP support, from Paul Ionescu.

Also, update his e-mail address.

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

19 years agoPatches to prevent problems under Windows when time formats are negative.
sharpe [Sun, 17 Dec 2000 03:48:44 +0000 (03:48 +0000)]
Patches to prevent problems under Windows when time formats are negative.

Make sure that if _gtime is null, a bad format message returned.

Also noticed that I am going to have to do something about Unicode strings soon and the SMBopenX dissect is slightly wrong ... Oh well, it is the Xmas break soon :-) No rest for the Wicca'd (please don't interpret that as a statement of my religious affiliation, it is just a cute saying :-)

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

19 years agoMatch Selected works better with FT_STRING variables.
gram [Fri, 15 Dec 2000 13:53:11 +0000 (13:53 +0000)]
Match Selected works better with FT_STRING variables.
From Ed Warnicke <hagbard@physics.rutgers.edu>

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

19 years agoAdd the relative time to the frame tree, at the request of Manfred Young.
gerald [Fri, 15 Dec 2000 03:30:21 +0000 (03:30 +0000)]
Add the relative time to the frame tree, at the request of Manfred Young.

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

19 years agoCheck the checksum on GRE packets, if possible and if the Checksum
guy [Fri, 15 Dec 2000 00:03:09 +0000 (00:03 +0000)]
Check the checksum on GRE packets, if possible and if the Checksum
Present flag is set.

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

19 years agoCheck the checksum on OSPF packets, if possible.
guy [Thu, 14 Dec 2000 22:23:15 +0000 (22:23 +0000)]
Check the checksum on OSPF packets, if possible.

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

19 years agoCheck the checksum on ICMPv6 packets, if possible.
guy [Thu, 14 Dec 2000 21:45:12 +0000 (21:45 +0000)]
Check the checksum on ICMPv6 packets, if possible.

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

19 years agoFix a typo in a comment.
guy [Thu, 14 Dec 2000 21:44:01 +0000 (21:44 +0000)]
Fix a typo in a comment.

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

19 years agoSet the "fragmented" field of the "packet_info" structure based on
guy [Thu, 14 Dec 2000 18:56:22 +0000 (18:56 +0000)]
Set the "fragmented" field of the "packet_info" structure based on
whether the packet has any fragmentation headers or not.

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

19 years agoInclude winsock.h on windows so that htons will be defined.
gram [Thu, 14 Dec 2000 17:51:51 +0000 (17:51 +0000)]
Include winsock.h on windows so that htons will be defined.

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

19 years agoMobile IPv6 support, from Martti Kuparinen.
guy [Thu, 14 Dec 2000 08:35:08 +0000 (08:35 +0000)]
Mobile IPv6 support, from Martti Kuparinen.

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

19 years agoPPP patches from Burke Lau to:
guy [Thu, 14 Dec 2000 08:20:31 +0000 (08:20 +0000)]
PPP patches from Burke Lau to:

add FCS checking;

support Cisco HDLC format in the PPP dissector;

handle MPLS-over-PPP.

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

19 years agoAdded support for Router-Alert IP option (RFC2113)
ashokn [Wed, 13 Dec 2000 16:38:20 +0000 (16:38 +0000)]
Added support for Router-Alert IP option (RFC2113)

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

19 years agoDon't check the checksum of ICMP datagrams that are fragmented
guy [Wed, 13 Dec 2000 02:43:32 +0000 (02:43 +0000)]
Don't check the checksum of ICMP datagrams that are fragmented
(unlikely, perhaps even forbidden, but not impossible).

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

19 years agoAdd code to check the checksums of TCP segments and UDP datagrams;
guy [Wed, 13 Dec 2000 02:24:23 +0000 (02:24 +0000)]
Add code to check the checksums of TCP segments and UDP datagrams;
replace the existing checksummer with a modified version of the BSD
checksumming code.  Add a flag to the "packet_info" structure to
indicate that a packet is the first fragment of a fragmented datagram,
so that the checksummers won't try to checksum those.

(It doesn't seem to add a lot of CPU overhead, so we don't introduce a
flag to disable it, yet.  Further checks may be necessary to see whether
the overhead is just swamped by other overheads when scanning through a
capture dissecting all frames, or if it truly is negligible.)

Make the Boolean preference option controlling whether to make the
top-level protocol tree item for TCP display a packet summary static to
the TCP dissector (it doesn't need to be accessible outside the TCP

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

19 years agoprint message ID in isakmp header
itojun [Tue, 12 Dec 2000 09:57:05 +0000 (09:57 +0000)]
print message ID in isakmp header

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

19 years agoremove incorrect bound check. the check can fail on legal packet, at the
itojun [Tue, 12 Dec 2000 08:25:37 +0000 (08:25 +0000)]
remove incorrect bound check.  the check can fail on legal packet, at the
very end of the packet.  may need to revisit.

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

19 years agoFix for pppdump buffer-overflow check.
gram [Sat, 9 Dec 2000 03:02:43 +0000 (03:02 +0000)]
Fix for pppdump buffer-overflow check.
From Daniel Thompson <daniel.thompson@st.com>

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

19 years agoWhen printing an address mask in hex, zero-pad it, don't blank-pad it.
guy [Fri, 8 Dec 2000 22:53:08 +0000 (22:53 +0000)]
When printing an address mask in hex, zero-pad it, don't blank-pad it.

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

19 years agoBreak out the bits in the NBIPX "connection control" field.
guy [Wed, 6 Dec 2000 04:19:44 +0000 (04:19 +0000)]
Break out the bits in the NBIPX "connection control" field.

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

19 years agoFix egregious error with AF_ types. I relied on a Linux header file rather
sharpe [Mon, 4 Dec 2000 13:40:11 +0000 (13:40 +0000)]
Fix egregious error with AF_ types. I relied on a Linux header file rather
than checking RFC1700.

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

19 years agoAdd a "col_clear()" routine, to clear a column; it appears (and it
guy [Mon, 4 Dec 2000 06:37:46 +0000 (06:37 +0000)]
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).

Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.

Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.

Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.

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

19 years agoDon't loop infinitely if we see a Host Address or unknown Forwarding
guy [Mon, 4 Dec 2000 06:05:49 +0000 (06:05 +0000)]
Don't loop infinitely if we see a Host Address or unknown Forwarding
Equivalence Class.

Set "pinfo->current_proto", so that if we run past the end of the data
the problem is noted as being with LDP.

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

19 years agoUpdate a comment.
guy [Sun, 3 Dec 2000 22:53:09 +0000 (22:53 +0000)]
Update a comment.

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

19 years agoDeclare "proto_malformed" in "packet-frame.h", as "packet-frame.c"
guy [Sun, 3 Dec 2000 22:32:10 +0000 (22:32 +0000)]
Declare "proto_malformed" in "packet-frame.h", as "packet-frame.c"
exports it.

Make the pointer that points to the GMemChunk for per-frame data static
to "epan/packet.c", as it's not used outside "epan/packet.c".

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

19 years agoNothing in "packet.c" uses the global "cfile", so there's no need to
guy [Sun, 3 Dec 2000 22:26:26 +0000 (22:26 +0000)]
Nothing in "packet.c" uses the global "cfile", so there's no need to
declare it there.

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

19 years agoPull the code to set the fields in the "cfile.cinfo" structure into a
guy [Sun, 3 Dec 2000 22:12:21 +0000 (22:12 +0000)]
Pull the code to set the fields in the "cfile.cinfo" structure into a
common routine to initialize a "column_info()" structure, shared by
Ethereal and Tethereal.

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

19 years agoPut the "-s" flag into the usage message for editcap.
guy [Sun, 3 Dec 2000 21:11:05 +0000 (21:11 +0000)]
Put the "-s" flag into the usage message for editcap.

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

19 years ago"dissect_ppp()" isn't called directly from outside of "packet-ppp.c", so
guy [Sun, 3 Dec 2000 09:59:49 +0000 (09:59 +0000)]
"dissect_ppp()" isn't called directly from outside of "packet-ppp.c", so
make it static.

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

19 years agoAdd the standard "CHECK_DISPLAY_AS_DATA()" call.
guy [Sun, 3 Dec 2000 09:47:18 +0000 (09:47 +0000)]
Add the standard "CHECK_DISPLAY_AS_DATA()" call.

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

19 years agoRegister "dissect_nbipx()", and have the IPX dissector look up its
guy [Sun, 3 Dec 2000 09:18:20 +0000 (09:18 +0000)]
Register "dissect_nbipx()", and have the IPX dissector look up its
handle and call it through the handle.  Make it static; this renders
"packet-nbipx.h" unnecessary.

Get rid of the "tvb_compat()" call in the IPX dissector - it calls all
dissectors through handles or lookup tables, and thus any
backwards-compatibility stuff is done by the code in libethereal.

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

19 years agoStealing time again to compulsively code this beast.
sharpe [Sun, 3 Dec 2000 02:37:56 +0000 (02:37 +0000)]
Stealing time again to compulsively code this beast.

Still more TLVs to code ...

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

19 years agoDissect Common Hello Params TLV ...
sharpe [Sat, 2 Dec 2000 14:23:04 +0000 (14:23 +0000)]
Dissect Common Hello Params TLV ...

Still more work to do though ...

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

19 years agoAdd the relevant "CHECK_DISPLAY_AS_DATA()" call.
guy [Sat, 2 Dec 2000 09:09:25 +0000 (09:09 +0000)]
Add the relevant "CHECK_DISPLAY_AS_DATA()" call.

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

19 years agoThe second argument to "proto_register_protocol()" is a name to be used
guy [Sat, 2 Dec 2000 08:56:40 +0000 (08:56 +0000)]
The second argument to "proto_register_protocol()" is a name to be used
in filters, and should be all-lower-case.

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

19 years agoSome tvbuffified dissectors weren't setting "pinfo->current_proto", so
guy [Sat, 2 Dec 2000 08:41:08 +0000 (08:41 +0000)]
Some tvbuffified dissectors weren't setting "pinfo->current_proto", so
that if they threw an exception, the wrong protocol would be blamed.
Add the missing assignments.

Clean up the extraction of the null-encapsulation header.

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

19 years agoClean up the handling of MIME headers.
guy [Sat, 2 Dec 2000 06:05:29 +0000 (06:05 +0000)]
Clean up the handling of MIME headers.

Handle the Content-Length: MIME header, so that, if there's a
Content-Length: header, we only process as RTSP payload the amount of
data specified by that header.

Handle frames with more than one RTSP message in them (the previous
change allows us to do so).

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

19 years agoComment out some unused variables.
gram [Fri, 1 Dec 2000 15:12:25 +0000 (15:12 +0000)]
Comment out some unused variables.

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

19 years agoFix one small type WRT Forwarding Equivalence Classes and handle the
sharpe [Fri, 1 Dec 2000 09:40:12 +0000 (09:40 +0000)]
Fix one small type WRT Forwarding Equivalence Classes and handle the
illegal padding by trying to skip it.

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

19 years agoA much more complete LDP dissector.
sharpe [Fri, 1 Dec 2000 09:05:46 +0000 (09:05 +0000)]
A much more complete LDP dissector.

Still more work to do though, as I want to dissect the various message
types correctly, and to dissect TLVs much more as well.

The dissector currently handles multiple messages in a PDU, as the trace
file I have has some of those.

I think that the equipment that generated the LDP trace I have has a bug.

It seems to think that TLVs must be alligned on 4-byte boundaries, while the
spec (draft) says that there are no alignment requirements :-)

Don't know what generated the trace :-)

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

19 years agoNFS V4 support, from Mike Frisch.
guy [Fri, 1 Dec 2000 00:38:20 +0000 (00:38 +0000)]
NFS V4 support, from Mike Frisch.

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

19 years agoStep-wise improvement on this thing ... next to dissect each message type
sharpe [Thu, 30 Nov 2000 20:27:40 +0000 (20:27 +0000)]
Step-wise improvement on this thing ... next to dissect each message type
more fully.

Apparently, LDP allows multiple messages per PDU. Has anyone seen such an

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

19 years agoSmall code optimization to make it possible to compile on ReliantUNIX.
girlich [Thu, 30 Nov 2000 14:09:14 +0000 (14:09 +0000)]
Small code optimization to make it possible to compile on ReliantUNIX.

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

19 years agoFix up the handling of type/length fields in ATMARP.
guy [Thu, 30 Nov 2000 10:42:50 +0000 (10:42 +0000)]
Fix up the handling of type/length fields in ATMARP.

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

19 years agoGVRP dissector, from Kevin Shi.
guy [Thu, 30 Nov 2000 09:31:52 +0000 (09:31 +0000)]
GVRP dissector, from Kevin Shi.

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

19 years agoMore work in progress on the Label Distribution Protocol dissector ...
sharpe [Thu, 30 Nov 2000 06:24:53 +0000 (06:24 +0000)]
More work in progress on the Label Distribution Protocol dissector ...

Bit more work to do, and a list of TLV values, and I am away :-)

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

19 years agoIn "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit
guy [Thu, 30 Nov 2000 06:11:32 +0000 (06:11 +0000)]
In "tvb_find_guint8()" and "tvb_pbrk_guint8()", correctly set the limit
of the search if the caller-supplied limit goes past the end of the
tvbuff - the limit should just be what remains in the tvbuff after the
specified starting offset.

In "tvb_find_line_end_unquoted()", after searching for the next
interesting character, check the value we got back from that search, in
"char_offset", not whatever happens to be in "cur_offset", to see if we
found a character.

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

19 years agoIn tvb_set_reported_length(), don't assert on
gram [Thu, 30 Nov 2000 03:24:16 +0000 (03:24 +0000)]
In tvb_set_reported_length(), don't assert on
reported_length <= tvb->reported_length, but throw a ReportedBoundsError
if that condition is not met.

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

19 years agoRename "proto_reg_handoff_iee380211()"[sic] to
guy [Thu, 30 Nov 2000 03:19:27 +0000 (03:19 +0000)]
Rename "proto_reg_handoff_iee380211()"[sic] to
"proto_reg_handoff_wlan()", to match "proto_register_wlan()".

Call it "IEEE 802.11 wireless LAN", not "Wireless ethernet" - that makes
it clearer what type of wireless LAN it is (which *isn't* Ethernet at
the MAC layer, although I suspect many of the drivers make it look like
Ethernet to the rest of the system).

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

19 years agoClean up the handling of the RTSP payload a bit.
guy [Thu, 30 Nov 2000 02:06:30 +0000 (02:06 +0000)]
Clean up the handling of the RTSP payload a bit.

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

19 years agoAdd LDP dissector to NMake makefile.
gram [Wed, 29 Nov 2000 13:20:06 +0000 (13:20 +0000)]
Add LDP dissector to NMake makefile.

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

19 years agoInitial coding of the dissector for the Label Distribution Protocol.
sharpe [Wed, 29 Nov 2000 13:15:01 +0000 (13:15 +0000)]
Initial coding of the dissector for the Label Distribution Protocol.

It registers the same dissector for the LDP port for both TCP and UDP.

Still a lot of work to do, but we can see the header now.

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

19 years agoUse GLib's G_MODULE_EXPORT when defining constants and functions
guy [Wed, 29 Nov 2000 09:49:30 +0000 (09:49 +0000)]
Use GLib's G_MODULE_EXPORT when defining constants and functions
exported by a plugin, rather than defining our own DLLEXPORT.

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

19 years agoGet the suffix for dynamically-loaded modules by means of a hack
guy [Wed, 29 Nov 2000 09:10:03 +0000 (09:10 +0000)]
Get the suffix for dynamically-loaded modules by means of a hack
involving "g_module_build_path()", rather than by checking the platform
- this should let us handle non-Windows platforms that don't use ".so"
(e.g., HP-UX).

Use G_DIR_SEPARATOR_S as the pathname separator character when
generating the pathname of the module.

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

19 years agoCatch Sniffer packets where the record length for a record containing a
guy [Wed, 29 Nov 2000 08:24:14 +0000 (08:24 +0000)]
Catch Sniffer packets where the record length for a record containing a
packet is too small to contain all the data that the frame header claims
was captured for the packet; treat that as a bad record, and return an

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

19 years agoTvbuffify the GRE and WCCP dissectors.
guy [Wed, 29 Nov 2000 07:42:35 +0000 (07:42 +0000)]
Tvbuffify the GRE and WCCP dissectors.

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

19 years agoWCCP 2.0 support.
guy [Wed, 29 Nov 2000 06:17:34 +0000 (06:17 +0000)]
WCCP 2.0 support.

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

19 years agoWrap the dissect_fddi() call (with a 4th argument) with
gram [Wed, 29 Nov 2000 05:16:15 +0000 (05:16 +0000)]
Wrap the dissect_fddi() call (with a 4th argument) with
dissect_fddi_not_bitswapped() and dissect_fddi_bitswapped(), both of which
use the standard 3-argument tvbuffified-dissector argument list.

Add a dissector table called "wtap_encap" which is used to call dissectors
from dissect_frame(). The switch() statement from this top-level dissector
is removed.

The link-layer dissectors register themselves with the "wtap_encap"
dissector table. The dissectors are now static where possible.

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

19 years agoTranslate the A-F characters of all OUIs to uppercase before inserting
gram [Wed, 29 Nov 2000 04:11:48 +0000 (04:11 +0000)]
Translate the A-F characters of all OUIs to uppercase before inserting
them into the hash. Without using the same case on all OUIs, some collisions
were not detected (00:00:F6 vs 00:00:f6)

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

19 years agoMove Win32 version to
gram [Tue, 28 Nov 2000 15:54:20 +0000 (15:54 +0000)]
Move Win32 version to

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

19 years agoUpdates from Ralf Holzer.
guy [Tue, 28 Nov 2000 06:38:47 +0000 (06:38 +0000)]
Updates from Ralf Holzer.

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

19 years agoThe SMI Network Management Private Enterprise Code for Ascend is 529,
guy [Tue, 28 Nov 2000 06:29:17 +0000 (06:29 +0000)]
The SMI Network Management Private Enterprise Code for Ascend is 529,
not 123 (123 is Newbridge Networks); update the list of RADIUS vendor
IDs, and put in a comment before that list indicating that RADIUS vendor
IDs are just SMI Network Management Private Enterprise Codes and giving
the URL of the IANA list of enterprise codes.

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

19 years agoThe length of FT_BOOLEAN bitfields must be specified in bits, not bytes.
oabad [Mon, 27 Nov 2000 06:23:42 +0000 (06:23 +0000)]
The length of FT_BOOLEAN bitfields must be specified in bits, not bytes.

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

19 years agoCredit Michael Patton and the IEEE in the document header. Add URLs to the
gerald [Sun, 26 Nov 2000 19:35:31 +0000 (19:35 +0000)]
Credit Michael Patton and the IEEE in the document header.  Add URLs to the
IEEE data (Michael's was already there).

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

19 years agoAdd make-manuf, a script that:
gerald [Thu, 23 Nov 2000 18:22:00 +0000 (18:22 +0000)]
Add make-manuf, a script that:

  - Reads our current 'manuf' file header and contents

  - Fetches OUI information from the IEEE and CaveBear

  - Merges the OUI information, with our entries taking precedence, then
    CaveBear's, then the IEEE.

  - Dumps eveything into the 'manuf' file.

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

19 years agoApply Jeroen Ruigrok van der Werven's patches ...
sharpe [Wed, 22 Nov 2000 21:19:38 +0000 (21:19 +0000)]
Apply Jeroen Ruigrok van der Werven's patches ...

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

19 years agoGenerated Bison and Flex files test whether __STDC__ is defined
guy [Wed, 22 Nov 2000 07:20:27 +0000 (07:20 +0000)]
Generated Bison and Flex files test whether __STDC__ is defined
in order to check whether to use ANSI C features such as "const".

GCC defines it as 1 even if extensions that render the implementation
non-conformant are enabled; Sun's C compiler (and, I think, other
AT&T-derived C compilers) define it as 0 if extensions that render
the implementation non-conformant are enabled; Microsoft Visual C++
6.0 doesn't define it at all if extensions that render the implementation
non-conformant are enabled.

We define it as 0 in "config.h.win32", so that those generated files will use
those features (and thus not get type warnings when compiled with

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

19 years agoExport plugin_reg_handoff via DLLEXPORT.
gram [Wed, 22 Nov 2000 06:22:35 +0000 (06:22 +0000)]
Export plugin_reg_handoff via DLLEXPORT.

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

19 years agoChange Ethereal homepage URL from etheral.zing.org to www.ethereal.com.
gram [Wed, 22 Nov 2000 04:07:04 +0000 (04:07 +0000)]
Change Ethereal homepage URL from etheral.zing.org to ethereal.com.

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

19 years agoEnable the building of any combination of ethereal, tethereal, and editcap.
gram [Wed, 22 Nov 2000 04:03:22 +0000 (04:03 +0000)]
Enable the building of any combination of ethereal, tethereal, and editcap.
If GTK+ is not detected, then ethereal is not built.

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

19 years agoIn the tvbuffified "dissect_rpc()", use the "pinfo" argument rather than
guy [Wed, 22 Nov 2000 01:39:10 +0000 (01:39 +0000)]
In the tvbuffified "dissect_rpc()", use the "pinfo" argument rather than
the global "pi".  Also set "pinfo->current_proto" to "RPC", so that we
get the right message if a tvb accessor throws an exception.

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

19 years agoGet rid of declarations of no-longer-extant "init_dissect_rpc()" and
guy [Wed, 22 Nov 2000 00:34:15 +0000 (00:34 +0000)]
Get rid of declarations of no-longer-extant "init_dissect_rpc()" and

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

19 years agoAdd a "color.h" file that declares a nominally-toolkit-independent
guy [Tue, 21 Nov 2000 23:54:10 +0000 (23:54 +0000)]
Add a "color.h" file that declares a nominally-toolkit-independent
"color_t" structure to store color values (although currently it has all
the same fields that a GdkColor has; its currently advantage is that you
don't have to include any GTK/GDK stuff to declare it).

Add routines in the "gtk" directory to convert between "color_t" and
GdkColor values.

Define, in "prefs.h", all colors as "color_t" values rather than
GdkColor values.  "prefs.h" now no longer needs to include <gtk/gtk.h>,
so don't include it.

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

19 years agoTethereal includes no GUI stuff, so it doesn't need to include
guy [Tue, 21 Nov 2000 23:50:56 +0000 (23:50 +0000)]
Tethereal includes no GUI stuff, so it doesn't need to include

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

19 years agoInitialize "http_type" to HTTP_OTHERS before calling
guy [Tue, 21 Nov 2000 22:40:40 +0000 (22:40 +0000)]
Initialize "http_type" to HTTP_OTHERS before calling
"is_http_request_or_reply()", so that if "is_http_request_or_reply()"
decides the line is part of a request or a response it'll set "*type"
(which it does only if "*type" is HTTP_OTHERS).

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

19 years agoSome compilers, e.g. Microsoft Visual C++, don't define __STDC__ unless
guy [Tue, 21 Nov 2000 21:24:52 +0000 (21:24 +0000)]
Some compilers, e.g. Microsoft Visual C++, don't define __STDC__ unless
extensions to ANSI C are disabled if they may cause strictly conforming
programs not to compile, or to work differently if those extensions are
enabled.  (Other compilers #define it as 0, e.g.  Sun's and, I think,
other AT&T-derived compilers; still others cheerfully define it as 1
even when those extensions are enabled, e.g. GCC.)

As such, checking whether __STDC__ is defined, or is defined as a
non-zero value, isn't the right way to check whether function prototypes
are supported; MSVC++ 6.0 supports them, but, by default, leaves
extensions of the sort described above enabled, and thus doesn't define
__STDC__.  This means that the compiler warns about arguments to
"snprintf()" when compiling it, as the declaration is an old-style

As Ethereal uses function prototypes, there's not much point in making
it possible for its private "snprintf()" to be compiled or used when
function prototypes aren't supported; just get rid of the tests for
__STDC__, so that it's compiled with function prototypes regardless of
whether __STDC__ is defined or not.

While we're at it, have "snprintf()" give it a "__attribute__((format
(printf, 3, 4))))" when compiled by GCC 2.x or later, so that
format/argument checks can be done even on platforms lacking

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

19 years agoFix infinite loop in reallocation of memory for decryption buffer.
gram [Tue, 21 Nov 2000 16:17:58 +0000 (16:17 +0000)]
Fix infinite loop in reallocation of memory for decryption buffer.

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

19 years agoStart of a tvbuff_t version of the dissect_rpc() function.
girlich [Tue, 21 Nov 2000 14:58:07 +0000 (14:58 +0000)]
Start of a tvbuff_t version of the dissect_rpc() function.
All ONC/RPC dissectors remain old dissectors for now but this will
change too.

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

19 years agoSenseless old prototype for rpc init removed.
girlich [Tue, 21 Nov 2000 14:15:21 +0000 (14:15 +0000)]
Senseless old prototype for rpc init removed.

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

19 years agoUpdates from Ed Warnicke.
guy [Tue, 21 Nov 2000 05:38:51 +0000 (05:38 +0000)]
Updates from Ed Warnicke.

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

19 years agoTvbuffication, and introduction of a number of named fields, from Heikki
guy [Tue, 21 Nov 2000 05:36:36 +0000 (05:36 +0000)]
Tvbuffication, and introduction of a number of named fields, from Heikki

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

19 years agoMove to version 0.8.14
gram [Mon, 20 Nov 2000 17:10:26 +0000 (17:10 +0000)]
Move to version 0.8.14

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

19 years agoChanges in 0.8.14
gram [Mon, 20 Nov 2000 17:08:50 +0000 (17:08 +0000)]
Changes in 0.8.14

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

19 years agoInitialize winsock as we do in Ethereal.
gram [Mon, 20 Nov 2000 17:08:20 +0000 (17:08 +0000)]
Initialize winsock as we do in Ethereal.

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

19 years agoMove tvbtest.c to EXTRA_DIST
gram [Mon, 20 Nov 2000 16:18:08 +0000 (16:18 +0000)]
Move tvbtest.c to EXTRA_DIST

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

19 years agonext_pd and next_offset are used only if HAVE_PLUGINS is #defined.
gram [Mon, 20 Nov 2000 16:17:43 +0000 (16:17 +0000)]
next_pd and next_offset are used only if HAVE_PLUGINS is #defined.
Therefore, declare these 2 variables only if HAVE_PLUGINS is #defined.

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

19 years agoIn dissect_ntp(), add an ellipsis (...) to the end of a reference clock ID
gerald [Sun, 19 Nov 2000 21:18:10 +0000 (21:18 +0000)]
In dissect_ntp(), add an ellipsis (...) to the end of a reference clock ID
if its name gets truncated.

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

19 years agoFixes, from Heikki Vatiainen, to bugs introduced by the tvbuffification
guy [Sun, 19 Nov 2000 21:01:06 +0000 (21:01 +0000)]
Fixes, from Heikki Vatiainen, to bugs introduced by the tvbuffification
of the SAP and SDP dissectors.

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

19 years agoAdd an overflow check to process_data().
gerald [Sun, 19 Nov 2000 20:56:17 +0000 (20:56 +0000)]
Add an overflow check to process_data().

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

19 years agoUpdates from Heikki Vatiainen to tvbuffify the Auto-RP dissector and
guy [Sun, 19 Nov 2000 20:01:22 +0000 (20:01 +0000)]
Updates from Heikki Vatiainen to tvbuffify the Auto-RP dissector and
improve the named fields.

Add Auto-RP to the list, in the AUTHORS file, of stuff he's done.

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

19 years agoCheck to make sure the h_addr entry returned by gethostbyname() can fit
gerald [Sun, 19 Nov 2000 19:45:54 +0000 (19:45 +0000)]
Check to make sure the h_addr entry returned by gethostbyname() can fit
into an in_addr struct.

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

19 years agoDynamically resize decr_pd in dissect_icqv5Client() in order to avoid
gerald [Sun, 19 Nov 2000 19:23:54 +0000 (19:23 +0000)]
Dynamically resize decr_pd in dissect_icqv5Client() in order to avoid
a possible buffer overflow on media with frame sizes greater than
1600 bytes.

According to http://www.student.nada.kth.se/~d95-mih/icq/ there isn't
an upper bound to the size of a v5 packet, so we grow dynamically to
fit what we've been handed.

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

19 years agoFix buffer overruns:
gerald [Sun, 19 Nov 2000 16:58:57 +0000 (16:58 +0000)]
Fix buffer overruns:

  - packet-afs.c: dissect_acl() didn't restrict the size of a string read
    with sscanf().  An exploit has been released.

  - packet-nbns.c: When passed an illegal name, get_nbns_name() would
    overrun nbname with an error message.  This isn't exploitable AFAIK,
    but it could result in a crash.

  - packet-ntp.c: dissect_ntp() wasn't checking the length of the
    reference clock's host name.  This is most likely exploitable.
    This fix simply lops off the end of the host name if it's too long.
    We should probably add an ellipsis (...) as we have done in other
    places in the code.

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

19 years agoFor each column, have both a buffer into which strings for that column
guy [Sun, 19 Nov 2000 08:54:37 +0000 (08:54 +0000)]
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.

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

19 years agoThe source operand of "SET_ADDRESS()" has to be static, as a pointer to
guy [Sun, 19 Nov 2000 08:20:34 +0000 (08:20 +0000)]
The source operand of "SET_ADDRESS()" has to be static, as a pointer to
it is saved.

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

19 years agoRegister the OSI transport dissector by name, and make it static.
guy [Sun, 19 Nov 2000 04:14:26 +0000 (04:14 +0000)]
Register the OSI transport dissector by name, and make it static.
"packet-clnp.h" no longer exports anything, so remove it.

Have the X.25 dissector call subdissectors through dissector handles
(now that all the dissectors it uses are registered by name).

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

19 years ago"wtap_read()" must *always* set "*err" when it returns FALSE - if it's
guy [Sun, 19 Nov 2000 03:47:36 +0000 (03:47 +0000)]
"wtap_read()" must *always* set "*err" when it returns FALSE - if it's
just an EOF, it should set "*err" to 0.  Fix up a bunch of read routines
for various capture file types to set "*err" appropriately.

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

19 years agoFinish tvbuffifying the X11 dissector - instead of having it be an
guy [Sun, 19 Nov 2000 02:48:24 +0000 (02:48 +0000)]
Finish tvbuffifying the X11 dissector - instead of having it be an
old-style dissector that does a "tvb_create_from_top()" and then calls
new-style-dissector subroutines, just use tvbuffs throughout.

Turn "tvb" from a global variable into an argument (as we no longer
create that tvbuff).

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

19 years agoGet rid of a now-unused variable.
guy [Sun, 19 Nov 2000 02:03:00 +0000 (02:03 +0000)]
Get rid of a now-unused variable.

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

19 years agoHave the Etherenet and PPP dissectors register themselves, and have
guy [Sun, 19 Nov 2000 02:00:03 +0000 (02:00 +0000)]
Have the Etherenet and PPP dissectors register themselves, and have
other dissectors call them through handles.  Do the same for the "PPP
payload" dissector, after tvbuffifying it.

Tvbuffify the PPPoE dissector.

Do the last little bit of tvbuffifying the L2TP dissector (it takes
old-style arguments and immediately generates a tvbuff out of them; make
it take new-style arguments).

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