Commit graph

5982 commits

Author SHA1 Message Date
Guy Harris
9c900f33ea Call "proto_item_add_subtree()" to create a subtree for POST data, don't
just use the return value of a "proto_tree_add" routine as if it could
be used as a protocol tree.

svn path=/trunk/; revision=5915
2002-07-30 07:36:22 +00:00
Guy Harris
4348b2e845 From Michael Tuexen: AF_INET6 support for DLT_NULL captures from
Darwin/MacOS X.  (As if FreeBSD and {Net,Open}BSD having different
AF_INET6 values wasn't enough, we have The Other BSD having its own
value....)

svn path=/trunk/; revision=5914
2002-07-30 07:25:29 +00:00
Guy Harris
b0de25272d #ifdef out some variables not used on Windows.
If printing a single packet to a file, don't use the "print to a
printer" code for Windows.

Only free "print_args.dest" *after* the last usage.

svn path=/trunk/; revision=5913
2002-07-30 07:04:08 +00:00
Uwe Girlich
5fa90a663e Code from Jan Berkel <jan.berkel@gmx.de> to
* fully decode client->server packets (mouse movement, button press etc.)
* start of decoding server->client packets (names of first command as text)

svn path=/trunk/; revision=5912
2002-07-29 09:28:28 +00:00
Guy Harris
ff0df5d8a4 From Didier Gautheron: add FPGetUserInfo.
svn path=/trunk/; revision=5911
2002-07-29 06:35:12 +00:00
Guy Harris
3365355534 From Joerg Mayer:
gtk/colors.c: Fix a memleak found by valgrind
   (Note that there are similar bugs in other functions that
   use the same construct with path!)

svn path=/trunk/; revision=5910
2002-07-29 06:30:01 +00:00
Guy Harris
6e21561be8 From Joerg Mayer:
All files:
  - Replace types from sys/types.h by those from glib.h
  - Replace ntoh family of macros from netinet/in.h and winsock2.h
    by g_ntoh family from glib.h
  - Remove now unneeded includes of sys/types.h, netinet/in.h and
    winsock2.h
wtap.h
  Move includes to the top

svn path=/trunk/; revision=5909
2002-07-29 06:09:59 +00:00
Richard Sharpe
4298a1f07d Committing Kerberos NetBIOS address type stuff from Jim McDonough.
svn path=/trunk/; revision=5908
2002-07-29 02:03:54 +00:00
Ronnie Sahlberg
af6da1a420 Changed the SMB dissector to put ALL command PDUs in one SMB in the summary
line, separated by ;

It only prints "Request"/"Response" for the first command to save space

svn path=/trunk/; revision=5907
2002-07-27 05:03:53 +00:00
Ronnie Sahlberg
0fa3c02231 If conversations have already been created in lower layers, say TCP before
SMB sees the PDU, then SMB would forget to create the proper state variables and crash.

SMB is changed to split the operation into
1, only create a conversation if it needs to. (as before)
2, detect if it needs to create the si.ct state variables independant of
whether smb also created a conversation or not.

Without this patch and with changes to say TCP to create conversations ethereal would crash at the first packet the SMB dissector would see.

svn path=/trunk/; revision=5906
2002-07-27 03:18:29 +00:00
Guy Harris
6d68a964e5 From Stefan Wenk: remove an unnecessary +1 from some offset
computations.

svn path=/trunk/; revision=5905
2002-07-25 21:43:53 +00:00
Guy Harris
e9310b2f14 For connection-oriented DCE RPC, show the stub data if we can't actually
do anything else with a request or reply (e.g., because we haven't seen
the bind request).

svn path=/trunk/; revision=5904
2002-07-25 21:30:58 +00:00
Tim Potter
617a6d883e Remove trailing space characters between a netbios name and the name type.
This makes the display look much nicer!

svn path=/trunk/; revision=5903
2002-07-22 20:52:21 +00:00
Guy Harris
976323d49a Update from Anand V. Narwani:
fix a minor problem in which the Info colum was incorrectly
	defaulted to "Fragmentation Frame";

	add 4 missing fields for the Extended header in Fragmentation
	frames.

svn path=/trunk/; revision=5902
2002-07-22 20:18:23 +00:00
Guy Harris
6c289aebb9 Fix up some comments.
Fix up a call to use the right byte-ordering routine (both routines have
the same effect, but we want to use the right one to make it clearer
what we're doing).

svn path=/trunk/; revision=5901
2002-07-21 20:31:21 +00:00
Guy Harris
1dd6c308ce Mention the "-h" flag.
Fix up the list of arguments to "-S" in the synopsis.

svn path=/trunk/; revision=5900
2002-07-21 20:28:35 +00:00
Guy Harris
73a4f43644 "yyin" is from lex/flex, so it should be "extern", not "static" - we
have to modify lex/flex's input stream, not some private "FILE *".

Fix up the usage message to:

	mention the "-h" flag;

	not mention the non-existent "-w" flag;

	fit within 80 columns.

Add "-h" to the list of options in the "getopt()" call, as there's code
to support it, and remove "-r" and "-w", as there wasn't any code to
support them.

svn path=/trunk/; revision=5899
2002-07-21 20:27:30 +00:00
Richard Sharpe
b5fa2524e6 Fix the problems WRT overwriting a capture file. From Joerg Mayer.
svn path=/trunk/; revision=5898
2002-07-21 16:54:22 +00:00
Guy Harris
52896da39e Offsets in packets should be "int", not "guint8", unless there is an
*inviolable guarantee* that the offset will *never* be bigger than 255.
(The same applies for "guint16" and 65535.) Otherwise, you run the risk
of an infinite loop (packets are not guaranteed to be valid, nor are the
contents of capture files - and there's no guarantee that you're reading
a DOCSIS file if you've turned on the "force interpretation as DOCSIS"
flag.)

svn path=/trunk/; revision=5897
2002-07-21 00:22:17 +00:00
Guy Harris
206b6edb1b From Anand V. Narwani: fix to the Info column for Request frames.
svn path=/trunk/; revision=5896
2002-07-20 23:19:20 +00:00
Guy Harris
ca637b4413 From Prabhakar Krishnan: add item to SMB protocol tree for time between
request and response.

svn path=/trunk/; revision=5895
2002-07-20 23:14:39 +00:00
Uwe Girlich
372fe49be8 Include sys/types.h to provide the type size_t, which is needed
further down in this file but must not be defined yet in the C source,
which includes this header file.
Example: without this change, packet-dcerpc-samr.c 1.51 could not be
compiled under SINIX-M.

svn path=/trunk/; revision=5894
2002-07-19 12:59:21 +00:00
Guy Harris
2b39f15499 From Richard Urwin: fixes for README.plugins.
Combine the two entries for Anand Narwani in the AUTHORS file and the
Ethereal man page list of contributors.

svn path=/trunk/; revision=5893
2002-07-19 09:33:17 +00:00
Guy Harris
91ab6eb809 Change a "proto_tree_add_uint()" call to use "proto_tree_add_item()".
When dissecting a BYE packet, bump the chunk count when dissecting the
SSRC/CSRC identifiers, so the loop terminates properly.

svn path=/trunk/; revision=5892
2002-07-17 10:37:31 +00:00
Guy Harris
47b147ffd1 Add an extra argument to "tvb_find_line_end()", which specifies what it
should do if it doesn't find an EOL; if FALSE, it behaves as before,
returning values that treat the line as ending at the end of the tvbuff,
and if TRUE, it returns -1, so its caller can do segment reassembly
until it gets the EOL.

Add an option to the SMTP dissector to do segment reassembly, and do
segment reassembly of the first line.

svn path=/trunk/; revision=5891
2002-07-17 06:55:29 +00:00
Guy Harris
cc00331455 From Kan Sasaki:
1. Add some VSAs.

	2. Modify the routines match_numval() and
	   rd_match_strval_attrib() to use a null string pointer, rather
	   than a 0 value, to signify the end of the attribute table,
	   because some vendors are using an attribute with a value of 0.

	3. Bug fix.

svn path=/trunk/; revision=5890
2002-07-17 01:02:45 +00:00
Guy Harris
77fa06b899 From Joerg Mayer:
dftest.c:
	     Remove #if-0-ed includes

	packet-ieee80211.c, packet-wtls.c, packet-afp.c, packet-wsp.c,
        packet-wtp.c, ethereal_gen.py:
	     Remove redundant include varargs (already in snprintf.h,
	     and required only for snprintf.h)

	Remove unused include of snprintf.h from files not using
	"snprintf()".

svn path=/trunk/; revision=5889
2002-07-17 00:43:03 +00:00
Guy Harris
ca6badc579 Get rid of some "unused variable" and "unused static function" warnings,
and some compile errors in Tethereal, when compiling without libpcap.

If libpcap is missing (whether that's detected at compile time or, as on
Windows, at run time), don't call any of the "capture_prefs" routines -
the routine to create the capture preferences page wasn't called, so the
other routines can try to refer to non-existent widgets and other items
and crash.

Get rid of the stub routines in "capture_prefs()" used when compiling
without libpcap, as they're no longer called.

svn path=/trunk/; revision=5888
2002-07-17 00:22:30 +00:00
Guy Harris
ff49944dcd From Joerg Mayer: add #includes of "snprintf.h" in modules that used
"snprintf()" but weren't including "snprintf.h".

svn path=/trunk/; revision=5887
2002-07-16 22:50:48 +00:00
Guy Harris
f65887d220 Get rid of carriage returns.
svn path=/trunk/; revision=5886
2002-07-16 10:11:41 +00:00
Guy Harris
c10a2f283d Don't allocate structures to remember how to re-access a packet's data,
or the array to hold pointers to those structures, if we're only reading
the file sequentially.

svn path=/trunk/; revision=5885
2002-07-16 09:41:32 +00:00
Guy Harris
44d19627ef From Graeme Hewson:
Allow "-" as the output file name in Wiretap, referring to the
	standard error.

	Optimize the capture loop.

Fix some of the error-message printing code in Ethereal and Tethereal.

Have Wiretap check whether it can seek on a file descriptor, and pass
the results of that test to the file-type-specific "open for output"
routine.  Have the "open for output" routines for files where we need to
seek when writing the file return an error if seeks don't work.

svn path=/trunk/; revision=5884
2002-07-16 07:15:09 +00:00
Guy Harris
41dc7b1b59 From Graeme Hewson:
In sync mode, if the capture file written by the child can't be
	opened by the parent, ethereal will write two identical popup
	error messages.

	This patch fixes the problem.

svn path=/trunk/; revision=5883
2002-07-16 05:43:39 +00:00
Guy Harris
a77d6a14c2 Update the "NT sucks for PPP capture" note to include NT 5.1 (XP and
.NET Server).

Fix indentation.

svn path=/trunk/; revision=5882
2002-07-15 23:25:59 +00:00
Ashok Narayanan
7f7af9143a Added support for dissecting RSVP Bundle Messages
svn path=/trunk/; revision=5881
2002-07-15 21:19:56 +00:00
Guy Harris
e0dc69929e From Joerg Mayer:
Replace our own definitions of TRUE/FALSE by their glib.h
	equivalents.  Put sys/types.h into ifdefs.

svn path=/trunk/; revision=5880
2002-07-15 20:57:13 +00:00
Guy Harris
736c64296e From Joerg Mayer:
Use the GLib macros to convert from network to host byte order.

svn path=/trunk/; revision=5879
2002-07-15 20:55:51 +00:00
Guy Harris
4c86bb6b38 From Joerg Mayer:
Change struct addr to guint32 which is the way it is used
	anyway.

	Use the GLib macros to convert from network to host byte order.

svn path=/trunk/; revision=5878
2002-07-15 20:54:45 +00:00
Guy Harris
a650adbf57 Fix a sample call to add an item to the subtree for a protocol to add it
there rather than to the top-level tree, and use
"proto_tree_add_item()".

Add a description of PROTOSHORTNAME, and give an example of the way
PROTONAME, PROTOSHORTNAME, and PROTOABBREV would be set for a protocol.

svn path=/trunk/; revision=5877
2002-07-15 20:31:06 +00:00
Guy Harris
976fcf09d4 The mysterious two bytes were just the FCS. Use the length field from
the IP header as the reported length again, but make the actual length
be the minimum of the length of the tvbuff and the reported length, just
to keep from having a weird tvbuff that has more data than the packet
has.

svn path=/trunk/; revision=5876
2002-07-15 09:56:04 +00:00
Guy Harris
6f9a78cc79 Clean up the setting of "id_offset" and "sd_offset"; this fixes a bug in
handling the first few packets in a file.

svn path=/trunk/; revision=5875
2002-07-15 09:50:02 +00:00
Guy Harris
5b3660e693 SMTP and FTP response codes need more than 1 byte, as they can go up to
999; give them 4.

svn path=/trunk/; revision=5874
2002-07-15 09:40:20 +00:00
Guy Harris
2537158d48 Redo the way random access is handled. Save, for each packet, the
offset of the beginning of the first record containing data from that
packet, and the offset from the first byte of data in that record of the
first byte of data from that packet; to read a given packet, seek to the
offset of the first record, and keep processing packets until we find
one with the right direction.

This fixes a problem where it wasn't correctly reading the packet, when
doing random access, in cases where you have a sequence of records that
stop in the middle of a packet.

svn path=/trunk/; revision=5873
2002-07-15 08:45:32 +00:00
Richard Sharpe
eac7bf1188 This seems to fix the problem of trying to save over the top of an existing
capture on some occassions.

svn path=/trunk/; revision=5872
2002-07-15 05:14:26 +00:00
Guy Harris
fbaa0dd809 Add Booleans for the Ack and Srefresh messages, and move the Boolean for
the HELLO message to be in numerical message-code order.

svn path=/trunk/; revision=5871
2002-07-14 19:33:16 +00:00
Guy Harris
5e2787151a Add a Boolean field for the Bundle message type.
svn path=/trunk/; revision=5870
2002-07-14 19:23:04 +00:00
Guy Harris
3dc1693e97 Clarify the octet-stuffed framing code, by adding comments and by using
hex values rather than characters in a switch statement.

svn path=/trunk/; revision=5869
2002-07-14 10:59:38 +00:00
Guy Harris
4ceeb56841 Make the reported length of the VJ-uncompressed tvbuff the reported
length of the data in the PPP packet, not the value from the IP header,
just in case there's extra crap at the end.  (That appears to be the
case in at least one pppdump capture filel; that's probably either a bug
in the version of pppdump that produced the capture or in the pppdump
reading code, but, until we fix that, if we can, let's at least get this
right, so that the reported length of the tvbuff won't be less than the
length unless that was the case for the tvbuff handed to us.)

svn path=/trunk/; revision=5868
2002-07-14 08:57:56 +00:00
Guy Harris
2e7f37aee7 From Anand V. Narwani: fix so that when a filter is applied to a DOCSIS
management frame, the Info column isn't erased.

Replace a call to "tvb_length_remaining()" with the value returned by a
earlier identical call.

svn path=/trunk/; revision=5867
2002-07-14 08:37:45 +00:00
Guy Harris
9d1fdfedb7 Only put "smtp.req" into the tree for packets that contain request
lines, and only put "smtp.rsp" into the tree for packets that contain
reply lines; don't put either into the tree for packets that contain
only message body text or an EOM.

svn path=/trunk/; revision=5866
2002-07-14 08:27:34 +00:00