Browse Source

small windows fix

afeiszli 3 years ago
parent
commit
fbe119f0cd

+ 3 - 1
netclient/functions/mqhandlers.go

@@ -207,7 +207,6 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
 		cfg.Server.Version = peerUpdate.ServerVersion
 		config.Write(&cfg, cfg.Network)
 	}
-
 	file := ncutils.GetNetclientPathSpecific() + cfg.Node.Interface + ".conf"
 	internetGateway, err := wireguard.UpdateWgPeers(file, peerUpdate.Peers)
 	if err != nil {
@@ -224,6 +223,9 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
 		if err := config.ModNodeConfig(&cfg.Node); err != nil {
 			logger.Log(0, "failed to save internet gateway", err.Error())
 		}
+		if ncutils.IsWindows() {
+			wireguard.RemoveConfGraceful(cfg.Node.Interface)
+		}
 		if err := wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, file); err != nil {
 			logger.Log(0, "error applying internet gateway", err.Error())
 		}

+ 0 - 2
netclient/ncutils/netclientutils.go

@@ -164,7 +164,6 @@ func GetPublicIP(api string) (string, error) {
 	endpoint := ""
 	var err error
 	for _, ipserver := range iplist {
-		logger.Log(3, "Running public IP check with service", ipserver)
 		client := &http.Client{
 			Timeout: time.Second * 10,
 		}
@@ -179,7 +178,6 @@ func GetPublicIP(api string) (string, error) {
 				continue
 			}
 			endpoint = string(bodyBytes)
-			logger.Log(3, "Public IP address is", endpoint)
 			break
 		}
 	}

+ 0 - 2
netclient/wireguard/common.go

@@ -28,7 +28,6 @@ func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error
 	var devicePeers []wgtypes.Peer
 	var keepalive = node.PersistentKeepalive
 	var oldPeerAllowedIps = make(map[string]bool, len(peers))
-
 	var err error
 	devicePeers, err = GetDevicePeers(iface)
 	if err != nil {
@@ -84,7 +83,6 @@ func SetPeers(iface string, node *models.Node, peers []wgtypes.PeerConfig) error
 			logger.Log(0, "error setting peer", peer.PublicKey.String())
 		}
 	}
-
 	if len(devicePeers) > 0 {
 		for _, currentPeer := range devicePeers {
 			shouldDelete := true