dswd
/
vpncloud
mirror of https://github.com/dswd/vpncloud.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Formatting

This commit is contained in:
Dennis Schwerdel 2021-01-23 21:03:36 +01:00
parent e6994e6939
commit 8e3cdbddbf
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cloud.rs
View File

@ -281,16 +281,18 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
return Ok(()) return Ok(())
} }
} }
if !addrs.is_empty() {
self.config.call_event_script(
"peer_connecting",
vec![("PEER", format!("{:?}", addr_nice(addrs[0]))), ("IFNAME", self.device.ifname().to_owned())],
true
);
}
// Send a message to each resolved address // Send a message to each resolved address
for a in addrs { for a in addrs {
// Ignore error this time // Ignore error this time
self.connect_sock(a).ok(); self.connect_sock(a).ok();
} }
self.config.call_event_script(
"peer_connecting",
vec![("PEER", format!("{:?}", addr)), ("IFNAME", self.device.ifname().to_owned())],
true
);
Ok(()) Ok(())
} }
@ -638,7 +640,12 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
info!("Added peer {}", addr_nice(addr)); info!("Added peer {}", addr_nice(addr));
self.config.call_event_script( self.config.call_event_script(
"peer_connected", "peer_connected",
vec![("PEER", format!("{:?}", addr)), ("IFNAME", self.device.ifname().to_owned())], vec![
("PEER", format!("{:?}", addr_nice(addr))),
("IFNAME", self.device.ifname().to_owned()),
("CLAIMS", info.claims.iter().map(|r| format!("{:?}", r)).collect::<Vec<String>>().join(" ")),
("NODE_ID", format!("{:?}", info.node_id)),
],
true true
); );
if let Some(init) = self.pending_inits.remove(&addr) { if let Some(init) = self.pending_inits.remove(&addr) {
@ -658,14 +665,18 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
} }
fn remove_peer(&mut self, addr: SocketAddr) { fn remove_peer(&mut self, addr: SocketAddr) {
if let Some(_peer) = self.peers.remove(&addr) { if let Some(peer) = self.peers.remove(&addr) {
info!("Closing connection to {}", addr_nice(addr)); info!("Closing connection to {}", addr_nice(addr));
self.table.remove_claims(addr);
self.config.call_event_script( self.config.call_event_script(
"peer_disconnected", "peer_disconnected",
vec![("PEER", format!("{:?}", addr)), ("IFNAME", self.device.ifname().to_owned())], vec![
("PEER", format!("{:?}", addr)),
("IFNAME", self.device.ifname().to_owned()),
("NODE_ID", format!("{:?}", peer.node_id)),
],
true true
); );
self.table.remove_claims(addr);
} }
} }
@ -781,7 +792,10 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
Ok(res) => { Ok(res) => {
self.config.call_event_script( self.config.call_event_script(
"peer_connecting", "peer_connecting",
vec![("PEER", format!("{:?}", src)), ("IFNAME", self.device.ifname().to_owned())], vec![
("PEER", format!("{:?}", addr_nice(src))),
("IFNAME", self.device.ifname().to_owned()),
],
true true
); );
self.pending_inits.insert(src, init); self.pending_inits.insert(src, init);
@ -825,7 +839,7 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
self.pending_inits.remove(&src); self.pending_inits.remove(&src);
self.config.call_event_script( self.config.call_event_script(
"peer_disconnected", "peer_disconnected",
vec![("PEER", format!("{:?}", src)), ("IFNAME", self.device.ifname().to_owned())], vec![("PEER", format!("{:?}", addr_nice(src))), ("IFNAME", self.device.ifname().to_owned())],
true true
); );
} }