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

Conflicts:
	src/ConnectionPool.cpp
	src/Peer.cpp
This commit is contained in:
Arthur Britto
2012-06-19 12:29:06 -07:00
24 changed files with 238 additions and 109 deletions

View File

@@ -60,7 +60,7 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra
void Peer::detach(const char *rsn)
{
#ifdef DEBUG
std::cerr << "DETACHING PEER: " << rsn
Log(lsTRACE) << "DETACHING PEER: " << rsn;
<< ": "
<< (mNodePublic.isValid() ? mNodePublic.humanNodePublic() : "-")
<< " " << getIP() << " " << getPort() << std::endl;
@@ -509,6 +509,7 @@ void Peer::processReadBuffer()
default:
std::cerr << "Unknown Msg: " << type << std::endl;
std::cerr << strHex(&mReadbuf[0], mReadbuf.size());
}
}
}