p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just fixing gofmt issues in other people's code.

Browse Source 
Upstream-commit: 6756e786ac36d4e5cda46541b5d6e0b2913b6997
Component: engine
This commit is contained in:
Brian Olsen
2013-08-30 02:49:11 +02:00
parent 8468ddcf8f
commit 4fa9c87644
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/container.go
View File

@ -11,6 +11,7 @@ import (
"io"
"io/ioutil"
"log"
"net"
"os"
"os/exec"
"path"
@ -20,7 +21,6 @@ import (
"strings"
"syscall"
"time"
"net"
)
type Container struct {
@ -813,10 +813,10 @@ func (container *Container) allocateNetwork() error {
iface = &NetworkInterface{disabled: true}
} else {
iface = &NetworkInterface{
IPNet: net.IPNet{IP: net.ParseIP(container.NetworkSettings.IPAddress), Mask: manager.bridgeNetwork.Mask},
IPNet: net.IPNet{IP: net.ParseIP(container.NetworkSettings.IPAddress), Mask: manager.bridgeNetwork.Mask},
Gateway: manager.bridgeNetwork.IP,
manager: manager,
}
}
ipNum := ipToInt(iface.IPNet.IP)
manager.ipAllocator.inUse[ipNum] = struct{}{}
}
@ -827,10 +827,10 @@ func (container *Container) allocateNetwork() error {
portSpecs = container.Config.PortSpecs
} else {
for backend, frontend := range container.NetworkSettings.PortMapping["Tcp"] {
portSpecs = append(portSpecs, fmt.Sprintf("%s:%s/tcp",frontend, backend))
portSpecs = append(portSpecs, fmt.Sprintf("%s:%s/tcp", frontend, backend))
}
for backend, frontend := range container.NetworkSettings.PortMapping["Udp"] {
portSpecs = append(portSpecs, fmt.Sprintf("%s:%s/udp",frontend, backend))
portSpecs = append(portSpecs, fmt.Sprintf("%s:%s/udp", frontend, backend))
}
}

2
components/engine/network.go
View File

@ -642,7 +642,7 @@ func (manager *NetworkManager) Allocate() (*NetworkInterface, error) {
if err != nil {
return nil, err
}
// avoid duplicate IP
// avoid duplicate IP
ipNum := ipToInt(ip)
firstIP := manager.ipAllocator.network.IP.To4().Mask(manager.ipAllocator.network.Mask)
firstIPNum := ipToInt(firstIP) + 1