Commit Graph

1475 Commits

Author SHA1 Message Date
João Valverde d0a91b27f2 plugins: config.h must not be included by public headers
For a sane plugin build environment. Include config.h as the first
header in the .c file instead.

Fix by moving required compiler attribute macros to a new
"ws_attributes.h" API header.

Change-Id: I34f58a927f68c1a0e59686c14d214825149749e1
Reviewed-on: https://code.wireshark.org/review/23400
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2017-09-06 08:10:56 +00:00
Gerald Combs 752c48f864 Remove README.vmware
The issues it discusses were relevant in 2000 but have long since been
fixed.

Change-Id: I6284950670eba86849288bf9c88f3d22c622bdd0
Reviewed-on: https://code.wireshark.org/review/23266
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-28 16:10:39 +00:00
Michael Mann 0831becc1a Remove support for CPack.
It's very incomplete and we already have installation makers for supported OSes.

Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752
Reviewed-on: https://code.wireshark.org/review/22226
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-19 15:59:04 +00:00
Gerald Combs 719adb4fdc Convert README to README.md.
Convert the contents of the top-level README to Markdown and give it a
.md extension. Most of our documentation is plain text or AsciiDoc, but
the top-level README file in a Git repository is special in that many
online browsers will show the README contents along with the directory
listing and those browsers tend to favor Markdown. This is true of
GitHub (which we're currently mirroring to), Gerrit via its Gitiles
plugin (which we're not yet using but likely will), and other places.

Add "foreign" to AM_INIT_AUTOMAKE. There is probably a joke to be
made here about the FSF and border walls.

Change-Id: I87c306d74864e1f0a432225b160a1b4483ee946c
Reviewed-on: https://code.wireshark.org/review/23049
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-15 14:48:29 +00:00
Gerald Combs 537b083e02 Sync some CMake and Autotools install behaviors.
Adjust the following CMake and Autotools behaviors in order to
synchronize their respective install behaviors:

- Disable tfshark by default in CMakeOptions.txt
- Add profiles/Bluetooth/preferences to Makefile.am
- Add missing captype and ciscodump entries to doc/Makefile.am
- Install help/faq.txt on all platforms in CMakeLists.txt
- Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb
  options to CMake and use them to adjust the corresponding parts
  of the build.
- Pull the DCERPC idl2wrs build steps into the top-level
  CMakeLists.txt.

This change doesn't sync everything. Some installed content still
diverges, including the following:

- CMake installs a bunch of modules into lib/wireshark:
    FindGLIB2.cmake
    FindWireshark.cmake
    FindWSWinLibs.cmake
    LocatePythonModule.cmake
    UseAsn2Wrs.cmake
    UseMakeDissectorReg.cmake
    WiresharkConfig.cmake
    WiresharkConfigVersion.cmake

  Do we need any or all of these? If so, should the Autotools behavior
  be synced accordingly?

- Autotools installs libtool .la files. It also installs
  wireshark-gtk.desktop unconditionally.

Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22
Reviewed-on: https://code.wireshark.org/review/23041
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-12 13:53:59 +00:00
Gerald Combs cdeb6f122a WSDG: Update the Windows docs and add a CMake section.
Update the Windows section for Visual Studio 2015. Copy the content from
README.cmake to its own WSDG section and remove README.cmake.

Remove the PowerShell sections. Our required version (2.0) ships with
every supported version of Windows. Remove the sed section.

Change-Id: Id37c6e71bacc247a3ed1992adb1408ec13f6a187
Reviewed-on: https://code.wireshark.org/review/22940
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-04 23:01:59 +00:00
Guy Harris 2a17c33928 Move macosx-setup.sh to tools and remove the "x".
The OS is now called just macOS, and the rest of the setup scripts are
in tools, so move this one there as well.

Update the documentation to reflect the change.

Change-Id: I4d9ebf0797ffe8862e82c4bcfdeec1d2eabae6ae
Reviewed-on: https://code.wireshark.org/review/22918
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-02 07:40:34 +00:00
Guy Harris be502d221a There's no wka.tmpl file any more, it's just wka.
Change-Id: Ia44a02c92995a47357a3fded7131199117ad6425
Reviewed-on: https://code.wireshark.org/review/22779
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-24 18:17:21 +00:00
João Valverde 14d94e174a Put the well-known addresses into a separate file from OUIs
Having two distinct logical concepts (OUI and Well Known Address)
concatenated to a single "manuf" file is needlessly obfuscating
the WKA feature.

Have a distinct "wka" file instead and just skip the cat.

Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8
Reviewed-on: https://code.wireshark.org/review/22742
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-23 17:14:19 +00:00
Guy Harris fd495f7792 Another enterprises -> enterprises.tsv rename.
Change-Id: I59dcc7fa066d75ba14f5f7bf645a8eb24839db1c
Reviewed-on: https://code.wireshark.org/review/22635
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-16 03:31:09 +00:00
Gerald Combs 76efb096d4 Rename enterprises to enterprises.tsv and ship it.
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more
obvious and so that double-clicking the file might do something useful.

Add it to the Windows packages.

Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463
Reviewed-on: https://code.wireshark.org/review/22616
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-15 06:20:34 +00:00
João Valverde 7466880e8a Parse enterprise-numbers at run time
"enterprise-numbers" is converted to tab-separated values and renamed
"enterprises". Unused fields are stripped.

PENs are stored in a hash table loaded at run-time.

User "enterprises" file is loaded from the personal config dir.

Misc make-sminmpec.pl improvements and fixes.
Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output.

Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2
Reviewed-on: https://code.wireshark.org/review/22246
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26 22:40:50 +00:00
Guy Harris 5039d0e576 Change some names to reflect Apple's new UNIX-for-Macs name.
{OS_X,os_x} -> {MACOS,macos}.

Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de
Reviewed-on: https://code.wireshark.org/review/22161
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16 08:50:22 +00:00
Guy Harris 7aec9523d8 Sort the dictionary.* files.
Change-Id: Iad4457cc17f3e6a5b092d8050a0d1cc541efb2a3
Reviewed-on: https://code.wireshark.org/review/21856
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-31 09:39:11 +00:00
Guy Harris 0082f59f38 Rename dictionary.erx to dictionary.unisphere and pick up the FreeRADIUS version.
This picks up

    commit a5ad82aecc194f5f55153c351a62af9bb1c222a0
    Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
    Date:   Sat Dec 7 23:24:20 2013 +0000

        Fully sync ERX/Unisphere with Juniper's dictionaries

as well as picking up the copyright notice.

Change-Id: Ia6a694ccd94ad05caf25bea4dec9b467a4f99157
Reviewed-on: https://code.wireshark.org/review/21855
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-31 09:33:35 +00:00
Michael Mann 9b24ffcd6f Add Inovar specific Diameter AVP codes
Bug: 13349
Change-Id: I2a06ee3bd7ab1f81414ad8e4155c1430a7287644
Reviewed-on: https://code.wireshark.org/review/21778
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-30 10:34:46 +00:00
João Valverde 1a8991e875 sharkd: Fix build using system Speex library (autotools)
Change-Id: I1798f3dc76704c646d67d11533f8dc32ebab7401
Reviewed-on: https://code.wireshark.org/review/21793
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2017-05-30 01:56:07 +00:00
Alexis La Goutte 7a122a16e1 radius: Sync with FreeRADIUS
add Dell EMC dictonary

commit 2b2a7dc5654abf740ff7ffb52fc0807a5e0f1781
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed May 24 15:55:05 2017 -0400

    as posted to the list

Change-Id: If3e7e7f401c6f1eca5292f0f323c2cd86dfd3fcc
Reviewed-on: https://code.wireshark.org/review/21787
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-29 21:28:20 +00:00
Guy Harris 804d3f6245 Use cfile_write_failure_message() in the randpkt code.
Change-Id: I32ef7ff85f854782e5dd02c3e7f12436a120bc13
Reviewed-on: https://code.wireshark.org/review/21259
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 21:07:35 +00:00
Guy Harris 64ec2b2e5e Take the error message generation out of the merge_files routines.
Have them just return the information needed for the caller to produce
an error message, and have the callers use the new cfile_ routines for
reporting errors.

This requires that the "write failure alert box" routine take the
*input* file name as an argument, so that, on a merge, if the problem is
that a record from a given input file can't be written out to the type
of output file we're generating, the input file name can be given, along
with the record number in that file.

Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71
Reviewed-on: https://code.wireshark.org/review/21257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 20:25:59 +00:00
Guy Harris bce5ec919e Use the new cfile_XXX_failure_message() routines more broadly.
Change-Id: I7814b3fd0353f4836ae61cbdbd4e13f659cbcb59
Reviewed-on: https://code.wireshark.org/review/21239
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 07:19:41 +00:00
Guy Harris 347a19ae96 Add common routines for command-line libwiretap error reporting.
These are similar to the routines added to ui/alert_box.c for dialog-box
libwiretap error reporting.

This centralizes the knowledge about what to say for various libwiretap
errors, removing some duplicate code, and giving more details in some
programs.

Change-Id: I737405c4edaa0e6c27840f78a8c587a8b3ee120b
Reviewed-on: https://code.wireshark.org/review/21234
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 02:21:58 +00:00
Guy Davies d4519ff28d [Diameter] Add Juniper SCG AVPs
Change-Id: I832a82b4edbfce26e3edceb0f6baed3b7a1c8b62
Reviewed-on: https://code.wireshark.org/review/21190
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-19 14:13:51 +00:00
Jakub Zawadzki ca29ec9e77 sharkd: support for "downloading" decoded RTP stream in wave-like format.
Change-Id: Ic6b241f9b7ed302e7b11644e63230474d5933a85
Reviewed-on: https://code.wireshark.org/review/20963
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-04-17 07:29:31 +00:00
Guy Harris 77cad8561c Move the filter file reading code to libui.
It doesn't belong in libwireshark, as it doesn't affect dissection, but
it *does* belong in libui, as it's helper code for the UIs.

Change-Id: I8a5e0640a299a08e9ec1917dd253197438ebfdbc
Reviewed-on: https://code.wireshark.org/review/20974
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-09 04:25:52 +00:00
Guy Harris 357cfd3b03 A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example.  It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.

Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 19:16:22 +00:00
Joerg Mayer 0b6b152694 Remove echld/.
It has been unsupported for some years and when talking about removing it
in the past I received some positive and no negative feedback.

There is one instance of echld left:
capchild/capture_sync.c:                 * echld might have already reaped the child.

Can that case be removed or should be comment be updated to something more
accurate? (left for a separate patch)

Change-Id: Idac397158dd86fd0728eb95379449ee4a463fc28
Reviewed-on: https://code.wireshark.org/review/20619
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-19 15:13:14 +00:00
Erik de Jong f1c75cf6ef Rewrite dissectors to use Libgcrypt functions.
As discussed on the mailinglist, rewriting dissectors to use Libgcrypt
functions as Libgcrypt will be mandatory after change 20030.
Removal of following functions:
- crypt_md4
- crypt_rc4*
- aes_cmac_encrypt_*
- md5_*
- sha1_*
- sha256_*

Further candidates:
- aes_*
- rijndael_*
- ...

Added functions:
- ws_hmac_buffer

Added const macros:
- HASH_MD5_LENGTH
- HASH_SHA1_LENGTH

Changes on epan/crypt/* verified with captures from
https://wiki.wireshark.org/HowToDecrypt802.11
Changes on packet-snmp.c and packet-radius.c verified with captures from
https://wiki.wireshark.org/SampleCapture
Changes on packet-tacacs.c verified with capture from
http://ccie-in-3-months.blogspot.nl/2009/04/decoding-login-credentials-regardless.html

Change-Id: Iea6ba2bf207cf0f1bf2117068fb1abcfeaafaa46
Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html
Reviewed-on: https://code.wireshark.org/review/20095
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-02 23:58:05 +00:00
Alexis La Goutte b91207017f RADIUS: add cnergee dictionary (from FreeRADIUS)
commit e37987492b0d575a8ef41900ef916244112b2468
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Sat Feb 18 12:11:05 2017 -0500

    Dictionary from cnergee.

    Which modifications so that the names don't conflict with
    existing ones.

Change-Id: I4fed7f38300dd8bcf526e5a07eec6c7812991d95
Reviewed-on: https://code.wireshark.org/review/20258
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26 01:54:53 +00:00
Peter Wu 53c7f0a25e CMake,autotools: remove unneeded files, fixes build
sharkd does not perform any capturing, so do not include related
libraries and files. This fixes the CMake build too.

Change-Id: Ie002b09dbf60070e34dacc8ae7dadee6690d4db8
Reviewed-on: https://code.wireshark.org/review/19786
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-25 15:19:03 +00:00
Guy Harris 29d0f40d44 Put sharkd.h into the distribution.
Change-Id: I0e831a5448fc6247ccca033ae512a3fa74351c63
Reviewed-on: https://code.wireshark.org/review/19779
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-25 08:09:35 +00:00
Jakub Zawadzki e2930f3b78 Add sharkd - daemon variant
sharkd listens on UNIX socket and allows external clients
to run commands like: loading file, analysing frames or running TAP(s).

Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766
Reviewed-on: https://code.wireshark.org/review/18208
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-01-25 07:19:05 +00:00
João Valverde 41a9a1f9bf autotools: Add tag glob pattern for distribution VCS version
Avoid leaking private tags and prefer vX.X.X over wireshark-X.X.X.

Ping-Bug: 12901
Change-Id: I7a4e2de283b87047e435a0b0abe72bc18819a985
Reviewed-on: https://code.wireshark.org/review/18951
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-12-16 16:23:51 +00:00
Dario Lombardo 3b5d5adcd3 autotools: fix typo.
The required executable is rpmbuild and not rpm.

Change-Id: Iba1bff9c7fb6907659451a977ad8ab98efb169da
Reviewed-on: https://code.wireshark.org/review/19015
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-02 11:31:11 +00:00
Alexis La Goutte ab55444590 RADIUS: Add RFC7930 dictionnary
From FreeRADIUS master

commit 42e55cca4cee6524475f0461b00f0f96769ab40b
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Oct 12 10:13:00 2016 -0400

    added RFC 7930

Change-Id: Icb69117cad84fcaf9d9ffe8040962afb33709441
Reviewed-on: https://code.wireshark.org/review/18913
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-24 17:48:25 +00:00
Alexis La Goutte 75bf463707 RADIUS: Add Microsemi dictionnary
commit 503e1e78daaa51d9a47e85bd7c9f5fb096a25b87
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Fri Nov 11 06:56:23 2016 -0500

    from Microsemi

Change-Id: Icc5e5f74f7d34aaebdb192c83908856189082cf0
Reviewed-on: https://code.wireshark.org/review/18914
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>
2016-11-24 17:47:28 +00:00
Peter Wu 9490f5e98d autotools: propagate git version info to distribution tarball
Store the git describe output in the distribution tarball (make dist)
and ensure that this version is always used for builds from this
tarball. This will prevent the useless "Git Rev Unknown from unknown"
output in tar-based builds.

It will also prevent git from being invoked in tarball builds.

Remove the git branch name since the commit ID (and git tag) in the git
describe output is sufficient to identify the source tree. (In SVN, a
revision ID had to be paired with a branch name to identify the source
tree, in git this is no longer the case.)

Change-Id: Iffe142b6efd81e857802eb604d6310cfd301d207
Reviewed-on: https://code.wireshark.org/review/18415
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-03 08:55:31 +00:00
Jakub Zawadzki ce9405b00b cleanup: move extra libs to EPAN_EXTRA_LIBS
Every program linking with epan lib added some extra dependencies.
Keep these in EPAN_EXTRA_LIBS.

Change-Id: I3fac0974ef6a46675d35ee7b9862674923369b67
Reviewed-on: https://code.wireshark.org/review/18356
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22 17:38:13 +00:00
Gerald Combs b725d6c9ac Add an initial "shellcheck" target.
Look for shellcheck in Autotools and CMake, and if found add a target
that checks some of our shell scripts.

Add a "source=" directive to targets that include test-common.sh so
that shellcheck will correctly process the scripts. Note that this
requires shellcheck 0.4.0 or later.

To do: Fix the issues that shellcheck found and check more scripts.

Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c
Reviewed-on: https://code.wireshark.org/review/17943
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 23:17:02 +00:00
Gerald Combs 635f0a5c2c Update the README.
The formatting was mostly AsciiDoc-compliant. Take it the rest of the
way. Update the list of supported operating sytems, along with other
info. Use HTTPS URLs. Remove README.tru64 while we're here.

Change-Id: Ibd9cac5d9f3cdcc7de9c9d7052c14e851e108cbe
Reviewed-on: https://code.wireshark.org/review/17014
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-18 04:26:32 +00:00
Gerald Combs f5dff39232 Use xz to compress the source tarball.
Compress the source tarball using xz instead of bzip2. Other open source
projects (including many of our dependencies) have been using xz for a
while so hopefully this won't be too much of a shock.

Remove the patch-bzip2 Autotools target while we're here.

Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d
Reviewed-on: https://code.wireshark.org/review/16735
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29 10:55:34 +00:00
Michal Privoznik ea0b2e0d36 Makefile: Install wireshark.pc too
In my previous patches (8454f2a20e and ea16a84ef5) I've tried
to make the pkg-config file more robust. But what I had
completely forgot about is that the file was never installed by
our Makefile rather than we relied on distribution maintainers to
be smart and make the package install the file instead. I've
realized this as soon as I've tried to update wireshark in my
system.

Change-Id: Idb60157a51ea1dd0afd6cfac695bfa5760485241
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-on: https://code.wireshark.org/review/16279
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10 14:56:59 +00:00
Roland Knall f2786bc8ff extcap: Remove g_spawn_helper support
Move g_spawn to separate file and implement functions to
 use Windows based method of spawning, instead of the glib
 based version

Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f
Reviewed-on: https://code.wireshark.org/review/16049
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-07-05 11:54:43 +00:00
João Valverde a16d401b25 Remove Makefile.common files
Now that nmake build system has been removed they are not needed anymore.

Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-06-30 11:04:17 +00:00
Pascal Quantin 6baa1b544c Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15 19:21:57 +00:00
Alexis La Goutte 4e55a28814 RADIUS: Add Sangoma dictionary
From FreeRADIUS master

commit ba4b4402588ae87497a0b7c87e26eb5cb433c8a7
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Fri Jun 10 14:38:55 2016 -0400

    Added dictionary.sangoma

    from http://wiki.sangoma.com/files/NSC-Radius-Support/dictionary.sangoma.txt

Change-Id: Ie51ea6343a2a8a5b286d70451abce81ca920261f
Reviewed-on: https://code.wireshark.org/review/15823
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-13 05:17:41 +00:00
AndersBroman 9cd10f0805 Add CiscoSystems, vendor id 9 AVPs
Bug 12459
Change-Id: I9ebe7f4a9e6ae03539bd74e535c95c85a8efa55b
Reviewed-on: https://code.wireshark.org/review/15506
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-20 17:18:01 +00:00
João Valverde 9f8fc21b62 autotools: Check for SpeexDSP system library
Change-Id: Ie07f49ec5a563f3b43a2442e05646c6a0b51ca41
Reviewed-on: https://code.wireshark.org/review/15349
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-05-16 14:16:41 +00:00
Michael Mann 32a2167698 Run checkAPIs in epan/wmem/
Was fixed to pass.  Let's keep it that way.

Change-Id: I49b532b6f1df2430b3912f8f1e9d518caff17d2c
Reviewed-on: https://code.wireshark.org/review/15413
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-13 16:01:38 +00:00
Jeff Morriss 2b52f2440c automake/nmake: run checkAPIs in ui/cli/
cmake already does this.

Use checkAPIs arguments appropriate to the cli directory (there's no gtk code
here so don't bother checking for deprecated gtk APIs).

Change-Id: I3e76ed5260223f05ac1b42431569bde3d1c596ea
Reviewed-on: https://code.wireshark.org/review/15403
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>
2016-05-13 04:04:19 +00:00
Jeff Morriss bbfe038686 Run checkAPIs in epan/ .
It runs cleanly (no errors anyway) now.

Change-Id: I1dca3a3f854c4f2feebcf4193e3c5d444a01e06b
Reviewed-on: https://code.wireshark.org/review/15378
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11 20:24:18 +00:00
Jeff Morriss bca12baa4c Run checkAPIs in epan/ftypes/ .
Michael cleaned up the strcpy()'s which were preventing it from running
without errors.

Change-Id: I3f02150a9b1fbefddb67c0cb90fc2c58766d7d2a
Reviewed-on: https://code.wireshark.org/review/15375
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11 15:51:21 +00:00
Jeff Morriss 442c9bf33a Remove the dist tarball after making an RPM.
A typo has prevented this from happening for a while.

Change-Id: I57f3ed1138d6caffa596f41e6257ecc0eb39a1a6
Reviewed-on: https://code.wireshark.org/review/15112
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-26 07:09:28 +00:00
João Valverde 8a07ca8703 Avoid making dist tarball if rpmbuild is missing
Fail sooner rather than later.

Change-Id: If5740ee01d79f2eec87038cdbcb0725899735ff6
Reviewed-on: https://code.wireshark.org/review/15113
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-26 07:09:05 +00:00
João Valverde bbea6a1c9f autotools: use AM_CONDITIONAL for rpm build rule
Change-Id: Ia97966e28cf7d061694336fb00b9a0790f0d57bb
Reviewed-on: https://code.wireshark.org/review/15067
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-04-25 15:27:52 +00:00
Guy Harris 249f87aeee There's no version.h.in file.
Change-Id: Ia9c956d5b1f653f111e012fccc892246fcaa8b4b
Reviewed-on: https://code.wireshark.org/review/15060
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-22 23:13:39 +00:00
Peter Wu e6c54017a7 Fix out-of-tree "gen-authors" target
Change directory to the source tree before invoking `git shortlog`,
otherwise it fails on build directories outside the source tree.

Alexis suggested to move the git invocation to the perl script, this is
done now and also avoids writing AUTHORS.git in the source tree.

Change-Id: I5905ebf40d8d32a586c88671b52f28c542ca33ba
Reviewed-on: https://code.wireshark.org/review/14660
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-28 22:13:59 +00:00
João Valverde a1ed731413 Add ax_lib_socket_nsl.m4 macro
Add SOCKET_LIBS and NSL_LIBS to global LIBS variables on platforms
where it is required.

Make configure checks for getaddrinfo/gethostname unconditional,
that is handled with #ifdefs if necessary.

Change-Id: Ia874038454fb9cf3bdbf8e6fd829f319e331837e
Reviewed-on: https://code.wireshark.org/review/14560
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25 00:16:19 +00:00
Guy Harris a4aa8930bb Put pcapio.c into a writecap library, and use it.
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e
Reviewed-on: https://code.wireshark.org/review/14615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 20:49:37 +00:00
João Valverde c1692d989e Add files by folder to distribution tarball (EXTRA_DIST)
This takes away much of the pain (and merge conflicts) of micro-managing every
sub-folder file.

Change-Id: I7d7bb1173511ec9312ca4a97c6a59a26b0b194f4
Reviewed-on: https://code.wireshark.org/review/14595
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-24 01:04:36 +00:00
João Valverde 759fc8cf70 Rename 'aclocal-fallback' directory to 'm4'
Change-Id: Icac1c43264b6c6fd426d3c5146863a491b48b4ff
Reviewed-on: https://code.wireshark.org/review/14569
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:33:56 +00:00
João Valverde c57b3777f8 Add pkg.m4 and remove aclocal-flags script
Add pkg-config 0.29.1 macros to our distribution. This makes the
aclocal-flags script obsolete, since we are already not using GLib
autoconf macros.

ACLOCAL_AMFLAGS need only be defined on the top-level Makefile.am.

Change-Id: Idd868dcfeb8f279517970d0f96d9d53e3a7e4d5c
Reviewed-on: https://code.wireshark.org/review/14568
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:33:43 +00:00
João Valverde b175e16d6e Remove unused autoconf macros
Change-Id: Ifb9ab1011373cbe6ac9d6a417f07af76171d87fe
Reviewed-on: https://code.wireshark.org/review/14577
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 02:08:41 +00:00
João Valverde 7a1d3f67ac Remove ADNS support
Relevant mailing list message:

  https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html

Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2
Reviewed-on: https://code.wireshark.org/review/14519
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21 19:32:00 +00:00
João Valverde 52dd4fb633 Fix building without extcap enabled
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap.

Some documentation fixes too.

Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99
Reviewed-on: https://code.wireshark.org/review/14522
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21 17:10:21 +00:00
Gerald Combs a183726370 DocBook: Don't require xmllint.
Remove dependencies on xmllint. We don't write DocBook by hand any more
and we haven't used it in a long time in the CMake builds.

Change-Id: Ic07f03b00c4554c058eece0462b0925d565b6da1
Reviewed-on: https://code.wireshark.org/review/14506
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-18 23:26:51 +00:00
João Valverde 54a520d4a1 Move /asn1 to /epan/dissectors
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-13 21:30:24 +00:00
Eric Anderson 2728f5673f Use AX_PROG_CC_FOR_BUILD macro to identify compiler targeting the build host.
(When cross-compiling, this is *not* the compiler used to build wireshark itself).

Macro ax_prog_cc_for_build.m4 retrieved from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git

Change-Id: I035059d9315e0081dcf1ffbafd9ce6d7ad46700c
Reviewed-on: https://code.wireshark.org/review/4503
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Eric Anderson <andersoe@cs.cmu.edu>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10 01:54:27 +00:00
Alexis La Goutte 80dda81a61 AUTHORS: sort by name
Change-Id: I01980d1ab757decb7bb84649dbd41477978104c3
Reviewed-on: https://code.wireshark.org/review/14381
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08 18:02:01 +00:00
João Valverde 5f8003e949 Add EditorConfig settings for most C files
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52
Reviewed-on: https://code.wireshark.org/review/14360
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:46:35 +00:00
Gerald Combs b63a8bdcb7 Start adding EditorConfig files.
Add EditorConfig files where we currently have consistent indentation.
This might let us get rid of our editor modeline footers at some point.

Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce
Reviewed-on: https://code.wireshark.org/review/12383
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:44:17 +00:00
Gerald Combs 1e97b5f284 Update the Automake gen-authors target to match CMake.
Broken in g32d60ac.

Change-Id: Idf9ea0970c30c8eff8e21c3039fe47fd8a175a27
Reviewed-on: https://code.wireshark.org/review/14370
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07 06:31:26 +00:00
Jeff Morriss 7d543a0b87 Run checkAPIs in the (epan/) wslua and crypt directories.
Don't try to run it (automake only) in dcerpc: there's no target for it there.

Change-Id: Idaf1d3d3ac27e837f484520406e604c12c4b473f
Reviewed-on: https://code.wireshark.org/review/14346
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-07 05:07:51 +00:00
Guy Harris 1e289cb906 That patch is gone (we changed the menu category ourselves).
Change-Id: I4a7de0e95347aa7c1085bd4c026aaef02755a98c
Reviewed-on: https://code.wireshark.org/review/14350
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-04 18:21:30 +00:00
Michael Mann 8435145b1f Create perl script to append existing AUTHORS file with information from git log.
new AUTHORS file can be created with "gen-authors" build parameter

The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src.  This preserves the features authors worked on.  For authors that didn't list features, they may be converted to just getting information from git.

Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451
Reviewed-on: https://code.wireshark.org/review/14231
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 18:28:32 +00:00
João Valverde a2371bd6c9 Revert "autotools: Use explicit zlib dependency build flags"
This reverts commit 2bded0b661.

Change-Id: Ic898c65df4daaa395eb010e0286d97509346d43a
Reviewed-on: https://code.wireshark.org/review/14318
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03 07:14:53 +00:00
João Valverde 2bded0b661 autotools: Use explicit zlib dependency build flags
Use pkg-config if a zlib.pc file is available.

Remove the now redundant AC_TRY_LINK_FUNC test (there are no linker flags
for GTK+ here).

Change-Id: I7de744749eba7231ae0097b975144b76ffcf1bdb
Reviewed-on: https://code.wireshark.org/review/14263
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-03 03:49:08 +00:00
João Valverde e8e084a052 Check for clang before trying to add -Q flag
Change-Id: I91a9d8fd4ae6623b3719a3927da1d1b714f08b04
Reviewed-on: https://code.wireshark.org/review/14106
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-02-24 12:14:13 +00:00
João Valverde de1dc7e7b8 autotools: Improve libnl configuration and dependency
Change-Id: I3de7c2a6292a2f3fc57fdb849c23c3b31f6e4a13
Reviewed-on: https://code.wireshark.org/review/14052
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21 18:21:42 +00:00
João Valverde f0fb79d534 autotools: Use pkg-config autoconf macros for GLib/GTK
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset
of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add
dependency flags explicitly instead of using WS_CPPFLAGS.

Some minor improvements and fixes for missing/unnecessary variables (no impact
on our test builds).

Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671
Reviewed-on: https://code.wireshark.org/review/14005
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21 07:51:55 +00:00
João Valverde e282c19520 autotools: Fix multiple repetitions of -L build flags
Before:

  WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/usr/local/lib'

After:

  WS_LDFLAGS=' -Wl,--as-needed -L/usr/local/lib'

Bumps autoconf required version to 2.64.

Change-Id: Idac0e0382481ddd954b07d9ac729f33c9d11639a
Reviewed-on: https://code.wireshark.org/review/14041
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21 07:45:33 +00:00
João Valverde 1b3ae81e9e autotools: Use Qt flags only for building Qt GUI
Change-Id: I041e2fab6de948c803cc059e78358077000efee8
Reviewed-on: https://code.wireshark.org/review/14006
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20 14:27:00 +00:00
Guy Harris b32a5ee98c Don't add the wiretap directory to the list of include directories.
If you include something from the wiretap directory, always precede it
with wiretap/.

Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
directory.

This makes it a bit clearer what's being included.

Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
Reviewed-on: https://code.wireshark.org/review/13990
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18 12:55:26 +00:00
Guy Harris 58d00bad1a Build the extcap programs in the extcap directory.
That lets the version of Wireshark built with autotools find the extcap
programs.

Don't install the extcap programs under ${datadir} - that puts it under
a share directory, and share directories are for platform-independent
files, which executable images aren't (they're instruction-set
dependent, hence platform-dependent).

Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f
Reviewed-on: https://code.wireshark.org/review/13943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15 08:31:06 +00:00
João Valverde 387c8864bf autotools: Move SBC dependency to libwscodecs
Change-Id: I931961033798613b78f846c9176dffdb8385bf43
Reviewed-on: https://code.wireshark.org/review/13782
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-07 23:23:16 +00:00
Gerald Combs c9d148c077 Update filter bookmark icons.
Separate the capture and display filter bookmark icons. Make the capture
icon green to match(-ish) the active capture icon. Tested on nice+new
and janky+old displays.

Change-Id: I6ed532c8a49da50fe2a7de3d8fbd0b1af7623b4a
Reviewed-on: https://code.wireshark.org/review/13612
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-30 22:02:42 +00:00
João Valverde 265a41e14d autotools: Don't use "user variables" to set build flags
GNU coding standards recommend against it and automake is designed
around it.

This allows overriding the global build flags using AM_CFLAGS, etc.,
or per object flags, something that is difficult or impossible currently
because of automake precedence rules.

Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12
Reviewed-on: https://code.wireshark.org/review/13455
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-01-28 18:13:48 +00:00
Jeff Morriss 039b6ea41e Revert "Diameter: Add Redknee AVPs."
As requested by the supplier of the data.

This reverts commit ab754d6ba4.

Change-Id: I3f4e19a0a7f4c75da0e2e2b5a01b187692ebf0a9
Reviewed-on: https://code.wireshark.org/review/13468
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-21 17:16:29 +00:00
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