mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-05 11:08:25 +00:00
Johnathan Corgan
7ccc7adab0
Not a replay: master had independently reorganized or reimplemented nearly every area the batch touches, so most of this is re-derivation. Four files maint modified do not exist on master at all, and git marks those DU with no conflict markers, so the lazy resolution would have dropped 499 lines while the tree still built and still passed tests. Two conflicts turned out to be the same defect already present on master in a different place, and fixing it there reaches further than the original did. Master had centralized socket binding into sockbind across three sockets, one of which maint does not have, with the same create-wide-then-narrow window; and master's shared PerAddrRateLimiter swept the whole map on every admit with no entry ceiling, which is the routing-error limiter finding in a primitive the lookup-forward limiter also uses. Two others would have added dead code if replayed. Master had already deleted the pre-refactor restart block the epoch dampener patched, so it went onto InboundDecision::RestartThenPromote instead; and master already carried the relocated reactive-MTU floor check, so the copy inside the conflict was the old post-apply one that had been removed. The lookup dedup eviction was re-derived into the hoisted lookup core, and its target-side signing gate re-added to the request path, where the merge had dropped it entirely and left the limiter inert. Two regression tests were repaired rather than accepted. The gap-tracker test adapted into master's ReceiverState style asserted an empty burst after a jump to the ceiling counter, which is not what that code does; and the epoch dampener's stamp-on-acceptance ordering was pinned by nothing, so a sustained replay could have starved a restarting peer with every test still green. Both now red when the fix they guard is reverted. Gate: fmt, build, clippy -D warnings, 2273 tests passing, six repo guards on the committed tree.