Browse Source

fixed window bug? removed binaries

0xdcarns 3 years ago
parent
commit
6418378b07

+ 2 - 0
.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/

+ 5 - 4
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

+ 2 - 2
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
 }

BIN
netclient/netclient-32


BIN
netclient/netclient-arm


BIN
netclient/netclient-arm64


BIN
netclient/netclient.exe


BIN
netclient/netclient32


+ 1 - 5
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)
 	}