Merge branch 'master' into 1941

tlsdialer.go

@@ -34,6 +34,8 @@ type ConnWithTimings struct {
 	// HandshakeTime: the amount of time that it took to complete the TLS
 	// handshake
 	HandshakeTime time.Duration
+	// ResolvedAddr: the address to which our dns lookup resolved
+	ResolvedAddr *net.TCPAddr
 	// VerifiedChains: like tls.ConnectionState.VerifiedChains
 	VerifiedChains [][]*x509.Certificate
 }
@@ -89,11 +91,10 @@ func DialForTimings(dialer *net.Dialer, network, addr string, sendServerName boo
 
 	log.Tracef("Resolving addr: %s", addr)
 	start := time.Now()
-	var resolved *net.TCPAddr
 	var err error
 	if timeout == 0 {
 		log.Tracef("Resolving immediately")
-		resolved, err = net.ResolveTCPAddr("tcp", addr)
+		result.ResolvedAddr, err = net.ResolveTCPAddr("tcp", addr)
 	} else {
 		log.Tracef("Resolving on goroutine")
 		resolvedCh := make(chan *net.TCPAddr, 10)
@@ -106,19 +107,19 @@ func DialForTimings(dialer *net.Dialer, network, addr string, sendServerName boo
 		err = <-errCh
 		if err == nil {
 			log.Tracef("No error, looking for resolved")
-			resolved = <-resolvedCh
+			result.ResolvedAddr = <-resolvedCh
 		}
 	}
 
 	if err != nil {
 		return result, err
 	}
 	result.ResolutionTime = time.Now().Sub(start)
-	log.Tracef("Resolved addr %s to %s in %s", addr, resolved, result.ResolutionTime)
+	log.Tracef("Resolved addr %s to %s in %s", addr, result.ResolvedAddr, result.ResolutionTime)
 
-	log.Tracef("Dialing %s %s (%s)", network, addr, resolved)
+	log.Tracef("Dialing %s %s (%s)", network, addr, result.ResolvedAddr)
 	start = time.Now()
-	rawConn, err := dialer.Dial(network, resolved.String())
+	rawConn, err := dialer.Dial(network, result.ResolvedAddr.String())
 	if err != nil {
 		return result, err
 	}

tlsdialer_test.go

@@ -70,12 +70,14 @@ func init() {
 
 func TestOKWithServerName(t *testing.T) {
 	fdStart := countTCPFiles()
-	conn, err := Dial("tcp", ADDR, true, &tls.Config{
+	cwt, err := DialForTimings(new(net.Dialer), "tcp", ADDR, true, &tls.Config{
 		RootCAs: cert.PoolContainingCert(),
 	})
+	conn := cwt.Conn
 	assert.NoError(t, err, "Unable to dial")
 	serverName := <-receivedServerNames
 	assert.Equal(t, "localhost", serverName, "Unexpected ServerName on server")
+	assert.NotNil(t, cwt.ResolvedAddr, "Should have resolved addr")
 	closeAndCountFDs(t, conn, err, fdStart)
 }
 
@@ -148,6 +150,8 @@ func TestVariableTimeouts(t *testing.T) {
 	for i := 0; i < 500; i++ {
 		doTestTimeout(t, time.Duration(rand.Intn(5000)+1)*time.Microsecond)
 	}
+	// Wait to give the sockets time to close
+	time.Sleep(1 * time.Second)
 	fdEnd := countTCPFiles()
 	assert.Equal(t, fdStart, fdEnd, "Number of open files should be the same after test as before")
 }
@@ -180,7 +184,7 @@ func closeAndCountFDs(t *testing.T, conn *tls.Conn, err error, fdStart int) {
 		conn.Close()
 	}
 	fdEnd := countTCPFiles()
-	assert.Equal(t, fdStart, fdEnd, "Number of open files should be the same after test as before")
+	assert.Equal(t, fdStart, fdEnd, "Number of open TCP files should be the same after test as before")
 }
 
 // see https://groups.google.com/forum/#!topic/golang-nuts/c0AnWXjzNIA