Browse Source

added netmaker check on checkin

afeiszli 4 years ago
parent
commit
8d27876a15
3 changed files with 4 additions and 3 deletions
  1. 1 1
      controllers/common.go
  2. 2 1
      netclient/functions/checkin.go
  3. 1 1
      netclient/wireguard/kernel.go

+ 1 - 1
controllers/common.go

@@ -246,7 +246,7 @@ func NodeCheckIn(node models.Node, networkName string) (models.CheckInResponse,
 		}
 		}
 		return models.CheckInResponse{
 		return models.CheckInResponse{
 			Success:true,
 			Success:true,
-			NeedPeerUpdate:false,
+			NeedPeerUpdate:true,
 			NeedKeyUpdate: false,
 			NeedKeyUpdate: false,
 			NeedConfigUpdate:false,
 			NeedConfigUpdate:false,
 			NeedDelete:false,
 			NeedDelete:false,

+ 2 - 1
netclient/functions/checkin.go

@@ -298,7 +298,8 @@ func CheckIn(cliconf config.ClientConfig) error {
                 }
                 }
 	}
 	}
 	}
 	}
-	return nil
+        err = Pull(network)
+	return err
 }
 }
 
 
 func Pull (network string) error{
 func Pull (network string) error{

+ 1 - 1
netclient/wireguard/kernel.go

@@ -402,7 +402,7 @@ func SetWGConfig(network string, peerupdate bool) error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
-	if peerupdate && node.Name != "netmaker" {
+	if peerupdate {
 		SetPeers(node.Interface, node.Keepalive, peers)
 		SetPeers(node.Interface, node.Keepalive, peers)
 	} else {
 	} else {
 		err = InitWireguard(&node, privkey, peers, hasGateway, gateways)
 		err = InitWireguard(&node, privkey, peers, hasGateway, gateways)