This commit is contained in:
kony
2024-12-18 10:15:56 +08:00
parent 342537063c
commit f95dba6611
4 changed files with 10 additions and 10 deletions

View File

@@ -11,9 +11,9 @@ import (
func stunT2QProcess1(tc net.Conn, qc quic.Stream, stun_quic_conn quic.Connection) { func stunT2QProcess1(tc net.Conn, qc quic.Stream, stun_quic_conn quic.Connection) {
for { for {
if n, err := io.Copy(tc, qc); n == 0 || err != nil { if n, err := io.Copy(tc, qc); n == 0 || err != nil {
log.Printf("stunT2QProcess1 tcp close: %v==>%v\n", tc.RemoteAddr(), tc.LocalAddr()) log.Printf("stunT2QProcess1 tcp close: %v ==> %v\n", tc.RemoteAddr(), tc.LocalAddr())
tc.Close() tc.Close()
log.Printf("stunT2QProcess1 quic stream close: %v, %v==>%v\n", qc.StreamID(), stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) log.Printf("stunT2QProcess1 quic stream close: %v, %v ==> %v\n", qc.StreamID(), stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr())
qc.Close() qc.Close()
break break
} }
@@ -23,9 +23,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) { func stunQ2TProcess1(qc quic.Stream, tc net.Conn, stun_quic_conn quic.Connection) {
for { for {
if n, err := io.Copy(qc, tc); n == 0 || err != nil { if n, err := io.Copy(qc, tc); n == 0 || err != nil {
log.Printf("stunQ2TProcess1 tcp close: %v==>%v\n", tc.RemoteAddr(), tc.LocalAddr()) log.Printf("stunQ2TProcess1 tcp close: %v ==> %v\n", tc.RemoteAddr(), tc.LocalAddr())
tc.Close() tc.Close()
log.Printf("stunQ2TProcess1 quic stream close: %v, %v==>%v\n", qc.StreamID(), stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) log.Printf("stunQ2TProcess1 quic stream close: %v, %v ==> %v\n", qc.StreamID(), stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr())
qc.Close() qc.Close()
break break
} }

View File

@@ -14,10 +14,10 @@ func ProcessProxyClient(listener net.Listener, stun_quic_conn quic.Connection) {
for { for {
new_tcp_conn, err := listener.Accept() new_tcp_conn, err := listener.Accept()
if err == nil { if err == nil {
log.Printf("ProcessProxyClient listener.Accept: %v==>%v\n", new_tcp_conn.RemoteAddr(), new_tcp_conn.LocalAddr()) 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()) new_quic_stream, err := stun_quic_conn.OpenStreamSync(context.Background())
if err == nil { if err == nil {
log.Printf("ProcessProxyClient stun_quic_conn.OpenStreamSync: %v==>%v\n", stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) 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 stunT2QProcess1(new_tcp_conn, new_quic_stream, stun_quic_conn)
go stunQ2TProcess1(new_quic_stream, new_tcp_conn, stun_quic_conn) go stunQ2TProcess1(new_quic_stream, new_tcp_conn, stun_quic_conn)
continue continue

View File

@@ -19,7 +19,7 @@ func ProcessProxyServer(addr string, stun_quic_conn quic.Connection) {
for { for {
new_quic_stream, err := stun_quic_conn.AcceptStream(context.Background()) new_quic_stream, err := stun_quic_conn.AcceptStream(context.Background())
if err == nil { if err == nil {
log.Printf("ProcessProxyServer new_quic_conn.AcceptStream: %v==>%v\n", stun_quic_conn.RemoteAddr(), stun_quic_conn.LocalAddr()) 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) new_tcp_conn, err := net.Dial("tcp", addr)
if err == nil { if err == nil {
go stunT2QProcess1(new_tcp_conn, new_quic_stream, stun_quic_conn) go stunT2QProcess1(new_tcp_conn, new_quic_stream, stun_quic_conn)

View File

@@ -44,7 +44,7 @@ func (c *TunnelClient) process_quic(conn *net.UDPConn, remoteAddr *net.UDPAddr)
listener, err := quic.Listen(conn, tls2.GetServerTLSConfig(), nil) listener, err := quic.Listen(conn, tls2.GetServerTLSConfig(), nil)
tools.AssertErrorToNilf("process_quic quic.Listen: %v", err) tools.AssertErrorToNilf("process_quic quic.Listen: %v", err)
log.Printf("process_quic conn.WriteToUDP: %v==>%v\n", conn.LocalAddr(), c.remote_addr) log.Printf("process_quic conn.WriteToUDP: %v ==> %v\n", conn.LocalAddr(), c.remote_addr)
if _, err := conn.WriteToUDP(c.SendData, c.remote_addr); err != nil { if _, err := conn.WriteToUDP(c.SendData, c.remote_addr); err != nil {
log.Printf("process_quic conn.WriteToUDP: %v\n", err) log.Printf("process_quic conn.WriteToUDP: %v\n", err)
return return
@@ -54,11 +54,11 @@ func (c *TunnelClient) process_quic(conn *net.UDPConn, remoteAddr *net.UDPAddr)
new_quic_conn, err := listener.Accept(context.Background()) new_quic_conn, err := listener.Accept(context.Background())
tools.AssertErrorToNilf("process_server5 listener.Accept: %v", err) tools.AssertErrorToNilf("process_server5 listener.Accept: %v", err)
log.Printf("process_server5 quic.AcceptStream: %v==>%v\n", new_quic_conn.RemoteAddr(), new_quic_conn.LocalAddr()) log.Printf("process_server5 quic.AcceptStream: %v ==> %v\n", new_quic_conn.RemoteAddr(), new_quic_conn.LocalAddr())
new_quic_stream, err := new_quic_conn.AcceptStream(context.Background()) new_quic_stream, err := new_quic_conn.AcceptStream(context.Background())
tools.AssertErrorToNilf("process_server5 new_quic_conn.AcceptStream: %v", err) tools.AssertErrorToNilf("process_server5 new_quic_conn.AcceptStream: %v", err)
log.Printf("process_quic new_quic_stream.Read: %v==>%v\n", new_quic_conn.RemoteAddr(), new_quic_conn.LocalAddr()) log.Printf("process_quic new_quic_stream.Read: %v ==> %v\n", new_quic_conn.RemoteAddr(), new_quic_conn.LocalAddr())
//new_quic_stream.SetDeadline(time.Now().Add(30 * time.Second)) //new_quic_stream.SetDeadline(time.Now().Add(30 * time.Second))
if n, err := new_quic_stream.Read(c.RecvData); err == nil && n > 0 { if n, err := new_quic_stream.Read(c.RecvData); err == nil && n > 0 {
//new_quic_stream.SetDeadline(time.Time{}) //new_quic_stream.SetDeadline(time.Time{})