dial with timeout

3 files changed, 8 insertions, 5 deletions

diff --git a/pkg/server/hook/proxy.go b/pkg/server/hook/proxy.go
index ca8e3c8..bc6da18 100644
--- a/pkg/server/hook/proxy.go
+++ b/pkg/server/hook/proxy.go
@@ -43,7 +43,7 @@ func (p *proxy) Send(rq, wq queue.Q) error {
 		return nil
 	}
 
-	p.env.Push("info", "-> " + p.addr)
+	p.env.Push("info", "-> "+p.addr)
 
 	return queue.Copy(rq, wq)
 }
diff --git a/pkg/server/socket/dial.go b/pkg/server/socket/dial.go
index 18dee8f..7623084 100644
--- a/pkg/server/socket/dial.go
+++ b/pkg/server/socket/dial.go
@@ -5,9 +5,12 @@ import (
 	"log"
 	"net"
 	"strings"
+	"time"
 	"tunnel/pkg/server/env"
 )
 
+const defaultTimeout = 5 * time.Second
+
 type dialSocket struct {
 	proto, addr string
 }
@@ -30,7 +33,7 @@ func (s *dialSocket) Open(e env.Env) (Conn, error) {
 		}
 	}
 
-	conn, err := net.Dial(s.proto, addr)
+	conn, err := net.DialTimeout(s.proto, addr, defaultTimeout)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/server/tunnel.go b/pkg/server/tunnel.go
index ae20c9b..b6c5ada 100644
--- a/pkg/server/tunnel.go
+++ b/pkg/server/tunnel.go
@@ -235,11 +235,11 @@ func (s *stream) info() string {
 	case d < 60000:
 		t = fmt.Sprintf("%.3f", float64(d)/1000.0)
 	case d < 3600000:
-		m, d := d / 60000, d % 60000
+		m, d := d/60000, d%60000
 		t = fmt.Sprintf("%d:%06.3f", m, float64(d)/1000.0)
 	default:
-		h, d := d / 3600000, d % 3600000
-		m, d := d / 60000, d % 60000
+		h, d := d/3600000, d%3600000
+		m, d := d/60000, d%60000
 		t = fmt.Sprintf("%d:%02d:%06.3f", h, m, float64(d)/1000.0)
 	}