fix(nat): retain cold ingress reservation after partial measurements
This commit is contained in:
1 parent
7bf877b7d6
commit
37e092672a
2 files changed
+8
-4
No files matched your search
@@ -1427,7 +1427,6 @@ uint64_t nat_detection_probe_delay(struct NAT_DETECTION *detector) {
|
||||
for (struct nat_socket *state = detector->sockets; state; state = state->next) {
|
||||
if (state->socket->is_tcp || !state->reservation_fingerprint || state->cold_until <= now ||
|
||||
(!detector->automatic && !state->phase && !state->forced) ||
|
||||
(state->completed_tb && !state->phase && !state->cycling && !state->forced && state->due > now + 2500) ||
|
||||
(!state->phase && !state->cycling && !state->forced && state->measured_profile.source == ADDRESS_SOURCE_ETCP &&
|
||||
state->measured_profile.mapping && state->measured_profile.inbound))
|
||||
continue;
|
||||
@@ -1444,7 +1443,6 @@ int nat_detection_ping_allowed(struct NAT_DETECTION *detector, struct ETCP_SOCKE
|
||||
struct nat_socket *state = socket_state(detector, socket, 0);
|
||||
if (!state || (!state->reservation_fingerprint && !state->available_fingerprint) || state->cold_until <= get_time_tb() ||
|
||||
(!detector->automatic && !state->phase && !state->forced) ||
|
||||
(state->completed_tb && !state->phase && !state->cycling && !state->forced && state->due > get_time_tb() + 2500) ||
|
||||
(!state->phase && !state->cycling && !state->forced && state->measured_profile.source == ADDRESS_SOURCE_ETCP &&
|
||||
state->measured_profile.mapping && state->measured_profile.inbound)) return 1;
|
||||
uint64_t peer = sc_derive_node_id_from_pubkey(peer_key);
|
||||
|
||||
Reference in new issue
Block a user