Commit Graph

6767 Commits

Author SHA1 Message Date
Guy Harris 28e7a23569 "BYTE_ORDER" is, on some platforms, defined by a header file included by
Ethereal, so you get some compiler complaints by redefining it; don't
define BYTE_ORDER as TRUE and then use BYTE_ORDER, just use TRUE.

svn path=/trunk/; revision=6853
2003-01-06 02:18:15 +00:00
Guy Harris 5344a43575 Fix up the display of the "ncp.nds_time_filter" field.
svn path=/trunk/; revision=6852
2003-01-06 02:13:01 +00:00
Guy Harris 22667240e5 "hf_nds_time_filter" is put into the tree as an integral value; make it
one.

svn path=/trunk/; revision=6851
2003-01-06 02:10:54 +00:00
Guy Harris 705bf9a6cb Don't interpret NET_HDLC as LAPB/X.25 - sometimes it's some other
HDLC-flavored encapsulation (or, at least, it was in at least one
capture).  Instead, treat it as WTAP_ENCAP_PER_PACKET, and infer the
packet type, as we do for NET_ROUTER.

For NET_ROUTER captures, if the ISDN channel number is zero, infer the
packet type from the contents, rather than wiring it to PPP - it might
be, for example, Cisco or Wellfleet HDLC.

Fix the check for Cisco HDLC to look for 0x0F 0x00 and 0x8F 0x00, as
0x0F, not 0x08, is the unicast address in Cisco HDLC.

When fixing the pseudo-header, fix it for WTAP_ENCAP_WFLEET_HDLC,
WTAP_ENCAP_CHDLC, and WTAP_ENCAP_PPP_WITH_PHDR, as well as for
WTAP_ENCAP_ISDN, as the three ones listed don't use x25.flags, they use
p2p.sent.

svn path=/trunk/; revision=6850
2003-01-06 00:03:43 +00:00
Guy Harris f7501c1331 Get rid of global variables - pass them as arguments.
Rename the "osi_decode_" routines "ositp_decode_", to indicate that
they're for OSI COTP and CLTP.

Fetch the dst_ref field in each dissector, rather than globally, as not
all PDUs have it.  In particular, DT PDUs don't have it in classes 0 and
1, so don't put it into the summary line for class 0 and 1 COTP.

Register the CLNP dissector for use by the X.25 dissector.

svn path=/trunk/; revision=6849
2003-01-05 02:50:23 +00:00
Guy Harris e56b77f4cd Add support for SDLC encapsulation in DOS Sniffer captures; that
includes adding an SDLC dissector.

svn path=/trunk/; revision=6848
2003-01-03 22:31:26 +00:00
Guy Harris deadb2896c Well, at least some version 5 captures have type 7 records, and they
appear to look like the type 7 records in version 4 captures.

Note that sometimes the subtype is misleading.

svn path=/trunk/; revision=6847
2003-01-03 20:42:52 +00:00
Ronnie Sahlberg 4f2ea9f7e9 Small bugfix for h.261, the HMVD field spans two bytes, read those two bytes
when building the integer value and not just the same byte twice.

Also make the hex pane display both bytes this field spans.

svn path=/trunk/; revision=6846
2003-01-03 20:42:43 +00:00
Guy Harris d0606b986a Well, it's not as simple as "version 5 internetwork analyzer captures
hide the subtype in the reserved field in the version number", alas....

svn path=/trunk/; revision=6845
2003-01-03 20:09:01 +00:00
Guy Harris 64c6541346 I must've been on drugs when I checked in revision 1.56; put in the
"return" that should've been there, so we don't try to dissect Cisco
HDLC frames as PPP after having finished dissecting them as Cisco HDLC.

svn path=/trunk/; revision=6844
2003-01-03 19:40:25 +00:00
Guy Harris 4750bf47a7 Add some more comments.
svn path=/trunk/; revision=6843
2003-01-03 08:00:51 +00:00
Guy Harris ae6cb2b4e3 Get rid of some bogus commented-out statements.
svn path=/trunk/; revision=6842
2003-01-03 07:54:01 +00:00
Guy Harris eaea31134c It appears there are, indeed, two fields in the "xxb" part of the file
header that specify the detailed capture type for WAN captures; use
those fields.

svn path=/trunk/; revision=6841
2003-01-03 07:51:26 +00:00
Guy Harris 0a5be3f18b Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer.  (That's not a great name, but I
couldn't think of a better one.)

Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off.  That's what at least some versions of the
Windows-based ATM Sniffer appear to have.

Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).

svn path=/trunk/; revision=6840
2003-01-03 06:45:45 +00:00
Guy Harris decd1f84d1 Add support for version 002.000, and note that there's probably
something hidden in the per-packet header for ATM captures that
specifies the traffic type (and stuff such as that).

svn path=/trunk/; revision=6839
2003-01-03 02:24:56 +00:00
Guy Harris 773fcba41a Fix Gerald's e-mail address.
svn path=/trunk/; revision=6838
2003-01-02 20:45:14 +00:00
Guy Harris 87ed53914b From Jeff Morriss:
make ANSI point codes filterable in MTP3;

	fix a bug in the ANSI SLS dissection;

	have MTP3 store the SI for use by subdissectors;

	add a new MTP3-Management dissector.

Fix Makefile.nmake to include the Wellfleet HDLC dissector.

svn path=/trunk/; revision=6837
2003-01-02 20:44:32 +00:00
Guy Harris 6664e10070 From Flavio Poletti: handle the hyphen in QoS inside RADIUS client
messages, as recommended by recent 3GPP recommendations.

svn path=/trunk/; revision=6836
2003-01-02 20:33:45 +00:00
Guy Harris 06803d2919 Re-word-wrap the "you can't capture on PPP/WAN interfaces on NT"
message, to make the margins more even and to bring the second line
under 80 characters.  (It's amazing how long Herman Hollerith's legacy
has lasted....)

svn path=/trunk/; revision=6835
2003-01-01 03:51:02 +00:00
Guy Harris 99db336999 One more "#ifdef" (well, #ifndef, actually) for _WIN32.
svn path=/trunk/; revision=6834
2002-12-31 22:42:45 +00:00
Guy Harris 3e822a8538 #ifdef out all the pipe-opening stuff on Windows.
svn path=/trunk/; revision=6833
2002-12-31 22:01:48 +00:00
Guy Harris 8d0aab0e78 From Ronald Henderson: make "format_text()", on Windows, escape all
characters that aren't printable ASCII, as GTK+ for Windows thinks
strings are UTF-8 but the strings we give it wouldn't be UTF-8.

svn path=/trunk/; revision=6832
2002-12-31 21:51:10 +00:00
Guy Harris 4ec4c64968 Update a comment to indicate why there's a problem with printable-but-
not-ASCII characters in GTK+.

svn path=/trunk/; revision=6831
2002-12-31 21:49:00 +00:00
Guy Harris 5eb1be46a7 From Ronald Henderson: fix up "snprintf()" and "vsnprintf()" calls in
"epan/proto.c" to properly handle string truncation (by checking both
for -1 and a value larger than the buffer size as an indication of
truncation, as some older versions of those routines return -1, and, if
the string was truncated, putting in a trailing '\0', as "snprintf()" on
some platforms might not put the trailing '\0' in).

svn path=/trunk/; revision=6830
2002-12-31 21:37:29 +00:00
Guy Harris 55246f1b9f Clean up the comments a bit.
Use _WIN32 rather than WIN32 throughout (both of them appear to work - I
don't know whether one is the "right" one to use and, if one is, which
one it is - and they're both used in Ethereal, but let's at least be
consistent within a given file).

Update the capture device open failure message on Windows not to say
Token Ring devices aren't supported - current versions of WinPcap do
support it, and the Ethereal message was updated, but the Tethereal one
wasn't.

Fix up the Tethereal code to match the Ethereal code a bit more, so that
we go to "error" on Windows if the capture device open fails, and so
that the code actually compiles on Windows.  Fix up the indentation
while we're at it.

svn path=/trunk/; revision=6829
2002-12-31 21:18:05 +00:00
Guy Harris 3534ae5454 Use _WIN32 rather than WIN32 throughout (both of them appear to work - I
don't know whether one is the "right" one to use and, if one is, which
one it is - and they're both used in Ethereal, but let's at least be
consistent within a given file).

svn path=/trunk/; revision=6828
2002-12-31 21:12:55 +00:00
Guy Harris 4ff2dcfcda Clean up the comments a bit.
svn path=/trunk/; revision=6827
2002-12-31 21:06:48 +00:00
Guy Harris bc0e186eef Fix a braino in a last-minute fix I put into the previous checkin.
svn path=/trunk/; revision=6826
2002-12-31 08:08:19 +00:00
Guy Harris 3a92530a52 From Devin Heitmueller: support for decrypting DCERPC conversations
using NTLMSSP version 1.

Show stub data as such for all requests and replies where we can't
dissect the stub data as a request or reply for some DCERPC-based
protocol.

svn path=/trunk/; revision=6825
2002-12-31 08:05:29 +00:00
Guy Harris d2986ef68d Make the "rpc.fragment" and "rpc.fragment.error" fields FT_FRAMENUMs, as
they're put into the tree with "proto_tree_add_uint_format()", with the
frame number as the value.

svn path=/trunk/; revision=6824
2002-12-31 07:49:14 +00:00
Richard Sharpe 3340b685d7 Small fix from Andrew Bartlett to make Is Directory come out right.
svn path=/trunk/; revision=6823
2002-12-31 04:24:18 +00:00
Guy Harris 1e6c1a0ac0 From rmkml: support for capturing from a pipe in Tethereal.
Fix up the documentation of the "-i" flag in the Ethereal man page to
note only that "netstat -i" and "ifconfig -a" *might* work, to
specifically note that not all UNIXes support the "-a" flag to
"ifconfig", and to note that pipe data must be in *standard* libpcap
format.

Document the support for pipes in the "-i" flag in Tethereal.

svn path=/trunk/; revision=6822
2002-12-29 22:40:10 +00:00
Guy Harris 0b9234c3a3 Fix a typo.
svn path=/trunk/; revision=6821
2002-12-29 01:25:01 +00:00
Guy Harris fac9a235d7 "&magic" is a "guint32 *", so adding a byte count to it points that
number of *32-bit words* into the magic number, not that number of
*bytes* into the magic number; cast it to "char *" before adding the
byte count.

svn path=/trunk/; revision=6820
2002-12-29 01:19:08 +00:00
Guy Harris a8149cce51 Mention binary developer's packages, as well as "make install-incl", in
the message printed if we can't find net/bpf.h, and line-wrap the
message.

svn path=/trunk/; revision=6819
2002-12-28 23:15:52 +00:00
Guy Harris f84b455832 From Martin Regner: properly set the offset in the join/prune processing
loops for groups, so that it gets advanced to the beginning of the next
group after a group is finished.

svn path=/trunk/; revision=6818
2002-12-27 22:55:40 +00:00
Olivier Abad 0b721e0ccf Make last modifications work with gtk2.
svn path=/trunk/; revision=6817
2002-12-27 18:32:55 +00:00
Richard Sharpe bdf14fc80e Minor spelling etc updates.
svn path=/trunk/; revision=6816
2002-12-25 20:58:06 +00:00
Guy Harris 4f02b606b3 The field 2 bytes into a BPDU is always a version identifier, regardless
of the type of the packet; always fetch it.

svn path=/trunk/; revision=6815
2002-12-22 00:40:38 +00:00
Guy Harris 785413e7c0 Update some comments.
Make the "fs" and "flags" fields in type 6 records unsigned, as they are
in other per-frame records - they're probably the same set of flag bits.

svn path=/trunk/; revision=6814
2002-12-20 22:30:15 +00:00
Guy Harris 156254096a Add an item for Wellfleet HDLC.
svn path=/trunk/; revision=6813
2002-12-20 21:59:33 +00:00
Guy Harris 9284c8f86d Make "infer_pkt_encap()" take a pointer and length as arguments.
Update some comments.

svn path=/trunk/; revision=6812
2002-12-20 21:58:46 +00:00
Guy Harris 9a6a8177e4 Supply more information about "WAN/Synchronous" captures.
svn path=/trunk/; revision=6811
2002-12-20 21:23:02 +00:00
Richard Sharpe 05fa98f948 Add support for Wellfleet HDLC. It now can see inside the packets and handles
the capture I was sent as a bunch of TCP segments containing LPD stuff.

svn path=/trunk/; revision=6810
2002-12-20 07:56:07 +00:00
Richard Sharpe 13970cc2eb This adds the beginning of support for Wellfleet HDLC to ngsniffer.c as
well as Cisco HDLC support. It compiles OK, but I do not claim that it is
not borken.

I will have to add a small dissector that eats the first two bytes and then
calls the Ethernet dissector as well, to complete the work.

svn path=/trunk/; revision=6809
2002-12-20 05:40:52 +00:00
Guy Harris 392fee6d7a Support putting preferences into arbitrary places in a tree, which is
used to construct the "Edit->Preferences" dialog box; this includes the
ability to register a "subtree" for preferences.  Instead of
special-casing protocol preferences, have a subtree "Protocols" for
protocol preferences.

svn path=/trunk/; revision=6808
2002-12-20 01:48:57 +00:00
Ronnie Sahlberg e4633bc783 Update reassemble.c/show_item and all callers to use FT_FRAMENUM for the list of packets corresponding to a reassembled pdu
svn path=/trunk/; revision=6807
2002-12-19 11:22:38 +00:00
Ronnie Sahlberg 54ac42f379 Update packet-smb.c to use the new FT_FRAMENUM type
svn path=/trunk/; revision=6806
2002-12-19 10:31:38 +00:00
Guy Harris 58d1820542 Document FT_FRAMENUM.
svn path=/trunk/; revision=6805
2002-12-19 05:28:40 +00:00
Guy Harris 90880001b7 Document "Tools->Go To Corresponding Frame".
svn path=/trunk/; revision=6804
2002-12-19 05:26:42 +00:00