forked from I2P_Developers/i2p.i2p
* Streaming: Don't send RST on globally-blackisted conns
This commit is contained in:
@ -240,6 +240,7 @@ class ConnectionManager {
|
|||||||
Hash h = from.calculateHash();
|
Hash h = from.calculateHash();
|
||||||
if ((_hourThrottler != null && _hourThrottler.isThrottled(h)) ||
|
if ((_hourThrottler != null && _hourThrottler.isThrottled(h)) ||
|
||||||
(_dayThrottler != null && _dayThrottler.isThrottled(h)) ||
|
(_dayThrottler != null && _dayThrottler.isThrottled(h)) ||
|
||||||
|
_globalBlacklist.contains(h) ||
|
||||||
(_defaultOptions.isAccessListEnabled() && !_defaultOptions.getAccessList().contains(h)) ||
|
(_defaultOptions.isAccessListEnabled() && !_defaultOptions.getAccessList().contains(h)) ||
|
||||||
(_defaultOptions.isBlacklistEnabled() && _defaultOptions.getBlacklist().contains(h))) {
|
(_defaultOptions.isBlacklistEnabled() && _defaultOptions.getBlacklist().contains(h))) {
|
||||||
// A signed RST packet + ElGamal + session tags is fairly expensive, so
|
// A signed RST packet + ElGamal + session tags is fairly expensive, so
|
||||||
@ -435,7 +436,7 @@ class ConnectionManager {
|
|||||||
if (!_currentBlacklist.equals(hashes)) {
|
if (!_currentBlacklist.equals(hashes)) {
|
||||||
// rebuild _globalBlacklist when property changes
|
// rebuild _globalBlacklist when property changes
|
||||||
synchronized(_globalBlacklist) {
|
synchronized(_globalBlacklist) {
|
||||||
if (hashes != null) {
|
if (hashes.length() > 0) {
|
||||||
Set<Hash> newSet = new HashSet();
|
Set<Hash> newSet = new HashSet();
|
||||||
StringTokenizer tok = new StringTokenizer(hashes, ",; ");
|
StringTokenizer tok = new StringTokenizer(hashes, ",; ");
|
||||||
while (tok.hasMoreTokens()) {
|
while (tok.hasMoreTokens()) {
|
||||||
|
Reference in New Issue
Block a user