aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2013-01-18Use CMAKE_VERSION for the Info.plist comment.Gerald Combs1-1/+1
svn path=/trunk/; revision=47152
2013-01-18Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.Gerald Combs1-0/+8
svn path=/trunk/; revision=47143
2012-12-21Move common time shifting code to ui/time_shift.[ch]. Change theGerald Combs1-1/+1
shifting routines to return an error message on failure or NULL on success. Prettify and simplify the layout of the GTK+ time shift dialog. Make the cancel button work as expected. Add a time shift dialog to the Qt port. I used a Mad Lib (sentence) layout. Hopefully that won't make translation too difficult. For some reason time shifts aren't immediately shown in the packet detail. This appears to be a bug in the packet list / packet detail code. Add warning role color definitions to tango_colors.h and use them. svn path=/trunk/; revision=46680
2012-12-21Use pcapio routines. This concludes the preperation forMichael Tüxen1-0/+1
adding pcapng support. svn path=/trunk/; revision=46673
2012-12-18text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).Michael Tüxen1-1/+1
svn path=/trunk/; revision=46600
2012-12-17Add libui_dirty.Gerald Combs1-0/+2
svn path=/trunk/; revision=46575
2012-11-22We don't need Cocoa or Core Services for anything.Guy Harris1-7/+7
What we *do* need is: the Application Services framework, for GUI applications; System Configuration, for anything that would try to get interface friendly names; Core Foundation for everything that uses either of those and/or everything that displays system version information. We're currently assuming that the only Apple platform on which we build is OS X, in which case we have the OS X frameworks; update a comment. cfutils.c is part of WIRESHARK_COMMON_SRC, which is included in tshark_FILES; it doesn't need to be included in tshark_FILES. svn path=/trunk/; revision=46147
2012-11-22Link with CoreFoundation and SystemConfiguration and add cfuitils.c onGerald Combs1-4/+14
OS X where needed. Dumpcap, rawshark and tshark don't appear to require Cocoa so remove it. svn path=/trunk/; revision=46144
2012-11-22Add capture_unix_ifnames.c to the list of files needed when building forGuy Harris1-1/+1
UN*X. svn path=/trunk/; revision=46133
2012-11-19From Mike Garratt:Anders Broman1-1/+1
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-11-01Fix ui/qt/print_dialog.cpp:228:23: error: variable ‘status’ set but not ↵Jörg Mayer1-1/+7
used [-Werror=unused-but-set-variable] svn path=/trunk/; revision=45864
2012-10-03capinfos needs libwsutil. Explicitely link against it.Jörg Mayer1-0/+1
svn path=/trunk/; revision=45292
2012-10-03Add manpages for reordercapJörg Mayer1-0/+4
svn path=/trunk/; revision=45291
2012-09-28Get rid of HAVE_CONFIG_H for cmake. Fix one case where it was still used.Jörg Mayer1-1/+0
svn path=/trunk/; revision=45191
2012-09-24Update regexes to match the version string changes in r45112.Gerald Combs1-6/+6
svn path=/trunk/; revision=45114
2012-09-24From Jim Young, bug 7745.Martin Mathieson1-1/+19
Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-18*NIX (autofoo and cmake) part of the fix forJeff Morriss1-30/+41
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6134 : Make VERSION_MAJOR, VERSION_MINOR, and VERSION_MICRO available in config.h so (e.g.) dissector writers can #if around them as necessary to make a piece of code compile with different versions of Wireshark. (Hopefully VERSION_MICRO is not important in this respect!) Windows also defines VERSION_EXTRA which can be used to help identify custom builds; this is not done for these build methods (yet?). svn path=/trunk/; revision=44986
2012-09-15Update CMakeLists to respect the recent libui changes so that wireshark andEvan Huus1-1/+2
qtshark build again. (Also, first commit trying to use bzr as an svn client, so apologies if something unexpected breaks) svn path=/trunk/; revision=44908
2012-09-14Create a common libui using CMake similar to what we do with Autotools.Gerald Combs1-4/+6
Move the GTK+ text import code to the common UI directory. Create wtap_encap_requires_phdr() from code in file_import_dlg.c. svn path=/trunk/; revision=44904
2012-09-06Get netlink detection working with cmake (not complete)Jörg Mayer1-2/+3
svn path=/trunk/; revision=44791
2012-08-24Revert r44644 and 44645. g_source_*, g_timeout_, and g_io_* all dependGerald Combs1-1/+0
on the GLib main loop which isn't portable (unless you want to want to manage the main loop yourself). svn path=/trunk/; revision=44655
2012-08-23Move the pipe input routines to the common UI directory.Gerald Combs1-0/+1
svn path=/trunk/; revision=44644
2012-08-23The proper way to set compiler flags in cmake is not by usingJörg Mayer1-1/+20
add_definitions() but the variables CMAKE_C{,XX}_FLAGS. Set these flags correctly at the toplevel, so no hack in the ui/qt/ subdir is required anymore. svn path=/trunk/; revision=44633
2012-08-23The name configure.in has been deprecated for many years.Jörg Mayer1-2/+2
Use configure.ac instead. svn path=/trunk/; revision=44630
2012-08-19Commit 44474 added some arguments to the ac_init macro that brokeJörg Mayer1-1/+1
extraction of the wireshark version for cmake. Now the version part is either terminated by ")" (old) or "," (added). It looks like .*? does not exist for non-greedy matches in cmake regex. svn path=/trunk/; revision=44570
2012-08-01Move the common parts of iface_lists.[ch] from ui/gtk/ to ui/. Leave theGerald Combs1-0/+1
GTK+-specific parts behind in capture_dlg.c. svn path=/trunk/; revision=44196
2012-07-20WiMAX OFDMA PHY SAP dissector plugin ↵Michael Mann1-0/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) svn path=/trunk/; revision=43844
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-28From Pontus Fuchs:Guy Harris1-0/+2
Add an interface monitor that, on Linux distributions with libnl, watches for interfaces to appear or disappear and, on such an event, causes windows showing interface lists to update. svn path=/trunk/; revision=43521
2012-06-25From Tony Trinh:Anders Broman1-1/+1
Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-24Also add ws80211_utils.c for CMake builds.Jörg Mayer1-0/+2
Build with -g to make debugging easier. The debug info will get removed on installation. svn path=/trunk/; revision=43464
2012-06-20Complete cmake support for netlink detectionJörg Mayer1-0/+8
svn path=/trunk/; revision=43421
2012-06-20And another instance of HAVE_WIRELESS_TOOLBAR I missedJörg Mayer1-1/+0
svn path=/trunk/; revision=43418
2012-06-20Copy over Makefile.common changes to CMakeListsJörg Mayer1-0/+1
svn path=/trunk/; revision=43416
2012-06-19Do the changes to configure from r43354 in cmake as well.Jörg Mayer1-0/+1
Log: Start to have an generic wireless toolbar. Sligtly modified patch from Pontus Fuchs. svn path=/trunk/; revision=43361
2012-06-01No more GIOP plugins, no more plugins/giop directory.Guy Harris1-1/+0
svn path=/trunk/; revision=42984
2012-03-15Document which warnings are c++ only.Jörg Mayer1-9/+14
svn path=/trunk/; revision=41574
2012-03-08Reflect the move of alert_box.c to the ui directory.Guy Harris1-1/+1
svn path=/trunk/; revision=41437
2012-02-19Reflect the move of dftest.c back to the top-level directory.Guy Harris1-1/+1
svn path=/trunk/; revision=41065
2012-02-17Trying to fix the compile of ui/util.c on Windows by moving theJörg Mayer1-1/+3
source file directly into the sources variable - there seems to be a subtle difference between ui/util.c and epan/crypt/md5.c svn path=/trunk/; revision=41052
2012-02-17Start moving files to ui/ and ui/cli/Jörg Mayer1-42/+42
svn path=/trunk/; revision=41047
2012-02-08Last fix to the wrong approach.Jörg Mayer1-0/+1
svn path=/trunk/; revision=40925
2012-02-07Make sure that we only have to set (or pick up) the docdir environmentJörg Mayer1-1/+1
variable on the initial cmake run and not on later re-runs (like when some cmakelists.txt file changed and we call make). Of course this value should really be passed as an option instead of an environment variable but I want to document how to get the current approach working properly before switching to the proper approach. svn path=/trunk/; revision=40913
2012-02-05From QA Cafe:Anders Broman1-0/+1
Add support to follow UDP and TCP streams like wireshark does. UDP streams are selected with IP address/port pairs. TCP stream are selected with either the stream index or IP address/port pairs. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6684 svn path=/trunk/; revision=40852
2012-02-05Fix long standing but that prevented installation toJörg Mayer1-3/+3
work at all. Next step ist to move docbook installation back into docbook/ svn path=/trunk/; revision=40846
2012-02-04- Add a comment how to improve the output of supported features later on.Jörg Mayer1-1/+18
- Move docbook pdf installation to toplevel. svn path=/trunk/; revision=40840
2012-02-02- Move setting _U_ into config.h, becauseJörg Mayer1-4/+11
a) C++ has a standardized way of marking parameters as unused b) cmakes autoquoting magic failed when the compiler wasn't gcc but moc instead. - qtshark: Don't try to compile the c source files inside ui/qt/ - qtshark: Only run moc on the files that need it. - qtshark: It's too early to try any of the new qtshark files as clean. - Make Qt detection actually work - Add C++ to the list of languages for this project svn path=/trunk/; revision=40807
2012-02-02Prepare the cmake infrastucture for eventually buildingJörg Mayer1-16/+58
wireshark and qtshark simultanously. The "only" missing thing for this is now ui/qt/CMakeLists.txt ;) svn path=/trunk/; revision=40799
2012-01-20Manually revert the changes to CMakeLists.txt from commit 40602 - they ↵Jörg Mayer1-2/+2
should not be necessary/are wrong svn path=/trunk/; revision=40605
2012-01-20Bug 6448 says the embedded Python stuff does not really work.Jeff Morriss1-2/+2
And if I run Valgrind with Python enabled, I get pages of errors related to it. So: disable Python by default. svn path=/trunk/; revision=40602
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 04:51:24 +0000