From baba9cde9542b480162d11bd30ca3a522fa6b4d0 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 26 Mar 2014 11:51:27 +0000 Subject: [PATCH] Return error when existing bridge does not match ip Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- runtime/networkdriver/bridge/driver.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runtime/networkdriver/bridge/driver.go b/runtime/networkdriver/bridge/driver.go index 41588b1c27..61e82dd481 100644 --- a/runtime/networkdriver/bridge/driver.go +++ b/runtime/networkdriver/bridge/driver.go @@ -93,6 +93,12 @@ func InitDriver(job *engine.Job) engine.Status { network = addr.(*net.IPNet) } else { network = addr.(*net.IPNet) + // validate that the bridge ip matches the ip specified by BridgeIP + if bridgeIP != "" { + if !network.IP.Equal(net.ParseIP(bridgeIP)) { + return job.Errorf("bridge ip (%s) does not match existing bridge configuration %s", network.IP, bridgeIP) + } + } } // Configure iptables for link support