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

adding gateway functionality

Browse Source
This commit is contained in:
afeiszli
2021-04-13 02:55:49 -04:00
parent 1402dd828a
commit 9839cbd806
13 changed files with 242 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
netclient/functions/common.go
View File

@@ -1070,7 +1070,7 @@ func getNode(network string) nodepb.Node {
node.Listenport = nodecfg.Port
node.Keepalive = nodecfg.KeepAlive
node.Postup = nodecfg.PostUp
node.Preup = nodecfg.PreUp
node.Postdown = nodecfg.PostDown
node.Publickey = nodecfg.PublicKey
node.Macaddress = nodecfg.MacAddress
node.Endpoint = nodecfg.Endpoint
@@ -1271,6 +1271,23 @@ func getPeers(macaddress string, network string, server string) ([]wgtypes.PeerC
return peers, err
}
var peer wgtypes.PeerConfig
var peeraddr = net.IPNet{
IP: net.ParseIP(res.Peers.Address),
Mask: net.CIDRMask(32, 32),
}
var allowedips []net.IPNet
allowedips = append(allowedips, peeraddr)
if res.Peers.Isgateway {
_, ipnet, err := net.ParseCIDR(res.Peers.Gatewayrange)
if err != nil {
fmt.Println("ERROR ENCOUNTERED SETTING GATEWAY")
fmt.Println("NOT SETTING GATEWAY")
fmt.Println(err)
} else {
allowedips = append(allowedips, *ipnet)
}
}
if keepalive != 0 {
peer = wgtypes.PeerConfig{
PublicKey: pubkey,
@@ -1280,11 +1297,8 @@ func getPeers(macaddress string, network string, server string) ([]wgtypes.PeerC
Port: int(res.Peers.Listenport),
},
ReplaceAllowedIPs: true,
AllowedIPs: []net.IPNet{{
IP: net.ParseIP(res.Peers.Address),
Mask: net.CIDRMask(32, 32),
}},
}
AllowedIPs: allowedips,
}
} else {
peer = wgtypes.PeerConfig{
PublicKey: pubkey,
@@ -1293,11 +1307,8 @@ func getPeers(macaddress string, network string, server string) ([]wgtypes.PeerC
Port: int(res.Peers.Listenport),
},
ReplaceAllowedIPs: true,
AllowedIPs: []net.IPNet{{
IP: net.ParseIP(res.Peers.Address),
Mask: net.CIDRMask(32, 32),
}},
}
AllowedIPs: allowedips,
}
}
peers = append(peers, peer)