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

Merge pull request #967 from aboch/i6

Browse source 
Honor enableIPv6 network flag on IP allocation
This commit is contained in:
Madhu Venugopal 2016-03-20 10:03:25 -07:00
commit 896196c521
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libnetwork/network.go
View file

@ -489,6 +489,10 @@ func (n *network) UnmarshalJSON(b []byte) (err error) {
if v, ok := netMap["inDelete"]; ok { if v, ok := netMap["inDelete"]; ok {
n.inDelete = v.(bool) n.inDelete = v.(bool)
} }
// Reconcile old networks with the recently added `--ipv6` flag
if !n.enableIPv6 {
n.enableIPv6 = len(n.ipamV6Info) > 0
}
return nil return nil
} }
@ -779,7 +783,7 @@ func (n *network) CreateEndpoint(name string, options ...EndpointOption) (Endpoi
ep.ipamOptions[netlabel.MacAddress] = ep.iface.mac.String() ep.ipamOptions[netlabel.MacAddress] = ep.iface.mac.String()
} }
if err = ep.assignAddress(ipam.driver, true, !n.postIPv6); err != nil { if err = ep.assignAddress(ipam.driver, true, n.enableIPv6 && !n.postIPv6); err != nil {
return nil, err return nil, err
} }
defer func() { defer func() {
@ -799,7 +803,7 @@ func (n *network) CreateEndpoint(name string, options ...EndpointOption) (Endpoi
} }
}() }()
if err = ep.assignAddress(ipam.driver, false, n.postIPv6); err != nil { if err = ep.assignAddress(ipam.driver, false, n.enableIPv6 && n.postIPv6); err != nil {
return nil, err return nil, err
} }
@ -1033,6 +1037,10 @@ func (n *network) ipamAllocate() error {
} }
}() }()
if !n.enableIPv6 {
return nil
}
return n.ipamAllocateVersion(6, ipam) return n.ipamAllocateVersion(6, ipam)
} }
@ -1153,7 +1161,7 @@ func (n *network) ipamReleaseVersion(ipVer int, ipam ipamapi.Ipam) {
return return
} }
if *infoList == nil { if len(*infoList) == 0 {
return return
} }