Merge branch 'master' into pmtu

This commit is contained in:
Quentin McGaw
2025-10-17 00:17:45 +00:00
28 changed files with 1505 additions and 665 deletions

View File

@@ -48,6 +48,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
}
tunnelUpData := tunnelUpData{
vpnType: settings.Type,
serverIP: connection.IP,
serverName: connection.ServerName,
canPortForward: connection.PortForward,
portForwarder: portForwarder,
@@ -75,7 +76,7 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
for stayHere {
select {
case <-tunnelReady:
go l.onTunnelUp(openvpnCtx, tunnelUpData)
go l.onTunnelUp(openvpnCtx, ctx, tunnelUpData)
case <-ctx.Done():
l.cleanup()
openvpnCancel()