Commit Graph

547 Commits

Author SHA1 Message Date
Joerg Mayer 5d65e022df More .in files to handle
Change-Id: I55a04fe6f72c22f1a936ef45b215a8813f7a02db
Reviewed-on: https://code.wireshark.org/review/2502
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20 23:05:57 +00:00
Joerg Mayer fd8bf42152 Process all .in files, not only the ones needed for Unix'ish systems.
Change-Id: I265367f07253be4379efbb6689ec944f04ef6134
Reviewed-on: https://code.wireshark.org/review/2500
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20 22:39:37 +00:00
Graham Bloice dc5d0ed0bc Add flags required for VS2013 to Cmake
Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4
Reviewed-on: https://code.wireshark.org/review/2499
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-20 22:05:50 +00:00
Joerg Mayer 72078cfc91 Undo more of Graham's changes:
- We don't expect to find all packages and it is normally OK for
  some to fail.

Change-Id: I46c5edbf8ea3635fd703b222d4a9beb5ebb4745a
Reviewed-on: https://code.wireshark.org/review/2406
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 19:28:49 +00:00
Guy Harris ff5c9684db Only check for -msse4.2.
We don't care about instruction set extensions other than SSE 4.2, just
check for that.

Do so on all compilers other than MSVC.

Change-Id: I227c31715aab6df0e020d6bc3e3aa41e1bc5cb7e
Reviewed-on: https://code.wireshark.org/review/2405
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 19:27:24 +00:00
Guy Harris 8dabe0027a We don't need -Qunused-arguments with Clang
check_c_compiler_flag now checks for the message Clang prints for -f and
-m flags it doesn't handle ("argument unused during compilation:
'-{flag}'"), so the checks for it now should fail properly during
testing, causing us not to use the flag in question.  This means we
don't need to suppress that warning, as we shouldn't be getting it.

Change-Id: Ieb9657f9e2cee2f357acd52725199d78d2dad80f
Reviewed-on: https://code.wireshark.org/review/2401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:58:57 +00:00
Guy Harris c6007e8d26 We don't need -Werror=unknown-warning-option with Clang.
check_c_compiler_flag checks for the message Clang prints for an unknown
warning option ("unknown warning option '-WXXX'"), and fails if it's
produced, so we don't need to force the compiler to fail by passing it
-Werror=unknown-warning-option.

(Yes, the CMake way of handling those annoying options is different from
the way we do that in autotools - autotools adds flags to force errors,
CMake checks for the warning messages - but that's OK.)

Change-Id: I5c2e5d6f4826eba7048736d5134d20417778276a
Reviewed-on: https://code.wireshark.org/review/2400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:55:27 +00:00
Guy Harris 77e34736c5 Do C-Flags and CXX-Flags the same way.
It looks weird to have "-- " before C-Flags but not CXX-Flags.

Change-Id: I95f309b60a45cbd4477c8ed6187b198ab9bac9d8
Reviewed-on: https://code.wireshark.org/review/2398
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 18:31:20 +00:00
Joerg Mayer 289aa37d8d Remove detection of Python libraries: They are not used anymore.
Change-Id: If42bb16d5c6202889ff933af6c9d974866d2a950
Reviewed-on: https://code.wireshark.org/review/2290
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 00:44:53 +00:00
Jeff Morriss f113306e0e More Python-bindings removal.
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce
Reviewed-on: https://code.wireshark.org/review/2283
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 23:14:05 +00:00
Joerg Mayer 67a924be4a The visibility warning is only valid on non-msvc platforms
Change-Id: Iec90ac8654d08b63cfda7d14c370f3c800c74038
Reviewed-on: https://code.wireshark.org/review/2263
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 19:15:32 +00:00
Joerg Mayer 4c261cf6a0 Policy CMP020 was being set twice. Remove my original clumsy implementation.
Set CMP0015 to NEW

Change-Id: Idea76f365f27e59eb6f56c7edec6d96224668c0d
Reviewed-on: https://code.wireshark.org/review/2219
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 14:34:22 +00:00
Joerg Mayer 30480da87a Match for contents of WIRESHARK_SIMD_FLAGS only if non-empty
Change-Id: I99e15b237c74783b455461ce58ba32f1f8202990
Reviewed-on: https://code.wireshark.org/review/2208
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 08:49:51 +00:00
Joerg Mayer 935280317a Backport autofoo simd optimization
Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6
Reviewed-on: https://code.wireshark.org/review/2206
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 06:44:15 +00:00
Joerg Mayer 21b08ba8c8 Rename WIRESHARK_C_FLAGS to WIRESHARK_COMMON_FLAGS
Change-Id: If78801de797264c0924e81abaf8cd49cc5715a83
Reviewed-on: https://code.wireshark.org/review/2204
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 06:42:39 +00:00
Joerg Mayer 9b4991098f Linking against libgettext and libm got broken by
commit 561460160a
 Author: Graham Bloice <graham.bloice@trihedral.com>
 Date:   Fri May 16 20:43:17 2014 +0100

     Update CMake build for win32 to build QT again, and to find
     GLib and GThread libs

Fix that (basically it put them into the packagelist which got
*replaced* by the next set of things to test).

Change-Id: I0f43a17a7c7eb087c530f6336dc61f93b121fda8
Reviewed-on: https://code.wireshark.org/review/2035
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-08 14:36:37 +00:00
Graham Bloice 561460160a Update CMake build for win32 to build QT again, and to find
GLib and GThread libs

Change-Id: If7e8ebc46f42389d174959303e13cde20687ae8a
Reviewed-on: https://code.wireshark.org/review/2010
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-08 12:13:35 +00:00
Michal Labedzki c04b5292b1 cmake: Add feature info for SBC
It is helpful to find and build this optional dependance.

Change-Id: I73d7a7bb730778bc8b9a54d6560f7f42f1e23bc0
Reviewed-on: https://code.wireshark.org/review/1876
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30 13:59:02 +00:00
Balint Reczey 7c1171f784 Fix wireshark.pc install destination
Change-Id: I136d654ac5ea54237494d9b61c3ddb445b0720ae
Reviewed-on: https://code.wireshark.org/review/1863
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30 13:36:29 +00:00
Balint Reczey 7bf49b31ac Set PLUGIN_INSTALL_DIR properly for wireshark.pc
Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747
Reviewed-on: https://code.wireshark.org/review/1861
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30 12:48:08 +00:00
Joerg Mayer 6dabe124dc Commit 5ff629ec5a requires the minimum
cmake version to be 2.8.3. Make this explicit.

  commit 5ff629ec5a
  Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
  Date:   Thu May 22 22:05:08 2014 +0200

  CMake: Remove FeatureSummary.cmake and fix display of feature

Change-Id: If6f67c837f1bee92a22bbff8965baa3cc71bf663
Reviewed-on: https://code.wireshark.org/review/1841
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-28 15:15:32 +00:00
Alexis La Goutte 5ff629ec5a CMake: Remove FeatureSummary.cmake and fix display of feature
Bug:8819

Change-Id: I35778a4ce198245fbe86eaded2b733745ff8e934
Reviewed-on: https://code.wireshark.org/review/1728
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-27 11:20:55 +00:00
Alexis La Goutte ca97ba0fcb Update comment about -Wunreachable-code and -Wdocumentation
Change-Id: I5b942bdacc5f4a9ecfa084dbff479eba6582b0df
Reviewed-on: https://code.wireshark.org/review/1726
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-23 07:23:42 +00:00
Alexis La Goutte 2b0ad54034 Fix indent (use tabs)
Change-Id: Ie23faaeeab61c684d57c4ff7b3c1b4ff95906dbe
Reviewed-on: https://code.wireshark.org/review/1706
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-21 02:06:10 +00:00
Guy Harris 8f2f727571 Not finding a non-required package is *NOT* an error!
If you think not finding a package that the user specifies should be
used should be an error, please fix bug 10074 first - not finding a
package that the user *didn't* specify should be used or shouldn't be
used should not be an error.

Change-Id: I62aba4309e227352e114f2d291aaa74dba78840f
Reviewed-on: https://code.wireshark.org/review/1498
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-05 03:12:14 +00:00
Guy Harris 0b0c98a040 set(<variable>) *undefines* the variable; a value must be specified.
When setting the XXX_REQUIRED variables, set them to TRUE.

Change-Id: I1591ffe221e15d65cb64516a45e9dc8461051373
Reviewed-on: https://code.wireshark.org/review/1497
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-05 03:07:21 +00:00
Michał Orynicz fbd3c93798 Fix procedure of finding packages
Before this change the code using make package was just showing
a string ${PACKAGE_VAR}_FOUND instead of showing if the
${PACKAGE_VAR}_FOUND variable was set true by find_package function.
Now the user will be informed about which packages were not found
and an error will be raised, as packages sought are the ones that
are selected for the build.

This change also ads fixes to some improper PACKAGE_VAR
variables that prevented find_package from finding
proper packages.

Change-Id: Ic20bc50ace65bab385059a7430909f95367520a3
Reviewed-on: https://code.wireshark.org/review/1410
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-01 12:12:12 +00:00
Graham Bloice 14017dc6f1 Set CMake defaults for Windows build to:
Use GTK2 as per nmake.
  Not to build the dumpabi executables.

Change-Id: Ia28cf1a80b81e10595f4af5bbd46da3b3675faf5
Reviewed-on: https://code.wireshark.org/review/1376
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-29 04:25:26 +00:00
Guy Harris fde8ef0713 Rename ENABLE_EXTRA_COMPILER_CHECKS to ENABLE_EXTRA_COMPILER_WARNINGS.
This matches the current name of the --enable-extra-compiler-warnings
option in autotools.

Fix the documentation of the option to match.

(Note that "compiler" won't necessarily always be GCC or Clang, and
won't necessarily always use -W for warning options, so speaking of them
as "-W checks" isn't future-proof.)

Change-Id: I2e142532e78be3c8051f1e738b3109a83e7d10dc
Reviewed-on: https://code.wireshark.org/review/1231
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20 23:54:46 +00:00
Guy Harris f456a6e0a5 Get rid of ENABLE_EXTRA_CLANG_CHECKS.
It no longer does anything, and it refers to variables that no longer
exist, as we're not distinguishing between extra GCC warning flags and
extra CLang warning flags any more.

Change-Id: If0b346f669f2573e46261e6da4dc78e96ef79a8f
Reviewed-on: https://code.wireshark.org/review/1228
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20 23:22:33 +00:00
Guy Harris 68f9811b1b Don't distinguish between "GCC" and "Clang" extra -W flags.
We test whether a given compiler supports a given -W flag, so we don't
need to separate them and check them only for particular compilers.

To make that even clearer, rename the --enable option from
--enable-extra-gcc-checks to --enable-extra-compiler-checks, and
document it as just "do additional -W checks", and rename the
WIRESHARK_EXTRA_GCC_ CMake variables to WIRESHARK_EXTRA_COMPILER_.

Sync up the lists of warning flags in CMake with the lists in autoconf.

Uncomment -Wdocumentation while we're at it.  If it doesn't work *at
all*, comment it out until it's fixed, or, better yet, fix it; if it
still produces warnings, we just leave it among the "extra" flags.

Change-Id: I4042affdade612e4025e2881d08f1ca69d759626
Reviewed-on: https://code.wireshark.org/review/1226
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20 22:47:18 +00:00
Michał Orynicz 412c6cabcf Make makefile verbosity configurable from CMake
This change makes CMAKE_VERBOSE_MAKEFILE option
of CMake used to determine verbosity of generated
makefile, instead of hardcoding it in CMakeLists.txt
script and forcing user to read the script and use
workarounds like "make VERBOSE=1"

Change-Id: I0f3b90ccf962ff88fbfa21ad2f3920b1644d6b6e
Reviewed-on: https://code.wireshark.org/review/1002
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09 08:00:31 +00:00
Michał Orynicz 3057e309df Change how WERROR and WERR_UNKNOWN is turned off
Use setting WERROR and WERR_UNKNOWN explicitly to 
FALSE instead using unset command. This ensures that
no if(WERROR) or if(WERR_UNKNOWN) clause will trigger
unless these variables are set to another value.

Change-Id: I752d7691c9c101b07c6ee85db83d96d9190bccd7
Reviewed-on: https://code.wireshark.org/review/1001
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09 07:54:10 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte 280c2958f2 Add --enable-extra-clang-checks for autotools and CMakeList
With -Wunreachable-code flags (and disable for the moment -Wdocumentation)

Change-Id: I126c962b32e650a63b78092e95896736ae7335c9
Reviewed-on: https://code.wireshark.org/review/678
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-31 08:29:58 +00:00
Alexis La Goutte d43f7d134b Remove -Wunreachable-code it is removed from GCC
http://gcc.gnu.org/ml/gcc-help/2011-05/msg00360.html

Change-Id: I3f016611d0dc5e7cc6d53965f9b5d2b1ee88fe1c
Reviewed-on: https://code.wireshark.org/review/677
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17 14:32:44 +00:00
Balint Reczey ff6cc9b0cb Add pkg-config file
Change-Id: Ia55a2e560aef8d2f9a3cede18af4555507656047
Reviewed-on: https://code.wireshark.org/review/500
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-03-08 23:55:38 +00:00
Michal Labedzki 1fd434e4f1 Add missing SBC library to cmake build
Change-Id: I4eb2dacc196b8feef62ff633322c53c04f78fc92
Reviewed-on: https://code.wireshark.org/review/252
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20 18:24:24 +00:00
Michal Labedzki 5e27a39fc6 Add Bluetooth SBC Codec support in cmake
SBC Codec can be optionally linked with Wireshark to provide
ability to playing RTP/SBC stream by RTP Player.

Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5
Reviewed-on: https://code.wireshark.org/review/223
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17 21:44:17 +00:00
Evan Huus b24339e22d Disable tfshark taps for now.
Should fix build issue and none of the current taps are relevant to tfshark
anyways.

Change-Id: I29168e0b296cd64fe3783de63e1fdd2a472ee6d3
Reviewed-on: https://code.wireshark.org/review/218
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-14 20:58:53 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.

Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-07 23:03:03 +00:00
Jörg Mayer 88a205d5e6 Error doesn't exist, use warning instead.
svn path=/trunk/; revision=54841
2014-01-19 01:08:52 +00:00
Jörg Mayer 2a21b01fbb Add option to specify special permissions for dumpcap during cmake phase:
set(DUMPCAP_INSTALL_OPTION   <val>)
where val is one of "normal" "suid" "capabilities"

Some things left to do:
- Error out in cmake if setcap isn't found or libcap isn't found.
- Move multivalue option handling into it's own macro (-file) with
  value checking


svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
Jörg Mayer 5783452ab2 -Warray-bounds was listed twice
svn path=/trunk/; revision=54839
2014-01-18 22:52:56 +00:00
Jörg Mayer 02b9cbb571 Move cfile.c into SHARK_COMMON_SRC (as was done in nmake)
svn path=/trunk/; revision=54678
2014-01-09 11:02:29 +00:00
Jörg Mayer 2203d51591 make tfshark finally compile:
- Link against filetap
- Add cfile.c to sources
- Add the generated tshark-tap-register.c (which seems to be pulled
  in by one of the intermediate libraries with autotools)

svn path=/trunk/; revision=54674
2014-01-08 22:02:07 +00:00
Guy Harris 8c916394ef TFShark doesn't capture traffic, so it doesn't need
SHARK_COMMON_CAPTURE_SRC.

svn path=/trunk/; revision=54672
2014-01-08 20:57:34 +00:00
Guy Harris c81a43da68 At least some of the files in PLATFORM_CAPTURE_SRC are needed by
programs that use {lib,win}pcap but that don't capture traffic, such as
rawshark; rename it to PLATFORM_PCAP_SRC, and include it in
SHARK_COMMON_SRC rather than SHARK_COMMON_CAPTURE_SRC.

svn path=/trunk/; revision=54670
2014-01-08 20:36:37 +00:00
Guy Harris 005ff3f64d Rename WIRESHARK_COMMON_SRC to SHARK_COMMON_SRC - what's common about it
is that it includes files used in TShark and rawshark as well as
Wireshark, and that name is what's used by the autotools.

Add capture_sync.c to SHARK_COMMON_CAPTURE_SRC, as it's used both by
Wireshark and TShark, but not by rawshark, and as it's in the autotools
SHARK_COMMON_CAPTURE_SRC.  Move PLATFORM_CAPTURE_SRC from
(WIRE)SHARK_COMMON_SRC to SHARK_COMMON_CAPTURE_SRC, as it should only be
used by programs that capture traffic.

svn path=/trunk/; revision=54668
2014-01-08 20:10:17 +00:00
Michael Mann bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607)
This is a VERY PRELIMINARY version of tfshark.  It's an attempt to jumpstart FileShark and its architecture.  Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)

This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture.  And those layers will slowly be added in time (patches always welcome!).

svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
Jörg Mayer 25f66df319 Rework compiler flag detection to be able to handle changed
order of flags

svn path=/trunk/; revision=54638
2014-01-07 23:08:42 +00:00
Jörg Mayer 75dbaf5830 Check flags that might be supported by both C and C++ still
separately.

svn path=/trunk/; revision=54573
2014-01-03 00:40:21 +00:00
Jörg Mayer 0752f22af1 As discussed on wireshark-dev: follow autotools to use
-Wshorten-64-to-32 for c only

svn path=/trunk/; revision=54572
2014-01-03 00:14:46 +00:00
Jörg Mayer 0a5f6f4a5b Actually enable building filetap library.
NEWS changed

svn path=/trunk/; revision=54560
2014-01-02 17:59:04 +00:00
Anders Broman 643b572665 Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.
svn path=/trunk/; revision=54559
2014-01-02 17:47:34 +00:00
Jörg Mayer f9cce15b35 Generated stuff does not belong into the source tree
svn path=/trunk/; revision=54349
2013-12-22 01:29:21 +00:00
Jörg Mayer 6d17d3c4d6 Beginnings of doxygen support.
Currently the doxygen.cfg files are not designed for
out-of-tree builds - that needs to be fixed first.

svn path=/trunk/; revision=54348
2013-12-22 01:21:56 +00:00
Guy Harris e21fd7c0ce Add a "captype" file that just reports the type of a capture file, based
on what libwiretap thinks it is.

Update some comments to reflect the death of the hack used to include
(libwiretap) plugin support in programs not built with libwireshark.

svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
Jörg Mayer cf82d056f2 Create all binaries in one directory. After running setpath.bat
wireshark etc should now work, the basic stuff at least.

Known problems/todos:
- The plugins are not searched for in the current directory,
  so find out how to let Wireshark know to search for the
  plugins
- Other supporting files are missing (COPYING.txt, AUTHORS*, ...)
- Your missing feature could be listed here ;)

 Ciao
   Jörg

svn path=/trunk/; revision=53780
2013-12-04 10:41:38 +00:00
Jörg Mayer 20799bdeb4 Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part of
the QT5_BASE_DIR value.

svn path=/trunk/; revision=53717
2013-12-02 09:50:30 +00:00
Guy Harris 0cc1545d05 Move most of the plugin code from epan to wsutil and remove all
knowledge of particular types of plugins.  Instead, let particular types
of plugins register with the common plugin code, giving a name and a
routine to recognize that type of plugin.

In particular applications, only process the relevant plugin types.

Add a Makefile.common to the codecs directory.

svn path=/trunk/; revision=53710
2013-12-02 08:30:29 +00:00
Jörg Mayer 6a34c8c924 Small style changes.
svn path=/trunk/; revision=53701
2013-12-01 21:55:21 +00:00
Jörg Mayer 244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
2013-12-01 10:05:16 +00:00
Jörg Mayer e30fd2f989 Looks like the WinPcap version can only be determined from the
name of the compressed archive - which currently means "only by
manual developer intervention".

svn path=/trunk/; revision=53682
2013-11-30 23:40:25 +00:00
Jörg Mayer eaaf4437ab Graham Bloice
Ensure we use the correct value for MSC_VER_REQUIRED (similar to
nmake build)

svn path=/trunk/; revision=53656
2013-11-29 21:07:23 +00:00
Jörg Mayer 718568b4ff Graham Bloice:
Always include the "true" zlib includes first. This works around a
bug in the Windows setup of GTK[23] which has a faulty zconf.h.


svn path=/trunk/; revision=53647
2013-11-29 15:40:04 +00:00
Guy Harris 4dbed5fbd0 According to
http://gcc.gnu.org/onlinedocs/gcc-4.8.2/gcc/Code-Gen-Options.html#Code-Gen-Options

-ftrapv "generates traps for signed overflow on addition, subtraction,
multiplication operations." and -fwrapv "instructs the compiler to
assume that signed arithmetic overflow of addition, subtraction and
multiplication wraps around using twos-complement representation."

Those seem mutually-exclusive to me, and we probably want wrapping, not
traps, as there's probably a fair bit of code out there that explicitly
or implicitly assumes wrapping.  (Actually, we really want to avoid
signed arithmetic for the cases that most matter, such as offsets and
lengths, but, unfortunately, we currently have API conventions that
allow negative values for lengths, either with -1 meaning "to the end"
or with negative values meaning "relative to the end".)  In addition,
there seem to be some bugs complaining that -ftrapv doesn't always cause
traps on signed integer overflow.

We seem to be seeing crashes in Lemon on the Solaris buildbot subsequent
to adding -ftrapv; I don't know whether that's an overflow being
detected, a bug in the compiler, or something unrelated, especially
given that we're using Sun C, not GCC, on the Solaris buildbot. 
However, we'll try removing -ftrapv, to see if it fixes the problem; the
MIT CSAIL paper in question wasn't really recommending all the GCC
options it mentioned (which, as noted, wouldn't make sense, as -ftrapv
and -fwrapv appear to be mutually-exclusive).

svn path=/trunk/; revision=53556
2013-11-24 22:51:44 +00:00
Balint Reczey ee147994b7 Use GCC flags to avoid optimization problems due to undefined behaviour
Adding flags suggested by article at:
http://pdos.csail.mit.edu/~xi/papers/stack-sosp13.pdf

svn path=/trunk/; revision=53551
2013-11-24 20:28:25 +00:00
Alexis La Goutte 001d79cac3 Add -Wheader-guard to Autotools and CMake
svn path=/trunk/; revision=53507
2013-11-22 14:51:31 +00:00
Jörg Mayer 2276ff07d2 Beginnings of CheckAPI support. More diligence needed
(need to seperate generated files into their own variables).

svn path=/trunk/; revision=53407
2013-11-18 07:42:23 +00:00
Alexis La Goutte 35b782401e Fix indent (use tabs)
svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
Guy Harris db25270df8 Move the epan/filesystem.c routines to wsutil; they're not specific to
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00
Jörg Mayer f9b68b05e4 No need to check whether cmake_policy command exists as we require
cmake 2.6.
Add two more policy statements to avoid warnings on current cmake systems.
CMP0020 doesn't work - no idea why.

svn path=/trunk/; revision=53180
2013-11-09 09:36:09 +00:00
Jörg Mayer a00f13bbc3 Turn WANT_PACKET_EDITOR into an option until such a time that
it isn't a compile time option any more.

svn path=/trunk/; revision=53147
2013-11-07 20:32:41 +00:00
Alexis La Goutte 6261789695 Add WANT_PACKET_EDITOR to CMake
svn path=/trunk/; revision=53133
2013-11-07 07:43:01 +00:00
Jörg Mayer de057472f3 - Reenable /LARGEADDRESSAWARE on Windows platform
- Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info),
  print the choice.
  This will pick up the previously used flags LINK_FLAGS and
  CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed
  by _<build-type>
- Remove Optimization (-O2) and debug (-g) flags from list of default flags
  as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc.
  NOTE: This also needs to be done for the Windows flags, I just don't have
  a Win system to test on right now.


svn path=/trunk/; revision=53083
2013-11-04 20:29:29 +00:00
Jörg Mayer 117a59d7a2 Pass the name of the sed executable as an explicit argurment to
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

svn path=/trunk/; revision=53059
2013-11-03 12:22:39 +00:00
Jeff Morriss 58d01512b1 Make it so out-of-tree builds (autofoo and cmake) have access to the various
data files (diameter/*, COPYING, manuf) when running *shark from the
build directory.

Do this by passing in the top-level source directory as a compile-time
definition (unfortunately this has to be in the top-level Makefile too because
some programs link directly with epan/filesystem.c).

The plugins dir is no longer below the datafile directory but rather the
progfile directory (if we have one).  Handle the special case of AUTHORS-SHORT
(a data file but a generated one) by checking the file name before building
the path.

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

svn path=/trunk/; revision=52940
2013-10-29 02:28:16 +00:00
Gerald Combs 858524047c Add Gettext to PACKAGELIST. Homebrew puts it in a nonstandard location.
svn path=/trunk/; revision=52895
2013-10-27 17:14:12 +00:00
Gerald Combs 5fba0c2474 If we're using Clang add -Qunused-arguments in order to avoid a bunch
of warnings described at
http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html

svn path=/trunk/; revision=52646
2013-10-16 17:22:58 +00:00
Graham Bloice 9c4ee86784 Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
Jörg Mayer 3ab8799526 Remove some things that I added while not understanding the real
problem/solution.
"Long" since solved by copying the solution from Makefile.nmake.

Small update to the status of cmake builds on windows

svn path=/trunk/; revision=52574
2013-10-12 22:08:03 +00:00
Jörg Mayer c01ab40cde With Gerald's patch we should no longer require GTK includes for QT-Only builds
(untested).

svn path=/trunk/; revision=52555
2013-10-11 23:03:18 +00:00
Jörg Mayer ee5397d832 The env variable is QT5_BASE_DIR, as documented in README.cmake
Make documentation and implementatoin consistent

svn path=/trunk/; revision=52541
2013-10-11 11:43:37 +00:00
Jörg Mayer f0e92efd24 The path for the Qt5 installation now needs to be set as a
windows environment variable.

svn path=/trunk/; revision=52540
2013-10-11 11:25:40 +00:00
Jörg Mayer f5fd46fe6d qtshark and wireshark(gtk2) now actually find their libs.
svn path=/trunk/; revision=52539
2013-10-11 11:11:41 +00:00
Jörg Mayer 28282a991d Now the GUI programs (wireshark/gtk2 and qtshark) compile and link
svn path=/trunk/; revision=52538
2013-10-11 10:32:11 +00:00
Gerald Combs 564797a2e7 Try to locate QtMacExtras.
svn path=/trunk/; revision=52518
2013-10-10 23:11:19 +00:00
Jörg Mayer 2a59ee58b8 Add Airpcap detection, use it by default on win32
QT5 compile working - NOT. It's almost working, except
that I *still* need to get GTK detection working on Win :-(


svn path=/trunk/; revision=52513
2013-10-10 20:35:32 +00:00
Jörg Mayer 36e0adfcc1 Generate setpath.bat to set the paths necessary for running
the generated binaries inside the build dir.

svn path=/trunk/; revision=52492
2013-10-10 13:37:15 +00:00
Jörg Mayer 526f7cf367 The path approach can't work this way: Trying to set an environment
variable of our parent process isn't going to work. Plan B is to write
this stuff into a file and manually run it once.

Hard code the QT5 search path on Windows for now.

svn path=/trunk/; revision=52489
2013-10-10 09:10:53 +00:00
Jörg Mayer 0863791253 Try to set PATH on Windows to all required dlls/libs to allow
running the executables from the build tree without installation.
It doesn't really work yet but the troubleshooting has to wait
until either I've gotten some sleep or someone else fixes it.

svn path=/trunk/; revision=52454
2013-10-08 20:41:57 +00:00
Jörg Mayer f625f54e3f Remove an uncommented line: The file is now part of wsutil
svn path=/trunk/; revision=52426
2013-10-06 22:15:38 +00:00
Jörg Mayer d28324b05e Add a comment about PCAP_VERSION
svn path=/trunk/; revision=52409
2013-10-06 18:11:41 +00:00
Jörg Mayer f5cebd0ef9 Hack around the "/MD overridden by /MDd" messages.
Better solutions welcome.

svn path=/trunk/; revision=52396
2013-10-06 12:25:46 +00:00
Jörg Mayer 7b3ac2ae6b Attempt to get linking working with cmake - without success so far.
svn path=/trunk/; revision=52377
2013-10-05 10:17:21 +00:00
Jörg Mayer de3867e1a1 The PERL variable name is deprecated, use PERL_EXECUTABLE instead.
svn path=/trunk/; revision=52368
2013-10-04 16:55:33 +00:00
Jörg Mayer d5cd2f3ad9 Don't link qtshark against portaudio
svn path=/trunk/; revision=52283
2013-09-30 08:12:46 +00:00
Jörg Mayer d456079b7e Beginnings of win cmake support (not yet working), created by Graham Bloice,
some smaller changes by me.
- README.cmake
  Document how to (one day) run on Windows
- CMakeLists.txt
  Use MSVC compiler flags for MSVC instead of gcc flags
- FindWSWinLibs.cmake
  New: Creates HINTS for finding includes and libraries
  inside the Wireshark support library installation.
- FindXXX.cmake
  Make use of HINTS generated by FindWSWinLibs.cmake

This has not really been tested on Windows as my installation seems to have
automagically downloaded some fixes and is in an inconsistent state since.
Will probably need to reinstall.

svn path=/trunk/; revision=52194
2013-09-23 21:45:55 +00:00
Gerald Combs 17678f9b5d Homebrew installs gettext (including libintl, which GLib requires) in
/usr/local/opt/gettext. Tell CMake to update our include and library
paths accordingly.

svn path=/trunk/; revision=51943
2013-09-10 21:24:52 +00:00
Jörg Mayer bae2eee028 Implement in cmake:
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322

> User: guy
> Date: 2013/08/12 01:01 PM
>
> Log:
>  Just check whether dladdr() is available; we check in the code whether
>  it succeeds, so there's no point in checking whether it succeeds in a
>  sample program.

svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
Jörg Mayer 6ab6208e3d Allow the python interpreter to be version 3 (2 being preferred)
svn path=/trunk/; revision=51128
2013-08-03 00:39:27 +00:00
Jörg Mayer 87ca12fcb7 Print the flag we are testing
svn path=/trunk/; revision=51116
2013-08-02 07:20:43 +00:00
Gerald Combs 45589bf41d TShark links with libui so we should always build it.
svn path=/trunk/; revision=51101
2013-08-01 23:40:06 +00:00
Jeff Morriss 2df54da6e2 Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.

Protect a bunch of the crypt header files from multiple inclusion.

svn path=/trunk/; revision=51100
2013-08-01 23:34:47 +00:00
Jörg Mayer 812f308620 Use largefile detection in cmake.
Move wiretap/file_wrapper.c back to clean sources.

svn path=/trunk/; revision=50825
2013-07-23 09:41:35 +00:00
Jörg Mayer 681c9e7160 Looks like not every version of cmake has the same behaviour wrt
the working directory. So hardcode the path in a case where it
didn't work for everyone.

svn path=/trunk/; revision=50817
2013-07-23 07:41:20 +00:00
Jörg Mayer fe166ca904 Wrap clang specific tests into a clang tests instead of checking
for APPLE.
Move 3 of the 4 tests out of this check because the improved checks
should detect them correctly now

svn path=/trunk/; revision=50789
2013-07-22 14:45:58 +00:00
Jörg Mayer 43ef033128 Don't use the program name to identify the compiler - it won't work
reliably in cases where the compiler is name /usr/bin/cc

Use the internal variable CMAKE_<LANG>_COMPILER_ID instead, which is
finally documented (but still called internal in the docs), see
http://www.cmake.org/cmake/help/v2.8.10/cmake.html#variable:CMAKE_LANG_COMPILER_ID


svn path=/trunk/; revision=50784
2013-07-22 09:36:14 +00:00
Jörg Mayer 9e7b6f1a69 Try to generate an error when calling clang with an unknown compiler
option. This behaviour changed in clang, see
https://bugzilla.mozilla.org/show_bug.cgi?id=731316

svn path=/trunk/; revision=50760
2013-07-21 18:12:20 +00:00
Jörg Mayer df397b4f63 Enable echld builds with cmake when building with ENABLE_ECHLD=ON
svn path=/trunk/; revision=50751
2013-07-21 13:34:50 +00:00
Jörg Mayer f3f910a5cf Don't check for "APPLE" if what you really mean is "clang"
svn path=/trunk/; revision=50749
2013-07-21 12:53:51 +00:00
Jeff Morriss 0a669967fa Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
svn path=/trunk/; revision=50656
2013-07-16 02:35:33 +00:00
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