unom/punktfunk
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 5 Wiki Activity

style(host): rustfmt the #9/#13 pairing edits

Browse Source 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Enrico Bühler
2026-06-29 09:04:01 +00:00
parent 3e498cd40d
commit 7cd9364c9e
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/punktfunk-host/src/native_pairing.rs
+18 -4
View File
@@ -282,7 +282,9 @@ impl NativePairing {
match &arm.pin { match &arm.pin {
None => PinAttempt::Disarmed, None => PinAttempt::Disarmed,
Some(pin) => match &arm.bound_fp { Some(pin) => match &arm.bound_fp {
Some(bound) if !bound.eq_ignore_ascii_case(client_fp_hex) => PinAttempt::BoundToOther, Some(bound) if !bound.eq_ignore_ascii_case(client_fp_hex) => {
PinAttempt::BoundToOther
}
_ => PinAttempt::Pin(pin.clone()), _ => PinAttempt::Pin(pin.clone()),
}, },
} }
@@ -441,7 +443,13 @@ impl NativePairing {
// Per-source-IP cap: a single host can't occupy more than MAX_PENDING_PER_IP slots — evict its // Per-source-IP cap: a single host can't occupy more than MAX_PENDING_PER_IP slots — evict its
// own oldest entry first so it can't crowd out other devices' knocks (#13). // own oldest entry first so it can't crowd out other devices' knocks (#13).
if let Some(ip) = src_ip { if let Some(ip) = src_ip {
if pending.items.iter().filter(|p| p.src_ip == Some(ip)).count() >= MAX_PENDING_PER_IP { if pending
.items
.iter()
.filter(|p| p.src_ip == Some(ip))
.count()
>= MAX_PENDING_PER_IP
{
if let Some(i) = Self::evict_index(&pending.items, Some(ip)) { if let Some(i) = Self::evict_index(&pending.items, Some(ip)) {
pending.items.remove(i); pending.items.remove(i);
} }
@@ -572,7 +580,10 @@ impl NativePairing {
self.np.set_parked(self.fp, false); self.np.set_parked(self.fp, false);
} }
} }
let _park = ParkGuard { np: self, fp: fp_hex }; let _park = ParkGuard {
np: self,
fp: fp_hex,
};
let deadline = tokio::time::Instant::now() + timeout; let deadline = tokio::time::Instant::now() + timeout;
loop { loop {
// Arm the wakeup BEFORE re-reading state, and `enable()` it, so an approve/deny that // Arm the wakeup BEFORE re-reading state, and `enable()` it, so an approve/deny that
@@ -833,7 +844,10 @@ mod tests {
// the caller rejects it WITHOUT consuming the window. // the caller rejects it WITHOUT consuming the window.
let pin = np.arm_for(Duration::from_secs(60), Some("AA11".into())); let pin = np.arm_for(Duration::from_secs(60), Some("AA11".into()));
assert!(matches!(np.pin_for_attempt("aa11"), PinAttempt::Pin(x) if x == pin)); assert!(matches!(np.pin_for_attempt("aa11"), PinAttempt::Pin(x) if x == pin));
assert!(matches!(np.pin_for_attempt("bb22"), PinAttempt::BoundToOther)); assert!(matches!(
np.pin_for_attempt("bb22"),
PinAttempt::BoundToOther
));
np.disarm(); np.disarm();
assert!(matches!(np.pin_for_attempt("aa11"), PinAttempt::Disarmed)); assert!(matches!(np.pin_for_attempt("aa11"), PinAttempt::Disarmed));
let _ = std::fs::remove_file(&p); let _ = std::fs::remove_file(&p);