@@ -8,6 +8,7 @@ import (

 	"github.com/dotcloud/docker/engine"

 	"github.com/dotcloud/docker/execdriver"

 	"github.com/dotcloud/docker/graphdriver"

+	"github.com/dotcloud/docker/links"

 	"github.com/dotcloud/docker/nat"

 	"github.com/dotcloud/docker/pkg/mount"

 	"github.com/dotcloud/docker/pkg/term"

@@ -71,7 +72,7 @@ type Container struct {

 	VolumesRW  map[string]bool

 	hostConfig *runconfig.HostConfig

-	activeLinks map[string]*Link

+	activeLinks map[string]*links.Link

 }

 type BindMap struct {

@@ -537,7 +538,7 @@ func (container *Container) Start() (err error) {

 	}

 	if len(children) > 0 {

-		container.activeLinks = make(map[string]*Link, len(children))

+		container.activeLinks = make(map[string]*links.Link, len(children))

 		// If we encounter an error make sure that we rollback any network

 		// config and ip table changes

@@ -553,7 +554,7 @@ func (container *Container) Start() (err error) {

 				return fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)

 			}

-			link, err := NewLink(

+			link, err := links.NewLink(

 				container.NetworkSettings.IPAddress,

 				child.NetworkSettings.IPAddress,

 				linkAlias,

deleted file mode 100644

@@ -1,137 +0,0 @@

-package docker

-

-import (

-	"fmt"

-	"github.com/dotcloud/docker/engine"

-	"github.com/dotcloud/docker/nat"

-	"path"

-	"strings"

-)

-

-type Link struct {

-	ParentIP         string

-	ChildIP          string

-	Name             string

-	ChildEnvironment []string

-	Ports            []nat.Port

-	IsEnabled        bool

-	eng              *engine.Engine

-}

-

-func NewLink(parentIP, childIP, name string, env []string, exposedPorts map[nat.Port]struct{}, eng *engine.Engine) (*Link, error) {

-

-	var (

-		i     int

-		ports = make([]nat.Port, len(exposedPorts))

-	)

-

-	for p := range exposedPorts {

-		ports[i] = p

-		i++

-	}

-

-	l := &Link{

-		Name:             name,

-		ChildIP:          childIP,

-		ParentIP:         parentIP,

-		ChildEnvironment: env,

-		Ports:            ports,

-		eng:              eng,

-	}

-	return l, nil

-

-}

-

-func (l *Link) Alias() string {

-	_, alias := path.Split(l.Name)

-	return alias

-}

-

-func (l *Link) ToEnv() []string {

-	env := []string{}

-	alias := strings.ToUpper(l.Alias())

-

-	if p := l.getDefaultPort(); p != nil {

-		env = append(env, fmt.Sprintf("%s_PORT=%s://%s:%s", alias, p.Proto(), l.ChildIP, p.Port()))

-	}

-

-	// Load exposed ports into the environment

-	for _, p := range l.Ports {

-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s=%s://%s:%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto(), l.ChildIP, p.Port()))

-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_ADDR=%s", alias, p.Port(), strings.ToUpper(p.Proto()), l.ChildIP))

-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PORT=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Port()))

-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PROTO=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto()))

-	}

-

-	// Load the linked container's name into the environment

-	env = append(env, fmt.Sprintf("%s_NAME=%s", alias, l.Name))

-

-	if l.ChildEnvironment != nil {

-		for _, v := range l.ChildEnvironment {

-			parts := strings.Split(v, "=")

-			if len(parts) != 2 {

-				continue

-			}

-			// Ignore a few variables that are added during docker build

-			if parts[0] == "HOME" || parts[0] == "PATH" {

-				continue

-			}

-			env = append(env, fmt.Sprintf("%s_ENV_%s=%s", alias, parts[0], parts[1]))

-		}

-	}

-	return env

-}

-

-// Default port rules

-func (l *Link) getDefaultPort() *nat.Port {

-	var p nat.Port

-	i := len(l.Ports)

-

-	if i == 0 {

-		return nil

-	} else if i > 1 {

-		nat.Sort(l.Ports, func(ip, jp nat.Port) bool {

-			// If the two ports have the same number, tcp takes priority

-			// Sort in desc order

-			return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && strings.ToLower(ip.Proto()) == "tcp")

-		})

-	}

-	p = l.Ports[0]

-	return &p

-}

-

-func (l *Link) Enable() error {

-	if err := l.toggle("-I", false); err != nil {

-		return err

-	}

-	l.IsEnabled = true

-	return nil

-}

-

-func (l *Link) Disable() {

-	// We do not care about errors here because the link may not

-	// exist in iptables

-	l.toggle("-D", true)

-

-	l.IsEnabled = false

-}

-

-func (l *Link) toggle(action string, ignoreErrors bool) error {

-	job := l.eng.Job("link", action)

-

-	job.Setenv("ParentIP", l.ParentIP)

-	job.Setenv("ChildIP", l.ChildIP)

-	job.SetenvBool("IgnoreErrors", ignoreErrors)

-

-	out := make([]string, len(l.Ports))

-	for i, p := range l.Ports {

-		out[i] = fmt.Sprintf("%s/%s", p.Port(), p.Proto())

-	}

-	job.SetenvList("Ports", out)

-

-	if err := job.Run(); err != nil {

-		// TODO: get ouput from job

-		return err

-	}

-	return nil

-}

new file mode 100644

@@ -0,0 +1,137 @@

+package links

+

+import (

+	"fmt"

+	"github.com/dotcloud/docker/engine"

+	"github.com/dotcloud/docker/nat"

+	"path"

+	"strings"

+)

+

+type Link struct {

+	ParentIP         string

+	ChildIP          string

+	Name             string

+	ChildEnvironment []string

+	Ports            []nat.Port

+	IsEnabled        bool

+	eng              *engine.Engine

+}

+

+func NewLink(parentIP, childIP, name string, env []string, exposedPorts map[nat.Port]struct{}, eng *engine.Engine) (*Link, error) {

+

+	var (

+		i     int

+		ports = make([]nat.Port, len(exposedPorts))

+	)

+

+	for p := range exposedPorts {

+		ports[i] = p

+		i++

+	}

+

+	l := &Link{

+		Name:             name,

+		ChildIP:          childIP,

+		ParentIP:         parentIP,

+		ChildEnvironment: env,

+		Ports:            ports,

+		eng:              eng,

+	}

+	return l, nil

+

+}

+

+func (l *Link) Alias() string {

+	_, alias := path.Split(l.Name)

+	return alias

+}

+

+func (l *Link) ToEnv() []string {

+	env := []string{}

+	alias := strings.ToUpper(l.Alias())

+

+	if p := l.getDefaultPort(); p != nil {

+		env = append(env, fmt.Sprintf("%s_PORT=%s://%s:%s", alias, p.Proto(), l.ChildIP, p.Port()))

+	}

+

+	// Load exposed ports into the environment

+	for _, p := range l.Ports {

+		env = append(env, fmt.Sprintf("%s_PORT_%s_%s=%s://%s:%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto(), l.ChildIP, p.Port()))

+		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_ADDR=%s", alias, p.Port(), strings.ToUpper(p.Proto()), l.ChildIP))

+		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PORT=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Port()))

+		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PROTO=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto()))

+	}

+

+	// Load the linked container's name into the environment

+	env = append(env, fmt.Sprintf("%s_NAME=%s", alias, l.Name))

+

+	if l.ChildEnvironment != nil {

+		for _, v := range l.ChildEnvironment {

+			parts := strings.Split(v, "=")

+			if len(parts) != 2 {

+				continue

+			}

+			// Ignore a few variables that are added during docker build

+			if parts[0] == "HOME" || parts[0] == "PATH" {

+				continue

+			}

+			env = append(env, fmt.Sprintf("%s_ENV_%s=%s", alias, parts[0], parts[1]))

+		}

+	}

+	return env

+}

+

+// Default port rules

+func (l *Link) getDefaultPort() *nat.Port {

+	var p nat.Port

+	i := len(l.Ports)

+

+	if i == 0 {

+		return nil

+	} else if i > 1 {

+		nat.Sort(l.Ports, func(ip, jp nat.Port) bool {

+			// If the two ports have the same number, tcp takes priority

+			// Sort in desc order

+			return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && strings.ToLower(ip.Proto()) == "tcp")

+		})

+	}

+	p = l.Ports[0]

+	return &p

+}

+

+func (l *Link) Enable() error {

+	if err := l.toggle("-I", false); err != nil {

+		return err

+	}

+	l.IsEnabled = true

+	return nil

+}

+

+func (l *Link) Disable() {

+	// We do not care about errors here because the link may not

+	// exist in iptables

+	l.toggle("-D", true)

+

+	l.IsEnabled = false

+}

+

+func (l *Link) toggle(action string, ignoreErrors bool) error {

+	job := l.eng.Job("link", action)

+

+	job.Setenv("ParentIP", l.ParentIP)

+	job.Setenv("ChildIP", l.ChildIP)

+	job.SetenvBool("IgnoreErrors", ignoreErrors)

+

+	out := make([]string, len(l.Ports))

+	for i, p := range l.Ports {

+		out[i] = fmt.Sprintf("%s/%s", p.Port(), p.Proto())

+	}

+	job.SetenvList("Ports", out)

+

+	if err := job.Run(); err != nil {

+		// TODO: get ouput from job

+		return err

+	}

+	return nil

+}

new file mode 100644

@@ -0,0 +1,79 @@

+package links

+

+import (

+	"github.com/dotcloud/docker/nat"

+	"strings"

+	"testing"

+)

+

+func TestLinkNew(t *testing.T) {

+	ports := make(nat.PortSet)

+	ports[nat.Port("6379/tcp")] = struct{}{}

+

+	link, err := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", nil, ports, nil)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	if link == nil {

+		t.FailNow()

+	}

+	if link.Name != "/db/docker" {

+		t.Fail()

+	}

+	if link.Alias() != "docker" {

+		t.Fail()

+	}

+	if link.ParentIP != "172.0.17.3" {

+		t.Fail()

+	}

+	if link.ChildIP != "172.0.17.2" {

+		t.Fail()

+	}

+	for _, p := range link.Ports {

+		if p != nat.Port("6379/tcp") {

+			t.Fail()

+		}

+	}

+}

+

+func TestLinkEnv(t *testing.T) {

+	ports := make(nat.PortSet)

+	ports[nat.Port("6379/tcp")] = struct{}{}

+

+	link, err := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", []string{"PASSWORD=gordon"}, ports, nil)

+	if err != nil {

+		t.Fatal(err)

+	}

+

+	rawEnv := link.ToEnv()

+	env := make(map[string]string, len(rawEnv))

+	for _, e := range rawEnv {

+		parts := strings.Split(e, "=")

+		if len(parts) != 2 {

+			t.FailNow()

+		}

+		env[parts[0]] = parts[1]

+	}

+	if env["DOCKER_PORT"] != "tcp://172.0.17.2:6379" {

+		t.Fatalf("Expected 172.0.17.2:6379, got %s", env["DOCKER_PORT"])

+	}

+	if env["DOCKER_PORT_6379_TCP"] != "tcp://172.0.17.2:6379" {

+		t.Fatalf("Expected tcp://172.0.17.2:6379, got %s", env["DOCKER_PORT_6379_TCP"])

+	}

+	if env["DOCKER_PORT_6379_TCP_PROTO"] != "tcp" {

+		t.Fatalf("Expected tcp, got %s", env["DOCKER_PORT_6379_TCP_PROTO"])

+	}

+	if env["DOCKER_PORT_6379_TCP_ADDR"] != "172.0.17.2" {

+		t.Fatalf("Expected 172.0.17.2, got %s", env["DOCKER_PORT_6379_TCP_ADDR"])

+	}

+	if env["DOCKER_PORT_6379_TCP_PORT"] != "6379" {

+		t.Fatalf("Expected 6379, got %s", env["DOCKER_PORT_6379_TCP_PORT"])

+	}

+	if env["DOCKER_NAME"] != "/db/docker" {

+		t.Fatalf("Expected /db/docker, got %s", env["DOCKER_NAME"])

+	}

+	if env["DOCKER_ENV_PASSWORD"] != "gordon" {

+		t.Fatalf("Expected gordon, got %s", env["DOCKER_ENV_PASSWORD"])

+	}

+}

deleted file mode 100644

@@ -1,79 +0,0 @@

-package docker

-

-import (

-	"github.com/dotcloud/docker/nat"

-	"strings"

-	"testing"

-)

-

-func TestLinkNew(t *testing.T) {

-	ports := make(nat.PortSet)

-	ports[nat.Port("6379/tcp")] = struct{}{}

-

-	link, err := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", nil, ports, nil)

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if link == nil {

-		t.FailNow()

-	}

-	if link.Name != "/db/docker" {

-		t.Fail()

-	}

-	if link.Alias() != "docker" {

-		t.Fail()

-	}

-	if link.ParentIP != "172.0.17.3" {

-		t.Fail()

-	}

-	if link.ChildIP != "172.0.17.2" {

-		t.Fail()

-	}

-	for _, p := range link.Ports {

-		if p != nat.Port("6379/tcp") {

-			t.Fail()

-		}

-	}

-}

-

-func TestLinkEnv(t *testing.T) {

-	ports := make(nat.PortSet)

-	ports[nat.Port("6379/tcp")] = struct{}{}

-

-	link, err := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", []string{"PASSWORD=gordon"}, ports, nil)

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	rawEnv := link.ToEnv()

-	env := make(map[string]string, len(rawEnv))

-	for _, e := range rawEnv {

-		parts := strings.Split(e, "=")

-		if len(parts) != 2 {

-			t.FailNow()

-		}

-		env[parts[0]] = parts[1]

-	}

-	if env["DOCKER_PORT"] != "tcp://172.0.17.2:6379" {

-		t.Fatalf("Expected 172.0.17.2:6379, got %s", env["DOCKER_PORT"])

-	}

-	if env["DOCKER_PORT_6379_TCP"] != "tcp://172.0.17.2:6379" {

-		t.Fatalf("Expected tcp://172.0.17.2:6379, got %s", env["DOCKER_PORT_6379_TCP"])

-	}

-	if env["DOCKER_PORT_6379_TCP_PROTO"] != "tcp" {

-		t.Fatalf("Expected tcp, got %s", env["DOCKER_PORT_6379_TCP_PROTO"])

-	}

-	if env["DOCKER_PORT_6379_TCP_ADDR"] != "172.0.17.2" {

-		t.Fatalf("Expected 172.0.17.2, got %s", env["DOCKER_PORT_6379_TCP_ADDR"])

-	}

-	if env["DOCKER_PORT_6379_TCP_PORT"] != "6379" {

-		t.Fatalf("Expected 6379, got %s", env["DOCKER_PORT_6379_TCP_PORT"])

-	}

-	if env["DOCKER_NAME"] != "/db/docker" {

-		t.Fatalf("Expected /db/docker, got %s", env["DOCKER_NAME"])

-	}

-	if env["DOCKER_ENV_PASSWORD"] != "gordon" {

-		t.Fatalf("Expected gordon, got %s", env["DOCKER_ENV_PASSWORD"])

-	}

-}