yeyinlaoying/vnt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安卓不设置路由

Browse Source
This commit is contained in:
lubeilin
2024-04-07 21:38:09 +08:00
parent 28522f2f07
commit 256a2adc3e
1 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vnt/src/handle/recv_data/server.rs
+49 -42
View File
@@ -267,57 +267,64 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
if old.virtual_ip != Ipv4Addr::UNSPECIFIED { if old.virtual_ip != Ipv4Addr::UNSPECIFIED {
log::info!("ip发生变化,old:{:?},response={:?}", old, response); log::info!("ip发生变化,old:{:?},response={:?}", old, response);
} }
if let Err(e) = self.device.set_ip(virtual_ip, virtual_netmask) { #[cfg(not(target_os = "android"))]
log::error!("LocalIpExists {:?}", e);
self.callback.error(ErrorInfo::new_msg(
ErrorType::LocalIpExists,
format!("set_ip {:?}", e),
));
return Ok(());
}
let mut guard = self.route_record.lock();
for (dest, mask) in guard.drain(..) {
if let Err(e) = self.device.delete_route(dest, mask) {
log::warn!("删除路由失败 ={:?}", e);
}
}
if let Err(e) = self.device.add_route(virtual_network, virtual_netmask, 1) {
log::warn!("添加默认路由失败 ={:?}", e);
} else {
guard.push((virtual_network, virtual_netmask));
}
if let Err(e) =
self.device
.add_route(Ipv4Addr::BROADCAST, Ipv4Addr::BROADCAST, 1)
{ {
log::warn!("添加广播路由失败 ={:?}", e); if let Err(e) = self.device.set_ip(virtual_ip, virtual_netmask) {
} else { log::error!("LocalIpExists {:?}", e);
guard.push((Ipv4Addr::BROADCAST, Ipv4Addr::BROADCAST)); self.callback.error(ErrorInfo::new_msg(
} ErrorType::LocalIpExists,
format!("set_ip {:?}", e),
));
return Ok(());
}
let mut guard = self.route_record.lock();
for (dest, mask) in guard.drain(..) {
if let Err(e) = self.device.delete_route(dest, mask) {
log::warn!("删除路由失败 ={:?}", e);
}
}
if let Err(e) =
self.device.add_route(virtual_network, virtual_netmask, 1)
{
log::warn!("添加默认路由失败 ={:?}", e);
} else {
guard.push((virtual_network, virtual_netmask));
}
if let Err(e) =
self.device
.add_route(Ipv4Addr::BROADCAST, Ipv4Addr::BROADCAST, 1)
{
log::warn!("添加广播路由失败 ={:?}", e);
} else {
guard.push((Ipv4Addr::BROADCAST, Ipv4Addr::BROADCAST));
}
if let Err(e) = self.device.add_route( if let Err(e) = self.device.add_route(
Ipv4Addr::from([224, 0, 0, 0]),
Ipv4Addr::from([240, 0, 0, 0]),
1,
) {
log::warn!("添加组播路由失败 ={:?}", e);
} else {
guard.push((
Ipv4Addr::from([224, 0, 0, 0]), Ipv4Addr::from([224, 0, 0, 0]),
Ipv4Addr::from([240, 0, 0, 0]), Ipv4Addr::from([240, 0, 0, 0]),
)); 1,
} ) {
log::warn!("添加组播路由失败 ={:?}", e);
for (dest, mask) in self.external_route.to_route() {
if let Err(e) = self.device.add_route(dest, mask, 1) {
log::warn!("添加路由失败 ={:?}", e);
} else { } else {
guard.push((dest, mask)); guard.push((
Ipv4Addr::from([224, 0, 0, 0]),
Ipv4Addr::from([240, 0, 0, 0]),
));
}
for (dest, mask) in self.external_route.to_route() {
if let Err(e) = self.device.add_route(dest, mask, 1) {
log::warn!("添加路由失败 ={:?}", e);
} else {
guard.push((dest, mask));
}
} }
} }
self.callback.success();
} }
self.set_device_info_list(response.device_info_list, response.epoch as _); self.set_device_info_list(response.device_info_list, response.epoch as _);
if old.status.offline() {
self.callback.success();
}
} }
} }
service_packet::Protocol::PushDeviceList => { service_packet::Protocol::PushDeviceList => {