vless: added udp support

This commit is contained in:
nadoo committed 2020-10-02 19:09:12 +08:00
1 parent bc68535dcd
commit b323a62ce6
10 files changed
+97 -34

No files matched your search

+7 -7
View File
@@ -172,14 +172,14 @@ func (s *SS) Serve(c net.Conn) {
func (s *SS) ListenAndServeUDP() {
lc, err := net.ListenPacket("udp", s.addr)
if err != nil {
log.F("[ss-udp] failed to listen on %s: %v", s.addr, err)
log.F("[ssu] failed to listen on %s: %v", s.addr, err)
return
}
defer lc.Close()
lc = s.PacketConn(lc)
log.F("[ss-udp] listening UDP on %s", s.addr)
log.F("[ssu] listening UDP on %s", s.addr)
var nm sync.Map
buf := make([]byte, proxy.UDPBufSize)
@@ -189,7 +189,7 @@ func (s *SS) ListenAndServeUDP() {
n, raddr, err := c.ReadFrom(buf)
if err != nil {
log.F("[ss-udp] remote read error: %v", err)
log.F("[ssu] remote read error: %v", err)
continue
}
@@ -198,7 +198,7 @@ func (s *SS) ListenAndServeUDP() {
if !ok && v == nil {
lpc, nextHop, err := s.proxy.DialUDP("udp", c.tgtAddr.String())
if err != nil {
log.F("[ss-udp] remote dial error: %v", err)
log.F("[ssu] remote dial error: %v", err)
continue
}
@@ -211,7 +211,7 @@ func (s *SS) ListenAndServeUDP() {
nm.Delete(raddr.String())
}()
log.F("[ss-udp] %s <-> %s", raddr, c.tgtAddr)
log.F("[ssu] %s <-> %s", raddr, c.tgtAddr)
} else {
pc = v.(*PktConn)
@@ -219,11 +219,11 @@ func (s *SS) ListenAndServeUDP() {
_, err = pc.WriteTo(buf[:n], pc.writeAddr)
if err != nil {
log.F("[ss-udp] remote write error: %v", err)
log.F("[ssu] remote write error: %v", err)
continue
}
// log.F("[ss-udp] %s <-> %s", raddr, c.tgtAddr)
// log.F("[ssu] %s <-> %s", raddr, c.tgtAddr)
}
}
+6
View File
@@ -28,6 +28,7 @@ func NewPktConn(c net.Conn, tgtAddr socks.Addr) *PktConn {
}
// 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) {
// ATYP, DST.ADDR, DST.PORT
_, err := socks.ReadAddr(pc.Conn)
@@ -50,6 +51,10 @@ func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
return 0, nil, err
}
if len(b) < length {
return 0, nil, errors.New("buf size is not enough")
}
// Payload
n, err := io.ReadFull(pc.Conn, b[:length])
if err != nil {
@@ -69,5 +74,6 @@ func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
binary.Write(buf, binary.BigEndian, uint16(len(b)))
buf.WriteString("\r\n")
buf.Write(b)
return pc.Write(buf.Bytes())
}
+8 -3
View File
@@ -27,8 +27,8 @@ type Conn struct {
rcved bool
}
// NewConn returns a new vless client conn.
func NewConn(c net.Conn, uuid [16]byte, target string) (*Conn, error) {
// ClientConn returns a new vless client conn.
func ClientConn(c net.Conn, uuid [16]byte, network, target string) (*Conn, error) {
atyp, addr, port, err := ParseAddr(target)
if err != nil {
return nil, err
@@ -40,7 +40,12 @@ func NewConn(c net.Conn, uuid [16]byte, target string) (*Conn, error) {
buf.WriteByte(Version) // ver
buf.Write(uuid[:]) // uuid
buf.WriteByte(0) // addLen
buf.WriteByte(CmdTCP) // cmd
cmd := CmdTCP
if network == "udp" {
cmd = CmdUDP
}
buf.WriteByte(cmd) // cmd
// target
err = binary.Write(buf, binary.BigEndian, uint16(port)) // port
+53
View File
@@ -0,0 +1,53 @@
package vless
import (
"encoding/binary"
"errors"
"io"
"net"
"github.com/nadoo/glider/pool"
)
// PktConn .
type PktConn struct {
net.Conn
}
// NewPktConn returns a PktConn.
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) {
// Length
if _, err := io.ReadFull(pc.Conn, b[:2]); err != nil {
return 0, nil, err
}
length := int(binary.BigEndian.Uint16(b[:2]))
if len(b) < length {
return 0, nil, errors.New("buf size is not enough")
}
// Payload
n, err := io.ReadFull(pc.Conn, b[:length])
if err != nil {
return 0, nil, err
}
return n, nil, nil
}
// WriteTo implements the necessary function of net.PacketConn.
func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
buf := pool.GetWriteBuffer()
defer pool.PutWriteBuffer(buf)
binary.Write(buf, binary.BigEndian, uint16(len(b)))
buf.Write(b)
return pc.Write(buf.Bytes())
}
+7 -3
View File
@@ -1,7 +1,6 @@
package vless
import (
"errors"
"net"
"net/url"
@@ -60,10 +59,15 @@ func (s *VLess) Dial(network, addr string) (net.Conn, error) {
if err != nil {
return nil, err
}
return NewConn(rc, s.uuid, addr)
return ClientConn(rc, s.uuid, network, addr)
}
// DialUDP connects to the given address via the proxy.
func (s *VLess) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
return nil, nil, errors.New("vless client does not support udp now")
c, err := s.Dial("udp", addr)
if err != nil {
return nil, nil, err
}
pkc := NewPktConn(c)
return pkc, nil, nil
}
+2 -1
View File
@@ -14,8 +14,9 @@ import (
"strings"
"time"
"github.com/nadoo/glider/pool"
"golang.org/x/crypto/chacha20poly1305"
"github.com/nadoo/glider/pool"
)
// Request Options