From bd80ec0d2379b44050d6f833b030684ffae7016a Mon Sep 17 00:00:00 2001 From: Patrick Strateman Date: Thu, 13 Aug 2015 02:19:17 -0700 Subject: [PATCH] Refactor: Move failure conditions to the top of AcceptConnection --- src/net.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 140fd44a3..6662bf624 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -706,6 +706,13 @@ static void AcceptConnection(const ListenSocket& hListenSocket) { return; } + if (CNode::IsBanned(addr) && !whitelisted) + { + LogPrintf("connection from %s dropped (banned)\n", addr.ToString()); + CloseSocket(hSocket); + return; + } + if (nInbound >= nMaxInbound) { LogPrint("net", "connection from %s dropped (full)\n", addr.ToString()); @@ -720,13 +727,6 @@ static void AcceptConnection(const ListenSocket& hListenSocket) { return; } - if (CNode::IsBanned(addr) && !whitelisted) - { - LogPrintf("connection from %s dropped (banned)\n", addr.ToString()); - CloseSocket(hSocket); - return; - } - // According to the internet TCP_NODELAY is not carried into accepted sockets // on all platforms. Set it again here just to be sure. int set = 1;