From 050749fbb6cdc3301a0888b5dbd166f21b48c761 Mon Sep 17 00:00:00 2001
From: Callan Bryant <callan.bryant@gmail.com>
Date: Sun, 8 Mar 2020 22:50:54 +0000
Subject: [PATCH] bugfix: do not interrupt connwctions when syncing

---
 sync.go | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/sync.go b/sync.go
index 19a810e..05ec725 100644
--- a/sync.go
+++ b/sync.go
@@ -12,19 +12,48 @@ func Sync() {
 }
 
 func ConfigureDevice(conf *DsnetConfig) {
-	peers := conf.GetWgPeerConfigs()
-
-	wgConfig := wgtypes.Config{
-		PrivateKey:   &conf.PrivateKey.Key,
-		ListenPort:   &conf.ListenPort,
-		ReplacePeers: true,
-		Peers:        peers,
-	}
-
 	wg, err := wgctrl.New()
 	check(err)
 	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)
 
 	if err != nil {