bugfix: add/remove peers without restarting interface
This commit is contained in:
parent
5f735112f2
commit
319e238261
46
sync.go
46
sync.go
@ -12,17 +12,49 @@ func Sync() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ConfigureDevice(conf *DsnetConfig) {
|
func ConfigureDevice(conf *DsnetConfig) {
|
||||||
wgConfig := wgtypes.Config{
|
|
||||||
PrivateKey: &conf.PrivateKey.Key,
|
|
||||||
ListenPort: &conf.ListenPort,
|
|
||||||
ReplacePeers: true,
|
|
||||||
Peers: conf.GetWgPeerConfigs(),
|
|
||||||
}
|
|
||||||
|
|
||||||
wg, err := wgctrl.New()
|
wg, err := wgctrl.New()
|
||||||
check(err)
|
check(err)
|
||||||
defer wg.Close()
|
defer wg.Close()
|
||||||
|
|
||||||
|
dev, err := wg.Device(conf.InterfaceName)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
ExitFail("Could not retrieve device '%s' (%v)", conf.InterfaceName, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
peers := conf.GetWgPeerConfigs()
|
||||||
|
|
||||||
|
// compare peers to see if any exist on the device and not the config. If
|
||||||
|
// so, they should be removed by appending a dummy peer with Remove:true + pubkey.
|
||||||
|
knownKeys := make(map[wgtypes.Key]bool)
|
||||||
|
|
||||||
|
for _, peer := range peers {
|
||||||
|
knownKeys[peer.PublicKey] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
// find deleted peers, and append dummy "remove" peers
|
||||||
|
for _, peer := range dev.Peers {
|
||||||
|
if !knownKeys[peer.PublicKey] {
|
||||||
|
peers = append(peers, wgtypes.PeerConfig{
|
||||||
|
PublicKey: peer.PublicKey,
|
||||||
|
Remove: true,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
wgConfig := wgtypes.Config{
|
||||||
|
PrivateKey: &conf.PrivateKey.Key,
|
||||||
|
ListenPort: &conf.ListenPort,
|
||||||
|
// ReplacePeers with the same peers results in those peers losing
|
||||||
|
// connection, so it's not possible to do declarative configuration
|
||||||
|
// idempotently with ReplacePeers like I had assumed. Instead, peers
|
||||||
|
// must be removed imperatively with Remove:true. Peers can still be
|
||||||
|
// added/updated with ConfigureDevice declaratively.
|
||||||
|
ReplacePeers: false,
|
||||||
|
Peers: peers,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
err = wg.ConfigureDevice(conf.InterfaceName, wgConfig)
|
err = wg.ConfigureDevice(conf.InterfaceName, wgConfig)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user