Local code formatting

.rustfmt.toml

@@ -0,0 +1,2 @@
+hard_tabs = false
+tab_spaces = 2

src/config/mod.rs

@@ -3,8 +3,12 @@ mod options;
 mod options_test;
 mod runtime;
 
-pub use options::{ConfigOpts, ConfigOptsConsul, ConfigOptsAcme, ConfigOptsFirewall, ConfigOptsIgd};
+pub use options::{
-pub use runtime::{RuntimeConfig, RuntimeConfigAcme, RuntimeConfigConsul, RuntimeConfigFirewall, RuntimeConfigIgd};
+  ConfigOpts, ConfigOptsAcme, ConfigOptsConsul, ConfigOptsFirewall, ConfigOptsIgd,
+};
+pub use runtime::{
+  RuntimeConfig, RuntimeConfigAcme, RuntimeConfigConsul, RuntimeConfigFirewall, RuntimeConfigIgd,
+};
 
 pub const EXPIRATION_TIME: u16 = 300;
 pub const REFRESH_TIME: u16 = 60;

src/config/options.rs

@@ -15,7 +15,6 @@ use crate::config::RuntimeConfig;
 // Only in runtime.rs would these options find their proper location in each
 // module's struct.
 
-
 /// Consul configuration options
 #[derive(Clone, Default, Deserialize)]
 pub struct ConfigOptsConsul {
@@ -88,10 +87,13 @@ impl ConfigOpts {
   // Currently only used in tests
   #[allow(dead_code)]
   pub fn from_iter<Iter: Clone>(iter: Iter) -> Result<RuntimeConfig>
-	where Iter: IntoIterator<Item = (String, String)> {
+  where
+    Iter: IntoIterator<Item = (String, String)>,
+  {
     let consul: ConfigOptsConsul = envy::prefixed("DIPLONAT_CONSUL_").from_iter(iter.clone())?;
     let acme: ConfigOptsAcme = envy::prefixed("DIPLONAT_ACME_").from_iter(iter.clone())?;
-		let firewall: ConfigOptsFirewall = envy::prefixed("DIPLONAT_FIREWALL_").from_iter(iter.clone())?;
+    let firewall: ConfigOptsFirewall =
+      envy::prefixed("DIPLONAT_FIREWALL_").from_iter(iter.clone())?;
     let igd: ConfigOptsIgd = envy::prefixed("DIPLONAT_IGD_").from_iter(iter.clone())?;
 
     RuntimeConfig::new(Self {

src/config/options_test.rs

@@ -11,19 +11,34 @@ use crate::config::*;
 
 fn minimal_valid_options() -> HashMap<String, String> {
   let mut opts = HashMap::new();
-    opts.insert("DIPLONAT_CONSUL_NODE_NAME".to_string(), "consul_node".to_string());
+  opts.insert(
+    "DIPLONAT_CONSUL_NODE_NAME".to_string(),
+    "consul_node".to_string(),
+  );
   opts
 }
 
 fn all_valid_options() -> HashMap<String, String> {
   let mut opts = minimal_valid_options();
-    opts.insert("DIPLONAT_CONSUL_URL".to_string(), "http://127.0.0.1:9999".to_string());
+  opts.insert(
+    "DIPLONAT_CONSUL_URL".to_string(),
+    "http://127.0.0.1:9999".to_string(),
+  );
   opts.insert("DIPLONAT_ACME_ENABLE".to_string(), "true".to_string());
-	opts.insert("DIPLONAT_ACME_EMAIL".to_string(), "bozo@bozo.net".to_string());
+  opts.insert(
+    "DIPLONAT_ACME_EMAIL".to_string(),
+    "bozo@bozo.net".to_string(),
+  );
   opts.insert("DIPLONAT_FIREWALL_ENABLE".to_string(), "true".to_string());
-	opts.insert("DIPLONAT_FIREWALL_REFRESH_TIME".to_string(), "20".to_string());
+  opts.insert(
+    "DIPLONAT_FIREWALL_REFRESH_TIME".to_string(),
+    "20".to_string(),
+  );
   opts.insert("DIPLONAT_IGD_ENABLE".to_string(), "true".to_string());
-	opts.insert("DIPLONAT_IGD_PRIVATE_IP".to_string(), "172.123.43.555".to_string());
+  opts.insert(
+    "DIPLONAT_IGD_PRIVATE_IP".to_string(),
+    "172.123.43.555".to_string(),
+  );
   opts.insert("DIPLONAT_IGD_EXPIRATION_TIME".to_string(), "60".to_string());
   opts.insert("DIPLONAT_IGD_REFRESH_TIME".to_string(), "10".to_string());
   opts
@@ -53,10 +68,7 @@ fn ok_minimal_valid_options() {
     &rt_config.consul.node_name,
     opts.get(&"DIPLONAT_CONSUL_NODE_NAME".to_string()).unwrap()
   );
-	assert_eq!(
+  assert_eq!(rt_config.consul.url, CONSUL_URL.to_string());
-		rt_config.consul.url, 
-		CONSUL_URL.to_string()
-	);
   assert!(rt_config.acme.is_none());
   assert!(rt_config.firewall.is_none());
   assert!(rt_config.igd.is_none());
@@ -94,17 +106,29 @@ fn ok_all_valid_options() {
   let rt_config = ConfigOpts::from_iter(opts.clone()).unwrap();
 
   let firewall_refresh_time = Duration::from_secs(
-		opts.get(&"DIPLONAT_FIREWALL_REFRESH_TIME".to_string()).unwrap()
+    opts
-			.parse::<u64>().unwrap()
+      .get(&"DIPLONAT_FIREWALL_REFRESH_TIME".to_string())
-			.into());
+      .unwrap()
+      .parse::<u64>()
+      .unwrap()
+      .into(),
+  );
   let igd_expiration_time = Duration::from_secs(
-		opts.get(&"DIPLONAT_IGD_EXPIRATION_TIME".to_string()).unwrap()
+    opts
-			.parse::<u64>().unwrap()
+      .get(&"DIPLONAT_IGD_EXPIRATION_TIME".to_string())
-			.into());
+      .unwrap()
+      .parse::<u64>()
+      .unwrap()
+      .into(),
+  );
   let igd_refresh_time = Duration::from_secs(
-		opts.get(&"DIPLONAT_IGD_REFRESH_TIME".to_string()).unwrap()
+    opts
-			.parse::<u64>().unwrap()
+      .get(&"DIPLONAT_IGD_REFRESH_TIME".to_string())
-			.into());
+      .unwrap()
+      .parse::<u64>()
+      .unwrap()
+      .into(),
+  );
 
   assert_eq!(
     &rt_config.consul.node_name,
@@ -119,14 +143,12 @@ fn ok_all_valid_options() {
   let acme = rt_config.acme.unwrap();
   assert_eq!(
     &acme.email,
-		opts.get(&"DIPLONAT_ACME_EMAIL".to_string()).unwrap());
+    opts.get(&"DIPLONAT_ACME_EMAIL".to_string()).unwrap()
+  );
 
   assert!(rt_config.firewall.is_some());
   let firewall = rt_config.firewall.unwrap();
-	assert_eq!(
+  assert_eq!(firewall.refresh_time, firewall_refresh_time);
-		firewall.refresh_time,
-		firewall_refresh_time
-	);
 
   assert!(rt_config.igd.is_some());
   let igd = rt_config.igd.unwrap();
@@ -134,12 +156,6 @@ fn ok_all_valid_options() {
     &igd.private_ip,
     opts.get(&"DIPLONAT_IGD_PRIVATE_IP".to_string()).unwrap()
   );
-	assert_eq!(
+  assert_eq!(igd.expiration_time, igd_expiration_time);
-		igd.expiration_time,
+  assert_eq!(igd.refresh_time, igd_refresh_time);
-		igd_expiration_time
-	);
-	assert_eq!(
-		igd.refresh_time,
-		igd_refresh_time
-	);
 }

src/config/runtime.rs

@@ -1,8 +1,10 @@
 use std::time::Duration;
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 
-use crate::config::{ConfigOpts, ConfigOptsConsul, ConfigOptsAcme, ConfigOptsFirewall, ConfigOptsIgd};
+use crate::config::{
+  ConfigOpts, ConfigOptsAcme, ConfigOptsConsul, ConfigOptsFirewall, ConfigOptsIgd,
+};
 
 // This code is inspired by the Trunk crate (https://github.com/thedodd/trunk)
 
@@ -60,14 +62,12 @@ impl RuntimeConfig {
 
 impl RuntimeConfigConsul {
   pub(super) fn new(opts: ConfigOptsConsul) -> Result<Self> {
-		let node_name = opts.node_name.expect(
+    let node_name = opts
-			"'DIPLONAT_CONSUL_NODE_NAME' is required");
+      .node_name
+      .expect("'DIPLONAT_CONSUL_NODE_NAME' is required");
     let url = opts.url.unwrap_or(super::CONSUL_URL.to_string());
 
-		Ok(Self {
+    Ok(Self { node_name, url })
-			node_name,
-			url,
-		})
   }
 }
 
@@ -77,12 +77,11 @@ impl RuntimeConfigAcme {
       return Ok(None);
     }
 
-		let email = opts.email.expect(
+    let email = opts
-			"'DIPLONAT_ACME_EMAIL' is required if ACME is enabled");
+      .email
+      .expect("'DIPLONAT_ACME_EMAIL' is required if ACME is enabled");
 
-		Ok(Some(Self {
+    Ok(Some(Self { email }))
-			email,
-		}))
   }
 }
 
@@ -92,12 +91,9 @@ impl RuntimeConfigFirewall {
       return Ok(None);
     }
 
-		let refresh_time = Duration::from_secs(
+    let refresh_time = Duration::from_secs(opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
-				opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
 
-		Ok(Some(Self {
+    Ok(Some(Self { refresh_time }))
-			refresh_time,
-		}))
   }
 }
 
@@ -107,12 +103,16 @@ impl RuntimeConfigIgd {
       return Ok(None);
     }
 
-		let private_ip = opts.private_ip.expect(
+    let private_ip = opts
-			"'DIPLONAT_IGD_PRIVATE_IP' is required if IGD is enabled");
+      .private_ip
+      .expect("'DIPLONAT_IGD_PRIVATE_IP' is required if IGD is enabled");
     let expiration_time = Duration::from_secs(
-				opts.expiration_time.unwrap_or(super::EXPIRATION_TIME).into());
+      opts
-		let refresh_time = Duration::from_secs(
+        .expiration_time
-				opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
+        .unwrap_or(super::EXPIRATION_TIME)
+        .into(),
+    );
+    let refresh_time = Duration::from_secs(opts.refresh_time.unwrap_or(super::REFRESH_TIME).into());
 
     if refresh_time.as_secs() * 2 > expiration_time.as_secs() {
       return Err(anyhow!(

src/consul.rs

@@ -1,22 +1,22 @@
 use std::collections::HashMap;
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ServiceEntry {
-  pub Tags: Vec<String>
+  pub Tags: Vec<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct CatalogNode {
-  pub Services: HashMap<String, ServiceEntry>
+  pub Services: HashMap<String, ServiceEntry>,
 }
 
 pub struct Consul {
   client: reqwest::Client,
   url: String,
-  idx: Option<u64>
+  idx: Option<u64>,
 }
 
 impl Consul {
@@ -24,7 +24,7 @@ impl Consul {
     return Self {
       client: reqwest::Client::new(),
       url: url.to_string(),
-      idx: None
+      idx: None,
     };
   }
 
@@ -35,16 +35,16 @@ impl Consul {
   pub async fn watch_node(&mut self, host: &str) -> Result<CatalogNode> {
     let url = match self.idx {
       Some(i) => format!("{}/v1/catalog/node/{}?index={}", self.url, host, i),
-      None => format!("{}/v1/catalog/node/{}", self.url, host)
+      None => format!("{}/v1/catalog/node/{}", self.url, host),
     };
 
     let http = self.client.get(&url).send().await?;
     self.idx = match http.headers().get("X-Consul-Index") {
       Some(v) => Some(v.to_str()?.parse::<u64>()?),
-      None => return Err(anyhow!("X-Consul-Index header not found"))
+      None => return Err(anyhow!("X-Consul-Index header not found")),
     };
 
     let resp: CatalogNode = http.json().await?;
-    return Ok(resp)
+    return Ok(resp);
   }
 }

src/consul_actor.rs

@@ -4,8 +4,8 @@ use std::time::Duration;
 
 use anyhow::Result;
 use log::*;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
-use serde_lexpr::{from_str,error};
+use serde_lexpr::{error, from_str};
 use tokio::sync::watch;
 use tokio::time::delay_for;
 
@@ -16,12 +16,12 @@ use crate::messages;
 #[derive(Serialize, Deserialize, Debug)]
 pub enum DiplonatParameter {
   tcp_port(HashSet<u16>),
-  udp_port(HashSet<u16>)
+  udp_port(HashSet<u16>),
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub enum DiplonatConsul {
-  diplonat(Vec<DiplonatParameter>)
+  diplonat(Vec<DiplonatParameter>),
 }
 
 pub struct ConsulActor {
@@ -31,13 +31,16 @@ pub struct ConsulActor {
   node: String,
   retries: u32,
 
-  tx_open_ports: watch::Sender<messages::PublicExposedPorts>
+  tx_open_ports: watch::Sender<messages::PublicExposedPorts>,
 }
 
 fn retry_to_time(retries: u32, max_time: Duration) -> Duration {
   // 1.2^x seems to be a good value to exponentially increase time at a good pace
   // eg. 1.2^32 = 341 seconds ~= 5 minutes - ie. after 32 retries we wait 5 minutes
-  return Duration::from_secs(cmp::min(max_time.as_secs(), 1.2f64.powf(retries as f64) as u64))
+  return Duration::from_secs(cmp::min(
+    max_time.as_secs(),
+    1.2f64.powf(retries as f64) as u64,
+  ));
 }
 
 fn to_parameters(catalog: &consul::CatalogNode) -> Vec<DiplonatConsul> {
@@ -59,7 +62,7 @@ fn to_parameters(catalog: &consul::CatalogNode) -> Vec<DiplonatConsul> {
 fn to_open_ports(params: &Vec<DiplonatConsul>) -> messages::PublicExposedPorts {
   let mut op = messages::PublicExposedPorts {
     tcp_ports: HashSet::new(),
-    udp_ports: HashSet::new()
+    udp_ports: HashSet::new(),
   };
 
   for conf in params {
@@ -77,9 +80,9 @@ fn to_open_ports(params: &Vec<DiplonatConsul>) -> messages::PublicExposedPorts {
 
 impl ConsulActor {
   pub fn new(config: RuntimeConfigConsul) -> Self {
-    let (tx, rx) = watch::channel(messages::PublicExposedPorts{
+    let (tx, rx) = watch::channel(messages::PublicExposedPorts {
       tcp_ports: HashSet::new(),
-      udp_ports: HashSet::new()
+      udp_ports: HashSet::new(),
     });
 
     return Self {
@@ -99,7 +102,11 @@ impl ConsulActor {
           self.consul.watch_node_reset();
           self.retries = cmp::min(std::u32::MAX - 1, self.retries) + 1;
           let will_retry_in = retry_to_time(self.retries, Duration::from_secs(600));
-          error!("Failed to query consul. Will retry in {}s. {}", will_retry_in.as_secs(), e);
+          error!(
+            "Failed to query consul. Will retry in {}s. {}",
+            will_retry_in.as_secs(),
+            e
+          );
           delay_for(will_retry_in).await;
           continue;
         }

src/diplonat.rs

@@ -1,4 +1,4 @@
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use tokio::try_join;
 
 use crate::config::ConfigOpts;
@@ -20,19 +20,14 @@ impl Diplonat {
 
     let consul_actor = ConsulActor::new(config.consul);
 
-    let firewall_actor = FirewallActor::new(
+    let firewall_actor = FirewallActor::new(config.firewall, &consul_actor.rx_open_ports).await?;
-        config.firewall,
-        &consul_actor.rx_open_ports
-    ).await?;
 
-    let igd_actor = IgdActor::new(
+    let igd_actor = IgdActor::new(config.igd, &consul_actor.rx_open_ports).await?;
-      config.igd,
-      &consul_actor.rx_open_ports
-    ).await?;
 
     if firewall_actor.is_none() && igd_actor.is_none() {
       return Err(anyhow!(
-        "At least enable *one* module, otherwise it's boring!"));
+        "At least enable *one* module, otherwise it's boring!"
+      ));
     }
 
     let ctx = Self {
@@ -53,13 +48,13 @@ impl Diplonat {
       async {
         match firewall {
           Some(x) => x.listen().await,
-          None => Ok(())
+          None => Ok(()),
         }
       },
       async {
         match igd {
           Some(x) => x.listen().await,
-          None => Ok(())
+          None => Ok(()),
         }
       },
     )?;

src/fw.rs

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use anyhow::{Result,Context};
+use anyhow::{Context, Result};
 use iptables;
 use log::*;
 use regex::Regex;
@@ -8,23 +8,38 @@ use regex::Regex;
 use crate::messages;
 
 pub fn setup(ipt: &iptables::IPTables) -> Result<()> {
-
   // ensure we start from a clean state without any rule already set
   cleanup(ipt)?;
 
-    ipt.new_chain("filter", "DIPLONAT").context("Failed to create new chain")?;
+  ipt
-    ipt.insert_unique("filter", "INPUT", "-j DIPLONAT", 1).context("Failed to insert jump rule")?;
+    .new_chain("filter", "DIPLONAT")
+    .context("Failed to create new chain")?;
+  ipt
+    .insert_unique("filter", "INPUT", "-j DIPLONAT", 1)
+    .context("Failed to insert jump rule")?;
 
   Ok(())
 }
 
 pub fn open_ports(ipt: &iptables::IPTables, ports: messages::PublicExposedPorts) -> Result<()> {
   for p in ports.tcp_ports {
-        ipt.append("filter", "DIPLONAT", &format!("-p tcp --dport {} -j ACCEPT", p)).context("Failed to insert port rule")?;
+    ipt
+      .append(
+        "filter",
+        "DIPLONAT",
+        &format!("-p tcp --dport {} -j ACCEPT", p),
+      )
+      .context("Failed to insert port rule")?;
   }
 
   for p in ports.udp_ports {
-        ipt.append("filter", "DIPLONAT", &format!("-p udp --dport {} -j ACCEPT", p)).context("Failed to insert port rule")?;
+    ipt
+      .append(
+        "filter",
+        "DIPLONAT",
+        &format!("-p udp --dport {} -j ACCEPT", p),
+      )
+      .context("Failed to insert port rule")?;
   }
 
   Ok(())
@@ -33,18 +48,17 @@ pub fn open_ports(ipt: &iptables::IPTables, ports: messages::PublicExposedPorts)
 pub fn get_opened_ports(ipt: &iptables::IPTables) -> Result<messages::PublicExposedPorts> {
   let mut ports = messages::PublicExposedPorts {
     tcp_ports: HashSet::new(),
-        udp_ports: HashSet::new()
+    udp_ports: HashSet::new(),
   };
 
   let list = ipt.list("filter", "DIPLONAT")?;
-    let re = Regex::new(r"\-A.*? \-p (\w+).*\-\-dport (\d+).*?\-j ACCEPT").context("Regex matching open ports encountered an unexpected rule")?;
+  let re = Regex::new(r"\-A.*? \-p (\w+).*\-\-dport (\d+).*?\-j ACCEPT")
+    .context("Regex matching open ports encountered an unexpected rule")?;
   for i in list {
     let caps = re.captures(&i);
     match caps {
       Some(c) => {
-           
         if let (Some(raw_proto), Some(raw_port)) = (c.get(1), c.get(2)) {
-
           let proto = String::from(raw_proto.as_str());
           let number = String::from(raw_port.as_str()).parse::<u16>()?;
 
@@ -53,12 +67,10 @@ pub fn get_opened_ports(ipt: &iptables::IPTables) -> Result<messages::PublicExpo
           } else {
             ports.udp_ports.insert(number);
           }
-
         } else {
           error!("Unexpected rule found in DIPLONAT chain")
         }
-
+      }
-            },
       _ => {}
     }
   }
@@ -67,17 +79,21 @@ pub fn get_opened_ports(ipt: &iptables::IPTables) -> Result<messages::PublicExpo
 }
 
 pub fn cleanup(ipt: &iptables::IPTables) -> Result<()> {
-    
   if ipt.chain_exists("filter", "DIPLONAT")? {
-        ipt.flush_chain("filter", "DIPLONAT").context("Failed to flush the DIPLONAT chain")?;
+    ipt
+      .flush_chain("filter", "DIPLONAT")
+      .context("Failed to flush the DIPLONAT chain")?;
 
     if ipt.exists("filter", "INPUT", "-j DIPLONAT")? {
-            ipt.delete("filter", "INPUT", "-j DIPLONAT").context("Failed to delete jump rule")?;
+      ipt
+        .delete("filter", "INPUT", "-j DIPLONAT")
+        .context("Failed to delete jump rule")?;
     }
 
-        ipt.delete_chain("filter", "DIPLONAT").context("Failed to delete chain")?;
+    ipt
+      .delete_chain("filter", "DIPLONAT")
+      .context("Failed to delete chain")?;
   }
 
   Ok(())
 }
-

src/fw_actor.rs

@@ -6,16 +6,13 @@ use log::*;
 use tokio::{
   select,
   sync::watch,
-  time::{
+  time::{self, Duration},
-    Duration,
+};
-    self, 
-}};
 
 use crate::config::RuntimeConfigFirewall;
 use crate::fw;
 use crate::messages;
 
-
 pub struct FirewallActor {
   pub ipt: iptables::IPTables,
 
@@ -26,7 +23,10 @@ pub struct FirewallActor {
 }
 
 impl FirewallActor {
-  pub async fn new(config: Option<RuntimeConfigFirewall>, rxp: &watch::Receiver<messages::PublicExposedPorts>) -> Result<Option<Self>> {
+  pub async fn new(
+    config: Option<RuntimeConfigFirewall>,
+    rxp: &watch::Receiver<messages::PublicExposedPorts>,
+  ) -> Result<Option<Self>> {
     if config.is_none() {
       return Ok(None);
     }
@@ -55,7 +55,9 @@ impl FirewallActor {
       };
 
       // 2. Update last ports if needed
-      if let Some(p) = new_ports { self.last_ports = p; }
+      if let Some(p) = new_ports {
+        self.last_ports = p;
+      }
 
       // 3. Update firewall rules
       match self.do_fw_update().await {
@@ -68,18 +70,26 @@ impl FirewallActor {
   pub async fn do_fw_update(&self) -> Result<()> {
     let curr_opened_ports = fw::get_opened_ports(&self.ipt)?;
 
-    let diff_tcp = self.last_ports.tcp_ports.difference(&curr_opened_ports.tcp_ports).copied().collect::<HashSet<u16>>();
+    let diff_tcp = self
-    let diff_udp = self.last_ports.udp_ports.difference(&curr_opened_ports.udp_ports).copied().collect::<HashSet<u16>>();
+      .last_ports
+      .tcp_ports
+      .difference(&curr_opened_ports.tcp_ports)
+      .copied()
+      .collect::<HashSet<u16>>();
+    let diff_udp = self
+      .last_ports
+      .udp_ports
+      .difference(&curr_opened_ports.udp_ports)
+      .copied()
+      .collect::<HashSet<u16>>();
 
     let ports_to_open = messages::PublicExposedPorts {
       tcp_ports: diff_tcp,
-        udp_ports: diff_udp
+      udp_ports: diff_udp,
     };
 
     fw::open_ports(&self.ipt, ports_to_open)?;
 
     return Ok(());
   }
-
 }
-

src/igd_actor.rs

@@ -1,16 +1,14 @@
 use std::net::SocketAddrV4;
 
-use anyhow::{Result, Context};
+use anyhow::{Context, Result};
 use igd::aio::*;
 use igd::PortMappingProtocol;
 use log::*;
 use tokio::{
   select,
   sync::watch,
-  time::{
+  time::{self, Duration},
-    Duration,
+};
-    self, 
-}};
 
 use crate::config::RuntimeConfigIgd;
 use crate::messages;
@@ -26,7 +24,10 @@ pub struct IgdActor {
 }
 
 impl IgdActor {
-  pub async fn new(config: Option<RuntimeConfigIgd>, rxp: &watch::Receiver<messages::PublicExposedPorts>) -> Result<Option<Self>> {
+  pub async fn new(
+    config: Option<RuntimeConfigIgd>,
+    rxp: &watch::Receiver<messages::PublicExposedPorts>,
+  ) -> Result<Option<Self>> {
     if config.is_none() {
       return Ok(None);
     }
@@ -60,7 +61,9 @@ impl IgdActor {
       };
 
       // 2. Update last ports if needed
-      if let Some(p) = new_ports { self.last_ports = p; }
+      if let Some(p) = new_ports {
+        self.last_ports = p;
+      }
 
       // 3. Flush IGD requests
       match self.do_igd().await {
@@ -73,14 +76,25 @@ impl IgdActor {
   pub async fn do_igd(&self) -> Result<()> {
     let actions = [
       (PortMappingProtocol::TCP, &self.last_ports.tcp_ports),
-      (PortMappingProtocol::UDP, &self.last_ports.udp_ports)
+      (PortMappingProtocol::UDP, &self.last_ports.udp_ports),
     ];
 
     for (proto, list) in actions.iter() {
       for port in *list {
         let service_str = format!("{}:{}", self.private_ip, port);
-        let service  = service_str.parse::<SocketAddrV4>().context("Invalid socket address")?;
+        let service = service_str
-        self.gateway.add_port(*proto, *port, service, self.expire.as_secs() as u32, "diplonat").await?;
+          .parse::<SocketAddrV4>()
+          .context("Invalid socket address")?;
+        self
+          .gateway
+          .add_port(
+            *proto,
+            *port,
+            service,
+            self.expire.as_secs() as u32,
+            "diplonat",
+          )
+          .await?;
         debug!("IGD request successful for {:#?} {}", proto, service);
       }
     }

src/main.rs

@@ -7,8 +7,8 @@ mod fw_actor;
 mod igd_actor;
 mod messages;
 
-use log::*;
 use diplonat::Diplonat;
+use log::*;
 
 #[tokio::main]
 async fn main() {

src/messages.rs

@@ -3,14 +3,14 @@ use std::collections::HashSet;
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PublicExposedPorts {
   pub tcp_ports: HashSet<u16>,
-  pub udp_ports: HashSet<u16>
+  pub udp_ports: HashSet<u16>,
 }
 
 impl PublicExposedPorts {
   pub fn new() -> Self {
     return Self {
       tcp_ports: HashSet::new(),
-      udp_ports: HashSet::new()
+      udp_ports: HashSet::new(),
-    }
+    };
   }
 }