brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use tls.Dialer to be able to use DialContext

Browse Source
This commit is contained in:
Julien Laffaye 2022-08-17 19:35:55 -04:00
parent 45482d097e
commit fa83b53d0e
No known key found for this signature in database
GPG Key ID: 890C3E5C169AE841
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ftp.go
View File

@ -110,16 +110,20 @@ func Dial(addr string, options ...DialOption) (*ServerConn, error) {
dialFunc := do.dialFunc dialFunc := do.dialFunc
if dialFunc == nil { if dialFunc == nil {
ctx := do.context
if ctx == nil {
ctx = context.Background()
}
if do.tlsConfig != nil && !do.explicitTLS { if do.tlsConfig != nil && !do.explicitTLS {
dialFunc = func(network, address string) (net.Conn, error) { dialFunc = func(network, address string) (net.Conn, error) {
return tls.DialWithDialer(&do.dialer, network, addr, do.tlsConfig) tlsDialer := &tls.Dialer{
NetDialer: &do.dialer,
Config: do.tlsConfig,
}
return tlsDialer.DialContext(ctx, network, addr)
} }
} else { } else {
ctx := do.context
if ctx == nil {
ctx = context.Background()
}
dialFunc = func(network, address string) (net.Conn, error) { dialFunc = func(network, address string) (net.Conn, error) {
return do.dialer.DialContext(ctx, network, addr) return do.dialer.DialContext(ctx, network, addr)