diff --git a/internal/firewall/iptables.go b/internal/firewall/iptables.go index 11b6ec2ac..1d224b45a 100644 --- a/internal/firewall/iptables.go +++ b/internal/firewall/iptables.go @@ -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)) diff --git a/internal/openvpn/loop.go b/internal/openvpn/loop.go index 8158a0395..abdbd44a8 100644 --- a/internal/openvpn/loop.go +++ b/internal/openvpn/loop.go @@ -118,9 +118,6 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) { l.cancel() return } - if connection.IP == nil { - panic("PLEASE CREATE AN ISSUE with this log: https://github.com/qdm12/gluetun/issues") - } lines := providerConf.BuildConf(connection, l.username, settings) if err := writeOpenvpnConf(lines, l.openFile); err != nil { diff --git a/internal/provider/nordvpn.go b/internal/provider/nordvpn.go index 0e6af211d..7affbc823 100644 --- a/internal/provider/nordvpn.go +++ b/internal/provider/nordvpn.go @@ -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 diff --git a/internal/provider/windscribe.go b/internal/provider/windscribe.go index 1349a127f..e3e5605c9 100644 --- a/internal/provider/windscribe.go +++ b/internal/provider/windscribe.go @@ -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