Update:

[obnox/wireshark/wip.git] / dumpcap.c

diff --git a/dumpcap.c b/dumpcap.c
index 467a517b599dce4336aff8456ea7cedfd692df97..cdc3aabb560109a33b90a1fc3ea51fb13ee9ac74 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -81,7 +81,6 @@
 #include "capture-pcap-util.h"
 #ifdef _WIN32
 #include "capture-wpcap.h"
-#include "capture_errs.h"
 #endif /* _WIN32 */
 
 #include "pcapio.h"
@@ -682,13 +681,22 @@ get_capture_device_open_failure_messages(const char *open_err_str,
                "The capture session could not be initiated (%s).", open_err_str);
 #ifdef _WIN32
     if (!has_wpcap) {
-      char *detailed_err;
-
-      detailed_err = cant_load_winpcap_err("TShark");
       g_snprintf(secondary_errmsg, (gulong) secondary_errmsg_len,
-                 "\n",
-                 "%s\n", detailed_err);
-      g_free(detailed_err);
+                 "\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"
+                 "\n"
+                 "for a downloadable version of WinPcap and for instructions on how to install\n"
+                 "WinPcap.");
     } else {
       g_snprintf(secondary_errmsg, (gulong) secondary_errmsg_len,
                  "\n"
@@ -1293,6 +1301,7 @@ print_statistics_loop(gboolean machine_readable)
     if (if_list == NULL) {
         switch (err) {
         case CANT_GET_INTERFACE_LIST:
+        case DONT_HAVE_PCAP:
             cmdarg_err("%s", err_str);
             g_free(err_str);
             break;
@@ -4199,6 +4208,7 @@ main(int argc, char *argv[])
         if (if_list == NULL) {
             switch (err) {
             case CANT_GET_INTERFACE_LIST:
+            case DONT_HAVE_PCAP:
                 cmdarg_err("%s", err_str);
                 g_free(err_str);
                 exit_main(2);