Browse code

Fix bridge ip comparison

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)

Tibor Vass authored on 2014/04/29 09:04:56
Showing 1 changed files
... ...
@@ -97,8 +97,12 @@ func InitDriver(job *engine.Job) engine.Status {
97 97
 		network = addr.(*net.IPNet)
98 98
 		// validate that the bridge ip matches the ip specified by BridgeIP
99 99
 		if bridgeIP != "" {
100
-			if !network.IP.Equal(net.ParseIP(bridgeIP)) {
101
-				return job.Errorf("bridge ip (%s) does not match existing bridge configuration %s", network.IP, bridgeIP)
100
+			bip, _, err := net.ParseCIDR(bridgeIP)
101
+			if err != nil {
102
+				return job.Error(err)
103
+			}
104
+			if !network.IP.Equal(bip) {
105
+				return job.Errorf("bridge ip (%s) does not match existing bridge configuration %s", network.IP, bip)
102 106
 			}
103 107
 		}
104 108
 	}