Fix: empty connection for NordVPN and Windscribe
This commit is contained in:
@@ -121,9 +121,6 @@ func (c *configurator) acceptEstablishedRelatedTraffic(ctx context.Context, remo
|
||||
|
||||
func (c *configurator) acceptOutputTrafficToVPN(ctx context.Context,
|
||||
defaultInterface string, connection models.OpenVPNConnection, remove bool) error {
|
||||
if connection.IP == nil {
|
||||
panic("PLEASE CREATE AN ISSUE with this log: https://github.com/qdm12/gluetun/issues")
|
||||
}
|
||||
return c.runIptablesInstruction(ctx,
|
||||
fmt.Sprintf("%s OUTPUT -d %s -o %s -p %s -m %s --dport %d -j ACCEPT",
|
||||
appendOrDelete(remove), connection.IP, defaultInterface, connection.Protocol, connection.Protocol, connection.Port))
|
||||
|
||||
@@ -2,8 +2,6 @@ package openvpn
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"strings"
|
||||
@@ -120,17 +118,6 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
|
||||
l.cancel()
|
||||
return
|
||||
}
|
||||
if connection.IP == nil {
|
||||
serverSelectionJSON, _ := json.Marshal(settings.Provider.ServerSelection)
|
||||
connectionJSON, _ := json.Marshal(connection)
|
||||
message := fmt.Sprintf(`
|
||||
PLEASE CREATE AN ISSUE with this log: https://github.com/qdm12/gluetun/issues
|
||||
Server selection: %s
|
||||
AllServers count: %d
|
||||
connection: %s
|
||||
`, string(serverSelectionJSON), allServers.Count(), string(connectionJSON))
|
||||
panic(message)
|
||||
}
|
||||
lines := providerConf.BuildConf(connection, l.username, settings)
|
||||
|
||||
if err := writeOpenvpnConf(lines, l.openFile); err != nil {
|
||||
|
||||
@@ -73,8 +73,7 @@ func (n *nordvpn) GetOpenVPNConnection(selection models.ServerSelection) (
|
||||
|
||||
connections := make([]models.OpenVPNConnection, len(servers))
|
||||
for i := range servers {
|
||||
connection := models.OpenVPNConnection{IP: servers[i].IP, Port: port, Protocol: selection.Protocol}
|
||||
connections = append(connections, connection)
|
||||
connections[i] = models.OpenVPNConnection{IP: servers[i].IP, Port: port, Protocol: selection.Protocol}
|
||||
}
|
||||
|
||||
return pickRandomConnection(connections, n.randSource), nil
|
||||
|
||||
@@ -67,8 +67,8 @@ func (w *windscribe) GetOpenVPNConnection(selection models.ServerSelection) (con
|
||||
}
|
||||
|
||||
connections := make([]models.OpenVPNConnection, len(servers))
|
||||
for _, server := range servers {
|
||||
connections = append(connections, models.OpenVPNConnection{IP: server.IP, Port: port, Protocol: selection.Protocol})
|
||||
for i := range servers {
|
||||
connections[i] = models.OpenVPNConnection{IP: servers[i].IP, Port: port, Protocol: selection.Protocol}
|
||||
}
|
||||
|
||||
return pickRandomConnection(connections, w.randSource), nil
|
||||
|
||||
Reference in New Issue
Block a user