From e9278cc0bdb7bfb948d646b0914df8b15c49a5d2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 6 May 2013 15:27:44 -0700
Subject: [PATCH] packer/plugin: Randomly generate port to run on

---
 packer/plugin/plugin.go      | 23 +++++++++++++++++++++--
 packer/plugin/plugin_test.go |  8 +++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/packer/plugin/plugin.go b/packer/plugin/plugin.go
index c7f9135c2..9ff71e235 100644
--- a/packer/plugin/plugin.go
+++ b/packer/plugin/plugin.go
@@ -10,19 +10,38 @@ import (
 	"net/rpc"
 	"os"
 	packrpc "github.com/mitchellh/packer/packer/rpc"
+	"strconv"
 )
 
 // This serves a single RPC connection on the given RPC server on
 // a random port.
 func serve(server *rpc.Server) (err error) {
-	listener, err := net.Listen("tcp", ":2345")
+	minPort, err := strconv.ParseInt(os.Getenv("PACKER_PLUGIN_MIN_PORT"), 10, 32)
 	if err != nil {
 		return
 	}
+
+	maxPort, err := strconv.ParseInt(os.Getenv("PACKER_PLUGIN_MAX_PORT"), 10, 32)
+	if err != nil {
+		return
+	}
+
+	var address string
+	var listener net.Listener
+	for port := minPort; port <= maxPort; port++ {
+		address = fmt.Sprintf(":%d", port)
+		listener, err = net.Listen("tcp", address)
+		if err != nil {
+			return
+		}
+
+		break
+	}
+
 	defer listener.Close()
 
 	// Output the address to stdout
-	fmt.Println(":2345")
+	fmt.Println(address)
 	os.Stdout.Sync()
 
 	// Accept a connection
diff --git a/packer/plugin/plugin_test.go b/packer/plugin/plugin_test.go
index 70849e46e..3b7b79978 100644
--- a/packer/plugin/plugin_test.go
+++ b/packer/plugin/plugin_test.go
@@ -21,8 +21,14 @@ func (helperCommand) Synopsis() string {
 func helperProcess(s... string) *exec.Cmd {
 	cs := []string{"-test.run=TestHelperProcess", "--"}
 	cs = append(cs, s...)
+	env := []string{
+		"GO_WANT_HELPER_PROCESS=1",
+		"PACKER_PLUGIN_MIN_PORT=10000",
+		"PACKER_PLUGIN_MAX_PORT=25000",
+	}
+
 	cmd := exec.Command(os.Args[0], cs...)
-	cmd.Env = append([]string{"GO_WANT_HELPER_PROCESS=1"}, os.Environ()...)
+	cmd.Env = append(env, os.Environ()...)
 	return cmd
 }