Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
jed
2012-06-19 12:35:12 -07:00
10 changed files with 236 additions and 141 deletions

View File

@@ -723,8 +723,8 @@ Json::Value RPCServer::doConnect(Json::Value& params)
iPort = boost::lexical_cast<int>(strPort);
}
if (!theApp->getConnectionPool().connectTo(strIp, iPort))
return "connected";
// XXX Validate legal IP and port
theApp->getConnectionPool().connectTo(strIp, iPort);
return "connecting";
}