diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-02-08 11:08:01 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-02-08 20:29:06 +0000 |
| commit | a43730cb10bb971a8e8f124e33c93609b7fadc80 (patch) | |
| tree | 7c137fba12d0791aca373c81c1003d1e938ada7b /caputils | |
| parent | aabce6151c832ce7577a14a192cc131404ea4e4b (diff) | |
Convert WinPcap references to Npcap.
Convert WinPcap references and URLs in error messages and the FAQ
to their Npcap equivalents. Remove some obsolete FAQ entries.
Change-Id: I695d358a2c9cff0939f4ea84ba02d4c62ad7dd01
Reviewed-on: https://code.wireshark.org/review/31943
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/capture-pcap-util.c | 2 | ||||
| -rw-r--r-- | caputils/capture-wpcap.c | 22 | ||||
| -rw-r--r-- | caputils/capture-wpcap.h | 4 |
3 files changed, 10 insertions, 18 deletions
diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c index 9a5ea26cd3..0eedf71bf9 100644 --- a/caputils/capture-pcap-util.c +++ b/caputils/capture-pcap-util.c @@ -468,7 +468,7 @@ if_info_new(const char *name, const char *description, gboolean loopback) /* * On Windows, the "description" is a vendor description, - * and the friendly name isn't returned by WinPcap. + * and the friendly name isn't returned by Npcap/WinPcap. * Fetch it ourselves. */ diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 5ed8c749db..25129361db 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -245,23 +245,19 @@ load_wpcap(void) has_wpcap = TRUE; } -/* - * The official list of WinPcap mirrors is at - * https://www.winpcap.org/misc/mirrors.htm - */ -char * +static char * cant_load_winpcap_err(const char *app_name) { return g_strdup_printf( -"Unable to load WinPcap (wpcap.dll); %s will not be able to capture\n" -"packets.\n" +"Unable to load Npcap or WinPcap (wpcap.dll); %s will not be able to\n" +"capture packets.\n" "\n" -"In order to capture packets, WinPcap must be installed; see\n" +"In order to capture packets Npcap or WinPcap must be installed. See\n" "\n" -" https://www.winpcap.org/\n" +" https://nmap.org/npcap/\n" "\n" -"for a downloadable version of WinPcap and for instructions on how to install\n" -"WinPcap.", +"for a downloadable version of Npcap and for instructions on how to\n" +"install it.", app_name); } @@ -968,8 +964,8 @@ cant_get_if_list_error_message(const char *err_str) if (strstr(err_str, "Not enough storage is available to process this command") != NULL || strstr(err_str, "The operation completed successfully") != NULL) { return g_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" -"a later version of WinPcap - see the WinPcap site at www.winpcap.org", +"This might be a problem with WinPcap 3.0. You should try updating to\n" +"Npcap. See https://nmap.org/npcap/ for more information.", err_str); } return g_strdup_printf("Can't get list of interfaces: %s", err_str); diff --git a/caputils/capture-wpcap.h b/caputils/capture-wpcap.h index 3c42a81067..3e18a79de4 100644 --- a/caputils/capture-wpcap.h +++ b/caputils/capture-wpcap.h @@ -18,10 +18,6 @@ extern gboolean has_wpcap; extern void load_wpcap(void); -/* error message, if WinPcap couldn't be loaded */ -/* will use g_strdup, don't forget to g_free the returned string! */ -extern char *cant_load_winpcap_err(const char *app_name); - /** * Check to see if npf.sys is running. * @return TRUE if npf.sys is running, FALSE if it's not or if there was |