Catch p2p exceptions

hayscoding · Jan 10, 2012 · eceeda1 · eceeda1
1 parent 0195702
commit eceeda1
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/bitcoin.cpp b/bitcoin.cpp
@@ -259,16 +259,21 @@ class CNode {
 };
 
 bool TestNode(const CIPPort &cip, int &ban, int &clientV, vector<CAddress>& vAddr) {
-  CNode node(cip, vAddr);
-  bool ret = node.Run();
-  if (!ret) {
-    ban = node.GetBan();
-  } else {
+  try {
+    CNode node(cip, vAddr);
+    bool ret = node.Run();
+    if (!ret) {
+      ban = node.GetBan();
+    } else {
+      ban = 0;
+    }
+    clientV = node.GetClientVersion();
+//  printf("%s: %s!!!\n", cip.ToString().c_str(), ret ? "GOOD" : "BAD");
+    return ret;
+  } catch(std::ios_base::failure& e) {
     ban = 0;
+    return false;
   }
-  clientV = node.GetClientVersion();
-//  printf("%s: %s!!!\n", cip.ToString().c_str(), ret ? "GOOD" : "BAD");
-  return ret;
 }
 
 /*