diff options
52 files changed, 171 insertions, 241 deletions
@@ -4,7 +4,7 @@ directly from Git, as files such as the configuration script are not checked into Git, but need to be generated from the autoconf and automake files. -See http://wiki.wireshark.org/Development if you would like to build the +See https://wiki.wireshark.org/Development if you would like to build the source code checked out directly from Git. Installation diff --git a/Makefile.nmake b/Makefile.nmake index 73147a0d39..f961e76b76 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -258,7 +258,7 @@ packaging_zip: all # Note: Certain .sbr files cause bscmake warning "too many references... ignoring ..." # XXX: It seems that using .bsc files with VS2010 doesn't work (isn't supported ?) # Using .bsc files with VS2008 may work -# See: http://ask.wireshark.org/questions/8660/wireshark-building-and-debugging-on-visual-c-or-visual-studio +# See: https://ask.wireshark.org/questions/8660/wireshark-building-and-debugging-on-visual-c-or-visual-studio wireshark.bsc: \ *.sbr \ capchild\*.sbr \ diff --git a/README.windows b/README.windows index 10744f896e..3475795d28 100644 --- a/README.windows +++ b/README.windows @@ -1,12 +1,8 @@ Installing Wireshark on Windows ============================= -To install Wireshark, just download the appropriate installer program from +To install Wireshark, simply download the appropriate installer program from -http://www.wireshark.org/download/win32 - -or - -http://www.wireshark.org/download/win64 +https://www.wireshark.org/download.html and start it. Just keep the default settings and start Wireshark after the installation finished (e.g. using the start menu entry). @@ -14,7 +10,7 @@ installation finished (e.g. using the start menu entry). For detailed descriptions on how to install and use Wireshark and the related command line tools, see the Wireshark User's Guide at: -http://www.wireshark.org/docs/ +https://www.wireshark.org/docs/ Compiling the Wireshark distribution from source @@ -23,4 +19,4 @@ In case you want to develop Wireshark code yourself, you can find a comprehensive guide how to do this in the Developer's Guide, which you can find (and much more info) at: -http://wiki.wireshark.org/Development +https://wiki.wireshark.org/Development diff --git a/asn1/atn-ulcs/atn-ulcs.asn b/asn1/atn-ulcs/atn-ulcs.asn index d7d18d08ba..92a3a1a7e8 100644 --- a/asn1/atn-ulcs/atn-ulcs.asn +++ b/asn1/atn-ulcs/atn-ulcs.asn @@ -279,7 +279,7 @@ Application-context-name ::= OBJECT IDENTIFIER -- Application-entity title productions follow (not in alphabetical order) -- *************************************************************************** -- MG: asn2wrs cannot handle untagged CHOICEs within either a SET or a SEQUENCE. --- http://wiki.wireshark.org/Asn2wrs_Handmassaging_the_ASN_file +-- https://wiki.wireshark.org/Asn2wrs_Handmassaging_the_ASN_file AP-title ::= CHOICE { -- ATN: See encoding guidance in 2.5.11 -- "form2" is encoded as 0 and "form1" as 1 ap-title-form2 [0] IMPLICIT AP-title-form2, -- Object Identifier form diff --git a/caputils/airpcap.h b/caputils/airpcap.h index e7b65fe698..538d825667 100644 --- a/caputils/airpcap.h +++ b/caputils/airpcap.h @@ -730,13 +730,13 @@ gboolean AirpcapStoreCurConfigAsAdapterDefault(PAirpcapHandle AdapterHandle); \brief Set the BPF kernel filter for an adapter \param AdapterHandle Handle to the adapter. \param Instructions pointer to the first BPF instruction in the array. Corresponds to the bf_insns - in a bpf_program structure (see the WinPcap documentation at http://www.winpcap.org/devel.htm). + in a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm). \param Len Number of instructions in the array pointed by the previous field. Corresponds to the bf_len in - a a bpf_program structure (see the WinPcap documentation at http://www.winpcap.org/devel.htm). + a a bpf_program structure (see the WinPcap documentation at https://www.winpcap.org/devel.htm). \return TRUE on success. The AirPcap driver is able to perform kernel-level filtering using the standard BPF pseudo-machine format. You can read - the WinPcap documentation at http://www.winpcap.org/devel.htm for more details on the BPF filtering mechanism. + the WinPcap documentation at https://www.winpcap.org/devel.htm for more details on the BPF filtering mechanism. A filter can be automatically created by using the pcap_compile() function of the WinPcap API. This function converts a human readable text expression with the tcpdump/libpcap syntax into a BPF program. diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 6e60dfa48d..3342276569 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -231,7 +231,7 @@ load_wpcap(void) /* * The official list of WinPcap mirrors is at - * http://www.winpcap.org/misc/mirrors.htm + * https://www.winpcap.org/misc/mirrors.htm */ char * cant_load_winpcap_err(const char *app_name) @@ -242,15 +242,7 @@ cant_load_winpcap_err(const char *app_name) "\n" "In order to capture packets, WinPcap must be installed; see\n" "\n" -" http://www.winpcap.org/\n" -"\n" -"or the mirror at\n" -"\n" -" http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n" -"\n" -"or the mirror at\n" -"\n" -" http://winpcap.cs.pu.edu.tw/\n" +" https://www.winpcap.org/\n" "\n" "for a downloadable version of WinPcap and for instructions on how to install\n" "WinPcap.", @@ -741,7 +733,7 @@ get_interface_list(int *err, char **err_str) * PacketGetAdapterNames. According to the documentation * I could find: * - * http://www.winpcap.org/docs/man/html/Packet32_8c.html#a43 + * https://www.winpcap.org/docs/man/html/Packet32_8c.html#a43 * * this means that: * @@ -990,7 +982,7 @@ get_runtime_caplibs_version(GString *str _U_) #endif /* HAVE_LIBPCAP */ /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local variables: * c-basic-offset: 8 diff --git a/config.nmake b/config.nmake index 3dcae8fd59..e82a862112 100644 --- a/config.nmake +++ b/config.nmake @@ -148,7 +148,7 @@ MSVC_VARIANT=MSVC2013 ## when vcvarsall.bat is called to set up the build environment. ## [*]One possibility: download the Windows 7 Platform SDK and copy ## win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include -## See: http://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012 +## See: https://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012 ## 2. Dec 28,2012: "VS2012 Update 1" is required to use VS 2012 to build an .exe which ## will run on Windows XP (as well as on later versions of Windows). ## ToDo: It appears that some special setup is required to to do this. @@ -175,7 +175,7 @@ MSVC_VARIANT=MSVC2013 ## when vcvarsall.bat is called to set up the build environment. ## [*]One possibility: download the Windows 7 Platform SDK and copy ## win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include -## See: http://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012 +## See: https://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012 #MSVC_VARIANT=MSVC2013EE # The default if we haven't set a system environment variable or diff --git a/debian/README.Debian b/debian/README.Debian index d4548497c9..fd1b585b9c 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -66,10 +66,10 @@ II. Installing SNMP MIBs from RFC authors [5]. - [1] http://wiki.wireshark.org/Development/PrivilegeSeparation - [2] http://wiki.wireshark.org/CaptureSetup/CapturePrivileges + [1] https://wiki.wireshark.org/Development/PrivilegeSeparation + [2] https://wiki.wireshark.org/CaptureSetup/CapturePrivileges [3] https://blog.wireshark.org/2010/02/running-wireshark-as-you - [4] http://wiki.wireshark.org/SNMP - [5] http://wiki.debian.org/NonFreeIETFDocuments - [6] http://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free - [7] http://www.debian.org/doc/debian-policy/ch-archive.html#s-main + [4] https://wiki.wireshark.org/SNMP + [5] https://wiki.debian.org/NonFreeIETFDocuments + [6] https://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free + [7] https://www.debian.org/doc/debian-policy/ch-archive.html#s-main diff --git a/debian/patches/05_note-README-when-running-as-root.patch b/debian/patches/05_note-README-when-running-as-root.patch index 7c3c63f97b..68872b317f 100644 --- a/debian/patches/05_note-README-when-running-as-root.patch +++ b/debian/patches/05_note-README-when-running-as-root.patch @@ -8,7 +8,7 @@ Author: Balint Reczey <balint@balintreczey.hu> "This could be dangerous.\n\n" "If you're running Wireshark this way in order to perform live capture, " "you may want to be aware that there is a better way documented at\n" -- "http://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group); +- "https://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group); + "/usr/share/doc/wireshark-common/README.Debian", cur_user, cur_group); g_free(cur_user); g_free(cur_group); diff --git a/doc/README.dissector b/doc/README.dissector index 8eefc8b06f..abe33c0e7d 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -2148,7 +2148,7 @@ to the DISSECTOR_SRC section of epan/CMakeLists.txt - TEST YOUR DISSECTOR BEFORE SUBMITTING IT. Use fuzz-test.sh and/or randpkt against your dissector. These are - described at <http://wiki.wireshark.org/FuzzTesting>. + described at <https://wiki.wireshark.org/FuzzTesting>. - Subscribe to <mailto:wireshark-dev[AT]wireshark.org> by sending an email to <mailto:wireshark-dev-request[AT]wireshark.org?body="help"> or visiting @@ -2166,13 +2166,13 @@ to the DISSECTOR_SRC section of epan/CMakeLists.txt you previously ran 'git config --add remote.origin.push HEAD:refs/for/master' then only 'git push' is needed.) - - Create a Wiki page on the protocol at <http://wiki.wireshark.org>. + - Create a Wiki page on the protocol at <https://wiki.wireshark.org>. A template is provided so it is easy to setup in a consistent style. - See: <http://wiki.wireshark.org/HowToEdit> - and <http://wiki.wireshark.org/ProtocolReference> + See: <https://wiki.wireshark.org/HowToEdit> + and <https://wiki.wireshark.org/ProtocolReference> - If possible, add sample capture files to the sample captures page at - <http://wiki.wireshark.org/SampleCaptures>. These files are used by + <https://wiki.wireshark.org/SampleCaptures>. These files are used by the automated build system for fuzz testing. - If you don't think the wiki is the right place for your sample capture, diff --git a/doc/dumpcap.pod b/doc/dumpcap.pod index cabbdbbe4a..8ed270f901 100644 --- a/doc/dumpcap.pod +++ b/doc/dumpcap.pod @@ -350,7 +350,7 @@ output file. =head1 CAPTURE FILTER SYNTAX See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8), -or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>. +or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>. =head1 SEE ALSO diff --git a/doc/tshark.pod b/doc/tshark.pod index 9bd161562f..f93e8b4576 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -1529,7 +1529,7 @@ created. Only one capture comment may be set per output file. =head1 CAPTURE FILTER SYNTAX See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8), -or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>. +or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>. =head1 READ FILTER SYNTAX diff --git a/doc/wireshark-filter.pod b/doc/wireshark-filter.pod index 536bc3bcf1..94a47e9b20 100644 --- a/doc/wireshark-filter.pod +++ b/doc/wireshark-filter.pod @@ -400,7 +400,7 @@ C<tshark -G fields> on the command line =item * -The Wireshark wiki: L<http://wiki.wireshark.org/DisplayFilters> +The Wireshark wiki: L<https://wiki.wireshark.org/DisplayFilters> =back @@ -415,7 +415,7 @@ See L<http://developer.gnome.org/glib/2.32/glib-regex-syntax.html/> or L<http:// This manpage does not describe the capture filter syntax, which is different. See the manual page of pcap-filter(7) or, if that doesn't exist, -tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters> +tcpdump(8), or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters> for a description of capture filters. =head1 SEE ALSO diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template index 9e0cc3988a..b3a6fc6817 100644 --- a/doc/wireshark.pod.template +++ b/doc/wireshark.pod.template @@ -2477,7 +2477,7 @@ protocols built into Wireshark are. =head1 CAPTURE FILTER SYNTAX See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8), -or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>. +or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>. =head1 DISPLAY FILTER SYNTAX diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 117c54aa9d..340b1b53bf 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -22,17 +22,17 @@ wireshark-git-http-url:\[\]=https://your.username@code.wireshark.org/review/wire wireshark-git-ssh-url:\[\]=ssh://your.username@code.wireshark.org:29418/wireshark wireshark-buildbot-url:\[\]=http://buildbot.wireshark.org/trunk/waterfall wireshark-mailing-lists-url:\[\]=https://www.wireshark.org/lists/ -wireshark-qa-url:\[\]=http://ask.wireshark.org/ +wireshark-qa-url:\[\]=https://ask.wireshark.org/ wireshark-users-guide-url:\[\]=https://www.wireshark.org/docs/ wireshark-web-site:\[\]=https://www.wireshark.org/ -wireshark-wiki-site:\[\]=http://wiki.wireshark.org/ +wireshark-wiki-site:\[\]=https://wiki.wireshark.org/ tcpdump-web-site:\[\]=http://www.tcpdump.org/ tcpdump-man-page-url:\[\]=http://www.tcpdump.org/manpages/tcpdump.1.html pcap-filter-man-page-url:\[\]=http://www.tcpdump.org/manpages/pcap-filter.7.html -winpcap-web-site:\[\]=http://www.winpcap.org/ -winpcap-download-page:\[\]=http://www.winpcap.org/install/ +winpcap-web-site:\[\]=https://www.winpcap.org/ +winpcap-download-page:\[\]=https://www.winpcap.org/install/ wikipedia-web-site:\[\]=https://en.wikipedia.org/wiki/ sysfs-web-site:\[\]=http://linux-diag.sourceforge.net/Sysfsutils.html @@ -49,7 +49,7 @@ wsug-author-email2:\[\]=rsharpe[AT]ns.aus.com wsug-author-email3:\[\]=hagbard[AT]physics.rutgers.edu wsug-author-email4:\[\]=luis[AT]ontanon.org -gpl-url:\[\]=http://www.gnu.org/licenses/gpl-2.0.html +gpl-url:\[\]=https://www.gnu.org/licenses/gpl-2.0.html [macros] diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 89c3ac9720..ea12877b57 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -227,7 +227,7 @@ Wireshark should let you work with multiple capture files. (ws-buglink:10488[]) == Getting Help -Community support is available on http://ask.wireshark.org/[Wireshark's +Community support is available on https://ask.wireshark.org/[Wireshark's Q&A site] and on the wireshark-users mailing list. Subscription information and archives for all of Wireshark's mailing lists can be found on https://www.wireshark.org/lists/[the web site]. diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc index 655b76d7f1..78130d229f 100644 --- a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc @@ -24,8 +24,8 @@ build Wireshark. .Our libraries are freely available ==== All libraries required to build Wireshark on Windows are available for download at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and -http://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and +https://anonsvn.wireshark.org/wireshark-win64-libs/trunk/packages/[]. See <<ChLibsSetup>> for an easier way to install them. ==== @@ -106,7 +106,7 @@ as described in <<ChToolsWin32Verify>>. Then it will download the zipped libraries (together around 45MB for x86 and 52MB for x64) from the server location at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] into the +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] into the directory specified by WIRESHARK_LIB_DIR and install (unzip) all required library files there. @@ -207,7 +207,7 @@ http://www.ibr.cs.tu-bs.de/projects/libsmi/[]. Wireshark uses the source libSMI distribution at http://www.ibr.cs.tu-bs.de/projects/libsmi/[]. LibSMI is cross-compiled using MinGW32. It's stored in the libsmi zip archive at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsCares]] @@ -256,7 +256,7 @@ http://www.zlib.net/[]. ==== Win32 MSVC The zlib sources are downloaded from -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled locally. [[ChLibsPcap]] @@ -278,7 +278,7 @@ platform, you can get it at http://www.tcpdump.org/[]. ==== Win32 MSVC: WinPcap You can get the "Windows packet capture library" at: -http://www.winpcap.org/install/[] +https://www.winpcap.org/install/[] [[ChLibsGNUTLS]] @@ -293,14 +293,14 @@ protocols (aka: HTTPS). If this library isn't already installed or available as a package for your platform, you can get it at -http://www.gnu.org/software/gnutls/download.html[]. +https://www.gnu.org/software/gnutls/download.html[]. [[ChLibsWin32GNUTLS]] ==== Win32 MSVC We provide a package cross-compiled using MinGW32 at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsGcrypt]] @@ -315,7 +315,7 @@ support for many ciphers, such as DES, 3DES, AES, Blowfish, and others.. If this library isn't already installed or available as a package for your platform, you can get it at -http://directory.fsf.org/security/libgcrypt.html[]. +https://directory.fsf.org/wiki/Libgcrypt[]. [[ChLibsWin32Gcrypt]] @@ -343,7 +343,7 @@ http://web.mit.edu/Kerberos/dist/[]. ==== Win32 MSVC We provide a package at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsLua]] @@ -364,7 +364,7 @@ http://www.lua.org/download.html[]. ==== Win32 MSVC We provide a copy of the official package at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. [[ChLibsPortAudio]] @@ -385,7 +385,7 @@ http://www.portaudio.com/download.html[]. ==== Win32 MSVC The PortAudio sources are downloaded from -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled locally. [[ChLibsGeoIP]] @@ -408,7 +408,7 @@ http://www.maxmind.com/app/c[]. ==== Win32 MSVC We provide a package cross-compiled using MinGW32 at -http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. +https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[]. ++++++++++++++++++++++++++++++++++++++ <!-- End of WSDG Chapter Libraries --> diff --git a/docbook/wsug_src/WSUG_app_files.asciidoc b/docbook/wsug_src/WSUG_app_files.asciidoc index 3d85e418e1..8ad5812ec4 100644 --- a/docbook/wsug_src/WSUG_app_files.asciidoc +++ b/docbook/wsug_src/WSUG_app_files.asciidoc @@ -16,12 +16,12 @@ are saved to a capture file, it's helpful to know a bit about the capture file contents. Wireshark uses the -link:http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html[pcapng] file +link:https://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html[pcapng] file format as the default format to save captured packets. It is very flexible but other tools may not support it. Wireshark also supports the -link:http://wiki.wireshark.org/Development/LibpcapFileFormat[libpcap] file +link:https://wiki.wireshark.org/Development/LibpcapFileFormat[libpcap] file format. This is a much simpler format and is well established. However, it has some drawbacks: it's not extensible and lacks some information that would be really helpful (e.g. being able to add a comment to a packet such as ``the @@ -51,7 +51,7 @@ The following data is saved for each packet: * The packet's raw bytes A detailed description of the libpcap file format can be found at: -link:$$http://wiki.wireshark.org/Development/LibpcapFileFormat$$[] +link:$$https://wiki.wireshark.org/Development/LibpcapFileFormat$$[] [[ChIOFileNotContentSection]] @@ -407,7 +407,7 @@ contains the following: [database] source=Wikipedia version=1 -url_template=http://${language}.wikipedia.org/wiki/${PATH} +url_template=https://${language}.wikipedia.org/wiki/${PATH} # Substitution data for the location template. # Each occurrence of the keys below in the location template will be @@ -446,7 +446,7 @@ configuration: [database] source=Wikipedia version=1 -location=http://en.wikipedia.org/wiki/ +location=https://en.wikipedia.org/wiki/ [map] tcp=TCP @@ -541,4 +541,4 @@ _C:\TEMP_ ++++++++++++++++++++++++++++++++++++++ <!-- End of WSUG Appendix Files --> -++++++++++++++++++++++++++++++++++++++
\ No newline at end of file +++++++++++++++++++++++++++++++++++++++ @@ -348,7 +348,7 @@ typedef struct _pcap_queue_element { */ static const char please_report[] = "Please report this to the Wireshark developers.\n" - "http://bugs.wireshark.org/\n" + "https://bugs.wireshark.org/\n" "(This is not a crash; please do not report it as such.)"; /* @@ -777,15 +777,7 @@ get_capture_device_open_failure_messages(const char *open_err_str, "\n" "In order to capture packets, WinPcap must be installed; see\n" "\n" - " http://www.winpcap.org/\n" - "\n" - "or the mirror at\n" - "\n" - " http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n" - "\n" - "or the mirror at\n" - "\n" - " http://winpcap.cs.pu.edu.tw/\n" + " https://www.winpcap.org/\n" "\n" "for a downloadable version of WinPcap and for instructions on how to install\n" "WinPcap."); @@ -797,8 +789,8 @@ get_capture_device_open_failure_messages(const char *open_err_str, "\n" "Help can be found at:\n" "\n" - " http://wiki.wireshark.org/WinPcap\n" - " http://wiki.wireshark.org/CaptureSetup\n", + " https://wiki.wireshark.org/WinPcap\n" + " https://wiki.wireshark.org/CaptureSetup\n", iface); } #else @@ -1277,11 +1269,11 @@ get_if_capabilities(const char *devicename, gboolean monitor_mode * * See the mail threads starting at * - * http://www.winpcap.org/pipermail/winpcap-users/2006-September/001421.html + * https://www.winpcap.org/pipermail/winpcap-users/2006-September/001421.html * * and * - * http://www.winpcap.org/pipermail/winpcap-users/2008-May/002498.html + * https://www.winpcap.org/pipermail/winpcap-users/2008-May/002498.html */ #ifndef _WIN32 #define xx_free free /* hack so checkAPIs doesn't complain */ @@ -3163,7 +3155,7 @@ capture_loop_dispatch(loop_data *ld, /* * WinPcap's remote capturing feature doesn't work with pcap_dispatch(), - * see http://wiki.wireshark.org/CaptureSetup_2fWinPcapRemote + * see https://wiki.wireshark.org/CaptureSetup_2fWinPcapRemote * This should be fixed in the WinPcap 4.0 alpha release. * * For reference, an example remote interface: @@ -4527,7 +4519,7 @@ DIAG_ON(cast-qual) /* This behaviour will apparently be changed in the kernel */ /* to allow the kill (signal) in this case. */ /* See the following for details: */ - /* http://www.mail-archive.com/ [wrapped] */ + /* https://www.mail-archive.com/ [wrapped] */ /* linux-security-module@vger.kernel.org/msg02913.html */ /* */ /* It is therefore conceivable that if dumpcap somehow hangs */ @@ -4575,7 +4567,7 @@ DIAG_ON(cast-qual) case 'h': /* Print help and exit */ printf("Dumpcap (Wireshark) %s\n" "Capture network packets and dump them into a pcapng or pcap file.\n" - "See http://www.wireshark.org for more information.\n", + "See https://www.wireshark.org for more information.\n", get_ws_vcs_version_info()); print_usage(stdout); exit_main(0); @@ -5208,7 +5200,7 @@ signal_pipe_check_running(void) /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local variables: * c-basic-offset: 4 diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 0105f073a3..304ae9b4c4 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -23,7 +23,7 @@ /* This dissector supports DVB-CI as defined in EN50221 and * CI+ (www.ci-plus.com). - * For more details, see http://wiki.wireshark.org/DVB-CI. + * For more details, see https://wiki.wireshark.org/DVB-CI. * * The pcap input format for this dissector is documented at * http://www.kaiser.cx/pcap-dvbci.html. diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index 4c1bb62efc..59c7b7c0d9 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -122,7 +122,7 @@ static gint ett_prism_did = -1; * I'm not sure where these DID values come from, but they work with * at least one capture file. However, in * - * http://ask.wireshark.org/questions/14963/how-to-get-the-field-did-unknown-4041-into-the-column + * https://ask.wireshark.org/questions/14963/how-to-get-the-field-did-unknown-4041-into-the-column * * somebody reports a capture where *different* DID values, corresponding * to diff --git a/epan/dissectors/packet-mac-lte.h b/epan/dissectors/packet-mac-lte.h index b8f3bad590..e7050cf10c 100644 --- a/epan/dissectors/packet-mac-lte.h +++ b/epan/dissectors/packet-mac-lte.h @@ -225,7 +225,7 @@ int is_mac_lte_frame_retx(packet_info *pinfo, guint8 direction); /* and implemented by this dissector, using the definitions */ /* below. A link to an example program showing you how to encode */ /* these headers and send LTE MAC PDUs on a UDP socket is */ -/* provided at http://wiki.wireshark.org/MAC-LTE */ +/* provided at https://wiki.wireshark.org/MAC-LTE */ /* */ /* A heuristic dissecter (enabled by a preference) will */ /* recognise a signature at the beginning of these frames. */ diff --git a/epan/dissectors/packet-pdcp-lte.h b/epan/dissectors/packet-pdcp-lte.h index ff2ff56695..f717960ff0 100644 --- a/epan/dissectors/packet-pdcp-lte.h +++ b/epan/dissectors/packet-pdcp-lte.h @@ -100,7 +100,7 @@ typedef struct pdcp_lte_info /* and implemented by this dissector, using the definitions */ /* below. A link to an example program showing you how to encode */ /* these headers and send LTE PDCP PDUs on a UDP socket is */ -/* provided at http://wiki.wireshark.org/PDCP-LTE */ +/* provided at https://wiki.wireshark.org/PDCP-LTE */ /* */ /* A heuristic dissecter (enabled by a preference) will */ /* recognise a signature at the beginning of these frames. */ diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index d35dd4abb8..2ad2ba84ad 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -5029,7 +5029,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * matching first before calling dissect_ppp_raw_hdlc(). Otherwise, if we call * it directly for USB captures, some captures like the following will not be * dissected correctly: - * http://wiki.wireshark.org/SampleCaptures#head-886e340c31ca977f321c921f81cbec4c21bb7738 + * https://wiki.wireshark.org/SampleCaptures#head-886e340c31ca977f321c921f81cbec4c21bb7738 * * NOTE: I don't know if these heuristics are sufficient. Time will tell ... */ diff --git a/epan/dissectors/packet-rlc-lte.h b/epan/dissectors/packet-rlc-lte.h index 7b44d3e361..1dd52cf6fa 100644 --- a/epan/dissectors/packet-rlc-lte.h +++ b/epan/dissectors/packet-rlc-lte.h @@ -100,7 +100,7 @@ void set_rlc_lte_drb_li_field(packet_info *pinfo, guint16 ueid, guint8 drbid, gb /* and implemented by this dissector, using the definitions */ /* below. A link to an example program showing you how to encode */ /* these headers and send LTE RLC PDUs on a UDP socket is */ -/* provided at http://wiki.wireshark.org/RLC-LTE */ +/* provided at https://wiki.wireshark.org/RLC-LTE */ /* */ /* A heuristic dissecter (enabled by a preference) will */ /* recognise a signature at the beginning of these frames. */ diff --git a/epan/dissectors/packet-rlc.h b/epan/dissectors/packet-rlc.h index ce2a4b1474..f58c1ae52a 100644 --- a/epan/dissectors/packet-rlc.h +++ b/epan/dissectors/packet-rlc.h @@ -65,7 +65,7 @@ gboolean rlc_is_ciphered(packet_info * pinfo); /* and implemented by this dissector, using the definitions */ /* below. A link to an example program showing you how to encode */ /* these headers and send RLC PDUs on a UDP socket is provided */ -/* at http://wiki.wireshark.org/RLC */ +/* at https://wiki.wireshark.org/RLC */ /* */ /* A heuristic dissecter (enabled by a preference) will */ /* recognise a signature at the beginning of these frames. */ diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index 02d6aa0370..ccc7df55a8 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -25,7 +25,7 @@ /* * Documentation that formed the basis of the packet decoding: * https://github.com/matthiasbock/OpenSkype/wiki/Skype's-UDP-Format - * For additional information see: http://wiki.wireshark.org/Skype + * For additional information see: https://wiki.wireshark.org/Skype * * TODO: * - Authentication diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index a77d217a23..b9294e278e 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -4,8 +4,8 @@ * * For documentation of this protocol, see: * - * http://wiki.wireshark.org/SMB2 - * http://msdn.microsoft.com/en-us/library/cc246482(PROT.10).aspx + * https://wiki.wireshark.org/SMB2 + * https://msdn.microsoft.com/en-us/library/cc246482.aspx * * If you edit this file, keep the wiki updated as well. * diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c index e249a482d8..51f7e84bc2 100644 --- a/epan/dissectors/packet-sml.c +++ b/epan/dissectors/packet-sml.c @@ -26,7 +26,7 @@ SML dissector is based on v1.03 (12.11.2008) specifications of "smart message la Link to specifications: http://www.vde.com/de/fnn/arbeitsgebiete/messwesen/Sym2/infomaterial/seiten/sml-spezifikation.aspx -Short description of the SML protocol on the SML Wireshark Wiki page: http://wiki.wireshark.org/SML +Short description of the SML protocol on the SML Wireshark Wiki page: https://wiki.wireshark.org/SML */ #include "config.h" diff --git a/epan/expert.h b/epan/expert.h index 6302bfbcf5..bbaa07c715 100644 --- a/epan/expert.h +++ b/epan/expert.h @@ -1,7 +1,7 @@ /* expert.h * Collecting of Expert information. * - * For further info, see: http://wiki.wireshark.org/Development/ExpertInfo + * For further info, see: https://wiki.wireshark.org/Development/ExpertInfo * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -195,7 +195,7 @@ WS_DLL_PUBLIC const value_string expert_checksum_vals[]; #endif /* __EXPERT_H__ */ /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local variables: * c-basic-offset: 8 diff --git a/epan/proto.h b/epan/proto.h index 6b0ec8e262..f0222e01f8 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -738,7 +738,7 @@ typedef proto_node proto_item; /** The protocol field indicates a packet comment */ #define PI_COMMENTS_GROUP 0x0b000000 -/* add more, see http://wiki.wireshark.org/Development/ExpertInfo */ +/* add more, see https://wiki.wireshark.org/Development/ExpertInfo */ /** is this protocol field hidden from the protocol tree display (used for filtering only)? */ diff --git a/epan/wslua/console.lua b/epan/wslua/console.lua index eeaf563c3d..eda8d6b09f 100644 --- a/epan/wslua/console.lua +++ b/epan/wslua/console.lua @@ -104,7 +104,7 @@ if (gui_enabled()) then end function wiki_page() - browser_open_url("http://wiki.wireshark.org/Lua") + browser_open_url("https://wiki.wireshark.org/Lua") end register_menu("Lua/Evaluate", evaluate_lua, MENU_TOOLS_UNSORTED) diff --git a/epan/wslua/template-init.lua b/epan/wslua/template-init.lua index 0939e16fa6..91ed1d5504 100644 --- a/epan/wslua/template-init.lua +++ b/epan/wslua/template-init.lua @@ -37,7 +37,7 @@ run_user_scripts_when_superuser = false -- disable potentialy harmful lua functions when running superuser if running_superuser then - local hint = "has been disabled due to running Wireshark as superuser. See http://wiki.wireshark.org/CaptureSetup/CapturePrivileges for help in running Wireshark as an unprivileged user." + local hint = "has been disabled due to running Wireshark as superuser. See https://wiki.wireshark.org/CaptureSetup/CapturePrivileges for help in running Wireshark as an unprivileged user." local disabled_lib = {} setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } ); diff --git a/epan/wslua/wslua_int64.c b/epan/wslua/wslua_int64.c index a4bea12243..c2e641d7b0 100644 --- a/epan/wslua/wslua_int64.c +++ b/epan/wslua/wslua_int64.c @@ -46,7 +46,7 @@ either expressed or implied, of the FreeBSD Project. it is often set to IEEE 754 double precision floating point, one cannot store a 64 bit integer with full precision. - For details, see [[http://wiki.wireshark.org/LuaAPI/Int64]]. + For details, see [[https://wiki.wireshark.org/LuaAPI/Int64]]. */ #define LUATYPE64_STRING_SIZE 21 /* string to hold 18446744073709551615 */ @@ -56,7 +56,7 @@ WSLUA_CLASS_DEFINE_BASE(Int64,NOP,NOP,0); /* `Int64` represents a 64 bit signed integer. - For details, see [[http://wiki.wireshark.org/LuaAPI/Int64]]. + For details, see [[https://wiki.wireshark.org/LuaAPI/Int64]]. */ /* A checkInt64 but that also auto-converts numbers, strings, and UINT64 to a gint64 */ @@ -607,7 +607,7 @@ LUALIB_API int Int64_register(lua_State* L) { WSLUA_CLASS_DEFINE_BASE(UInt64,NOP,NOP,0); /* `UInt64` represents a 64 bit unsigned integer, similar to `Int64`. - For details, see: [[http://wiki.wireshark.org/LuaAPI/Int64]]. + For details, see: [[https://wiki.wireshark.org/LuaAPI/Int64]]. */ /* A checkUInt64 but that also auto-converts numbers, strings, and `Int64` to a guint64. */ @@ -664,7 +664,7 @@ cf_read(capture_file *cf, gboolean reloading) CATCH(OutOfMemoryError) { simple_message_box(ESD_TYPE_ERROR, NULL, "More information and workarounds can be found at\n" - "http://wiki.wireshark.org/KnownBugs/OutOfMemory", + "https://wiki.wireshark.org/KnownBugs/OutOfMemory", "Sorry, but Wireshark has run out of memory and has to terminate now."); #if 0 /* Could we close the current capture and free up memory from that? */ @@ -837,7 +837,7 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err) CATCH(OutOfMemoryError) { simple_message_box(ESD_TYPE_ERROR, NULL, "More information and workarounds can be found at\n" - "http://wiki.wireshark.org/KnownBugs/OutOfMemory", + "https://wiki.wireshark.org/KnownBugs/OutOfMemory", "Sorry, but Wireshark has run out of memory and has to terminate now."); #if 0 /* Could we close the current capture and free up memory from that? */ diff --git a/help/faq.py b/help/faq.py index c76e3ab81a..8240f33762 100755 --- a/help/faq.py +++ b/help/faq.py @@ -337,7 +337,7 @@ More information on the name change can be found here: question("Where can I get help?") answer(""" Community support is available on the -<a href="http://ask.wireshark.org/">Q&A site</a> and on the +<a href="https://ask.wireshark.org/">Q&A site</a> and on the wireshark-users mailing list. Subscription information and archives for all of Wireshark's mailing lists can be found at %s. An IRC channel dedicated to Wireshark can be found at %s. @@ -514,7 +514,7 @@ libpcap. <br /> -See <a href="http://wiki.wireshark.org/CaptureSetup/NetworkMedia">the list of +See <a href="https://wiki.wireshark.org/CaptureSetup/NetworkMedia">the list of supported capture media on various OSes</a> for details (several items in there say "Unknown", which doesn't mean "Wireshark can't capture on them", it means "we don't know whether it can capture on them"; we @@ -570,43 +570,10 @@ Yes, but if you want to capture packets as a normal user, you must make sure npf.sys is loaded. Wireshark's installer enables this by default. This is not a concern if you run Wireshark as Administrator, but this is discouraged. See the <a -href="http://wiki.wireshark.org/CaptureSetup/CapturePrivileges#windows">CapturePrivileges</a> +href="https://wiki.wireshark.org/CaptureSetup/CapturePrivileges#windows">CapturePrivileges</a> page on the wiki for more details. """) -################################################################# -section("Downloading Wireshark") -################################################################# - - -question("""Why do I get an error when I try to run the Win32 installer?""") - -answer(""" -The program you used to download it may have downloaded it incorrectly. -Web browsers and download accelerators sometimes may do this. - -<br /> - -Try downloading it with, for example: -<ul> -<li>Wget, for which Windows binaries are available from <a -href="http://www.christopherlewis.com/WGet/WGetFiles.htm">Christopher Lewis</a> -or -<a href="http://www.jensroesner.de/wgetgui/">wGetGUI</a>, which offers a GUI -interface that uses wget; - -<li>WS_FTP from <a href="http://www.ipswitch.com/">Ipswitch</a>, - -<li>the <code>ftp</code> command that comes with Windows. - -</ul> - -If you use the <code>ftp</code> command, make sure you do the transfer in -binary mode rather than ASCII mode, by using the <code>binary</code> command -before transferring the file. -""") - - ################################################################# section("Installing Wireshark") @@ -876,8 +843,8 @@ Some switches have the ability to replicate all traffic on all ports to a single port so that you can plug your analyzer into that single port to sniff all traffic. You would have to check the documentation for the switch to see if this is possible and, if so, to see how to do this. -See <a href="http://wiki.wireshark.org/SwitchReference">the switch -reference page</a> on <a href="http://wiki.wireshark.org/">the Wireshark +See <a href="https://wiki.wireshark.org/SwitchReference">the switch +reference page</a> on <a href="https://wiki.wireshark.org/">the Wireshark Wiki</a> for information on some switches. (Note that it's a Wiki, so you can update or fix that information, or add additional information on those switches or information on new switches, yourself.) @@ -941,7 +908,7 @@ network interface. In the case of token ring interfaces, the drivers for some of them, on Windows, may require you to enable promiscuous mode in order to capture in promiscuous mode. See <a -href="http://wiki.wireshark.org/CaptureSetup/TokenRing">the Wireshark +href="https://wiki.wireshark.org/CaptureSetup/TokenRing">the Wireshark Wiki item on Token Ring capturing</a> for details. <br /> @@ -1049,8 +1016,8 @@ be used to capture traffic on, for example, your T1/E1 link. <br /> -See <a href="http://wiki.wireshark.org/CaptureSetup/SS7">the SS7 capture -setup page</a> on <a href="http://wiki.wireshark.org/">the Wireshark +See <a href="https://wiki.wireshark.org/CaptureSetup/SS7">the SS7 capture +setup page</a> on <a href="https://wiki.wireshark.org/">the Wireshark Wiki</a> for current information on capturing SS7 traffic on TDM links. """) @@ -1264,7 +1231,7 @@ In order to see the raw Ethernet packets, rather than "de-VLANized" packets, you would have to capture not on the virtual interface for the VLAN, but on the interface corresponding to the physical network device, if possible. See <a -href="http://wiki.wireshark.org/CaptureSetup/VLAN">the Wireshark Wiki +href="https://wiki.wireshark.org/CaptureSetup/VLAN">the Wireshark Wiki item on VLAN capturing</a> for details. """) @@ -1435,7 +1402,7 @@ On Windows 2000, Windows XP, and Windows Server 2003, but be able to capture on the "GenericDialupAdapter" with WinPcap 3.1. (3.1 beta releases called it the "NdisWanAdapter"; if you're using a 3.1 beta release, you should un-install it and install the final 3.1 release.) -See <a href="http://wiki.wireshark.org/CaptureSetup/PPP">the Wireshark +See <a href="https://wiki.wireshark.org/CaptureSetup/PPP">the Wireshark Wiki item on PPP capturing</a> for details. <br /> @@ -1579,7 +1546,7 @@ On Windows 2000, Windows XP, and Windows Server 2003, but be able to capture on the "GenericDialupAdapter" with WinPcap 3.1. (3.1 beta releases called it the "NdisWanAdapter"; if you're using a 3.1 beta release, you should un-install it and install the final 3.1 release.) -See <a href="http://wiki.wireshark.org/CaptureSetup/PPP">the Wireshark +See <a href="https://wiki.wireshark.org/CaptureSetup/PPP">the Wireshark Wiki item on PPP capturing</a> for details. """) @@ -1607,7 +1574,7 @@ On Windows 2000, Windows XP, and Windows Server 2003, but be able to capture on the "GenericDialupAdapter" with WinPcap 3.1. (3.1 beta releases called it the "NdisWanAdapter"; if you're using a 3.1 beta release, you should un-install it and install the final 3.1 release.) -See <a href="http://wiki.wireshark.org/CaptureSetup/PPP">the Wireshark +See <a href="https://wiki.wireshark.org/CaptureSetup/PPP">the Wireshark Wiki item on PPP capturing</a> for details. """) @@ -1713,7 +1680,7 @@ your account sufficient privileges to capture packets. Only those interfaces that Wireshark can open for capturing show up in that list; if you don't have sufficient privileges to capture on any interfaces, no interfaces will show up in the list. See -<a href="http://wiki.wireshark.org/CaptureSetup/CapturePrivileges">the +<a href="https://wiki.wireshark.org/CaptureSetup/CapturePrivileges">the Wireshark Wiki item on capture privileges</a> for details on how to give a particular account or account group capture privileges on platforms where that can be done. @@ -1724,7 +1691,7 @@ If you are running Wireshark from an account with sufficient privileges, then note that Wireshark relies on the libpcap library, and on the facilities that come with the OS on which it's running in order to do captures. On some OSes, those facilities aren't present by default; see -<a href="http://wiki.wireshark.org/CaptureSetup/CaptureSupport">the +<a href="https://wiki.wireshark.org/CaptureSetup/CaptureSupport">the Wireshark Wiki item on adding capture support</a> for details. <br /> @@ -1900,7 +1867,7 @@ communicate with any DNS or NIS servers. <br /> See <a -href="http://wiki.wireshark.org/CaptureSetup/WLAN">the Wireshark +href="https://wiki.wireshark.org/CaptureSetup/WLAN">the Wireshark Wiki item on 802.11 capturing</a> for details. """) @@ -1970,7 +1937,7 @@ is boring. Where can I find more interesting captures? answer(""" We have a collection of strange and exotic sample capture -files at %s""" % (selflink("http://wiki.wireshark.org/SampleCaptures"))) +files at %s""" % (selflink("https://wiki.wireshark.org/SampleCaptures"))) question(""" @@ -2076,8 +2043,8 @@ How do I filter a capture to see traffic for virus XXX? answer(""" For some viruses/worms there might be a capture filter to recognize the virus traffic. Check the <a -href="http://wiki.wireshark.org/CaptureFilters">CaptureFilters</a> page -on the <a href="http://wiki.wireshark.org/">Wireshark Wiki</a> to see if +href="https://wiki.wireshark.org/CaptureFilters">CaptureFilters</a> page +on the <a href="https://wiki.wireshark.org/">Wireshark Wiki</a> to see if anybody's added such a filter. <br /> diff --git a/macosx-setup.sh b/macosx-setup.sh index 3f8a60204f..6ba73e8d65 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -71,7 +71,7 @@ PKG_CONFIG_VERSION=0.28 # and un-comment the GTK_VERSION=2.* line. # # If you don't want to build with GTK+ at all, comment out both lines. -# +# QT_VERSION=5.2.1 GTK_VERSION=2.24.17 #GTK_VERSION=3.5.2 @@ -108,10 +108,6 @@ LIBSMI_VERSION=0.4.8 LIBGPG_ERROR_VERSION=1.10 # # libgcrypt is required for GnuTLS. -# XXX - the link for "Libgcrypt source code" at -# http://www.gnupg.org/download/#libgcrypt is for 1.5.0, and is a bzip2 -# file, but http://directory.fsf.org/project/libgcrypt/ lists only -# 1.4.6. # LIBGCRYPT_VERSION=1.5.0 GNUTLS_VERSION=2.12.19 @@ -1947,7 +1943,7 @@ CXXFLAGS="-g -O2" # fix that file. # if [[ $DARWIN_MAJOR_VERSION -le 9 ]]; then - echo "This script does not support any versions of OS X before Snow Leopard" 1>&2 + echo "This script does not support any versions of OS X before Snow Leopard" 1>&2 exit 1 fi @@ -2246,7 +2242,7 @@ echo "make install" echo "" echo "Make sure you are allowed capture access to the network devices" -echo "See: http://wiki.wireshark.org/CaptureSetup/CapturePrivileges" +echo "See: https://wiki.wireshark.org/CaptureSetup/CapturePrivileges" echo "" diff --git a/packaging/nsis/WinPcapPage.ini b/packaging/nsis/WinPcapPage.ini index 9ca79db842..7ffc2da937 100644 --- a/packaging/nsis/WinPcapPage.ini +++ b/packaging/nsis/WinPcapPage.ini @@ -49,4 +49,4 @@ Right=100 Top=120 Bottom=135 Text=What is WinPcap? -State=http://wiki.wireshark.org/WinPcap +State=https://wiki.wireshark.org/WinPcap diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index cc9d6972f4..138a67f69a 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -41,7 +41,7 @@ BrandingText "Wireshark Installer (tm)" !define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of ${PROGRAM_NAME}.\r\n\r\nBefore starting the installation, make sure ${PROGRAM_NAME} is not running.\r\n\r\nClick 'Next' to continue." ;!define MUI_FINISHPAGE_LINK "Install WinPcap to be able to capture packets from a network." -;!define MUI_FINISHPAGE_LINK_LOCATION "http://www.winpcap.org" +;!define MUI_FINISHPAGE_LINK_LOCATION "https://www.winpcap.org" ; NSIS shows Readme files by opening the Readme file with the default application for ; the file's extension. "README.win32" won't work in most cases, because extension "win32" @@ -161,7 +161,7 @@ ShowInstDetails show ; ============================================================================ Var EXTENSION -; http://msdn.microsoft.com/en-us/library/windows/desktop/cc144148.aspx +; https://msdn.microsoft.com/en-us/library/windows/desktop/cc144148.aspx Function Associate Push $R0 !insertmacro PushFileExtensions @@ -682,19 +682,19 @@ File "${STAGING_DIR}\help\faq.txt" ; Write the uninstall keys for Windows ; http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs -; http://msdn.microsoft.com/en-us/library/ms954376.aspx -; http://msdn.microsoft.com/en-us/library/windows/desktop/aa372105.aspx +; https://msdn.microsoft.com/en-us/library/ms954376.aspx +; https://msdn.microsoft.com/en-us/library/windows/desktop/aa372105.aspx !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PROGRAM_NAME}" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Comments" "${DISPLAY_NAME}" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${PROGRAM_NAME_PATH_GTK},0" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayName" "${DISPLAY_NAME}" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" -WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "HelpLink" "http://ask.wireshark.org/" +WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "HelpLink" "https://ask.wireshark.org/" WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "InstallLocation" "$INSTDIR" -WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Publisher" "The Wireshark developer community, http://www.wireshark.org" -WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLInfoAbout" "http://www.wireshark.org" -WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLUpdateInfo" "http://www.wireshark.org/download.html" +WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Publisher" "The Wireshark developer community, https://www.wireshark.org" +WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLInfoAbout" "https://www.wireshark.org" +WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "URLUpdateInfo" "https://www.wireshark.org/download.html" WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "NoModify" 1 WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "NoRepair" 1 @@ -720,7 +720,7 @@ SetOutPath $PROFILE ; To quote "http://download.microsoft.com/download/0/4/6/046bbd36-0812-4c22-a870-41911c6487a6/WindowsUserExperience.pdf" ; "Do not include Readme, Help, or Uninstall entries on the Programs menu." Delete "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Web Site.lnk" -;WriteINIStr "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Web Site.url" "InternetShortcut" "URL" "http://www.wireshark.org/" +;WriteINIStr "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Web Site.url" "InternetShortcut" "URL" "https://www.wireshark.org/" CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME_GTK}.lnk" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" "" "$INSTDIR\${PROGRAM_NAME_PATH_GTK}" 0 "" "" "${PROGRAM_FULL_NAME_GTK}" ;CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Manual.lnk" "$INSTDIR\wireshark.html" ;CreateShortCut "$SMPROGRAMS\${PROGRAM_NAME}\Display Filters Manual.lnk" "$INSTDIR\wireshark-filter.html" @@ -1248,7 +1248,7 @@ lbl_wireshark_notinstalled: FunctionEnd ; -; Editor modelines - http://www.wireshark.org/tools/modelines.html +; Editor modelines - https://www.wireshark.org/tools/modelines.html ; ; Local variables: ; c-basic-offset: 4 diff --git a/test/lua/acme_file.lua b/test/lua/acme_file.lua index 999d565ba9..eefa67463b 100644 --- a/test/lua/acme_file.lua +++ b/test/lua/acme_file.lua @@ -31,7 +31,7 @@ To-do: - make it use Struct.tohex/fromhex now that we have the Struct library in Wireshark - - make it use a linux cooked-mode pseudo-header (see http://wiki.wireshark.org/SLL) + - make it use a linux cooked-mode pseudo-header (see https://wiki.wireshark.org/SLL) - make it use preferences, once I write C-code for Wireshark to do that :) - rewrite some of the pattern searches to use real regex/PCRE instead? It's not in Wireshark yet, but it's coming (see https://code.wireshark.org/review/#/c/332/) diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh index bc8eb1c0b7..269567810a 100755 --- a/test/suite-decryption.sh +++ b/test/suite-decryption.sh @@ -58,7 +58,7 @@ TS_DC_ARGS="" DIFF_OUT=./diff-output.txt # WPA PSK -# http://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=wpa-Induction.pcap +# https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=wpa-Induction.pcap decryption_step_80211_wpa_psk() { env $TS_DC_ENV $TSHARK $TS_DC_ARGS \ -o "wlan.enable_decryption: TRUE" \ @@ -75,7 +75,7 @@ decryption_step_80211_wpa_psk() { } # DTLS -# http://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil.tgz +# https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil.tgz decryption_step_dtls() { env $TS_DC_ENV $TSHARK $TS_DC_ARGS \ -Tfields -e data.data \ @@ -90,7 +90,7 @@ decryption_step_dtls() { } # SSL, using the server's private key -# http://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil2_070531.tgz +# https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil2_070531.tgz decryption_step_ssl() { env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri \ -r "$CAPTURE_DIR/rsasnakeoil2.pcap" -Y http \ @@ -247,7 +247,7 @@ decryption_suite() { } # -# Editor modelines - http://www.wireshark.org/tools/modelines.html +# Editor modelines - https://www.wireshark.org/tools/modelines.html # # Local variables: # c-basic-offset: 8 @@ -1158,7 +1158,7 @@ DIAG_ON(cast-qual) case 'h': /* Print help and exit */ printf("TFShark (Wireshark) %s\n" "Dump and analyze network traffic.\n" - "See http://www.wireshark.org for more information.\n", + "See https://www.wireshark.org for more information.\n", get_ws_vcs_version_info()); print_usage(stdout); return 0; @@ -1508,7 +1508,7 @@ DIAG_ON(cast-qual) "Sorry, but TFShark has to terminate now!\n" "\n" "Some infos / workarounds can be found at:\n" - "http://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); + "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); err = ENOMEM; } ENDTRY; @@ -2823,7 +2823,7 @@ failure_message_cont(const char *msg_format, va_list ap) } /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local variables: * c-basic-offset: 2 diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm index 561de37389..bd4c79d3e2 100644 --- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm @@ -1121,7 +1121,7 @@ sub Parse($$$$$) Pidl is a perl based IDL compiler for DCE/RPC idl files. It is maintained by the Samba team, not the Wireshark team. Instructions on how to download and install Pidl can be - found at http://wiki.wireshark.org/Pidl + found at https://wiki.wireshark.org/Pidl */ "; diff --git a/tools/pidl/pidl b/tools/pidl/pidl index 4eec34685d..95626dbf40 100755 --- a/tools/pidl/pidl +++ b/tools/pidl/pidl @@ -381,14 +381,15 @@ usesgetlasterror, vararg, vi_progid, wire_marshal. =head1 SEE ALSO -L<http://msdn.microsoft.com/library/en-us/rpc/rpc/field_attributes.asp>, -L<http://wiki.wireshark.org/DCE/RPC>, -L<http://www.samba.org/>, +# Dead link +# L<http://msdn.microsoft.com/library/en-us/rpc/rpc/field_attributes.asp>, +L<https://wiki.wireshark.org/DCE/RPC>, +L<https://www.samba.org/>, L<yapp(1)> =head1 LICENSE -pidl is licensed under the GNU General Public License L<http://www.gnu.org/licenses/gpl.html>. +pidl is licensed under the GNU General Public License L<https://www.gnu.org/licenses/gpl.html>. =head1 AUTHOR @@ -1473,7 +1473,7 @@ DIAG_ON(cast-qual) case 'h': /* Print help and exit */ printf("TShark (Wireshark) %s\n" "Dump and analyze network traffic.\n" - "See http://www.wireshark.org for more information.\n", + "See https://www.wireshark.org for more information.\n", get_ws_vcs_version_info()); print_usage(stdout); return 0; @@ -2136,7 +2136,7 @@ DIAG_ON(cast-qual) "Sorry, but TShark has to terminate now.\n" "\n" "More information and workarounds can be found at\n" - "http://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); + "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); err = ENOMEM; } ENDTRY; @@ -2566,7 +2566,7 @@ capture(void) "Sorry, but TShark has to terminate now.\n" "\n" "More information and workarounds can be found at\n" - "http://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); + "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n"); exit(1); } ENDTRY; @@ -4381,7 +4381,7 @@ failure_message_cont(const char *msg_format, va_list ap) } /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local variables: * c-basic-offset: 2 diff --git a/ui/capture.c b/ui/capture.c index 1a9543db42..64f28dbf50 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -302,7 +302,7 @@ capture_input_read_all(capture_session *cap_session, gboolean is_tempfile, "\n" "Help about capturing can be found at\n" "\n" -" http://wiki.wireshark.org/CaptureSetup" +" https://wiki.wireshark.org/CaptureSetup" #ifdef _WIN32 "\n\n" "Wireless (Wi-Fi/WLAN):\n" @@ -592,7 +592,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg) "\n" "Help about capturing can be found at\n" "\n" - " http://wiki.wireshark.org/CaptureSetup" + " https://wiki.wireshark.org/CaptureSetup" #ifdef _WIN32 "\n\n" "Wireless (Wi-Fi/WLAN):\n" @@ -799,7 +799,7 @@ capture_stat_stop(if_stat_cache_t *sc) { #endif /* HAVE_LIBPCAP */ /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local Variables: * c-basic-offset: 2 diff --git a/ui/gtk/main.c b/ui/gtk/main.c index a931741104..bf31fec78a 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -391,7 +391,7 @@ static void selected_ptree_info_answered_cb(gpointer dialog _U_, gint btn, gpoin case(ESD_BTN_OK): if (cfile.finfo_selected) { /* open wiki page using the protocol abbreviation */ - selected_proto_url = g_strdup_printf("http://wiki.wireshark.org/Protocols/%s", proto_abbrev); + selected_proto_url = g_strdup_printf("https://wiki.wireshark.org/Protocols/%s", proto_abbrev); browser_open_url(selected_proto_url); g_free(selected_proto_url); } @@ -470,7 +470,7 @@ static void selected_ptree_ref_answered_cb(gpointer dialog _U_, gint btn, gpoint case(ESD_BTN_OK): if (cfile.finfo_selected) { /* open reference page using the protocol abbreviation */ - selected_proto_url = g_strdup_printf("http://www.wireshark.org/docs/dfref/%c/%s", proto_abbrev[0], proto_abbrev); + selected_proto_url = g_strdup_printf("https://www.wireshark.org/docs/dfref/%c/%s", proto_abbrev[0], proto_abbrev); browser_open_url(selected_proto_url); g_free(selected_proto_url); } @@ -1177,7 +1177,7 @@ print_usage(gboolean for_help_option) { output = stdout; fprintf(output, "Wireshark %s\n" "Interactively dump and analyze network traffic.\n" - "See http://www.wireshark.org for more information.\n", + "See https://www.wireshark.org for more information.\n", get_ws_vcs_version_info()); } else { output = stderr; @@ -2106,7 +2106,7 @@ check_and_warn_user_startup(gchar *cf_name _U_) "This could be dangerous.\n\n" "If you're running Wireshark this way in order to perform live capture, " "you may want to be aware that there is a better way documented at\n" - "http://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group); + "https://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group); g_free(cur_user); g_free(cur_group); simple_dialog_check_set(priv_warning_dialog, "Don't show this message again."); diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index cf1eb41746..0ba63b2cc9 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -495,7 +495,7 @@ typedef struct _recent_item_status { /* * Fetch the status of a file. * This function might be called as a thread. We can't use any drawing - * routines here: http://developer.gnome.org/gdk/2.24/gdk-Threads.html + * routines here: https://developer.gnome.org/gdk3/stable/gdk3-Threads.html */ static void * get_recent_item_status(void *data) @@ -1096,25 +1096,9 @@ fill_capture_box(void) "must be installed; see\n" "\n" #if GTK_CHECK_VERSION(2,18,0) - " <a href=\"http://www.winpcap.org/\">http://www.winpcap.org/</a>\n" + " <a href=\"https://www.winpcap.org/\">https://www.winpcap.org/</a>\n" #else - " http://www.winpcap.org/\n" -#endif - "\n" - "or the mirror at\n" - "\n" -#if GTK_CHECK_VERSION(2,18,0) - " <a href=\"http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\">http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/</a>\n" -#else - " http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n" -#endif - "\n" - "or the mirror at\n" - "\n" -#if GTK_CHECK_VERSION(2,18,0) - " <a href=\"http://winpcap.cs.pu.edu.tw/\">http://winpcap.cs.pu.edu.tw/</a>\n" -#else - " http://winpcap.cs.pu.edu.tw/\n" + " https://www.winpcap.org/\n" #endif "\n" "for a downloadable version of WinPcap " @@ -1452,7 +1436,7 @@ get_welcome_window(void) } /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local variables: * c-basic-offset: 4 diff --git a/ui/help_url.c b/ui/help_url.c index 0f9520a1b1..9cf9aa0592 100644 --- a/ui/help_url.c +++ b/ui/help_url.c @@ -73,40 +73,40 @@ topic_online_url(topic_action_e action) { switch(action) { case(ONLINEPAGE_HOME): - return "http://www.wireshark.org"; + return "https://www.wireshark.org"; break; case(ONLINEPAGE_WIKI): - return "http://wiki.wireshark.org"; + return "https://wiki.wireshark.org"; break; case(ONLINEPAGE_DOWNLOAD): - return "http://www.wireshark.org/download.html"; + return "https://www.wireshark.org/download.html"; break; case(ONLINEPAGE_USERGUIDE): - return "http://www.wireshark.org/docs/wsug_html_chunked/"; + return "https://www.wireshark.org/docs/wsug_html_chunked/"; break; case(ONLINEPAGE_FAQ): return "http://www.wireshark.org/faq.html"; break; case(ONLINEPAGE_ASK): - return "http://ask.wireshark.org"; + return "https://ask.wireshark.org"; break; case(ONLINEPAGE_SAMPLE_FILES): - return "http://wiki.wireshark.org/SampleCaptures"; + return "https://wiki.wireshark.org/SampleCaptures"; break; case(ONLINEPAGE_CAPTURE_SETUP): - return "http://wiki.wireshark.org/CaptureSetup"; + return "https://wiki.wireshark.org/CaptureSetup"; break; case(ONLINEPAGE_NETWORK_MEDIA): - return "http://wiki.wireshark.org/CaptureSetup/NetworkMedia"; + return "https://wiki.wireshark.org/CaptureSetup/NetworkMedia"; break; case(ONLINEPAGE_SAMPLE_CAPTURES): - return "http://wiki.wireshark.org/SampleCaptures"; + return "https://wiki.wireshark.org/SampleCaptures"; break; case(ONLINEPAGE_SECURITY): - return "http://wiki.wireshark.org/Security"; + return "https://wiki.wireshark.org/Security"; break; case(ONLINEPAGE_CHIMNEY): - return "http://wiki.wireshark.org/CaptureSetup/Offloading#chimney"; + return "https://wiki.wireshark.org/CaptureSetup/Offloading#chimney"; break; default: return NULL; diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index c59c32e96c..8efaa9330b 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -232,19 +232,19 @@ a:hover { <body> <table><tr> -<th><a href="http://www.wireshark.org/docs/wsug_html_chunked/">User's Guide</a></th> +<th><a href="https://www.wireshark.org/docs/wsug_html_chunked/">User's Guide</a></th> <td style="padding-left: 8px; padding-right: 8px;">·</td> -<th><a href="http://wiki.wireshark.org/">Wiki</a></th> +<th><a href="https://wiki.wireshark.org/">Wiki</a></th> <td style="padding-left: 8px; padding-right: 8px;">·</td> -<th><a href="http://ask.wireshark.org/">Questions and Answers</a></th> +<th><a href="https://ask.wireshark.org/">Questions and Answers</a></th> <td style="padding-left: 8px; padding-right: 8px;">·</td> -<th><a href="http://www.wireshark.org/lists/">Mailing Lists</a></th> +<th><a href="https://www.wireshark.org/lists/">Mailing Lists</a></th> </tr></table> </body></html></string> diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 32c2f0c954..9ecb7b73e1 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -382,7 +382,7 @@ check_and_warn_user_startup(const QString &cf_name) "This could be dangerous.\n\n" "If you're running Wireshark this way in order to perform live capture, " "you may want to be aware that there is a better way documented at\n" - "http://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group); + "https://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group); g_free(cur_user); g_free(cur_group); } diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index fe2b980bb6..e47244b042 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -22,9 +22,11 @@ */ /* File format reference: - * http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html + * https://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html + * File format specification: + * https://github.com/pcapng/pcapng * Related Wiki page: - * http://wiki.wireshark.org/Development/PcapNg + * https://wiki.wireshark.org/Development/PcapNg */ #include "config.h" @@ -3838,7 +3840,7 @@ int pcapng_dump_can_write_encap(int wtap_encap) } /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local variables: * c-basic-offset: 4 |