mirror of
https://github.com/netbirdio/netbird.git
synced 2025-07-21 08:22:20 +02:00
21464ac770
This PR fixes issues with closing the WireGuard watcher by adjusting its asynchronous invocation and synchronization. Update tests in wg_watcher_test.go to launch the watcher in a goroutine and add a delay for timing. Modify wg_watcher.go to run the periodic handshake check synchronously by removing the waitGroup and goroutine. Enhance conn.go to wait on the watcher wait group during connection close and add a note for potential further synchronization
100 lines
2.0 KiB
Go
100 lines
2.0 KiB
Go
package peer
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/netbirdio/netbird/client/iface/configurer"
|
|
)
|
|
|
|
type MocWgIface struct {
|
|
initial bool
|
|
lastHandshake time.Time
|
|
stop bool
|
|
}
|
|
|
|
func (m *MocWgIface) GetStats(key string) (configurer.WGStats, error) {
|
|
if !m.initial {
|
|
m.initial = true
|
|
return configurer.WGStats{}, nil
|
|
}
|
|
|
|
if !m.stop {
|
|
m.lastHandshake = time.Now()
|
|
}
|
|
|
|
stats := configurer.WGStats{
|
|
LastHandshake: m.lastHandshake,
|
|
}
|
|
|
|
return stats, nil
|
|
}
|
|
|
|
func (m *MocWgIface) disconnect() {
|
|
m.stop = true
|
|
}
|
|
|
|
func TestWGWatcher_EnableWgWatcher(t *testing.T) {
|
|
checkPeriod = 5 * time.Second
|
|
wgHandshakeOvertime = 1 * time.Second
|
|
|
|
mlog := log.WithField("peer", "tet")
|
|
mocWgIface := &MocWgIface{}
|
|
watcher := NewWGWatcher(mlog, mocWgIface, "", newStateDump("peer", mlog, &Status{}))
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
|
|
onDisconnected := make(chan struct{}, 1)
|
|
go watcher.EnableWgWatcher(ctx, func() {
|
|
mlog.Infof("onDisconnectedFn")
|
|
onDisconnected <- struct{}{}
|
|
})
|
|
|
|
// wait for initial reading
|
|
time.Sleep(2 * time.Second)
|
|
mocWgIface.disconnect()
|
|
|
|
select {
|
|
case <-onDisconnected:
|
|
case <-time.After(10 * time.Second):
|
|
t.Errorf("timeout")
|
|
}
|
|
watcher.DisableWgWatcher()
|
|
}
|
|
|
|
func TestWGWatcher_ReEnable(t *testing.T) {
|
|
checkPeriod = 5 * time.Second
|
|
wgHandshakeOvertime = 1 * time.Second
|
|
|
|
mlog := log.WithField("peer", "tet")
|
|
mocWgIface := &MocWgIface{}
|
|
watcher := NewWGWatcher(mlog, mocWgIface, "", newStateDump("peer", mlog, &Status{}))
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
|
|
onDisconnected := make(chan struct{}, 1)
|
|
|
|
go watcher.EnableWgWatcher(ctx, func() {})
|
|
time.Sleep(1 * time.Second)
|
|
watcher.DisableWgWatcher()
|
|
|
|
go watcher.EnableWgWatcher(ctx, func() {
|
|
onDisconnected <- struct{}{}
|
|
})
|
|
|
|
time.Sleep(2 * time.Second)
|
|
mocWgIface.disconnect()
|
|
|
|
select {
|
|
case <-onDisconnected:
|
|
case <-time.After(10 * time.Second):
|
|
t.Errorf("timeout")
|
|
}
|
|
watcher.DisableWgWatcher()
|
|
}
|