diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index d57ba903e6..319f7130b3 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -32,7 +32,7 @@ set(WSUG_FILES wsug_src/WSUG_app_protocols.xml wsug_src/WSUG_app_tools.xml wsug_src/WSUG_chapter_advanced.xml - wsug_src/WSUG_chapter_build_install.xml + WSUG_chapter_build_install.xml wsug_src/WSUG_chapter_capture.xml wsug_src/WSUG_chapter_customize.xml WSUG_chapter_introduction.xml @@ -49,6 +49,7 @@ set(WSUG_FILES ) set(WSDG_ASCIIDOC_FILES + wsug_src/WSUG_chapter_build_install.asciidoc wsug_src/WSUG_chapter_introduction.asciidoc wsug_src/WSUG_preface.asciidoc ) diff --git a/docbook/Makefile.common b/docbook/Makefile.common index f07d5d8291..209181072f 100644 --- a/docbook/Makefile.common +++ b/docbook/Makefile.common @@ -6,7 +6,7 @@ WSUG_FILES = \ wsug_src/WSUG_app_protocols.xml \ wsug_src/WSUG_app_tools.xml \ wsug_src/WSUG_chapter_advanced.xml \ - wsug_src/WSUG_chapter_build_install.xml \ + wsug_src/WSUG_chapter_build_install.asciidoc \ wsug_src/WSUG_chapter_capture.xml \ wsug_src/WSUG_chapter_customize.xml \ wsug_src/WSUG_chapter_introduction.asciidoc \ @@ -22,6 +22,7 @@ WSUG_FILES = \ ws.css WSUG_GENERATED_SOURCE = \ + wsug_src/WSUG_chapter_build_install.xml \ wsug_src/WSUG_chapter_introduction.xml \ wsug_src/WSUG_preface.xml diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index bbd8712daa..54563b2186 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -13,7 +13,7 @@ wireshark-code-browse-url:\[\]=https://code.wireshark.org/review/gitweb?p=wiresh wireshark-code-review-url:\[\]=https://code.wireshark.org/review wireshark-dev-list-email:\[\]=wireshark-dev[AT]wireshark.org wireshark-developers-guide-url:\[\]=http://www.wireshark.org/docs/ -wireshark-download-page:\[\]=http://www.wireshark.org/download.html +wireshark-download-page:\[\]=https://www.wireshark.org/download.html wireshark-faq-url:\[\]=http://www.wireshark.org/faq.html wireshark-git-anonhttp-url:\[\]=https://code.wireshark.org/review/wireshark wireshark-git-http-url:\[\]=https://your.username@code.wireshark.org/review/wireshark @@ -25,6 +25,12 @@ wireshark-users-guide-url:\[\]=http://www.wireshark.org/docs/ wireshark-web-site:\[\]=http://www.wireshark.org/ wireshark-wiki-site:\[\]=http://wiki.wireshark.org/ +tcpdump-web-site:\[\]=http://www.tcpdump.org/ +tcpdump-man-page-url:\[\]=http://www.tcpdump.org/manpages/tcpdump.1.html + +winpcap-web-site:\[\]=http://www.winpcap.org/ +winpcap-download-page:\[\]=http://www.winpcap.org/install/ + # Make a document attribute after we fully convert to AsciiDoc wsdg-author-email:\[\]=ulf.lamping[AT]web.de diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc new file mode 100644 index 0000000000..16736ab1ba --- /dev/null +++ b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc @@ -0,0 +1,418 @@ +++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++ + +[[ChapterBuildInstall]] + +== Building and Installing Wireshark + +[[ChBuildInstallIntro]] + +=== Introduction + +As with all things there must be a beginning and so it is with Wireshark. To +use Wireshark you must first install it. If you are running Windows or Mac OS X +you can download an official release at wireshark-download-page:[], install it, +and skip the rest of this chapter. + +If you are running another operating system such as Linux or FreeBSD you might +want to install from source. Several Linux distributions offer Wireshark +packages but they commonly ship out-of-date versions. No other versions of UNIX +ship Wireshark so far. For that reason, you will need to know where to get the +latest version of Wireshark and how to install it. + +This chapter shows you how to obtain source and binary packages and how to +build Wireshark from source should you choose to do so. + +The following are the general steps you would use: + +. Download the relevant package for your needs, e.g. source or binary + distribution. + +. Compile the source into a binary if needed. + This may involve building and/or installing other necessary packages. + +. Install the binaries into their final destinations. + +[[ChBuildInstallDistro]] + +=== Obtaining the source and binary distributions + +You can obtain both source and binary distributions from the Wireshark web site: +wireshark-web-site:[]. Select the download link and then select the desired +binary or source package. + +[NOTE] +.Download all required files +==== +If you are building Wireshark from source you will +In general, unless you have already downloaded Wireshark before, you will most +likely need to download several source packages if you are building Wireshark +from source. This is covered in more detail below. + +++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++ +==== + +Once you have downloaded the relevant files, you can go on to the next step. + +// +// Windows +// + +[[ChBuildInstallWinInstall]] + +=== Installing Wireshark under Windows + +Windows installers contain the platform and version, e.g. ++Wireshark-win__xx__-wireshark-major-minor-version:[]._x_.exe+. The Wireshark +installer includes WinPcap which is required for packet capture. + +Simply download the Wireshark installer from: wireshark-download-page:[] and +execute it. Official packages are signed by the *Wireshark Foundation*. You can +choose to install several optional components and select the location of the +installed package. The default settings are recommended for most users. + +[[ChBuildInstallWinComponents]] + +==== Installation Components + +On the _Choose Components_ page of the installer you can select from the following: + +* *Wireshark* - The network protocol analyzer that we all know and mostly love. + +* *TShark* - A command-line network protocol analyzer. If you haven't tried it + you should. + +* *Wireshark 1 Legacy* - The old (GTK+) user interface in case you need it. + +* *Plugins & Extensions* - Extras for the Wireshark and TShark dissection engines + + - *Dissector Plugins* - Plugins with some extended dissections. + + - *Tree Statistics Plugins* - Extended statistics. + + - *Mate - Meta Analysis and Tracing Engine* - User configurable extension(s) of the display filter engine, see wireshark-wiki-site:[]Mate for details. + + - *SNMP MIBs* - SNMP MIBs for a more detailed SNMP dissection. + +* *Tools* - Additional command line tools to work with capture files + + - *Editcap* - Reads a capture file and writes some or all of the packets into + another capture file. + + - *Text2Pcap* - Reads in an ASCII hex dump and writes the data into a + pcap capture file. + + - *Reordercap* - Reorders a capture file by timestamp. + + - *Mergecap* - Combines multiple saved capture files into a single output file. + + - *Capinfos* - Provides information on capture files. + + - *Rawshark* - Raw packet filter. + +* *User's Guide* - Local installation of the User's Guide. The Help buttons on + most dialogs will require an internet connection to show help pages if the + User's Guide is not installed locally. + +[[ChBuildInstallWinAdditionalTasks]] + +==== Additional Tasks + +* *Start Menu Shortcuts* - Add some start menu shortcuts. + +* *Desktop Icon* - Add a Wireshark icon to the desktop. + +* *Quick Launch Icon* - add a Wireshark icon to the Explorer quick launch toolbar. + +* *Associate file extensions to Wireshark* - Associate standard network trace files to Wireshark. + +[[ChBuildInstallWinLocation]] + +==== Install Location + +By default Wireshark installs into `%ProgramFiles%\Wireshark` on 32-bit Windows +and `%ProgramFiles64%\Wireshark` on 64-bit Windows. This expands to `C:\Program +Files\Wireshark` on most systems. + +[[ChBuildInstallWinPcap]] + +==== Installing WinPcap + +The Wireshark installer contains the latest WinPcap installer. + +If you don't have WinPcap installed you won't be able to capture live network +traffic but you will still be able to open saved capture files. By default the +latest version of WinPcap will be installed. If you don't wish to do this or if +you wish to reinstall WinPcap you can check the _Install WinPcap_ box as needed. + +For more information about WinPcap see winpcap-web-site:[] and +wireshark-wiki-site:[]WinPcap. + + +[[ChBuildInstallWinWiresharkCommandLine]] + +==== Windows installer command line options + +For special cases, there are some command line parameters available: + +* `/S` runs the installer or uninstaller silently with default values. The + silent installer *will not* install WinPCap. + +* `/desktopicon` installation of the desktop icon, `=yes` - force installation, + `=no` - don't install, otherwise use default settings. This option can be + useful for a silent installer. + +* `/quicklaunchicon` installation of the quick launch icon, `=yes` - force + installation, `=no` - don't install, otherwise use default settings. + +* `/D` sets the default installation directory ($INSTDIR), overriding InstallDir + and InstallDirRegKey. It must be the last parameter used in the command line + and must not contain any quotes even if the path contains spaces. + +* `/NCRC` disables the CRC check. We recommend against using this flag. + +Example: +---- +> Wireshark-win64-wireshark-2.0.5.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\Program Files\Foo +---- + +Running the installer without any parameters shows the normal interactive installer. + +[[ChBuildInstallWinPcapManually]] + +==== Manual WinPcap Installation + +As mentioned above, the Wireshark installer takes care of installing WinPcap. +The following is only necessary if you want to use a different version than the +one included in the Wireshark installer, e.g. because a new WinPcap version was +released. + +Additional WinPcap versions (including newer alpha or beta releases) can be +downloaded from the main WinPcap site: winpcap-web-site:[]. The _Installer for +Windows_ supports modern Windows operating systems. + +[[ChBuildInstallWinWiresharkUpdate]] + +==== Update Wireshark + +By default the offical Windows package will check for new versions and notify +you when they are available. If you have the _Check for updates_ preference +disabled or if you run Wireshark in an isolated environment you should subcribe +to the _wireshark-announce_ mailing list. See <> for +details on subscribing to this list. + +New versions of Wireshark are usually released every four to six weeks. Updating +Wireshark is done the same way as installing it. Simply download and start the +installer exe. A reboot is usually not required and all your personal settings +remain unchanged. + +[[ChBuildInstallWinPcapUpdate]] + +==== Update WinPcap + +New versions of WinPcap are less frequently available. You will find WinPcap +update instructions the WinPcap web site at winpcap-web-site:[]. You may have to +reboot your machine after installing a new WinPcap version. + +[[ChBuildInstallWinUninstall]] + +==== Uninstall Wireshark + +You can uninstall Wireshark using the _Programs and Features_ control panel. +Select the "Wireshark" entry to start the uninstallation procedure. + +The Wireshark uninstaller provides several options for removal. The default is +to remove the core components but keep your personal settings and WinPcap. +WinPcap is left installed by default in case other programs need it. + +[[ChBuildInstallWinPcapUninstall]] + +==== Uninstall WinPcap + +You can uninstall WinPcap independently of Wireshark using the _WinPcap_ entry +in the _Programs and Features_ control panel. Remember that if you uninstall +WinPcap you won't be able to capture anything with Wireshark. + +// +// OS X +// + +[[ChBuildInstallOSXInstall]] + +=== Installing Wireshark under Mac OS X + +The official Mac OS X packages are distributed as disk images (.dmg) containing +the application installer. To install Wireshark simply open the disk image and +run the enclosed installer. + +The installer package includes Wireshark, its related command line utilities, +and a launch daemon that adjusts capture permissions at system startup. See the +included _Read me first_ file for more details. + +[[ChBuildInstallUnixBuild]] + +=== Building Wireshark from source under UNIX + +Building Wireshark requires the proper build environment including a compiler +and many supporting libraries. See the Developer's Guide at +wireshark-developers-guide-url:[] for more information. + +Use the following general steps to build Wireshark from source under UNIX or Linux: + +. Unpack the source from its compressed `tar` file. If you are using Linux or + your version of UNIX uses GNU `tar` you can use the following command: ++ +-- +---- +$ tar xaf wireshark-2.0.5.tar.bz2 +---- +In other cases you will have to use the following commands: +---- +$ bzip2 -d wireshark-2.0.5.tar.bz2 +$ tar xf wireshark-2.0.5.tar +---- +-- + +. Change directory to the Wireshark source directory. ++ +---- +$ cd wireshark-2.0.5 +---- + +. Configure your source so it will build correctly for your version of UNIX. You + can do this with the following command: ++ +---- +$ ./configure +---- ++ +If this step fails you will have to rectify the problems and rerun `configure`. +Troubleshooting hints are provided in <>. + +. Build the sources. ++ +---- +$ make +---- + +. Install the software in its final destination. ++ +---- +$ make install +---- + +// XXX To do: CMake + +Once you have installed Wireshark with _make install_ above, you should be able +to run it by entering `wireshark`. + +[[ChBuildInstallUnixInstallBins]] + +=== Installing the binaries under UNIX + +In general installing the binary under your version of UNIX will be specific to +the installation methods used with your version of UNIX. For example, under AIX, +you would use _smit_ to install the Wireshark binary package, while under Tru64 +UNIX (formerly Digital UNIX) you would use _setld_. + +==== Installing from rpm's under Red Hat and alike + +Use the following command to install the Wireshark RPM that you have downloaded from the Wireshark web site: + +---- +rpm -ivh wireshark-2.0.5.i386.rpm +---- + +If the above step fails because of missing dependencies, install the +dependencies first, and then retry the step above. + +==== Installing from deb's under Debian, Ubuntu and other Debian derivatives + +If you can just install from the repository then use + +---- +$ aptitude install wireshark +---- + +Aptitude should take care of all of the dependency issues for you. + +Use the following command to install downloaded Wireshark deb's under Debian: + +---- +$ dpkg -i wireshark-common_2.0.5.0-1_i386.deb wireshark_wireshark-2.0.5.0-1_i386.deb +---- + +dpkg doesn't take care of all dependencies, but reports what's missing. + + +[NOTE] +.Capturing requires privileges +==== +By installing Wireshark packages non-root users won't gain rights automatically +to capture packets. To allow non-root users to capture packets follow the +procedure described in +file:///usr/share/doc/wireshark-common/README.Debian[/usr/share/doc/wireshark-common/README.Debian] +==== + +==== Installing from portage under Gentoo Linux + +Use the following command to install Wireshark under Gentoo Linux with all of +the extra features: + +---- +$ USE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux" emerge wireshark +---- + +==== Installing from packages under FreeBSD + +Use the following command to install Wireshark under FreeBSD: + +---- +$ pkg_add -r wireshark +---- + +pkg_add should take care of all of the dependency issues for you. + +[[ChBuildInstallUnixTrouble]] + +=== Troubleshooting during the install on Unix + +A number of errors can occur during the installation process. Some hints on +solving these are provided here. + +If the `configure` stage fails you will need to find out why. You can check the +file `config.log` in the source directory to find out what failed. The last few +lines of this file should help in determining the problem. + +The standard problems are that you do not have a required development package on +your system or that the development package isn't new enough. Note that +installing a library package isn't enough. You need to install its development +package as well. `configure` will also fail if you do not have libpcap (at least +the required include files) on your system. + +If you cannot determine what the problems are, send an email to the +_wireshark-dev_ mailing list explaining your problem. Include the output from +`config.log` and anything else you think is relevant such as a trace of the +`make` stage. + +[[ChBuildInstallWinBuild]] + +=== Building from source under Windows + +We strongly recommended that you use the binary installer for Windows unless you +want to start developing Wireshark on the Windows platform. + +For further information how to build Wireshark for Windows from the sources +see the Developer's Guide at wireshark-developers-guide-url:[] + +You may also want to have a look at the Development Wiki +(wireshark-wiki-site:[]Development) for the latest available development +documentation. + +++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++ + diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml deleted file mode 100644 index 3eb867376b..0000000000 --- a/docbook/wsug_src/WSUG_chapter_build_install.xml +++ /dev/null @@ -1,780 +0,0 @@ - - - - Building and Installing Wireshark -
- Introduction - - As with all things, there must be a beginning, and so it is with - Wireshark. To use Wireshark, you must: - - - - Obtain a binary package for your operating system, or - - - - - Obtain the source and build Wireshark for your operating system. - - - - - - Currently, several Linux distributions ship Wireshark, but - they are commonly shipping an out-of-date version. No other versions - of UNIX ship Wireshark so far, and Microsoft does not ship it with any - version of Windows. For that reason, you will need to know where to - get the latest version of Wireshark and how to install it. - - - This chapter shows you how to obtain source and binary packages, - and how to build Wireshark from source, should you choose to do so. - - - The following are the general steps you would use: - - - - Download the relevant package for your needs, e.g. source or - binary distribution. - - - - - Build the source into a binary, if you have downloaded the - source. - - - This may involve building and/or installing other necessary packages. - - - - - Install the binaries into their final destinations. - - - - -
- -
- Obtaining the source and binary distributions - - You can obtain both source and binary distributions from the Wireshark - web site: &WiresharkWebSite;. - Simply select the download link, and then select either the source - package or binary package of your choice from the mirror site closest - to you. - - - Download all required files! - - In general, unless you have already downloaded Wireshark - before, you will most likely need to download several source - packages if you are building Wireshark from source. This is - covered in more detail below. - - - - Once you have downloaded the relevant files, you can go on to the - next step. - - - Note! - - While you will find a number of binary packages available on the - Wireshark web site, you might not find one for your platform, and - they often tend to be several versions behind the current released - version, as they are contributed by people who have the platforms - they are built for. - - - For this reason, you might want to pull down the source distribution - and build it, as the process is relatively simple. - - -
- -
- Before you build <application>Wireshark</application> under UNIX - - Before you build Wireshark from sources, or install a binary package, - you must ensure that you have the following other packages installed: - - - GTK+, The GIMP Tool Kit. - - You will also need Glib. Both can be obtained from - www.gtk.org - - - - - libpcap, the packet capture software that Wireshark uses. - - - You can obtain libpcap from - www.tcpdump.org - - - - Depending on your system, you may be able to install these from - binaries, e.g. RPMs, or you may need to obtain them in source code - form and build them. - - - If you have downloaded the source for GTK+, the instructions shown - in may provide some help in building it: - - Building GTK+ from source - -gzip -dc gtk+-2.21.1.tar.gz | tar xvf - -<much output removed> -cd gtk+-2.21.1 -./configure -<much output removed> -make -<much output removed> -make install -<much output removed> - - - - Note! - - You may need to change the version number of GTK+ in - to match the version of GTK+ you have - downloaded. The directory you change to will change if the - version of GTK+ changes, and in all cases, - tar xvf - will show you the name of the - directory you should change to. - - - - Note! - - If you use Linux, or have GNU tar installed, - you can use tar zxvf gtk+-2.21.1.tar.gz. It - is also possible to use gunzip -c or - gzcat rather than gzip -dc - on many UNIX systems. - - - - Note! - - If you downloaded GTK+ or any other tar file using Windows, - you may find your file called gtk+-2_21_1_tar.gz. - - - - - You should consult the GTK+ web site if any errors occur in carrying - out the instructions in . - - - If you have downloaded the source to libpcap, the general instructions - shown in will assist in building it. Also, - if your operating system does not support tcpdump, - you might also want to download it from the - tcpdump web site and - install it. - - Building and installing libpcap - -gzip -dc libpcap-1.0.0.tar.Z | tar xvf - -<much output removed> -cd libpcap-1.0.0 -./configure -<much output removed> -make -<much output removed> -make install -<much output removed> - - - - - Note! - - The directory you should change to will depend on the version of - libpcap you have downloaded. In all cases, - tar xvf - will show you the name of the - directory that has been unpacked. - - - - Under Red Hat 6.x and beyond (and distributions based on it, like - Mandrake) you can simply install each of the packages you need from - RPMs. Most Linux systems will install GTK+ and GLib in any case, - however you will probably need to install the devel versions of - each of these packages. The commands shown in - will install all the needed RPMs if they are not already installed. - - - Installing required RPMs under Red Hat Linux 6.2 and beyond - - -cd /mnt/cdrom/RedHat/RPMS -rpm -ivh glib-1.2.6-3.i386.rpm -rpm -ivh glib-devel-1.2.6-3.i386.rpm -rpm -ivh gtk+-1.2.6-7.i386.rpm -rpm -ivh gtk+-devel-1.2.6-7.i386.rpm -rpm -ivh libpcap-0.4-19.i386.rpm - - - - - - If you are using a version of Red Hat later than 6.2, the required - RPMs have most likely changed. Simply use the correct RPMs from your - distribution. - - - - Under Debian you can install Wireshark using aptitude. aptitude will - handle any dependency issues for you. shows - how to do this. - - Installing debs under Debian, Ubuntu and other Debian derivatives - -aptitude install wireshark-dev - - - -
- -
- Building Wireshark from source under UNIX - - Use the following general steps if you are building Wireshark from - source under a UNIX operating system: - - - - Unpack the source from its gzip'd - tar file. If you are using Linux, or your - version of UNIX uses GNU tar, you can use the - following command: - -tar zxvf wireshark-&WiresharkCurrentVersion;-tar.gz - - - - For other versions of UNIX, you will want to use the following - commands: - -gzip -d wireshark-&WiresharkCurrentVersion;-tar.gz -tar xvf wireshark-&WiresharkCurrentVersion;-tar - - - Note! - - The pipeline - - gzip -dc wireshark-&WiresharkCurrentVersion;-tar.gz | tar xvf - - will work here as well. - - - - Note! - - If you have downloaded the Wireshark tarball under Windows, - you may find that your browser has created a file with - underscores rather than periods in its file name. - - - - - - - Change directory to the Wireshark source directory. - - - - - Configure your source so it will build correctly for your - version of UNIX. You can do this with the following command: - -./configure - - - - If this step fails, you will have to rectify the problems and - rerun configure. Troubleshooting hints are - provided in . - - - - - Build the sources into a binary, with the make - command. For example: - -make - - - - - - Install the software in its final destination, using the command: - -make install - - - - - - - Once you have installed Wireshark with make install - above, you should be able to run it by entering - wireshark. - -
- -
- Installing the binaries under UNIX - - In general, installing the binary under your version of UNIX will be - specific to the installation methods used with your version of UNIX. - For example, under AIX, you would use smit to - install the Wireshark binary package, while under Tru64 UNIX - (formerly Digital UNIX) you would use setld. - - -
- Installing from rpm's under Red Hat and alike - - Use the following command to install the Wireshark RPM that you have - downloaded from the Wireshark web site: - -rpm -ivh wireshark-&WiresharkCurrentVersion;.i386.rpm - - If the above step fails because of missing dependencies, install the - dependencies first, and then retry the step above. See - for information on what RPMs you will need - to have installed. - -
- -
- Installing from deb's under Debian, Ubuntu and other Debian derivatives - - If you can just install from the repository then use: - -aptitude install wireshark - - aptitude should take care of all of the dependency issues for you. - - - Use the following command to install downloaded Wireshark deb's under - Debian: - -dpkg -i wireshark-common_&WiresharkCurrentVersion;.0-1_i386.deb wireshark_&WiresharkCurrentVersion;.0-1_i386.deb - - dpkg doesn't take care of all dependencies, but reports what's missing. - - Note! - - By installing Wireshark packages non-root users won't gain rights - automatically to capture packets. To allow non-root users to capture - packets follow the procedure described in - /usr/share/doc/wireshark-common/README.Debian - - -
- -
- Installing from portage under Gentoo Linux - - Use the following command to install Wireshark under Gentoo - Linux with all of the extra features: - -USE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux" emerge wireshark - - -
- -
- Installing from packages under FreeBSD - - Use the following command to install Wireshark under FreeBSD: - -pkg_add -r wireshark - - pkg_add should take care of all of the dependency issues for you. - -
-
- -
- Troubleshooting during the install on Unix - - A number of errors can occur during the installation process. - Some hints on solving these are provided here. - - - If the configure stage fails, you will need to find - out why. You can check the file config.log in the - source directory to find out what failed. The last few lines of this - file should help in determining the problem. - - - The standard problems are that you do not have GTK+ on your system, - or you do not have a recent enough version of GTK+. The - configure will also fail if you do not have libpcap - (at least the required include files) on your system. - - - Another common problem is for the final compile and link stage to - terminate with a complaint of: Output too long. - This is likely to be caused by an antiquated sed - (such as the one shipped with Solaris). Since sed is - used by the libtool script to construct the final - link command, this leads to mysterious problems. This can be - resolved by downloading a recent version of sed from - . - - - If you cannot determine what the problems are, send an email to the - wireshark-dev mailing list explaining your problem, - and including the output from config.log and - anything else you think is relevant, like a trace of the - make stage. - -
- -
- Building from source under Windows - - It is recommended to use the binary installer for Windows, - until you want to start developing Wireshark on the Windows platform. - - - For further information how to build Wireshark for Windows from the - sources, have a look at the Developer's Guide on the - Documentation Page. - - - You may also want to have a look at the Development Wiki: - &WiresharkWikiPage;/Development - for the latest available development documentation. - -
- -
- Installing Wireshark under Windows - - In this section we explore installing Wireshark under Windows from the - binary packages. - -
- Install Wireshark - - You may acquire a binary installer of Wireshark named something like: - wireshark-winxx-&WiresharkCurrentVersion;.x.exe. - The Wireshark installer includes WinPcap, so you don't need to download - and install two separate packages. - - - Simply download the Wireshark installer from: - &WiresharkBinariesPage; - and execute it. - Beside the usual installer options like where to install the program, - there are several optional components. - - Tip: Just keep the defaults! - - If you are unsure which settings to select, just keep the defaults. - - -
- "Choose Components" page - - Wireshark - - - Wireshark GTK - Wireshark is a GUI network protocol - analyzer. - - - - - TShark - TShark is a command-line based network - protocol analyzer. - - - Plugins / Extensions (for the Wireshark and TShark - dissection engines): - - - Dissector Plugins - Plugins with some extended dissections. - - - Tree Statistics Plugins - Plugins with some extended statistics. - - - Mate - Meta Analysis and Tracing Engine (experimental) - - user configurable extension(s) of the display filter engine, see - &WiresharkWikiPage;/Mate - for details. - - - SNMP MIBs - SNMP MIBs for a more detailed SNMP - dissection. - - - Tools (additional command line tools to work with - capture files): - - - Editcap - Editcap is a program that reads a capture - file and writes some or all of the packets into another capture file. - - - Text2Pcap - Text2pcap is a program that reads in an - ASCII hex dump and writes the data into a libpcap-style capture file. - - - Mergecap - Mergecap is a program that combines multiple - saved capture files into a single output file. - - - Capinfos - Capinfos is a program that provides - information on capture files. - - - Rawshark - Rawshark is a raw packet filter. - - - - - User's Guide - - Local installation of the User's Guide. The Help buttons on most dialogs - will require an internet connection to show help pages if the User's Guide - is not installed locally. - -
-
- "Additional Tasks" page - - - - Start Menu Shortcuts - add some start menu shortcuts. - - - Desktop Icon - add a Wireshark icon to the desktop. - - - Quick Launch Icon - add a Wireshark icon to the - Explorer quick launch toolbar. - - - Associate file extensions to Wireshark - Associate - standard network trace files to Wireshark. - - - -
-
- "Install WinPcap?" page - - The Wireshark installer contains the latest released WinPcap installer. - - - If you don't have WinPcap installed, you won't be able to capture live - network traffic, but you will still be able to open saved capture files. - - - - - Currently installed WinPcap version - the Wireshark - installer detects the currently installed WinPcap version. - - - Install WinPcap x.x - if the currently installed - version is older than the one which comes with the Wireshark installer - (or WinPcap is not installed at all), this will be selected by default. - - - Start WinPcap service "NPF" at startup - so users - without administrative privileges can capture. - - - - - - More WinPcap info: - - - Wireshark related: - &WiresharkWikiPage;/WinPcap - - - General WinPcap info: - &WinPcapWebsite; - - - -
-
- Command line options - - You can simply start the Wireshark installer without any command line - parameters, it will show you the usual interactive installer. - - - For special cases, there are some command line parameters available: - - - - - /NCRC disables the CRC check - - - - - /S runs the installer or uninstaller silently with - default values. Please note: The silent installer won't install WinPCap! - - - - - /desktopicon installation of the desktop icon, - =yes - force installation, =no - - don't install, otherwise use defaults / user settings. - This option can be useful for a silent installer. - - - - - /quicklaunchicon installation of the quick launch icon, - =yes - force installation, =no - - don't install, otherwise use defaults / user settings. - - - - - /D sets the default installation directory - ($INSTDIR), overriding - InstallDir and InstallDirRegKey. It must be the last parameter used in - the command line and must not contain any quotes, even if the path - contains spaces. - - - - Example: - -wireshark-win32-&WiresharkCurrentVersion;.0.exe /NCRC /S /desktopicon=yes - /quicklaunchicon=no /D=C:\Program Files\Foo - - -
-
- -
- Manual WinPcap Installation - Note! - - As mentioned above, the Wireshark installer - takes care of the installation of WinPcap, - so usually you don't have to worry about WinPcap at all! - - - - The following is only necessary if you want to - try a different version than the one included in the Wireshark installer, - e.g. because a new WinPcap (beta) version was released. - - - Additional WinPcap versions (including newer alpha or beta releases) - can be downloaded from the following locations: - - - The main WinPcap site: - &WinPcapWebsite; - - - The Wiretapped.net mirror: - - http://www.mirrors.wiretapped.net/security/packet-capture/winpcap - - - - - At the download page you will find a single installer exe called something - like "auto-installer", which can be installed under various Windows - systems. - -
- -
- Update Wireshark - - From time to time you may want to update your installed Wireshark to a more - recent version. If you join Wireshark's announce mailing list, you will be - informed about new Wireshark versions, see for details how to subscribe to this list. - - - New versions of Wireshark usually become available every 4 to 8 months. - Updating Wireshark is done the same way as installing it, you simply - download and start the installer exe. A reboot is usually not required and - all your personal settings remain unchanged. - -
- -
- Update WinPcap - - New versions of WinPcap are less frequently available, maybe only once in a - year. You will find WinPcap update instructions where you can download new - WinPcap versions. Usually you have to reboot the machine after installing - a new WinPcap version. - - Warning! - - If you have an older version of WinPcap installed, you must uninstall it - before installing the current version. Recent versions of the WinPcap - installer will take care of this. - - -
- -
- Uninstall Wireshark - - You can uninstall Wireshark the usual way, using the "Add or Remove - Programs" option inside the Control Panel. Select the "Wireshark" entry to - start the uninstallation procedure. - - - The Wireshark uninstaller will provide several options as to which things are to be - uninstalled; the default is to remove the core components but keep the personal - settings, WinPcap and alike. - - - WinPcap won't be uninstalled by default, as other programs than Wireshark - may use it as well. - -
- -
- Uninstall WinPcap - - You can uninstall WinPcap independently of Wireshark, using the "WinPcap" - entry in the "Add or Remove Programs" of the Control Panel. - - Note! - - After uninstallation of WinPcap you can't capture anything with Wireshark. - - - - It might be a good idea to reboot Windows afterwards. - -
-
- - - diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini index b36f9e9aa7..ad51274196 100644 --- a/packaging/nsis/AdditionalTasksPage.ini +++ b/packaging/nsis/AdditionalTasksPage.ini @@ -16,7 +16,7 @@ Left=10 Right=-1 Top=10 Bottom=18 -Text=Start Menu Item +Text=Wireshark Start Menu Item State=1 [Field 3] @@ -25,7 +25,7 @@ Left=10 Right=-1 Top=20 Bottom=28 -Text=Desktop Icon +Text=Wireshark Desktop Icon State=0 [Field 4] @@ -34,7 +34,7 @@ Left=10 Right=-1 Top=30 Bottom=38 -Text=Quick Launch Icon +Text=Wireshark Quick Launch Icon State=1 [Field 5] @@ -43,7 +43,7 @@ Left=10 Right=-1 Top=40 Bottom=48 -Text=Wireshark 2 Preview Start Menu Item +Text=Wireshark 1 Start Menu Item Flags=DISABLED State=0 @@ -53,7 +53,7 @@ Left=10 Right=-1 Top=50 Bottom=58 -Text=Wireshark 2 Preview Desktop Icon +Text=Wireshark 1 Desktop Icon Flags=DISABLED State=0 @@ -63,7 +63,7 @@ Left=10 Right=-1 Top=60 Bottom=68 -Text=Wireshark 2 Preview Quick Launch Icon +Text=Wireshark 1 Quick Launch Icon Flags=DISABLED State=0 @@ -93,7 +93,7 @@ Left=10 Right=-1 Top=95 Bottom=103 -Text=Associate trace file extensions to Wireshark 2 Preview +Text=Associate trace file extensions to Wireshark 1 Flags=DISABLED State=0 diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 8f9b5f0ec4..ca3e73c8e0 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -678,7 +678,7 @@ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Pa !endif ; Create start menu entries (depending on additional tasks page) -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" StrCmp $0 "0" SecRequired_skip_StartMenu SetOutPath $PROFILE ;CreateDirectory "$SMPROGRAMS\${PROGRAM_NAME}" @@ -699,7 +699,7 @@ StrCmp $R1 "no" SecRequired_skip_DesktopIcon StrCmp $R1 "yes" SecRequired_install_DesktopIcon ; Create desktop icon (depending on additional tasks page and command line option) -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" StrCmp $0 "0" SecRequired_skip_DesktopIcon SecRequired_install_DesktopIcon: CreateShortCut "$DESKTOP\${PROGRAM_NAME_GTK}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" "" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" 0 "" "" "${PROGRAM_FULL_NAME_GTK}" @@ -712,7 +712,7 @@ StrCmp $R1 "no" SecRequired_skip_QuickLaunchIcon StrCmp $R1 "yes" SecRequired_install_QuickLaunchIcon ; Create quick launch icon (depending on additional tasks page and command line option) -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" StrCmp $0 "0" SecRequired_skip_QuickLaunchIcon SecRequired_install_QuickLaunchIcon: CreateShortCut "$QUICKLAUNCH\${PROGRAM_NAME_GTK}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" "" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" 0 "" "" "${PROGRAM_FULL_NAME_GTK}" @@ -723,10 +723,10 @@ SecRequired_skip_QuickLaunchIcon: ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 11" "State" StrCmp $0 "1" SecRequired_skip_FileExtensions ; GTK+ Associate -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "State" +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "State" StrCmp $0 "1" SecRequired_GTK_FileExtensions ; Qt Associate -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "State" +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "State" StrCmp $0 "1" SecRequired_QT_FileExtensions SecRequired_GTK_FileExtensions: @@ -755,7 +755,7 @@ SecRequired_skip_FileExtensions: IfSilent SecRequired_skip_Winpcap ; Install WinPcap (depending on winpcap page setting) -ReadINIStr $0 "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" +ReadINIStr $0 "$PLUGINSDIR\WinPcapPage.ini" "Field 7" "State" StrCmp $0 "0" SecRequired_skip_Winpcap ; Uinstall old WinPcap first ReadRegStr $WINPCAP_UNINSTALL HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString" @@ -782,8 +782,77 @@ SetShellVarContext all SectionEnd ; "Required" +!ifdef QT_DIR +Section "${PROGRAM_NAME}" SecWiresharkQt +;------------------------------------------- +; by default, QtShark is installed but file is always associate with Wireshark GTK+ +SetOutPath $INSTDIR +File "${QT_DIR}\${PROGRAM_NAME_PATH_QT}" +!ifdef NEED_QT4_DLL +File "${QT_DIR}\QtCore4.dll" +File "${QT_DIR}\QtGui4.dll" +!endif +!ifdef NEED_QT5_DLL +File "${QT_DIR}\Qt5Core.dll" +File "${QT_DIR}\Qt5Gui.dll" +File "${QT_DIR}\Qt5Widgets.dll" +File "${QT_DIR}\Qt5PrintSupport.dll" +SetOutPath $INSTDIR\platforms +File "${QT_DIR}\platforms\qwindows.dll" +!endif + +Push $0 +;SectionGetFlags ${SecWiresharkQt} $0 +;IntOp $0 $0 & 1 +;CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" + +; Create start menu entries (depending on additional tasks page) +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" +StrCmp $0 "0" SecRequired_skip_StartMenuQt +CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" +SecRequired_skip_StartMenuQt: + +; is command line option "/desktopicon" set? +${GetParameters} $R0 +${GetOptions} $R0 "/desktopicon=" $R1 +StrCmp $R1 "no" SecRequired_skip_DesktopIconQt +StrCmp $R1 "yes" SecRequired_install_DesktopIconQt + +; Create desktop icon (depending on additional tasks page and command line option) +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" +StrCmp $0 "0" SecRequired_skip_DesktopIconQt +SecRequired_install_DesktopIconQt: +CreateShortCut "$DESKTOP\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" +SecRequired_skip_DesktopIconQt: + +; is command line option "/quicklaunchicon" set? +${GetParameters} $R0 +${GetOptions} $R0 "/quicklaunchicon=" $R1 +StrCmp $R1 "no" SecRequired_skip_QuickLaunchIconQt +StrCmp $R1 "yes" SecRequired_install_QuickLaunchIconQt + +; Create quick launch icon (depending on additional tasks page and command line option) +ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" +StrCmp $0 "0" SecRequired_skip_QuickLaunchIconQt +SecRequired_install_QuickLaunchIconQt: +CreateShortCut "$QUICKLAUNCH\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" +SecRequired_skip_QuickLaunchIconQt: + +Pop $0 +SectionEnd ; "Wireshark" +!endif + + +Section "TShark" SecTShark +;------------------------------------------- +SetOutPath $INSTDIR +File "${STAGING_DIR}\tshark.exe" +File "..\..\doc\tshark.html" +SectionEnd + + !ifdef GTK_DIR -Section "${PROGRAM_NAME}" SecWiresharkGtk +Section "${PROGRAM_NAME} 1" SecWiresharkGtk ;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\${PROGRAM_NAME_PATH_GTK}" @@ -863,69 +932,11 @@ SetOutPath $INSTDIR\${GTK_SCHEMAS_DIR} File "${STAGING_DIR}\${GTK_SCHEMAS_DIR}\*.*" !endif -SectionEnd ; "Wireshark" +SectionEnd ; "Wireshark 1" !endif -Section "TShark" SecTShark -;------------------------------------------- -SetOutPath $INSTDIR -File "${STAGING_DIR}\tshark.exe" -File "..\..\doc\tshark.html" -SectionEnd - -!ifdef QT_DIR -Section "${PROGRAM_NAME} 2 Preview" SecWiresharkQt -;------------------------------------------- -; by default, QtShark is installed but file is always associate with Wireshark GTK+ -SetOutPath $INSTDIR -File "${QT_DIR}\${PROGRAM_NAME_PATH_QT}" -!include qt-dll-manifest.nsh -File "${QT_DIR}\*.qm" - -Push $0 -;SectionGetFlags ${SecWiresharkQt} $0 -;IntOp $0 $0 & 1 -;CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" - -; Create start menu entries (depending on additional tasks page) -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" -StrCmp $0 "0" SecRequired_skip_StartMenuQt -CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" -SecRequired_skip_StartMenuQt: - - -; is command line option "/desktopicon" set? -${GetParameters} $R0 -${GetOptions} $R0 "/desktopicon=" $R1 -StrCmp $R1 "no" SecRequired_skip_DesktopIconQt -StrCmp $R1 "yes" SecRequired_install_DesktopIconQt - -; Create desktop icon (depending on additional tasks page and command line option) -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" -StrCmp $0 "0" SecRequired_skip_DesktopIconQt -SecRequired_install_DesktopIconQt: -CreateShortCut "$DESKTOP\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" -SecRequired_skip_DesktopIconQt: - -; is command line option "/quicklaunchicon" set? -${GetParameters} $R0 -${GetOptions} $R0 "/quicklaunchicon=" $R1 -StrCmp $R1 "no" SecRequired_skip_QuickLaunchIconQt -StrCmp $R1 "yes" SecRequired_install_QuickLaunchIconQt - -; Create quick launch icon (depending on additional tasks page and command line option) -ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" -StrCmp $0 "0" SecRequired_skip_QuickLaunchIconQt -SecRequired_install_QuickLaunchIconQt: -CreateShortCut "$QUICKLAUNCH\${PROGRAM_NAME_QT}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" "" "$INSTDIR\${PROGRAM_NAME_PATH_QT}" 0 "" "" "${PROGRAM_FULL_NAME_QT}" -SecRequired_skip_QuickLaunchIconQt: - -Pop $0 -SectionEnd -!endif - -SectionGroup "Plugins / Extensions" SecPluginsGroup +SectionGroup "Plugins & Extensions" SecPluginsGroup Section "Dissector Plugins" SecPlugins ;------------------------------------------- @@ -1101,33 +1112,33 @@ onSelChange.checkgtk: onSelChange.unselectgtk: ;GTK Icon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 0 ;GTK Association - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "DISABLED" ; Select "None Association" WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 11" "State" 1 Goto onSelChange.checkqt onSelChange.selectgtk: ;GTK Icon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" 1 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" 1 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 1 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 1 ;GTK Association - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "State" 1 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "State" 1 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "" ; Force None and Qt Association to no selected WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 11" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "State" 0 Goto onSelChange.checkqt ;Check Wireshark Qt+ @@ -1143,26 +1154,26 @@ onSelChange.checkqt: !ifdef QT_DIR onSelChange.unselectqt: ;Qt Icon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" 0 ;Qt Association - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "Flags" "DISABLED" Goto onSelChange.end onSelChange.selectqt: ;Qt Icon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 1 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 1 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" 1 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" 1 ;Qt Association - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "Flags" "" Goto onSelChange.end !endif @@ -1184,14 +1195,14 @@ Function myShowCallback !ifdef QT_DIR ; if Qt is available enable icon and associate from additional tasks ;Qt Icon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" 1 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" 0 - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "Flags" "" - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" 1 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" 1 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" 0 + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" 1 ;Qt Association - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 9" "Flags" "" !endif ; Get the Windows version @@ -1233,16 +1244,16 @@ lbl_winversion_warn_xp: lbl_winversion_supported: ; detect if WinPcap should be installed - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap ${PCAP_DISPLAY_VERSION}" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 7" "Text" "Install WinPcap ${PCAP_DISPLAY_VERSION}" ReadRegStr $WINPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName" IfErrors 0 lbl_winpcap_installed ;if RegKey is available, WinPcap is already installed - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed" - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "(Use Add/Remove Programs first to uninstall any undetected old WinPcap versions)" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "WinPcap is currently not installed" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "(Use Add/Remove Programs first to uninstall any undetected old WinPcap versions)" Goto lbl_winpcap_done lbl_winpcap_installed: - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "$WINPCAP_NAME" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "$WINPCAP_NAME" ; Compare the installed build against the one we have. ReadRegStr $WINWINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayVersion" StrCmp $WINWINPCAP_VERSION "" lbl_winpcap_do_install ; WinPcap is really old(?) or installed improperly. @@ -1251,22 +1262,22 @@ lbl_winpcap_installed: ;lbl_winpcap_dont_install: ; The installed version is >= to what we have, so don't install - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0" - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If selected, the currently installed $WINPCAP_NAME will be uninstalled first." + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 7" "State" "0" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "If selected, the currently installed $WINPCAP_NAME will be uninstalled first." Goto lbl_winpcap_done ;lbl_winpcap_dont_upgrade: ; force the user to upgrade by hand - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0" - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Flags" "DISABLED" - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If you wish to install WinPcap ${PCAP_DISPLAY_VERSION}, please uninstall $WINPCAP_NAME manually first." - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 7" "State" "0" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 7" "Flags" "DISABLED" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "If you wish to install WinPcap ${PCAP_DISPLAY_VERSION}, please uninstall $WINPCAP_NAME manually first." + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Flags" "DISABLED" Goto lbl_winpcap_done lbl_winpcap_do_install: ; seems to be an old version, install newer one - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "1" - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "The currently installed $WINPCAP_NAME will be uninstalled first." + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 7" "State" "1" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "The currently installed $WINPCAP_NAME will be uninstalled first." lbl_winpcap_done: @@ -1280,41 +1291,41 @@ lbl_winpcap_done: SetShellVarContext all ;Set State=1 to Desktop icon (no enable by default) - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" "1" -!ifdef QT_DIR WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" "1" +!ifdef QT_DIR + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" "1" !endif IfFileExists "$SMPROGRAMS\${PROGRAM_NAME}\${PROGRAM_NAME}.lnk" lbl_have_gtk_startmenu IfFileExists "$SMPROGRAMS\${PROGRAM_NAME}.lnk" lbl_have_gtk_startmenu IfFileExists "$SMPROGRAMS\${PROGRAM_NAME_GTK}.lnk" lbl_have_gtk_startmenu - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" "0" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" "0" lbl_have_gtk_startmenu: ; only select Desktop Icon, if previously installed IfFileExists "$DESKTOP\${PROGRAM_NAME}.lnk" lbl_have_gtk_desktopicon IfFileExists "$DESKTOP\${PROGRAM_NAME_GTK}.lnk" lbl_have_gtk_desktopicon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" "0" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" "0" lbl_have_gtk_desktopicon: ; only select Quick Launch Icon, if previously installed IfFileExists "$QUICKLAUNCH\${PROGRAM_NAME}.lnk" lbl_have_gtk_quicklaunchicon IfFileExists "$QUICKLAUNCH\${PROGRAM_NAME_GTK}.lnk" lbl_have_gtk_quicklaunchicon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" "0" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" "0" lbl_have_gtk_quicklaunchicon: !ifdef QT_DIR IfFileExists "$SMPROGRAMS\${PROGRAM_NAME_QT}.lnk" lbl_have_qt_startmenu - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 5" "State" "0" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 2" "State" "0" lbl_have_qt_startmenu: ; only select Desktop Icon, if previously installed IfFileExists "$DESKTOP\${PROGRAM_NAME_QT}.lnk" lbl_have_qt_desktopicon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 6" "State" "0" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" "0" lbl_have_qt_desktopicon: ; only select Quick Launch Icon, if previously installed IfFileExists "$QUICKLAUNCH\${PROGRAM_NAME_QT}.lnk" lbl_have_qt_quicklaunchicon - WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 7" "State" "0" + WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" "0" lbl_have_qt_quicklaunchicon: !endif