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

add ipv6 and lan

Browse Source
This commit is contained in:
kony
2025-01-23 19:49:55 +08:00
parent c34b26aa26
commit e920056ccb
2 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pro/local.go
View File

@@ -72,13 +72,21 @@ func GetLocalQuicConn(conn *net.UDPConn, addr *AddrType, conn_type int, count in
tun_active = nil
redisJson.LocalAddr = *addr
if redisJson.LocalAddr.WanIPv4 == redisJson.RemoteAddr.WanIPv4 {
RedisDel()
return tun_active, tun_passive, nil, nil, fmt.Errorf("和对端处在同一个公网IP, 退出")
}
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.RemoteAddr.WanIPv4, redisJson.RemoteAddr.WanPort1, redisJson.RemoteAddr.WanPort2, redisJson.SendPortCount)
tun_passive.Start()
if redisJson.LocalAddr.IPv6 != "" && redisJson.RemoteAddr.IPv6 != "" {
utils.Log().Debug("IPv6直连")
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.RemoteAddr.IPv6, redisJson.RemoteAddr.LocalPort, 0, redisJson.SendPortCount)
tun_passive.Start1()
} else if redisJson.LocalAddr.WanIPv4 == redisJson.RemoteAddr.WanIPv4 {
utils.Log().Debug("内网直连")
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.RemoteAddr.LocalIPv4, redisJson.RemoteAddr.LocalPort, 0, redisJson.SendPortCount)
tun_passive.Start1()
} else {
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.RemoteAddr.WanIPv4, redisJson.RemoteAddr.WanPort1, redisJson.RemoteAddr.WanPort2, redisJson.SendPortCount)
tun_passive.Start()
}
redisJson.State = 2
utils.Log().DebugF("发送本端地址: %v", redisJson.LocalAddr)
@@ -90,13 +98,20 @@ func GetLocalQuicConn(conn *net.UDPConn, addr *AddrType, conn_type int, count in
}
tun_passive = nil
if redisJson.LocalAddr.WanIPv4 == redisJson.RemoteAddr.WanIPv4 {
RedisDel()
return tun_active, tun_passive, nil, nil, fmt.Errorf("已经和对端处在同一个公网IP, 退出")
tun_active = tun.CreateTunActive([]byte(redisJson.SessionID), conn)
if redisJson.LocalAddr.IPv6 != "" && redisJson.RemoteAddr.IPv6 != "" {
utils.Log().Debug("IPv6直连")
tun_active.Start1(redisJson.RemoteAddr.IPv6, redisJson.RemoteAddr.LocalPort, 0)
} else if redisJson.LocalAddr.WanIPv4 == redisJson.RemoteAddr.WanIPv4 {
utils.Log().Debug("内网直连")
tun_active.Start1(redisJson.RemoteAddr.LocalIPv4, redisJson.RemoteAddr.LocalPort, 0)
} else {
tun_active.Start(redisJson.LocalAddr.WanPort1, redisJson.LocalAddr.WanPort2, redisJson.RemoteAddr.WanIPv4, redisJson.RemoteAddr.WanPort1, redisJson.RemoteAddr.WanPort2)
}
tun_active = tun.CreateTunActive([]byte(redisJson.SessionID), conn, 15*time.Second)
tun_active.Start(redisJson.LocalAddr.WanPort1, redisJson.LocalAddr.WanPort2, redisJson.RemoteAddr.WanIPv4, redisJson.RemoteAddr.WanPort1, redisJson.RemoteAddr.WanPort2, redisJson.SocketTimeOut)
redisJson.State = 2
RedisSet(redisJson.RedisTimeOut, &redisJson)
}

30
pro/remote.go
View File

@@ -85,7 +85,7 @@ func GetRemoteQuicConn(conn *net.UDPConn, addr *AddrType, time_out time.Duration
}
tun_passive = nil
tun_active = tun.CreateTunActive([]byte(redisJson.SessionID), conn, time_out)
tun_active = tun.CreateTunActive([]byte(redisJson.SessionID), conn)
tun_active_chain = tun_active.GetChain()
redisJson.State = 1
@@ -102,8 +102,20 @@ func GetRemoteQuicConn(conn *net.UDPConn, addr *AddrType, time_out time.Duration
}
tun_active = nil
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.LocalAddr.WanIPv4, redisJson.LocalAddr.WanPort1, redisJson.LocalAddr.WanPort2, 0x100)
tun_passive.Start()
if redisJson.LocalAddr.IPv6 != "" && redisJson.RemoteAddr.IPv6 != "" {
utils.Log().Debug("IPv6直连")
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.LocalAddr.IPv6, redisJson.LocalAddr.LocalPort, 0, 0x100)
tun_passive.Start1()
} else if redisJson.LocalAddr.WanIPv4 == redisJson.RemoteAddr.WanIPv4 {
utils.Log().Debug("内网直连")
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.LocalAddr.LocalIPv4, redisJson.LocalAddr.LocalPort, 0, 0x100)
tun_passive.Start1()
} else {
tun_passive = tun.CteateTunPassive([]byte(redisJson.SessionID), conn, redisJson.LocalAddr.WanIPv4, redisJson.LocalAddr.WanPort1, redisJson.LocalAddr.WanPort2, 0x100)
tun_passive.Start()
}
tun_passive_chain = tun_passive.GetChain()
@@ -116,7 +128,17 @@ func GetRemoteQuicConn(conn *net.UDPConn, addr *AddrType, time_out time.Duration
switch conn_type {
case 0:
utils.Log().DebugF("收到对端地址: %v", redisJson.LocalAddr)
tun_active.Start(redisJson.RemoteAddr.WanPort1, redisJson.RemoteAddr.WanPort2, redisJson.LocalAddr.WanIPv4, redisJson.LocalAddr.WanPort1, redisJson.LocalAddr.WanPort2, redisJson.SocketTimeOut)
if redisJson.LocalAddr.IPv6 != "" && redisJson.RemoteAddr.IPv6 != "" {
utils.Log().Debug("IPv6直连")
tun_active.Start1(redisJson.LocalAddr.IPv6, redisJson.LocalAddr.LocalPort, 0)
} else if redisJson.LocalAddr.WanIPv4 == redisJson.RemoteAddr.WanIPv4 {
utils.Log().Debug("内网直连")
tun_active.Start1(redisJson.LocalAddr.LocalIPv4, redisJson.LocalAddr.LocalPort, 0)
} else {
tun_active.Start(redisJson.RemoteAddr.WanPort1, redisJson.RemoteAddr.WanPort2, redisJson.LocalAddr.WanIPv4, redisJson.LocalAddr.WanPort1, redisJson.LocalAddr.WanPort2)
}
case 1:
utils.Log().DebugF("收到对端地址, 等待连接: %v", redisJson.LocalAddr)