set the LocalAddr that is used in the tls.ClientHelloInfo.Conn

quic-go · Feb 17, 2020 · 038cd1d · 038cd1d
1 parent 2e1387c
commit 038cd1d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/internal/handshake/crypto_setup.go b/internal/handshake/crypto_setup.go
@@ -120,6 +120,7 @@ func NewCryptoSetupClient(
 	handshakeStream io.Writer,
 	oneRTTStream io.Writer,
 	connID protocol.ConnectionID,
+	localAddr net.Addr,
 	remoteAddr net.Addr,
 	tp *TransportParameters,
 	runner handshakeRunner,
@@ -139,7 +140,7 @@ func NewCryptoSetupClient(
 		logger,
 		protocol.PerspectiveClient,
 	)
-	cs.conn = qtls.Client(newConn(remoteAddr), cs.tlsConf)
+	cs.conn = qtls.Client(newConn(localAddr, remoteAddr), cs.tlsConf)
 	return cs, clientHelloWritten
 }
 
@@ -149,6 +150,7 @@ func NewCryptoSetupServer(
 	handshakeStream io.Writer,
 	oneRTTStream io.Writer,
 	connID protocol.ConnectionID,
+	localAddr net.Addr,
 	remoteAddr net.Addr,
 	tp *TransportParameters,
 	runner handshakeRunner,
@@ -168,7 +170,7 @@ func NewCryptoSetupServer(
 		logger,
 		protocol.PerspectiveServer,
 	)
-	cs.conn = qtls.Server(newConn(remoteAddr), cs.tlsConf)
+	cs.conn = qtls.Server(newConn(localAddr, remoteAddr), cs.tlsConf)
 	return cs
 }
 

diff --git a/internal/handshake/crypto_setup_test.go b/internal/handshake/crypto_setup_test.go
@@ -92,6 +92,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 			ioutil.Discard,
 			protocol.ConnectionID{},
 			nil,
+			nil,
 			&TransportParameters{},
 			NewMockHandshakeRunner(mockCtrl),
 			tlsConf,
@@ -123,6 +124,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 			ioutil.Discard,
 			protocol.ConnectionID{},
 			nil,
+			nil,
 			&TransportParameters{},
 			runner,
 			testdata.GetTLSConfig(),
@@ -160,6 +162,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 			ioutil.Discard,
 			protocol.ConnectionID{},
 			nil,
+			nil,
 			&TransportParameters{},
 			runner,
 			testdata.GetTLSConfig(),
@@ -200,6 +203,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 			ioutil.Discard,
 			protocol.ConnectionID{},
 			nil,
+			nil,
 			&TransportParameters{},
 			runner,
 			serverConf,
@@ -233,6 +237,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 			ioutil.Discard,
 			protocol.ConnectionID{},
 			nil,
+			nil,
 			&TransportParameters{},
 			NewMockHandshakeRunner(mockCtrl),
 			serverConf,
@@ -321,6 +326,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 				cOneRTTStream,
 				protocol.ConnectionID{},
 				nil,
+				nil,
 				&TransportParameters{},
 				cRunner,
 				clientConf,
@@ -342,6 +348,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 				sOneRTTStream,
 				protocol.ConnectionID{},
 				nil,
+				nil,
 				&TransportParameters{StatelessResetToken: &token},
 				sRunner,
 				serverConf,
@@ -394,6 +401,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 				ioutil.Discard,
 				protocol.ConnectionID{},
 				nil,
+				nil,
 				&TransportParameters{},
 				runner,
 				&tls.Config{InsecureSkipVerify: true},
@@ -434,6 +442,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 				ioutil.Discard,
 				protocol.ConnectionID{},
 				nil,
+				nil,
 				cTransportParameters,
 				cRunner,
 				clientConf,
@@ -456,6 +465,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 				ioutil.Discard,
 				protocol.ConnectionID{},
 				nil,
+				nil,
 				sTransportParameters,
 				sRunner,
 				serverConf,
@@ -492,6 +502,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 					ioutil.Discard,
 					protocol.ConnectionID{},
 					nil,
+					nil,
 					&TransportParameters{},
 					cRunner,
 					clientConf,
@@ -509,6 +520,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 					ioutil.Discard,
 					protocol.ConnectionID{},
 					nil,
+					nil,
 					&TransportParameters{},
 					sRunner,
 					serverConf,
@@ -547,6 +559,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 					ioutil.Discard,
 					protocol.ConnectionID{},
 					nil,
+					nil,
 					&TransportParameters{},
 					cRunner,
 					clientConf,
@@ -564,6 +577,7 @@ var _ = Describe("Crypto Setup TLS", func() {
 					ioutil.Discard,
 					protocol.ConnectionID{},
 					nil,
+					nil,
 					&TransportParameters{},
 					sRunner,
 					serverConf,

diff --git a/internal/handshake/qtls.go b/internal/handshake/qtls.go
@@ -10,11 +10,14 @@ import (
 )
 
 type conn struct {
-	remoteAddr net.Addr
+	localAddr, remoteAddr net.Addr
 }
 
-func newConn(remote net.Addr) net.Conn {
-	return &conn{remoteAddr: remote}
+func newConn(local, remote net.Addr) net.Conn {
+	return &conn{
+		localAddr:  local,
+		remoteAddr: remote,
+	}
 }
 
 var _ net.Conn = &conn{}
@@ -23,7 +26,7 @@ func (c *conn) Read([]byte) (int, error)         { return 0, nil }
 func (c *conn) Write([]byte) (int, error)        { return 0, nil }
 func (c *conn) Close() error                     { return nil }
 func (c *conn) RemoteAddr() net.Addr             { return c.remoteAddr }
-func (c *conn) LocalAddr() net.Addr              { return nil }
+func (c *conn) LocalAddr() net.Addr              { return c.localAddr }
 func (c *conn) SetReadDeadline(time.Time) error  { return nil }
 func (c *conn) SetWriteDeadline(time.Time) error { return nil }
 func (c *conn) SetDeadline(time.Time) error      { return nil }

diff --git a/session.go b/session.go
@@ -260,6 +260,7 @@ var newSession = func(
 		handshakeStream,
 		oneRTTStream,
 		clientDestConnID,
+		conn.LocalAddr(),
 		conn.RemoteAddr(),
 		params,
 		&handshakeRunner{
@@ -359,6 +360,7 @@ var newClientSession = func(
 		handshakeStream,
 		oneRTTStream,
 		destConnID,
+		conn.LocalAddr(),
 		conn.RemoteAddr(),
 		params,
 		&handshakeRunner{