apps/cunicu
1
0
Fork 0
mirror of https://codeberg.org/cunicu/cunicu.git synced 2025-10-05 08:47:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

daemon: use per-interface features

Browse Source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel
2022-09-30 08:32:26 +02:00
parent 70e437d9a6
commit 92a7ad2f7f
99 changed files with 3510 additions and 2599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/watcher/watcher.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/stv0g/cunicu/pkg/core"
"github.com/stv0g/cunicu/pkg/crypto"
"github.com/stv0g/cunicu/pkg/log"
"github.com/stv0g/cunicu/pkg/util"
"go.uber.org/zap"
"golang.zx2c4.com/wireguard/wgctrl"
@@ -111,20 +112,22 @@ func (w *Watcher) Watch() {
defer ticker.Stop()
}
logger := w.logger.WithOptions(log.WithVerbose(10))
out:
for {
select {
// We still a need periodic sync we can not (yet) monitor WireGuard interfaces
// for changes via a netlink socket (patch is pending)
case <-ticker.C:
w.logger.Debug("Started periodic interface synchronization")
logger.Debug("Started periodic interface synchronization")
if err := w.Sync(); err != nil {
w.logger.Error("Synchronization failed", zap.Error(err))
}
w.logger.Debug("Completed periodic interface synchronization")
logger.Debug("Completed periodic interface synchronization")
case event := <-w.events:
w.logger.Debug("Received interface event", zap.Any("event", event))
logger.Debug("Received interface event", zap.Any("event", event))
if err := w.Sync(); err != nil {
w.logger.Error("Synchronization failed", zap.Error(err))
}
@@ -151,12 +154,12 @@ func (w *Watcher) Sync() error {
}
// Ignore devices which do not match the filter
new = util.FilterSlice(new, func(d *wgtypes.Device) bool {
new = util.SliceFilter(new, func(d *wgtypes.Device) bool {
return w.filter == nil || w.filter(d.Name)
})
added, removed, kept := util.DiffSliceFunc(old, new, func(a, b **wgtypes.Device) int {
return strings.Compare((*a).Name, (*b).Name)
added, removed, kept := util.SliceDiffFunc(old, new, func(a, b *wgtypes.Device) int {
return strings.Compare(a.Name, b.Name)
})
w.mu.Unlock()