mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
trojan: added udp support
This commit is contained in:
1 parent
2520a1c8b4
commit
bfcf9272dc
6 files changed
+138
-66
No files matched your search
@@ -0,0 +1,75 @@
|
||||
// https://trojan-gfw.github.io/trojan/protocol
|
||||
// If the connection is a UDP ASSOCIATE, then each UDP packet has the following format:
|
||||
// +------+----------+----------+--------+---------+----------+
|
||||
// | ATYP | DST.ADDR | DST.PORT | Length | CRLF | Payload |
|
||||
// +------+----------+----------+--------+---------+----------+
|
||||
// | 1 | Variable | 2 | 2 | X'0D0A' | Variable |
|
||||
// +------+----------+----------+--------+---------+----------+
|
||||
package trojan
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
"io"
|
||||
"net"
|
||||
|
||||
"github.com/nadoo/glider/common/conn"
|
||||
"github.com/nadoo/glider/common/socks"
|
||||
)
|
||||
|
||||
// PktConn .
|
||||
type PktConn struct {
|
||||
net.Conn
|
||||
|
||||
tgtAddr socks.Addr
|
||||
}
|
||||
|
||||
func NewPktConn(c net.Conn, tgtAddr socks.Addr) *PktConn {
|
||||
pc := &PktConn{
|
||||
Conn: c,
|
||||
tgtAddr: tgtAddr,
|
||||
}
|
||||
return pc
|
||||
}
|
||||
|
||||
func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
|
||||
// ATYP, DST.ADDR, DST.PORT
|
||||
_, err := socks.ReadAddr(pc.Conn)
|
||||
if err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
|
||||
// Length
|
||||
if _, err = io.ReadFull(pc.Conn, b[:2]); err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
|
||||
length := int(binary.BigEndian.Uint16(b[:2]))
|
||||
if length > conn.UDPBufSize {
|
||||
return 0, nil, errors.New("packet invalid")
|
||||
}
|
||||
|
||||
// CRLF
|
||||
if _, err = io.ReadFull(pc.Conn, b[:2]); err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
|
||||
// Payload
|
||||
n, err := io.ReadFull(pc.Conn, b[:length])
|
||||
if err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
|
||||
// TODO: check the addr in return value, it's a fake packetConn so the addr is not valid
|
||||
return n, nil, err
|
||||
}
|
||||
|
||||
func (pc *PktConn) WriteTo(b []byte, addr net.Addr) (int, error) {
|
||||
var buf bytes.Buffer
|
||||
buf.Write(pc.tgtAddr)
|
||||
binary.Write(&buf, binary.BigEndian, uint16(len(b)))
|
||||
buf.WriteString("\r\n")
|
||||
buf.Write(b)
|
||||
return pc.Write(buf.Bytes())
|
||||
}
|
||||
+22
-4
@@ -32,7 +32,6 @@ import (
|
||||
"crypto/sha256"
|
||||
"crypto/tls"
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"net"
|
||||
"net/url"
|
||||
"strings"
|
||||
@@ -42,7 +41,7 @@ import (
|
||||
"github.com/nadoo/glider/proxy"
|
||||
)
|
||||
|
||||
// Trojan is a base trojan struct.
|
||||
// Trojan is a base trojan struct
|
||||
type Trojan struct {
|
||||
dialer proxy.Dialer
|
||||
proxy proxy.Proxy
|
||||
@@ -115,8 +114,13 @@ func (s *Trojan) Addr() string {
|
||||
|
||||
// Dial connects to the address addr on the network net via the proxy.
|
||||
func (s *Trojan) Dial(network, addr string) (net.Conn, error) {
|
||||
return s.dial(network, addr)
|
||||
}
|
||||
|
||||
func (s *Trojan) dial(network, addr string) (net.Conn, error) {
|
||||
rc, err := s.dialer.Dial("tcp", s.addr)
|
||||
if err != nil {
|
||||
log.F("[trojan]: dial to %s error: %s", s.addr, err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -128,14 +132,28 @@ func (s *Trojan) Dial(network, addr string) (net.Conn, error) {
|
||||
var buf bytes.Buffer
|
||||
buf.Write(s.pass[:])
|
||||
buf.WriteString("\r\n")
|
||||
buf.WriteByte(socks.CmdConnect)
|
||||
|
||||
cmd := socks.CmdConnect
|
||||
if network == "udp" {
|
||||
cmd = socks.CmdUDPAssociate
|
||||
}
|
||||
buf.WriteByte(cmd)
|
||||
|
||||
buf.Write(socks.ParseAddr(addr))
|
||||
buf.WriteString("\r\n")
|
||||
_, err = tlsConn.Write(buf.Bytes())
|
||||
|
||||
return tlsConn, err
|
||||
}
|
||||
|
||||
// DialUDP connects to the given address via the proxy.
|
||||
func (s *Trojan) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
|
||||
return nil, nil, errors.New("trojan client does not support udp now")
|
||||
c, err := s.dial("udp", addr)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
pkc := NewPktConn(c, socks.ParseAddr(addr))
|
||||
|
||||
return pkc, nil, nil
|
||||
}
|
||||
Reference in new issue
Block a user