From 9f0f5e1a098a0904ca3444c4ac8c36d67da6b467 Mon Sep 17 00:00:00 2001 From: afeiszli Date: Sat, 5 Feb 2022 15:53:26 -0500 Subject: [PATCH] fixing merge problems --- netclient/local/routes_other.go | 38 --------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 netclient/local/routes_other.go diff --git a/netclient/local/routes_other.go b/netclient/local/routes_other.go deleted file mode 100644 index 34d2fb11..00000000 --- a/netclient/local/routes_other.go +++ /dev/null @@ -1,38 +0,0 @@ -//go:build !linux -// +build !linux - -package local - -import ( - //"github.com/davecgh/go-spew/spew" - - "fmt" - "net" - - "github.com/gravitl/netmaker/netclient/ncutils" -) - -//"github.com/davecgh/go-spew/spew" - -/* - -These functions are not used. These should only be called by Linux (see routes_linux.go). These routes return nothing if called. - -*/ - -func setRoute(iface string, addr *net.IPNet) error { - out, err := ncutils.RunCmd(fmt.Sprintf("ip route get %s", addr.IP.String()), false) - if err != nil || !strings.Contains(out, iface) { - _, err = ncutils.RunCmd(fmt.Sprintf("ip route add %s dev %s", addr.String(), iface), true) - } - return err -} - -func deleteRoute(iface string, addr *net.IPNet) error { - var err error - out, _ := ncutils.RunCmd(fmt.Sprintf("ip route get %s", addr.IP.String()), false) - if strings.Contains(out, iface) { - _, err = ncutils.RunCmd(fmt.Sprintf("ip route del %s dev %s", addr.String(), iface), true) - } - return err -}