mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Merge branch 'master' of github.com:jedmccaleb/NewCoin
This commit is contained in:
@@ -166,7 +166,7 @@ void Application::setup()
|
||||
//
|
||||
// Allow peer connections.
|
||||
//
|
||||
if (!theConfig.RUN_STANDALONE && !theConfig.PEER_IP.empty() && theConfig.PEER_PORT)
|
||||
if (!theConfig.RUN_STANDALONE)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
@@ -694,7 +694,7 @@ int commandLineRPC(const std::vector<std::string>& vCmd)
|
||||
return nRet;
|
||||
}
|
||||
|
||||
#define RPC_NOTIFY_MAX_BYTES 8192
|
||||
#define RPC_REPLY_MAX_BYTES (128*1024*1024)
|
||||
#define RPC_NOTIFY_SECONDS 10
|
||||
|
||||
bool responseRPC(
|
||||
@@ -787,7 +787,7 @@ void callRPC(
|
||||
jvParams,
|
||||
mapRequestHeaders,
|
||||
"/", _1, _2),
|
||||
RPC_NOTIFY_MAX_BYTES,
|
||||
RPC_REPLY_MAX_BYTES,
|
||||
boost::posix_time::seconds(RPC_NOTIFY_SECONDS),
|
||||
boost::bind(&responseRPC, callbackFuncP, _1, _2, _3));
|
||||
}
|
||||
|
||||
@@ -35,9 +35,12 @@ PeerDoor::PeerDoor(boost::asio::io_service& io_service) :
|
||||
if (1 != SSL_CTX_set_cipher_list(mCtx.native_handle(), theConfig.PEER_SSL_CIPHER_LIST.c_str()))
|
||||
std::runtime_error("Error setting cipher list (no valid ciphers).");
|
||||
|
||||
Log(lsINFO) << "Peer port: " << theConfig.PEER_IP << " " << theConfig.PEER_PORT;
|
||||
|
||||
startListening();
|
||||
if (!theConfig.PEER_IP.empty() && theConfig.PEER_PORT)
|
||||
{
|
||||
Log(lsINFO) << "Peer port: " << theConfig.PEER_IP << " " << theConfig.PEER_PORT;
|
||||
startListening();
|
||||
}
|
||||
}
|
||||
|
||||
void PeerDoor::startListening()
|
||||
|
||||
Reference in New Issue
Block a user