mirror of
https://github.com/e1732a364fed/v2ray_simple.git
synced 2025-12-24 13:27:56 +08:00
修订示例,文档,代码;主要修复如下两个 udp问题:
设置 socks5 的超时,包括fullcone。 修订tproxy代码,修复tproxy代码中的 两个缺陷 缺陷一: 在旧的tproxy代码中,如果读到了以前存在过的 udp源地址发来的信息的话,会继续返回 原来的 MsgConn 这时,会造成 给 主代码 提供 两个相同的 MsgConn的情况,不仅不正确,而且会导致 严重的并发问题 缺陷二: 旧代码中,tproxy的 缓存map 一直在增长,却没有 删除机制,这个也是个重大缺陷, 会导致内存泄漏
This commit is contained in:
@@ -21,46 +21,55 @@ func HandshakeTCP(tcpConn *net.TCPConn) netLayer.Addr {
|
||||
|
||||
}
|
||||
|
||||
var udpMsgConnMap = make(map[netLayer.HashableAddr]*MsgConn)
|
||||
|
||||
//从一个透明代理udp连接中读取到实际地址,并返回 *MsgConn
|
||||
func HandshakeUDP(underlay *net.UDPConn) (*MsgConn, netLayer.Addr, error) {
|
||||
bs := utils.GetPacket()
|
||||
n, src, dst, err := ReadFromUDP(underlay, bs)
|
||||
if err != nil {
|
||||
return nil, netLayer.Addr{}, err
|
||||
}
|
||||
ad := netLayer.NewAddrFromUDPAddr(src)
|
||||
hash := ad.GetHashable()
|
||||
conn, found := udpMsgConnMap[hash]
|
||||
if !found {
|
||||
conn = &MsgConn{
|
||||
ourSrcAddr: src,
|
||||
readChan: make(chan netLayer.AddrData, 5),
|
||||
closeChan: make(chan struct{}),
|
||||
}
|
||||
conn.InitEasyDeadline()
|
||||
|
||||
udpMsgConnMap[hash] = conn
|
||||
|
||||
}
|
||||
|
||||
conn.readChan <- netLayer.AddrData{Data: bs[:n], Addr: netLayer.NewAddrFromUDPAddr(dst)}
|
||||
|
||||
return conn, netLayer.NewAddrFromUDPAddr(dst), nil
|
||||
func (m *Machine) removeUDPByHash(hash netLayer.HashableAddr) {
|
||||
m.Lock()
|
||||
delete(m.udpMsgConnMap, hash)
|
||||
m.Unlock()
|
||||
}
|
||||
|
||||
//implements netLayer.MsgConn
|
||||
type MsgConn struct {
|
||||
netLayer.EasyDeadline
|
||||
//从一个透明代理udp连接中读取到实际地址,并返回 *MsgConn
|
||||
func (m *Machine) HandshakeUDP(underlay *net.UDPConn) (*MsgConn, netLayer.Addr, error) {
|
||||
|
||||
ourSrcAddr *net.UDPAddr
|
||||
for {
|
||||
bs := utils.GetPacket()
|
||||
n, src, dst, err := ReadFromUDP(underlay, bs)
|
||||
if err != nil {
|
||||
return nil, netLayer.Addr{}, err
|
||||
}
|
||||
ad := netLayer.NewAddrFromUDPAddr(src)
|
||||
hash := ad.GetHashable()
|
||||
|
||||
readChan chan netLayer.AddrData
|
||||
m.RLock()
|
||||
conn, found := m.udpMsgConnMap[hash]
|
||||
m.RUnlock()
|
||||
|
||||
closeChan chan struct{}
|
||||
if !found {
|
||||
conn = &MsgConn{
|
||||
ourSrcAddr: src,
|
||||
readChan: make(chan netLayer.AddrData, 5),
|
||||
closeChan: make(chan struct{}),
|
||||
parentMachine: m,
|
||||
hash: hash,
|
||||
}
|
||||
conn.InitEasyDeadline()
|
||||
|
||||
m.Lock()
|
||||
m.udpMsgConnMap[hash] = conn
|
||||
m.Unlock()
|
||||
|
||||
}
|
||||
|
||||
destAddr := netLayer.NewAddrFromUDPAddr(dst)
|
||||
|
||||
conn.readChan <- netLayer.AddrData{Data: bs[:n], Addr: destAddr}
|
||||
|
||||
if !found {
|
||||
return conn, destAddr, nil
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fullcone bool
|
||||
}
|
||||
|
||||
func (mc *MsgConn) Close() error {
|
||||
@@ -68,12 +77,14 @@ func (mc *MsgConn) Close() error {
|
||||
case <-mc.closeChan:
|
||||
default:
|
||||
close(mc.closeChan)
|
||||
mc.parentMachine.removeUDPByHash(mc.hash)
|
||||
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (mc *MsgConn) CloseConnWithRaddr(raddr netLayer.Addr) error {
|
||||
return nil
|
||||
return mc.Close()
|
||||
}
|
||||
|
||||
func (mc *MsgConn) Fullcone() bool {
|
||||
|
||||
Reference in New Issue
Block a user