浏览代码

Port number 49153(BeginPortRange) would be returned twice, causing duplication and potential errors.

If we first request port 49153 (BeginPortRange) explicitly, and later some time request the next free port (of same ip/proto) by calling RequestPort() with port number 0, we will again get 49153 returned, even if it's currently in use. Because findPort() blindly retured BeginPortRange the first run, without checking if it has already been taken.

Signed-off-by: shuai-z <zs.broccoli@gmail.com>
shuai-z 10 年之前
父节点
当前提交
9451cf39ef
共有 1 个文件被更改,包括 1 次插入6 次删除
  1. 1 6
      daemon/networkdriver/portallocator/portallocator.go

+ 1 - 6
daemon/networkdriver/portallocator/portallocator.go

@@ -15,6 +15,7 @@ type portMap struct {
 func newPortMap() *portMap {
 	return &portMap{
 		p: map[int]struct{}{},
+		last: EndPortRange,
 	}
 }
 
@@ -135,12 +136,6 @@ func ReleaseAll() error {
 }
 
 func (pm *portMap) findPort() (int, error) {
-	if pm.last == 0 {
-		pm.p[BeginPortRange] = struct{}{}
-		pm.last = BeginPortRange
-		return BeginPortRange, nil
-	}
-
 	for port := pm.last + 1; port != pm.last; port++ {
 		if port > EndPortRange {
 			port = BeginPortRange