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>
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>
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>
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>
This aligns the name with what is done for other Wireshark shared libraries.
Moreover it allows to compile a wiretap plugin once per major release, without
the need to recompile it each time ${PROJECT_VERSION} changes (each nightly
build / official release).
Change-Id: I53c82277223a4f323079cf695168ac85c2fba523
Reviewed-on: https://code.wireshark.org/review/16058
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
Explicitly pass /install to the Visual C++ redistributable installer. A
few people have reported issues with missing or incorrect redistributable
files after installing Wireshark but unfortunately haven't provided
much in the way of further detail. Is it possible that the installer
sometimes goes into /repair, /layout, or /uninstall modes?
Remove checks for old, unsupported compilers while we're here.
Change-Id: I4e24dbe562c8aeb6ce63ec98ea1601cba5256806
Reviewed-on: https://code.wireshark.org/review/15120
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support
Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43
Reviewed-on: https://code.wireshark.org/review/12117
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The newer version creates a system restore point during installation
Also add an explicit note in Wireshark installer explaining that USBPcap is
experimental and some hints on how to recover in case of issue
Bug: 12316
Change-Id: Ifb15ee98bf9db843debe5878f3df8c78f846d8d0
Reviewed-on: https://code.wireshark.org/review/14854
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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>
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>
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>
NSIS script modified to:
- check for KB 3033929 presence on Windows 7 / 2008R2 (as we sign drivers with a SHA2 certificate)
- do not delete the installation folder if not empty
Bug: 11766
Change-Id: I5c7b6378b0775bb75c1b9e58e503997176c12213
Reviewed-on: https://code.wireshark.org/review/12546
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>
Warn the user when installing on Windows Server 2003 along with XP.
CMake builds are not targeting them, and their support was officially
dropped with Wireshark 1.12.
Update our copy of GetWindowsVersion.nsh with "Alternate Script With
Server Versions" from http://nsis.sourceforge.net/Get_Windows_version.
Change-Id: I762859ea13e1ecd91757eeab360a39d1e6116144
Reviewed-on: https://code.wireshark.org/review/11972
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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>
Otherwise it can lead to a false verdict in after the check for Wireshark uninstall registry entry
Bug: 10867
Change-Id: I213ac8ffadfb3578b05d33b996540bd4330a0ec5
Reviewed-on: https://code.wireshark.org/review/11621
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
If Npcap is installed without WinPcap API-compatible mode, propose to install WinPcap
If Npcap is installed with WinPcap API-compatible mode, do not allow to install Winpcap without manually uninstalling Npcap first
Change-Id: I606f8b11c950fd54cf7fdda7f4a1886cc2580d31
Reviewed-on: https://code.wireshark.org/review/10197
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Yang Luo <hsluoyz@sohu.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
*.qm files are now in a translations subfolder
Change-Id: I233152cd2662aec7072769e27f7a278c6890d8ec
Reviewed-on: https://code.wireshark.org/review/9646
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>
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>
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>
On Windows, prepend the main program directory to %Path% when spawning
extcap processes. This lets us place androiddump in extcap while allowing
it to locate its DLLs.
Change-Id: I406c47ce71323266d5f14fb596931398464e452d
Reviewed-on: https://code.wireshark.org/review/8057
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
It adds a delay on startup and is verbose on command line when Android SDK is not installed
Change-Id: I165358ff14ef458712ebaa12bd3c7256f657e238
Reviewed-on: https://code.wireshark.org/review/8035
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Add missing androiddump stuff like:
- release notes
- documentation
- Windows nmake support
- running androiddump as a windows application instead of console on Windows
- addition of androiddump to the Windows installer
Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d
Reviewed-on: https://code.wireshark.org/review/7981
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Revert parts of g2ef72cb and g7710da4 so that the NSIS installer once
again places plugins in $INSTDIR\plugins\$VERSION. This matches the
behavior of Autotools and previous Windows installers, and reduces the
chances of a version mismatch if the user happens to install a custom
plugin.
Leave the development plugin path unversioned. Leave the extcap path
unversioned for now.
Change-Id: I861d4ee12975fba4b642e391871c5e852d92a2fe
Reviewed-on: https://code.wireshark.org/review/7976
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include
file. Add macros to generate packaging-related targets and invoke them
from the top-level CMakeLists.txt.
Add a top-level "plugins" target. Copy plugins to "plugins" in each of
our staging directories instead of "plugins/$VERSION".
Add missing files to the copy_data_files and copy_cli_dlls targets.
Add all files in the NSIS package from the staging directory.
Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT.
Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa
Reviewed-on: https://code.wireshark.org/review/6459
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.
Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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>
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>
Replace a pile-o-ifdefs with generated include files. This should make
it easier to add an NSIS target to CMake.
Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while.
Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873
Reviewed-on: https://code.wireshark.org/review/6717
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6
Author: Alan T. DeKok <aland@freeradius.org>
Date: Tue Nov 25 16:45:45 2014 -0500
as found on the net
commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu Nov 13 17:39:46 2014 -0500
Add memcached rlm_cache_driver
commit 6277960bc830891123b00400af56912e51d4d311
Author: Alan T. DeKok <aland@freeradius.org>
Date: Tue Oct 28 17:01:49 2014 -0400
Add FreeRADIUS-Response-Delay-USec
Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f
Reviewed-on: https://code.wireshark.org/review/5510
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>
Update includes all new/renamed dictionaries in radius, but does not cover any differences in already included dictionaries, which will be handled in a separate update.
Change-Id: I6d1e1cc1815423fb71ec940366964a366ab41a25
Reviewed-on: https://code.wireshark.org/review/4947
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".
It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.
Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).
Tested:
- Nmake builds
- NSIS packaging
- CMake builds (Windows, OS X)
- Autotools build and distcheck
- RPM packaging
To do:
- Test Debian packaging
- Fix PortableApps
Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Extcap is a plugin interface, which allows for the usage
of external capture interfaces via pipes using a predefined
configuration language which results in a graphical gui.
This implementation seeks for a generic implementation,
which results in a seamless integration with the current
system, and does add all external interfaces as simple
interfaces.
Windows Note: Due to limitations with GTK and Windows,
a gspawn-winXX-helper.exe, respective gspawn-winXX-helper-console.exe
is needed, which is part of any GTK windows installation.
The default installation directory from the build is an extcap
subdirectory underneath the run directory. The folder used by
extcap may be viewed in the folders tab of the about dialog.
The default installation directory for extcap plugins with
a pre-build or installer version of wireshark is the extcap
subdirectory underneath the main wireshark directory.
For more information see:
http://youtu.be/Nn84T506SwU
bug #9009
Also take a look in doc/extcap_example.py for a Python-example
and in extcap.pod for the arguments grammer.
Todo:
- Integrate with Qt - currently no GUI is generated, but
the interfaces are still usable
Change-Id: I4f1239b2f1ebd8b2969f73af137915f5be1ce50f
Signed-off-by: Mike Ryan <mikeryan+wireshark@lacklustre.net>
Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net>
Signed-off-by: Roland Knall <rknall@gmail.com>
Reviewed-on: https://code.wireshark.org/review/359
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>