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

Fix: port forwarding deadlock bug, fix #547

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-07-29 01:13:16 +00:00
parent c61f854edc
commit 0bcc6ed597
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/openvpn/portforward.go
View File

@@ -10,10 +10,12 @@ import (
)
func (l *Loop) startPortForwarding(ctx context.Context,
portForwarder provider.PortForwarder, serverName string) {
if !l.GetSettings().Provider.PortForwarding.Enabled {
enabled bool, portForwarder provider.PortForwarder,
serverName string) {
if !enabled {
return
}
// only used for PIA for now
gateway, err := l.routing.VPNLocalGatewayIP()
if err != nil {
@@ -33,7 +35,12 @@ func (l *Loop) startPortForwarding(ctx context.Context,
}
}
func (l *Loop) stopPortForwarding(ctx context.Context, timeout time.Duration) {
func (l *Loop) stopPortForwarding(ctx context.Context, enabled bool,
timeout time.Duration) {
if !enabled {
return // nothing to stop
}
if timeout > 0 {
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, timeout)