aboutsummaryrefslogtreecommitdiffstats
path: root/capture_sync.c
AgeCommit message (Collapse)AuthorFilesLines
2011-11-16Get rid of unnecessary assignment (the code below it always assigns aguy1-1/+0
value to the variable). Praise be to Clang Cat. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39877 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-20Back out infrastructure change. We missed supportingtuexen1-2/+0
stdin and pipes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39498 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-20Use a global list containing all interfaces and only changetuexen1-0/+2
properties of the entries when changes are made in the GUI. Do not misuse the list of interfaces specified on the command line anymore. This patch does not provide any new functionality, it just provides the base for future extensions like removing remote interface, mulitple airpcap devices and multiple pipes. This patch was provided by Irene Ruengeler. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39495 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-24Fix prematurely-terminated comment.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38696 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-24Fix a comment; this includes describing an additional way in which weguy1-5/+13
could fail to open the capture file. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38695 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-23Hopefully fixtuexen1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6256. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38694 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-05Fix Windows build.tuexen1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38352 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-05Simplification suggested by Guy.tuexen1-3/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38351 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-05Generate the capure sync pipe correctly.tuexen1-15/+37
Fix obtained from Irene Ruengeler. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38349 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-28Replace all strerror() with g_strerror().stig1-15/+15
Remove our local strerror implementation. Mark strerror as locale unsafe API. This fixes bug 5715. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37812 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-27Fix the bug reported by Guy. Nowtuexen1-6/+0
tshark -i en0 icmpp returns a correct error message. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37806 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-27Report the correct interface when there is a problem with a capture filter.tuexen1-5/+11
This patch is from Irene Ruengeler. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37804 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-27Get rid of old non-interface specific settings which are now interfacetuexen1-57/+8
specifc. This finalizes the change of the infrastructure. This patch is based on work by Irene Ruengeler. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37794 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-17Make pcap-ng the default. Add a compile-time option to prefer pcap-ng orgerald1-0/+2
pcap. Add a "-P" capture option which tries to use pcap instead of pcap-ng ("-P" seemed to be the best option but we may want to use a different letter). Update the documentation and release notes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37696 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-07Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;wmeier1-684/+684
Also: whitespace cleanup. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37603 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-21Fix the capturing from the GUI. Honor the iface variable.tuexen1-0/+7
The next step is to retire the iface variable and use the ifaces array only. This should simplify things and fix the cases, where you start wireshark with command line arguments and also use the GUI. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37342 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19In case we have no interface information in the array, use the global value.tuexen1-0/+48
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5935. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37307 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19Move the debug output for the generated command line arguments to the ↵tuexen1-3/+3
correct place. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37276 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-19Only declare a variable if its going to be used.martinm1-0/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37273 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-18We don't have the ability to set the capture buffer size on all platforms.guy1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37255 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-18Use the interface specific parameter array.tuexen1-69/+75
This enables the capturing from mulitple interfaces using tshark and wireshark (at the command line). (tshark -i lo0 -i en0) or (wireshark -k -i lo0 -i en0) works. You can capture from multiple remote and local interfaces. Based on work from Irene Ruengeler. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37248 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-11Back out Jeff Morris's change to make the autostop file size 64-bit - itguy1-2/+2
didn't change the GUI code for setting the autostop file size, and that broke the build. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36552 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-11Jeff Morris's change to make the autostop file size 64-bit. Fixes bugguy1-2/+2
5691. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36551 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-02STATUS_UNWIND_CONSOLIDATE "should not happen", so don't include it -guy1-2/+0
we'd have to include some other headers to get it defined. Get rid of the include of Winbase.h - it doesn't define STATUS_UNWIND_CONSOLIDATE, and it's not necessary. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33413 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-02Include <Winbase.h> to get error statuses.guy1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33412 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-02Attempt to detect when dumpcap dies due to an exception and report thatguy1-4/+54
appropriately. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33411 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-02Have sync_pipe_wait_for_child() return the child's exit status onguy1-0/+9
Windows, just as we do on UN*X. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33410 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-01From Petr Lautrbach: when capturing, return the exit status of dumpcap,guy1-0/+3
so we give a non-zero exit status for invalid interfaces or capture filters. From me: don't exit immediately if dumpcap failed, print out information from taps and the like. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33393 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-27Clean up the error reporting. An EOF from the sync pipe when capturingguy1-73/+116
is just an indication that the capture child exited; don't treat it as an error, unless the child process exits with an abnormal status. As tshark sends a "stop capture" indication to the child when it's ^C'ed, the child will exit and we'll get an EOF from the capture pipe; don't make SIGINT etc. interrupt system calls, so they don't cause reads from the capture pipe to get EINTR errors. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32986 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-26Untabify.stig1-35/+35
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32970 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-26Don't report EINTR - it might be from a ^C.guy1-6/+24
Do report the error string for other read errors, though. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32969 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-26Use the right system call name.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32965 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-26If dumpcap exits abnormally, report the error.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32964 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-19Fix comments.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32885 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-18Fix some errors. Use FormatMessageA(), as we need the string in ASCII.guy1-5/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32857 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-18Add a routine to convert Win32 error statuses into strings, and use itguy1-27/+60
when generating error messages. The error code from CreatePipe() is gotten by calling GetLastError(); it's not in errno. Clean up indentation a bit. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32855 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-17Make -Z always generate machine-readable output, and don't botherguy1-3/+0
supplying -M along with -Z. (We keep -M around for debugging use; it's documented, unlike -Z.) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32850 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-17Update a comment.guy1-3/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32844 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-17When dumpcap is run to get an interface list, interface capabilities, orguy1-249/+477
interface statistics, have its error messages come out as sync-pipe errors, have it send a sync-pipe "success" message on success, and have the callers get that message and display it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32843 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-13Fetch an indication of whether the interface supports capturing inguy1-3/+7
monitor mode at the same time that we fetch its list of link-layer types. Support fetching that list in monitor mode, as the list may be different in regular and monitor mode. If the interface supports monitor mode, when printing the list of link-layer types, indicate whether they're fetched in monitor mode or not, as tcpdump 4.1.x does. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32789 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-07Add monitor mode support to TShark.guy1-0/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32704 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Just check for pcap_create(); it first appeared in libpcap 1.0.0, andguy1-2/+2
pcap_set_buffer_size() did as well, so there aren't any libpcap releases with pcap_create() but not pcap_set_buffer_size(). Only do one check for pcap_create. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32695 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Checking in Stigs changes frometxrab1-2/+4
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475 BUT not activating the check for pcap_create() pcap_set_buffer_size() This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic. The code for handling the 'B' option should be OK in any case. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32688 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-04In Wireshark and TShark, run dumpcap to get interface lists and lists ofguy1-33/+40
link-layer header types for interfaces; if special privileges are necessary to open capture devices, Wireshark and TShark shouldn't have those privileges, but dumpcap should. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32104 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-02From Hitoshi Irino:etxrab1-1/+1
Displaying value and type of IPFIX reverse PEN elements in data records https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4399 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32082 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-29Fix various gcc -Wshadow warnings.wmeier1-16/+16
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31729 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-13Don't use SIGUSR1 to tell dumpcap to exit, use SIGINT: SIGINT is traditionallymorriss1-3/+3
used for this purpose and using it also prevents the 2 signals the child gets: - the user's Ctrl-C (which is sent as a SIGINT to both *shark and its child dumpcap) - the signal *shark generates to shut down the child from colliding (and running 2 signal handlers in the child). It might be possible for tshark to not send the signal at all when it gets SIGINT, but it doesn't do any harm now. Also, do not call g_log() within the signal handler: doing so can cause aborts (if g_log is being called by the process when the signal comes, the 2nd entrance into g_log is detected as a recursion). This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2767 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29881 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-15Added a preference to capture in Pcap-NG from GUI.stig1-0/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28740 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-21If we don't have any of the pcap_datalink_XXX_to_YYY routines,guy1-5/+0
substitute our own (I wrote them all, so I can steal them from the BSD-licensed libpcap if I want :-)). This means that linktype_name_to_val() and linktype_val_to_name() are always available, and we don't need to #ifdef use of them. Use pcap_datalink_val_to_description() to get the description for a particular DLT_ value, rather than mapping the DLT_ value to a WTAP_ENCAP_ value and getting the description for the latter. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27074 f5534014-38df-0310-8fa8-9805f1628bb7
2008-11-03Do not set buffer size for remote interfaces or when using default value.stig1-0/+6
Do not get link-layer for remote interfaces. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26683 f5534014-38df-0310-8fa8-9805f1628bb7