Selaa lähdekoodia

A bit more auth cleanup in the local node.

Adam Ierymenko 3 vuotta sitten
vanhempi
commit
fe0068da52
1 muutettua tiedostoa jossa 1 lisäystä ja 3 poistoa
  1. 1 3
      node/Membership.hpp

+ 1 - 3
node/Membership.hpp

@@ -90,9 +90,7 @@ public:
 	 */
 	 */
 	inline bool isAllowedOnNetwork(const NetworkConfig &thisNodeNetworkConfig, const Identity &otherNodeIdentity) const
 	inline bool isAllowedOnNetwork(const NetworkConfig &thisNodeNetworkConfig, const Identity &otherNodeIdentity) const
 	{
 	{
-		if (thisNodeNetworkConfig.isPublic()) return true;
-		if (_com.timestamp() <= _comRevocationThreshold) return false;
-		return thisNodeNetworkConfig.com.agreesWith(_com, otherNodeIdentity);
+		return (thisNodeNetworkConfig.isPublic() || (((_com.timestamp() > _comRevocationThreshold) && (thisNodeNetworkConfig.com.agreesWith(_com, otherNodeIdentity)))));
 	}
 	}
 
 
 	inline bool recentlyAssociated(const int64_t now) const
 	inline bool recentlyAssociated(const int64_t now) const