beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prioritize nw endpoint which can provide both v4 and v6 connectivity

Browse source 
- when selecting sandbox's default gw

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2017-01-03 11:39:04 -08:00
parent ac7deb041b
commit cdd56ba07e
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libnetwork/sandbox.go
View file

@ -1174,6 +1174,17 @@ func (eh epHeap) Less(i, j int) bool {
return true
}
if epi.joinInfo != nil && epj.joinInfo != nil {
if (epi.joinInfo.gw != nil && epi.joinInfo.gw6 != nil) &&
(epj.joinInfo.gw == nil || epj.joinInfo.gw6 == nil) {
return true
}
if (epj.joinInfo.gw != nil && epj.joinInfo.gw6 != nil) &&
(epi.joinInfo.gw == nil || epi.joinInfo.gw6 == nil) {
return false
}
}
if ci != nil {
cip, ok = ci.epPriority[eh[i].ID()]
if !ok {