kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Just fixing gofmt issues in other people's code.

Browse source
This commit is contained in:
Brian Olsen 2013-08-30 02:49:11 +02:00
parent 84431ec03c
commit 6756e786ac
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
container.go
View file

@ -11,6 +11,7 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
"net"
"os" "os"
"os/exec" "os/exec"
"path" "path"
@ -20,7 +21,6 @@ import (
"strings" "strings"
"syscall" "syscall"
"time" "time"
"net"
) )
type Container struct { type Container struct {
@ -813,10 +813,10 @@ func (container *Container) allocateNetwork() error {
iface = &NetworkInterface{disabled: true} iface = &NetworkInterface{disabled: true}
} else { } else {
iface = &NetworkInterface{ 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, Gateway: manager.bridgeNetwork.IP,
manager: manager, manager: manager,
} }
ipNum := ipToInt(iface.IPNet.IP) ipNum := ipToInt(iface.IPNet.IP)
manager.ipAllocator.inUse[ipNum] = struct{}{} manager.ipAllocator.inUse[ipNum] = struct{}{}
} }
@ -827,10 +827,10 @@ func (container *Container) allocateNetwork() error {
portSpecs = container.Config.PortSpecs portSpecs = container.Config.PortSpecs
} else { } else {
for backend, frontend := range container.NetworkSettings.PortMapping["Tcp"] { 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"] { 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
network.go
View file

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