diff --git a/.gitignore b/.gitignore index bc9123a9..94280f81 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ netclient/netclient-amd64 netclient/netclient-arm netclient/netclient-arm64 netclient/netclient-32 +netclient/netclient32 +netclient/netclient.exe config/dnsconfig/ winsw.exe data/ diff --git a/functions/helpers.go b/functions/helpers.go index a44e5d44..31f892f5 100644 --- a/functions/helpers.go +++ b/functions/helpers.go @@ -108,9 +108,9 @@ func CreateServerToken(netID string) (string, error) { GRPCSSL: "off", } } - log.Println("APIConnString:",servervals.APIConnString) - log.Println("GRPCConnString:",servervals.GRPCConnString) - log.Println("GRPCSSL:",servervals.GRPCSSL) + log.Println("APIConnString:", servervals.APIConnString) + log.Println("GRPCConnString:", servervals.GRPCConnString) + log.Println("GRPCSSL:", servervals.GRPCSSL) accessToken.ServerConfig = servervals accessToken.ClientConfig.Network = netID accessToken.ClientConfig.Key = GenKey() @@ -123,7 +123,7 @@ func CreateServerToken(netID string) (string, error) { return accesskey.AccessString, err } accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(tokenjson)) - log.Println("accessstring:",accesskey.AccessString) + log.Println("accessstring:", accesskey.AccessString) network.AccessKeys = append(network.AccessKeys, accesskey) if data, err := json.Marshal(network); err != nil { return "", err @@ -235,6 +235,7 @@ func UpdateNetworkNodeAddresses(networkName string) error { } node.Address = ipaddr + node.PullChanges = "yes" data, err := json.Marshal(&node) if err != nil { return err diff --git a/netclient/daemon/windows.go b/netclient/daemon/windows.go index 5da7490d..dbc9b2bd 100644 --- a/netclient/daemon/windows.go +++ b/netclient/daemon/windows.go @@ -35,9 +35,9 @@ func SetupWindowsDaemon() error { ncutils.Log("finished daemon setup") } // install daemon, will not overwrite - ncutils.RunCmd(strings.Replace(ncutils.GetNetclientPathSpecific(), `\\`, `\`, -1)+`winsw.exe install`, true) + ncutils.RunCmd(strings.Replace(ncutils.GetNetclientPathSpecific(), `\\`, `\`, -1)+`winsw.exe install`, false) // start daemon, will not restart or start another - ncutils.RunCmd(strings.Replace(ncutils.GetNetclientPathSpecific(), `\\`, `\`, -1)+`winsw.exe start`, true) + ncutils.RunCmd(strings.Replace(ncutils.GetNetclientPathSpecific(), `\\`, `\`, -1)+`winsw.exe start`, false) ncutils.Log(strings.Replace(ncutils.GetNetclientPathSpecific(), `\\`, `\`, -1) + `winsw.exe start`) return nil } diff --git a/netclient/netclient-32 b/netclient/netclient-32 deleted file mode 100755 index 517ac25f..00000000 Binary files a/netclient/netclient-32 and /dev/null differ diff --git a/netclient/netclient-arm b/netclient/netclient-arm deleted file mode 100755 index 3c55f3dc..00000000 Binary files a/netclient/netclient-arm and /dev/null differ diff --git a/netclient/netclient-arm64 b/netclient/netclient-arm64 deleted file mode 100755 index 6cdb0918..00000000 Binary files a/netclient/netclient-arm64 and /dev/null differ diff --git a/netclient/netclient.exe b/netclient/netclient.exe deleted file mode 100644 index 7abfe949..00000000 Binary files a/netclient/netclient.exe and /dev/null differ diff --git a/netclient/netclient32 b/netclient/netclient32 deleted file mode 100755 index 212721b5..00000000 Binary files a/netclient/netclient32 and /dev/null differ diff --git a/netclient/wireguard/common.go b/netclient/wireguard/common.go index 66437529..be42ca93 100644 --- a/netclient/wireguard/common.go +++ b/netclient/wireguard/common.go @@ -274,10 +274,6 @@ func SetWGConfig(network string, peerupdate bool) error { } else { err = InitWireguard(&nodecfg, privkey, peers, hasGateway, gateways) } - if err != nil { - return err - } - return err } @@ -299,7 +295,7 @@ func ApplyConf(confPath string) error { var err error switch os { case "windows": - err = ApplyWindowsConf(confPath) + _ = ApplyWindowsConf(confPath) default: err = ApplyWGQuickConf(confPath) }