From 3a6c485329aa4e35c4b0a080154e78a775ee3a9a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 24 Feb 2024 00:30:39 +0100
Subject: compute network once

---
 htping.go | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'htping.go')

diff --git a/htping.go b/htping.go
index 9e13baa..b480237 100644
--- a/htping.go
+++ b/htping.go
@@ -87,6 +87,7 @@ var ntotal int32
 
 var flag4 bool
 var flag6 bool
+var network = "tcp"
 var quiet bool
 var myHeaders headers
 var method string
@@ -150,16 +151,7 @@ func newTransport() *transport {
 		ForceAttemptHTTP2: !http11,
 
 		DialContext: func(ctx context.Context, _, addr string) (net.Conn, error) {
-			var network string
-			switch {
-			case flag4:
-				network = "tcp4"
-			case flag6:
-				network = "tcp6"
-			default:
-				network = "tcp"
-			}
-			return dialer.DialContext(ctx, network, addr)
+			return dialer.DialContext(ctx, network, addr) // force our network preference
 		},
 	}
 
@@ -334,6 +326,13 @@ func main() {
 		os.Exit(2)
 	}
 
+	switch {
+	case flag4:
+		network = "tcp4"
+	case flag6:
+		network = "tcp6"
+	}
+
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
 	defer stop()
 
-- 
cgit 1.4.1