TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-03-31 00:50:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

avoid duplicating incoming handles

Browse Source
This commit is contained in:
Ferdinand Schober
2024-10-19 19:21:41 +02:00
parent 87304744ad
commit 9dc4e95a4d
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/service.rs
View File

@@ -75,7 +75,10 @@ pub struct Service {
pending_incoming: Rc<RefCell<VecDeque<IncomingEvent>>>, pending_incoming: Rc<RefCell<VecDeque<IncomingEvent>>>,
capture_status: Rc<Cell<Status>>, capture_status: Rc<Cell<Status>>,
pub(crate) emulation_status: Rc<Cell<Status>>, pub(crate) emulation_status: Rc<Cell<Status>>,
incoming_conns: Rc<RefCell<HashMap<ClientHandle, Incoming>>>, /// keep track of registered connections to avoid duplicate barriers
incoming_conns: Rc<RefCell<HashSet<SocketAddr>>>,
/// map from capture handle to connection info
incoming_conn_info: Rc<RefCell<HashMap<ClientHandle, Incoming>>>,
cert: Certificate, cert: Certificate,
next_trigger_handle: u64, next_trigger_handle: u64,
} }
@@ -135,7 +138,8 @@ impl Service {
pending_frontend_events: Rc::new(RefCell::new(VecDeque::new())), pending_frontend_events: Rc::new(RefCell::new(VecDeque::new())),
capture_status: Default::default(), capture_status: Default::default(),
emulation_status: Default::default(), emulation_status: Default::default(),
incoming_conns: Rc::new(RefCell::new(HashMap::new())), incoming_conn_info: Default::default(),
incoming_conns: Default::default(),
next_trigger_handle: 0, next_trigger_handle: 0,
}; };
Ok(service) Ok(service)
@@ -196,8 +200,11 @@ impl Service {
} { } {
match incoming { match incoming {
IncomingEvent::Connected { addr, pos, fingerprint } => { IncomingEvent::Connected { addr, pos, fingerprint } => {
self.add_incoming(addr, pos, fingerprint.clone(), &capture); // check if already registered
self.notify_frontend(FrontendEvent::IncomingConnected(fingerprint, addr, pos)); if self.incoming_conns.borrow_mut().insert(addr) {
self.add_incoming(addr, pos, fingerprint.clone(), &capture);
self.notify_frontend(FrontendEvent::IncomingConnected(fingerprint, addr, pos));
}
}, },
IncomingEvent::Disconnected { addr } => { IncomingEvent::Disconnected { addr } => {
if let Some(fp) = self.remove_incoming(addr, &capture) { if let Some(fp) = self.remove_incoming(addr, &capture) {
@@ -214,7 +221,7 @@ impl Service {
handle = capture.entered() => { handle = capture.entered() => {
// we entered the capture zone for an incoming connection // we entered the capture zone for an incoming connection
// => notify it that its capture should be released // => notify it that its capture should be released
if let Some(incoming) = self.incoming_conns.borrow().get(&handle) { if let Some(incoming) = self.incoming_conn_info.borrow().get(&handle) {
emulation.notify_release(incoming.addr); emulation.notify_release(incoming.addr);
} }
}, },
@@ -248,7 +255,7 @@ impl Service {
let handle = Self::ENTER_HANDLE_BEGIN + self.next_trigger_handle; let handle = Self::ENTER_HANDLE_BEGIN + self.next_trigger_handle;
self.next_trigger_handle += 1; self.next_trigger_handle += 1;
capture.create(handle, pos); capture.create(handle, pos);
self.incoming_conns.borrow_mut().insert( self.incoming_conn_info.borrow_mut().insert(
handle, handle,
Incoming { Incoming {
fingerprint, fingerprint,
@@ -260,20 +267,21 @@ impl Service {
fn remove_incoming(&mut self, addr: SocketAddr, capture: &Capture) -> Option<String> { fn remove_incoming(&mut self, addr: SocketAddr, capture: &Capture) -> Option<String> {
let handle = self let handle = self
.incoming_conns .incoming_conn_info
.borrow() .borrow()
.iter() .iter()
.find(|(_, incoming)| incoming.addr == addr) .find(|(_, incoming)| incoming.addr == addr)
.map(|(k, _)| *k)?; .map(|(k, _)| *k)?;
capture.destroy(handle); capture.destroy(handle);
self.incoming_conns self.incoming_conns.borrow_mut().remove(&addr);
self.incoming_conn_info
.borrow_mut() .borrow_mut()
.remove(&handle) .remove(&handle)
.map(|incoming| incoming.fingerprint) .map(|incoming| incoming.fingerprint)
} }
pub(crate) fn get_incoming_pos(&self, handle: ClientHandle) -> Option<Position> { pub(crate) fn get_incoming_pos(&self, handle: ClientHandle) -> Option<Position> {
self.incoming_conns self.incoming_conn_info
.borrow() .borrow()
.get(&handle) .get(&handle)
.map(|incoming| incoming.pos) .map(|incoming| incoming.pos)