Added --ignore-iface option to netcheck and use it to ignore weave bridge route

This commit is contained in:
Bryan Boreham committed 2015-07-07 12:52:29 +01:00
1 parent 3e7c20b4ee
commit e621aca77e
3 files changed
+23 -9

No files matched your search

+12 -5
View File
@@ -6,6 +6,7 @@ import (
"net"
"os"
"github.com/docker/docker/pkg/mflag"
weavenet "github.com/weaveworks/weave/net"
)
@@ -15,19 +16,25 @@ func fatal(err error) {
}
func main() {
if len(os.Args) <= 1 {
os.Exit(0)
var ignoreIfaceName string
mflag.StringVar(&ignoreIfaceName, []string{"-ignore-iface"}, "", "name of interface to ignore)")
mflag.Parse()
if len(mflag.Args()) < 1 {
fmt.Fprintln(os.Stderr, "usage: netcheck [--ignore-iface <iface-name>] network-cidr")
os.Exit(1)
}
cidrStr := os.Args[1]
cidrStr := mflag.Args()[0]
addr, ipnet, err := net.ParseCIDR(cidrStr)
if err != nil {
fatal(err)
}
if ipnet.IP.Equal(addr) {
err = weavenet.CheckNetworkFree(ipnet)
err = weavenet.CheckNetworkFree(ipnet, ignoreIfaceName)
} else {
err = weavenet.CheckAddressOverlap(addr)
err = weavenet.CheckAddressOverlap(addr, ignoreIfaceName)
}
if err != nil {
fatal(err)