From c65f0a5a155d0eca8221bb5c745c5c8f70d1605d Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 6 Jan 2022 16:10:32 -0800 Subject: [PATCH] Update our Npcap URLs. The official Npcap web site is now https://npcap.com/. Update our URLs to match. Fixes #17838. --- capture/capture-wpcap.c | 11 ++--------- docbook/attributes.adoc | 2 +- docbook/faq.adoc | 32 ++++++++++++++++---------------- dumpcap.c | 2 +- packaging/nsis/wireshark.nsi | 2 +- ui/qt/interface_frame.cpp | 3 +-- 6 files changed, 22 insertions(+), 30 deletions(-) diff --git a/capture/capture-wpcap.c b/capture/capture-wpcap.c index 84711faa4e..e8d666cbca 100644 --- a/capture/capture-wpcap.c +++ b/capture/capture-wpcap.c @@ -44,11 +44,6 @@ gboolean has_wpcap = FALSE; #define MAX_WIN_IF_NAME_LEN 511 -/* - * XXX - should we require at least WinPcap 3.1 both for building an - * for using Wireshark? - */ - static void (*p_pcap_close) (pcap_t *); static int (*p_pcap_stats) (pcap_t *, struct pcap_stat *); static int (*p_pcap_dispatch) (pcap_t *, int, pcap_handler, guchar *); @@ -276,7 +271,7 @@ cant_load_winpcap_err(const char *app_name) "\n" "In order to capture packets Npcap or WinPcap must be installed. See\n" "\n" -" https://nmap.org/npcap/\n" +" https://npcap.com/\n" "\n" "for a downloadable version of Npcap and for instructions on how to\n" "install it.", @@ -710,8 +705,6 @@ int pcap_setbuff(pcap_t *a, int b) return p_pcap_setbuff(a, b); } -/* pcap_next_ex is available since libpcap 0.8 / WinPcap 3.0! */ -/* (if you get a declaration warning here, try to update to at least WinPcap 3.1b4 develpack) */ int pcap_next_ex(pcap_t *a, struct pcap_pkthdr **b, const u_char **c) { ws_assert(has_wpcap); @@ -773,7 +766,7 @@ cant_get_if_list_error_message(const char *err_str) strstr(err_str, "The operation completed successfully") != NULL) { return ws_strdup_printf("Can't get list of interfaces: %s\n" "This might be a problem with WinPcap 3.0. You should try updating to\n" -"Npcap. See https://nmap.org/npcap/ for more information.", +"Npcap. See https://npcap.com/ for more information.", err_str); } return ws_strdup_printf("Can't get list of interfaces: %s", err_str); diff --git a/docbook/attributes.adoc b/docbook/attributes.adoc index 8e95a1200f..04439fcea6 100644 --- a/docbook/attributes.adoc +++ b/docbook/attributes.adoc @@ -45,7 +45,7 @@ :pcap-filter-man-page-url: {tcpdump-main-url}manpages/pcap-filter.7.html :tcpdump-man-page-url: {tcpdump-main-url}manpages/tcpdump.1.html -:npcap-main-url: https://nmap.org/npcap/ +:npcap-main-url: https://npcap.com/ :npcap-development-url: https://github.com/nmap/npcap :npcap-license-url: https://raw.githubusercontent.com/nmap/npcap/master/LICENSE :vcpkg-main-url: https://github.com/Microsoft/vcpkg/ diff --git a/docbook/faq.adoc b/docbook/faq.adoc index c22f5003f6..e361797c68 100644 --- a/docbook/faq.adoc +++ b/docbook/faq.adoc @@ -1,9 +1,11 @@ -= Wireshark Frequently Asked Questions +include::attributes.adoc[] :stylesheet: ws.css :linkcss: :copycss: {stylesheet} :toc: += Wireshark Frequently Asked Questions + == General Questions === What is Wireshark? @@ -286,8 +288,7 @@ driver; so: -* if you are using Windows, see https://nmap.org/npcap/[the Npcap -support page] - check the "Patches, Bug Reports, Questions, Suggestions, +* if you are using Windows, see {npcap-main-url}[the Npcap support page] - check the "Patches, Bug Reports, Questions, Suggestions, etc" section; * if you are using some Linux distribution, some version of BSD, or some other UNIX-flavored OS, you should report the problem to the company or @@ -688,10 +689,8 @@ problem with one or more of: * the device driver for the interface you're using; * the Npcap library and/or the Npcap device driver; -so first check https://nmap.org/npcap/guide/[the Npcap User's Guide] to -see if your problem is mentioned there. If not, then see -https://nmap.org/npcap/[the main Npcap page] - check the "Patches, Bug -Reports, Questions, Suggestions, etc" section. +so first check {npcap-main-url}guide/[the Npcap User's Guide] to see if your problem is mentioned there. +If not, then see {npcap-main-url}[the main Npcap page] - check the "Patches, Bug Reports, Questions, Suggestions, etc" section. If you are having trouble capturing on a particular network interface, first try capturing on that device with WinDump; see @@ -714,10 +713,8 @@ certainly a problem with one or more of: * the device driver for the interface you're using; * the Npcap library and/or the Npcap device driver; -so first check https://nmap.org/npcap/guide/[the Npcap User's Guide] to -see if your problem is mentioned there. If not, then see -https://nmap.org/npcap/[the main Npcap page] - check the "Patches, Bug -Reports, Questions, Suggestions, etc" section. +so first check {npcap-main-url}guide/[the Npcap User's Guide] to see if your problem is mentioned there. +If not, then see {npcap-main-url}[the main Npcap page] - check the "Patches, Bug Reports, Questions, Suggestions, etc" section. You may also want to ask the mailto:wireshark-users@wireshark.org[wireshark-users@wireshark.org] and @@ -725,7 +722,7 @@ the mailto:dev@nmap.org[dev@nmap.org] mailing lists to see if anybody happens to know about the problem and know a workaround or fix for the problem. (Note that you will have to subscribe to that list in order to be allowed to mail to it; see -https://nmap.org/npcap/[the Npcap support page] for information on the +{npcap-main-url}[the Npcap support page] for information on the mailing list.) In your mail, please give full details of the problem, as described above, and also indicate that the problem occurs with WinDump, not just with Wireshark. @@ -759,6 +756,8 @@ on that interface. === I'm trying to capture 802.11 traffic on Windows; why am I not seeing any packets? +You should first ensure that Npcap was installed with {npcap-main-url}/guide/npcap-devguide.html#npcap-feature-dot11[raw 802.11 support] and that monitor mode is enabled. + At least some 802.11 card drivers on Windows appear not to see any packets if they're running in promiscuous mode. Try turning promiscuous mode off; you'll only be able to see packets sent by and received by @@ -766,10 +765,11 @@ your machine, not third-party traffic, and it'll look like Ethernet traffic and won't include any management or control frames, but that's a limitation of the card drivers. -See the archived -https://web.archive.org/web/20090226193157/http://www.micro-logix.com/winpcap/Supported.asp[MicroLogix's -list of cards supported with WinPcap] for information on support of -various adapters and drivers with WinPcap. +// XXX Is this still relevant? +// See the archived +// https://web.archive.org/web/20090226193157/http://www.micro-logix.com/winpcap/Supported.asp[MicroLogix's +// list of cards supported with WinPcap] for information on support of +// various adapters and drivers with WinPcap. === I'm trying to capture 802.11 traffic on Windows; why am I seeing packets received by the machine on which I'm capturing traffic, but not packets sent by that machine? diff --git a/dumpcap.c b/dumpcap.c index 672802084d..32575b44ee 100644 --- a/dumpcap.c +++ b/dumpcap.c @@ -576,7 +576,7 @@ get_pcap_failure_secondary_error_message(cap_device_open_status open_status, return "In order to capture packets, Npcap or WinPcap must be installed. See\n" "\n" - " https://nmap.org/npcap/\n" + " https://npcap.com/\n" "\n" "for a downloadable version of Npcap and for instructions on how to\n" "install it."; diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 6bde1dd521..4f1ff2531b 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -63,7 +63,7 @@ BrandingText "Wireshark${U+00ae} Installer" !define MUI_WELCOMEPAGE_TITLE_3LINES !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 Npcap to be able to capture packets from a network." -;!define MUI_FINISHPAGE_LINK_LOCATION "https://nmap.org/npcap/" +;!define MUI_FINISHPAGE_LINK_LOCATION "https://npcap.com/" ; 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" diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp index 60193c8a7b..5bb2d9cf7c 100644 --- a/ui/qt/interface_frame.cpp +++ b/ui/qt/interface_frame.cpp @@ -285,8 +285,7 @@ void InterfaceFrame::resetInterfaceTreeDisplay() "

" "Local interfaces are unavailable because no packet capture driver is installed." "

" - "You can fix this by installing Npcap" - " or WinPcap." + "You can fix this by installing Npcap." "

")); } else if (!npf_sys_is_running()) { ui->warningLabel->setText(tr(