Commit Graph

12210 Commits

Author SHA1 Message Date
Ulf Lamping 5d53c6e5a9 add a simplified overview section about the Ethereal function blocks.
Some cleanup in the docbook Makefile

svn path=/trunk/; revision=12447
2004-10-30 12:54:53 +00:00
Ulf Lamping c56b2f0838 add a dia about the capture internals
svn path=/trunk/; revision=12446
2004-10-30 12:52:34 +00:00
Ulf Lamping 3e5ac87520 code cleanup: split capture_sync from capture.c into it's own file.
That's the part used, when "Update list of packets in real time" is used while capturing.

svn path=/trunk/; revision=12445
2004-10-30 11:44:06 +00:00
Guy Harris 1f02604dcd from Mark Phillips: the length field in the UDP header includes the
length of the UDP header itself, so subtract the length of the header
when using it to limit the length of the payload tvbuff.

Clean up the computing of the captured length of the payload tvbuff (we
really should get rid of the "length" argument to "tvb_new_subset()",
and have it compute the captured length based on the supplied reported
length and the amount of that data actually present in the parent
tvbuff).

Don't fetch the length and checksum fields until we use them (so that we
don't throw an exception until then, and fail to process the source and
destination ports), and check whether the length is bogus regardless of
whether we're building a protocol tree or not.

svn path=/trunk/; revision=12444
2004-10-30 10:04:35 +00:00
Guy Harris 6d9c6770bb Squelch some compile warnings.
svn path=/trunk/; revision=12443
2004-10-30 09:19:14 +00:00
Guy Harris a3439d24fb Check for errors from all calls to "file_getc()".
If we get such an error, always call "file_error()" to get an indication
of what the error was and, if it returns 0, set the error to
WTAP_ERR_SHORT_READ.

svn path=/trunk/; revision=12442
2004-10-30 09:14:36 +00:00
Guy Harris 212015b7ff The length of the protocol tree item passed to "dissect_ppp_common()"
should be the length of the packet being dissected, so that if we throw
an exception dissecting it, the item covers the entire packet (because
it's incomplete, and thus *all* of it is the beginning of the header).

Instead, we should pass the length of the part of the header prior to
the protocol field as an argument to "dissect_ppp_common()", and it
should use that to set the length of that item.

svn path=/trunk/; revision=12441
2004-10-30 08:45:10 +00:00
Guy Harris bbd6db0f46 The interface name field is 6 bytes if we *do* have UUID information in
the file and 10 bytes if we *don't*.

Small language edits in preference text and blurb.

svn path=/trunk/; revision=12440
2004-10-30 07:47:50 +00:00
Guy Harris 6c1c5fc3e7 From Martin Pichlmaier: the first 4 bytes of the Symantec firewall
header are the IP address of the interface that saw the packet.

svn path=/trunk/; revision=12439
2004-10-30 07:23:55 +00:00
Ronnie Sahlberg b1e1e18ad1 change Extension to be implemented inside the conformance file and remove it from the template
svn path=/trunk/; revision=12438
2004-10-30 02:36:58 +00:00
Ronnie Sahlberg 805f948c29 implement AlgorithmIdentifier using the conformance file and remove it from the template
svn path=/trunk/; revision=12437
2004-10-30 02:18:44 +00:00
Ronnie Sahlberg ee310edcda fix call_ber_iod_callback() to move offset past the end of the current blob.
svn path=/trunk/; revision=12436
2004-10-30 01:54:40 +00:00
Gilbert Ramirez 840c4b0505 Add netscreen2dump.py, to convert netscreen packet-trace hex dumps
to hex dumps that can be read by text2pcap.

svn path=/trunk/; revision=12435
2004-10-29 15:09:00 +00:00
Ronnie Sahlberg b2160d6d25 update to cms to use workaround to lack of ANY and reducing the template significantly
svn path=/trunk/; revision=12434
2004-10-29 12:11:42 +00:00
Ronnie Sahlberg 076d4710ec more updates of x509if
svn path=/trunk/; revision=12433
2004-10-29 11:39:58 +00:00
Ronnie Sahlberg deae759020 new generated version of x509if
svn path=/trunk/; revision=12432
2004-10-29 11:11:11 +00:00
Ronnie Sahlberg 0e7d35f8b4 Update to x509if use a workaround to emulate the type ANY and remove stuff from teh template
svn path=/trunk/; revision=12431
2004-10-29 11:10:31 +00:00
Guy Harris 62612c70aa From Yaniv Kaul: dissect authentication data as NTLMSSP only if it
starts with "NTLMSSP", otherwise dissect it as GSS-API.

svn path=/trunk/; revision=12430
2004-10-29 08:01:11 +00:00
Guy Harris 1e6a5d408c As Sam Leffler notes, the radiotap header isn't BSD-only, it's also used
by his madwifi Atheros driver on Linux; rename
WTAP_ENCAP_IEEE_802_11_WLAN_BSD to WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP,
and change its text name from "ieee-802-11-bsd" to
"ieee-802-11-radiotap".

svn path=/trunk/; revision=12429
2004-10-29 02:40:01 +00:00
Guy Harris 898c26a82f Have the usual three separate buffers for "format_text()", so that it
can be used multiple times in a single formatting call.

svn path=/trunk/; revision=12428
2004-10-29 00:39:56 +00:00
Guy Harris e09e12621a The common merge code merely needs to offer the abstraction of routines
that return the next packet from a set of {chronologically sorted,
sequential-by-file} packets; it doesn't need to have a loop over all
those packets, or any code to write packets.

Supply those abstractions, change the code that merges packets to do its
own writing, and have the Ethereal version manage a progress bar and
have the mergecap version print packet numbers in verbose mode, as the
common merge code used to do.

svn path=/trunk/; revision=12427
2004-10-29 00:36:52 +00:00
Gerald Combs 24f30a8850 Add support for pkauthdata and pkdhkeydata OIDs.
svn path=/trunk/; revision=12426
2004-10-28 22:06:55 +00:00
Ronnie Sahlberg bef8e01fcd fix small bug that gets offset confused for CHOICE { } OPTIONAL if there were no arms that matched
svn path=/trunk/; revision=12425
2004-10-28 11:35:43 +00:00
Guy Harris ea673ada7a The offset to the first IFD in a TIFF file is 4 bytes long, not 2 bytes
long.

The offset is relative to the first byte of the TIFF structure, which is
after the "Exif\0" *and* the extra byte after "Exif\0".

Loop over all IFDs.

Sanity check the offset to the first IFD and the offset in each IFD to
the next IFD.

svn path=/trunk/; revision=12424
2004-10-28 07:50:07 +00:00
Guy Harris 66e85e4e43 Make "merge_files()" and "merge_append_files()" return a tri-state
indication - success, read failure, write failure - and have their
callers handle read failures by looking for the file that got the read
failure and reporting the failure in question.

Free up the err_info string returned by "wtap_read()" after using it.

svn path=/trunk/; revision=12423
2004-10-28 01:52:05 +00:00
Guy Harris dc2280bc1e Remove all the verbose-mode code from merge.c, and put most of it in
mergecap.c (get rid of the verbose printing of information for each
packet).

Have "merge_append_files()" return FALSE only on a write error, as
"merge_files()" does.

Sort the routines in "merge.c" in the order from "merge.h".

svn path=/trunk/; revision=12422
2004-10-28 01:06:11 +00:00
Guy Harris d9bdadc4dd Get rid of merge_n_files() - it's only called in one place now, and
absorbing its logic into "cf_merge_files()" simplifies things a bit.

svn path=/trunk/; revision=12421
2004-10-27 23:45:10 +00:00
Guy Harris b48b8847b1 Change some of the merge.c APIs to return more information on failure,
and use that information to provide better error messages.

Have "merge_open_outfile()" do all the work of filling in the
merge_out_file_t structure, with the values to use passed as arguments. 
Get rid of some structure members that used to be used solely to pass
information to "merge_open_outfile()".

Add a "cf_merge_files()" routine to do the merging and reporting of errors.

svn path=/trunk/; revision=12420
2004-10-27 23:28:37 +00:00
Guy Harris 21e7c6bc78 "dissect_MAP_Dialogue()" returns no value; declare its return value as
"void".

Fix a typo in the MAP Dialogue dissector template .h file.

Re-generate the MAP Dialogue dissector files and set svn:keywords to Id
and svn:eol-style to native for them.

svn path=/trunk/; revision=12419
2004-10-27 21:16:18 +00:00
Guy Harris ba80dd691f Turn off execute permission on .asn files.
svn path=/trunk/; revision=12418
2004-10-27 20:36:20 +00:00
Guy Harris 8ca8879a2b Fix a typo in the name of the directory for the MAP dialogue ASN.1
files.

Set svn:eol-style to native for those files, and get rid of trailing
CRs.

Set svn:keywords to Id for those files.

svn path=/trunk/; revision=12417
2004-10-27 20:34:21 +00:00
Anders Broman 9315137a65 Add a MapDialouge dissector ( can be tested with the file gsm-ss-01.snoop )
svn path=/trunk/; revision=12416
2004-10-27 20:17:38 +00:00
Anders Broman a2ace4a6c4 Add a MAPdialouge dissector
svn path=/trunk/; revision=12415
2004-10-27 20:08:44 +00:00
Anders Broman 784fece9c0 Improve OID dissection and make it possible to call an "OID" Dissector for Dialougedata parameter.
svn path=/trunk/; revision=12413
2004-10-27 20:04:56 +00:00
Anders Broman 0510221c29 Make it possible to register a string for an OID in the hash table.
svn path=/trunk/; revision=12412
2004-10-27 19:59:44 +00:00
Guy Harris 7d4248680d Fix indentation.
svn path=/trunk/; revision=12411
2004-10-27 19:36:48 +00:00
Guy Harris 62988d944a Check whether any input files were specified, and print an error for
that - otherwise, you get a "No valid input files" message, which
perhaps doesn't make it clear enough that the problem is that there were
no input files, period.

svn path=/trunk/; revision=12410
2004-10-27 19:36:22 +00:00
Guy Harris b18338c3e6 Add unix2dos.pl to the list of files to be distributed.
svn path=/trunk/; revision=12409
2004-10-27 19:26:01 +00:00
Ulf Lamping ebeac29b64 two more dia diagrams about Ethereals capture engine and updated the first one
svn path=/trunk/; revision=12408
2004-10-27 19:12:51 +00:00
Ulf Lamping cd6da8590f a dia diagram about Ethereal development (hopefully later some more)
svn path=/trunk/; revision=12407
2004-10-27 17:20:25 +00:00
Guy Harris 948d61bae1 Check to make sure we don't give a protocol tree item a negative length.
Clean up indentation.

If we dissect an octet string and then re-dissect it as a particular
type of data, don't use the end offset from the re-dissection as the
offset of the end of the octet string - just use the result of
"dissect_per_octet_string()".

svn path=/trunk/; revision=12406
2004-10-27 10:02:45 +00:00
Ulf Lamping de1852ed3b fix doxygen generation
svn path=/trunk/; revision=12405
2004-10-27 04:46:17 +00:00
Ulf Lamping e0bbf855d9 fix doxygen tags
svn path=/trunk/; revision=12404
2004-10-27 04:45:00 +00:00
Ulf Lamping 5fed058707 fix doxygen generation
svn path=/trunk/; revision=12403
2004-10-27 04:03:31 +00:00
Ulf Lamping 5d7291d197 fix doxygen generation
svn path=/trunk/; revision=12402
2004-10-27 03:59:02 +00:00
Ulf Lamping 401945dde2 fix doxygen tags
svn path=/trunk/; revision=12401
2004-10-27 03:57:57 +00:00
Guy Harris 816267f2c1 Don't have two variables, in different scopes in the same routine, have
the same name.

Fix up alignment.

svn path=/trunk/; revision=12400
2004-10-27 02:52:40 +00:00
Guy Harris 685bbf7b35 Encapsulate into a macro the idiom
if(offset&0x07){
		offset=(offset&0xfffffff8)+8;
	}

for byte-aligning a bit offset.

svn path=/trunk/; revision=12399
2004-10-27 02:34:30 +00:00
Guy Harris b2c1c3d0e5 Document the personal capture and display filters list in the FILES
section, as is done for other files.  Just refer to those files in the
section for the "Save" button for the capture and display filter dialog
boxes.

svn path=/trunk/; revision=12398
2004-10-26 23:30:33 +00:00
Guy Harris e8727b5615 Fix the file name in the initial comment.
svn path=/trunk/; revision=12397
2004-10-26 18:41:25 +00:00