mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
vless: fixed a bug in fallback processing
This commit is contained in:
1 parent
d510ea45b0
commit
13babd9305
6 files changed
+24
-29
No files matched your search
@@ -91,11 +91,6 @@ func (s *Trojan) dial(network, addr string) (net.Conn, error) {
|
||||
// DialUDP connects to the given address via the proxy.
|
||||
func (s *Trojan) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
|
||||
c, err := s.dial("udp", addr)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
pkc := NewPktConn(c, socks.ParseAddr(addr))
|
||||
// TODO: check the addr in return value
|
||||
return pkc, nil, nil
|
||||
return NewPktConn(c, socks.ParseAddr(addr)), nil, err
|
||||
}
|
||||
@@ -98,7 +98,7 @@ func (s *Trojan) Serve(c net.Conn) {
|
||||
|
||||
cmd, target, err := s.readHeader(io.TeeReader(c, headBuf))
|
||||
if err != nil {
|
||||
log.F("[trojan] verify header from %s error: %v", c.RemoteAddr(), err)
|
||||
// log.F("[trojan] verify header from %s error: %v", c.RemoteAddr(), err)
|
||||
if s.fallback != "" {
|
||||
s.serveFallback(c, s.fallback, headBuf)
|
||||
}
|
||||
|
||||
+8
-12
@@ -27,8 +27,13 @@ func (s *VLess) Addr() string {
|
||||
|
||||
// Dial connects to the address addr on the network net via the proxy.
|
||||
func (s *VLess) Dial(network, addr string) (net.Conn, error) {
|
||||
return s.dial(network, addr)
|
||||
}
|
||||
|
||||
func (s *VLess) dial(network, addr string) (net.Conn, error) {
|
||||
rc, err := s.dialer.Dial("tcp", s.addr)
|
||||
if err != nil {
|
||||
log.F("[vless]: dial to %s error: %s", s.addr, err)
|
||||
return nil, err
|
||||
}
|
||||
return NewClientConn(rc, s.uuid, network, addr)
|
||||
@@ -36,18 +41,9 @@ 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) {
|
||||
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
|
||||
}
|
||||
|
||||
return NewPktConn(c), nil, nil
|
||||
c, err := s.dial("udp", addr)
|
||||
// TODO: check the addr in return value
|
||||
return NewPktConn(c), nil, err
|
||||
}
|
||||
|
||||
// ClientConn is a vless client connection.
|
||||
|
||||
@@ -51,17 +51,17 @@ 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)
|
||||
// log.F("[vless] verify header from %s error: %v", c.RemoteAddr(), err)
|
||||
if s.fallback != "" {
|
||||
s.serveFallback(c, s.fallback, headBuf)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
c = NewServerConn(c)
|
||||
|
||||
network := "tcp"
|
||||
dialer := s.proxy.NextDialer(target)
|
||||
|
||||
@@ -232,7 +232,11 @@ func (c *ServerConn) Write(b []byte) (int, error) {
|
||||
c.sent = true
|
||||
|
||||
n, err := c.Conn.Write(buf.Bytes())
|
||||
return n - 2, err
|
||||
if n > 2 {
|
||||
return n - 2, err
|
||||
}
|
||||
|
||||
return 0, err
|
||||
}
|
||||
|
||||
return c.Conn.Write(b)
|
||||
|
||||
Reference in new issue
Block a user