zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 08:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing mac stuff and dns testing

Browse Source
This commit is contained in:
afeiszli
2022-02-07 11:30:15 -05:00
committed by 0xdcarns
parent dd3780c18d
commit 96535554f5
11 changed files with 159 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
netclient/functions/common.go
View File

@@ -189,12 +189,21 @@ func LeaveNetwork(network string) error {
wgClient, wgErr := wgctrl.New()
if wgErr == nil {
dev, devErr := wgClient.Device(cfg.Node.Interface)
removeIface := cfg.Node.Interface
if ncutils.IsMac() {
var macIface string
macIface, wgErr = local.GetMacIface(cfg.Node.Address)
if wgErr == nil && removeIface != "" {
removeIface = macIface
}
wgErr = nil
}
dev, devErr := wgClient.Device(removeIface)
if devErr == nil {
local.FlushPeerRoutes(cfg.Node.Interface, cfg.Node.Address, dev.Peers[:])
local.FlushPeerRoutes(removeIface, cfg.Node.Address, dev.Peers[:])
_, cidr, cidrErr := net.ParseCIDR(cfg.NetworkSettings.AddressRange)
if cidrErr == nil {
local.RemoveCIDRRoute(cfg.Node.Interface, cfg.Node.Address, cidr)
local.RemoveCIDRRoute(removeIface, cfg.Node.Address, cidr)
}
} else {
ncutils.PrintLog("could not flush peer routes when leaving network, "+cfg.Node.Network, 1)