add errors for IP

This commit is contained in:
Joe Ardent 2025-07-05 11:53:55 -07:00
parent a9e1256227
commit 627bf71703
2 changed files with 27 additions and 27 deletions

View file

@ -39,8 +39,11 @@ pub enum LocalSendError {
#[error("Cancel Failed")] #[error("Cancel Failed")]
CancelFailed, CancelFailed,
#[error("No broadcast IP available")] #[error("IPv6 is not supported")]
NoBroadcastIP, IPv6Unsupported,
#[error("Error getting local IP")]
IpAddrError(#[from] local_ip_address::Error),
} }
pub type Result<T> = std::result::Result<T, LocalSendError>; pub type Result<T> = std::result::Result<T, LocalSendError>;

View file

@ -1,8 +1,4 @@
#![feature(ip_as_octets)] use joecalsend::{Client, JoecalState, error, models::device::DeviceInfo};
#![feature(slice_as_array)]
use std::net::Ipv4Addr;
use joecalsend::{Client, error, models::device::DeviceInfo};
use local_ip_address::local_ip; use local_ip_address::local_ip;
use network_interface::{Addr, NetworkInterface, NetworkInterfaceConfig, V4IfAddr}; use network_interface::{Addr, NetworkInterface, NetworkInterfaceConfig, V4IfAddr};
@ -11,31 +7,32 @@ async fn main() -> error::Result<()> {
let device = DeviceInfo::default(); let device = DeviceInfo::default();
dbg!(&device); dbg!(&device);
let std::net::IpAddr::V4(ip) = local_ip()? else {
unreachable!()
};
// for enumerating subnet peers when multicast fails (https://github.com/localsend/protocol?tab=readme-ov-file#32-http-legacy-mode)
let mut network_ip = ip;
let nifs = NetworkInterface::show().unwrap();
for addr in nifs.into_iter().flat_map(|i| i.addr) {
if let Addr::V4(V4IfAddr {
ip: ifip,
netmask: Some(netmask),
..
}) = addr
&& ip == ifip
{
network_ip = ip & netmask;
break;
}
}
dbg!(network_ip);
let client = Client::with_config(device, 53317, "/home/ardent/joecalsend".into()) let client = Client::with_config(device, 53317, "/home/ardent/joecalsend".into())
.await .await
.unwrap(); .unwrap();
let (h1, h2, h3) = client.start().await.unwrap(); let (h1, h2, h3) = client.start().await.unwrap();
let ip = local_ip().unwrap();
if !ip.is_ipv4() {
return Err(error::LocalSendError::NoBroadcastIP);
}
let local_device_ip = Ipv4Addr::from_bits(u32::from_be_bytes(
ip.as_octets().as_array().unwrap().to_owned(),
));
let nifs = NetworkInterface::show().unwrap();
let mut mask = Ipv4Addr::from_bits(u32::MAX);
'outer: for nif in nifs {
for addr in nif.addr {
if let Addr::V4(V4IfAddr { ip, netmask, .. }) = addr
&& ip == local_device_ip
{
mask = netmask.unwrap_or(mask);
break 'outer;
}
}
}
dbg!(mask);
let _ = tokio::join!(h1, h2, h3); let _ = tokio::join!(h1, h2, h3);
Ok(()) Ok(())