Commit Graph

334 Commits

Author SHA1 Message Date
Jeff Morriss 56735f8c16 Move u3.{h,c} and g711.{h,c} into wsutil.
Project g711.h against multiple inclusion and add C++ compatibility wrapper.

svn path=/trunk/; revision=50654
2013-07-16 02:04:55 +00:00
Jeff Morriss 2d30d5beb1 Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).

svn path=/trunk/; revision=50650
2013-07-16 01:16:50 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Michael Tüxen 43e20ff200 Don't use compiler options not supported by clang in XCode 4.6.3
on Apple platforms.

svn path=/trunk/; revision=50576
2013-07-14 12:39:25 +00:00
Jeff Morriss 4dcc156cf3 Move the print modules into epan.
svn path=/trunk/; revision=50526
2013-07-12 03:50:50 +00:00
Jeff Morriss 16206348d9 Move disabled_protos.{h,c} into epan.
svn path=/trunk/; revision=50521
2013-07-12 01:40:06 +00:00
Jeff Morriss 45449ce1a8 Move some more modules into epan.
svn path=/trunk/; revision=50517
2013-07-11 23:57:11 +00:00
Jakub Zawadzki ce81449ed9 packet dissection now takes pointer to tvb instead of guint8 data
implement frame_tvbuff, right now almost a copy of 'real' tvb.

svn path=/trunk/; revision=50497
2013-07-11 05:47:02 +00:00
Chris Maynard d602662b36 Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make use of it in editcap and mergecap for listing encapsulation types. For example:
Before:
    user0 - USER 0
    user1 - USER 1
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9

After:
    user0 - USER 0
    user1 - USER 1
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15


svn path=/trunk/; revision=50482
2013-07-10 16:18:37 +00:00
Guy Harris b450609a55 For now, don't turn on -Wcast-align by default. There are at least some
bugs it points out that probably mean the code won't work on machines
that require alignment (e.g., SPARC machines), but we'll turn it on once
we fix them.  (clang is fussier than GCC about this.)

svn path=/trunk/; revision=50187
2013-06-27 10:35:06 +00:00
Jeff Morriss 500d399393 Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.
svn path=/trunk/; revision=50165
2013-06-26 02:12:12 +00:00
Jeff Morriss bbf6a3766e Move tempfile.{h,c} into wsutil.
svn path=/trunk/; revision=50163
2013-06-26 01:14:35 +00:00
Jeff Morriss 9ef2507e34 editcap no longer has to link against nstime.o, it's in libwsutil now.
svn path=/trunk/; revision=50161
2013-06-26 00:45:38 +00:00
Jeff Morriss a441793cba Move a couple of time-related modules into wsutil.
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
Guy Harris 15a0d1f945 Update various warning-option lists to match what the configure script
adds by default.

svn path=/trunk/; revision=49670
2013-06-01 02:20:12 +00:00
Jörg Mayer 7ad85db8e1 Move -Wlogical-op to list of standard compiler flags for c-only.
svn path=/trunk/; revision=49668
2013-06-01 00:13:25 +00:00
Guy Harris 9f11d6cd44 capture_unix_ifnames.c is gone.
svn path=/trunk/; revision=49490
2013-05-22 04:17:23 +00:00
Michael Tüxen eded0ecb14 Suppress warnings when using Apple's C compiler.
svn path=/trunk/; revision=49305
2013-05-14 21:01:19 +00:00
Jörg Mayer 5ba458916a Move common code into UseAsn2Wrs.cmake.
Include the new file.
Use the new file.
Add cmake support to rebuild the gsm_map dissector.

svn path=/trunk/; revision=49194
2013-05-07 03:25:49 +00:00
Jörg Mayer 436270ffab Sort the list of packages to make it easier to check results.
svn path=/trunk/; revision=49107
2013-05-01 10:40:12 +00:00
Jörg Mayer 30653b7e16 - Fix logic for finding packages with differing Find-name
and returned variable-names:
  Old: Provide the var name and adapt the find-name
  New: Provide the find-name and adapt the var name
  This allows for different packages with the same var name.
  This chage effects Qt4 and PythonInterp.
- Replace self created FindPYTHON with cmake provided
  FindPythonLibs.

svn path=/trunk/; revision=49105
2013-05-01 09:20:59 +00:00
Jörg Mayer cd160c7af2 Our scripts do ont work with python3, so only pick up a python2
executable.

Reported on #wireshark by McEnroe

svn path=/trunk/; revision=49102
2013-05-01 00:53:59 +00:00
Guy Harris 2cd4b0f607 Fix suspected copy-and-pasteo.
svn path=/trunk/; revision=49078
2013-04-28 01:09:00 +00:00
Jörg Mayer c3d7f57f58 Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...
svn path=/trunk/; revision=49042
2013-04-25 23:04:19 +00:00
Jörg Mayer 8faa262e90 Stub cmake support for generating the asn1 dissectors.
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007
2013-04-23 23:05:33 +00:00
Jörg Mayer 4f8cb5fdc3 Mimic autoconf behavior and enable -Wc++-compat by default.
svn path=/trunk/; revision=48992
2013-04-22 22:32:03 +00:00
Jörg Mayer 8c11433414 Revert
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46575

User: gerald                                                                           Date: 2012/12/17 01:24 PM

Log:
 Add libui_dirty.

This is the autofoo way of solving the problem.

Implement the cmake solution (which is used in wiretap/ and other places)
which does not require building a separate lib.

svn path=/trunk/; revision=48976
2013-04-22 19:00:29 +00:00
Jörg Mayer f8dc3aab11 Use -Wshadow in cmake builds
svn path=/trunk/; revision=48949
2013-04-21 08:16:07 +00:00
Balint Reczey a8f543b56b Merge asn2deb and idl2deb from official Debian package
svn path=/trunk/; revision=48133
2013-03-06 13:31:08 +00:00
Balint Reczey 1eb5e1d739 Revert "Make Solaris Studio hide internal shared library symbols by default"
This reverts commit r48020.

svn path=/trunk/; revision=48022
2013-03-02 22:27:40 +00:00
Balint Reczey 73aafe2bc4 Make Solaris Studio hide internal shared library symbols by default
svn path=/trunk/; revision=48020
2013-03-02 22:11:26 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Balint Reczey 45c2884f1b Export libwsutil symbols using WS_DLL_PUBLIC define
This change replaces *.def and *.sym file usage following the
guideline at http://gcc.gnu.org/wiki/Visibility

svn path=/trunk/; revision=47938
2013-02-28 14:09:46 +00:00
Balint Reczey d2e0724afc Add dumpabi targets to CMake builds
Also update automake generated targets to match CMake generated ones

svn path=/trunk/; revision=47879
2013-02-25 18:12:20 +00:00
Guy Harris ab3840049e Reflect the move of recent.c to the ui directory.
svn path=/trunk/; revision=47439
2013-02-02 05:25:39 +00:00
Gerald Combs 6b3308d113 Use CMAKE_VERSION for the Info.plist comment.
svn path=/trunk/; revision=47152
2013-01-18 16:05:29 +00:00
Gerald Combs a377c7c38d Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.
svn path=/trunk/; revision=47143
2013-01-18 01:37:27 +00:00
Gerald Combs 962b4f08f7 Move common time shifting code to ui/time_shift.[ch]. Change the
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-21 17:37:57 +00:00
Michael Tüxen 2440176cab Use pcapio routines. This concludes the preperation for
adding pcapng support.

svn path=/trunk/; revision=46673
2012-12-21 14:34:26 +00:00
Michael Tüxen 0461a705c0 text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).
svn path=/trunk/; revision=46600
2012-12-18 22:56:06 +00:00
Gerald Combs dc908733ea Add libui_dirty.
svn path=/trunk/; revision=46575
2012-12-17 21:24:22 +00:00
Guy Harris 7cb9781379 We don't need Cocoa or Core Services for anything.
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-22 18:19:37 +00:00
Gerald Combs ec560b5b47 Link with CoreFoundation and SystemConfiguration and add cfuitils.c on
OS X where needed. Dumpcap, rawshark and tshark don't appear to require
Cocoa so remove it.

svn path=/trunk/; revision=46144
2012-11-22 16:49:17 +00:00
Guy Harris 1d0b5f5d07 Add capture_unix_ifnames.c to the list of files needed when building for
UN*X.

svn path=/trunk/; revision=46133
2012-11-22 07:00:23 +00:00
Anders Broman 28474fe8ef From Mike Garratt:
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-19 20:07:27 +00:00
Jörg Mayer 854ae179ef Fix ui/qt/print_dialog.cpp:228:23: error: variable ‘status’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=45864
2012-11-01 23:09:02 +00:00
Jörg Mayer 218aaf05e3 capinfos needs libwsutil. Explicitely link against it.
svn path=/trunk/; revision=45292
2012-10-03 17:31:23 +00:00
Jörg Mayer 4844896d63 Add manpages for reordercap
svn path=/trunk/; revision=45291
2012-10-03 17:29:06 +00:00
Jörg Mayer 7ebba8f64d Get rid of HAVE_CONFIG_H for cmake. Fix one case where it was still used.
svn path=/trunk/; revision=45191
2012-09-28 14:24:52 +00:00
Gerald Combs af176b4c36 Update regexes to match the version string changes in r45112.
svn path=/trunk/; revision=45114
2012-09-24 23:40:59 +00:00
Martin Mathieson 60fb63783a From Jim Young, bug 7745.
Add Makefile support for reordercap.

svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
Jeff Morriss 5ee932193f *NIX (autofoo and cmake) part of the fix for
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-18 21:42:13 +00:00
Evan Huus 01f1afd5d3 Update CMakeLists to respect the recent libui changes so that wireshark and
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-15 02:52:29 +00:00
Gerald Combs 762e5ac93f Create a common libui using CMake similar to what we do with Autotools.
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-14 20:23:18 +00:00
Jörg Mayer d8a7eed0a7 Get netlink detection working with cmake (not complete)
svn path=/trunk/; revision=44791
2012-09-06 10:37:17 +00:00
Gerald Combs 5f2783de05 Revert r44644 and 44645. g_source_*, g_timeout_, and g_io_* all depend
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-24 15:25:42 +00:00
Gerald Combs 5adc43f597 Move the pipe input routines to the common UI directory.
svn path=/trunk/; revision=44644
2012-08-23 18:42:48 +00:00
Jörg Mayer e3d925b1ff The proper way to set compiler flags in cmake is not by using
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-23 12:30:16 +00:00
Jörg Mayer fcb0307fae The name configure.in has been deprecated for many years.
Use configure.ac instead.

svn path=/trunk/; revision=44630
2012-08-23 11:11:24 +00:00
Jörg Mayer 4546cfeab5 Commit 44474 added some arguments to the ac_init macro that broke
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-19 00:14:14 +00:00
Gerald Combs bd855826a9 Move the common parts of iface_lists.[ch] from ui/gtk/ to ui/. Leave the
GTK+-specific parts behind in capture_dlg.c.

svn path=/trunk/; revision=44196
2012-08-01 22:32:14 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695)
svn path=/trunk/; revision=43844
2012-07-20 01:21:27 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Guy Harris 1d1391ed47 From Pontus Fuchs:
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-28 16:21:51 +00:00
Anders Broman e6e6d6217b From Tony Trinh:
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-25 20:42:07 +00:00
Jörg Mayer 3b34b557f8 Also add ws80211_utils.c for CMake builds.
Build with -g to make debugging easier. The debug info
will get removed on installation.

svn path=/trunk/; revision=43464
2012-06-24 19:41:13 +00:00
Jörg Mayer c0da019caa Complete cmake support for netlink detection
svn path=/trunk/; revision=43421
2012-06-20 20:59:43 +00:00
Jörg Mayer d9f88ebdcc And another instance of HAVE_WIRELESS_TOOLBAR I missed
svn path=/trunk/; revision=43418
2012-06-20 19:09:35 +00:00
Jörg Mayer b5c1bd803c Copy over Makefile.common changes to CMakeLists
svn path=/trunk/; revision=43416
2012-06-20 18:46:16 +00:00
Jörg Mayer e64ba28e3b Do the changes to configure from r43354 in cmake as well.
Log:
 Start to have an generic wireless toolbar. Sligtly modified patch from
 Pontus Fuchs.

svn path=/trunk/; revision=43361
2012-06-19 14:21:08 +00:00
Guy Harris 72f9f25dcb No more GIOP plugins, no more plugins/giop directory.
svn path=/trunk/; revision=42984
2012-06-01 18:09:14 +00:00
Jörg Mayer 6b8234e001 Document which warnings are c++ only.
svn path=/trunk/; revision=41574
2012-03-15 21:27:04 +00:00
Guy Harris 1667f1ef11 Reflect the move of alert_box.c to the ui directory.
svn path=/trunk/; revision=41437
2012-03-08 17:43:34 +00:00
Guy Harris db40e0bc1a Reflect the move of dftest.c back to the top-level directory.
svn path=/trunk/; revision=41065
2012-02-19 08:59:17 +00:00
Jörg Mayer d205085350 Trying to fix the compile of ui/util.c on Windows by moving the
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-17 16:59:14 +00:00
Jörg Mayer 35508464b2 Start moving files to ui/ and ui/cli/
svn path=/trunk/; revision=41047
2012-02-17 12:30:27 +00:00
Jörg Mayer 4e8aa4f6f3 Last fix to the wrong approach.
svn path=/trunk/; revision=40925
2012-02-08 07:39:51 +00:00
Jörg Mayer dc1a9e539b Make sure that we only have to set (or pick up) the docdir environment
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-07 08:05:11 +00:00
Anders Broman 8d4f6fc794 From QA Cafe:
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-05 10:39:12 +00:00
Jörg Mayer 9f61b8bdd0 Fix long standing but that prevented installation to
work at all.
Next step ist to move docbook installation back into docbook/

svn path=/trunk/; revision=40846
2012-02-05 07:41:53 +00:00
Jörg Mayer 67d74b7f4e - Add a comment how to improve the output of supported features later on.
- Move docbook pdf installation to toplevel.

svn path=/trunk/; revision=40840
2012-02-04 14:19:38 +00:00
Jörg Mayer 137f3fc455 - Move setting _U_ into config.h, because
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-02 12:04:22 +00:00
Jörg Mayer 0e3ac2fdf0 Prepare the cmake infrastucture for eventually building
wireshark and qtshark simultanously.
The "only" missing thing for this is now ui/qt/CMakeLists.txt ;)

svn path=/trunk/; revision=40799
2012-02-02 00:46:02 +00:00
Jörg Mayer 5357769aca Manually revert the changes to CMakeLists.txt from commit 40602 - they should not be necessary/are wrong
svn path=/trunk/; revision=40605
2012-01-20 11:02:15 +00:00
Jeff Morriss 0a6eca4097 Bug 6448 says the embedded Python stuff does not really work.
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
2012-01-20 03:20:35 +00:00
Guy Harris 5263048b9b Reflect the move of recent.c from ui/gtk to the top-level directory.
svn path=/trunk/; revision=40565
2012-01-18 20:23:30 +00:00
Jörg Mayer 333b9e0fa8 move alert box for cmake builds as well
svn path=/trunk/; revision=40542
2012-01-16 03:25:55 +00:00
Jörg Mayer a7d99d703f alert_box.c moved to ui/
svn path=/trunk/; revision=40538
2012-01-16 02:28:38 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00
Jörg Mayer 2097912587 Rename crypt-xxx to xxx
svn path=/trunk/; revision=40511
2012-01-15 12:29:44 +00:00
Jörg Mayer 9781eaf0f5 Sync filelists between autofoo and cmake.
Move some dissectors that throw warnings to DIRTY_
Whitespace cleanups

svn path=/trunk/; revision=40478
2012-01-13 19:29:58 +00:00
Gerald Combs f6ffb03ccb CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
register_tap_files so that the "-z" flag works for TShark.

epan/stat_cmd_args.c: Fixup whitespace.

svn path=/trunk/; revision=40443
2012-01-12 19:16:15 +00:00
Guy Harris f210836a02 I had a capture_errs.c but capture-wpcap.c eated it.
svn path=/trunk/; revision=40339
2011-12-30 00:17:50 +00:00
Jörg Mayer d2dcf80ed4 Dafine G_DISABLE_SINGLE_INCLUDES while compiling. This mimics a patch
that has been in configure.in for quite some while.

svn path=/trunk/; revision=40056
2011-12-01 02:31:47 +00:00
Stig Bjørlykke 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
Gerald Combs 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
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER
as it is the only option left.

svn path=/trunk/; revision=39138
2011-09-25 21:27:19 +00:00
Martin Mathieson a0f614494b Add a tap for showing all expert items.
svn path=/trunk/; revision=39010
2011-09-15 10:30:57 +00:00
Jörg Mayer 3a48ef3e02 Make it possible to disable building with libpcap.
svn path=/trunk/; revision=38795
2011-08-30 11:44:21 +00:00
Jörg Mayer 6c3a7ca052 Only build rawshark and dumpcap if we have libpcap
svn path=/trunk/; revision=38780
2011-08-29 19:18:28 +00:00
Jörg Mayer 167628a96e rtp-player now compiles with gtk3
svn path=/trunk/; revision=38774
2011-08-29 13:43:23 +00:00
Jörg Mayer 4c7d6af730 GTK3 only builds if portaudio is disabled (rtp player is not
yet gtk3 ready).

svn path=/trunk/; revision=38684
2011-08-23 09:31:25 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib.
svn path=/trunk/; revision=38683
2011-08-23 09:25:06 +00:00
Jörg Mayer 8268c2c656 Missed (at least) one place where to rename UI_MANAGER -> ENABLE_UI_MANAGER
svn path=/trunk/; revision=38674
2011-08-22 16:16:16 +00:00
Jörg Mayer cf889e0707 Rename UI_MANAGER to ENABLE_UI_MANAGER, put it into
CMakeOptions and enable it by default.
Update comment in proto_help that this feature is no
  longer built by default.
Enable PYTHON by default.


svn path=/trunk/; revision=38659
2011-08-22 08:08:38 +00:00
Jörg Mayer 553c565699 mate_grammar.lemon:
- Fix a bug my previous patch introduced.

mate/:
- Unset G_DISABLE_DEPRECATED for the mate files.

CMakeLists.txt
configure.in:
- Build with -DG_DISABLE_DEPRECATED so further usage of
  deprecated glib functions will be detected.

svn path=/trunk/; revision=38393
2011-08-07 18:35:36 +00:00
Jörg Mayer a2c225e8e3 We can always add ${GTHREAD2_LIBRARIES} - this variable will be empty
if not building with the gthread library.

svn path=/trunk/; revision=38359
2011-08-05 11:10:26 +00:00
Gerald Combs 3d2c4f6182 Use GLIB2_LDFLAGS instead of GLIB2_LIBRARIES for wsutil, since it
includes the path to the libraries. Add gthread to wireshark_LIBS if
threads are enabled.

svn path=/trunk/; revision=38345
2011-08-05 00:25:02 +00:00
Gerald Combs 53c550831b Define PACKAGE in config.h.
svn path=/trunk/; revision=38316
2011-08-02 21:23:00 +00:00
Gerald Combs d39696be6d Add tap-hosts.c.
svn path=/trunk/; revision=38313
2011-08-02 18:13:16 +00:00
Chris Maynard 4a5c24b6fc At the request of Tony Trinh on -dev, set(CMAKE_VERBOSE_MAKEFILE OFF)
Ref: http://www.wireshark.org/lists/wireshark-dev/201107/msg00156.html

svn path=/trunk/; revision=38103
2011-07-19 01:46:16 +00:00
Michael Tüxen 7b52f1bb96 Add option for USE_THREADS.
svn path=/trunk/; revision=38061
2011-07-16 13:05:46 +00:00
Martin Mathieson 092b161d04 Add LTE RLC stats tap to tshark.
svn path=/trunk/; revision=38019
2011-07-14 17:07:41 +00:00
Martin Mathieson a7fac381ca Add LTE MAC statistics to tshark.
svn path=/trunk/; revision=38016
2011-07-14 13:39:02 +00:00
Jörg Mayer de185ff0b5 Copy over behaviour of commit 37967 for configure.in
svn path=/trunk/; revision=37994
2011-07-12 21:24:15 +00:00
Jörg Mayer a3d62412fd rev 37741 added tap-rtspstat.c to Makefile.common.
svn path=/trunk/; revision=37745
2011-06-22 06:52:18 +00:00
Jörg Mayer 5b22003e93 Add configure options to make change the default file format
from pcap-ng to pcap.
Add a comment that GTK3 doesn't build yet.

svn path=/trunk/; revision=37701
2011-06-17 22:57:02 +00:00
Jörg Mayer 48904e0a71 Add GTK3 cmake options. It doesn't build, just like its configure pendant.
svn path=/trunk/; revision=37623
2011-06-08 18:10:03 +00:00
Stig Bjørlykke 65b2467999 From Roland Knall via bug 6007:
Remove plugins/interlink from CMake.

svn path=/trunk/; revision=37614
2011-06-08 07:03:53 +00:00
Anders Broman d8e1b0d3d5 Move packet-sercosiii.c to be a builtin dissector.
svn path=/trunk/; revision=37597
2011-06-07 20:33:26 +00:00
Gerald Combs 99d4de66e5 From Dirk Jagdmann via bug 5875:
My attachment adds a link to a XSLT file to the preamble of the PDML.
The XSLT will transform the PDML to a HTML page, and the HTML page
features a look similar to Wireshark. See
http://cubic.org/~doj/ebay/a.pdml for an example.

The patch also contains a small perl program which converts the
Wireshark colortable into javascript code which is used in the XSLT
file. If you want to use a different color scheme you would execute the
perl program and insert the generated javascript function into your XSLT
file.

To view the HTML you could either place the PDML and XSLT file on your
webserver and verify that your webserver sends the PDML file as
"text/xml".  Then your webbrowser will find the linked XSLT file,
download that as well and convert the PDML to HTML on the fly.

You could also use an XSLT processor like xsltproc to convert the PDML
and XSLT into a static HTML file.


From me:

Minor fixups.

svn path=/trunk/; revision=37298
2011-05-19 18:10:21 +00:00
Jörg Mayer 07265037dd Update CMakeLists to follow commit 37219.
Remove a duplicate check in configure.in

svn path=/trunk/; revision=37277
2011-05-19 04:35:04 +00:00
Jörg Mayer 811afde69e Play catch up with recent configure.in changes:
- Link dumpcap (and only dumpcap) against gthread
- gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1
- Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..."


svn path=/trunk/; revision=37103
2011-05-12 21:13:00 +00:00
Guy Harris 9e2ecb8d7a Add frame_data_sequence.c.
svn path=/trunk/; revision=36885
2011-04-27 03:57:21 +00:00
Chris Maynard 5abfa49525 Add conversation tracking and tshark tap support to ICMPv6. Fixes bug 5810.
TODO: Add a Wireshark tap or look into possibly using the stats tree instead.
Also, like ICMP, the ICMPv6 payload appears to carry the sender's timestamp, so
it might be possible to make use of this information to estimate the total SRT.
(See bug 5770 for more details.)

svn path=/trunk/; revision=36561
2011-04-11 17:42:01 +00:00
Chris Maynard 595e5e1c1d Add ICMP tap support, and add a tshark tap to measure such things as:
* Number of ICMP echo requests, replies, lost replies and percent loss.
  * Min, Max, Average SRT (Service Response Time), and standard deviation.
(This is my first tap, so hopefully I didn't miss something, but we'll see ...)
TODO: Add a Wireshark tap.


svn path=/trunk/; revision=36480
2011-04-05 20:21:59 +00:00
Jaap Keuter 4dd920a9aa From Roland Knall:
WS_MSVC_NORETURN is undeclared under a non-Windows operating system, which
breaks compilation in the files epan/except.c and dumpcap.c as well as any
file including epan/except.h

svn path=/trunk/; revision=36023
2011-02-21 21:33:54 +00:00
Jörg Mayer 6e4b5cac5e dumpcap failed to link - add glib2 and wsutil libraries to fix this.
svn path=/trunk/; revision=35575
2011-01-18 17:49:41 +00:00
Jaap Keuter 3656ecb823 Free dumpcap from linking to wiretap.
svn path=/trunk/; revision=35353
2011-01-04 07:06:01 +00:00
Jörg Mayer 4ee8c642d6 u3.c has moved.
svn path=/trunk/; revision=35057
2010-11-28 21:44:06 +00:00
Jörg Mayer 0fda991f45 First try to install docbook stuff as well - not yet working
svn path=/trunk/; revision=34896
2010-11-16 00:20:31 +00:00
Jörg Mayer 3c349772fb - Pod stuff is independent of the guides, so check/use
it indepently.
- AND needs to be in caps.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879

svn path=/trunk/; revision=34325
2010-10-02 06:45:49 +00:00
Jörg Mayer b4b1ad9963 Fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4879
where the build would fail if no gtk2 development files
were found.

svn path=/trunk/; revision=34308
2010-10-01 12:17:11 +00:00
Jörg Mayer 34c7218d1a - Reorder how packagetests are run
- Add packet-reload.c
- Make most packages not-required (not tested)
- Does *not* (yet) add an optional/whatever case to enable_


svn path=/trunk/; revision=34307
2010-10-01 08:40:52 +00:00
Jörg Mayer eb1fdd0f27 - Reset a few more variables used in FindXYZ scripts.
- README.cmake: small update.
- Set a variable before using it for installation.

svn path=/trunk/; revision=34274
2010-09-28 19:23:15 +00:00
Jörg Mayer 4bfd2dfdf1 - FindGLIB2.cmake updates from
http://www.opensync.org/browser/branches/3rd-party-cmake-modules/modules
  + split out FindGMODULE2.cmake
  + contains /sw/... by default
  + supposedly tested on OSX
- Disable pcre for cmake builds by default, gregex should be
  picked up automatically if glib2 is not too old.

Should you have trouble linking due to some libgmodule... stuff
undefined, please add "${GMODULE2_LIBRARIES}" after "${GLIB2_LIBRARIES}"
an report back.

svn path=/trunk/; revision=34248
2010-09-25 15:38:12 +00:00
Guy Harris 8257e6e816 Actually do what I said I did in the previous checkin.
svn path=/trunk/; revision=34244
2010-09-24 21:18:39 +00:00
Guy Harris ac3ac6c476 Plugins are not shared libraries, so:
1) don't set thei SOVERSION - run-time-loaded modules don't have
	   an SOVERSION;

	2) build them with link mode MODULE, not SHARED, on all
	   platforms.

(Fixing 1) also fixes the problem with building them as MODULE on OS X.)

svn path=/trunk/; revision=34243
2010-09-24 20:41:34 +00:00
Jörg Mayer e84f210167 Undo some part of
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34224

This fix is wrong. We need to find out why this fails and correct it in


svn path=/trunk/; revision=34226
2010-09-23 21:18:04 +00:00
Jörg Mayer 79d806450f H.sivank:
Cmake fixes.

svn path=/trunk/; revision=34225
2010-09-23 21:14:23 +00:00
Stig Bjørlykke e60eeb3602 Some CMake fixes from H.sivank:
- Apple gcc does not like "-Wl,--as-needed".
- Fix plugins link step on OSX.
- Put AUTHORS-SHORT, AUTHORS-SHORT-FORMAT and wireshark.pod in build directory.

svn path=/trunk/; revision=34224
2010-09-23 21:06:31 +00:00
Jörg Mayer f337b03f39 Copy behaviour of
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=34145
to cmake.

svn path=/trunk/; revision=34205
2010-09-23 09:05:31 +00:00
Jörg Mayer de68ad3066 H. Sivank <hsivank@gmail.com>
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Jörg Mayer de916f6bfb Try to add support to learn the HTML_VIEWER variable and the DOC_DIR variables from the environment - not yet working
svn path=/trunk/; revision=34200
2010-09-23 06:59:41 +00:00
Jeff Morriss 9d3d2922ea From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5223 :
I would like to contribute iSCSI SRT tap, 'tap-scsistat.c' for tshark. 

The output exactly matches that of the Wireshark's iSCSI(disk) SRT dialog.

From me: a couple of small changes to make it compile without warnings.

svn path=/trunk/; revision=34152
2010-09-18 01:03:45 +00:00
Stig Bjørlykke 8d8c397852 Use absolute paths in link_directories.
svn path=/trunk/; revision=34098
2010-09-10 16:50:12 +00:00
Jörg Mayer 7807a0d846 - Copy over from Makefile.am: dumpcap doesn't need to link
in libgcrypt and gnutls.
- capinfos has a dependency on svnversion.h

svn path=/trunk/; revision=33559
2010-07-17 14:07:13 +00:00
Jörg Mayer 9f9b4fbf71 Fix cmake build for wireshark-filters.
svn path=/trunk/; revision=33546
2010-07-15 22:50:28 +00:00
Gerald Combs 69df102b4e Don't include the filter list (which is now over 16MB) in the
wireshark-filter man page. Point to other sources for the list instead.

svn path=/trunk/; revision=33539
2010-07-15 16:18:13 +00:00
Jörg Mayer 08619accd1 - Update todo list
- Add dftest and randpkt manpages to sync with autofoo


svn path=/trunk/; revision=33521
2010-07-14 16:16:29 +00:00