From 62522c98539e1591017cf0d4f28e6a58f3b1ec6b Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 30 Mar 2015 17:31:21 -0700 Subject: [PATCH] Refactor portmapper to remove ALL global state Signed-off-by: Michael Crosby --- daemon/networkdriver/portmapper/mapper.go | 9 +-------- daemon/networkdriver/portmapper/mapper_test.go | 3 +-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/daemon/networkdriver/portmapper/mapper.go b/daemon/networkdriver/portmapper/mapper.go index a01b604160..7092352f57 100644 --- a/daemon/networkdriver/portmapper/mapper.go +++ b/daemon/networkdriver/portmapper/mapper.go @@ -18,14 +18,7 @@ type mapping struct { container net.Addr } -var ( - NewProxy = NewProxyCommand - - DefaultPortMapper = NewWithPortAllocator(portallocator.DefaultPortAllocator) - SetIptablesChain = DefaultPortMapper.SetIptablesChain - Map = DefaultPortMapper.Map - Unmap = DefaultPortMapper.Unmap -) +var NewProxy = NewProxyCommand var ( ErrUnknownBackendAddressType = errors.New("unknown container address type not supported") diff --git a/daemon/networkdriver/portmapper/mapper_test.go b/daemon/networkdriver/portmapper/mapper_test.go index 4082a6002b..d5d10d8cb1 100644 --- a/daemon/networkdriver/portmapper/mapper_test.go +++ b/daemon/networkdriver/portmapper/mapper_test.go @@ -4,7 +4,6 @@ import ( "net" "testing" - "github.com/docker/docker/daemon/networkdriver/portallocator" "github.com/docker/docker/pkg/iptables" ) @@ -126,7 +125,7 @@ func TestMapAllPortsSingleInterface(t *testing.T) { }() for i := 0; i < 10; i++ { - start, end := portallocator.PortRange() + start, end := pm.allocator.Begin, pm.allocator.End for i := start; i < end; i++ { if host, err = pm.Map(srcAddr1, dstIp1, 0); err != nil { t.Fatal(err)