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

Bug fix: Program exit on Openvpn fatal error

Browse Source
This commit is contained in:
Quentin McGaw
2020-12-29 17:50:36 +00:00
parent 8428714cf5
commit fe81eb65c2
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/openvpn/loop.go
View File

@@ -53,6 +53,7 @@ type looper struct {
stop, stopped chan struct{} stop, stopped chan struct{}
start chan struct{} start chan struct{}
portForwardSignals chan net.IP portForwardSignals chan net.IP
crashed bool
} }
func NewLooper(settings settings.OpenVPN, func NewLooper(settings settings.OpenVPN,
@@ -88,9 +89,15 @@ func NewLooper(settings settings.OpenVPN,
func (l *looper) PortForward(vpnGateway net.IP) { l.portForwardSignals <- vpnGateway } func (l *looper) PortForward(vpnGateway net.IP) { l.portForwardSignals <- vpnGateway }
func (l *looper) signalCrashedStatus() {
if !l.crashed {
l.crashed = true
l.running <- constants.Crashed
}
}
func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) { func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
defer wg.Done() defer wg.Done()
crashed := false
select { select {
case <-l.start: case <-l.start:
case <-ctx.Done(): case <-ctx.Done():
@@ -104,6 +111,7 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
connection, err := providerConf.GetOpenVPNConnection(settings.Provider.ServerSelection) connection, err := providerConf.GetOpenVPNConnection(settings.Provider.ServerSelection)
if err != nil { if err != nil {
l.logger.Error(err) l.logger.Error(err)
l.signalCrashedStatus()
l.cancel() l.cancel()
return return
} }
@@ -119,18 +127,21 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
if err := writeOpenvpnConf(lines, l.openFile); err != nil { if err := writeOpenvpnConf(lines, l.openFile); err != nil {
l.logger.Error(err) l.logger.Error(err)
l.signalCrashedStatus()
l.cancel() l.cancel()
return return
} }
if err := l.conf.WriteAuthFile(settings.User, settings.Password, l.puid, l.pgid); err != nil { if err := l.conf.WriteAuthFile(settings.User, settings.Password, l.puid, l.pgid); err != nil {
l.logger.Error(err) l.logger.Error(err)
l.signalCrashedStatus()
l.cancel() l.cancel()
return return
} }
if err := l.fw.SetVPNConnection(ctx, connection); err != nil { if err := l.fw.SetVPNConnection(ctx, connection); err != nil {
l.logger.Error(err) l.logger.Error(err)
l.signalCrashedStatus()
l.cancel() l.cancel()
return return
} }
@@ -140,10 +151,7 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
stream, waitFn, err := l.conf.Start(openvpnCtx) stream, waitFn, err := l.conf.Start(openvpnCtx)
if err != nil { if err != nil {
openvpnCancel() openvpnCancel()
if !crashed { l.signalCrashedStatus()
l.running <- constants.Crashed
crashed = true
}
l.logAndWait(ctx, err) l.logAndWait(ctx, err)
continue continue
} }
@@ -169,11 +177,11 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
waitError <- err waitError <- err
}() }()
if !crashed { if l.crashed {
l.running <- constants.Running l.crashed = false
crashed = false
} else {
l.state.setStatusWithLock(constants.Running) l.state.setStatusWithLock(constants.Running)
} else {
l.running <- constants.Running
} }
stayHere := true stayHere := true
@@ -197,7 +205,7 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
openvpnCancel() openvpnCancel()
l.state.setStatusWithLock(constants.Crashed) l.state.setStatusWithLock(constants.Crashed)
l.logAndWait(ctx, err) l.logAndWait(ctx, err)
crashed = true l.crashed = true
stayHere = false stayHere = false
} }
} }