Resolve merge conflict

This commit is contained in:
Kristoffer Dalby 2021-08-13 10:33:19 +01:00
parent 5bfcf5c917
commit 9698abbfd5
No known key found for this signature in database
GPG key ID: 09F62DC067465735
10 changed files with 180 additions and 139 deletions

View file

@ -49,12 +49,7 @@ func (h *Headscale) EnableNodeRoute(namespace string, nodeName string, routeStr
// The peers map is stored in memory in the server process.
// Definitely not accessible from the CLI tool.
// We need RPC to the server - or some kind of 'needsUpdate' field in the DB
peers, _ := h.getPeers(*m)
for _, p := range *peers {
if pUp, ok := h.clientsPolling.Load(uint64(p.ID)); ok {
pUp.(chan []byte) <- []byte{}
}
}
h.notifyChangesToPeers(m)
return &rIP, nil
}
}