WIP igd actor

This commit is contained in:
Quentin 2020-05-22 22:01:27 +02:00
parent c8742b1f14
commit 941942aeda

View file

@ -1,16 +1,28 @@
use igd::aio::*; use igd::aio::*;
use igd::PortMappingProtocol;
use std::net::SocketAddrV4;
use log::*; use log::*;
use anyhow::{Result, Context}; use anyhow::{Result, Context};
use tokio::sync::watch; use tokio::{
select,
sync::watch,
time::{
self,
Duration
}};
use crate::messages; use crate::messages;
pub struct IgdActor { pub struct IgdActor {
last_ports: messages::PublicExposedPorts,
rx_ports: watch::Receiver<messages::PublicExposedPorts>, rx_ports: watch::Receiver<messages::PublicExposedPorts>,
gateway: Gateway, gateway: Gateway,
refresh: Duration,
expire: Duration,
private_ip: String
} }
impl IgdActor { impl IgdActor {
pub async fn new(rxp: &watch::Receiver<messages::PublicExposedPorts>) -> Result<Self> { pub async fn new(priv_ip: &str, refresh: Duration, expire: Duration, rxp: &watch::Receiver<messages::PublicExposedPorts>) -> Result<Self> {
let gw = search_gateway(Default::default()) let gw = search_gateway(Default::default())
.await .await
.context("Failed to find gateway")?; .context("Failed to find gateway")?;
@ -18,16 +30,48 @@ impl IgdActor {
let ctx = Self { let ctx = Self {
gateway: gw, gateway: gw,
rx_ports: rxp.clone() rx_ports: rxp.clone(),
private_ip: priv_ip.to_string(),
refresh: refresh,
expire: expire
}; };
return Ok(ctx); return Ok(ctx);
} }
pub async fn listen(&mut self) -> Result<()> { pub async fn listen(&mut self) -> Result<()> {
while let Some(ports) = self.rx_ports.recv().await { let mut interval = time::interval(self.refresh);
println!("received = {:#?}", ports); loop {
let res = select! {
msg = self.rx_ports.recv() => match msg {
Some(ports) => { self.last_ports = ports ; return self.do_igd().await; } ,
None => return Ok(()) // Sender dropped, terminate loop.
} }
_ = interval.tick() => self.do_igd().await
};
match res {
Ok(()) => debug!("Successfully updated IGD"),
Err(e) => error!("An error occured while updating IGD. {}. {:#?}", e, self.last_ports),
}
}
}
pub async fn do_igd(&self) -> Result<()> {
let actions = [
(PortMappingProtocol::TCP, self.last_ports.tcp_ports),
(PortMappingProtocol::UDP, self.last_ports.udp_ports)
];
for (proto, list) in &actions {
for port in list {
let service_str = format!("{}:{}", self.private_ip, port);
let service: SocketAddrV4 = service_str.parse()?.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);
}
}
return Ok(()); return Ok(());
} }
} }