From 734692b91881e05fe6ed90c7efcdf264202fa6c1 Mon Sep 17 00:00:00 2001
From: Mike Goslin <mikegoslin@users.sourceforge.net>
Date: Thu, 21 Dec 2000 19:29:10 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/express/error_utils.cxx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/panda/src/express/error_utils.cxx b/panda/src/express/error_utils.cxx
index 4eeff3d491..5306a98451 100644
--- a/panda/src/express/error_utils.cxx
+++ b/panda/src/express/error_utils.cxx
@@ -21,7 +21,8 @@ handle_socket_error(void) {
 #ifndef WIN32
   return strerror(errno);
 #else
-  switch (WSAGetLastError()) {
+  int err = WSAGetLastError();
+  switch (err) {
     case 10022:
       return "An invalid argument was supplied";
     case 10036:
@@ -59,8 +60,7 @@ handle_socket_error(void) {
     default:
       if (express_cat.is_debug())
         express_cat.debug()
-	  << "handle_socket_error - unknown error: " << WSAGetLastError()
-	  << endl;
+	  << "handle_socket_error - unknown error: " << err << endl;
       return "Unknown WSA error";
   }
 #endif
@@ -149,7 +149,8 @@ get_network_error(void) {
 #ifndef WIN32
   return EU_error_abort;
 #else
-  switch (WSAGetLastError()) {
+  int err = WSAGetLastError();
+  switch (err) {
     case 10050:
       return EU_error_network_dead;
     case 10051:
@@ -177,11 +178,16 @@ get_network_error(void) {
       return EU_error_network_remote_host_not_found;
     case 11002:
       return EU_error_network_remote_host_no_response;
+    case 0:
+      if (express_cat.is_debug())
+	express_cat.debug()
+	  << "get_network_error() - WSA error = 0 - error : "
+	  << strerror(errno) << endl;
+      return EU_error_abort;
     default:
       if (express_cat.is_debug())
 	express_cat.debug()
-	  << "get_network_error() - unknown error: " << WSAGetLastError()
-	  << endl;
+	  << "get_network_error() - unknown error: " << err << endl;
       return EU_error_abort;
   }
 #endif