communicator/ssh: respect interrupts by not looping on retyr [GH-327]

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 BUG FIXES:
 
+* core: Fixed a couple cases where a double ctrl-C could panic.
 * command/build,command/validate: If a non-existent build is specified to
   '-only' or '-except', it is now an error. [GH-326]
 

common/step_connect_ssh.go

@@ -116,7 +116,7 @@ func (s *StepConnectSSH) waitForSSH(state map[string]interface{}, cancel <-chan
 		}
 
 		// Attempt to connect to SSH port
-		connFunc := ssh.ConnectFunc("tcp", address, 5*time.Minute)
+		connFunc := ssh.ConnectFunc("tcp", address)
 		nc, err := connFunc()
 		if err != nil {
 			log.Printf("TCP connection to SSH ip/port failed: %s", err)

communicator/ssh/connect.go

@@ -1,7 +1,6 @@
 package ssh
 
 import (
-	"errors"
 	"log"
 	"net"
 	"time"
@@ -10,24 +9,9 @@ import (
 // ConnectFunc is a convenience method for returning a function
 // that just uses net.Dial to communicate with the remote end that
 // is suitable for use with the SSH communicator configuration.
-func ConnectFunc(network, addr string, timeout time.Duration) func() (net.Conn, error) {
+func ConnectFunc(network, addr string) func() (net.Conn, error) {
 	return func() (net.Conn, error) {
-		timeoutCh := time.After(timeout)
+		log.Printf("Opening conn for SSH to %s %s", network, addr)
-
+		return net.DialTimeout(network, addr, 15*time.Second)
-		for {
-			select {
-			case <-timeoutCh:
-				return nil, errors.New("timeout connecting to remote machine")
-			default:
-			}
-
-			log.Printf("Opening conn for SSH to %s %s", network, addr)
-			nc, err := net.DialTimeout(network, addr, 15*time.Second)
-			if err == nil {
-				return nc, nil
-			}
-
-			time.Sleep(500 * time.Millisecond)
-		}
 	}
 }