Commit Graph

1337 Commits

Author SHA1 Message Date
Jeff Morriss ab754d6ba4 Diameter: Add Redknee AVPs.
Also add a couple Verizon Wireless and Wimax AVPs.

All taken from the attachments to bug 11907.

Change-Id: Ie45935f421c4797783f616a75ef35486447ff950
Reviewed-on: https://code.wireshark.org/review/12833
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-23 08:30:08 +00:00
Dario Lombardo ac0eb6043b extcap: add randpktdump, a random packet generator.
This new extcap is for testing and educational purpose.
It relies on rankpkt-core functions to generate random packets.

Change-Id: If6890f0673545682995a2079458108edc0913b30
Reviewed-on: https://code.wireshark.org/review/11764
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 12:24:16 +00:00
Balint Reczey 04d72727a8 Add files missing from make dists's tarball
Bug: 11893
Change-Id: I11e6a40856f224e65401b01fafb3e561950ec086
Reviewed-on: https://code.wireshark.org/review/12663
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-16 05:31:39 +00:00
Gerald Combs 42333aa353 CMake+PortableApps: Include the VC runtime (second try).
Move the code that finds the Visual C++ redistributable DLLs to its
own module. Run it before we create our NSIS and PortableApps targets.
Add a PortableApps target that copies the redistributable

This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4.

Bug: 11800
Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df
Reviewed-on: https://code.wireshark.org/review/12431
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f)
Reviewed-on: https://code.wireshark.org/review/12432
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-04 22:32:32 +00:00
Pascal Quantin 651e0884b7 Change codecs from static to dynamic library
This allows to properly register codecs plugins.
See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details.

Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b
Reviewed-on: https://code.wireshark.org/review/12385
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-03 23:54:49 +00:00
Dario Lombardo d6da95231e extcap: add sshdump.
sshdump is an extcap module that allows dumping from a remote host using an ssh connection.
It goes with the existing extcap plugin interface.

Change-Id: I8987614fdd817b8173a50130812bc643a4833bca
Reviewed-on: https://code.wireshark.org/review/11402
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-19 15:29:18 +00:00
Guy Harris db02f99fdb Fix installation of desktop files.
Change-Id: I33ed9741db9a50098b8c7c85409f3e6a0c2e2f15
Reviewed-on: https://code.wireshark.org/review/11772
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-12 17:45:28 +00:00
João Valverde 2d7b0fc7d0 [GTK] Replace deprecated gdk_pixbuf_new_from_inline()
Use GResource instead, if available. Add autotools and cmake compile time
checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26).

Merge all the various static pixbuf csource header files into
a single pixbuf-csource.h header with external linkage through use of the
tools/make-pixbuf-csource.pl script.

Fix inline pixbuf build target for some image paths (broken for GTK
in gb4a4de7).

Add missing 'expert_ok.png' file to distribution (GTK only).

Minor improvements to style/structure of ui/gtk/Makefile.am.

Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Reviewed-on: https://code.wireshark.org/review/10992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12 07:14:32 +00:00
Balint Reczey 8930b0d5e0 debian: Make make dist know about moving wireshark.1 to wireshark-qt and removal of wireshark.menu
Change-Id: I81b95e43beae7ca85bff9b2d5b4a6f498252f2b3
Reviewed-on: https://code.wireshark.org/review/11720
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11 05:26:37 +00:00
Balint Reczey b732f44d1e GTK: Add separate working desktop file for GTK+ Wireshark GUI
Change-Id: I52a749b7e2b9a4a5cb2968409e140b9d5f2002f6
Reviewed-on: https://code.wireshark.org/review/11696
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-11-11 04:45:48 +00:00
Gerald Combs 7682ae4887 Keep CMake from finding Cygwin's Python.
Try to find Python and set PYTHON_EXECUTABLE on Windows via the registry
prior to calling FindPythonInterp. This works around a bug in CMake that
prefers Cygwin's Python, which is a symlink, which by default is a text
file that contains a Cygwin-specific cookie, which is therefore useless
outside of Cygwin.

This is avoids the need to pass -DPYTHON_EXECUTABLE=... to CMake.

Change-Id: Ife37221b61d920682c20357b6d139a93067a5ad1
Reviewed-on: https://code.wireshark.org/review/11071
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16 20:40:28 +00:00
Gerald Combs 6a98d59e76 Fix dist.
Fixup the name of the SVG file that contains all of the expert
indicators.

Change-Id: Ia45038fcf965973cc7585cc7c68dc24807e59168
Reviewed-on: https://code.wireshark.org/review/11099
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16 16:22:55 +00:00
Gerald Combs b4a4de78d8 Use buttons to display the main status bar icons.
Use QToolButtons to display the expert indicator and comment icons in
the main status bar. Use the same style sheet hack we use in
ProgressFrame to un-style the buttons.

Make sure we specify the @2x comment icon in our .qrc file so that it's
loaded and used on retina displays. Move the comment and expert .pngs to
the stock icon directory and use StockIcon to load them. Remove
status.qrc since it's no longer used.

Change-Id: I84485b22656f8f9af29ad3c02446ffefb6657ed5
Reviewed-on: https://code.wireshark.org/review/11048
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16 03:52:42 +00:00
Gerald Combs b212a4eb43 Add missing CMake files to the tarball.
Make sure we can build from the tarball using CMake. Tested on Windows.

Change-Id: Iffc1ac964279e573aa2a8280b9bb4e799f10a974
Reviewed-on: https://code.wireshark.org/review/11066
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-15 21:07:40 +00:00
Gerald Combs a24eeb931e Make the capture comment icon more Wireshark-y.
Change-Id: Ic693c7afc1658c3b89ae5cddf9c7ab32c435cf2e
Reviewed-on: https://code.wireshark.org/review/10788
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05 16:32:03 +00:00
Gerald Combs 66de69aeae Use the Qt-provided media icons.
Use Qt's standard pixmaps to build our media playback, stop, and pause
icons. Note that we probably don't want to do this for all of the
available standard pixmaps.

Change-Id: I78541a46a65583d7365cd601c578ebe8f197c060
Reviewed-on: https://code.wireshark.org/review/10609
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-23 19:48:58 +00:00
Guy Harris 48c3f7a1c0 Add image files not already here.
Change-Id: I429ae4c418f8fb574407ed6038b411c54b672f0a
Reviewed-on: https://code.wireshark.org/review/10398
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-06 07:11:31 +00:00
Guy Harris 5b468c4110 Reflect the removal of some display filter-related images.
Change-Id: Iac635122a125a0a5cbadfaaf3d39b4c16b2a17f1
Reviewed-on: https://code.wireshark.org/review/10396
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-06 02:38:25 +00:00
Gerald Combs 0e9389bb47 Display filter edit updates.
Have the bookmark button operate on saved display filters, similar to
the "Filter:" button in the GTK+ UI. Expose the saved display filter
list via a popup menu.

Update the display filter icons. Make the "Apply" button wider. Remove
the old icon assets.

Add a StockIconToolButton class along with note explaining why it's
necessary.

Rename the "Filter Bookmarks" preference to "Filter Shortcuts".
Suggestion for a better name are welcome.

Change-Id: I0082d3f01b017253fa75e51cbff9beb17c41a209
Reviewed-on: https://code.wireshark.org/review/10390
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-09-06 01:43:21 +00:00
Dario Lombardo e1dee7cfb6 dcerpc: fixed distcheck.
Change-Id: Ide0b95278786d45d9c41fb0fe3214dce0880b830
Reviewed-on: https://code.wireshark.org/review/10355
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-02 11:49:19 +00:00
Guy Harris 9f03aa131e On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.
Qt 5.5 and later have @rpath-based install names for the frameworks,
which means that, if they're not installed in some frameworks directory
searched by default (such as /Library/Frameworks) - which is the default
case with the Qt installer - they won't be found by default.

Add the directory in which the frameworks exist as an rpath in the
Wireshark binary, so that they'll be found, and then remove it from the
Wireshark binary in the app bundle, as the directory in which the
frameworks exist on the machine on which Wireshark was built is
irrelevant to the machines on which it's being deployed - the frameworks
are included in the bundle, and we already add an rpath to find them
there.

Change-Id: I54e033743e7b17eab26976064dcd7cd000f97c78
Reviewed-on: https://code.wireshark.org/review/9625
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13 17:35:15 +00:00
Alexis La Goutte 86e562f27d Qt: Add x-capture-file-reload@2x.svg to Makefile.am
Change-Id: I497290eff821167a31468a10af23ab762eff32fe
Reviewed-on: https://code.wireshark.org/review/9095
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-24 17:17:35 +00:00
Jeff Morriss 7f6fe7a1fd Reorganize some of the Diameter XML files, taking advantage of the fact that
AVPs can be grouped by Vendor now (not just by Application).

Move a bunch of vendor-specific Application IDs to the vendor's XML file.

Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml
files.

Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx.

Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the
AVP is of type Enumerated.

Change-Id: I7a9702c0c48dc3fe751ad74413d8ecc040984f1f
Reviewed-on: https://code.wireshark.org/review/8235
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-29 11:37:29 +00:00
Jeff Morriss 9abd4a288e Add Tekelec (now Oracle) AVPs.
Untested; taken from the document 910-6828-001 Revision A (found on the web).

Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2
Reviewed-on: https://code.wireshark.org/review/8110
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 06:38:44 +00:00
Alexis La Goutte 4171f5590b RADIUS: Sync with FreeRADIUS Master
commit dec7ff66f34d773d25dee412fe218b4e108d7680
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Apr 1 13:49:22 2015 -0400

    added VALUEs

commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Apr 1 13:34:19 2015 -0400

    Added from RFC which has numbers assigned

commit 005437d9f260c233f165e5f1a8a0e00ab48d6456
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date:   Thu Mar 26 09:09:13 2015 -0400

    Hyphens

commit 88332d8e5dc6bae25270500902cdcb511e0e08a6
Author: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date:   Thu Mar 26 12:13:39 2015 +0200

    Update dictionary.mikrotik

    Update dictionary.mikrotik to have new attributes and values mentioned
    in Mikrotik wiki:

    http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary

commit 849336c73dda97ac2a1185f19e21fd2d4d086180
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Mar 25 15:40:02 2015 -0500

    Motorola error message

Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c
Reviewed-on: https://code.wireshark.org/review/7974
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 13:23:35 +00:00
Michal Labedzki b99cf21c25 extcap: Add support for Android - androiddump
androiddump is extcap program that can be used with Android devices
(need Android SDK in system PATH). Supported is Logcat/Logger logs and
Bluetooth interfaces for all Android to this day (Lollipop).

Please note that it will work also for FirefoxOS.

Interfaces:
1. Logcat Main (binary or text)
2. Logcat System (binary or text)
3. Logcat Events (binary or text)
4. Logcat Radio (binary or text)
5. Logcat Crash (text; Lollipop)
6. Bluetooth Hcidump (<Kitkat)
7. Bluetooth Bluedroid External Parser (Kitkat)
8. Bluetooth BtsnoopNet (Lollipop)

Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80
Reviewed-on: https://code.wireshark.org/review/7475
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-08 09:57:24 +00:00
Gerald Combs f074647d2b Add a test-programs target everywhere.
Add a "test-programs" target to each toolchain which builds each unit
test executable. "test-programs" must now be built before running
the unit test suite.

Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090
Reviewed-on: https://code.wireshark.org/review/7673
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-13 22:41:40 +00:00
Gerald Combs 54c301a0d6 Add the @2x expert indicators.
We currently load the expert indicator resources using an <img> tag.
According to QTBUG-36383 the @2x versions won't load unless you've built
with Qt 5.4.0 or later.

Change-Id: I003fd5d5f10e779f2e7ca6ba9fbb8e033df85b80
Reviewed-on: https://code.wireshark.org/review/7601
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08 18:12:06 +00:00
Gerald Combs 29f7c7af7d Update the expert indicators.
Add @2x versions. Remove expert_ok. It appears to be unused.

Change-Id: If36f839f622e235334a4237a9c5424c15a9945bc
Reviewed-on: https://code.wireshark.org/review/7594
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08 16:18:48 +00:00
Gerald Combs 2d5255ec31 Add GenerateTestSh.cmake to the distribution.
Change-Id: I4cd6b91db7fa0202d6c1918feec9f34b819f09d1
Reviewed-on: https://code.wireshark.org/review/7571
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07 03:22:08 +00:00
Gerald Combs 342c55b925 Qt: Add @2x images to the layout preferences.
Run compress-pngs on the normal and @2x images.

Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d
Reviewed-on: https://code.wireshark.org/review/7499
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-02 19:53:31 +00:00
Alexis La Goutte fb4252e5a2 RADIUS: Add new dicto from FreeRADIUS
commit 6c51e945a73844029f347c3fdaa0de1ec96473f1
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Tue Feb 10 13:22:39 2015 -0500

    New dictionary

Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c
Reviewed-on: https://code.wireshark.org/review/7237
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18 18:52:32 +00:00
Gerald Combs 9707ff85ce Uninstall wireshark.appdata.xml.
Change-Id: Ic955e008b686af448f2091de891f8457623ae7d5
Reviewed-on: https://code.wireshark.org/review/7228
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18 05:19:13 +00:00
Jeff Morriss a5aab24321 Add an appdata entry for Wireshark.
Based on the one from Richard Hughes.

A French translation of the description field is included.

Links to two screenshots are provided--they are stored in my home directory
on wireshark.org (for lack of a better place that I can put them).

Bug: 10479
Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54
Reviewed-on: https://code.wireshark.org/review/4178
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-18 01:50:56 +00:00
Alexis La Goutte 8efe6b7bd6 RADIUS: Sync with FreeRADIUS Master
commit 852f15c72d41c637865776d5b80097e8ffbbb444
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Mon Jan 26 13:08:21 2015 -0500

    As found on the net

commit 53bf263d6ca9010acdc004bada894b1bfe0ed676
Author: Tobias Hachmer <tobias@hachmer.de>
Date:   Mon Jan 26 13:45:04 2015 +0100

    add perle dictionary

Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0
Reviewed-on: https://code.wireshark.org/review/6835
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04 07:04:30 +00:00
Jeff Morriss 4fe8ca0576 Simplify how we find Lua and expand the places we look.
First, it appears some packagers actually ship a pkg-config file for Lua.
Try to use it.  (Unfortunately the package name varies so we have to try
several package names.)

If that fails, try to find Lua directly, accounting for the various naming
conventions we've seen.

Bug: 10475
Bug: 10572
Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a
Reviewed-on: https://code.wireshark.org/review/6756
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-04 00:53:29 +00:00
Anders d5f0f2518a Add Cmakefiles missing from the distribution.
Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3
Reviewed-on: https://code.wireshark.org/review/6797
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-26 15:53:30 +00:00
Jeff Morriss ed413e9fe4 Link only the GUIs with SBC (if we have SBC). The other programs don't
(yet) use libcodec.

Also, there's no need to explicitly call pkg-config to get SBC's
CFLAGS and LIBS: PKG_CHECK_MODULES does that for you.

Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b
Reviewed-on: https://code.wireshark.org/review/6700
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-21 07:42:34 +00:00
Gerald Combs 6e6a1291d0 CMake: Set an output directory for plugins.
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.

Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20 16:12:20 +00:00
Josip Medved c8bca4fa9a Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks.
Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a
Reviewed-on: https://code.wireshark.org/review/6647
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19 16:53:04 +00:00
Alexis La Goutte 4fa73961f1 CMakeList.txt/Makefile.am (root) : fix indent (use tabs)
Makefile.am: avoid double space
CMakeList.txt: Add modelines info

Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925
Reviewed-on: https://code.wireshark.org/review/6570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16 16:35:48 +00:00
Gerald Combs 4f658999e6 CMake: Migrate to hhc.cmake.
Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the
hhc.cmd wrapper.

Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c
Reviewed-on: https://code.wireshark.org/review/6449
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 17:49:37 +00:00
Joerg Mayer dd65274bfd Revert e65f581ffa, which
reverts commit 89291ad4f3
Protect the new macro with "m4_ifdef" instead.
Add comments to keep the old and the new flags in sync.

Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0
Reviewed-on: https://code.wireshark.org/review/6343
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-06 15:57:11 +00:00
Guy Harris 0a64b55971 Remove wireshark_cxx.
It may have been part of the "build Qt Wireshark as C++" hacks, and is
now causing build problems.

Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c
Reviewed-on: https://code.wireshark.org/review/6200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 11:29:36 +00:00
Guy Harris 8bf7078f79 Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.
Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6
Reviewed-on: https://code.wireshark.org/review/6199
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01 10:46:00 +00:00
Stephen Fisher 45daef629d Put a C comment in dummy.cpp so the user knows where dummy.cpp came from
if it is ever created during the build process.

Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360
Reviewed-on: https://code.wireshark.org/review/6030
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-24 16:41:00 +00:00
Alexis La Goutte 0b6adfc7d0 Add .mailmap: fix duplicate/wrong e-mail or name in commit log
It will be reused form generate AUTHORS file

Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc
Reviewed-on: https://code.wireshark.org/review/5841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-23 19:11:28 +00:00
Guy Harris caf4cc6399 Use AC_SEARCH_LIBS() for math functions.
Use it to check whether we need -lm for various math functions -
including floorl().  Let it handle adding -lm, rather than having that
in the various _LDADD macros.

Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81
Reviewed-on: https://code.wireshark.org/review/5908
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20 04:45:48 +00:00
Maarten Bezemer f299f73684 Add new cmake.in files to the distribution
Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7
Reviewed-on: https://code.wireshark.org/review/5833
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18 16:26:27 +00:00
AndersBroman e2d7b56dd1 Add new cmake files to the distribution
Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3
Reviewed-on: https://code.wireshark.org/review/5831
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-18 12:11:45 +00:00