starred/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-11-06 16:14:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pick server only for new associations

Browse Source
This commit is contained in:
zonyitoo
2019-12-26 01:03:52 +08:00
parent 2d9a6e6ccd
commit c19108ab89
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/relay/udprelay/socks5_local.rs
+10 -8
View File
@@ -354,9 +354,6 @@ async fn listen(context: SharedContext, l: UdpSocket) -> io::Result<()> {
continue;
}
// Pick a server
let svr_cfg = balancer.pick_server();
// Check or (re)create an association
let mut assoc = {
// Locks the whole association map
@@ -365,11 +362,16 @@ async fn listen(context: SharedContext, l: UdpSocket) -> io::Result<()> {
// Get or create an association
let assoc = match assoc_map.entry(src.to_string()) {
Entry::Occupied(oc) => oc.into_mut(),
Entry::Vacant(vc) => vc.insert(
UdpAssociation::associate(context.clone(), svr_cfg.clone(), src, tx.clone())
.await
.expect("Failed to create udp association"),
),
Entry::Vacant(vc) => {
// Pick a server
let svr_cfg = balancer.pick_server();
vc.insert(
UdpAssociation::associate(context.clone(), svr_cfg.clone(), src, tx.clone())
.await
.expect("Failed to create udp association"),
)
}
};
// Clone the handle and release the lock.
src/relay/udprelay/tunnel_local.rs
+10 -8
View File
@@ -326,9 +326,6 @@ async fn listen(context: SharedContext, l: UdpSocket) -> io::Result<()> {
continue;
}
// Pick a server
let svr_cfg = balancer.pick_server();
// Check or (re)create an association
let mut assoc = {
// Locks the whole association map
@@ -337,11 +334,16 @@ async fn listen(context: SharedContext, l: UdpSocket) -> io::Result<()> {
// Get or create an association
let assoc = match assoc_map.entry(src.to_string()) {
Entry::Occupied(oc) => oc.into_mut(),
Entry::Vacant(vc) => vc.insert(
UdpAssociation::associate(context.clone(), svr_cfg.clone(), src, tx.clone())
.await
.expect("Failed to create udp association"),
),
Entry::Vacant(vc) => {
// Pick a server
let svr_cfg = balancer.pick_server();
vc.insert(
UdpAssociation::associate(context.clone(), svr_cfg.clone(), src, tx.clone())
.await
.expect("Failed to create udp association"),
)
}
};
// Clone the handle and release the lock.