From 3be965b6c878372c3d9845d46a5251802aa42134 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 20 May 2021 02:08:54 +0000 Subject: [PATCH] fixing netclient --- netclient/config/config.go | 1 + netclient/functions/common.go | 4 +++- netclient/functions/peers.go | 27 --------------------------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/netclient/config/config.go b/netclient/config/config.go index 6522607d7..ecdc2dfb2 100644 --- a/netclient/config/config.go +++ b/netclient/config/config.go @@ -36,6 +36,7 @@ type NodeConfig struct { DNSOff bool `yaml:"dnsoff"` IsLocal bool `yaml:"islocal"` IsDualStack bool `yaml:"isdualstack"` + IsIngressGateway bool `yaml:"isingressgateway"` AllowedIPs string `yaml:"allowedips"` LocalRange string `yaml:"localrange"` PostUp string `yaml:"postup"` diff --git a/netclient/functions/common.go b/netclient/functions/common.go index 847d16b9e..5c3dcf486 100644 --- a/netclient/functions/common.go +++ b/netclient/functions/common.go @@ -423,6 +423,7 @@ func Install(accesskey string, password string, server string, network string, n fmt.Println(" Mac Address: " + node.Macaddress) fmt.Println(" Is Local?: " + strconv.FormatBool(node.Islocal)) fmt.Println(" Is Dual Stack?: " + strconv.FormatBool(node.Isdualstack)) + fmt.Println(" Is Ingress Gateway?: " + strconv.FormatBool(node.Isingressgateway)) fmt.Println(" Local Range: " + node.Localrange) if node.Dnsoff==true && !nodecfg.DNSOff { @@ -610,7 +611,7 @@ func modConfig(node *nodepb.Node) error{ if node.Isdualstack == true { nodecfg.IsDualStack = true } - + nodecfg.IsIngressGateway = node.Isingressgateway if node.Localrange != "" && node.Islocal { nodecfg.IsLocal = true nodecfg.LocalRange = node.Localrange @@ -1310,6 +1311,7 @@ func getNode(network string) nodepb.Node { node.Password = nodecfg.Password node.Dnsoff = nodecfg.DNSOff node.Isdualstack = nodecfg.IsDualStack + node.Isingressgateway = nodecfg.IsIngressGateway return node } diff --git a/netclient/functions/peers.go b/netclient/functions/peers.go index a95345580..d17a8bafe 100644 --- a/netclient/functions/peers.go +++ b/netclient/functions/peers.go @@ -171,12 +171,6 @@ func getExtPeers(macaddress string, network string, server string, dualstack boo log.Fatalf("Issue retrieving config for network: " + network + ". Please investigate: %v", err) } nodecfg := cfg.Node - keepalive := nodecfg.KeepAlive - keepalivedur, err := time.ParseDuration(strconv.FormatInt(int64(keepalive), 10) + "s") - if err != nil { - log.Fatalf("Issue with format of keepalive value. Please update netconfig: %v", err) - } - fmt.Println("Registering with GRPC Server") requestOpts := grpc.WithInsecure() @@ -234,10 +228,6 @@ func getExtPeers(macaddress string, network string, server string, dualstack boo fmt.Println("Peer is self. Skipping") continue } - if nodecfg.Endpoint == res.Extpeers.Endpoint { - fmt.Println("Peer is self. Skipping") - continue - } var peer wgtypes.PeerConfig var peeraddr = net.IPNet{ @@ -254,28 +244,11 @@ func getExtPeers(macaddress string, network string, server string, dualstack boo } allowedips = append(allowedips, addr6) } - if keepalive != 0 { - peer = wgtypes.PeerConfig{ - PublicKey: pubkey, - PersistentKeepaliveInterval: &keepalivedur, - Endpoint: &net.UDPAddr{ - IP: net.ParseIP(res.Extpeers.Endpoint), - Port: int(res.Extpeers.Listenport), - }, - ReplaceAllowedIPs: true, - AllowedIPs: allowedips, - } - } else { peer = wgtypes.PeerConfig{ PublicKey: pubkey, - Endpoint: &net.UDPAddr{ - IP: net.ParseIP(res.Extpeers.Endpoint), - Port: int(res.Extpeers.Listenport), - }, ReplaceAllowedIPs: true, AllowedIPs: allowedips, } - } peers = append(peers, peer) }