aboutsummaryrefslogtreecommitdiffstats
path: root/capture_ui_utils.c
AgeCommit message (Collapse)AuthorFilesLines
2013-03-13Add interface options preferences.Irene Rüngeler1-0/+25
svn path=/trunk/; revision=48275
2013-03-07Add buffersize and snap length to the preferences.Irene Rüngeler1-0/+92
svn path=/trunk/; revision=48163
2013-03-05Use explicit casts.Anders Broman1-4/+4
svn path=/trunk/; revision=48088
2012-11-22On UN*X, if an interface has a description, use it as the "friendlyGuy Harris1-11/+16
name". If it doesn't have a description, on OS X, use the System Configuration framework to attempt to get a "friendly name" for interfaces. If a loopback device doesn't have a friendly name, give it "Loopback" as the friendly name. Move the "turn a CFString into a mallocated C string" routine into common code, as it's used in more than one place. svn path=/trunk/; revision=46131
2012-11-22Clean up indentation.Guy Harris1-84/+84
svn path=/trunk/; revision=46127
2012-11-19From Mike Garratt:Anders Broman1-1/+4
Friendly Names for interfaces on Windows Notes on the changes the patch covers: * if_info_t struct: addition of friendly_name * Dumpcap Interface list format changes: + Win32: "dumpcap -D" shows friendly_name in place of descript if known + All: machine interface "dumpcap -D -Z none" includes friendly_name in the list in addition to the existing parameters * interface_options struct: addition of console_display_name + When an interface name is displayed in a console, it will typically be the console_display_name (instead of name). + console_display_name is used as the basis of the autogenerated temp filenames + console_display_name is typically set to the friendly_name if known, otherwise it is set to the interface name * Enhancements to capture_opts_add_iface_opt() (the function which process -i options). + Can now specify the interface using its name and friendly_name + Interface name matching is case insenstive + Name matching first attempts exact matching, then falls back to prefix matching (e.g. dumpcap -i local) + Validates interface names, instead of blindly sending them off to winpcap/libpcap + Interface specification by number is still supported. * capture_opts_trim_iface() has been refactored: + Instead of repeating a decent chunk of the cost in capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the interface. * introduction of capture_win_ifnames.[ch] (windows only code) + Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a windows version independant function to convert an interface guid into its friendly name. Uses published api functions on windows vista and higher, but falls back to unpublished API functions on older windows releases. + void get_windows_interface_friendlyname(/* IN */ char *interface_devicename, /* OUT */char **interface_friendlyname); - extracts the GUID from the interface_devicename, then uses GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution * Auto temp filename generation: + Now uses wireshark_pcapng_* or wireshark_pcap_* depending on file format + Basis temp filename format on console_display_name + Win32: if console_display_name is a windows interface guid, extracts numbers from GUID here (instead of in interface option processing) GUI CHANGES: * Dialog that displays when you click the "Manage Interfaces" button (within Capture Options dialog) has been renamed from "Add new interfaces" to "Interface Management" * ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to interface_management_w * Win32: Local Interfaces tab on Interface Management dialog, shows includes friendly name as far left column * Interface Management dialog defaults to larger size on win32 - so it fits without resizing local interfaces tab * Interface Management dialog now saves preferences when you click the apply button (local hidden interfaces was not persisting across restarts) * Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces -> Details): + "Friendly Name" renamed to "NDIS Friendly Name" + Added "OS Friendly Name" to the top of the list * Win32: The "Capture Interfaces" dialog now shows the friendly name instead of device guid * Welcome screen: + The height of the interface list scrollbox dynamically adjusts & updates to the number visible interfaces. Up to 10 interfaces can be listed without a scroll bar, the minimum height is for 2 interfaces. + Win32: now shows just the Friendly Name if known - in place of "Interfacename_Guid:(Description)" svn path=/trunk/; revision=46083
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45015
2012-08-08Have (almost) all preferences use the generic preferences API (per ↵Michael Mann1-2/+4
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7402). This cleaned up a lot of hardcoded code and allows breaking up the prefs structure (or at least prevent it from growing too large) if desired. Bugfixed problems mentioned in http://www.wireshark.org/lists/wireshark-dev/201208/msg00001.html Column preferences now support default '#' character svn path=/trunk/; revision=44348
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-01-25Third try. This time pipes and stdin are supported and theMichael Tüxen1-0/+3
test scripts are passed. Use a global list containing all interfaces and only change 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. svn path=/trunk/; revision=40715
2012-01-24We need a 3rd try. (After learning how to run the testuite on Windows locally).Michael Tüxen1-3/+0
svn path=/trunk/; revision=40695
2012-01-24Second try. This time pipes and stdin are supported.Michael Tüxen1-0/+3
Use a global list containing all interfaces and only change 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. svn path=/trunk/; revision=40693
2011-10-20Back out infrastructure change. We missed supportingMichael Tüxen1-3/+0
stdin and pipes. svn path=/trunk/; revision=39498
2011-10-20Use a global list containing all interfaces and only changeMichael Tüxen1-0/+3
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. svn path=/trunk/; revision=39495
2011-06-27Get rid of old non-interface specific settings which are now interfaceMichael Tüxen1-22/+15
specifc. This finalizes the change of the infrastructure. This patch is based on work by Irene Ruengeler. svn path=/trunk/; revision=37794
2011-05-19When capturing from multiple interfaces, indicate this in the windowMichael Tüxen1-0/+16
title of the wireshark main window. svn path=/trunk/; revision=37289
2011-03-23Remove unneeded NULL Test...Bill Meier1-1/+1
Addresses Coverity 598 svn path=/trunk/; revision=36295
2011-02-17Use "XXX != NULL" rather than "XXX" to test for a null pointer; eitherGuy Harris1-33/+32
I'm missing something or the MSVC++ code analyzer doesn't realize that in if (XXX) dereference XXX will not dereference XXX if it's null - maybe "if (XXX != NULL)" will do the trick (if so, the code analyzer is buggy, because "if (XXX != NULL)", "if (XXX != 0)", and "if (XXX)" mean the exact same thing if XXX is a pointer-valued expression, really, truly, even if a null pointer isn't represented as all zero bits or if it's wider than an int). Clean up indentation. svn path=/trunk/; revision=35973
2010-04-05Note that -X stdin_descr stretches the original intent of the -X option.Gerald Combs1-0/+6
svn path=/trunk/; revision=32390
2010-04-01Keep a copy of the interface description and capture filter around so thatGerald Combs1-1/+7
we can use it in the main window title during and after capture. Add a "-X" option for providing a description for stdin. svn path=/trunk/; revision=32357
2010-03-04It uses isdigit(), so it requires <ctype.h>.Guy Harris1-0/+1
svn path=/trunk/; revision=32105
2010-03-04In Wireshark and TShark, run dumpcap to get interface lists and lists ofGuy Harris1-4/+4
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. svn path=/trunk/; revision=32104
2010-02-23Fix indentation.Anders Broman1-21/+21
svn path=/trunk/; revision=31966
2008-06-03strtol() returns a long, as the name suggests; assign its return valueGuy Harris1-2/+6
to a long, and check whether it fits in a gint before returning it as a gint. svn path=/trunk/; revision=25418
2008-06-03Include <stdlib.h> to declare strtol().Guy Harris1-0/+1
svn path=/trunk/; revision=25417
2008-06-02Added an option to set default link-layer header type for each interface.Stig Bjørlykke1-0/+26
Set linktype history for each interface so we don't mix them. Fixed some indents. svn path=/trunk/; revision=25411
2008-04-18Display the interface comment if defined.Stig Bjørlykke1-1/+1
On non-win32 also display the interface name. svn path=/trunk/; revision=25114
2008-01-31Hide hidden devices in "Capture Interfaces" dialog.Stig Bjørlykke1-3/+1
Added a function to check for hidden devices, which also work correctly for plumbed devices on solaris. svn path=/trunk/; revision=24231
2007-12-04Support for RPCAP features in GUI (from Boris Misenov, see Bug 1366)Tomas Kukosa1-3/+5
- retrieving the list of remote PCAP interfaces - password authentication support - UDP data fransfer - packet sampling (available in WinPcap 4.x) etc. fix problem if non-default rpcap port is used svn path=/trunk/; revision=23750
2007-11-30first steps to support MSVC 2008 Express EditionUlf Lamping1-0/+1
svn path=/trunk/; revision=23691
2007-09-04Don't call get_interface_descriptive_name() on a NULL iface: fixes a ↵Jeff Morriss1-1/+1
segfault when doing Statistics->Summary when you didn't capture anything (but rather read in a file) svn path=/trunk/; revision=22788
2007-08-28Fix for bug #1801 (http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1801)Stephen Fisher1-1/+1
Don't get to the point where we may do a strcmp() with a null value. svn path=/trunk/; revision=22697
2007-08-24Add a comment explaining why get_interface_descriptive_name() shouldn'tGuy Harris1-0/+5
be, for example, called once a second while a capture is in progress. svn path=/trunk/; revision=22643
2007-08-22gcc 4 doesn't like my macro for getting the interface description: it says ↵Jeff Morriss1-0/+13
there's an invalid lvalue in it. I don't see what's wrong with it, but replace the macro with a function. Also: don't include the .xpm files in gtk/main.c if we're building without PCAP (as they're not used in that configuration). svn path=/trunk/; revision=22588
2007-08-22Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1757 :Jeff Morriss1-0/+2
Try to call get_interface_descriptive_name() as little as possible (storing the result in capture_opts) to avoid a performance hit during live capture (especially if you have lots of interfaces) and to avoid leaking memory. One issue with this is that capture_opts.c cannot (without adding significant dependencies) set the iface_descr so readers of that field (only gtk/main.c and tshark.c) use a macro to (set if not already set and) get the value of that field. svn path=/trunk/; revision=22587
2007-01-21Have the routines to get interface lists take a pointer to a "gchar *"Guy Harris1-2/+1
as an argument, and, on an error, if they have an error message, have them set that "gchar *" to point to a g_malloc()ed string containing the error message, rather than taking a pointer to a buffer for that message as an argument. That's more like what's done in Wiretap, and doesn't impose an upper limit on the lengths of those error messages. If that pointer is null, don't allocate the message string and return it. Have that error message already have the "cant_get" processing applied to it, so nobody other than those routines need to call the "cant_get" routines to process the error messages. Have get_airpcap_interface_list() explicitly set "*err" to the appropriate error code. Clean up indentation. svn path=/trunk/; revision=20521
2006-05-21name changeRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18197
2006-02-17remove dependencies to pcap.h, so getting an idea what needs to be done by ↵Ulf Lamping1-2/+1
dumpcap in addition to the things already done now various dumpcap related code cleanup: mainly #include's and capture engine related stuff svn path=/trunk/; revision=17327
2005-12-14Constify a bunch of arguments and variables, to squelch compilerGuy Harris1-2/+2
warnings. Include "wiretap/libpcap.h" in "capture_loop.h", to get its declarations of data structures for headers in libpcap files. This lets us remove the includes of "wiretap/libpcap.h from files including "capture_loop.h". Make "log_func_ignore()" in "tethereal.c" static, and declare some of its arguments unused. Also get rid of an unused variable. Include <pcap.h> before including "wiretap/wtap-capture.h", to declare "struct pcap_pkthdr". svn path=/trunk/; revision=16791
2005-12-13make get_if_name() parameter if_text const, it's not changed insideUlf Lamping1-1/+1
svn path=/trunk/; revision=16785
2005-12-06rename pcap-....c/.h files to capture-pcap-....c/.hUlf Lamping1-1/+1
this way, the capture prefix will "logically" group the files together and file browsers will also group them we may want to move the files into a subdir capture later svn path=/trunk/; revision=16691
2005-04-19fix some minor bugs with the current interface name:Ulf Lamping1-0/+54
-always show descriptive string in combo box -correct the initialization, so cancelling the option dialog won't make trouble svn path=/trunk/; revision=14144
2005-02-13change nmake makefiles in /trunk and /trunk/epan so thatLars Roland1-4/+0
object code for libethereal.dll isn't generated by the makefile in /trunk. Having no code in /trunk linked into libethereal.dll anymore, the definition of the macro _NEED_VAR_IMPORT_ can be moved from various source files in /trunk to /trunk/Makefile.nmake . So do that, too. svn path=/trunk/; revision=13389
2005-01-16Rename capture_combo_utils.{c,h} to capture_ui_utils.{c,h}, as the codeGuy Harris1-0/+299
in there is for UI functions including, but not limited to, the combo box in capture dialogs. svn path=/trunk/; revision=13061