punchnet/sdlan-lib-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed 1969 to 1970 in multicast port

Browse Source
This commit is contained in:
asxalex 2024-07-16 15:34:42 +08:00
parent 8e05cb0ce0
commit dc9bf9cc6b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/mod.rs
View File

@ -2,7 +2,7 @@ pub const REGISTER_INTERVAL: u8 = 20;
pub const REGISTER_SUPER_INTERVAL: u16 = 20; pub const REGISTER_SUPER_INTERVAL: u16 = 20;
pub const MULITCAST_V4: [u8; 4] = [224, 0, 0, 69]; pub const MULITCAST_V4: [u8; 4] = [224, 0, 0, 69];
pub const MULTICAST_PORT: u16 = 1969; pub const MULTICAST_PORT: u16 = 1970;
// pub const SUPER_ATTEMPTS_DEFAULT: u8 = 3; // pub const SUPER_ATTEMPTS_DEFAULT: u8 = 3;

6
src/utils/socks.rs
View File

@ -47,12 +47,15 @@ impl Socket {
true => "0.0.0.0", true => "0.0.0.0",
false => "127.0.0.1", false => "127.0.0.1",
}; };
let udp = UdpSocket::bind(format!("{}:{}", addr, port)).await?; let addr = format!("{}:{}", addr, port);
let udp = UdpSocket::bind(&addr).await?;
if join_multicast { if join_multicast {
if let Err(e) = if let Err(e) =
udp.join_multicast_v4(Ipv4Addr::new(224, 0, 0, 69), Ipv4Addr::new(0, 0, 0, 0)) udp.join_multicast_v4(Ipv4Addr::new(224, 0, 0, 69), Ipv4Addr::new(0, 0, 0, 0))
{ {
error!("failed to join multicast: {}", e.to_string()); error!("failed to join multicast: {}", e.to_string());
} else {
println!("{} joined multicast ok", addr);
} }
} }
if tos != 0 { if tos != 0 {
@ -103,6 +106,7 @@ pub async fn send_to_sock(
AF_INET => { AF_INET => {
// sockv4 // sockv4
let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::from(sock.v4)), sock.port); let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::from(sock.v4)), sock.port);
println!("udp sock v4 send to {}", addr);
eee.udp_sock_v4.send_to(content, addr).await?; eee.udp_sock_v4.send_to(content, addr).await?;
return Ok(()); return Ok(());
} }