split code into modules

This commit is contained in:
2023-03-18 22:36:04 +01:00
parent 887a1b1db9
commit 0c4be4541c
3 changed files with 26 additions and 399 deletions

View File

@@ -1,4 +1,4 @@
use std::{fmt::Debug, net::SocketAddr};
use std::fmt::Debug;
use anyhow::bail;
use bytemuck::{Pod, Zeroable};
@@ -6,7 +6,6 @@ use tokio::{
io::{AsyncReadExt, AsyncWriteExt},
net::tcp::{ReadHalf, WriteHalf},
};
use tracing::debug;
pub const REJECT_OOP: &[u8; 6] = b"\x04\x04oop\x00";
pub const REJECT_TIMEOUT: &[u8; 10] = b"\x04\x08timeout\x00";
@@ -177,65 +176,3 @@ impl Packet {
})
}
}
pub async fn dyn_ip_update(
server: &SocketAddr,
number: u32,
pin: u16,
port: u16,
) -> anyhow::Result<std::net::Ipv4Addr> {
debug!(%number, %port, "starting dyn ip update");
let mut packet = Packet::default();
packet.header = Header {
kind: PacketKind::DynIpUpdate.raw(),
length: 8,
};
packet.data.clear();
packet.data.reserve(packet.header.length as usize);
packet.data.extend_from_slice(&number.to_le_bytes());
packet.data.extend_from_slice(&pin.to_le_bytes());
packet.data.extend_from_slice(&port.to_le_bytes());
let mut socket = tokio::net::TcpStream::connect(server).await?;
let (mut reader, mut writer) = socket.split();
packet.send(&mut writer).await?;
packet.recv_into(&mut reader).await?;
let result = match packet.kind() {
PacketKind::DynIpUpdateResponse => Ok(<[u8; 4]>::try_from(packet.data)
.map_err(|err| {
anyhow::anyhow!(
"too little data for ip address. Need 4 bytes got {}",
err.len()
)
})?
.into()),
PacketKind::Error => {
let first_zero = packet
.data
.iter()
.enumerate()
.find_map(|(i, x)| (*x == 0).then_some(i));
bail!(
"{}",
std::str::from_utf8(
first_zero
.map(|i| &packet.data[..i])
.unwrap_or(&packet.data),
)?
)
}
_ => bail!("server returned unexpected packet"),
};
debug!(?result, "finished dyn ip update");
result
}