apps/goodlink
1
0
Fork 0
mirror of https://gitee.com/konyshe/goodlink.git synced 2025-12-24 08:13:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加两边连接算法的切换

Browse Source
This commit is contained in:
kony
2024-12-20 21:47:20 +08:00
parent 961494321c
commit 514f9efcf1
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
process/local.go
View File

@@ -24,8 +24,10 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) {
wan_ip_chain := make(chan string, 1)
wan_port_chain := make(chan int, 1)
conn := tools.GetListenUDP()
go func() {
ClientIP, ClientPort := stun2.GetWanIpPort()
ClientIP, ClientPort := stun2.GetWanIpPort2(conn)
wan_ip_chain <- ClientIP
wan_port_chain <- ClientPort
}()
@@ -33,13 +35,13 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) {
switch conn_type {
case 0:
log.Println("0: 请求连接对端")
RedisSet(30*time.Second, &redisJson)
RedisSet(15*time.Second, &redisJson)
default:
redisJson.ClientIP, redisJson.ClientPort = <-wan_ip_chain, <-wan_port_chain
redisJson.State = 0
log.Printf("%d: 发送本端地址: %v\n", redisJson.State, redisJson)
RedisSet(30*time.Second, &redisJson)
RedisSet(15*time.Second, &redisJson)
}
for {
@@ -56,6 +58,10 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) {
switch conn_type {
case 0:
log.Printf("%d: 收到对端地址: %v\n", redisJson.State, redisJson)
conn.Close()
conn = nil
if m_tun_passive != nil {
m_tun_passive.Release()
}
@@ -86,7 +92,7 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) {
RedisSet(redisJson.RedisTimeOut, &redisJson)
default:
log.Printf("%d: 收到对端地址, 发起连接: %v\n", redisJson.State, redisJson)
log.Printf("%d: 收到对端地址: %v\n", redisJson.State, redisJson)
if m_tun_active != nil {
m_tun_active.Release()
}
@@ -96,23 +102,30 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream) {
RedisTimeOut: redisJson.RedisTimeOut,
TunQuicConn: nil,
TunHealthStream: nil,
Conn: nil,
Conn: conn,
ConnList: make([]*net.UDPConn, 0),
ProcessChain: make(chan quic.Connection, 1),
}
m_tun_active.Conn = tools.GetListenUDP()
m_tun_active.ProcessServerChild(redisJson.ServerIP, redisJson.ServerPort)
redisJson.State = 2
RedisSet(redisJson.RedisTimeOut, &redisJson)
}
case 3:
if m_tun_passive.TunQuicConn == nil {
log.Println(" 连接失败")
return nil, nil
if m_tun_passive != nil {
if m_tun_passive.TunQuicConn != nil {
log.Printf("%d: 连接成功\n", redisJson.State)
return m_tun_passive.TunQuicConn, m_tun_passive.TunHealthStream
}
}
log.Printf("%d: 连接成功\n", redisJson.State)
return m_tun_passive.TunQuicConn, m_tun_passive.TunHealthStream
if m_tun_active != nil {
if m_tun_active.TunQuicConn != nil {
log.Printf("%d: 连接成功\n", redisJson.State)
return m_tun_active.TunQuicConn, m_tun_active.TunHealthStream
}
}
log.Println(" 连接失败")
return nil, nil
case 4:
log.Printf("%d: 连接超时\n", redisJson.State)

3
process/remote.go
View File

@@ -57,13 +57,12 @@ func GetRemoteQuicConn(time_out time.Duration) (quic.Connection, quic.Stream) {
RedisTimeOut: time_out * 3,
TunQuicConn: nil,
TunHealthStream: nil,
Conn: nil,
Conn: tools.GetListenUDP(),
ConnList: make([]*net.UDPConn, 0),
ProcessChain: make(chan quic.Connection, 1),
}
tun_active_chain = m_tun_active.ProcessChain
m_tun_active.Conn = tools.GetListenUDP()
redisJson.ServerIP, redisJson.ServerPort = stun2.GetWanIpPort2(m_tun_active.Conn)
log.Printf("%d: 发送本端地址: %v\n", redisJson.State, redisJson)

4
proxy/proxy_io.go
View File

@@ -10,7 +10,7 @@ import (
func stunT2QProcess1(tc net.Conn, qc quic.Stream, stun_quic_conn quic.Connection) {
for {
if n, err := io.Copy(tc, qc); n == 0 || err != nil {
if _, err := io.Copy(tc, qc); 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()
@@ -23,7 +23,7 @@ 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 n, err := io.Copy(qc, tc); n == 0 || err != nil {
if _, err := io.Copy(qc, tc); 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()