This can be used by dissectors that need to parse out-of-band
configuration.
Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
Reviewed-on: https://code.wireshark.org/review/20912
Reviewed-by: Roland Knall <rknall@gmail.com>
Use macOS when not referring to a particular release; use the
appropriate name when referring to a particular release.
Change-Id: I9293d4db7c91d7c859d7c067c0f0b3c9c482fcc5
Reviewed-on: https://code.wireshark.org/review/20935
Reviewed-by: Guy Harris <guy@alum.mit.edu>
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>
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>
This reverts commit 3cfa4f7602.
Nope, *not* needed, and not wanted, either.
Change-Id: I71ac174a9b9b19980d0a6f44088d0a66f71ef99b
Reviewed-on: https://code.wireshark.org/review/19538
Reviewed-by: Guy Harris <guy@alum.mit.edu>
We can't just symbolically link to the executables, as that means that
the executable won't be in Contents/MacOS, which means that all
@executable_path-relative references will go to the wrong place if we
run the executables using the symlink, which means that the executables
could fail (they *do* fail to find the Cocoa Qt plugin, for example).
So, instead, we go back to the old version of the utility launcher, and
put that in Contents/Resources/bin as well as, if the user requests the
CLI utilities, /usr/local/bin. Maybe PackageMaker will find that
acceptable and include them in the installer package.
Bug: 13270
Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9
Reviewed-on: https://code.wireshark.org/review/19536
Reviewed-by: Guy Harris <guy@alum.mit.edu>
PackageMaker appears not to put them into the installer package, so
construct them in the Wireshark post-install script.
Bug: 13270
Change-Id: Idfa10d4d123d2c0e2f7b3ad65888e075fbfd27a7
Reviewed-on: https://code.wireshark.org/review/19531
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: I8ae8a1fdc8d0df0779ef119c527f41dac9e0dbdb
Reviewed-on: https://code.wireshark.org/review/19476
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: Michael Mann <mmann78@netscape.net>
Report that files /etc/paths.d/Wireshark and /etc/manpaths.d/Wireshark
are added and should be removed.
Change-Id: I2f9d3aea0dd4f86cb9a86065108a3948e28d3001
Reviewed-on: https://code.wireshark.org/review/19436
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>
That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so
the man command will look in
.../Wireshark.app/Contents/Resources/share/man.
This also may obviate the need to install the wrapper scripts in
/usr/local/bin, although those scripts obviate the need to re-set PATH
after installing Wireshark.
Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d
Reviewed-on: https://code.wireshark.org/review/19296
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Add plugin to autofoo and CMake build systems and fix errors found
Add plugin to Windows installer (optional component activated by default)
Change-Id: Id1b777bdee04e53076b3291f6fb68d5abad6985d
Reviewed-on: https://code.wireshark.org/review/19228
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Integrate the Spandsp library for G.722 and G.726 support. Adds support
for G.722 and all eight variants of G.726.
Note: this also fixes a crash in Qt (buffer overrun, reading too much
data) caused by confusion of the larger output buffer (resample_buff)
with the smaller input buffer (decode_buff). It was not triggered before
because the sample rate was always 8k, but with the addition of the new
codecs, a different sample rate became possible (16k).
Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled
and the VOIP Calls dialog is opened (the begin frame, start_fd, is not
yet known and therfore a NULL dereference could occur).
Passes testing (plays normally without bad RTP timing errors) with
SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested
with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled.
Bug: 5619
Change-Id: I5661908d193927bba50901079119eeff0c04991f
Reviewed-on: https://code.wireshark.org/review/18939
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
RPM complains when the date isn't valid.
Change-Id: I859a9900ba87d52159071b06310d5873c092231a
Reviewed-on: https://code.wireshark.org/review/19003
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
When we add our Qt to PATH, prepend it so that it will be found first.
Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9
Reviewed-on: https://code.wireshark.org/review/18988
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
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>
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>
Do for executables what we do for man pages.
Change-Id: I066f0199fd6064cae21e6ad079a1f344e1002c66
Reviewed-on: https://code.wireshark.org/review/18205
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Modify postinstall.sh script to add file /etc/manpaths.d/Wireshark
during installation.
Content of the file is the current path of the Wireshark manpages.
Bug: 12746
Change-Id: I1dc0dc9a2acf56c39c78c709294f1a6804c6ec5c
Reviewed-on: https://code.wireshark.org/review/17916
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>
Try enabling the MajorUpgrade:AllowSameVersionUpgrades attribute. This
should keep the .msi packages from installing side by side when only
the micro version differs.
Change-Id: I37e8971d965ec1909c6baacb55d6a8062b13ff70
Reviewed-on: https://code.wireshark.org/review/17945
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Enable and disable the Wireshark and Wireshark-gtk desktop icon and
shortcut checkboxes depending on our feature selections to match the
NSIS installer behavior (and make sense).
Set the level of "Fe.WiresharkGTK" to 2 so that it's disabled by default.
This roughly matches the behavior of the NSIS installer.
Note that we can't enable or disable radio buttons.
Change-Id: I1c73f901344e21bd62e67890ce544f644c0cdda6
Reviewed-on: https://code.wireshark.org/review/17898
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>
The condition expressions in g630b646 were incorrect. Fix them. This
also lets us make the error messages more verbose, so do so. Add a hint
about debugging.
Change-Id: I74d4b9cfb1bc9afb23be4d61ac190f90e7048745
Reviewed-on: https://code.wireshark.org/review/17849
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: Iae2a222db8e9359fd8440b59f43ec90c3b7f8243
Reviewed-on: https://code.wireshark.org/review/17747
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: Michael Mann <mmann78@netscape.net>
Look for an existing NSIS installation and cancel the installation if
we find one. Add a note about making this process more friendly.
Change-Id: Id6ea4d511bc813a38fa834931f5e677d3d6a4319
Reviewed-on: https://code.wireshark.org/review/17702
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: Gilbert Ramirez <gram@alumni.rice.edu>
Dig through the registry and look for a WiX / Windows Installer package.
Offer to uninstall it if we find one.
Change-Id: I513ce4184880571c484461483a3d25e6d90a85e0
Reviewed-on: https://code.wireshark.org/review/17613
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Disable the legacy UI by default. Associate our Programs and Features icon
with Wireshark.exe. Move some GTK+-specific code to SecWiresharkGtk. Make
sure the /desktopicon and /quicklaunchicon apply to Wireshark.exe. Remove
unneeded parentheses in the display name.
Change-Id: Ia7662d003d15afd809d81631e059e249a93d0999
Reviewed-on: https://code.wireshark.org/review/17593
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Note that you should probably uninstall the NSIS package first if it's
installed. Set the compression level to "high".
Change-Id: I10de8df580f8410fd13cdf414db1b1812a9fcf02
Reviewed-on: https://code.wireshark.org/review/17566
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>
The documentation for the [Launch]SingleAppInstance key doesn't seem
to match its behavior in that its default value (true) keeps multiple
portable instances from running, at least for us. Set it to false since
we're happy with users running as many concurrent instances as they can
stand. Set the related SinglePortableAppInstance key to false while
we're here in case its default value ever changes.
Change-Id: Iea1a6a80d5b204814b7569776734e0b0e254d657
Reviewed-on: https://code.wireshark.org/review/17616
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
It's been installed since Idb60157a51ea1dd0afd6cfac695bfa5760485241.
Change-Id: I2171f2a0bc9b05059b8ecf4451715f7f6d9506e3
Reviewed-on: https://code.wireshark.org/review/17113
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Look for the redistributable installer in the project library directory
before %VCINSTALLDIR%. This lets us ship a specific version of the
redistributable.
Change-Id: I70e5aa90ac5addba5355d1964aeb50e277d1a8d4
Ping-Bug: 12712
Reviewed-on: https://code.wireshark.org/review/16922
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>
Use our normal application icon in "Programs and Features".
Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419
Reviewed-on: https://code.wireshark.org/review/16768
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>
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>
Guy Davies