net: make Ban/Unban/ClearBan functionality consistent

theuni · Fuzzbawls · commit 4486d4e36b1a · 2020-06-22T17:38:07.000-07:00
- Ban/Unban/ClearBan call uiInterface.BannedListChanged() as necessary
- Ban/Unban/ClearBan sync to disk if the operation is user-invoked
- Mark node for disconnection automatically when banning
- Lock cs_vNodes while setting disconnected
- Don't spin in a tight loop while setting disconnected
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -462,20 +462,12 @@ UniValue setban(const UniValue& params, bool fHelp)
             absolute = params[3].get_bool();
 
         isSubnet ? CNode::Ban(subNet, BanReasonManuallyAdded, banTime, absolute) : CNode::Ban(netAddr, BanReasonManuallyAdded, banTime, absolute);
-
-        //disconnect possible nodes
-        while(CNode *bannedNode = (isSubnet ? FindNode(subNet) : FindNode(netAddr)))
-            bannedNode->CloseSocketDisconnect();
     }
     else if(strCommand == "remove")
     {
         if (!( isSubnet ? CNode::Unban(subNet) : CNode::Unban(netAddr) ))
             throw JSONRPCError(RPC_MISC_ERROR, "Error: Unban failed");
     }
-
-    DumpBanlist(); //store banlist to disk
-    uiInterface.BannedListChanged();
-
     return NullUniValue;
 }
 
@@ -532,8 +524,6 @@ UniValue clearbanned(const UniValue& params, bool fHelp)
             + HelpExampleRpc("clearbanned", ""));
 
     CNode::ClearBanned();
-    DumpBanlist(); //store banlist to disk
-    uiInterface.BannedListChanged();
 
     return NullUniValue;
 }

Original file line number	Diff line number	Diff line change
`@@ -462,20 +462,12 @@ UniValue setban(const UniValue& params, bool fHelp)`
`462`	`462`	`absolute = params[3].get_bool();`
`463`	`463`
`464`	`464`	`isSubnet ? CNode::Ban(subNet, BanReasonManuallyAdded, banTime, absolute) : CNode::Ban(netAddr, BanReasonManuallyAdded, banTime, absolute);`
`465`		`-`
`466`		`- //disconnect possible nodes`
`467`		`- while(CNode *bannedNode = (isSubnet ? FindNode(subNet) : FindNode(netAddr)))`
`468`		`- bannedNode->CloseSocketDisconnect();`
`469`	`465`	`}`
`470`	`466`	`else if(strCommand == "remove")`
`471`	`467`	`{`
`472`	`468`	`if (!( isSubnet ? CNode::Unban(subNet) : CNode::Unban(netAddr) ))`
`473`	`469`	`throw JSONRPCError(RPC_MISC_ERROR, "Error: Unban failed");`
`474`	`470`	`}`
`475`		`-`
`476`		`- DumpBanlist(); //store banlist to disk`
`477`		`- uiInterface.BannedListChanged();`
`478`		`-`
`479`	`471`	`return NullUniValue;`
`480`	`472`	`}`
`481`	`473`
`@@ -532,8 +524,6 @@ UniValue clearbanned(const UniValue& params, bool fHelp)`
`532`	`524`	`+ HelpExampleRpc("clearbanned", ""));`
`533`	`525`
`534`	`526`	`CNode::ClearBanned();`
`535`		`- DumpBanlist(); //store banlist to disk`
`536`		`- uiInterface.BannedListChanged();`
`537`	`527`
`538`	`528`	`return NullUniValue;`
`539`	`529`	`}`