Browse Source

Merge pull request #1242 from gravitl/bugfix_v0.14.4_mac_routing

remove peers from interface addresses
dcarns 3 years ago
parent
commit
78ef1d588b
1 changed files with 2 additions and 5 deletions
  1. 2 5
      netclient/wireguard/mac.go

+ 2 - 5
netclient/wireguard/mac.go

@@ -55,10 +55,6 @@ func WgQuickUpMac(node *models.Node, iface string, confPath string) error {
 		return err
 		return err
 	}
 	}
 	var ips = append(node.AllowedIPs, node.Address, node.Address6)
 	var ips = append(node.AllowedIPs, node.Address, node.Address6)
-	peerIPs := getPeerIPs(realIface)
-	if len(peerIPs) > 0 {
-		ips = append(ips, peerIPs...)
-	}
 	for _, i := range ips {
 	for _, i := range ips {
 		if i != "" {
 		if i != "" {
 			err = addAddress(realIface, i)
 			err = addAddress(realIface, i)
@@ -74,7 +70,8 @@ func WgQuickUpMac(node *models.Node, iface string, confPath string) error {
 		logger.Log(1, "error turning on interface ", iface)
 		logger.Log(1, "error turning on interface ", iface)
 		return err
 		return err
 	}
 	}
-	for _, i := range ips {
+	peerIPs := getPeerIPs(realIface)
+	for _, i := range peerIPs {
 		if i != "" {
 		if i != "" {
 			err = addRoute(i, realIface)
 			err = addRoute(i, realIface)
 			if err != nil {
 			if err != nil {