admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: wireguard cleanup preventing restarts

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-09-04 22:29:04 +00:00
parent 61afdce788
commit 82ac568ee3
6 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/wireguard/run.go
View File

@@ -51,7 +51,7 @@ func (w *Wireguard) Run(ctx context.Context, waitError chan<- error, ready chan<
return
}
closers.add("closing TUN device", stepFive, tun.Close)
closers.add("closing TUN device", stepSeven, tun.Close)
tunName, err := tun.Name()
if err != nil {
@@ -71,12 +71,12 @@ func (w *Wireguard) Run(ctx context.Context, waitError chan<- error, ready chan<
bind := conn.NewDefaultBind()
closers.add("closing bind", stepFive, bind.Close)
closers.add("closing bind", stepSeven, bind.Close)
deviceLogger := makeDeviceLogger(w.logger)
device := device.NewDevice(tun, bind, deviceLogger)
closers.add("closing Wireguard device", stepFour, func() error {
closers.add("closing Wireguard device", stepSix, func() error {
device.Close()
return nil
})
@@ -117,6 +117,12 @@ func (w *Wireguard) Run(ctx context.Context, waitError chan<- error, ready chan<
waitError <- fmt.Errorf("%w: %s", ErrIfaceUp, err)
return
}
closers.add("shutting down link", stepFour, func() error {
return w.netlink.LinkSetDown(link)
})
closers.add("deleting link", stepFive, func() error {
return w.netlink.LinkDel(link)
})
err = w.addRoute(link, allIPv4(), w.settings.FirewallMark)
if err != nil {