Commit graph

241 commits

Author SHA1 Message Date
Ulf Lamping
b45b0f5547 bugfix from previous check in
svn path=/trunk/; revision=10170
2004-02-21 14:04:17 +00:00
Ulf Lamping
2509c20b61 quit_after_cap should be a gboolean, not an int, and it should be initialized
svn path=/trunk/; revision=10169
2004-02-21 13:40:06 +00:00
Ulf Lamping
ba50469654 rework of capture.c: better seperation of sync and capture pipe by using
explicit names and seperated functionality of do_capture(),
but no functional change!

svn path=/trunk/; revision=10168
2004-02-21 12:58:42 +00:00
Guy Harris
727b913bbd Add an "open_failure_alert_box()" routine to pop up an alert box for a
failed attempt to open/create a file.

Fix one call to pass the right value for the "for_writing" flag.

svn path=/trunk/; revision=10026
2004-02-11 01:23:25 +00:00
Ulf Lamping
1987113fa6 bugfix: close capture file again, if empty after capturing
(bug appears only, if "update list of packets ..." not used)

svn path=/trunk/; revision=10017
2004-02-09 19:19:19 +00:00
Guy Harris
4b5d510056 Tweak the error messages for bad capture filters.
svn path=/trunk/; revision=9974
2004-02-03 20:48:50 +00:00
Ulf Lamping
41cd2385c3 ups, moved previously missing %s to the right place
svn path=/trunk/; revision=9970
2004-02-03 19:54:08 +00:00
Guy Harris
1d7a46d039 Add a missing "%s" to the format string.
svn path=/trunk/; revision=9967
2004-02-03 18:39:52 +00:00
Ulf Lamping
1d2c791ab6 enhanced some dialog messages,
close capture file when user told so

svn path=/trunk/; revision=9965
2004-02-03 17:59:01 +00:00
Guy Harris
1980fa5dbf Pass ESD_BTN_OK rather than NULL as a second argument to
"simple_dialog()"; NULL might be #defined to be a pointer expression on
some platforms, causing compiler warnings (and, on platforms where a
null pointer doesn't have all its bits 0, possibly causing misbehavior,
although I don't think there are any such platforms on which Ethereal
runs).

Don't allow 0 as button mask argument to "simple_dialog()".

Squelch a compiler warning.

Report fatal problems as errors, not warnings.

Report file I/O errors with "file_open_error_message()".

Report file write errors (including those reported by "close()", e.g.
some errors writing to an NFS server) when saving raw packet data to a
file.

svn path=/trunk/; revision=9915
2004-01-31 03:22:42 +00:00
Guy Harris
61e26a56ba Add some more information to the error message for invalid capture
filters that look like display filters.

svn path=/trunk/; revision=9914
2004-01-31 02:29:19 +00:00
Ulf Lamping
25edd1c53e renamed ESD_TYPE_CRIT to ESD_TYPE_ERROR to
better reflect the real error text

svn path=/trunk/; revision=9913
2004-01-31 02:25:46 +00:00
Guy Harris
d90d26ece2 If "pcap_compile()" fails to compile an empty filter string (because,
for example, the libpcap code generator doesn't support the link-layer
type for the capture), "dfilter_compile()" will succeed but return a
null rfcode pointer.

In that case, instead of telling people that it looks like a valid
display filter (which it does, but it also looks like a complete list of
all the Basque words likely to be known by Hammurabi :-)), and then
crashing when we try to "free" that non-existent dfilter code, we just
report it as a "sorry, couldn't compile that capture filter.

svn path=/trunk/; revision=9912
2004-01-31 01:32:51 +00:00
Guy Harris
d6cd61061e Have the Wiretap open, read, and seek-and-read routines return, in
addition to an error code, an error info string, for
WTAP_ERR_UNSUPPORTED, WTAP_ERR_UNSUPPORTED_ENCAP, and
WTAP_ERR_BAD_RECORD errors.  Replace the error messages logged with
"g_message()" for those errors with g_strdup()ed or g_strdup_printf()ed
strings returned as the error info string, and change the callers of
those routines to, for those errors, put the info string into the
printed message or alert box for the error.

Add messages for cases where those errors were returned without printing
an additional message.

Nobody uses the error code from "cf_read()" - "cf_read()" puts up the
alert box itself for failures; get rid of the error code, so it just
returns a success/failure indication.

Rename "file_read_error_message()" to "cf_read_error_message()", as it
handles read errors from Wiretap, and have it take an error info string
as an argument.  (That handles a lot of the work of putting the info
string into the error message.)

Make some variables in "ascend-grammar.y" static.

Check the return value of "erf_read_header()" in "erf_seek_read()".

Get rid of an unused #define in "i4btrace.c".

svn path=/trunk/; revision=9852
2004-01-25 21:55:17 +00:00
Guy Harris
46848f0a9e Add a new "file_open_error_message()" routine in "epan/filesystem.c", to
translate UNIX errno values to a somewhat friendly message format
string.

Rename "file_open_error_message()" in "file.c" to
"cf_open_error_message()", make "cf_open_error_message()" use the new
"file_open_error_message()" for UNIX errno values, have "do_capture()"
in "capture.c" use "file_open_error_message()" to report errors from
"open()", and make "cf_open_error_message()" static as nothing outside
"file.c" uses it.

Do similar stuff in "tethereal.c".

svn path=/trunk/; revision=9821
2004-01-24 01:44:29 +00:00
Guy Harris
71887f8792 Use "fork_child" rather than "child_process" - on Win32, "child_process"
tracks "fork_child", and, on UNIX, "child_process" doesn't exist.

svn path=/trunk/; revision=9783
2004-01-22 20:45:49 +00:00
Ulf Lamping
cf57056f70 bugfix: wrong parameter name
svn path=/trunk/; revision=9778
2004-01-22 19:25:36 +00:00
Ulf Lamping
a0f78e3b8f moved GTK specific parts from capture.c to ui_util.c,
implemented Win32 "Capture Stop" when using
"update list of packets in realtime" while capturing

svn path=/trunk/; revision=9777
2004-01-22 18:13:57 +00:00
Ulf Lamping
ef57df088f a.) saving GTK1 and GTK2 fontnames in different preference setting, to prevent problems when switching between GTK1 and GTK2 ethereal versions
b.) added new feature "Edit->Go To First Packet" "Edit->Go To Last Packet" with corresponding menu and toolbar items
c.) added new feature "View->Zoom In" / "View->Zoom Out" / View->Normal Size" with corresponding menu and toolbar items
This feature will act as a "size offset" to the current fontsize, so that the packet list/tree view/... will have a larger/smaller font size.
The value is stored inside the recent file.
d.) Win32 only: Try to get the win32 system font and fontsize at program startup and show the menus/dialogs and such with the same font and fontsize like other win32 windows.
This makes the program make a *lot* more feel like a normal win32 program.

svn path=/trunk/; revision=9753
2004-01-20 18:47:25 +00:00
Guy Harris
6033a79387 Update the Win32 information given when we fail to open a capture device
to note that the 3.0 and later versions of WinPcap don't support PPP/WAN
captures even on Windows OT.

svn path=/trunk/; revision=9709
2004-01-18 04:13:44 +00:00
Ulf Lamping
0d9679de8d removed some MSVC warnings (level 3)
svn path=/trunk/; revision=9561
2004-01-05 19:31:44 +00:00
Ulf Lamping
3b77bfee59 removed some MSVC warnings (moved pcap.h before glib.h)
svn path=/trunk/; revision=9393
2003-12-21 12:19:39 +00:00
Guy Harris
e65abd0ef4 Top-of-tree and top-of-0.8-branch libpcap support limited filtering on
DLT_LINUX_IRDA (empty expression and "link[M:N]" expressions), so don't
special-case IRDA adapters.

svn path=/trunk/; revision=9349
2003-12-18 21:18:34 +00:00
Guy Harris
b8299f0b98 From Jan Kiszka: IrDA support.
svn path=/trunk/; revision=9345
2003-12-18 19:07:14 +00:00
Guy Harris
08f3ea2cf3 Fix a typo.
svn path=/trunk/; revision=8983
2003-11-17 19:40:09 +00:00
Guy Harris
d9ad0a2062 Get rid of a no-longer-used variable.
svn path=/trunk/; revision=8980
2003-11-17 00:26:30 +00:00
Ulf Lamping
bca18fcf68 seperated capture dialog from capture.c and put into new gtk/capture_info_dlg.c
svn path=/trunk/; revision=8968
2003-11-15 08:48:14 +00:00
Guy Harris
f4d0c0d9c2 When it comes to whether to use "select()" or not, even if you're
building in Cygwin's pretend-it's-UNIX environment, we need to treat the
platform as Windows.

Get rid of the BSD #define - just check for the platforms on which we
mustn't use "select()".

svn path=/trunk/; revision=8967
2003-11-14 21:18:06 +00:00
Guy Harris
219b6cefa2 Based on a patch from Brian Fundakowski Feldman, add support for setting
link-layer type when capturing, using the "pcap_set_datalink()" and
related APIs.

svn path=/trunk/; revision=8848
2003-11-01 02:30:18 +00:00
Jörg Mayer
5d4949f2dd Part 3 of display vs. capture syntax confusion patches: Detect probable
use of display filter syntax where capture filter syntax need to be used
in Ethereal.

svn path=/trunk/; revision=8677
2003-10-11 21:49:56 +00:00
Guy Harris
b4746f3546 Make sure we return FALSE in all the failure paths in "do_capture()".
svn path=/trunk/; revision=8483
2003-09-15 23:48:42 +00:00
Guy Harris
2e98c97118 Don't pop up tap windows specified with "-z" options until we have a
capture file open.

svn path=/trunk/; revision=8480
2003-09-15 23:15:32 +00:00
Guy Harris
14509164fc Rename various capture file routines to have names starting with "cf_".
svn path=/trunk/; revision=8479
2003-09-15 22:48:42 +00:00
Guy Harris
183fa7f482 Give a more detailed message when WSAStartup fails.
svn path=/trunk/; revision=8069
2003-07-23 05:01:15 +00:00
Laurent Deniel
3070b797d5 Implement a ring buffer switch duration:
when the new "Rotate capture file every n second(s)" checkbox or the
-b <# of file>[:<duration>] argument are used, [t]ethereal will skip to the
next ring buffer file if the specified duration has elapsed (even if the
specified capture size is not reached). This is useful when you want to have
separate capture files per hour or day for instance.

I let the autostop filesize parameter mandatory (i.e. the "rotate capture
file after n kilobytes") but this could be no longer strictly necessary when
that new feature is used ...

Another point: it might be interesting to really truncate the file at the
switch and not the closure ... According to user comments and my own real
case tests, I might plan to enhance this point and others (still ring buffer
related) in the future.

svn path=/trunk/; revision=7678
2003-05-15 13:40:20 +00:00
Guy Harris
eb8c0fb210 Don't ignore SIGCHLD - doing so means that, on many platforms, we don't
get any status information from the child process when it terminates,
and we want that status information (e.g., death due to a signal).

svn path=/trunk/; revision=7549
2003-04-24 09:07:36 +00:00
Guy Harris
5b1484f7b3 From a look at the Linux ARCNET code, it appears that no frame delivered
to the networking stack will have an exception frame header.

Note, however, that on the BSD's ARCNET might be a bit of a mess.

svn path=/trunk/; revision=6986
2003-01-23 09:04:54 +00:00
Guy Harris
498c94b10a Add a "capture_arcnet()" routine and use it when capturing.
In "dissect_arcnet_common()", fetch the protocol ID using the correct
offset rather than a hardwired 4.

svn path=/trunk/; revision=6982
2003-01-23 06:57:37 +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
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
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
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
462a1b80b4 Correctly compute the minutes portion of the elapsed time.
svn path=/trunk/; revision=6797
2002-12-18 06:44:50 +00:00
Guy Harris
22496138e9 Add a capture routine for IP-over-FC, and call it from the capture code.
svn path=/trunk/; revision=6767
2002-12-08 22:35:30 +00:00
Guy Harris
926a65f2f0 Suppress compiler warnings on platforms where "time_t" is a "long",
without introducing warnings where it's an "int".

svn path=/trunk/; revision=6459
2002-10-19 07:52:12 +00:00
Guy Harris
b99f379f55 From Ulf Lamping: show total running time of capture in capture progress
dialog box.

svn path=/trunk/; revision=6440
2002-10-16 23:34:52 +00:00
Guy Harris
63d65a3f69 From Ulf Lamping: count ARP packets in capture progress dialog box.
svn path=/trunk/; revision=6416
2002-10-14 17:33:50 +00:00
Guy Harris
2dcc8ee1fc From Ulf Lamping: keep "Update list of packets in real time" from
crashing on Windows.

svn path=/trunk/; revision=6387
2002-10-09 08:18:37 +00:00