mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-21 07:46:04 +08:00
peerupdate refactor
This commit is contained in:
parent
a529b28a00
commit
24babaf560
|
@ -14,7 +14,7 @@ func setRoute(iface string, addr *net.IPNet, address string) error {
|
|||
|
||||
func deleteRoute(iface string, addr *net.IPNet, address string) error {
|
||||
var err error
|
||||
_, err = ncutils.RunCmd("route delete -net "+addr.String()+" -interface "+iface, false)
|
||||
_, _ = ncutils.RunCmd("route delete -net "+addr.String()+" -interface "+iface, false)
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -51,62 +51,80 @@ func SetPeers(iface, currentNodeAddr string, keepalive int32, peers []wgtypes.Pe
|
|||
ncutils.PrintLog("no peers pulled", 1)
|
||||
return err
|
||||
}
|
||||
found := false
|
||||
//if a current peer is not in the list of new peers (based on PublicKey) delete it
|
||||
for _, currentPeer := range devicePeers {
|
||||
oldPeerAllowedIps[currentPeer.PublicKey.String()] = currentPeer.AllowedIPs
|
||||
for _, peer := range peers {
|
||||
if peer.PublicKey == currentPeer.PublicKey {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
_, err := ncutils.RunCmd("wg set "+iface+" peer "+currentPeer.PublicKey.String()+" remove", true)
|
||||
if err != nil {
|
||||
log.Println("error removing peer", currentPeer.Endpoint.String())
|
||||
}
|
||||
}
|
||||
}
|
||||
//if a new peer is not in the list of existing peers, add it
|
||||
found = false
|
||||
replace := false
|
||||
for _, peer := range peers {
|
||||
|
||||
for _, currentPeer := range devicePeers {
|
||||
if currentPeer.AllowedIPs[0].String() == peer.AllowedIPs[0].String() &&
|
||||
currentPeer.PublicKey.String() != peer.PublicKey.String() {
|
||||
_, err := ncutils.RunCmd("wg set "+iface+" peer "+currentPeer.PublicKey.String()+" remove", true)
|
||||
if peer.PublicKey == currentPeer.PublicKey {
|
||||
found = true
|
||||
}
|
||||
if found {
|
||||
//check all fields are still the same
|
||||
replace = false
|
||||
if peer.Endpoint != currentPeer.Endpoint || peer.PersistentKeepaliveInterval != ¤tPeer.PersistentKeepaliveInterval {
|
||||
replace = true
|
||||
}
|
||||
for _, endpoint := range peer.AllowedIPs {
|
||||
if ncutils.IPNetSliceContains(currentPeer.AllowedIPs, endpoint) {
|
||||
replace = true
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if !found || replace {
|
||||
udpendpoint := peer.Endpoint.String()
|
||||
var allowedips string
|
||||
var iparr []string
|
||||
for _, ipaddr := range peer.AllowedIPs {
|
||||
iparr = append(iparr, ipaddr.String())
|
||||
}
|
||||
allowedips = strings.Join(iparr, ",")
|
||||
keepAliveString := strconv.Itoa(int(keepalive))
|
||||
if peer.Endpoint != nil && keepalive > 0 {
|
||||
_, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+
|
||||
" endpoint "+udpendpoint+
|
||||
" persistent-keepalive "+keepAliveString+
|
||||
" allowed-ips "+allowedips, true)
|
||||
} else if peer.Endpoint != nil && keepalive == 0 {
|
||||
_, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+
|
||||
" endpoint "+udpendpoint+
|
||||
" allowed-ips "+allowedips, true)
|
||||
} else if peer.Endpoint == nil && keepalive != 0 {
|
||||
_, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+
|
||||
" persistent-keepalive "+keepAliveString+
|
||||
" allowed-ips "+allowedips, true)
|
||||
} else {
|
||||
_, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+
|
||||
" allowed-ips "+allowedips, true)
|
||||
}
|
||||
if err != nil {
|
||||
log.Println("error removing peer", peer.Endpoint.String())
|
||||
log.Println("error setting peer", peer.PublicKey.String())
|
||||
}
|
||||
}
|
||||
}
|
||||
udpendpoint := peer.Endpoint.String()
|
||||
var allowedips string
|
||||
var iparr []string
|
||||
for _, ipaddr := range peer.AllowedIPs {
|
||||
iparr = append(iparr, ipaddr.String())
|
||||
}
|
||||
allowedips = strings.Join(iparr, ",")
|
||||
keepAliveString := strconv.Itoa(int(keepalive))
|
||||
if keepAliveString == "0" {
|
||||
keepAliveString = "15"
|
||||
}
|
||||
if peer.Endpoint != nil {
|
||||
_, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+
|
||||
" endpoint "+udpendpoint+
|
||||
" persistent-keepalive "+keepAliveString+
|
||||
" allowed-ips "+allowedips, true)
|
||||
} else {
|
||||
_, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+
|
||||
" persistent-keepalive "+keepAliveString+
|
||||
" allowed-ips "+allowedips, true)
|
||||
}
|
||||
if err != nil {
|
||||
log.Println("error setting peer", peer.PublicKey.String())
|
||||
}
|
||||
}
|
||||
|
||||
for _, currentPeer := range devicePeers {
|
||||
shouldDelete := true
|
||||
for _, peer := range peers {
|
||||
if peer.AllowedIPs[0].String() == currentPeer.AllowedIPs[0].String() {
|
||||
shouldDelete = false
|
||||
}
|
||||
}
|
||||
if shouldDelete {
|
||||
output, err := ncutils.RunCmd("wg set "+iface+" peer "+currentPeer.PublicKey.String()+" remove", true)
|
||||
if err != nil {
|
||||
log.Println(output, "error removing peer", currentPeer.PublicKey.String())
|
||||
}
|
||||
}
|
||||
oldPeerAllowedIps[currentPeer.PublicKey.String()] = currentPeer.AllowedIPs
|
||||
}
|
||||
if ncutils.IsMac() {
|
||||
err = SetMacPeerRoutes(iface)
|
||||
return err
|
||||
} else if ncutils.IsLinux() {
|
||||
} else {
|
||||
local.SetPeerRoutes(iface, currentNodeAddr, oldPeerAllowedIps, peers)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue