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

fix nat probe bug

Browse Source
This commit is contained in:
asxalex 2024-12-30 10:15:44 +08:00
parent 51c323008a
commit c070d345ad
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/node.rs
View File

@ -400,22 +400,18 @@ impl Node {
}; };
if reply1.ip == self.outer_ip_v4.load(Ordering::Relaxed) { if reply1.ip == self.outer_ip_v4.load(Ordering::Relaxed) {
let Ok(reply2) = self let Ok(_reply2) = self
.send_and_wait_for_probe_reply(StunProbeAttr::None, &self.config.nat_server2) .send_and_wait_for_probe_reply(StunProbeAttr::Peer, &self.config.nat_server1)
.await .await
else { else {
*self.nat_type.lock().unwrap() = NatType::Blocked;
return NatType::Blocked;
};
if reply1.ip != reply2.ip || reply1.port != reply2.port {
*self.nat_type.lock().unwrap() = NatType::Symmetric; *self.nat_type.lock().unwrap() = NatType::Symmetric;
return NatType::Symmetric; return NatType::Symmetric;
} };
*self.nat_type.lock().unwrap() = NatType::NoNat; *self.nat_type.lock().unwrap() = NatType::NoNat;
return NatType::NoNat; return NatType::NoNat;
} }
if let Ok(_reply3) = self if let Ok(_reply2_2) = self
.send_and_wait_for_probe_reply(StunProbeAttr::Peer, &self.config.nat_server1) .send_and_wait_for_probe_reply(StunProbeAttr::Peer, &self.config.nat_server1)
.await .await
{ {
@ -423,6 +419,18 @@ impl Node {
return NatType::FullCone; return NatType::FullCone;
} }
let Ok(reply3) = self
.send_and_wait_for_probe_reply(StunProbeAttr::None, &self.config.nat_server2)
.await
else {
*self.nat_type.lock().unwrap() = NatType::Blocked;
return NatType::Blocked;
};
if reply3.ip != reply1.ip || reply3.port != reply1.port {
*self.nat_type.lock().unwrap() = NatType::Symmetric;
return NatType::Symmetric;
}
if let Ok(_reply4) = self if let Ok(_reply4) = self
.send_and_wait_for_probe_reply(StunProbeAttr::Port, &self.config.nat_server1) .send_and_wait_for_probe_reply(StunProbeAttr::Port, &self.config.nat_server1)
.await .await