gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 11:56:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

removing mac path formatting, adding comment

Browse source
This commit is contained in:
afeiszli 2022-08-25 07:48:56 -04:00
parent 723e4ebeee
commit 0c0f089688
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
netclient/local/routes_freebsd.go
View file

@ -41,6 +41,7 @@ func setRoute(iface string, addr *net.IPNet, address string) error {
return err return err
} }
// SetExplicitRoute - sets route via explicit ip address
func SetExplicitRoute(iface string, destination *net.IPNet, gateway string) error { func SetExplicitRoute(iface string, destination *net.IPNet, gateway string) error {
_, err := ncutils.RunCmd("route add "+destination.String()+" "+gateway, false) _, err := ncutils.RunCmd("route add "+destination.String()+" "+gateway, false)
return err return err

8
netclient/wireguard/mac.go
View file

@ -209,8 +209,8 @@ func addRoute(addr string, iface string) error {
// setConfig - sets configuration of the wireguard interface from the config file // setConfig - sets configuration of the wireguard interface from the config file
func setConfig(realIface string, confPath string) error { func setConfig(realIface string, confPath string) error {
confString := getConfig(confPath) confString := getConfig(confPath)
pathFormatted := strings.Replace(confPath, " ", "\\ ", -1) // pathFormatted := strings.Replace(confPath, " ", "\\ ", -1)
err := os.WriteFile(pathFormatted+".tmp", []byte(confString), 0600) err := os.WriteFile(confPath+".tmp", []byte(confString), 0600)
if err != nil { if err != nil {
return err return err
} }
@ -221,9 +221,9 @@ func setConfig(realIface string, confPath string) error {
// getConfig - gets config from config file and strips out incompatible fields // getConfig - gets config from config file and strips out incompatible fields
func getConfig(path string) string { func getConfig(path string) string {
pathFormatted := strings.Replace(path, " ", "\\ ", -1) // pathFormatted := strings.Replace(path, " ", "\\ ", -1)
var confCmd = "grep -v -e Address -e MTU -e PostUp -e PostDown " var confCmd = "grep -v -e Address -e MTU -e PostUp -e PostDown "
confRaw, _ := ncutils.RunCmd(confCmd+pathFormatted, false) confRaw, _ := ncutils.RunCmd(confCmd+path, false)
return confRaw return confRaw
} }