Commit graph

6628 commits

Author SHA1 Message Date
Guy Harris
0c61b86e30 "#ifdef" doesn't take Boolean expressions as arguments; use "#if
defined(A) && defined(B)" to check whether both A and B are defined.

svn path=/trunk/; revision=6613
2002-11-11 17:34:22 +00:00
Guy Harris
13b8bc3f9c "gtk_quit_add_destroy()" takes a "GtkObject *" as its second argument in
both GTK+ 1.2[.x] and 2.x, so put the "GTK_OBJECT()" cast back in to
squelch a compiler warning.

svn path=/trunk/; revision=6612
2002-11-11 17:32:42 +00:00
Guy Harris
1981d976e3 Put in some missing macros needed for recent changes.
svn path=/trunk/; revision=6611
2002-11-11 17:30:26 +00:00
Olivier Abad
29011060de Use gtk1/gtk2 compatibility macros to reduce #ifdefs.
svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
Olivier Abad
c2c5e20927 Replace gtk_rpcprogs_init with gtk_rpcprogs_cb in the gtk2 menu entry.
svn path=/trunk/; revision=6609
2002-11-11 12:37:15 +00:00
Tim Potter
e26a5af8c2 Ignore Makefile{,.in}
svn path=/trunk/; revision=6608
2002-11-11 05:44:25 +00:00
Tim Potter
4518450b28 Convert getprinter info 0, 1, 2, 3 to dissect_ndr routines. Hooray!
The old prs_DEVMODE function is still used by something else for the
moment.

svn path=/trunk/; revision=6607
2002-11-11 05:39:51 +00:00
Gerald Combs
2329ea1483 Add tethereal's tap objects to Makefile.nmake's "clean" target.
Instead of setting MIBDIRS in tethereal.c and gtk/main.c, set it in
packet-snmp.c.

svn path=/trunk/; revision=6606
2002-11-10 20:53:06 +00:00
Guy Harris
f37932ff64 Update comments to reflect some information inferred from the Sniffer
documentation.

svn path=/trunk/; revision=6605
2002-11-10 20:52:56 +00:00
Guy Harris
5dda6f7556 Display the call reference flag, and don't include that bit in the call
reference value.

svn path=/trunk/; revision=6604
2002-11-10 20:26:24 +00:00
Guy Harris
c6bcd3eb0d From Devin Heitmueller: show proper field names for SAMR
UnicodeChangePassword2.

svn path=/trunk/; revision=6603
2002-11-10 20:17:52 +00:00
Olivier Abad
425e7406d2 When opening tap windows, we don't need to search the tap_list again. It
has been done when processing the -z command line option.

svn path=/trunk/; revision=6602
2002-11-10 11:41:45 +00:00
Olivier Abad
573f0840eb - use gtk1/gtk2 compatibility macros to reduce #ifdefs
- when processing tap extensions command line options, wait until the
  main window has been created before opening the tap window, to avoid
  lots of GTK warnings.

svn path=/trunk/; revision=6601
2002-11-10 11:36:39 +00:00
Olivier Abad
b48fd02f40 Use gtk1/gtk2 compatibility macros to reduce #ifdefs.
svn path=/trunk/; revision=6600
2002-11-10 11:00:29 +00:00
Ronnie Sahlberg
d8e1d2987a Bugfixes for two SAMR dissectors.
svn path=/trunk/; revision=6599
2002-11-10 09:49:38 +00:00
Guy Harris
262744d2b2 Dissect NTLMSSP authentication verifiers, as per lkcl's "DCE/RPC over
SMB" book.

svn path=/trunk/; revision=6598
2002-11-10 09:38:22 +00:00
Olivier Abad
048ab33a26 Use gtk1/gtk2 compatibility macros to reduce #ifdefs.
svn path=/trunk/; revision=6597
2002-11-09 20:52:39 +00:00
Olivier Abad
7a3de321f8 Helper macros fro gtk1.2/gtk2 compatibility.
It should reduce the number of #ifdefs in gtk source code.

svn path=/trunk/; revision=6596
2002-11-09 20:00:35 +00:00
Michael Tüxen
78266cfe46 Added support for version 2 of the ID, port number can now be selected.
Based on a patch of Jeff Morriss.

svn path=/trunk/; revision=6595
2002-11-09 19:00:09 +00:00
Guy Harris
753ef1fb73 Put in a note about "ntoh[ls]()" and "hton[ls]()" vs. the GLib versions
of same.

svn path=/trunk/; revision=6594
2002-11-09 08:37:00 +00:00
Guy Harris
c9e5b47d21 Display the call reference flag, and don't include that bit in the call
reference value.

svn path=/trunk/; revision=6593
2002-11-09 08:09:18 +00:00
Guy Harris
cc293e051d It appears that 0x80 in the fs field of an ISDN packet means "network to
user", not "user to network" (SETUP messages are generally sent *to* the
network).

svn path=/trunk/; revision=6592
2002-11-09 08:07:19 +00:00
Guy Harris
70c5b343bf Attempt to handle REC_HEADER2 records in major version 2 DOS Sniffer
captures.

svn path=/trunk/; revision=6591
2002-11-09 07:31:17 +00:00
Guy Harris
b9f754f891 Add support for SIGINFO on systems that have it.
svn path=/trunk/; revision=6590
2002-11-09 00:08:44 +00:00
Guy Harris
acf6949830 Eliminate a compiler warning, and handle overflows.
svn path=/trunk/; revision=6589
2002-11-08 19:58:09 +00:00
Guy Harris
41f68b84f7 Get rid of carriage returns - they upset some UNIX compilers (and
Windows compilers, etc. largely appear to handle files without them,
assuming CVS doesn't just put them in when you check them out).

Also get rid of execute permission on source files.

svn path=/trunk/; revision=6588
2002-11-08 19:46:09 +00:00
Richard Sharpe
aac18f73d4 More patches from Jim McDonough
svn path=/trunk/; revision=6587
2002-11-08 19:29:39 +00:00
Richard Sharpe
d15a388ded Another patch from Jim McDonough.
svn path=/trunk/; revision=6586
2002-11-08 19:25:42 +00:00
Guy Harris
9f9e93fe79 It doesn't appear as if any flag in the preceding NEGOTIATE or CHALLENGE
message indicates whether the session key or flags are missing in an
AUTH message - and it appears that the session key can be present
without the flags.

For both fields, check whether the offset is after the offset of the
first data chunk and, if so, assume the field is missing.

This means we no longer need to remember the flags for a NEGOTIATE
message, so just remember them for a CHALLENGE message.

svn path=/trunk/; revision=6585
2002-11-08 06:02:18 +00:00
Guy Harris
1177828349 Use the same ett_ value for all security blobs, regardless of whether
they're raw NTLMSSP or GSS-API.

svn path=/trunk/; revision=6584
2002-11-08 05:51:33 +00:00
Guy Harris
f0f2f07653 Call the NTLMSSP subdissector regardless of whether we're building a
protocol tree or not.

svn path=/trunk/; revision=6583
2002-11-08 05:06:36 +00:00
Guy Harris
3adaa6fc1e Get rid of an unused variable.
Fix the name of a field to begin with "ntlmssp".

svn path=/trunk/; revision=6582
2002-11-08 04:25:00 +00:00
Guy Harris
643ea3debf If NTLMSSP_NEGOTIATE_UNICODE is different in the negotiate and challenge
messages, the value in the challenge message is what should be used to
determine how to dissect the auth message.

svn path=/trunk/; revision=6581
2002-11-08 01:45:37 +00:00
Guy Harris
8181a83657 Allow more than one circuit with the same circuit ID; a circuit has a
starting and ending frame number, and circuits with the same circuit ID
are sorted by the starting frame number (the last circuit can have 0 as
the ending frame number, meaning "unknown"), and, when looking up a
circuit, we take a frame number as an argument and return the circuit
that includes that frame.

Add a new circuit ID type for X.25 virtual circuits, and use the circuit
mechanism to keep track of the dissector for an X.25 virtual circuit
rather than having a private mechanism.

svn path=/trunk/; revision=6580
2002-11-08 01:00:07 +00:00
Guy Harris
45d9642e52 From Hannes Gredler: show the type value for OSI protocols symbolically.
svn path=/trunk/; revision=6579
2002-11-07 22:12:13 +00:00
Richard Sharpe
65c1756287 Some more SPOOLSS stuff from Jim McDonough.
svn path=/trunk/; revision=6578
2002-11-07 17:45:30 +00:00
Ronnie Sahlberg
926433a151 Must use the proper proto_tree_add_... call for FT_NONE
svn path=/trunk/; revision=6577
2002-11-07 09:10:06 +00:00
Ronnie Sahlberg
2378b2a893 hf_index update for TCP
svn path=/trunk/; revision=6576
2002-11-07 08:51:07 +00:00
Guy Harris
3f8f3c6119 NTLMSSP_NEGOTIATE messages sometimes appear to have two other blobs at
the end, although they're empty in all messages I've seen; put in a
comment noting that.

NTLMSSP_CHALLENGE messages sometimes don't appear to have the address
list; it doesn't seem to be indicated by:

	any flags in the previous NEGOTIATE message other than the
	Negotiation Workstation Supplied, Negotiate Domain Supplied, or
	Negotiate UNICODE, but it doesn't make sense for those to affect
	it, as they affect unrelated things;

	any flags in the CHALLENGE message other than Negotiate OEM or
	Negotiate UNICODE, but those don't make sense.

So we just check whether the address list descriptor would be in the
middle of the domain name string and, if so, assume it's absent.

NTLMSSP_AUTH messages sometimes lack both the session key and the
negotiate flags; that appears to be controlled by th Negotiate Key
Exchange flag in the initial NEGOTIATE message - if not set, those
fields are missing.  We therefore remember the NEGOTIATE flags in a
conversation, and attach them to frames containing AUTH messages; we
also need those flags to determine whether the strings in the AUTH
message are Unicode or not.

Make lengths, maximum lengths, and offsets unsigned.

Display entries for empty blobs and address lists.

svn path=/trunk/; revision=6575
2002-11-07 08:01:19 +00:00
Guy Harris
70aaa6ddcc From Jason House: add the rule to make "ethereal-tap-register.c".
Make that rule work correctly, by making "ETHEREAL_TAP_SRC" refer to the
*source* files, making "ETHEREAL_TAP_OBJECTS" be the *object* files (as
generated from the list of source files), and adding
"ETHEREAL_TAP_OBJECTS" rather than "ETHEREAL_TAP_SRC" to the list of
objects to link.

svn path=/trunk/; revision=6574
2002-11-07 05:33:50 +00:00
Guy Harris
cb8300571b Fix the message printed when making "ethereal-tap-register.c".
svn path=/trunk/; revision=6573
2002-11-07 05:29:07 +00:00
Guy Harris
e7a61d2dff There can be more than one GSS-API negotiation in a conversation, so the
handle to use to dissect SPNEGO tokens has to be stored as per-frame
data, not just as conversation data.

svn path=/trunk/; revision=6572
2002-11-07 05:25:37 +00:00
Guy Harris
dd02634bd5 Add "ethereal-tap-register.c" to the gtk ".cvsignore" file, as it's a
generated file.

svn path=/trunk/; revision=6571
2002-11-06 23:41:21 +00:00
Guy Harris
412aaf59a5 Note that it's perfectly OK to store a dissector handle as per-frame or
per-conversation data.

svn path=/trunk/; revision=6570
2002-11-06 23:38:27 +00:00
Guy Harris
498d55ec8a There can be more than one GSS-API negotiation in a conversation, so the
handle to use to dissect GSS-API inner context tokens has to be stored
as per-frame data, not just as conversation data.

svn path=/trunk/; revision=6569
2002-11-06 23:36:25 +00:00
Guy Harris
eab13a03f3 From Andreas Trauer:
Replace the handling of PPP packets over GTPv1 and also
	establish the handling of PPP packet over GTPv0.  Additionally
	IPv6 packets are handled in GTPv0 and GTPv1.

	Explanation:

	- old solution: examining the known PPP protocols is a tough
	  task, because there might be more in the future -> the list
	  must be extended more and more (the octet 0x00 has already
	  been added for PPP network layer protocols, but for protocol
	  field compression a lot of protocols must be inserted for
	  IPv4(0x21), IPv6(0x57), maybe IPX (0x2b) or AppleTalk (0x29),
	  ...)

	- new solution: It is easier the other way: the most significant
	  nibble of the first octet must be 4 for IPv4 and 6 for IPv6.
	  All other values are assumed to be PPP packets, including
	  packets beginning with values 0x40-0x44 (header too short for
	  IPv4 packet) and value 0x4f (PPP protocol type (IPv6 header
	  compression protocol) taking precedence over IPv4 packets with
	  header length of 60 octets).

svn path=/trunk/; revision=6568
2002-11-06 22:59:23 +00:00
Guy Harris
8ee4a65f76 From Solomon Peachy: support for new "wlancap" 802.11 extra-information
header.

Add overflow checks to "BYTES_ARE_IN_FRAME()", and cast all arguments to
unsigned values (negative values should never be passed) to squelch
compiler warnings.

svn path=/trunk/; revision=6567
2002-11-06 21:49:34 +00:00
Ronnie Sahlberg
b3e0a56390 First step in creating an API to register TAPs for use with ethereal instead of hardcoding them in main.c/menu.c
This adds functions to register the command line arguments to use the API in the same way as is done for tethereal.

Later it may be extended to also register the GUI/Menu entry point to ethereal using this api but that iwll be later since the changes required to menu.c are not as intrusive as the main.c command line parsing ones were.


Some of the latest changes (before this checkin) has made ethereal to produce lots of GTK errors when starting up the extension windows.
They were there before this checking but will be investigated.

svn path=/trunk/; revision=6566
2002-11-06 10:53:36 +00:00
Guy Harris
d4e632c5ea Get rid of a trailing blank.
svn path=/trunk/; revision=6565
2002-11-05 23:00:11 +00:00
Guy Harris
aef0d31da2 Show the SAP values in RPL packets symbolically if possible.
svn path=/trunk/; revision=6564
2002-11-05 22:50:42 +00:00