Fix build by #if 0 out unused de_sgsap_tmsi() function.

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

diff --git a/dumpcap.c b/dumpcap.c
index 7826cd89aebb41b38f1b5b22e4c82a8370710f97..4e2f1325e4320e519cf07a3fa8ff66e7d5d95f08 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -300,12 +300,14 @@ static gboolean need_timeout_workaround;
  * of 250ms, i.e. the same value as CAP_READ_TIMEOUT when not on one
  * of the offending versions of Snow Leopard.
  *
- * XXX - why is it 100 for threaded capturing?
+ * On Windows this value is converted to milliseconds and passed to
+ * WaitForSingleObject. If it's less than 1000 WaitForSingleObject
+ * will return immediately.
  */
 #ifndef USE_THREADS
 #define PIPE_READ_TIMEOUT   250000
 #else
-#define PIPE_READ_TIMEOUT   100
+#define PIPE_READ_TIMEOUT   100000
 #endif
 static const char *cap_pipe_err_str;
 
@@ -3097,7 +3099,8 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
     cap_err_str = pcap_geterr(global_ld.pcap_h);
     if (strcmp(cap_err_str, "recvfrom: Network is down") == 0 ||
         strcmp(cap_err_str, "read: Device not configured") == 0 ||
-        strcmp(cap_err_str, "read: I/O error") == 0) {
+        strcmp(cap_err_str, "read: I/O error") == 0 ||
+        strcmp(cap_err_str, "read error: PacketReceivePacket failed") == 0) {
       report_capture_error("The network adapter on which the capture was being done "
                            "is no longer running; the capture has stopped.",
                            "");