6272bd1578
In cap_pipe_open_live(), be sure to call ws_close(fd) before returning due to a couple of error condtions. Fixes Coverity CID 702395 Resource leak.
...
svn path=/trunk/; revision=42844
2012-05-25 01:32:26 +00:00
fb8054f131
Expand a comment.
...
Clear the struct sigaction *before* we fill in any fields in it.
svn path=/trunk/; revision=42706
2012-05-18 04:06:35 +00:00
bdb614e264
Fix a bunch of uninitialized variables found by Coverity Scan. CIDs
...
702403, 702404, 702405, 702406, 702407, 702408, 702409, 702410, 702411,
and 702412.
svn path=/trunk/; revision=42658
2012-05-16 16:29:12 +00:00
9d4b7ad9fe
From Evan Huus:
...
In get_capture_device_open_failure_messages() in dumpcap.c, there are some
statements that should have been guarded by ifdefs, causing a little
unnecessary work on some platforms, and a bunch of unused-variable warnings
from static analyzers. The patch fixes the problem.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7228
svn path=/trunk/; revision=42454
2012-05-07 00:49:39 +00:00
e08a45d705
Set also the pcap buffer, if the default of 1 MB is used. This bug was
...
reported by Guy.
svn path=/trunk/; revision=42246
2012-04-25 21:19:31 +00:00
3c866b04d0
Report the packets captured and the packets dropped (either by libpcap or by dumpcap).
...
svn path=/trunk/; revision=42245
2012-04-25 21:09:33 +00:00
8ea1984ddc
Allow writing ISB with given recv/drop counters.
...
No functional change by this commit.
svn path=/trunk/; revision=42242
2012-04-25 20:50:38 +00:00
d2526de5f8
Fix the packet counters.
...
This fixes the inconsistencies reported on the command line by dumpcap
as indicated by
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7191
svn path=/trunk/; revision=42236
2012-04-25 17:43:44 +00:00
0fe7859ca4
Fix locking problem.
...
svn path=/trunk/; revision=42235
2012-04-25 16:05:29 +00:00
04cd90e99e
From Evan Huus: add a missing free. Fixes bug 7092.
...
svn path=/trunk/; revision=42070
2012-04-14 17:45:03 +00:00
5ef71a27ff
Fix tpo.
...
svn path=/trunk/; revision=41941
2012-04-04 19:46:45 +00:00
43ca745bb9
Work around that WinPcap bug for another pcap_open() call.
...
svn path=/trunk/; revision=41938
2012-04-04 19:26:07 +00:00
9c781b0939
Work around WinPcap bug wherein pcap_open() returns -1 without putting
...
an error message into errbuf (the bug has been reported to
winpcap-bugs).
Should fix bug 6922.
svn path=/trunk/; revision=41937
2012-04-04 19:13:39 +00:00
ba7c0cb1b9
From Jose Pedro Oliveira:
...
dumpcap.c: code cleaning
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6718
svn path=/trunk/; revision=41535
2012-03-13 15:27:22 +00:00
cbde63643e
From Jose Pedro Oliveira:
...
Enforce the modelines in dumpcap.c and in pcapio.c
svn path=/trunk/; revision=41505
2012-03-12 15:40:57 +00:00
6486942282
Fix function name in debugging message.
...
svn path=/trunk/; revision=41488
2012-03-11 19:59:08 +00:00
7a8df2f485
In pcapng.c use the units per second value from the interface instead of
...
the default.
Add support for reading nseclibpcap files to dumpcap.
svn path=/trunk/; revision=41455
2012-03-10 00:24:42 +00:00
bb71a9c96a
Forward interface_opts.descr (currently empty) when writing IDB:s
...
svn path=/trunk/; revision=41454
2012-03-09 15:29:35 +00:00
9d03324d91
From Jose Pedro Oliveira: Make dumpcap write the if_tsresol option (using the default value) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6718
...
svn path=/trunk/; revision=41444
2012-03-09 05:02:27 +00:00
57eeea4b20
Add a note about using GetSystemTimePreciseAsFileTime.
...
svn path=/trunk/; revision=41382
2012-03-06 21:11:31 +00:00
26f694ddee
Fix comment.
...
svn path=/trunk/; revision=41347
2012-03-05 06:43:44 +00:00
ad6640344f
From Jose Pedro Oliveira: Fix typos
...
svn path=/trunk/; revision=41330
2012-03-03 16:17:20 +00:00
8334ec2b43
Another small commit to test migration.
...
svn path=/trunk/; revision=41251
2012-03-01 02:18:35 +00:00
380f3f54a7
Add a comment noting that we need to add support for files with
...
nanosecond timestamps. (Also test the recent anonymous repository
migration.)
svn path=/trunk/; revision=41248
2012-02-29 20:32:12 +00:00
050c0a14c9
Don't use deprecated API on glib 2.31.18 and higher.
...
This should fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6884
svn path=/trunk/; revision=41247
2012-02-29 18:04:23 +00:00
412c5a903c
As discussed with Anders: Only write a single ISB at the end. Proivde
...
start/end time in the ISBs.
svn path=/trunk/; revision=41160
2012-02-23 12:57:17 +00:00
8fff390455
- Write ISB(s) at start and end of capture.
...
- Read all options.
- Prepare to write ISB.
svn path=/trunk/; revision=41137
2012-02-22 14:41:02 +00:00
af2100d4c3
Expand the API for ISB:s
...
svn path=/trunk/; revision=41136
2012-02-22 10:01:16 +00:00
f7dc80cb18
Whitespace changes.
...
svn path=/trunk/; revision=41124
2012-02-21 18:01:01 +00:00
41df09c92a
Whitespace changes.
...
svn path=/trunk/; revision=41115
2012-02-21 16:28:42 +00:00
1cf19ea95f
From Jose Pedro Oliveira:
...
dumpcap: only free os_version_str after the
libpcap_write_interface_description_block() calls.
svn path=/trunk/; revision=41114
2012-02-21 16:14:57 +00:00
5df11d41bb
Extend libpcap_write_interface_description_block() wiyh more options
...
all exept os curently unused.
svn path=/trunk/; revision=41108
2012-02-21 13:35:04 +00:00
ce86c08b58
From Jose Pedro Oliveira shb_os value: get_os_version_info() instead of get_runtime_version_info()
...
svn path=/trunk/; revision=41095
2012-02-21 05:52:50 +00:00
29a14da188
Jose Pedro Oliveira: get_os_version_info() is more apropriate for shb_os
...
svn path=/trunk/; revision=41086
2012-02-20 21:17:43 +00:00
68204c94a4
From Anders: Add support for options in the SHB.
...
From me: Some whitespace changes.
svn path=/trunk/; revision=41026
2012-02-14 17:07:52 +00:00
e553c70fe8
From Michael Mann:
...
help page update (pcapng is now the default file format).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6551
svn path=/trunk/; revision=40658
2012-01-23 07:48:53 +00:00
3864d5d19d
Add an additional DONT_HAVE_PCAP return value from get_interface_list()
...
and capture_interface_list(). Return it if, on Windows, we ask for the
interface list but don't have WinPcap installed. Handle it like
CANT_GET_INTERFACE_LIST.
svn path=/trunk/; revision=40334
2011-12-29 22:49:49 +00:00
21f5ea24e4
Just hard-code the error for "can't load WinPcap"; the one that
...
cant_load_winpcap_err() has some redundant gunk in it.
svn path=/trunk/; revision=40333
2011-12-29 22:06:22 +00:00
71c7f43d37
On Windows, if we can't open a capture device, check whether WinPcap is
...
loaded and, if not, report that as the problem, rather than suggesting
that you didn't specify the proper interface.
svn path=/trunk/; revision=40332
2011-12-29 21:59:24 +00:00
d892f00916
Show a "Capturing on ..." message similar to TShark.
...
svn path=/trunk/; revision=39989
2011-11-22 19:07:49 +00:00
939feef06f
If we're not running as a child process, report the interfaces on which
...
we're capturing. (We do not require a -i flag; the message could be
useful if you don't specify the interface, as it lets you know which
interface was chosen, which might not be the interface you'd think it
would be. Yes, that's arguably a libpcap bug, which I plan to look at;
it should probably try to figure out which interfaces are "active" if
possible, and prefer those.)
Use cmdarg_err() for invalid capture filters and other capture errors.
svn path=/trunk/; revision=39983
2011-11-22 10:08:26 +00:00
46575653fd
Don't set variables if we don't look at them later. All praise Clang
...
Cat.
svn path=/trunk/; revision=39876
2011-11-16 02:18:30 +00:00
aa0c9c965c
Try to fix the GLib thread API deprecations listed in bug 6552.
...
svn path=/trunk/; revision=39776
2011-11-09 23:43:50 +00:00
612dcc3c6b
As reported by Michael Speck:
...
Removed last occurrences of USE_THREADS.
svn path=/trunk/; revision=39775
2011-11-09 20:45:06 +00:00
7d442f4c22
Change the use of threads from "mostly always, depending on your
...
configure options and Gtk+ and GLib versions" to "always".
svn path=/trunk/; revision=39751
2011-11-07 23:42:53 +00:00
367cb50bd3
Minor formatting changes to the dumpcap -h output.
...
svn path=/trunk/; revision=39166
2011-09-27 18:19:23 +00:00
a58121db53
Fix vi "modeline" so it works;
...
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748
svn path=/trunk/; revision=39076
2011-09-21 16:44:10 +00:00
9c6aca43f2
Windows: GetTickCount() returns a DWORD (not a time_t);
...
Fixes a problem on Windows wherein specifying a capture file
time duration for autostop or file-switching would stop
working after some period of time.
The reason:
GetTickCount returns DWORD (unsigned int) which
wraps "every 49.7 days";
and: The GetTickCount() return value was being stored in a time_t which is
int64 on Windows;
thus:
The test for elapsed time (using signed integers) didn't work correctly after
the time had wrapped.
Fixes Bug #6280 : https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6280
svn path=/trunk/; revision=38921
2011-09-07 18:25:54 +00:00
dc3c5c8b63
Attempt to fix coverity id 1212: MISSING_BREAK by inserting "FALLTHROUGH"
...
comment.
svn path=/trunk/; revision=38785
2011-08-29 21:36:48 +00:00
bf95c7b5e4
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :
...
getopt() can/should normally be found in unistd.h, so:
- When testing for getopt(), define that we HAVE_GETOPT instead of
HAVE_GETOPT_H (to avoid confusion).
- Don't attempt to include getopt.h: not all OS's have it (for example,
Solaris 9 does not).
- (All the places which need getopt already include unistd.h (if we have it).)
If this breaks things on some OS, we might need (a real) HAVE_GETOPT_H check.
svn path=/trunk/; revision=38437
2011-08-09 21:02:10 +00:00
Chris Maynard