gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-27 01:23:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

added debug stuff

Browse source
This commit is contained in:
0xdcarns 2022-01-31 09:58:43 -05:00
parent 5a5ded1c04
commit 2a4a30f937
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
logic/wireguard.go
View file

@ -220,10 +220,10 @@ func setServerPeers(iface string, keepalive int32, peers []wgtypes.PeerConfig) e
if err != nil { if err != nil {
logger.Log(0, "error removing peer", peer.Endpoint.String()) logger.Log(0, "error removing peer", peer.Endpoint.String())
} }
logger.Log(0, "removed peer:", peer.Endpoint.String())
} }
} }
} }
udpendpoint := peer.Endpoint.String()
var allowedips string var allowedips string
var iparr []string var iparr []string
for _, ipaddr := range peer.AllowedIPs { for _, ipaddr := range peer.AllowedIPs {
@ -234,16 +234,10 @@ func setServerPeers(iface string, keepalive int32, peers []wgtypes.PeerConfig) e
if keepAliveString == "0" { if keepAliveString == "0" {
keepAliveString = "5" keepAliveString = "5"
} }
if peer.Endpoint != nil {
_, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+ _, err = ncutils.RunCmd("wg set "+iface+" peer "+peer.PublicKey.String()+
" endpoint "+udpendpoint+ " persistent-keepalive "+keepAliveString+
" persistent-keepalive "+keepAliveString+ " allowed-ips "+allowedips, true)
" 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 { if err != nil {
logger.Log(2, "error setting peer", peer.PublicKey.String()) logger.Log(2, "error setting peer", peer.PublicKey.String())
} }
@ -253,7 +247,9 @@ func setServerPeers(iface string, keepalive int32, peers []wgtypes.PeerConfig) e
if len(currentPeer.AllowedIPs) > 0 { if len(currentPeer.AllowedIPs) > 0 {
shouldDelete := true shouldDelete := true
for _, peer := range peers { for _, peer := range peers {
if len(peer.AllowedIPs) > 0 && peer.AllowedIPs[0].String() == currentPeer.AllowedIPs[0].String() { if len(peer.AllowedIPs) > 0 &&
(peer.PublicKey.String() == currentPeer.PublicKey.String() ||
peer.AllowedIPs[0].String() == currentPeer.PublicKey.String()) {
shouldDelete = false shouldDelete = false
} }
} }

2
mq/mq.go
View file

@ -122,7 +122,7 @@ func PublishPeerUpdate(newNode *models.Node) error {
if err = publish(&node, fmt.Sprintf("peers/%s/%s", node.Network, node.ID), data); err != nil { if err = publish(&node, fmt.Sprintf("peers/%s/%s", node.Network, node.ID), data); err != nil {
logger.Log(1, "failed to publish peer update for node", node.ID) logger.Log(1, "failed to publish peer update for node", node.ID)
} else { } else {
logger.Log(0, "sent peer update for network, %s and node, %s, peers sent: \n%v", node.Network, node.Name, string(data)) logger.Log(0, fmt.Sprintf("sent peer update for network, %s and node, %s", node.Network, node.Name))
} }
} }
return nil return nil