trigger CI to address dead lock

shadowsocks · Apr 28, 2021 · 7b3415f · 7b3415f
1 parent d69a2fa
commit 7b3415f
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/crates/shadowsocks-service/src/server/udprelay.rs b/crates/shadowsocks-service/src/server/udprelay.rs
@@ -414,11 +414,10 @@ impl UdpAssociationContext {
         let mut buffer = [0u8; MAXIMUM_UDP_PAYLOAD_SIZE];
         loop {
             let (n, addr) = match outbound.recv_from(&mut buffer).await {
-                Ok((n, addr)) => {
-                    trace!("udp relay {} <- {} received {} bytes", self.peer_addr, addr, n);
+                Ok(r) => {
                     // Keep association alive in map
                     let _ = self.assoc_map.lock().await.get(&self.peer_addr);
-                    (n, addr)
+                    r
                 }
                 Err(err) => {
                     error!(
@@ -430,13 +429,23 @@ impl UdpAssociationContext {
                 }
             };
 
+            trace!("udp relay {} <- {} received {} bytes", self.peer_addr, addr, n);
+
             let data = &buffer[..n];
 
             let target_addr = match self.target_cache.lock().await.get(&addr) {
                 Some(a) => a.clone(),
                 None => Address::from(addr),
             };
 
+            trace!(
+                "udp relay {} <- {} ({}) with {} bytes",
+                self.peer_addr,
+                target_addr,
+                addr,
+                data.len()
+            );
+
             // Send back to client
             if let Err(err) = self.inbound.send_to(self.peer_addr, &target_addr, data).await {
                 warn!(