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

arp reply encrypt

Browse Source
This commit is contained in:
asxalex 2024-10-22 15:14:03 +08:00
parent af56edd331
commit 32bbdc4f78
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/arp.rs
View File

@ -176,9 +176,9 @@ impl ArpInfo {
if (ip & host_netmask) == (host_ip & host_netmask) { if (ip & host_netmask) == (host_ip & host_netmask) {
println!( println!(
"hostip = {:?}\nhostmac={:?}\nip={:?}", "hostip = {:?}, ip={:?}",
host_netmask.to_be_bytes(),
host_ip.to_be_bytes(), host_ip.to_be_bytes(),
// host_ip.to_be_bytes(),
ip.to_be_bytes(), ip.to_be_bytes(),
); );
target_ip = ip; target_ip = ip;

14
src/network/packet.rs
View File

@ -23,8 +23,8 @@ use sdlan_sn_rs::{
config::{AF_INET, AF_INET6}, config::{AF_INET, AF_INET6},
peer::{is_sdlan_sock_equal, SdlanSock, V6Info}, peer::{is_sdlan_sock_equal, SdlanSock, V6Info},
utils::{ utils::{
aes_decrypt, get_current_timestamp, get_sdlan_sock_from_socketaddr, ip_to_string, aes_decrypt, aes_encrypt, get_current_timestamp, get_sdlan_sock_from_socketaddr,
is_multi_broadcast, Mac, Result, SDLanError, BROADCAST_MAC, ip_to_string, is_multi_broadcast, Mac, Result, SDLanError, BROADCAST_MAC,
}, },
}; };
use std::sync::Arc; use std::sync::Arc;
@ -804,19 +804,25 @@ async fn handle_tun_packet(
arp.sipaddr = arp.sipaddr =
[((self_ip >> 16) & 0xffff) as u16, (self_ip & 0xffff) as u16]; [((self_ip >> 16) & 0xffff) as u16, (self_ip & 0xffff) as u16];
let data = arp.marshal_to_bytes();
let Ok(encrypted) = aes_encrypt(key.as_slice(), &data) else {
error!("failed to encrypt arp reply");
return;
};
let data = SdlData { let data = SdlData {
is_p2p: true, is_p2p: true,
ttl: 2, ttl: 2,
network_id: edge.network_id.load(Ordering::Relaxed), network_id: edge.network_id.load(Ordering::Relaxed),
src_mac: Vec::from(self_mac), src_mac: Vec::from(self_mac),
dst_mac: Vec::from(arp.shwaddr), dst_mac: Vec::from(arp.shwaddr),
data: arp.marshal_to_bytes(), data: encrypted,
}; };
let v = let v =
encode_to_udp_message(Some(data), PacketType::Data as u8).unwrap(); encode_to_udp_message(Some(data), PacketType::Data as u8).unwrap();
println!("xxxx send arp reply"); println!("xxxx send arp reply");
send_packet_to_net(edge, BROADCAST_MAC, &v, 0).await; send_packet_to_net(edge, arp.shwaddr, &v, 0).await;
// send_to_sock(edge, &v, from_sock); // send_to_sock(edge, &v, from_sock);
// edge.sock.send(v).await; // edge.sock.send(v).await;
} }