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

route changes + primary addr on node

Browse Source
This commit is contained in:
0xdcarns
2022-04-19 16:18:03 -04:00
parent 8e976d1f55
commit dc12b1e418
16 changed files with 169 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netclient/functions/common.go
View File

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