Use hostIP to decide on Portmapper version

Arko Dasgupta · Arko Dasgupta · commit a89455d2de52 · 2021-01-23T12:00:46.000-08:00
Use HostIP to decide which portmapper object to store the binding in consistently in the allocate and release method (https://github.com/moby/libnetwork/blob/448016ef11309bd67541dcf4d72f1f5b7de94862/drivers/bridge/port_mapping.go#L208) Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
diff --git a/drivers/bridge/port_mapping.go b/drivers/bridge/port_mapping.go
@@ -139,7 +139,7 @@ func (n *bridgeNetwork) allocatePort(bnd *types.PortBinding, ulPxyEnabled bool)
 
 	portmapper := n.portMapper
 
-	if bnd.IP.To4() == nil {
+	if bnd.HostIP.To4() == nil {
 		portmapper = n.portMapperV6
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func (n bridgeNetwork) allocatePort(bnd types.PortBinding, ulPxyEnabled bool)`
`139`	`139`
`140`	`140`	`portmapper := n.portMapper`
`141`	`141`
`142`		`- if bnd.IP.To4() == nil {`
	`142`	`+ if bnd.HostIP.To4() == nil {`
`143`	`143`	`portmapper = n.portMapperV6`
`144`	`144`	`}`
`145`	`145`