zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 17:29:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

netclient update

Browse Source
This commit is contained in:
afeiszli
2021-07-28 23:59:20 -04:00
parent 74583878a6
commit a438642ff0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netclient/wireguard/kernel.go
View File

@@ -13,7 +13,6 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/davecgh/go-spew/spew"
nodepb "github.com/gravitl/netmaker/grpc" nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
@@ -30,7 +29,6 @@ import (
) )
func InitGRPCWireguard(client models.IntClient) error { func InitGRPCWireguard(client models.IntClient) error {
//spew.Dump(client)
key, err := wgtypes.ParseKey(client.PrivateKey) key, err := wgtypes.ParseKey(client.PrivateKey)
if err != nil { if err != nil {
@@ -124,7 +122,6 @@ func InitGRPCWireguard(client models.IntClient) error {
return err return err
} }
} }
//spew.Dump(conf)
err = wgclient.ConfigureDevice(ifacename, conf) err = wgclient.ConfigureDevice(ifacename, conf)
if err != nil { if err != nil {
@@ -297,7 +294,6 @@ func InitWireguard(node *nodepb.Node, privkey string, peers []wgtypes.PeerConfig
} }
} }
if hasGateway { if hasGateway {
spew.Dump(gateways)
for _, gateway := range gateways { for _, gateway := range gateways {
out, err := exec.Command(ipExec, "-4", "route", "add", gateway, "dev", ifacename).Output() out, err := exec.Command(ipExec, "-4", "route", "add", gateway, "dev", ifacename).Output()
fmt.Println(string(out)) fmt.Println(string(out))
@@ -420,7 +416,8 @@ func SetWGConfig(network string, peerupdate bool) error {
func SetPeers(iface string, peers []wgtypes.PeerConfig) { func SetPeers(iface string, peers []wgtypes.PeerConfig) {
for _, peer := range peers { for _, peer := range peers {
err := exec.Command("wg","set",iface,"peer",peer.PublicKey.String(),"endpoint",peer.Endpoint.String()).Run() udpendpoint := peer.Endpoint.IP.String()+":"+peer.Endpoint.IP.String()
err := exec.Command("wg","set",iface,"peer",peer.PublicKey.String(),"endpoint",udpendpoint).Run()
if err != nil { if err != nil {
log.Println("error setting peer",peer.Endpoint.String(),) log.Println("error setting peer",peer.Endpoint.String(),)
} }