fix bugs found in CI tests

Author: zh-jq

.github/workflows/static.yml

@@ -76,7 +76,7 @@ jobs:
           submodules: true
       - name: Install dependencies
         run: |
-          apk add --no-cache musl-dev linux-headers libc++-dev libunwind-static
+          apk add --no-cache musl-dev linux-headers libc++-dev llvm-libunwind-static
           apk add --no-cache clang lld capnproto-dev clang-libclang cmake make
       - name: Install Go for AWS-LC-FIPS
         if: contains(matrix.feature, 'vendored-aws-lc-fips')
@@ -111,7 +111,7 @@ jobs:
           submodules: true
       - name: Install dependencies
         run: |
-          apk add --no-cache musl-dev linux-headers libc++-dev libc++-static libunwind-static
+          apk add --no-cache musl-dev linux-headers libc++-dev libc++-static llvm-libunwind-static
           apk add --no-cache clang lld capnproto-dev clang-libclang cmake make
       - name: Cargo build
         run: cargo $UNSTABLE_OPTIONS build --profile release --no-default-features --features secure-vendored-mimalloc,${{ matrix.feature }},quic,vendored-c-ares

lib/vey-io-ext/src/udp/stream_copy/client/recv.rs

@@ -53,7 +53,7 @@ pub trait UdpCopyClientRecv {
         packets: &mut [UdpCopyPacket],
     ) -> Poll<Result<usize, UdpCopyClientError>> {
         let mut count = 0;
-        for (n, packet) in packets.iter_mut().enumerate() {
+        for packet in packets.iter_mut() {
             match self.poll_recv_buf(cx, packet.buf_mut()) {
                 Poll::Ready(Ok((off, len))) => {
                     packet.set_length(off);
@@ -65,10 +65,10 @@ pub trait UdpCopyClientRecv {
                 }
                 Poll::Ready(Err(e)) => return Poll::Ready(Err(e)),
                 Poll::Pending => {
-                    return if n == 0 {
+                    return if count == 0 {
                         Poll::Pending
                     } else {
-                        Poll::Ready(Ok(n - 1))
+                        Poll::Ready(Ok(count))
                     };
                 }
             }

lib/vey-io-ext/src/udp/stream_copy/remote/recv.rs

@@ -57,7 +57,7 @@ pub trait UdpCopyRemoteRecv {
         packets: &mut [UdpCopyPacket],
     ) -> Poll<Result<usize, UdpCopyRemoteError>> {
         let mut count = 0;
-        for (n, packet) in packets.iter_mut().enumerate() {
+        for packet in packets.iter_mut() {
             match self.poll_recv_buf(cx, packet.buf_mut()) {
                 Poll::Ready(Ok((off, len))) => {
                     packet.set_offset(off);
@@ -69,10 +69,10 @@ pub trait UdpCopyRemoteRecv {
                 }
                 Poll::Ready(Err(e)) => return Poll::Ready(Err(e)),
                 Poll::Pending => {
-                    return if n == 0 {
+                    return if count == 0 {
                         Poll::Pending
                     } else {
-                        Poll::Ready(Ok(n - 1))
+                        Poll::Ready(Ok(count))
                     };
                 }
             }

scripts/coverage/vey-proxy/0011_escaper_proxy_float/testcases.sh

@@ -12,14 +12,17 @@ for port in 1080 1081
 do
 	SOCKS5_PROXY="socks5h://127.0.0.1:${port}"
 	test_socks5_proxy_http
-	test_socks5_proxy_dns
 
 
 	SOCKS4_PROXY="socks4a://127.0.0.1:${port}"
 	test_socks4_proxy_http
 done
 
 
+SOCKS5_PROXY="socks5h://127.0.0.1:1080"
+test_socks5_proxy_dns
+
+
 vey_proxy_ctl escaper float_passive publish '{"type":"https","addr":"127.0.0.1:7443", "tls_name": "vey-proxy.local"}'
 
 
@@ -31,13 +34,17 @@ for port in 1080 1081
 do
 	SOCKS5_PROXY="socks5h://127.0.0.1:${port}"
 	test_socks5_proxy_http
-	test_socks5_proxy_dns
 
 
 	SOCKS4_PROXY="socks4a://127.0.0.1:${port}"
 	test_socks4_proxy_http
 done
 
+
+SOCKS5_PROXY="socks5h://127.0.0.1:1080"
+test_socks5_proxy_dns
+
+
 vey_proxy_ctl escaper float_passive publish '{"type":"socks5","addr":"127.0.0.1:6080"}'
 
 

vey-proxy/src/module/masque_udp/send.rs

@@ -54,7 +54,7 @@ impl MasqueUdpSendBuffer {
             return;
         }
         for packet in packets {
-            self.push_packet(packet.buf());
+            self.push_packet(packet.payload());
         }
     }