vless: fixed a bug in fallback processing

This commit is contained in:
nadoo committed 2020-10-15 19:34:00 +08:00
1 parent d510ea45b0
commit 13babd9305
6 files changed
+24 -29

No files matched your search

+8 -12
View File
@@ -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.
+8 -4
View File
@@ -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)