Add workaround to not trigger SplitHostPort in quic-go

netsec-ethz · May 19, 2020 · 404eac6 · 404eac6
1 parent 7b8092c
commit 404eac6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/netcat/modes/quic-modes.go b/netcat/modes/quic-modes.go
@@ -102,6 +102,9 @@ func DoDialQUIC(remoteAddr string) io.ReadWriteCloser {
 		&tls.Config{
 			InsecureSkipVerify: true,
 			NextProtos:         []string{nextProto},
+			// TODO: remove the hack below, and fix anywhere between appquic.Dial and quic-go/client.go newClient
+			ServerName: "example.com", // this is a stupid workaround to not hit SplitHostPort
+			// on a SCION address in quic-go newClient
 		},
 		&quic.Config{KeepAlive: true},
 	)

diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go
@@ -233,7 +233,6 @@ func findAnyHostInLocalAS(ctx context.Context, sciondConn sciond.Connector) (net
 	return bsAddr.IP, nil
 }
 
-
 // Duplicated from "github.com/scionproto/scion/go/lib/integration", but do not swallow error
 func (s *serverStop) Close() error {
 	s.cancel()