aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-03-09 12:51:00 +0100
committerAlex Auvolat <alex@adnab.me>2023-03-09 12:51:00 +0100
commit1fd9f209746fc6f26af87a7c431899eca1c3f6d7 (patch)
treea77ba2c43f2565c8371df2c19c0d7b57d6b916e2 /src
parentca486f05ca630080f56d215f28bdd14a6cf7ab83 (diff)
downloadwgautomesh-1fd9f209746fc6f26af87a7c431899eca1c3f6d7.tar.gz
wgautomesh-1fd9f209746fc6f26af87a7c431899eca1c3f6d7.zip
DNS resolution; faster cycling
Diffstat (limited to 'src')
-rw-r--r--src/main.rs40
1 files changed, 29 insertions, 11 deletions
diff --git a/src/main.rs b/src/main.rs
index d16e03c..5074d08 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
use std::collections::HashMap;
-use std::net::{IpAddr, SocketAddr, UdpSocket};
+use std::net::{IpAddr, SocketAddr, UdpSocket, ToSocketAddrs};
use std::process::Command;
use std::sync::Mutex;
use std::thread;
@@ -14,8 +14,8 @@ const KEEP_MAX_ADDRESSES: usize = 5;
/// Number of peers to gossip with
const GOSSIP_PEERS: usize = 10;
-/// Interval at which to try new addresses when disconnected (1 minute)
-const TRY_INTERVAL: Duration = Duration::from_secs(60);
+/// Interval at which to try new addresses when disconnected
+const TRY_INTERVAL: Duration = Duration::from_secs(30);
/// Time before a peer is considered dead (5 minutes)
const TIMEOUT: Duration = Duration::from_secs(300);
/// Interval at which to gossip last_seen info
@@ -41,7 +41,7 @@ struct Peer {
/// The peer's Wireguard address
address: IpAddr,
/// An optionnal Wireguard endpoint used to initialize a connection to this peer
- endpoint: Option<SocketAddr>,
+ endpoint: Option<String>,
}
fn main() -> Result<()> {
@@ -363,22 +363,42 @@ impl State {
fn setup_wg_peers(&self, daemon: &Daemon, i: usize) -> Result<()> {
let now = time();
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
.peers
.get(&peer.pubkey)
.map(|x| now < x.last_seen + TIMEOUT.as_secs())
.unwrap_or(false)
{
+ Command::new("wg")
+ .args([
+ "set",
+ &daemon.config.interface,
+ "peer",
+ &peer.pubkey,
+ "persistent-keepalive",
+ "30",
+ ])
+ .output()?;
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();
- if endpoints.is_empty() {
- if let Some(endpoint) = peer.endpoint {
- endpoints.push((endpoint, 0));
+ if let Some(endpoint) = &peer.endpoint {
+ match endpoint.to_socket_addrs() {
+ Err(e) => error!("Could not resolve DNS for {}: {}", endpoint, e),
+ Ok(iter) => for addr in iter {
+ endpoints.push((addr, 0));
+ }
}
}
endpoints.sort();
+
if !endpoints.is_empty() {
let endpoint = endpoints[i % endpoints.len()];
info!("Configure {} with endpoint {}", peer.pubkey, endpoint.0);
@@ -391,7 +411,7 @@ impl State {
"endpoint",
&endpoint.0.to_string(),
"persistent-keepalive",
- "20",
+ "10",
"allowed-ips",
&format!("{}/32", peer.address),
])
@@ -404,8 +424,6 @@ impl State {
&daemon.config.interface,
"peer",
&peer.pubkey,
- "persistent-keepalive",
- "20",
"allowed-ips",
&format!("{}/32", peer.address),
])