matthew/packer-plugin-xenserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32 from rdobson/port_race

Browse Source 
Fixing race condition between port test and attempting to listen.
This commit is contained in:
Rob Dobson 2015-05-22 10:24:01 +01:00
commit 274d86cdc6
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builder/xenserver/common/ssh.go
View File

@ -142,7 +142,7 @@ func forward(local_conn net.Conn, config *gossh.ClientConfig, server, remote_des
return nil return nil
} }
func ssh_port_forward(local_port uint, remote_port uint, remote_dest, host, username, password string) error { func ssh_port_forward(local_listener net.Listener, remote_port uint, remote_dest, host, username, password string) error {
config := &gossh.ClientConfig{ config := &gossh.ClientConfig{
User: username, User: username,
@ -151,16 +151,6 @@ func ssh_port_forward(local_port uint, remote_port uint, remote_dest, host, user
}, },
} }
// Listen on a local port
local_listener, err := net.Listen("tcp",
fmt.Sprintf("%s:%d",
"127.0.0.1",
local_port))
if err != nil {
log.Printf("Local listen failed: %s", err)
return err
}
for { for {
local_connection, err := local_listener.Accept() local_connection, err := local_listener.Accept()

4
builder/xenserver/common/step_forward_port_over_ssh.go
View File

@ -30,14 +30,12 @@ func (self *StepForwardPortOverSSH) Run(state multistep.StateBag) multistep.Step
return multistep.ActionHalt return multistep.ActionHalt
} }
l.Close()
ui.Say(fmt.Sprintf("Creating a local port forward over SSH on local port %d", sshHostPort)) ui.Say(fmt.Sprintf("Creating a local port forward over SSH on local port %d", sshHostPort))
remotePort, _ := self.RemotePort(state) remotePort, _ := self.RemotePort(state)
remoteDest, _ := self.RemoteDest(state) remoteDest, _ := self.RemoteDest(state)
go ssh_port_forward(sshHostPort, remotePort, remoteDest, config.HostIp, config.Username, config.Password) go ssh_port_forward(l, remotePort, remoteDest, config.HostIp, config.Username, config.Password)
ui.Say(fmt.Sprintf("Port forward setup. %d ---> %s:%d on %s", sshHostPort, remoteDest, remotePort, config.HostIp)) ui.Say(fmt.Sprintf("Port forward setup. %d ---> %s:%d on %s", sshHostPort, remoteDest, remotePort, config.HostIp))
// Provide the local port to future steps. // Provide the local port to future steps.