Commit Graph

280 Commits

Author SHA1 Message Date
Guy Harris 802a3977bf Make Ethereal and Tethereal compile if we're building without libpcap.
svn path=/trunk/; revision=13346
2005-02-07 20:52:59 +00:00
Guy Harris d01ae28b6f Suppress the packet counts when we're reading from a file.
svn path=/trunk/; revision=13342
2005-02-07 19:42:32 +00:00
Guy Harris da36197902 Tethereal can write to a file in binary even if not built with libpcap.
svn path=/trunk/; revision=13341
2005-02-07 19:33:49 +00:00
Guy Harris 6e58e3984b Clean up indentation.
The default for "capture_options.save_file" is a null pointer, meaning
we're not writing to a save file, we're writing out the dissection as
text.

svn path=/trunk/; revision=13340
2005-02-07 19:11:45 +00:00
Guy Harris 2b7b39bb6f "iface" is now a member of "capture_opts", not "cfile".
svn path=/trunk/; revision=13326
2005-02-06 22:21:51 +00:00
Ulf Lamping 3a63719e38 another two steps towards privilege seperation:
move another two capture related fields (iface and cfilter) from cfile to capture_opts

also move the handling of capture related command line options from main.c to capture.c, that way a future privilege seperated capture program can use the same code to parse it's command line than Ethereal. 
It might be even possible to share this parser code even with Tethereal, didn't took a closer look at this.

svn path=/trunk/; revision=13320
2005-02-06 21:20:35 +00:00
Guy Harris fa3e5609ab Put "cf_status_t" back.
svn path=/trunk/; revision=13303
2005-02-05 12:50:47 +00:00
Guy Harris 3e07757e58 Make "cf_open()" match the prototype in "file.h".
svn path=/trunk/; revision=13302
2005-02-05 12:08:01 +00:00
Guy Harris 2c89242aac Instead of having a single enumerated type for status return values from
cf_ functions, have separate ones for different classes of routines, and
use gboolean when the return value is just "success" or "failure" - that
way you don't get compiler warnings if a case statement isn't handling a
particular status value if the routine in question won't return it.

svn path=/trunk/; revision=13293
2005-02-04 20:54:12 +00:00
Ulf Lamping 0861927ce3 huge cleanup of capture file API (functions in file.c/file.h).
This includes: all functions in file.h now have a cf_ prefix, will have doxygen tags, will have the capture_file *cf as the first parameter and I tried to generalize the return values for non trivial functions.

Hopefully, I didn't introduced any new bugs, as I had to change a lot of files...

svn path=/trunk/; revision=13289
2005-02-04 18:44:44 +00:00
Ulf Lamping dd71ad695f (some) redesign of capture data structures.
don't use global cfile at all but only an untpyed handle to call the cf_... functions in file.c
move the save_file member from capture_file to capture_opts, as it's only used while capturing and while preparing it

svn path=/trunk/; revision=13276
2005-02-04 01:29:29 +00:00
Ulf Lamping 9ff19a4c94 move capture_file_fd field from capture_file to capture_opts type, as this is the place where it should be
svn path=/trunk/; revision=13268
2005-02-03 22:48:20 +00:00
Ulf Lamping be0e6a0631 prevent ringbuffer from having to know about capture_file type at all (decoupling dependencies)
svn path=/trunk/; revision=13266
2005-02-03 21:58:33 +00:00
Guy Harris 5485b96a9a Report a friendlier name, if possible, when capturing in Tethereal.
svn path=/trunk/; revision=13062
2005-01-16 03:09:05 +00:00
Guy Harris f1deabed56 Make the tone of the error messages a bit less formal, by using
contractions.  (Safari does, at least when you're trying to open a file
to which you don't have read access.)

svn path=/trunk/; revision=12852
2004-12-29 01:08:20 +00:00
Guy Harris cab22a15bd Move the #ifdef/#endif a bit so that the entire chunk of
live-capture-related-code is inside it.

svn path=/trunk/; revision=12651
2004-12-01 23:55:43 +00:00
Ronnie Sahlberg 5102dbe323 minor fix to tethereal to allow it to compile with --without-pcap
svn path=/trunk/; revision=12650
2004-12-01 23:47:14 +00:00
Guy Harris 196e04bf74 As per Sebastian Felis, don't assume that doubling the size of the line
buffer will necessarily be sufficient to make it big enough to handle
what's being added to the buffer - continue doubling the size until it
is.

Put the code to maintain the line buffer into a routine.

As that buffer is maintained as being large enough to handle what's
being put into it, there's no need to use "snprintf()" to print into it.

svn path=/trunk/; revision=12508
2004-11-11 11:50:26 +00:00
Guy Harris 6aaf948795 If we're not printing packet information, don't print the preamble or
finale for that information, either.

svn path=/trunk/; revision=12352
2004-10-19 22:43:52 +00:00
Jörg Mayer 54e0e363a9 Get rid of warnings about shadowed variables (code was ok)
svn path=/trunk/; revision=12171
2004-10-01 12:31:52 +00:00
Guy Harris 7f5b234c5c Move the column preferences stuff to epan (the rest of the preferences
stuff is already there).

Update Gerald's e-mail address in column.h.

svn path=/trunk/; revision=12131
2004-09-29 02:54:22 +00:00
Guy Harris 6472876ab3 Move the tap infrastructure to the epan directory.
svn path=/trunk/; revision=12128
2004-09-29 00:06:36 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Guy Harris 8e90f07c71 Hoist the code for handling "-G" into a common module.
svn path=/trunk/; revision=11956
2004-09-10 22:47:02 +00:00
Gilbert Ramirez f676f7107b Add a "-G fields2" option which is like "-G fields", but extends the field
records by tw fields: base (for integers), and blurb

Add a "-G values" option which shows value strings and true_false strings for
the fields that have them.

svn path=/trunk/; revision=11954
2004-09-10 15:21:20 +00:00
Guy Harris 10d4e3873a When opening an output file, use "file_snaplen" as the snapshot length,
rather than "pcap_snapshot(ld.pch)" - we've set "file_snaplen" to
"pcap_snapshot(ld.pch)" if we're capturing from a device, but if we're
reading from a pipe, "ld.pch" is null (so we'll crash if we use it), and
we've set "file_snaplen" from the header we've read from a pipe.

svn path=/trunk/; revision=11734
2004-08-13 08:27:58 +00:00
Guy Harris 3a583aeb59 From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an
include of <resolv.h> in any system header file gets the system
<resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]).

svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
Gilbert Ramirez e8c27ad10c Mention psml as a valid option to -T in the usage statements.
svn path=/trunk/; revision=11607
2004-08-06 03:36:28 +00:00
Guy Harris 07658bc75c Disallow "-f" when not doing a live capture, rather than just ignoring
the specified filter.

Note in the manual that you can't use capture filters when reading a
capture file, and that read filters might require too much CPU when
doing a live capture.

svn path=/trunk/; revision=11594
2004-08-03 02:52:48 +00:00
Guy Harris 5a3ab160c1 Make some generic print routines that take, as an argument, a pointer to
a structure containing a pointer to print operations for that object and
a pointer to the private subclass-dependent data for that object, with
subclasses for text and PostScript, and use those rather than the old
scheme where a print format was passed as an argument - or where (as in
the case of printing summary information in Tethereal) we just printed
as text even if "-T ps" was selected.

Check whether those routines succeed or get an I/O error writing output.

Clean up indentation.

svn path=/trunk/; revision=11514
2004-07-25 08:53:38 +00:00
Guy Harris a6b4a098ff "-T ps" should not imply "-V"; one should be able to get a list of
packet summaries in PostScript.

svn path=/trunk/; revision=11512
2004-07-25 08:32:32 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Gerald Combs 8106dc0862 Convert make-version.pl and the associated cvsversion.h and CVSVERSION
definition to Subversion.  "svn info" prints out the last changed date
of the repository, so we don't have to go hunting through "CVS/Entries"
files anymore.


svn path=/trunk/; revision=11379
2004-07-15 21:09:33 +00:00
Guy Harris 49283faa17 Don't complain about "-T pdml" or "-T psml" being combined with "-x"
only if "-x" was specified.

svn path=/trunk/; revision=11349
2004-07-09 09:21:07 +00:00
Guy Harris b650d01031 Make the "human-readable text vs. PSML vs. PDML" choice separate from
the "text vs.  PostScript" choice.  The "text vs. PostScript" choice
should probably ultimately be done with a generic set of print methods,
to handle various platform-native print mechanisms more cleanly (and
perhaps the dialog box code for "export as {PDML,PSML}" should be
separate from the "export as text"/"print" dialog).

svn path=/trunk/; revision=11342
2004-07-08 10:36:29 +00:00
Guy Harris 155117bd61 Fix the error for a WTAP_ERR_UNSUPPORTED_ENCAP read error to more
accurately reflect the problem (it's not that the entire file has a
network type we don't handle - if it did, we'd have failed when we tried
to open it - it's that the packet we tried to read does).

svn path=/trunk/; revision=11341
2004-07-08 07:47:29 +00:00
Guy Harris f9be24cd13 On Windows, if "get_interface_list()" returns CANT_GET_INTERFACE_LIST
and the error message includes "Not enough storage is available
to process this command" or "The operation completed successfully",
suggest that the user install a WinPcap version later than 3.0 - this is
definitely a Frequently Asked Question on the Ethereal list.

svn path=/trunk/; revision=11143
2004-06-12 07:47:14 +00:00
Guy Harris d16eb303f5 Move the ring-buffer tests from "process_packet()" to
"capture_pcap_cb()"; they're only done in live captures, and that
arranges that "process_packet()" gets called with the correct
wtap_dumper for the current file even if we switch to a new file.

Move the packet-count reporting out of "write_packet()" to
"capture_pcap_cb()" as well, as that's also only done in live captures.
That pretty much guts "write_packet()", so just move what's left up to
"process_packet()".

svn path=/trunk/; revision=11131
2004-06-10 08:01:51 +00:00
Guy Harris c8c2bab1b9 Add a routine that indicates where there are any tap listeners
registered (not whether there are any tap *filters* registered).

Do dissection in Tethereal iff:

	we're printing information about each packet;

	we're using a read filter on the packets;

	there are any tap listeners registered (even if there are no tap
	filters registered - not all taps use filters).

svn path=/trunk/; revision=11040
2004-05-31 09:53:21 +00:00
Guy Harris 0d1fb8c108 Make "-q" suppress packet printing when you're reading a capture file
and not writing to another capture file, for use with "-z" options.

Note that "-z proto" *doesn't* print statistics at the end - it modifies
the packet summary output.

Note that on at least some BSDs the "status" character is set to "off"
by default, so you have to set it explicitly in order to be able to ^T
an application such as Tethereal.

svn path=/trunk/; revision=11038
2004-05-31 08:41:32 +00:00
Guy Harris 8a429808e7 Move the packet counting, dissecting, and filtering out of the "write
packet" and "print packet" callbacks into a common routine, so that we
don't count packets twice if we're counting and dissecting.

Print the packet count with ^T iff we're not updating a displayed packet
count as packets arrive, regardless of whether we're printing packet
information, saving packets to a file, or both (tcpdump prints it
regardless of whether it's printing packet information or saving packets
to a file).

svn path=/trunk/; revision=11037
2004-05-31 07:52:27 +00:00
Guy Harris 15af0f656f From Lars Roland: add support for building a libethereal.dll with MSVC:
add a config.nmake option to control whether to build
	libethereal.dll or not;

	remove "./wiretap" from PATH to prevent problems due to
	wrongly-loaded files;

	build dissector.lib with MSVC;

	move "print.c" and "ps.c" to the dissector helpers, as "print.c"
	imports variables from packet-frame.c and packet-data.c, which
	are in libethereal;

	move "g711.c" out of the dissector helpers, as they're used only
	by Ethereal in a tap, not in Tethereal or in any dissector;

	add a .def file for libethereal;

	arrange to declare global variables exported from libethereal
	with "__declspec(dllimport)" when building programs that import
	those variables;

	update the NSIS installer.

Make the "configure" script define ETH_VAR_IMPORT as "extern".

svn path=/trunk/; revision=10834
2004-05-09 10:03:41 +00:00
Ulf Lamping 1531315c18 some code cleanup of the printing system
svn path=/trunk/; revision=10682
2004-04-24 23:13:46 +00:00
Ulf Lamping 51f987e04f added some options and enhancements to the print output:
-ps: added formatting hints for ghostscript, so pdf conversion will be much better
-ps: print a thin line at the top and bottom of each page
-ps/text: add an option to start a new page for every packet (formfeed)

svn path=/trunk/; revision=10660
2004-04-22 17:03:21 +00:00
Ulf Lamping 91e61df84e changed postscript output:
reduced print margin to 1/2 inch and font size to 8 point,
include filename in page header,
wrap too long lines

svn path=/trunk/; revision=10652
2004-04-20 22:34:08 +00:00
Guy Harris d209115ba3 Add a "report_failure()" routine to allow dissectors to report arbitrary
errors to the user.  Use that, rather than "g_warning()", in the
Diameter dissector to report errors reading the dictionary.

Make the format argument to "simple_dialog()" a "const" pointer.

Fix up the read-error message in Tethereal to end with a newline.

If a simple dialog is requested before the main window or the
capture-control window is popped up, queue it up and pop the queued
messages up once the main or capture-control window is displayed.

svn path=/trunk/; revision=10616
2004-04-16 23:17:13 +00:00
Ulf Lamping 8c42aa51f7 make print dialog "Packet Format" options somewhat similar to the
Ethereal panes, thus better understandable

svn path=/trunk/; revision=10611
2004-04-16 18:17:48 +00:00
Guy Harris 121f06fab7 Make "epan_init()" take, as additional arguments, pointers to routines
that dissectors should call to report file open and read errors, and
have "report_open_failure()" and "report_read_failure()" call through
those pointers, rather than being defined and exported by the
application using libethereal - instead, the application would define
those functions and pass pointers to them to 'epan_init()".

Move "report_err.h" to the epan directory, as the functions it declares
are now part of the libethereal API.

svn path=/trunk/; revision=10470
2004-03-23 21:19:58 +00:00
Olivier Biot 11f9232336 From Lars Roland: Move timestamp_type into libethereal and provide accessor
methods for getting and setting the timestamp type.

This is a move towards a real libethereal shared library.

svn path=/trunk/; revision=10402
2004-03-18 19:04:33 +00:00
Gerald Combs fc60101a9f Move cvsversion.h from BUILT_INCLUDES to BUILT_SOURCES. This tells automake
to create cvsversion.h before any "all" or "check" targets are built.

Clean up a few CVS version strings that I missed last week.

svn path=/trunk/; revision=10199
2004-02-23 16:12:52 +00:00