Deuxfleurs/wgautomesh
16
1
Fork 1
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

DNS resolution; faster cycling

Browse source
This commit is contained in:
Alex 2023-03-09 12:51:00 +01:00
parent ca486f05ca
commit 1fd9f20974
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main.rs
View file

@ -1,5 +1,5 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::net::{IpAddr, SocketAddr, UdpSocket}; use std::net::{IpAddr, SocketAddr, UdpSocket, ToSocketAddrs};
use std::process::Command; use std::process::Command;
use std::sync::Mutex; use std::sync::Mutex;
use std::thread; use std::thread;
@ -14,8 +14,8 @@ const KEEP_MAX_ADDRESSES: usize = 5;
/// Number of peers to gossip with /// Number of peers to gossip with
const GOSSIP_PEERS: usize = 10; const GOSSIP_PEERS: usize = 10;
/// Interval at which to try new addresses when disconnected (1 minute) /// Interval at which to try new addresses when disconnected
const TRY_INTERVAL: Duration = Duration::from_secs(60); const TRY_INTERVAL: Duration = Duration::from_secs(30);
/// Time before a peer is considered dead (5 minutes) /// Time before a peer is considered dead (5 minutes)
const TIMEOUT: Duration = Duration::from_secs(300); const TIMEOUT: Duration = Duration::from_secs(300);
/// Interval at which to gossip last_seen info /// Interval at which to gossip last_seen info
@ -41,7 +41,7 @@ struct Peer {
/// The peer's Wireguard address /// The peer's Wireguard address
address: IpAddr, address: IpAddr,
/// An optionnal Wireguard endpoint used to initialize a connection to this peer /// An optionnal Wireguard endpoint used to initialize a connection to this peer
endpoint: Option<SocketAddr>, endpoint: Option<String>,
} }
fn main() -> Result<()> { fn main() -> Result<()> {
@ -363,22 +363,42 @@ impl State {
fn setup_wg_peers(&self, daemon: &Daemon, i: usize) -> Result<()> { fn setup_wg_peers(&self, daemon: &Daemon, i: usize) -> Result<()> {
let now = time(); let now = time();
for peer in daemon.config.peers.iter() { for peer in daemon.config.peers.iter() {
// Skip peer if it is in connected state // Skip ourself
if peer.pubkey == daemon.our_pubkey {
continue;
}
// If peer is connected, use higher keepalive and then skip reconfiguring it
if self if self
.peers .peers
.get(&peer.pubkey) .get(&peer.pubkey)
.map(|x| now < x.last_seen + TIMEOUT.as_secs()) .map(|x| now < x.last_seen + TIMEOUT.as_secs())
.unwrap_or(false) .unwrap_or(false)
{ {
Command::new("wg")
.args([
"set",
&daemon.config.interface,
"peer",
&peer.pubkey,
"persistent-keepalive",
"30",
])
.output()?;
continue; continue;
} }
// For disconnected peers, cycle through the IP addresses that we know of
let mut endpoints = self.gossip.get(&peer.pubkey).cloned().unwrap_or_default(); let mut endpoints = self.gossip.get(&peer.pubkey).cloned().unwrap_or_default();
if endpoints.is_empty() { if let Some(endpoint) = &peer.endpoint {
if let Some(endpoint) = peer.endpoint { match endpoint.to_socket_addrs() {
endpoints.push((endpoint, 0)); Err(e) => error!("Could not resolve DNS for {}: {}", endpoint, e),
Ok(iter) => for addr in iter {
endpoints.push((addr, 0));
}
} }
} }
endpoints.sort(); endpoints.sort();
if !endpoints.is_empty() { if !endpoints.is_empty() {
let endpoint = endpoints[i % endpoints.len()]; let endpoint = endpoints[i % endpoints.len()];
info!("Configure {} with endpoint {}", peer.pubkey, endpoint.0); info!("Configure {} with endpoint {}", peer.pubkey, endpoint.0);
@ -391,7 +411,7 @@ impl State {
"endpoint", "endpoint",
&endpoint.0.to_string(), &endpoint.0.to_string(),
"persistent-keepalive", "persistent-keepalive",
"20", "10",
"allowed-ips", "allowed-ips",
&format!("{}/32", peer.address), &format!("{}/32", peer.address),
]) ])
@ -404,8 +424,6 @@ impl State {
&daemon.config.interface, &daemon.config.interface,
"peer", "peer",
&peer.pubkey, &peer.pubkey,
"persistent-keepalive",
"20",
"allowed-ips", "allowed-ips",
&format!("{}/32", peer.address), &format!("{}/32", peer.address),
]) ])