diff --git a/RNS/Interfaces/Interface.py b/RNS/Interfaces/Interface.py index 44de9681..0174ae38 100755 --- a/RNS/Interfaces/Interface.py +++ b/RNS/Interfaces/Interface.py @@ -308,7 +308,7 @@ class Interface: RNS.log("Releasing held announce packet "+str(selected_announce_packet)+" from "+str(self), RNS.LOG_EXTREME) self.ic_held_release = time.time() + self.ic_held_release_interval self.held_announces.pop(selected_announce_packet.destination_hash) - def release(): RNS.Transport.inbound(selected_announce_packet.raw, selected_announce_packet.receiving_interface, tc=RNS.Transport.TC_INGRESS_LIMITED, ifac_handled=True) + def release(): RNS.Transport.inbound(selected_announce_packet.raw, selected_announce_packet.receiving_interface, tc=RNS.Transport.TC_INGRESS_LIMITED, ifac_handled=True, no_accounting=True) threading.Thread(target=release, daemon=True).start() except Exception as e: diff --git a/RNS/Transport.py b/RNS/Transport.py index 26dafffd..f57a3e3e 100755 --- a/RNS/Transport.py +++ b/RNS/Transport.py @@ -2107,9 +2107,6 @@ class Transport: elif not announce_signature_valid: return packet.receiving_interface.protocol_violation(f"Invalid announce signature for {RNS.prettyhexrep(packet.destination_hash)}") - else: packet.receiving_interface.received_announce(size=len(packet.raw)) - Transport.announce_rxc += 1 - announced_destination_known = packet.destination_hash in Transport.path_table if not announced_destination_known: # This is an unknown destination, and we'll apply @@ -2120,7 +2117,12 @@ class Transport: RNS.log(f"Skipping ingress limit check for {RNS.prettyhexrep(packet.destination_hash)} due to waiting path requests", RNS.LOG_PATHING) if RNS.sl(RNS.LOG_PATHING) else None elif packet.receiving_interface.should_ingress_limit(): - return packet.receiving_interface.hold_announce(packet) + accepted = packet.receiving_interface.hold_announce(packet) + packet.receiving_interface.received_announce(size=0) + return accepted + + packet.receiving_interface.received_announce(size=len(raw)) + Transport.announce_rxc += 1 # Ingress limit path requests early elif packet.destination_hash == Transport.pr_destination_hash: @@ -2181,7 +2183,7 @@ class Transport: else: RNS.log(f"Unstamped path request for {RNS.prettyhexrep(destination_hash)}", RNS.LOG_EXTREME) if RNS.sl(RNS.LOG_EXTREME) else None # TODO: Remove after transition, simply drop if not stamp_ok: - if Transport.STAMPS_ENFORCED: return + if Transport.STAMPS_ENFORCED: return None packet.receiving_interface.received_path_request(size=len(raw)) Transport.pr_rxc += 1 @@ -2210,7 +2212,7 @@ class Transport: Transport.discovery_path_requests[destination_hash] = pr_entry - return + return True # TODO: Add early filtering here for non-transport nodes; there's no # reason to process further if we know we don't have the destination