mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
udp: remove uottun and optimize udp implementation
This commit is contained in:
1 parent
78e03d7fbf
commit
d510ea45b0
19 files changed
+83
-249
No files matched your search
+10
-3
@@ -7,6 +7,7 @@ import (
|
||||
"io/ioutil"
|
||||
"net"
|
||||
|
||||
"github.com/nadoo/glider/log"
|
||||
"github.com/nadoo/glider/pool"
|
||||
"github.com/nadoo/glider/proxy"
|
||||
)
|
||||
@@ -35,12 +36,18 @@ func (s *VLess) Dial(network, addr string) (net.Conn, error) {
|
||||
|
||||
// DialUDP connects to the given address via the proxy.
|
||||
func (s *VLess) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
|
||||
c, err := s.Dial("udp", addr)
|
||||
rc, err := s.dialer.Dial("tcp", s.addr)
|
||||
if err != nil {
|
||||
log.F("[vless]: dial to %s error: %s", s.addr, err)
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
c, err := NewClientConn(rc, s.uuid, network, addr)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
pkc := NewPktConn(c)
|
||||
return pkc, nil, nil
|
||||
|
||||
return NewPktConn(c), nil, nil
|
||||
}
|
||||
|
||||
// ClientConn is a vless client connection.
|
||||
|
||||
@@ -18,6 +18,10 @@ func NewPktConn(c net.Conn) *PktConn { return &PktConn{Conn: c} }
|
||||
// ReadFrom implements the necessary function of net.PacketConn.
|
||||
// TODO: we know that we use it in proxy.RelayUDP and the length of b is enough, check it later.
|
||||
func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
|
||||
if len(b) < 2 {
|
||||
return 0, nil, errors.New("buf size is not enough")
|
||||
}
|
||||
|
||||
// Length
|
||||
if _, err := io.ReadFull(pc.Conn, b[:2]); err != nil {
|
||||
return 0, nil, err
|
||||
@@ -41,5 +45,9 @@ func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
|
||||
binary.Write(buf, binary.BigEndian, uint16(len(b)))
|
||||
buf.Write(b)
|
||||
|
||||
return pc.Write(buf.Bytes())
|
||||
n, err := pc.Write(buf.Bytes())
|
||||
if n > 2 {
|
||||
return n - 2, err
|
||||
}
|
||||
return 0, err
|
||||
}
|
||||
+9
-19
@@ -2,7 +2,6 @@ package vless
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
@@ -52,6 +51,8 @@ func (s *VLess) Serve(c net.Conn) {
|
||||
headBuf := pool.GetWriteBuffer()
|
||||
defer pool.PutWriteBuffer(headBuf)
|
||||
|
||||
c = NewServerConn(c)
|
||||
|
||||
cmd, target, err := s.readHeader(io.TeeReader(c, headBuf))
|
||||
if err != nil {
|
||||
log.F("[vless] verify header from %s error: %v", c.RemoteAddr(), err)
|
||||
@@ -82,7 +83,7 @@ func (s *VLess) Serve(c net.Conn) {
|
||||
|
||||
log.F("[vless] %s <-> %s via %s", c.RemoteAddr(), target, dialer.Addr())
|
||||
|
||||
if err = proxy.Relay(NewServerConn(c), rc); err != nil {
|
||||
if err = proxy.Relay(c, rc); err != nil {
|
||||
log.F("[vless] %s <-> %s via %s, relay error: %v", c.RemoteAddr(), target, dialer.Addr(), err)
|
||||
// record remote conn failure only
|
||||
if !strings.Contains(err.Error(), s.addr) {
|
||||
@@ -161,7 +162,7 @@ func (s *VLess) readHeader(r io.Reader) (CmdType, string, error) {
|
||||
func (s *VLess) ServeUoT(c net.Conn, tgt string) {
|
||||
rc, err := net.ListenPacket("udp", "")
|
||||
if err != nil {
|
||||
log.F("[vless] UDP remote listen error: %v", err)
|
||||
log.F("[vless] UDP listen error: %v", err)
|
||||
return
|
||||
}
|
||||
defer rc.Close()
|
||||
@@ -172,26 +173,19 @@ func (s *VLess) ServeUoT(c net.Conn, tgt string) {
|
||||
return
|
||||
}
|
||||
|
||||
pc := NewPktConn(c)
|
||||
|
||||
go func() {
|
||||
buf := pool.GetBuffer(proxy.UDPBufSize)
|
||||
defer pool.PutBuffer(buf)
|
||||
for {
|
||||
_, err := io.ReadFull(c, buf[:2])
|
||||
n, _, err := pc.ReadFrom(buf)
|
||||
if err != nil {
|
||||
log.F("[vless] read c error: %s\n", err)
|
||||
return
|
||||
}
|
||||
|
||||
length := binary.BigEndian.Uint16(buf[:2])
|
||||
n, err := io.ReadFull(c, buf[:length])
|
||||
if err != nil {
|
||||
log.F("[vless] read payload error: %s\n", err)
|
||||
return
|
||||
}
|
||||
|
||||
_, err = rc.WriteTo(buf[:n], tgtAddr)
|
||||
if err != nil {
|
||||
log.F("[vless] write rc error: %s\n", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -203,20 +197,16 @@ func (s *VLess) ServeUoT(c net.Conn, tgt string) {
|
||||
defer pool.PutBuffer(buf)
|
||||
|
||||
for {
|
||||
n, _, err := rc.ReadFrom(buf[2:])
|
||||
n, _, err := rc.ReadFrom(buf)
|
||||
if err != nil {
|
||||
log.F("[vless] read rc error: %v", err)
|
||||
break
|
||||
}
|
||||
|
||||
binary.BigEndian.PutUint16(buf[:2], uint16(n))
|
||||
_, err = c.Write(buf[:2+n])
|
||||
_, err = pc.WriteTo(buf[:n], nil)
|
||||
if err != nil {
|
||||
log.F("[vless] write c error: %v", err)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// ServerConn is a vless client connection.
|
||||
|
||||
Reference in new issue
Block a user