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

Add default timeout to instantiate connection

Browse Source
This commit is contained in:
Julien Laffaye 2022-08-28 21:58:25 -04:00
parent 0aeb8660a7
commit b85cf1edcc
No known key found for this signature in database
GPG Key ID: 890C3E5C169AE841
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ftp.go
View File

@ -18,6 +18,12 @@ import (
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
) )
const (
// 30 seconds was chosen as it's the
// same duration as http.DefaultTransport's timeout.
DefaultDialTimeout = 30 * time.Second
)
// EntryType describes the different types of an Entry. // EntryType describes the different types of an Entry.
type EntryType int type EntryType int
@ -115,6 +121,12 @@ func Dial(addr string, options ...DialOption) (*ServerConn, error) {
if ctx == nil { if ctx == nil {
ctx = context.Background() ctx = context.Background()
} }
if _, ok := ctx.Deadline(); !ok {
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, DefaultDialTimeout)
defer cancel()
}
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) {
tlsDialer := &tls.Dialer{ tlsDialer := &tls.Dialer{