Add m_inbound_onion to AttemptToEvictConnection()

jonatack · jonatack · commit 8b1e15614374 · 2021-03-19T20:11:45.000+01:00
and an `m_is_onion` struct member to NodeEvictionCandidate and tests.

We'll use these in the peer eviction logic to protect inbound onion peers
in addition to the existing protection of localhost peers.
diff --git a/src/net.cpp b/src/net.cpp
@@ -992,7 +992,8 @@ bool CConnman::AttemptToEvictConnection()
                                                node->nLastBlockTime, node->nLastTXTime,
                                                HasAllDesirableServiceFlags(node->nServices),
                                                peer_relay_txes, peer_filter_not_null, node->nKeyedNetGroup,
-                                               node->m_prefer_evict, node->addr.IsLocal()};
+                                               node->m_prefer_evict, node->addr.IsLocal(),
+                                               node->m_inbound_onion};
             vEvictionCandidates.push_back(candidate);
         }
     }
diff --git a/src/net.h b/src/net.h
@@ -425,6 +425,7 @@ class CNode
 
     std::atomic<int64_t> nLastSend{0};
     std::atomic<int64_t> nLastRecv{0};
+    //! Unix epoch time at peer connection, in seconds.
     const int64_t nTimeConnected;
     std::atomic<int64_t> nTimeOffset{0};
     // Address of this peer
@@ -1281,6 +1282,7 @@ struct NodeEvictionCandidate
     uint64_t nKeyedNetGroup;
     bool prefer_evict;
     bool m_is_local;
+    bool m_is_onion;
 };
 
 /**
diff --git a/src/test/fuzz/node_eviction.cpp b/src/test/fuzz/node_eviction.cpp
@@ -31,6 +31,7 @@ FUZZ_TARGET(node_eviction)
             /* nKeyedNetGroup */ fuzzed_data_provider.ConsumeIntegral<uint64_t>(),
             /* prefer_evict */ fuzzed_data_provider.ConsumeBool(),
             /* m_is_local */ fuzzed_data_provider.ConsumeBool(),
+            /* m_is_onion */ fuzzed_data_provider.ConsumeBool(),
         });
     }
     // Make a copy since eviction_candidates may be in some valid but otherwise
diff --git a/src/test/net_peer_eviction_tests.cpp b/src/test/net_peer_eviction_tests.cpp
@@ -36,6 +36,7 @@ std::vector<NodeEvictionCandidate> GetRandomNodeEvictionCandidates(const int n_c
             /* nKeyedNetGroup */ random_context.randrange(100),
             /* prefer_evict */ random_context.randbool(),
             /* m_is_local */ random_context.randbool(),
+            /* m_is_onion */ random_context.randbool(),
         });
     }
     return candidates;

Original file line number	Diff line number	Diff line change
`@@ -992,7 +992,8 @@ bool CConnman::AttemptToEvictConnection()`
`992`	`992`	`node->nLastBlockTime, node->nLastTXTime,`
`993`	`993`	`HasAllDesirableServiceFlags(node->nServices),`
`994`	`994`	`peer_relay_txes, peer_filter_not_null, node->nKeyedNetGroup,`
`995`		`- node->m_prefer_evict, node->addr.IsLocal()};`
	`995`	`+ node->m_prefer_evict, node->addr.IsLocal(),`
	`996`	`+ node->m_inbound_onion};`
`996`	`997`	`vEvictionCandidates.push_back(candidate);`
`997`	`998`	`}`
`998`	`999`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ FUZZ_TARGET(node_eviction)`
`31`	`31`	`/* nKeyedNetGroup */ fuzzed_data_provider.ConsumeIntegral<uint64_t>(),`
`32`	`32`	`/* prefer_evict */ fuzzed_data_provider.ConsumeBool(),`
`33`	`33`	`/* m_is_local */ fuzzed_data_provider.ConsumeBool(),`
	`34`	`+ /* m_is_onion */ fuzzed_data_provider.ConsumeBool(),`
`34`	`35`	`});`
`35`	`36`	`}`
`36`	`37`	`// Make a copy since eviction_candidates may be in some valid but otherwise`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ std::vector<NodeEvictionCandidate> GetRandomNodeEvictionCandidates(const int n_c`
`36`	`36`	`/* nKeyedNetGroup */ random_context.randrange(100),`
`37`	`37`	`/* prefer_evict */ random_context.randbool(),`
`38`	`38`	`/* m_is_local */ random_context.randbool(),`
	`39`	`+ /* m_is_onion */ random_context.randbool(),`
`39`	`40`	`});`
`40`	`41`	`}`
`41`	`42`	`return candidates;`