From 50fa5e9a5edd4ed29ffe5c44c828ef85da03ea07 Mon Sep 17 00:00:00 2001 From: kony <2312708932@qq.com> Date: Sat, 21 Dec 2024 15:55:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy/proxy_io.go | 8 ++------ proxy/proxy_l.go | 6 ------ proxy/proxy_r.go | 5 ----- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/proxy/proxy_io.go b/proxy/proxy_io.go index 9c2370b..316da24 100644 --- a/proxy/proxy_io.go +++ b/proxy/proxy_io.go @@ -10,11 +10,9 @@ import ( func stunT2QProcess1(tc net.Conn, qc quic.Stream, stun_quic_conn quic.Connection) { for { - if _, err := io.Copy(tc, qc); err != nil { + if n, err := io.Copy(tc, qc); n == 0 || err != nil { log.Printf("udp.conn: %v, quic.conn: %v, quic.stream: %v, err: %v\n", tc.RemoteAddr(), stun_quic_conn.RemoteAddr(), qc.StreamID(), err) - //log.Printf(" stunT2QProcess1 tcp close: %v ==> %v\n", tc.RemoteAddr(), tc.LocalAddr()) tc.Close() - //log.Printf(" stunT2QProcess1 quic stream close: %v, %v ==> %v\n", qc.StreamID(), stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) qc.Close() break } @@ -23,11 +21,9 @@ func stunT2QProcess1(tc net.Conn, qc quic.Stream, stun_quic_conn quic.Connection func stunQ2TProcess1(qc quic.Stream, tc net.Conn, stun_quic_conn quic.Connection) { for { - if _, err := io.Copy(qc, tc); err != nil { + if n, err := io.Copy(qc, tc); n == 0 || err != nil { log.Printf("udp.conn: %v, quic.conn: %v, quic.stream: %v, err: %v\n", tc.RemoteAddr(), stun_quic_conn.RemoteAddr(), qc.StreamID(), err) - //log.Printf(" stunQ2TProcess1 tcp close: %v ==> %v\n", tc.RemoteAddr(), tc.LocalAddr()) tc.Close() - //log.Printf(" stunQ2TProcess1 quic stream close: %v, %v ==> %v\n", qc.StreamID(), stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) qc.Close() break } diff --git a/proxy/proxy_l.go b/proxy/proxy_l.go index 6f86189..70b1670 100644 --- a/proxy/proxy_l.go +++ b/proxy/proxy_l.go @@ -14,19 +14,13 @@ func ProcessProxyClient(listener net.Listener, stun_quic_conn quic.Connection) { for { new_tcp_conn, err := listener.Accept() if err == nil { - //log.Printf(" ProcessProxyClient listener.Accept: %v ==> %v\n", new_tcp_conn.RemoteAddr(), new_tcp_conn.LocalAddr()) new_quic_stream, err := stun_quic_conn.OpenStreamSync(context.Background()) if err == nil { - //log.Printf(" ProcessProxyClient stun_quic_conn.OpenStreamSync: %v ==> %v\n", stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) go stunT2QProcess1(new_tcp_conn, new_quic_stream, stun_quic_conn) go stunQ2TProcess1(new_quic_stream, new_tcp_conn, stun_quic_conn) continue - } else { - log.Printf(" ProcessProxyClient stun_quic_conn.OpenStreamSync: %v\n", err) } break - } else { - log.Printf(" ProcessProxyClient listener.Accept: %v\n", err) } break } diff --git a/proxy/proxy_r.go b/proxy/proxy_r.go index fa81035..c19de75 100644 --- a/proxy/proxy_r.go +++ b/proxy/proxy_r.go @@ -19,18 +19,13 @@ func ProcessProxyServer(addr string, stun_quic_conn quic.Connection) { for { new_quic_stream, err := stun_quic_conn.AcceptStream(context.Background()) if err == nil { - //log.Printf(" ProcessProxyServer new_quic_conn.AcceptStream: %v ==> %v\n", stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) new_tcp_conn, err := net.Dial("tcp", addr) if err == nil { go stunT2QProcess1(new_tcp_conn, new_quic_stream, stun_quic_conn) go stunQ2TProcess1(new_quic_stream, new_tcp_conn, stun_quic_conn) continue - } else { - log.Printf(" ProcessProxyServer net.Dial: %v\n", err) } break - } else { - log.Printf(" ProcessProxyServer stun_quic_conn.AcceptStream: %v\n", err) } break }