fix(quicping): support URLs with an IPv6 address (#1192)

Closes ooni/probe#2546 --------- Co-authored-by: Simone Basso <[email protected]>
ooni · Oct 6, 2023 · 16f175b · 16f175b
1 parent cf67bdb
commit 16f175b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/internal/experiment/quicping/quicping.go b/internal/experiment/quicping/quicping.go
@@ -33,7 +33,7 @@ const (
 
 const (
 	testName    = "quicping"
-	testVersion = "0.1.0"
+	testVersion = "0.1.1"
 )
 
 // Config contains the experiment configuration.
@@ -228,12 +228,18 @@ func (m *Measurer) Run(ctx context.Context, args *model.ExperimentArgs) error {
 	sess := args.Session
 
 	host := string(measurement.Input)
+	var port = ""
 	// allow URL input
 	if u, err := url.ParseRequestURI(host); err == nil {
-		host = u.Host
+		host = u.Hostname()
+		port = u.Port()
 	}
-	service := net.JoinHostPort(host, m.config.port())
-	udpAddr, err := net.ResolveUDPAddr("udp4", service)
+	var service string
+	if port == "" {
+		port = m.config.port()
+	}
+	service = net.JoinHostPort(host, port)
+	udpAddr, err := net.ResolveUDPAddr("udp", service)
 	if err != nil {
 		return err
 	}

diff --git a/internal/experiment/quicping/quicping_test.go b/internal/experiment/quicping/quicping_test.go
@@ -20,7 +20,7 @@ func TestNewExperimentMeasurer(t *testing.T) {
 	if measurer.ExperimentName() != "quicping" {
 		t.Fatal("unexpected name")
 	}
-	if measurer.ExperimentVersion() != "0.1.0" {
+	if measurer.ExperimentVersion() != "0.1.1" {
 		t.Fatal("unexpected version")
 	}
 }