Merge remote-tracking branch 'origin/main'
# Conflicts: # clients/windows/src/app/mod.rs
This commit is contained in:
@@ -235,6 +235,24 @@ pub fn pair_with_host(
|
||||
)
|
||||
}
|
||||
|
||||
/// Probe several hosts for reachability in parallel — one thread each, so the wall-clock cost is
|
||||
/// ~one `timeout`, not the sum. Each element of the returned vec corresponds by index to
|
||||
/// `targets`. Wraps the single-host [`NativeClient::probe`] (a bounded, trust-agnostic,
|
||||
/// mDNS-independent QUIC handshake); used by the hosts page's presence pips and the headless
|
||||
/// `--list-hosts --probe`.
|
||||
pub fn probe_reachable_many(
|
||||
targets: Vec<(String, u16)>,
|
||||
timeout: std::time::Duration,
|
||||
) -> Vec<bool> {
|
||||
let handles: Vec<_> = targets
|
||||
.into_iter()
|
||||
.map(|(addr, port)| {
|
||||
std::thread::spawn(move || NativeClient::probe(&addr, port, timeout))
|
||||
})
|
||||
.collect();
|
||||
handles.into_iter().map(|h| h.join().unwrap_or(false)).collect()
|
||||
}
|
||||
|
||||
/// App settings, persisted as JSON. Stringly-typed gamepad/compositor prefs so the file
|
||||
/// stays readable; parsed with `*Pref::from_name` at connect time.
|
||||
#[derive(Clone, Serialize, Deserialize)]
|
||||
|
||||
@@ -1436,6 +1436,39 @@ pub unsafe extern "C" fn punktfunk_generate_identity(
|
||||
})
|
||||
}
|
||||
|
||||
/// Reachability probe: attempt the QUIC handshake to `host:port` and report whether the host
|
||||
/// answered — trust-agnostic and mDNS-INDEPENDENT. A host reached over a routed network
|
||||
/// (Tailscale/VPN/another subnet) answers here even though it never advertises on mDNS, so the
|
||||
/// clients' saved-host "online" pips can reflect real reachability instead of LAN presence (the
|
||||
/// display-side companion to the dial-first connect fix). Returns [`PunktfunkStatus::Ok`] when
|
||||
/// reachable, [`PunktfunkStatus::Timeout`] when not (or on any connect error). Blocks up to
|
||||
/// `timeout_ms`; call off the UI thread.
|
||||
///
|
||||
/// # Safety
|
||||
/// `host` must be a NUL-terminated UTF-8 string.
|
||||
#[cfg(feature = "quic")]
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn punktfunk_probe(
|
||||
host: *const std::os::raw::c_char,
|
||||
port: u16,
|
||||
timeout_ms: u32,
|
||||
) -> PunktfunkStatus {
|
||||
guard(|| {
|
||||
let Ok(Some(host)) = (unsafe { opt_cstr(host) }) else {
|
||||
return PunktfunkStatus::NullPointer;
|
||||
};
|
||||
if crate::client::NativeClient::probe(
|
||||
host,
|
||||
port,
|
||||
std::time::Duration::from_millis(timeout_ms as u64),
|
||||
) {
|
||||
PunktfunkStatus::Ok
|
||||
} else {
|
||||
PunktfunkStatus::Timeout
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// Run the PIN pairing ceremony against a host (see the protocol docs in punktfunk-core):
|
||||
/// the host displays a short PIN; the user types it into the client app, which passes it
|
||||
/// here. On success the host has stored this client's identity, the now-verified host
|
||||
|
||||
@@ -708,6 +708,56 @@ impl NativeClient {
|
||||
})
|
||||
}
|
||||
|
||||
/// A lightweight, trust-agnostic reachability check: attempt the QUIC/TLS handshake to
|
||||
/// `host:port` and report whether the host answered — WITHOUT relying on mDNS presence.
|
||||
///
|
||||
/// The saved-hosts "online" pip historically read a host as offline whenever it wasn't
|
||||
/// currently advertising on mDNS, so a host reached over a routed network (Tailscale / VPN /
|
||||
/// another subnet) — which is mDNS-blind forever — always looked offline even though it was
|
||||
/// perfectly reachable (the same failure the dial-first reconnect fix addressed for the
|
||||
/// connect action). This probe answers the real question ("does the box respond on the
|
||||
/// stream port?") by completing just the handshake and tearing it straight down.
|
||||
///
|
||||
/// No pin and no identity are presented: hosts accept the transport-level connection
|
||||
/// regardless of pairing (client-cert auth is not mandatory at the QUIC layer —
|
||||
/// authorization is enforced per-feature), so a completed handshake means "reachable". A
|
||||
/// wrong address, closed port, or unroutable host fails the connect/`timeout` and yields
|
||||
/// `false`. Blocks up to `timeout`.
|
||||
pub fn probe(host: &str, port: u16, timeout: Duration) -> bool {
|
||||
let Ok(rt) = tokio::runtime::Builder::new_current_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
else {
|
||||
return false;
|
||||
};
|
||||
let host = host.to_string();
|
||||
rt.block_on(async move {
|
||||
// The stored address may be a hostname (Tailscale MagicDNS, an mDNS `.local` name),
|
||||
// not a bare IP literal, so resolve it rather than `SocketAddr::parse`.
|
||||
let Ok(mut addrs) = tokio::net::lookup_host((host.as_str(), port)).await else {
|
||||
return false;
|
||||
};
|
||||
let Some(remote) = addrs.next() else {
|
||||
return false;
|
||||
};
|
||||
// TOFU verifier (pin = None) accepts any cert, so a real host always completes the
|
||||
// handshake; the only failures are DNS / no route / connect timeout.
|
||||
let (ep, _observed) = endpoint::client_pinned_with_identity(None, None);
|
||||
let Ok(ep) = ep else {
|
||||
return false;
|
||||
};
|
||||
let reachable = match ep.connect(remote, "punktfunk") {
|
||||
Ok(connecting) => {
|
||||
matches!(tokio::time::timeout(timeout, connecting).await, Ok(Ok(_)))
|
||||
}
|
||||
Err(_) => false,
|
||||
};
|
||||
ep.close(0u32.into(), b"probe");
|
||||
let _ = tokio::time::timeout(Duration::from_millis(200), ep.wait_idle()).await;
|
||||
reachable
|
||||
})
|
||||
}
|
||||
|
||||
/// The currently active session mode — the Welcome's, until an accepted
|
||||
/// [`NativeClient::request_mode`] switches it.
|
||||
pub fn mode(&self) -> Mode {
|
||||
|
||||
@@ -53,7 +53,9 @@ pub use stats::Stats;
|
||||
/// added `punktfunk_pair` / `punktfunk_generate_identity` / `punktfunk_connection_request_mode`.
|
||||
/// v3: added `punktfunk_wake_on_lan` (Wake-on-LAN magic packet; the host's wake MAC(s) reach
|
||||
/// clients out-of-band via the mDNS `mac` TXT record, so no connection is required to wake).
|
||||
pub const ABI_VERSION: u32 = 3;
|
||||
/// v4: added `punktfunk_probe` (bounded, trust-agnostic, mDNS-independent reachability handshake —
|
||||
/// the display-side companion to dial-first, so saved-host "online" pips reflect real reachability).
|
||||
pub const ABI_VERSION: u32 = 4;
|
||||
|
||||
/// The punktfunk/1 **wire** version — what `Hello`/`Welcome` carry and hosts equality-check.
|
||||
/// Deliberately its own constant: [`ABI_VERSION`] tracks the embeddable **C surface**
|
||||
|
||||
@@ -895,14 +895,12 @@ async fn serve_session(
|
||||
// stance as the GameStream Main10 advertisement).
|
||||
let host_wants_10bit = crate::config::config().ten_bit;
|
||||
let client_supports_10bit = hello.video_caps & punktfunk_core::quic::VIDEO_CAP_10BIT != 0;
|
||||
let bit_depth: u8 = if host_wants_10bit
|
||||
&& client_supports_10bit
|
||||
&& codec == crate::encode::Codec::H265
|
||||
{
|
||||
10
|
||||
} else {
|
||||
8
|
||||
};
|
||||
let bit_depth: u8 =
|
||||
if host_wants_10bit && client_supports_10bit && codec == crate::encode::Codec::H265 {
|
||||
10
|
||||
} else {
|
||||
8
|
||||
};
|
||||
tracing::info!(
|
||||
bit_depth,
|
||||
host_wants_10bit,
|
||||
|
||||
Reference in New Issue
Block a user