浏览代码

Use timeout when TLS is used.

Viktor Grahn 7 年之前
父节点
当前提交
7d702352e3
共有 1 个文件被更改,包括 6 次插入7 次删除
  1. 6 7
      oftp.go

+ 6 - 7
oftp.go

@@ -62,17 +62,16 @@ func (o Oftp) Call() error {
 	var err error
 
 	if o.NetworkTLS {
-		/*
-			netDialer := &net.Dialer{
-				Timeout: time.Duration(o.NetworkTimeout) * time.Second,
-			}
-		*/
+
+		netDialer := &net.Dialer{
+			Timeout: time.Duration(o.NetworkTimeout) * time.Second,
+		}
+
 		tlsConfig := &tls.Config{
 			InsecureSkipVerify: true,
 		}
 
-		//conn, err = tls.DialWithDialer(netDialer, "tcp", fmt.Sprintf("%s:%d", o.NetworkHost, o.NetworkPort), tlsConfig)
-		conn, err = tls.Dial("tcp", fmt.Sprintf("%s:%d", o.NetworkHost, o.NetworkPort), tlsConfig)
+		conn, err = tls.DialWithDialer(netDialer, "tcp", fmt.Sprintf("%s:%d", o.NetworkHost, o.NetworkPort), tlsConfig)
 		if err != nil {
 			return err
 		}