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

chore(vpn): fix typo portForwader

Browse Source
This commit is contained in:
Quentin McGaw
2023-09-23 12:03:56 +00:00
parent 0406de399d
commit 1a865f56d5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/vpn/run.go
View File

@@ -23,9 +23,9 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
providerConf := l.providers.Get(*settings.Provider.Name) providerConf := l.providers.Get(*settings.Provider.Name)
customPortForwardingProvider := *settings.Provider.PortForwarding.Provider customPortForwardingProvider := *settings.Provider.PortForwarding.Provider
portForwader := providerConf portForwarder := providerConf
if customPortForwardingProvider != "" { if customPortForwardingProvider != "" {
portForwader = l.providers.Get(customPortForwardingProvider) portForwarder = l.providers.Get(customPortForwardingProvider)
} }
var vpnRunner interface { var vpnRunner interface {
@@ -49,7 +49,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
} }
tunnelUpData := tunnelUpData{ tunnelUpData := tunnelUpData{
serverName: serverName, serverName: serverName,
portForwarder: portForwader, portForwarder: portForwarder,
vpnIntf: vpnInterface, vpnIntf: vpnInterface,
} }
@@ -74,7 +74,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
case <-tunnelReady: case <-tunnelReady:
go l.onTunnelUp(openvpnCtx, tunnelUpData) go l.onTunnelUp(openvpnCtx, tunnelUpData)
case <-ctx.Done(): case <-ctx.Done():
l.cleanup(portForwader.Name()) l.cleanup(portForwarder.Name())
openvpnCancel() openvpnCancel()
<-waitError <-waitError
close(waitError) close(waitError)
@@ -82,7 +82,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
case <-l.stop: case <-l.stop:
l.userTrigger = true l.userTrigger = true
l.logger.Info("stopping") l.logger.Info("stopping")
l.cleanup(portForwader.Name()) l.cleanup(portForwarder.Name())
openvpnCancel() openvpnCancel()
<-waitError <-waitError
// do not close waitError or the waitError // do not close waitError or the waitError
@@ -95,7 +95,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
case err := <-waitError: // unexpected error case err := <-waitError: // unexpected error
l.statusManager.Lock() // prevent SetStatus from running in parallel l.statusManager.Lock() // prevent SetStatus from running in parallel
l.cleanup(portForwader.Name()) l.cleanup(portForwarder.Name())
openvpnCancel() openvpnCancel()
l.statusManager.SetStatus(constants.Crashed) l.statusManager.SetStatus(constants.Crashed)
l.logAndWait(ctx, err) l.logAndWait(ctx, err)