mirror of
https://github.com/feschber/lan-mouse.git
synced 2026-06-16 13:24:48 +03:00
Compare commits
2 Commits
peer-versi
...
rename-pre
| Author | SHA1 | Date | |
|---|---|---|---|
|
a716e195ed | ||
|
|
151792db31 |
1
.github/workflows/release.yml
vendored
1
.github/workflows/release.yml
vendored
@@ -175,7 +175,6 @@ jobs:
|
||||
- name: Download build artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
- name: Get short SHA
|
||||
id: vars
|
||||
run: echo "short_sha=${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
|
||||
- name: Create Pre-Release
|
||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||
|
||||
16
Cargo.lock
generated
16
Cargo.lock
generated
@@ -1647,7 +1647,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "input-capture"
|
||||
version = "0.4.0"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"ashpd",
|
||||
"async-trait",
|
||||
@@ -1677,7 +1677,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "input-emulation"
|
||||
version = "0.4.0"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"ashpd",
|
||||
"async-trait",
|
||||
@@ -1703,7 +1703,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "input-event"
|
||||
version = "0.4.0"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"log",
|
||||
@@ -1840,7 +1840,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lan-mouse"
|
||||
version = "0.11.0"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"env_logger",
|
||||
@@ -1875,7 +1875,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lan-mouse-cli"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"futures",
|
||||
@@ -1886,7 +1886,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lan-mouse-gtk"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"glib-build-tools",
|
||||
@@ -1900,7 +1900,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lan-mouse-ipc"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"log",
|
||||
@@ -1913,7 +1913,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lan-mouse-proto"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"input-event",
|
||||
"num_enum",
|
||||
|
||||
16
Cargo.toml
16
Cargo.toml
@@ -12,7 +12,7 @@ members = [
|
||||
[package]
|
||||
name = "lan-mouse"
|
||||
description = "Software KVM Switch / mouse & keyboard sharing software for Local Area Networks"
|
||||
version = "0.11.0"
|
||||
version = "0.10.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
@@ -27,13 +27,13 @@ panic = "abort"
|
||||
shadow-rs = "1.2.0"
|
||||
|
||||
[dependencies]
|
||||
input-event = { path = "input-event", version = "0.4.0" }
|
||||
input-emulation = { path = "input-emulation", version = "0.4.0", default-features = false }
|
||||
input-capture = { path = "input-capture", version = "0.4.0", default-features = false }
|
||||
lan-mouse-cli = { path = "lan-mouse-cli", version = "0.3.0" }
|
||||
lan-mouse-gtk = { path = "lan-mouse-gtk", version = "0.3.0", optional = true }
|
||||
lan-mouse-ipc = { path = "lan-mouse-ipc", version = "0.3.0" }
|
||||
lan-mouse-proto = { path = "lan-mouse-proto", version = "0.3.0" }
|
||||
input-event = { path = "input-event", version = "0.3.0" }
|
||||
input-emulation = { path = "input-emulation", version = "0.3.0", default-features = false }
|
||||
input-capture = { path = "input-capture", version = "0.3.0", default-features = false }
|
||||
lan-mouse-cli = { path = "lan-mouse-cli", version = "0.2.0" }
|
||||
lan-mouse-gtk = { path = "lan-mouse-gtk", version = "0.2.0", optional = true }
|
||||
lan-mouse-ipc = { path = "lan-mouse-ipc", version = "0.2.0" }
|
||||
lan-mouse-proto = { path = "lan-mouse-proto", version = "0.2.0" }
|
||||
shadow-rs = { version = "1.2.0", features = ["metadata"] }
|
||||
|
||||
hickory-resolver = "0.25.2"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "input-capture"
|
||||
description = "cross-platform input-capture library used by lan-mouse"
|
||||
version = "0.4.0"
|
||||
version = "0.3.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
@@ -10,7 +10,7 @@ repository = "https://github.com/feschber/lan-mouse"
|
||||
futures = "0.3.28"
|
||||
futures-core = "0.3.30"
|
||||
log = "0.4.22"
|
||||
input-event = { path = "../input-event", version = "0.4.0" }
|
||||
input-event = { path = "../input-event", version = "0.3.0" }
|
||||
memmap = "0.7"
|
||||
tempfile = "3.25.0"
|
||||
thiserror = "2.0.0"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "input-emulation"
|
||||
description = "cross-platform input emulation library used by lan-mouse"
|
||||
version = "0.4.0"
|
||||
version = "0.3.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
@@ -10,7 +10,7 @@ repository = "https://github.com/feschber/lan-mouse"
|
||||
async-trait = "0.1.80"
|
||||
futures = "0.3.28"
|
||||
log = "0.4.22"
|
||||
input-event = { path = "../input-event", version = "0.4.0" }
|
||||
input-event = { path = "../input-event", version = "0.3.0" }
|
||||
thiserror = "2.0.0"
|
||||
tokio = { version = "1.32.0", features = [
|
||||
"io-util",
|
||||
|
||||
@@ -106,19 +106,8 @@ impl MacOSEmulation {
|
||||
}
|
||||
}
|
||||
}
|
||||
// Always release the key with the correct CGKeyCode, regardless of
|
||||
// whether the repeat loop ran. This matches @feschber's review
|
||||
// request: "still release the key repeat task but with the correct
|
||||
// code."
|
||||
//
|
||||
// Do NOT call update_modifiers here: `key` is a Mac CGKeyCode but
|
||||
// update_modifiers expects a Linux evdev scancode, and the two
|
||||
// codespaces collide (e.g. Mac LeftShift=56 == Linux KeyLeftAlt=56,
|
||||
// Mac Down=125 == Linux KeyLeftMeta=125), corrupting modifier
|
||||
// state for chords like Shift+Option+X or Cmd+Down. Modifier state
|
||||
// is owned by the main consume() loop, which already calls
|
||||
// update_modifiers with the correct Linux scancode on the real key
|
||||
// release event from the client.
|
||||
// release key when cancelled
|
||||
update_modifiers(&modifiers, key as u32, 0);
|
||||
key_event(event_source.clone(), key, 0, modifiers.get());
|
||||
});
|
||||
self.repeat_task = Some(repeat_task);
|
||||
@@ -168,19 +157,6 @@ extern "C" {
|
||||
fn AXIsProcessTrusted() -> bool;
|
||||
}
|
||||
|
||||
/// Mac virtual key codes for the four arrow keys.
|
||||
const MAC_KEY_LEFT: u16 = 0x7B;
|
||||
const MAC_KEY_RIGHT: u16 = 0x7C;
|
||||
const MAC_KEY_DOWN: u16 = 0x7D;
|
||||
const MAC_KEY_UP: u16 = 0x7E;
|
||||
|
||||
fn is_arrow_key(key: u16) -> bool {
|
||||
matches!(
|
||||
key,
|
||||
MAC_KEY_LEFT | MAC_KEY_RIGHT | MAC_KEY_DOWN | MAC_KEY_UP
|
||||
)
|
||||
}
|
||||
|
||||
fn key_event(event_source: CGEventSource, key: u16, state: u8, modifiers: XMods) {
|
||||
let event = match CGEvent::new_keyboard_event(event_source, key, state != 0) {
|
||||
Ok(e) => e,
|
||||
@@ -189,15 +165,7 @@ fn key_event(event_source: CGEventSource, key: u16, state: u8, modifiers: XMods)
|
||||
return;
|
||||
}
|
||||
};
|
||||
let mut flags = to_cgevent_flags(modifiers);
|
||||
// Hardware-generated arrow keys on macOS carry NumericPad + SecondaryFn.
|
||||
// CGEventTap-based hotkey matchers (e.g. tiling window managers) check
|
||||
// these flags to recognize navigation keys; without them synthesized
|
||||
// arrow chords fall through to the focused app.
|
||||
if is_arrow_key(key) {
|
||||
flags |= CGEventFlags::CGEventFlagNumericPad | CGEventFlags::CGEventFlagSecondaryFn;
|
||||
}
|
||||
event.set_flags(flags);
|
||||
event.set_flags(to_cgevent_flags(modifiers));
|
||||
event.post(CGEventTapLocation::HID);
|
||||
log::trace!("key event: {key} {state}");
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "input-event"
|
||||
description = "cross-platform input-event types for input-capture / input-emulation"
|
||||
version = "0.4.0"
|
||||
version = "0.3.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
[package]
|
||||
name = "lan-mouse-cli"
|
||||
description = "CLI Frontend for lan-mouse"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
|
||||
[dependencies]
|
||||
futures = "0.3.30"
|
||||
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.3.0" }
|
||||
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.2.0" }
|
||||
clap = { version = "4.4.11", features = ["derive"] }
|
||||
thiserror = "2.0.0"
|
||||
tokio = { version = "1.32.0", features = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "lan-mouse-gtk"
|
||||
description = "GTK4 / Libadwaita Frontend for lan-mouse"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
@@ -12,7 +12,7 @@ adw = { package = "libadwaita", version = "0.7.0", features = ["v1_1"] }
|
||||
async-channel = { version = "2.1.1" }
|
||||
hostname = "0.4.0"
|
||||
log = "0.4.20"
|
||||
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.3.0" }
|
||||
lan-mouse-ipc = { path = "../lan-mouse-ipc", version = "0.2.0" }
|
||||
thiserror = "2.0.0"
|
||||
|
||||
[build-dependencies]
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
<file compressed="true" preprocess="xml-stripblanks">fingerprint_window.ui</file>
|
||||
<file compressed="true" preprocess="xml-stripblanks">client_row.ui</file>
|
||||
<file compressed="true" preprocess="xml-stripblanks">key_row.ui</file>
|
||||
<file compressed="true">style.css</file>
|
||||
</gresource>
|
||||
<gresource prefix="/de/feschber/LanMouse/icons">
|
||||
<file compressed="true" preprocess="xml-stripblanks">de.feschber.LanMouse.svg</file>
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
.peer-match > box > list .subtitle {
|
||||
color: @success_color;
|
||||
}
|
||||
|
||||
.peer-mismatch > box > list .subtitle {
|
||||
font-weight: bold;
|
||||
color: @warning_color;
|
||||
}
|
||||
|
||||
.peer-unknown > box > list .subtitle {
|
||||
color: @warning_color;
|
||||
}
|
||||
@@ -26,7 +26,6 @@ impl ClientObject {
|
||||
.collect::<Vec<_>>(),
|
||||
)
|
||||
.property("resolving", state.resolving)
|
||||
.property("peer-commit", peer_commit_to_string(state.peer_commit))
|
||||
.build()
|
||||
}
|
||||
|
||||
@@ -35,14 +34,6 @@ impl ClientObject {
|
||||
}
|
||||
}
|
||||
|
||||
/// Render the 8-byte ASCII commit hash carried in
|
||||
/// [`lan_mouse_ipc::ClientState::peer_commit`] as a `String`. `None`
|
||||
/// in → `None` out (peer hasn't sent a Hello yet, or speaks an older
|
||||
/// proto).
|
||||
pub fn peer_commit_to_string(commit: Option<[u8; 8]>) -> Option<String> {
|
||||
commit.and_then(|c| std::str::from_utf8(&c).ok().map(str::to_string))
|
||||
}
|
||||
|
||||
#[derive(Default, Clone)]
|
||||
pub struct ClientData {
|
||||
pub handle: ClientHandle,
|
||||
@@ -52,5 +43,4 @@ pub struct ClientData {
|
||||
pub position: String,
|
||||
pub resolving: bool,
|
||||
pub ips: Vec<String>,
|
||||
pub peer_commit: Option<String>,
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@ pub struct ClientObject {
|
||||
#[property(name = "position", get, set, type = String, member = position)]
|
||||
#[property(name = "resolving", get, set, type = bool, member = resolving)]
|
||||
#[property(name = "ips", get, set, type = Vec<String>, member = ips)]
|
||||
#[property(name = "peer-commit", get, set, type = Option<String>, member = peer_commit)]
|
||||
pub data: RefCell<ClientData>,
|
||||
}
|
||||
|
||||
|
||||
@@ -123,12 +123,6 @@ impl ClientRow {
|
||||
bindings.push(position_binding);
|
||||
bindings.push(resolve_binding);
|
||||
bindings.push(ip_binding);
|
||||
|
||||
// Render the initial collapsed subtitle from whatever
|
||||
// peer_commit the ClientObject was created with. Subsequent
|
||||
// changes are pushed by `Window::update_client_state` calling
|
||||
// `refresh_version_status` after writing the new property.
|
||||
self.refresh_version_status();
|
||||
}
|
||||
|
||||
pub fn unbind(&self) {
|
||||
@@ -156,40 +150,4 @@ impl ClientRow {
|
||||
pub fn set_dns_state(&self, resolved: bool) {
|
||||
self.imp().set_dns_state(resolved);
|
||||
}
|
||||
|
||||
/// Recompute the collapsed subtitle (Pango markup) based on the
|
||||
/// current `peer-commit` property and the local build's commit.
|
||||
/// Soft-warn semantics: a missing or mismatched peer commit
|
||||
/// surfaces as orange text but never blocks traffic. Called by
|
||||
/// the window after `update_client_state` writes the new
|
||||
/// `peer-commit`. The dns-status icon is left to its existing
|
||||
/// `set_dns_state` handler so the two indicators don't fight
|
||||
/// for the same CSS class.
|
||||
pub fn refresh_version_status(&self) {
|
||||
let peer: Option<String> = self
|
||||
.imp()
|
||||
.client_object
|
||||
.borrow()
|
||||
.as_ref()
|
||||
.and_then(|co| co.property::<Option<String>>("peer-commit"));
|
||||
let local = crate::local_commit_str();
|
||||
let markup = match peer.as_deref() {
|
||||
None => format!("Peer version: unknown · Ours: {local}"),
|
||||
Some(p) if p == local.as_str() => {
|
||||
format!("Peer version: {p} · matched")
|
||||
}
|
||||
Some(p) => {
|
||||
format!("Peer version: {p} · Ours: {local}")
|
||||
}
|
||||
};
|
||||
self.remove_css_class("peer-mismatch");
|
||||
self.remove_css_class("peer-match");
|
||||
self.remove_css_class("peer-unknown");
|
||||
match peer.as_deref() {
|
||||
Some(p) if p == local.as_str() => self.add_css_class("peer-match"),
|
||||
Some(_) => self.add_css_class("peer-mismatch"),
|
||||
None => self.add_css_class("peer-unknown"),
|
||||
};
|
||||
self.set_subtitle(&markup);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,28 +10,10 @@ mod macos_privacy;
|
||||
mod macos_status_item;
|
||||
mod window;
|
||||
|
||||
use std::{env, process, str, sync::OnceLock};
|
||||
use std::{env, process, str};
|
||||
|
||||
use gtk::CssProvider;
|
||||
use window::Window;
|
||||
|
||||
/// Local build's commit hash, set once by [`run`] before the GTK
|
||||
/// main loop starts. Read by per-row UI to compare against each
|
||||
/// peer's [`lan_mouse_ipc::ClientState::peer_commit`] for the
|
||||
/// soft-warn version-mismatch indicator.
|
||||
pub(crate) static LOCAL_COMMIT: OnceLock<[u8; 8]> = OnceLock::new();
|
||||
|
||||
/// Convenience: returns the local commit as an 8-char ASCII string,
|
||||
/// or a placeholder if unset (which would indicate a programmer
|
||||
/// error since [`run`] always sets it).
|
||||
pub(crate) fn local_commit_str() -> String {
|
||||
LOCAL_COMMIT
|
||||
.get()
|
||||
.and_then(|c| std::str::from_utf8(c).ok())
|
||||
.unwrap_or("????????")
|
||||
.to_string()
|
||||
}
|
||||
|
||||
use lan_mouse_ipc::FrontendEvent;
|
||||
|
||||
use adw::Application;
|
||||
@@ -49,12 +31,8 @@ pub enum GtkError {
|
||||
NonZeroExitCode(i32),
|
||||
}
|
||||
|
||||
pub fn run(local_commit: [u8; 8]) -> Result<(), GtkError> {
|
||||
pub fn run() -> Result<(), GtkError> {
|
||||
log::debug!("running gtk frontend");
|
||||
LOCAL_COMMIT
|
||||
.set(local_commit)
|
||||
.expect("local_commit set once");
|
||||
|
||||
#[cfg(windows)]
|
||||
let ret = std::thread::Builder::new()
|
||||
.stack_size(8 * 1024 * 1024) // https://gitlab.gnome.org/GNOME/gtk/-/commit/52dbb3f372b2c3ea339e879689c1de535ba2c2c3 -> caused crash on windows
|
||||
@@ -86,7 +64,6 @@ fn gtk_main() -> glib::ExitCode {
|
||||
.build();
|
||||
|
||||
app.connect_startup(|app| {
|
||||
load_css();
|
||||
load_icons();
|
||||
setup_actions(app);
|
||||
setup_menu(app);
|
||||
@@ -155,16 +132,6 @@ fn configure_macos_bundle_environment() {
|
||||
);
|
||||
}
|
||||
|
||||
fn load_css() {
|
||||
let provider = CssProvider::default();
|
||||
provider.load_from_resource("de/feschber/LanMouse/style.css");
|
||||
gtk::style_context_add_provider_for_display(
|
||||
&Display::default().expect("Could not connect to a display"),
|
||||
&provider,
|
||||
gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
|
||||
);
|
||||
}
|
||||
|
||||
fn load_icons() {
|
||||
let display = &Display::default().expect("Could not connect to a display.");
|
||||
let icon_theme = IconTheme::for_display(display);
|
||||
|
||||
@@ -365,13 +365,6 @@ impl Window {
|
||||
.map(|ip| ip.to_string())
|
||||
.collect::<Vec<_>>();
|
||||
client_object.set_ips(ips);
|
||||
|
||||
/* peer build version (drives the version-match indicator) */
|
||||
client_object.set_property(
|
||||
"peer-commit",
|
||||
crate::client_object::peer_commit_to_string(state.peer_commit),
|
||||
);
|
||||
row.refresh_version_status();
|
||||
}
|
||||
|
||||
fn client_object_for_handle(&self, handle: ClientHandle) -> Option<ClientObject> {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "lan-mouse-ipc"
|
||||
description = "library for communication between lan-mouse service and frontends"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
|
||||
@@ -176,12 +176,6 @@ pub struct ClientState {
|
||||
pub has_pressed_keys: bool,
|
||||
/// dns resolving in progress
|
||||
pub resolving: bool,
|
||||
/// Peer's build short commit hash from the [`Hello`] proto
|
||||
/// event. `None` means we haven't received a Hello yet — either
|
||||
/// the connection is fresh, or the peer is on an older build
|
||||
/// that predates the Hello event. The frontend uses this to
|
||||
/// soft-warn on version mismatch.
|
||||
pub peer_commit: Option<[u8; 8]>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "lan-mouse-proto"
|
||||
description = "network protocol for lan-mouse"
|
||||
version = "0.3.0"
|
||||
version = "0.2.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://github.com/feschber/lan-mouse"
|
||||
@@ -9,5 +9,5 @@ repository = "https://github.com/feschber/lan-mouse"
|
||||
[dependencies]
|
||||
num_enum = "0.7.2"
|
||||
thiserror = "2.0.0"
|
||||
input-event = { path = "../input-event", version = "0.4.0" }
|
||||
input-event = { path = "../input-event", version = "0.3.0" }
|
||||
paste = "1.0"
|
||||
|
||||
@@ -63,15 +63,6 @@ pub enum ProtoEvent {
|
||||
Ping,
|
||||
/// Response to [`ProtoEvent::Ping`], true if emulation is enabled / available
|
||||
Pong(bool),
|
||||
/// Build identification for the sending peer. Sent by the
|
||||
/// connect side once after the connection authenticates, and
|
||||
/// echoed back by the listen side in reply, so each end can
|
||||
/// display the peer's build hash and warn (soft) on mismatch.
|
||||
/// `commit` is the 8-byte ASCII short commit hash from
|
||||
/// `shadow_rs`'s `SHORT_COMMIT`. Old peers that don't
|
||||
/// recognize the event type silently skip it per the
|
||||
/// forward-compat handling in the receive loop.
|
||||
Hello { commit: [u8; 8] },
|
||||
}
|
||||
|
||||
impl Display for ProtoEvent {
|
||||
@@ -89,10 +80,6 @@ impl Display for ProtoEvent {
|
||||
if *alive { "alive" } else { "not available" }
|
||||
)
|
||||
}
|
||||
ProtoEvent::Hello { commit } => {
|
||||
let s = std::str::from_utf8(commit).unwrap_or("????????");
|
||||
write!(f, "Hello({s})")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -111,7 +98,6 @@ pub enum EventType {
|
||||
Enter,
|
||||
Leave,
|
||||
Ack,
|
||||
Hello,
|
||||
}
|
||||
|
||||
impl ProtoEvent {
|
||||
@@ -134,7 +120,6 @@ impl ProtoEvent {
|
||||
ProtoEvent::Enter(_) => EventType::Enter,
|
||||
ProtoEvent::Leave(_) => EventType::Leave,
|
||||
ProtoEvent::Ack(_) => EventType::Ack,
|
||||
ProtoEvent::Hello { .. } => EventType::Hello,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -189,13 +174,6 @@ impl TryFrom<[u8; MAX_EVENT_SIZE]> for ProtoEvent {
|
||||
EventType::Enter => Ok(Self::Enter(decode_u8(&mut buf)?.try_into()?)),
|
||||
EventType::Leave => Ok(Self::Leave(decode_u32(&mut buf)?)),
|
||||
EventType::Ack => Ok(Self::Ack(decode_u32(&mut buf)?)),
|
||||
EventType::Hello => {
|
||||
let mut commit = [0u8; 8];
|
||||
for b in commit.iter_mut() {
|
||||
*b = decode_u8(&mut buf)?;
|
||||
}
|
||||
Ok(Self::Hello { commit })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -260,11 +238,6 @@ impl From<ProtoEvent> for ([u8; MAX_EVENT_SIZE], usize) {
|
||||
ProtoEvent::Enter(pos) => encode_u8(buf, len, pos as u8),
|
||||
ProtoEvent::Leave(serial) => encode_u32(buf, len, serial),
|
||||
ProtoEvent::Ack(serial) => encode_u32(buf, len, serial),
|
||||
ProtoEvent::Hello { commit } => {
|
||||
for b in commit.iter() {
|
||||
encode_u8(buf, len, *b);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
(buf, len)
|
||||
|
||||
@@ -282,12 +282,6 @@ impl ClientManager {
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn set_peer_commit(&self, handle: ClientHandle, commit: Option<[u8; 8]>) {
|
||||
if let Some((_, s)) = self.clients.borrow_mut().get_mut(handle as usize) {
|
||||
s.peer_commit = commit;
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn active_addr(&self, handle: ClientHandle) -> Option<SocketAddr> {
|
||||
self.clients
|
||||
.borrow()
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
use crate::capture_test::TestCaptureArgs;
|
||||
use crate::emulation_test::TestEmulationArgs;
|
||||
use clap::{Parser, Subcommand, ValueEnum};
|
||||
use notify::event::ModifyKind;
|
||||
use notify::{EventKind, RecommendedWatcher, Watcher};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
@@ -28,18 +27,6 @@ use shadow_rs::shadow;
|
||||
|
||||
shadow!(build);
|
||||
|
||||
/// Local build's 8-byte ASCII short commit hash, suitable for use
|
||||
/// in [`lan_mouse_proto::ProtoEvent::Hello`]. Pads with `'?'` if
|
||||
/// shadow_rs returns an unexpected length so the field is always
|
||||
/// well-formed on the wire.
|
||||
pub fn local_commit() -> [u8; 8] {
|
||||
let bytes = build::SHORT_COMMIT.as_bytes();
|
||||
let mut out = [b'?'; 8];
|
||||
let n = bytes.len().min(8);
|
||||
out[..n].copy_from_slice(&bytes[..n]);
|
||||
out
|
||||
}
|
||||
|
||||
const CONFIG_FILE_NAME: &str = "config.toml";
|
||||
const CERT_FILE_NAME: &str = "lan-mouse.pem";
|
||||
|
||||
@@ -419,9 +406,7 @@ impl Config {
|
||||
if event.paths.contains(&self.config_path)
|
||||
&& matches!(
|
||||
event.kind,
|
||||
EventKind::Create(_)
|
||||
| EventKind::Modify(ModifyKind::Data(_))
|
||||
| EventKind::Remove(_)
|
||||
EventKind::Create(_) | EventKind::Modify(_) | EventKind::Remove(_)
|
||||
)
|
||||
&& self.read_from_disk()?
|
||||
{
|
||||
@@ -539,11 +524,6 @@ impl Config {
|
||||
}
|
||||
Err(e) => log::warn!("{:?} {e}", self.config_path()),
|
||||
};
|
||||
if changed {
|
||||
log::info!("config changed");
|
||||
} else {
|
||||
log::info!("config unchanged");
|
||||
}
|
||||
Ok(changed)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
use crate::client::ClientManager;
|
||||
use crate::config::local_commit;
|
||||
use lan_mouse_ipc::{ClientHandle, DEFAULT_PORT};
|
||||
use lan_mouse_proto::{MAX_EVENT_SIZE, ProtoEvent};
|
||||
use local_channel::mpsc::{Receiver, Sender, channel};
|
||||
@@ -198,19 +197,6 @@ async fn connect_to_handle(
|
||||
conns.lock().await.insert(addr, conn.clone());
|
||||
connecting.lock().await.remove(&handle);
|
||||
|
||||
// Best-effort version handshake. Send our commit hash once
|
||||
// immediately after the DTLS handshake; the listen side
|
||||
// mirrors a Hello back so the receive loop can populate
|
||||
// `peer_commit`. Old peers will silently skip this event
|
||||
// per the forward-compat handler in [`receive_loop`].
|
||||
let (buf, len) = ProtoEvent::Hello {
|
||||
commit: local_commit(),
|
||||
}
|
||||
.into();
|
||||
if let Err(e) = conn.send(&buf[..len]).await {
|
||||
log::debug!("hello send to {addr} failed: {e}");
|
||||
}
|
||||
|
||||
// poll connection for active
|
||||
spawn_local(ping_pong(addr, conn.clone(), ping_response.clone()));
|
||||
|
||||
@@ -269,26 +255,16 @@ async fn receive_loop(
|
||||
) {
|
||||
let mut buf = [0u8; MAX_EVENT_SIZE];
|
||||
while conn.recv(&mut buf).await.is_ok() {
|
||||
match buf.try_into() {
|
||||
Ok(event) => {
|
||||
log::trace!("{addr} <==<==<== {event}");
|
||||
match event {
|
||||
ProtoEvent::Pong(b) => {
|
||||
client_manager.set_active_addr(handle, Some(addr));
|
||||
client_manager.set_alive(handle, b);
|
||||
ping_response.borrow_mut().insert(addr);
|
||||
}
|
||||
ProtoEvent::Hello { commit } => {
|
||||
client_manager.set_peer_commit(handle, Some(commit));
|
||||
}
|
||||
event => tx.send((handle, event)).expect("channel closed"),
|
||||
if let Ok(event) = buf.try_into() {
|
||||
log::trace!("{addr} <==<==<== {event}");
|
||||
match event {
|
||||
ProtoEvent::Pong(b) => {
|
||||
client_manager.set_active_addr(handle, Some(addr));
|
||||
client_manager.set_alive(handle, b);
|
||||
ping_response.borrow_mut().insert(addr);
|
||||
}
|
||||
event => tx.send((handle, event)).expect("channel closed"),
|
||||
}
|
||||
// Skip undecodable datagrams without dropping the
|
||||
// connection. Each DTLS recv is one framed message, so
|
||||
// skipping is safe and keeps us forward-compatible with
|
||||
// peers that send event types we don't yet know about.
|
||||
Err(e) => log::debug!("ignoring undecodable event from {addr}: {e}"),
|
||||
}
|
||||
}
|
||||
log::warn!("recv error");
|
||||
@@ -304,7 +280,6 @@ async fn disconnect(
|
||||
log::warn!("client ({handle}) @ {addr} connection closed");
|
||||
conns.lock().await.remove(&addr);
|
||||
client_manager.set_active_addr(handle, None);
|
||||
client_manager.set_peer_commit(handle, None);
|
||||
let active: Vec<SocketAddr> = conns.lock().await.keys().copied().collect();
|
||||
log::info!("active connections: {active:?}");
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use crate::config::local_commit;
|
||||
use crate::listen::{LanMouseListener, ListenEvent, ListenerCreationError};
|
||||
use futures::StreamExt;
|
||||
use input_emulation::{EmulationHandle, InputEmulation, InputEmulationError};
|
||||
@@ -53,17 +52,6 @@ pub(crate) enum EmulationEvent {
|
||||
EmulationEnabled,
|
||||
/// capture should be released
|
||||
ReleaseNotify,
|
||||
/// peer sent us a Hello with its build commit hash. Used to
|
||||
/// populate `client_manager.peer_commit` from the listen side
|
||||
/// too — without this, peer-version visibility silently fails
|
||||
/// whenever the outgoing connection in the *other* direction is
|
||||
/// broken (one-way setups, asymmetric NAT, peer's TCP listener
|
||||
/// down). The connect-side path stays as the primary source;
|
||||
/// this is the defensive fallback.
|
||||
PeerHello {
|
||||
addr: SocketAddr,
|
||||
commit: [u8; 8],
|
||||
},
|
||||
}
|
||||
|
||||
enum EmulationRequest {
|
||||
@@ -162,21 +150,6 @@ impl ListenTask {
|
||||
}
|
||||
ProtoEvent::Input(event) => self.emulation_proxy.consume(event, addr),
|
||||
ProtoEvent::Ping => self.listener.reply(addr, ProtoEvent::Pong(self.emulation_proxy.emulation_active.get())).await,
|
||||
// Peer's version handshake. Echo our own
|
||||
// commit back so the peer's connect-side
|
||||
// receive_loop populates its `peer_commit`,
|
||||
// AND publish a PeerHello upward so our
|
||||
// service can populate ours from the listen
|
||||
// side too — the connect side is the primary
|
||||
// path, but if the outbound direction is
|
||||
// broken (one-way setup, NAT, peer's TCP
|
||||
// listener down) the version display would
|
||||
// otherwise silently say "unknown" while
|
||||
// the peer is in fact happily talking to us.
|
||||
ProtoEvent::Hello { commit } => {
|
||||
self.listener.reply(addr, ProtoEvent::Hello { commit: local_commit() }).await;
|
||||
self.event_tx.send(EmulationEvent::PeerHello { addr, commit }).expect("channel closed");
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,16 +259,8 @@ async fn read_loop(
|
||||
.send(ListenEvent::Msg { event, addr })
|
||||
.expect("channel closed"),
|
||||
Err(e) => {
|
||||
// Skip the malformed/unknown datagram and keep
|
||||
// listening. Each DTLS recv returns one full
|
||||
// datagram, so a parse error here can't desync a
|
||||
// stream; the next call gets a fresh, framed
|
||||
// message. This makes the protocol forward-
|
||||
// compatible: a peer running a newer Lan Mouse
|
||||
// version can introduce additional event types
|
||||
// and old peers will simply ignore them rather
|
||||
// than dropping the connection.
|
||||
log::debug!("ignoring undecodable event from {addr}: {e}");
|
||||
log::warn!("error receiving event: {e}");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ fn run() -> Result<(), LanMouseError> {
|
||||
#[cfg(feature = "gtk")]
|
||||
{
|
||||
let mut service = start_service()?;
|
||||
let res = lan_mouse_gtk::run(config::local_commit());
|
||||
let res = lan_mouse_gtk::run();
|
||||
#[cfg(unix)]
|
||||
{
|
||||
// on unix we give the service a chance to terminate gracefully
|
||||
|
||||
@@ -319,17 +319,6 @@ impl Service {
|
||||
EmulationEvent::Connected { addr, fingerprint } => {
|
||||
self.notify_frontend(FrontendEvent::DeviceConnected { addr, fingerprint });
|
||||
}
|
||||
EmulationEvent::PeerHello { addr, commit } => {
|
||||
// Map the peer's source addr back to its client handle
|
||||
// and stamp the commit. Skip if we don't have an
|
||||
// outgoing client configured for this peer (incoming-
|
||||
// only setup) — there's nowhere to display the version
|
||||
// in that case anyway.
|
||||
if let Some(handle) = self.client_manager.get_client(addr) {
|
||||
self.client_manager.set_peer_commit(handle, Some(commit));
|
||||
self.broadcast_client(handle);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user