This commit is contained in:
arraykeys@gmail.com
2018-10-26 14:25:45 +08:00
parent bcca92affc
commit f0389cdd5b

View File

@ -242,9 +242,9 @@ func (s *MuxClient) getParentConn() (conn net.Conn, err error) {
conn = net.Conn(&_conn) conn = net.Conn(&_conn)
} }
} else { } else {
conf, err := utils.TlsConfig(s.cfg.CertBytes, s.cfg.KeyBytes, nil) conf, e := utils.TlsConfig(s.cfg.CertBytes, s.cfg.KeyBytes, nil)
if err != nil { if e != nil {
return nil, err return nil, e
} }
var _c net.Conn var _c net.Conn
_c, err = s.jumper.Dial(*s.cfg.Parent, time.Millisecond*time.Duration(*s.cfg.Timeout)) _c, err = s.jumper.Dial(*s.cfg.Parent, time.Millisecond*time.Duration(*s.cfg.Timeout))