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

+1 -6
View File
@@ -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
}
+1 -1
View File
@@ -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)
}