Chore(deps): Bump golang.org/x/text from 0.3.7 to 0.4.0 (#1198 )

Chore(deps): Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (#1210 )
Chore(deps): Bump docker/build-push-action from 3.1.1 to 3.2.0 (#1193 )
2022-10-28 07:24:35 -04:00 · 2022-10-28 07:24:20 -04:00 · 2022-10-28 07:24:04 -04:00 · 2022-10-28 07:23:40 -04:00 · 2022-10-28 11:02:39 +00:00 · 2022-10-28 11:02:24 +00:00
168 changed files with 27546 additions and 4951 deletions
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -40,6 +40,7 @@ body:
    attributes:
      label: VPN service provider
      options:
+        - AirVPN
        - Custom
        - Cyberghost
        - ExpressVPN
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -23,6 +23,9 @@
  description: ""

 # VPN providers
+- name: ":cloud: AirVPN"
+  color: "cfe8d4"
+  description: ""
 - name: ":cloud: Cyberghost"
  color: "cfe8d4"
  description: ""
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,6 +45,8 @@ jobs:
        with:
          locale: "US"
          level: error
+          exclude: |
+            ./internal/storage/servers.json

      - name: Linting
        run: docker build --target lint .
@@ -126,7 +128,7 @@ jobs:
        run: echo "::set-output name=value::$(git rev-parse --short HEAD)"

      - name: Build and push final image
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v6,linux/arm/v7,linux/ppc64le
          labels: ${{ steps.meta.outputs.labels }}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,11 +5,11 @@
            "name": "Update a VPN provider servers data",
            "type": "go",
            "request": "launch",
-            "mode": "debug",
+            "cwd": "${workspaceFolder}",
            "program": "cmd/gluetun/main.go",
            "args": [
                "update",
-                "-enduser",
+                "${input:updateMode}",
                "-providers",
                "${input:provider}"
            ],
@@ -20,6 +20,16 @@
            "id": "provider",
            "type": "promptString",
            "description": "Please enter a provider (or comma separated list of providers)",
-        }
+        },
+        {
+            "id": "updateMode",
+            "type": "pickString",
+            "description": "Update mode to use",
+            "options": [
+                "-maintainer",
+                "-enduser"
+            ],
+            "default": "-maintainer"
+        },
    ]
 }
--- a/3
+++ b/3
@@ -1,6 +1,6 @@
 ARG ALPINE_VERSION=3.16
 ARG GO_ALPINE_VERSION=3.16
-ARG GO_VERSION=1.17
+ARG GO_VERSION=1.19
 ARG XCPUTRANSLATE_VERSION=v0.6.0
 ARG GOLANGCI_LINT_VERSION=v1.49.0
 ARG MOCKGEN_VERSION=v1.6.0
@@ -91,7 +91,6 @@ ENV VPN_SERVICE_PROVIDER=pia \
    OPENVPN_CIPHERS= \
    OPENVPN_AUTH= \
    OPENVPN_PROCESS_USER= \
-    OPENVPN_IPV6=off \
    OPENVPN_CUSTOM_CONFIG= \
    # Wireguard
    WIREGUARD_PRIVATE_KEY= \
--- a/README.md
+++ b/README.md
@@ -58,11 +58,11 @@ Lightweight swiss-knife-like VPN client to multiple VPN service providers
 ## Features

 - Based on Alpine 3.16 for a small Docker image of 29MB
- Supports: **Cyberghost**, **ExpressVPN**, **FastestVPN**, **HideMyAss**, **IPVanish**, **IVPN**, **Mullvad**, **NordVPN**, **Perfect Privacy**, **Privado**, **Private Internet Access**, **PrivateVPN**, **ProtonVPN**, **PureVPN**,  **SlickVPN**, **Surfshark**, **TorGuard**, **VPNSecure.me**, **VPNUnlimited**, **Vyprvpn**, **WeVPN**, **Windscribe** servers
+- Supports: **AirVPN**, **Cyberghost**, **ExpressVPN**, **FastestVPN**, **HideMyAss**, **IPVanish**, **IVPN**, **Mullvad**, **NordVPN**, **Perfect Privacy**, **Privado**, **Private Internet Access**, **PrivateVPN**, **ProtonVPN**, **PureVPN**,  **SlickVPN**, **Surfshark**, **TorGuard**, **VPNSecure.me**, **VPNUnlimited**, **Vyprvpn**, **WeVPN**, **Windscribe** servers
 - Supports OpenVPN for all providers listed
 - Supports Wireguard both kernelspace and userspace
-  - For **Mullvad**, **Ivpn** and **Windscribe**
-  - For **Torguard**, **VPN Unlimited** and **WeVPN** using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
+  - For **Mullvad**, **Ivpn**, **Surfshark** and **Windscribe**
+  - For **ProtonVPN**, **PureVPN**, **Torguard**, **VPN Unlimited** and **WeVPN** using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
  - For custom Wireguard configurations using [the custom provider](https://github.com/qdm12/gluetun/wiki/Custom-provider)
  - More in progress, see [#134](https://github.com/qdm12/gluetun/issues/134)
 - DNS over TLS baked in with service provider(s) of your choice
--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -16,10 +16,10 @@ import (
 	"github.com/qdm12/dns/pkg/unbound"
 	"github.com/qdm12/gluetun/internal/alpine"
 	"github.com/qdm12/gluetun/internal/cli"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
+	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/gluetun/internal/configuration/sources/env"
 	"github.com/qdm12/gluetun/internal/configuration/sources/files"
-	"github.com/qdm12/gluetun/internal/configuration/sources/mux"
+	mux "github.com/qdm12/gluetun/internal/configuration/sources/merge"
 	"github.com/qdm12/gluetun/internal/configuration/sources/secrets"
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/dns"
@@ -108,11 +108,15 @@ func main() {
 	const shutdownGracePeriod = 5 * time.Second
 	timer := time.NewTimer(shutdownGracePeriod)
 	select {
-	case <-errorCh:
+	case err := <-errorCh:
 		if !timer.Stop() {
 			<-timer.C
 		}
-		logger.Info("Shutdown successful")
+		if err == nil {
+			logger.Info("Shutdown successful")
+			os.Exit(0)
+		}
+		logger.Warnf("Shutdown not completed gracefully: %s", err)
 	case <-timer.C:
 		logger.Warn("Shutdown timed out")
 	case signal := <-signalCh:
@@ -128,7 +132,7 @@ var (

 //nolint:gocognit,gocyclo,maintidx
 func _main(ctx context.Context, buildInfo models.BuildInformation,
-	args []string, logger log.LoggerInterface, source sources.Source,
+	args []string, logger log.LoggerInterface, source Source,
 	tun Tun, netLinker netLinker, cmder command.RunStarter,
 	cli clier) error {
 	if len(args) > 1 { // cli operation
@@ -138,7 +142,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		case "clientkey":
 			return cli.ClientKey(args[2:])
 		case "openvpnconfig":
-			return cli.OpenvpnConfig(logger, source)
+			return cli.OpenvpnConfig(logger, source, netLinker)
 		case "update":
 			return cli.Update(ctx, args[2:], logger)
 		case "format-servers":
@@ -284,6 +288,17 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		return err
 	}

+	ipv6Supported, err := netLinker.IsIPv6Supported()
+	if err != nil {
+		return fmt.Errorf("checking for IPv6 support: %w", err)
+	}
+
+	if ipv6Supported {
+		logger.Info("IPv6 is supported")
+	} else {
+		logger.Info("IPv6 is not supported")
+	}
+
 	if err := routingConf.Setup(); err != nil {
 		if strings.Contains(err.Error(), "operation not permitted") {
 			logger.Warn("💡 Tip: Are you passing NET_ADMIN capability to gluetun?")
@@ -389,7 +404,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		httpClient, unzipper, parallelResolver, ipFetcher, openvpnFileExtractor)

 	vpnLogger := logger.New(log.SetComponent("vpn"))
-	vpnLooper := vpn.NewLoop(allSettings.VPN, allSettings.Firewall.VPNInputPorts,
+	vpnLooper := vpn.NewLoop(allSettings.VPN, ipv6Supported, allSettings.Firewall.VPNInputPorts,
 		providers, storage, ovpnConf, netLinker, firewallConf, routingConf, portForwardLooper,
 		cmder, publicIPLooper, unboundLooper, vpnLogger, httpClient,
 		buildInfo, *allSettings.Version.Enabled)
@@ -494,6 +509,7 @@ type netLinker interface {
 	Ruler
 	Linker
 	IsWireguardSupported() (ok bool, err error)
+	IsIPv6Supported() (ok bool, err error)
 }

 type Addresser interface {
@@ -529,8 +545,8 @@ type Linker interface {
 type clier interface {
 	ClientKey(args []string) error
 	FormatServers(args []string) error
-	OpenvpnConfig(logger cli.OpenvpnConfigLogger, source sources.Source) error
-	HealthCheck(ctx context.Context, source sources.Source, warner cli.Warner) error
+	OpenvpnConfig(logger cli.OpenvpnConfigLogger, source cli.Source, ipv6Checker cli.IPv6Checker) error
+	HealthCheck(ctx context.Context, source cli.Source, warner cli.Warner) error
 	Update(ctx context.Context, args []string, logger cli.UpdaterLogger) error
 }

@@ -538,3 +554,9 @@ type Tun interface {
 	Check(tunDevice string) error
 	Create(tunDevice string) error
 }
+
+type Source interface {
+	Read() (settings settings.Settings, err error)
+	ReadHealth() (health settings.Health, err error)
+	String() string
+}
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,9 @@
 module github.com/qdm12/gluetun

-go 1.17
+go 1.19

 require (
-	github.com/breml/rootcerts v0.2.6
+	github.com/breml/rootcerts v0.2.8
 	github.com/fatih/color v1.13.0
 	github.com/golang/mock v1.6.0
 	github.com/qdm12/dns v1.11.0
@@ -15,24 +15,25 @@ require (
 	github.com/qdm12/log v0.1.0
 	github.com/qdm12/ss-server v0.4.0
 	github.com/qdm12/updated v0.0.0-20210603204757-205acfe6937e
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.1
 	github.com/vishvananda/netlink v1.1.1-0.20211129163951-9ada19101fc5
-	golang.org/x/net v0.0.0-20210916014120-12bc252f5db8
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
-	golang.org/x/text v0.3.7
-	golang.zx2c4.com/wireguard v0.0.0-20210805125648-3957e9b9dd19
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210803171230-4253848d036c
+	golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
+	golang.org/x/text v0.4.0
+	golang.zx2c4.com/wireguard v0.0.0-20220703234212-c31a7b1ab478
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b
 	inet.af/netaddr v0.0.0-20210718074554-06ca8145d722
 )

 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
-	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
+	github.com/google/go-cmp v0.5.7 // indirect
+	github.com/josharian/native v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mdlayher/genetlink v1.0.0 // indirect
-	github.com/mdlayher/netlink v1.4.0 // indirect
+	github.com/mdlayher/genetlink v1.2.0 // indirect
+	github.com/mdlayher/netlink v1.6.0 // indirect
+	github.com/mdlayher/socket v0.2.3 // indirect
 	github.com/miekg/dns v1.1.40 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -40,6 +41,8 @@ require (
 	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
 	go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
 	go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -4,8 +4,8 @@ github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/g
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/breml/rootcerts v0.2.6 h1:CdPczjzItec+wopLoDsBAFcLEai2q7Yayfg/94/q/2E=
-github.com/breml/rootcerts v0.2.6/go.mod h1:24FDtzYMpqIeYC7QzaE8VPRQaFZU5TIUDlyk8qwjD88=
+github.com/breml/rootcerts v0.2.8 h1:hNPyNa+MghU9ZKqWy+MYxvouNqE70jvOBIa5v70z/P8=
+github.com/breml/rootcerts v0.2.8/go.mod h1:24FDtzYMpqIeYC7QzaE8VPRQaFZU5TIUDlyk8qwjD88=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -36,28 +36,16 @@ github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3K
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gotify/go-api-client/v2 v2.0.4/go.mod h1:VKiah/UK20bXsr0JObE1eBVLW44zbBouzjuri9iwjFU=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA=
-github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
-github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
-github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
-github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw=
-github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs=
-github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA=
-github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b h1:c3NTyLNozICy8B4mlMXemD3z/gXgQzVXZS/HqT+i3do=
-github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U=
+github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
+github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -73,24 +61,16 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
-github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
-github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
-github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
-github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
-github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
-github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
-github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
-github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8=
-github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
-github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
-github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys=
-github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
-github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
+github.com/mdlayher/genetlink v1.2.0 h1:4yrIkRV5Wfk1WfpWTcoOlGmsWgQj3OtQN9ZsbrE+XtU=
+github.com/mdlayher/genetlink v1.2.0/go.mod h1:ra5LDov2KrUCZJiAtEvXXZBxGMInICMXIwshlJ+qRxQ=
+github.com/mdlayher/netlink v1.6.0 h1:rOHX5yl7qnlpiVkFWoqccueppMtXzeziFjWAjLg6sz0=
+github.com/mdlayher/netlink v1.6.0/go.mod h1:0o3PlBmGst1xve7wQ7j/hwpNaFaH4qCRyWCdcZk8/vA=
+github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
+github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
+github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
 github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA=
 github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws=
-github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
@@ -128,13 +108,15 @@ github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jW
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/vishvananda/netlink v1.1.1-0.20211129163951-9ada19101fc5 h1:b/k/BVWzWRS5v6AB0gf2ckFSbFsHN5jR0HoNso1pN+w=
 github.com/vishvananda/netlink v1.1.1-0.20211129163951-9ada19101fc5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns=
@@ -154,80 +136,60 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210504132125-bbd867fde50d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210916014120-12bc252f5db8 h1:/6y1LfuqNuQdHAm0jjtPtgRcxIxjVZgm5OTu8/QhZvk=
-golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2 h1:6mzvA99KwZxbOrxww4EvWVQUnN1+xEu9tafK5ZxkYeA=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210309040221-94ec62e08169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -239,11 +201,12 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.zx2c4.com/wireguard v0.0.0-20210427022245-097af6e1351b/go.mod h1:a057zjmoc00UN7gVkaJt2sXVK523kMJcogDTEvPIasg=
-golang.zx2c4.com/wireguard v0.0.0-20210805125648-3957e9b9dd19 h1:ab2jcw2W91Rz07eHAb8Lic7sFQKO0NhBftjv6m/gL/0=
-golang.zx2c4.com/wireguard v0.0.0-20210805125648-3957e9b9dd19/go.mod h1:laHzsbfMhGSobUmruXWAyMKKHSqvIcrqZJMyHD+/3O8=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210803171230-4253848d036c h1:ADNrRDI5NR23/TUCnEmlLZLt4u9DnZ2nwRkPrAcFvto=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210803171230-4253848d036c/go.mod h1:+1XihzyZUBJcSc5WO9SwNA7v26puQwOEDwanaxfNXPQ=
+golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 h1:Ug9qvr1myri/zFN6xL17LSCBGFDnphBBhzmILHsM5TY=
+golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
+golang.zx2c4.com/wireguard v0.0.0-20220703234212-c31a7b1ab478 h1:vDy//hdR+GnROE3OdYbQKt9rdtNdHkDtONvpRwmls/0=
+golang.zx2c4.com/wireguard v0.0.0-20220703234212-c31a7b1ab478/go.mod h1:bVQfyl2sCM/QIIGHpWbFGfHPuDvqnCNkT6MQLTCjO/U=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b h1:9JncmKXcUwE918my+H6xmjBdhK2jM/UTUNXxhRG1BAk=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b/go.mod h1:yp4gl6zOlnDGOZeWeDfMwQcsdOIQnMdhuPx9mwwWBL4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/internal/cli/healthcheck.go
+++ b/internal/cli/healthcheck.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"time"

-	"github.com/qdm12/gluetun/internal/configuration/sources"
 	"github.com/qdm12/gluetun/internal/healthcheck"
 )

-func (c *CLI) HealthCheck(ctx context.Context, source sources.Source, warner Warner) error {
+func (c *CLI) HealthCheck(ctx context.Context, source Source, warner Warner) error {
 	// Extract the health server port from the configuration.
 	config, err := source.ReadHealth()
 	if err != nil {
--- a/internal/configuration/sources/source.go
+++ b/internal/configuration/sources/source.go
@@ -1,9 +1,9 @@
-package sources
+package cli

 import "github.com/qdm12/gluetun/internal/configuration/settings"

 type Source interface {
 	Read() (settings settings.Settings, err error)
-	ReadHealth() (settings settings.Health, err error)
+	ReadHealth() (health settings.Health, err error)
 	String() string
 }
--- a/internal/cli/openvpnconfig.go
+++ b/internal/cli/openvpnconfig.go
@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"

-	"github.com/qdm12/gluetun/internal/configuration/sources"
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/openvpn/extract"
 	"github.com/qdm12/gluetun/internal/provider"
@@ -36,7 +35,12 @@ type IPFetcher interface {
 	FetchMultiInfo(ctx context.Context, ips []net.IP) (data []ipinfo.Response, err error)
 }

-func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) error {
+type IPv6Checker interface {
+	IsIPv6Supported() (supported bool, err error)
+}
+
+func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source Source,
+	ipv6Checker IPv6Checker) error {
 	storage, err := storage.New(logger, constants.ServersData)
 	if err != nil {
 		return err
@@ -51,6 +55,11 @@ func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) e
 		return err
 	}

+	ipv6Supported, err := ipv6Checker.IsIPv6Supported()
+	if err != nil {
+		return fmt.Errorf("checking for IPv6 support: %w", err)
+	}
+
 	// Unused by this CLI command
 	unzipper := (Unzipper)(nil)
 	client := (*http.Client)(nil)
@@ -62,12 +71,14 @@ func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, source sources.Source) e
 	providers := provider.NewProviders(storage, time.Now, warner, client,
 		unzipper, parallelResolver, ipFetcher, openvpnFileExtractor)
 	providerConf := providers.Get(*allSettings.VPN.Provider.Name)
-	connection, err := providerConf.GetConnection(allSettings.VPN.Provider.ServerSelection)
+	connection, err := providerConf.GetConnection(
+		allSettings.VPN.Provider.ServerSelection, ipv6Supported)
 	if err != nil {
 		return err
 	}

-	lines := providerConf.OpenVPNConfig(connection, allSettings.VPN.OpenVPN)
+	lines := providerConf.OpenVPNConfig(connection,
+		allSettings.VPN.OpenVPN, ipv6Supported)

 	fmt.Println(strings.Join(lines, "\n"))
 	return nil
--- a/internal/configuration/settings/errors.go
+++ b/internal/configuration/settings/errors.go
@@ -37,6 +37,7 @@ var (
 	ErrWireguardEndpointIPNotSet       = errors.New("endpoint IP is not set")
 	ErrWireguardEndpointPortNotAllowed = errors.New("endpoint port is not allowed")
 	ErrWireguardEndpointPortNotSet     = errors.New("endpoint port is not set")
+	ErrWireguardEndpointPortSet        = errors.New("endpoint port is set")
 	ErrWireguardInterfaceAddressNotSet = errors.New("interface address is not set")
 	ErrWireguardInterfaceNotValid      = errors.New("interface name is not valid")
 	ErrWireguardPreSharedKeyNotSet     = errors.New("pre-shared key is not set")
--- a/internal/configuration/settings/openvpn.go
+++ b/internal/configuration/settings/openvpn.go
@@ -65,10 +65,6 @@ type OpenVPN struct {
 	// Private Internet Access. It can be set to an
 	// empty string for other providers.
 	PIAEncPreset *string
-	// IPv6 is set to true if IPv6 routing should be
-	// set to be tunnel in OpenVPN, and false otherwise.
-	// It cannot be nil in the internal state.
-	IPv6 *bool // TODO automate like with Wireguard
 	// MSSFix is the value (1 to 10000) to set for the
 	// mssfix option for OpenVPN. It is ignored if set to 0.
 	// It cannot be nil in the internal state.
@@ -99,12 +95,15 @@ func (o OpenVPN) validate(vpnProvider string) (err error) {
 	}

 	isCustom := vpnProvider == providers.Custom
+	isUserRequired := !isCustom &&
+		vpnProvider != providers.Airvpn &&
+		vpnProvider != providers.VPNSecure

-	if !isCustom && *o.User == "" {
+	if isUserRequired && *o.User == "" {
 		return ErrOpenVPNUserIsEmpty
 	}

-	passwordRequired := !isCustom &&
+	passwordRequired := isUserRequired &&
 		(vpnProvider != providers.Ivpn || !ivpnAccountID.MatchString(*o.User))

 	if passwordRequired && *o.Password == "" {
@@ -182,6 +181,7 @@ func validateOpenVPNClientCertificate(vpnProvider,
 	clientCert string) (err error) {
 	switch vpnProvider {
 	case
+		providers.Airvpn,
 		providers.Cyberghost,
 		providers.VPNSecure,
 		providers.VPNUnlimited:
@@ -204,6 +204,7 @@ func validateOpenVPNClientCertificate(vpnProvider,
 func validateOpenVPNClientKey(vpnProvider, clientKey string) (err error) {
 	switch vpnProvider {
 	case
+		providers.Airvpn,
 		providers.Cyberghost,
 		providers.VPNUnlimited,
 		providers.Wevpn:
@@ -253,7 +254,6 @@ func (o *OpenVPN) copy() (copied OpenVPN) {
 		EncryptedKey:  helpers.CopyStringPtr(o.EncryptedKey),
 		KeyPassphrase: helpers.CopyStringPtr(o.KeyPassphrase),
 		PIAEncPreset:  helpers.CopyStringPtr(o.PIAEncPreset),
-		IPv6:          helpers.CopyBoolPtr(o.IPv6),
 		MSSFix:        helpers.CopyUint16Ptr(o.MSSFix),
 		Interface:     o.Interface,
 		ProcessUser:   o.ProcessUser,
@@ -276,7 +276,6 @@ func (o *OpenVPN) mergeWith(other OpenVPN) {
 	o.EncryptedKey = helpers.MergeWithStringPtr(o.EncryptedKey, other.EncryptedKey)
 	o.KeyPassphrase = helpers.MergeWithStringPtr(o.KeyPassphrase, other.KeyPassphrase)
 	o.PIAEncPreset = helpers.MergeWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
-	o.IPv6 = helpers.MergeWithBool(o.IPv6, other.IPv6)
 	o.MSSFix = helpers.MergeWithUint16(o.MSSFix, other.MSSFix)
 	o.Interface = helpers.MergeWithString(o.Interface, other.Interface)
 	o.ProcessUser = helpers.MergeWithString(o.ProcessUser, other.ProcessUser)
@@ -299,7 +298,6 @@ func (o *OpenVPN) overrideWith(other OpenVPN) {
 	o.EncryptedKey = helpers.OverrideWithStringPtr(o.EncryptedKey, other.EncryptedKey)
 	o.KeyPassphrase = helpers.OverrideWithStringPtr(o.KeyPassphrase, other.KeyPassphrase)
 	o.PIAEncPreset = helpers.OverrideWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
-	o.IPv6 = helpers.OverrideWithBool(o.IPv6, other.IPv6)
 	o.MSSFix = helpers.OverrideWithUint16(o.MSSFix, other.MSSFix)
 	o.Interface = helpers.OverrideWithString(o.Interface, other.Interface)
 	o.ProcessUser = helpers.OverrideWithString(o.ProcessUser, other.ProcessUser)
@@ -328,8 +326,6 @@ func (o *OpenVPN) setDefaults(vpnProvider string) {
 		defaultEncPreset = presets.Strong
 	}
 	o.PIAEncPreset = helpers.DefaultStringPtr(o.PIAEncPreset, defaultEncPreset)
-
-	o.IPv6 = helpers.DefaultBool(o.IPv6, false)
 	o.MSSFix = helpers.DefaultUint16(o.MSSFix, 0)
 	o.Interface = helpers.DefaultString(o.Interface, "tun0")
 	o.ProcessUser = helpers.DefaultString(o.ProcessUser, "root")
@@ -375,8 +371,6 @@ func (o OpenVPN) toLinesNode() (node *gotree.Node) {
 		node.Appendf("Private Internet Access encryption preset: %s", *o.PIAEncPreset)
 	}

-	node.Appendf("Tunnel IPv6: %s", helpers.BoolPtrToYesNo(o.IPv6))
-
 	if *o.MSSFix > 0 {
 		node.Appendf("MSS Fix: %d", *o.MSSFix)
 	}
--- a/internal/configuration/settings/openvpnselection.go
+++ b/internal/configuration/settings/openvpnselection.go
@@ -67,6 +67,12 @@ func (o OpenVPNSelection) validate(vpnProvider string) (err error) {
 		default:
 			var allowedTCP, allowedUDP []uint16
 			switch vpnProvider {
+			case providers.Airvpn:
+				allowedTCP = []uint16{
+					53, 80, 443, // IP in 1, 3
+					1194, 2018, 41185, // IP in 1, 2, 3, 4
+				}
+				allowedUDP = []uint16{53, 80, 443, 1194, 2018, 41185}
 			case providers.Ivpn:
 				allowedTCP = []uint16{80, 443, 1143}
 				allowedUDP = []uint16{53, 1194, 2049, 2050}
--- a/internal/configuration/settings/provider.go
+++ b/internal/configuration/settings/provider.go
@@ -30,9 +30,11 @@ func (p *Provider) validate(vpnType string, storage Storage) (err error) {
 		validNames = append(validNames, "pia") // Retro-compatibility
 	} else { // Wireguard
 		validNames = []string{
+			providers.Airvpn,
 			providers.Custom,
 			providers.Ivpn,
 			providers.Mullvad,
+			providers.Surfshark,
 			providers.Windscribe,
 		}
 	}
--- a/internal/configuration/settings/settings_test.go
+++ b/internal/configuration/settings/settings_test.go
@@ -34,7 +34,6 @@ func Test_Settings_String(t *testing.T) {
 |       ├── User: [not set]
 |       ├── Password: [not set]
 |       ├── Private Internet Access encryption preset: strong
-|       ├── Tunnel IPv6: no
 |       ├── Network interface: tun0
 |       ├── Run OpenVPN as: root
 |       └── Verbosity level: 1
--- a/internal/configuration/settings/wireguard.go
+++ b/internal/configuration/settings/wireguard.go
@@ -38,6 +38,7 @@ func (w Wireguard) validate(vpnProvider string) (err error) {
 		providers.Custom,
 		providers.Ivpn,
 		providers.Mullvad,
+		providers.Surfshark,
 		providers.Windscribe,
 	) {
 		// do not validate for VPN provider not supporting Wireguard
@@ -53,6 +54,12 @@ func (w Wireguard) validate(vpnProvider string) (err error) {
 		return fmt.Errorf("private key is not valid: %w", err)
 	}

+	if vpnProvider == providers.Airvpn {
+		if *w.PreSharedKey == "" {
+			return fmt.Errorf("%w", ErrWireguardPreSharedKeyNotSet)
+		}
+	}
+
 	// Validate PreSharedKey
 	if *w.PreSharedKey != "" { // Note: this is optional
 		_, err = wgtypes.ParseKey(*w.PreSharedKey)
--- a/internal/configuration/settings/wireguardselection.go
+++ b/internal/configuration/settings/wireguardselection.go
@@ -19,7 +19,7 @@ type WireguardSelection struct {
 	// in the internal state.
 	EndpointIP net.IP
 	// EndpointPort is a the server port to use for the VPN server.
-	// It is optional for VPN providers IVPN, Mullvad
+	// It is optional for VPN providers IVPN, Mullvad, Surfshark
 	// and Windscribe, and compulsory for the others.
 	// When optional, it can be set to 0 to indicate not use
 	// a custom endpoint port. It cannot be nil in the internal
@@ -36,7 +36,9 @@ type WireguardSelection struct {
 func (w WireguardSelection) validate(vpnProvider string) (err error) {
 	// Validate EndpointIP
 	switch vpnProvider {
-	case providers.Ivpn, providers.Mullvad, providers.Windscribe: // endpoint IP addresses are baked in
+	case providers.Airvpn, providers.Ivpn, providers.Mullvad,
+		providers.Surfshark, providers.Windscribe:
+		// endpoint IP addresses are baked in
 	case providers.Custom:
 		if len(w.EndpointIP) == 0 {
 			return ErrWireguardEndpointIPNotSet
@@ -51,7 +53,12 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 		if *w.EndpointPort == 0 {
 			return ErrWireguardEndpointPortNotSet
 		}
-	case providers.Ivpn, providers.Mullvad, providers.Windscribe:
+	// EndpointPort cannot be set
+	case providers.Surfshark:
+		if *w.EndpointPort != 0 {
+			return ErrWireguardEndpointPortSet
+		}
+	case providers.Airvpn, providers.Ivpn, providers.Mullvad, providers.Windscribe:
 		// EndpointPort is optional and can be 0
 		if *w.EndpointPort == 0 {
 			break // no custom endpoint port set
@@ -61,6 +68,8 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 		}
 		var allowed []uint16
 		switch vpnProvider {
+		case providers.Airvpn:
+			allowed = []uint16{1637, 47107}
 		case providers.Ivpn:
 			allowed = []uint16{2049, 2050, 53, 30587, 41893, 48574, 58237}
 		case providers.Windscribe:
@@ -78,7 +87,9 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {

 	// Validate PublicKey
 	switch vpnProvider {
-	case providers.Ivpn, providers.Mullvad, providers.Windscribe: // public keys are baked in
+	case providers.Ivpn, providers.Mullvad,
+		providers.Surfshark, providers.Windscribe:
+		// public keys are baked in
 	case providers.Custom:
 		if w.PublicKey == "" {
 			return ErrWireguardPublicKeyNotSet
--- a/internal/configuration/sources/env/dns.go
+++ b/internal/configuration/sources/env/dns.go
@@ -7,8 +7,8 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readDNS() (dns settings.DNS, err error) {
-	dns.ServerAddress, err = r.readDNSServerAddress()
+func (s *Source) readDNS() (dns settings.DNS, err error) {
+	dns.ServerAddress, err = s.readDNSServerAddress()
 	if err != nil {
 		return dns, err
 	}
@@ -18,7 +18,7 @@ func (r *Reader) readDNS() (dns settings.DNS, err error) {
 		return dns, fmt.Errorf("environment variable DNS_KEEP_NAMESERVER: %w", err)
 	}

-	dns.DoT, err = r.readDoT()
+	dns.DoT, err = s.readDoT()
 	if err != nil {
 		return dns, fmt.Errorf("DoT settings: %w", err)
 	}
@@ -26,22 +26,22 @@ func (r *Reader) readDNS() (dns settings.DNS, err error) {
 	return dns, nil
 }

-func (r *Reader) readDNSServerAddress() (address net.IP, err error) {
-	key, s := r.getEnvWithRetro("DNS_ADDRESS", "DNS_PLAINTEXT_ADDRESS")
-	if s == "" {
+func (s *Source) readDNSServerAddress() (address net.IP, err error) {
+	key, value := s.getEnvWithRetro("DNS_ADDRESS", "DNS_PLAINTEXT_ADDRESS")
+	if value == "" {
 		return nil, nil
 	}

-	address = net.ParseIP(s)
+	address = net.ParseIP(value)
 	if address == nil {
-		return nil, fmt.Errorf("environment variable %s: %w: %s", key, ErrIPAddressParse, s)
+		return nil, fmt.Errorf("environment variable %s: %w: %s", key, ErrIPAddressParse, value)
 	}

 	// TODO remove in v4
 	if !address.Equal(net.IPv4(127, 0, 0, 1)) { //nolint:gomnd
-		r.warner.Warn(key + " is set to " + s +
+		s.warner.Warn(key + " is set to " + value +
 			" so the DNS over TLS (DoT) server will not be used." +
-			" The default value changed to 127.0.0.1 so it uses the internal DoT server." +
+			" The default value changed to 127.0.0.1 so it uses the internal DoT serves." +
 			" If the DoT server fails to start, the IPv4 address of the first plaintext DNS server" +
 			" corresponding to the first DoT provider chosen is used.")
 	}
--- a/internal/configuration/sources/env/dnsblacklist.go
+++ b/internal/configuration/sources/env/dnsblacklist.go
@@ -9,13 +9,13 @@ import (
 	"inet.af/netaddr"
 )

-func (r *Reader) readDNSBlacklist() (blacklist settings.DNSBlacklist, err error) {
+func (s *Source) readDNSBlacklist() (blacklist settings.DNSBlacklist, err error) {
 	blacklist.BlockMalicious, err = envToBoolPtr("BLOCK_MALICIOUS")
 	if err != nil {
 		return blacklist, fmt.Errorf("environment variable BLOCK_MALICIOUS: %w", err)
 	}

-	blacklist.BlockSurveillance, err = r.readBlockSurveillance()
+	blacklist.BlockSurveillance, err = s.readBlockSurveillance()
 	if err != nil {
 		return blacklist, err
 	}
@@ -36,8 +36,8 @@ func (r *Reader) readDNSBlacklist() (blacklist settings.DNSBlacklist, err error)
 	return blacklist, nil
 }

-func (r *Reader) readBlockSurveillance() (blocked *bool, err error) {
-	key, value := r.getEnvWithRetro("BLOCK_SURVEILLANCE", "BLOCK_NSA")
+func (s *Source) readBlockSurveillance() (blocked *bool, err error) {
+	key, value := s.getEnvWithRetro("BLOCK_SURVEILLANCE", "BLOCK_NSA")
 	if value == "" {
 		return nil, nil //nolint:nilnil
 	}
--- a/internal/configuration/sources/env/dot.go
+++ b/internal/configuration/sources/env/dot.go
@@ -6,7 +6,7 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readDoT() (dot settings.DoT, err error) {
+func (s *Source) readDoT() (dot settings.DoT, err error) {
 	dot.Enabled, err = envToBoolPtr("DOT")
 	if err != nil {
 		return dot, fmt.Errorf("environment variable DOT: %w", err)
@@ -22,7 +22,7 @@ func (r *Reader) readDoT() (dot settings.DoT, err error) {
 		return dot, err
 	}

-	dot.Blacklist, err = r.readDNSBlacklist()
+	dot.Blacklist, err = s.readDNSBlacklist()
 	if err != nil {
 		return dot, err
 	}
--- a/internal/configuration/sources/env/firewall.go
+++ b/internal/configuration/sources/env/firewall.go
@@ -9,7 +9,7 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readFirewall() (firewall settings.Firewall, err error) {
+func (s *Source) readFirewall() (firewall settings.Firewall, err error) {
 	vpnInputPortStrings := envToCSV("FIREWALL_VPN_INPUT_PORTS")
 	firewall.VPNInputPorts, err = stringsToPorts(vpnInputPortStrings)
 	if err != nil {
@@ -22,7 +22,7 @@ func (r *Reader) readFirewall() (firewall settings.Firewall, err error) {
 		return firewall, fmt.Errorf("environment variable FIREWALL_INPUT_PORTS: %w", err)
 	}

-	outboundSubnetsKey, _ := r.getEnvWithRetro("FIREWALL_OUTBOUND_SUBNETS", "EXTRA_SUBNETS")
+	outboundSubnetsKey, _ := s.getEnvWithRetro("FIREWALL_OUTBOUND_SUBNETS", "EXTRA_SUBNETS")
 	outboundSubnetStrings := envToCSV(outboundSubnetsKey)
 	firewall.OutboundSubnets, err = stringsToIPNets(outboundSubnetStrings)
 	if err != nil {
--- a/internal/configuration/sources/env/health.go
+++ b/internal/configuration/sources/env/health.go
@@ -7,18 +7,18 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) ReadHealth() (health settings.Health, err error) {
+func (s *Source) ReadHealth() (health settings.Health, err error) {
 	health.ServerAddress = getCleanedEnv("HEALTH_SERVER_ADDRESS")
-	_, health.TargetAddress = r.getEnvWithRetro("HEALTH_TARGET_ADDRESS", "HEALTH_ADDRESS_TO_PING")
+	_, health.TargetAddress = s.getEnvWithRetro("HEALTH_TARGET_ADDRESS", "HEALTH_ADDRESS_TO_PING")

-	health.VPN.Initial, err = r.readDurationWithRetro(
+	health.VPN.Initial, err = s.readDurationWithRetro(
 		"HEALTH_VPN_DURATION_INITIAL",
 		"HEALTH_OPENVPN_DURATION_INITIAL")
 	if err != nil {
 		return health, err
 	}

-	health.VPN.Addition, err = r.readDurationWithRetro(
+	health.VPN.Addition, err = s.readDurationWithRetro(
 		"HEALTH_VPN_DURATION_ADDITION",
 		"HEALTH_OPENVPN_DURATION_ADDITION")
 	if err != nil {
@@ -28,14 +28,14 @@ func (r *Reader) ReadHealth() (health settings.Health, err error) {
 	return health, nil
 }

-func (r *Reader) readDurationWithRetro(envKey, retroEnvKey string) (d *time.Duration, err error) {
-	envKey, s := r.getEnvWithRetro(envKey, retroEnvKey)
-	if s == "" {
+func (s *Source) readDurationWithRetro(envKey, retroEnvKey string) (d *time.Duration, err error) {
+	envKey, value := s.getEnvWithRetro(envKey, retroEnvKey)
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}

 	d = new(time.Duration)
-	*d, err = time.ParseDuration(s)
+	*d, err = time.ParseDuration(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", envKey, err)
 	}
--- a/internal/configuration/sources/env/httproxy.go
+++ b/internal/configuration/sources/env/httproxy.go
@@ -7,12 +7,12 @@ import (
 	"github.com/qdm12/govalid/binary"
 )

-func (r *Reader) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
-	httpProxy.User = r.readHTTProxyUser()
-	httpProxy.Password = r.readHTTProxyPassword()
-	httpProxy.ListeningAddress = r.readHTTProxyListeningAddress()
+func (s *Source) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
+	httpProxy.User = s.readHTTProxyUser()
+	httpProxy.Password = s.readHTTProxyPassword()
+	httpProxy.ListeningAddress = s.readHTTProxyListeningAddress()

-	httpProxy.Enabled, err = r.readHTTProxyEnabled()
+	httpProxy.Enabled, err = s.readHTTProxyEnabled()
 	if err != nil {
 		return httpProxy, err
 	}
@@ -22,7 +22,7 @@ func (r *Reader) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
 		return httpProxy, fmt.Errorf("environment variable HTTPPROXY_STEALTH: %w", err)
 	}

-	httpProxy.Log, err = r.readHTTProxyLog()
+	httpProxy.Log, err = s.readHTTProxyLog()
 	if err != nil {
 		return httpProxy, err
 	}
@@ -30,38 +30,38 @@ func (r *Reader) readHTTPProxy() (httpProxy settings.HTTPProxy, err error) {
 	return httpProxy, nil
 }

-func (r *Reader) readHTTProxyUser() (user *string) {
-	_, s := r.getEnvWithRetro("HTTPPROXY_USER", "PROXY_USER", "TINYPROXY_USER")
-	if s != "" {
-		return &s
+func (s *Source) readHTTProxyUser() (user *string) {
+	_, value := s.getEnvWithRetro("HTTPPROXY_USER", "PROXY_USER", "TINYPROXY_USER")
+	if value != "" {
+		return &value
 	}
 	return nil
 }

-func (r *Reader) readHTTProxyPassword() (user *string) {
-	_, s := r.getEnvWithRetro("HTTPPROXY_PASSWORD", "PROXY_PASSWORD", "TINYPROXY_PASSWORD")
-	if s != "" {
-		return &s
+func (s *Source) readHTTProxyPassword() (user *string) {
+	_, value := s.getEnvWithRetro("HTTPPROXY_PASSWORD", "PROXY_PASSWORD", "TINYPROXY_PASSWORD")
+	if value != "" {
+		return &value
 	}
 	return nil
 }

-func (r *Reader) readHTTProxyListeningAddress() (listeningAddress string) {
-	key, value := r.getEnvWithRetro("HTTPPROXY_LISTENING_ADDRESS", "PROXY_PORT", "TINYPROXY_PORT", "HTTPPROXY_PORT")
+func (s *Source) readHTTProxyListeningAddress() (listeningAddress string) {
+	key, value := s.getEnvWithRetro("HTTPPROXY_LISTENING_ADDRESS", "PROXY_PORT", "TINYPROXY_PORT", "HTTPPROXY_PORT")
 	if key == "HTTPPROXY_LISTENING_ADDRESS" {
 		return value
 	}
 	return ":" + value
 }

-func (r *Reader) readHTTProxyEnabled() (enabled *bool, err error) {
-	key, s := r.getEnvWithRetro("HTTPPROXY", "PROXY", "TINYPROXY")
-	if s == "" {
+func (s *Source) readHTTProxyEnabled() (enabled *bool, err error) {
+	key, value := s.getEnvWithRetro("HTTPPROXY", "PROXY", "TINYPROXY")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}

 	enabled = new(bool)
-	*enabled, err = binary.Validate(s)
+	*enabled, err = binary.Validate(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}
@@ -69,9 +69,9 @@ func (r *Reader) readHTTProxyEnabled() (enabled *bool, err error) {
 	return enabled, nil
 }

-func (r *Reader) readHTTProxyLog() (enabled *bool, err error) {
-	key, s := r.getEnvWithRetro("HTTPPROXY_LOG", "PROXY_LOG_LEVEL", "TINYPROXY_LOG")
-	if s == "" {
+func (s *Source) readHTTProxyLog() (enabled *bool, err error) {
+	key, value := s.getEnvWithRetro("HTTPPROXY_LOG", "PROXY_LOG_LEVEL", "TINYPROXY_LOG")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}

@@ -82,7 +82,7 @@ func (r *Reader) readHTTProxyLog() (enabled *bool, err error) {
 	}

 	enabled = new(bool)
-	*enabled, err = binary.Validate(s, binaryOptions...)
+	*enabled, err = binary.Validate(value, binaryOptions...)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}
--- a/internal/configuration/sources/env/openvpn.go
+++ b/internal/configuration/sources/env/openvpn.go
@@ -8,7 +8,7 @@ import (
 	"github.com/qdm12/govalid/binary"
 )

-func (r *Reader) readOpenVPN() (
+func (s *Source) readOpenVPN() (
 	openVPN settings.OpenVPN, err error) {
 	defer func() {
 		err = unsetEnvKeys([]string{"OPENVPN_KEY", "OPENVPN_CERT",
@@ -16,14 +16,14 @@ func (r *Reader) readOpenVPN() (
 	}()

 	openVPN.Version = getCleanedEnv("OPENVPN_VERSION")
-	openVPN.User = r.readOpenVPNUser()
-	openVPN.Password = r.readOpenVPNPassword()
+	openVPN.User = s.readOpenVPNUser()
+	openVPN.Password = s.readOpenVPNPassword()
 	confFile := getCleanedEnv("OPENVPN_CUSTOM_CONFIG")
 	if confFile != "" {
 		openVPN.ConfFile = &confFile
 	}

-	ciphersKey, _ := r.getEnvWithRetro("OPENVPN_CIPHERS", "OPENVPN_CIPHER")
+	ciphersKey, _ := s.getEnvWithRetro("OPENVPN_CIPHERS", "OPENVPN_CIPHER")
 	openVPN.Ciphers = envToCSV(ciphersKey)

 	auth := getCleanedEnv("OPENVPN_AUTH")
@@ -35,23 +35,18 @@ func (r *Reader) readOpenVPN() (
 	openVPN.Key = envToStringPtr("OPENVPN_KEY")
 	openVPN.EncryptedKey = envToStringPtr("OPENVPN_ENCRYPTED_KEY")

-	openVPN.KeyPassphrase = r.readOpenVPNKeyPassphrase()
+	openVPN.KeyPassphrase = s.readOpenVPNKeyPassphrase()

-	openVPN.PIAEncPreset = r.readPIAEncryptionPreset()
-
-	openVPN.IPv6, err = envToBoolPtr("OPENVPN_IPV6")
-	if err != nil {
-		return openVPN, fmt.Errorf("environment variable OPENVPN_IPV6: %w", err)
-	}
+	openVPN.PIAEncPreset = s.readPIAEncryptionPreset()

 	openVPN.MSSFix, err = envToUint16Ptr("OPENVPN_MSSFIX")
 	if err != nil {
 		return openVPN, fmt.Errorf("environment variable OPENVPN_MSSFIX: %w", err)
 	}

-	_, openVPN.Interface = r.getEnvWithRetro("VPN_INTERFACE", "OPENVPN_INTERFACE")
+	_, openVPN.Interface = s.getEnvWithRetro("VPN_INTERFACE", "OPENVPN_INTERFACE")

-	openVPN.ProcessUser, err = r.readOpenVPNProcessUser()
+	openVPN.ProcessUser, err = s.readOpenVPNProcessUser()
 	if err != nil {
 		return openVPN, err
 	}
@@ -69,9 +64,9 @@ func (r *Reader) readOpenVPN() (
 	return openVPN, nil
 }

-func (r *Reader) readOpenVPNUser() (user *string) {
+func (s *Source) readOpenVPNUser() (user *string) {
 	user = new(string)
-	_, *user = r.getEnvWithRetro("OPENVPN_USER", "USER")
+	_, *user = s.getEnvWithRetro("OPENVPN_USER", "USER")
 	if *user == "" {
 		return nil
 	}
@@ -81,9 +76,9 @@ func (r *Reader) readOpenVPNUser() (user *string) {
 	return user
 }

-func (r *Reader) readOpenVPNPassword() (password *string) {
+func (s *Source) readOpenVPNPassword() (password *string) {
 	password = new(string)
-	_, *password = r.getEnvWithRetro("OPENVPN_PASSWORD", "PASSWORD")
+	_, *password = s.getEnvWithRetro("OPENVPN_PASSWORD", "PASSWORD")
 	if *password == "" {
 		return nil
 	}
@@ -91,7 +86,7 @@ func (r *Reader) readOpenVPNPassword() (password *string) {
 	return password
 }

-func (r *Reader) readOpenVPNKeyPassphrase() (passphrase *string) {
+func (s *Source) readOpenVPNKeyPassphrase() (passphrase *string) {
 	passphrase = new(string)
 	*passphrase = getCleanedEnv("OPENVPN_KEY_PASSPHRASE")
 	if *passphrase == "" {
@@ -100,8 +95,8 @@ func (r *Reader) readOpenVPNKeyPassphrase() (passphrase *string) {
 	return passphrase
 }

-func (r *Reader) readPIAEncryptionPreset() (presetPtr *string) {
-	_, preset := r.getEnvWithRetro(
+func (s *Source) readPIAEncryptionPreset() (presetPtr *string) {
+	_, preset := s.getEnvWithRetro(
 		"PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET",
 		"PIA_ENCRYPTION", "ENCRYPTION")
 	if preset != "" {
@@ -110,8 +105,8 @@ func (r *Reader) readPIAEncryptionPreset() (presetPtr *string) {
 	return nil
 }

-func (r *Reader) readOpenVPNProcessUser() (processUser string, err error) {
-	key, value := r.getEnvWithRetro("OPENVPN_PROCESS_USER", "OPENVPN_ROOT")
+func (s *Source) readOpenVPNProcessUser() (processUser string, err error) {
+	key, value := s.getEnvWithRetro("OPENVPN_PROCESS_USER", "OPENVPN_ROOT")
 	if key == "OPENVPN_PROCESS_USER" {
 		return value, nil
 	}
--- a/internal/configuration/sources/env/openvpnselection.go
+++ b/internal/configuration/sources/env/openvpnselection.go
@@ -10,32 +10,32 @@ import (
 	"github.com/qdm12/govalid/port"
 )

-func (r *Reader) readOpenVPNSelection() (
+func (s *Source) readOpenVPNSelection() (
 	selection settings.OpenVPNSelection, err error) {
 	confFile := getCleanedEnv("OPENVPN_CUSTOM_CONFIG")
 	if confFile != "" {
 		selection.ConfFile = &confFile
 	}

-	selection.TCP, err = r.readOpenVPNProtocol()
+	selection.TCP, err = s.readOpenVPNProtocol()
 	if err != nil {
 		return selection, err
 	}

-	selection.CustomPort, err = r.readOpenVPNCustomPort()
+	selection.CustomPort, err = s.readOpenVPNCustomPort()
 	if err != nil {
 		return selection, err
 	}

-	selection.PIAEncPreset = r.readPIAEncryptionPreset()
+	selection.PIAEncPreset = s.readPIAEncryptionPreset()

 	return selection, nil
 }

 var ErrOpenVPNProtocolNotValid = errors.New("OpenVPN protocol is not valid")

-func (r *Reader) readOpenVPNProtocol() (tcp *bool, err error) {
-	envKey, protocol := r.getEnvWithRetro("OPENVPN_PROTOCOL", "PROTOCOL")
+func (s *Source) readOpenVPNProtocol() (tcp *bool, err error) {
+	envKey, protocol := s.getEnvWithRetro("OPENVPN_PROTOCOL", "PROTOCOL")

 	switch strings.ToLower(protocol) {
 	case "":
@@ -50,14 +50,14 @@ func (r *Reader) readOpenVPNProtocol() (tcp *bool, err error) {
 	}
 }

-func (r *Reader) readOpenVPNCustomPort() (customPort *uint16, err error) {
-	key, s := r.getEnvWithRetro("VPN_ENDPOINT_PORT", "PORT", "OPENVPN_PORT")
-	if s == "" {
+func (s *Source) readOpenVPNCustomPort() (customPort *uint16, err error) {
+	key, value := s.getEnvWithRetro("VPN_ENDPOINT_PORT", "PORT", "OPENVPN_PORT")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}

 	customPort = new(uint16)
-	*customPort, err = port.Validate(s)
+	*customPort, err = port.Validate(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}
--- a/internal/configuration/sources/env/portforward.go
+++ b/internal/configuration/sources/env/portforward.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readPortForward() (
+func (s *Source) readPortForward() (
 	portForwarding settings.PortForwarding, err error) {
-	key, _ := r.getEnvWithRetro(
+	key, _ := s.getEnvWithRetro(
 		"PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING",
 		"PORT_FORWARDING")
 	portForwarding.Enabled, err = envToBoolPtr(key)
@@ -16,7 +16,7 @@ func (r *Reader) readPortForward() (
 		return portForwarding, fmt.Errorf("environment variable %s: %w", key, err)
 	}

-	_, value := r.getEnvWithRetro(
+	_, value := s.getEnvWithRetro(
 		"PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE",
 		"PORT_FORWARDING_STATUS_FILE")
 	if value != "" {
--- a/internal/configuration/sources/env/provider.go
+++ b/internal/configuration/sources/env/provider.go
@@ -9,19 +9,19 @@ import (
 	"github.com/qdm12/gluetun/internal/constants/vpn"
 )

-func (r *Reader) readProvider(vpnType string) (provider settings.Provider, err error) {
-	provider.Name = r.readVPNServiceProvider(vpnType)
+func (s *Source) readProvider(vpnType string) (provider settings.Provider, err error) {
+	provider.Name = s.readVPNServiceProvider(vpnType)
 	var providerName string
 	if provider.Name != nil {
 		providerName = *provider.Name
 	}

-	provider.ServerSelection, err = r.readServerSelection(providerName, vpnType)
+	provider.ServerSelection, err = s.readServerSelection(providerName, vpnType)
 	if err != nil {
 		return provider, fmt.Errorf("server selection: %w", err)
 	}

-	provider.PortForwarding, err = r.readPortForward()
+	provider.PortForwarding, err = s.readPortForward()
 	if err != nil {
 		return provider, fmt.Errorf("port forwarding: %w", err)
 	}
@@ -29,17 +29,20 @@ func (r *Reader) readProvider(vpnType string) (provider settings.Provider, err e
 	return provider, nil
 }

-func (r *Reader) readVPNServiceProvider(vpnType string) (vpnProviderPtr *string) {
-	_, s := r.getEnvWithRetro("VPN_SERVICE_PROVIDER", "VPNSP")
-	s = strings.ToLower(s)
-	switch {
-	case vpnType != vpn.Wireguard &&
-		getCleanedEnv("OPENVPN_CUSTOM_CONFIG") != "": // retro compatibility
-		return stringPtr(providers.Custom)
-	case s == "":
+func (s *Source) readVPNServiceProvider(vpnType string) (vpnProviderPtr *string) {
+	_, value := s.getEnvWithRetro("VPN_SERVICE_PROVIDER", "VPNSP")
+	if value == "" {
+		if vpnType != vpn.Wireguard && getCleanedEnv("OPENVPN_CUSTOM_CONFIG") != "" {
+			// retro compatibility
+			return stringPtr(providers.Custom)
+		}
 		return nil
-	case s == "pia": // retro compatibility
+	}
+
+	value = strings.ToLower(value)
+	if value == "pia" { // retro compatibility
 		return stringPtr(providers.PrivateInternetAccess)
 	}
-	return stringPtr(s)
+
+	return stringPtr(value)
 }
--- a/internal/configuration/sources/env/publicip.go
+++ b/internal/configuration/sources/env/publicip.go
@@ -7,13 +7,13 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readPublicIP() (publicIP settings.PublicIP, err error) {
+func (s *Source) readPublicIP() (publicIP settings.PublicIP, err error) {
 	publicIP.Period, err = readPublicIPPeriod()
 	if err != nil {
 		return publicIP, err
 	}

-	publicIP.IPFilepath = r.readPublicIPFilepath()
+	publicIP.IPFilepath = s.readPublicIPFilepath()

 	return publicIP, nil
 }
@@ -33,10 +33,10 @@ func readPublicIPPeriod() (period *time.Duration, err error) {
 	return period, nil
 }

-func (r *Reader) readPublicIPFilepath() (filepath *string) {
-	_, s := r.getEnvWithRetro("PUBLICIP_FILE", "IP_STATUS_FILE")
-	if s != "" {
-		return &s
+func (s *Source) readPublicIPFilepath() (filepath *string) {
+	_, value := s.getEnvWithRetro("PUBLICIP_FILE", "IP_STATUS_FILE")
+	if value != "" {
+		return &value
 	}
 	return nil
 }
--- a/internal/configuration/sources/env/reader.go
+++ b/internal/configuration/sources/env/reader.go
@@ -2,12 +2,9 @@ package env

 import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 )

-var _ sources.Source = (*Reader)(nil)
-
-type Reader struct {
+type Source struct {
 	warner Warner
 }

@@ -15,36 +12,36 @@ type Warner interface {
 	Warn(s string)
 }

-func New(warner Warner) *Reader {
-	return &Reader{
+func New(warner Warner) *Source {
+	return &Source{
 		warner: warner,
 	}
 }

-func (r *Reader) String() string { return "environment variables" }
+func (s *Source) String() string { return "environment variables" }

-func (r *Reader) Read() (settings settings.Settings, err error) {
-	settings.VPN, err = r.readVPN()
+func (s *Source) Read() (settings settings.Settings, err error) {
+	settings.VPN, err = s.readVPN()
 	if err != nil {
 		return settings, err
 	}

-	settings.Firewall, err = r.readFirewall()
+	settings.Firewall, err = s.readFirewall()
 	if err != nil {
 		return settings, err
 	}

-	settings.System, err = r.readSystem()
+	settings.System, err = s.readSystem()
 	if err != nil {
 		return settings, err
 	}

-	settings.Health, err = r.ReadHealth()
+	settings.Health, err = s.ReadHealth()
 	if err != nil {
 		return settings, err
 	}

-	settings.HTTPProxy, err = r.readHTTPProxy()
+	settings.HTTPProxy, err = s.readHTTPProxy()
 	if err != nil {
 		return settings, err
 	}
@@ -54,7 +51,7 @@ func (r *Reader) Read() (settings settings.Settings, err error) {
 		return settings, err
 	}

-	settings.PublicIP, err = r.readPublicIP()
+	settings.PublicIP, err = s.readPublicIP()
 	if err != nil {
 		return settings, err
 	}
@@ -69,17 +66,17 @@ func (r *Reader) Read() (settings settings.Settings, err error) {
 		return settings, err
 	}

-	settings.Shadowsocks, err = r.readShadowsocks()
+	settings.Shadowsocks, err = s.readShadowsocks()
 	if err != nil {
 		return settings, err
 	}

-	settings.DNS, err = r.readDNS()
+	settings.DNS, err = s.readDNS()
 	if err != nil {
 		return settings, err
 	}

-	settings.ControlServer, err = r.readControlServer()
+	settings.ControlServer, err = s.readControlServer()
 	if err != nil {
 		return settings, err
 	}
@@ -92,8 +89,8 @@ func (r *Reader) Read() (settings settings.Settings, err error) {
 	return settings, nil
 }

-func (r *Reader) onRetroActive(oldKey, newKey string) {
-	r.warner.Warn(
+func (s *Source) onRetroActive(oldKey, newKey string) {
+	s.warner.Warn(
 		"You are using the old environment variable " + oldKey +
 			", please consider changing it to " + newKey)
 }
@@ -104,14 +101,14 @@ func (r *Reader) onRetroActive(oldKey, newKey string) {
 // and end on returning the value corresponding to the currentKey.
 // Note retroKeys should be in order from oldest to most
 // recent retro-compatibility key.
-func (r *Reader) getEnvWithRetro(currentKey string,
+func (s *Source) getEnvWithRetro(currentKey string,
 	retroKeys ...string) (key, value string) {
 	// We check retro-compatibility keys first since
 	// the current key might be set in the Dockerfile.
 	for _, key = range retroKeys {
 		value = getCleanedEnv(key)
 		if value != "" {
-			r.onRetroActive(key, currentKey)
+			s.onRetroActive(key, currentKey)
 			return key, value
 		}
 	}
--- a/internal/configuration/sources/env/server.go
+++ b/internal/configuration/sources/env/server.go
@@ -7,13 +7,13 @@ import (
 	"github.com/qdm12/govalid/binary"
 )

-func (r *Reader) readControlServer() (controlServer settings.ControlServer, err error) {
+func (s *Source) readControlServer() (controlServer settings.ControlServer, err error) {
 	controlServer.Log, err = readControlServerLog()
 	if err != nil {
 		return controlServer, err
 	}

-	controlServer.Address = r.readControlServerAddress()
+	controlServer.Address = s.readControlServerAddress()

 	return controlServer, nil
 }
@@ -32,17 +32,17 @@ func readControlServerLog() (enabled *bool, err error) {
 	return &log, nil
 }

-func (r *Reader) readControlServerAddress() (address *string) {
-	key, s := r.getEnvWithRetro("HTTP_CONTROL_SERVER_ADDRESS", "HTTP_CONTROL_SERVER_PORT")
-	if s == "" {
+func (s *Source) readControlServerAddress() (address *string) {
+	key, value := s.getEnvWithRetro("HTTP_CONTROL_SERVER_ADDRESS", "HTTP_CONTROL_SERVER_PORT")
+	if value == "" {
 		return nil
 	}

 	if key == "HTTP_CONTROL_SERVER_ADDRESS" {
-		return &s
+		return &value
 	}

 	address = new(string)
-	*address = ":" + s
+	*address = ":" + value
 	return address
 }
--- a/internal/configuration/sources/env/serverselection.go
+++ b/internal/configuration/sources/env/serverselection.go
@@ -15,44 +15,45 @@ var (
 	ErrServerNumberNotValid = errors.New("server number is not valid")
 )

-func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
+func (s *Source) readServerSelection(vpnProvider, vpnType string) (
 	ss settings.ServerSelection, err error) {
 	ss.VPN = vpnType

-	ss.TargetIP, err = r.readOpenVPNTargetIP()
+	ss.TargetIP, err = s.readOpenVPNTargetIP()
 	if err != nil {
 		return ss, err
 	}

-	countriesKey, _ := r.getEnvWithRetro("SERVER_COUNTRIES", "COUNTRY")
+	countriesKey, _ := s.getEnvWithRetro("SERVER_COUNTRIES", "COUNTRY")
 	ss.Countries = envToCSV(countriesKey)
 	if vpnProvider == providers.Cyberghost && len(ss.Countries) == 0 {
 		// Retro-compatibility for Cyberghost using the REGION variable
 		ss.Countries = envToCSV("REGION")
 		if len(ss.Countries) > 0 {
-			r.onRetroActive("REGION", "SERVER_COUNTRIES")
+			s.onRetroActive("REGION", "SERVER_COUNTRIES")
 		}
 	}

-	regionsKey, _ := r.getEnvWithRetro("SERVER_REGIONS", "REGION")
+	regionsKey, _ := s.getEnvWithRetro("SERVER_REGIONS", "REGION")
 	ss.Regions = envToCSV(regionsKey)

-	citiesKey, _ := r.getEnvWithRetro("SERVER_CITIES", "CITY")
+	citiesKey, _ := s.getEnvWithRetro("SERVER_CITIES", "CITY")
 	ss.Cities = envToCSV(citiesKey)

 	ss.ISPs = envToCSV("ISP")

-	hostnamesKey, _ := r.getEnvWithRetro("SERVER_HOSTNAMES", "SERVER_HOSTNAME")
+	hostnamesKey, _ := s.getEnvWithRetro("SERVER_HOSTNAMES", "SERVER_HOSTNAME")
 	ss.Hostnames = envToCSV(hostnamesKey)

-	serverNamesKey, _ := r.getEnvWithRetro("SERVER_NAMES", "SERVER_NAME")
+	serverNamesKey, _ := s.getEnvWithRetro("SERVER_NAMES", "SERVER_NAME")
 	ss.Names = envToCSV(serverNamesKey)

 	if csv := getCleanedEnv("SERVER_NUMBER"); csv != "" {
 		numbersStrings := strings.Split(csv, ",")
 		numbers := make([]uint16, len(numbersStrings))
 		for i, numberString := range numbersStrings {
-			number, err := strconv.Atoi(numberString)
+			const base, bitSize = 10, 16
+			number, err := strconv.ParseInt(numberString, base, bitSize)
 			if err != nil {
 				return ss, fmt.Errorf("%w: %s",
 					ErrServerNumberNotValid, numberString)
@@ -66,7 +67,7 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 	}

 	// Mullvad only
-	ss.OwnedOnly, err = r.readOwnedOnly()
+	ss.OwnedOnly, err = s.readOwnedOnly()
 	if err != nil {
 		return ss, err
 	}
@@ -95,12 +96,12 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
 		return ss, fmt.Errorf("environment variable STREAM_ONLY: %w", err)
 	}

-	ss.OpenVPN, err = r.readOpenVPNSelection()
+	ss.OpenVPN, err = s.readOpenVPNSelection()
 	if err != nil {
 		return ss, err
 	}

-	ss.Wireguard, err = r.readWireguardSelection()
+	ss.Wireguard, err = s.readWireguardSelection()
 	if err != nil {
 		return ss, err
 	}
@@ -112,23 +113,23 @@ var (
 	ErrInvalidIP = errors.New("invalid IP address")
 )

-func (r *Reader) readOpenVPNTargetIP() (ip net.IP, err error) {
-	envKey, s := r.getEnvWithRetro("VPN_ENDPOINT_IP", "OPENVPN_TARGET_IP")
-	if s == "" {
+func (s *Source) readOpenVPNTargetIP() (ip net.IP, err error) {
+	envKey, value := s.getEnvWithRetro("VPN_ENDPOINT_IP", "OPENVPN_TARGET_IP")
+	if value == "" {
 		return nil, nil
 	}

-	ip = net.ParseIP(s)
+	ip = net.ParseIP(value)
 	if ip == nil {
 		return nil, fmt.Errorf("environment variable %s: %w: %s",
-			envKey, ErrInvalidIP, s)
+			envKey, ErrInvalidIP, value)
 	}

 	return ip, nil
 }

-func (r *Reader) readOwnedOnly() (ownedOnly *bool, err error) {
-	envKey, _ := r.getEnvWithRetro("OWNED_ONLY", "OWNED")
+func (s *Source) readOwnedOnly() (ownedOnly *bool, err error) {
+	envKey, _ := s.getEnvWithRetro("OWNED_ONLY", "OWNED")
 	ownedOnly, err = envToBoolPtr(envKey)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", envKey, err)
--- a/internal/configuration/sources/env/shadowsocks.go
+++ b/internal/configuration/sources/env/shadowsocks.go
@@ -7,25 +7,25 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readShadowsocks() (shadowsocks settings.Shadowsocks, err error) {
+func (s *Source) readShadowsocks() (shadowsocks settings.Shadowsocks, err error) {
 	shadowsocks.Enabled, err = envToBoolPtr("SHADOWSOCKS")
 	if err != nil {
 		return shadowsocks, fmt.Errorf("environment variable SHADOWSOCKS: %w", err)
 	}

-	shadowsocks.Address = r.readShadowsocksAddress()
+	shadowsocks.Address = s.readShadowsocksAddress()
 	shadowsocks.LogAddresses, err = envToBoolPtr("SHADOWSOCKS_LOG")
 	if err != nil {
 		return shadowsocks, fmt.Errorf("environment variable SHADOWSOCKS_LOG: %w", err)
 	}
-	shadowsocks.CipherName = r.readShadowsocksCipher()
+	shadowsocks.CipherName = s.readShadowsocksCipher()
 	shadowsocks.Password = envToStringPtr("SHADOWSOCKS_PASSWORD")

 	return shadowsocks, nil
 }

-func (r *Reader) readShadowsocksAddress() (address string) {
-	key, value := r.getEnvWithRetro("SHADOWSOCKS_LISTENING_ADDRESS", "SHADOWSOCKS_PORT")
+func (s *Source) readShadowsocksAddress() (address string) {
+	key, value := s.getEnvWithRetro("SHADOWSOCKS_LISTENING_ADDRESS", "SHADOWSOCKS_PORT")
 	if value == "" {
 		return ""
 	}
@@ -38,7 +38,7 @@ func (r *Reader) readShadowsocksAddress() (address string) {
 	return ":" + value
 }

-func (r *Reader) readShadowsocksCipher() (cipher string) {
-	_, cipher = r.getEnvWithRetro("SHADOWSOCKS_CIPHER", "SHADOWSOCKS_METHOD")
+func (s *Source) readShadowsocksCipher() (cipher string) {
+	_, cipher = s.getEnvWithRetro("SHADOWSOCKS_CIPHER", "SHADOWSOCKS_METHOD")
 	return strings.ToLower(cipher)
 }
--- a/internal/configuration/sources/env/system.go
+++ b/internal/configuration/sources/env/system.go
@@ -14,13 +14,13 @@ var (
 	ErrSystemTimezoneNotValid = errors.New("timezone is not valid")
 )

-func (r *Reader) readSystem() (system settings.System, err error) {
-	system.PUID, err = r.readID("PUID", "UID")
+func (s *Source) readSystem() (system settings.System, err error) {
+	system.PUID, err = s.readID("PUID", "UID")
 	if err != nil {
 		return system, err
 	}

-	system.PGID, err = r.readID("PGID", "GID")
+	system.PGID, err = s.readID("PGID", "GID")
 	if err != nil {
 		return system, err
 	}
@@ -32,9 +32,9 @@ func (r *Reader) readSystem() (system settings.System, err error) {

 var ErrSystemIDNotValid = errors.New("system ID is not valid")

-func (r *Reader) readID(key, retroKey string) (
+func (s *Source) readID(key, retroKey string) (
 	id *uint32, err error) {
-	idEnvKey, idString := r.getEnvWithRetro(key, retroKey)
+	idEnvKey, idString := s.getEnvWithRetro(key, retroKey)
 	if idString == "" {
 		return nil, nil //nolint:nilnil
 	}
--- a/internal/configuration/sources/env/system_test.go
+++ b/internal/configuration/sources/env/system_test.go
@@ -74,8 +74,8 @@ func Test_Reader_readID(t *testing.T) {
 			setTestEnv(t, key, testCase.keyValue)
 			setTestEnv(t, retroKey, testCase.retroValue)

-			reader := &Reader{}
-			id, err := reader.readID(key, retroKey)
+			source := &Source{}
+			id, err := source.readID(key, retroKey)

 			assert.ErrorIs(t, err, testCase.errWrapped)
 			if err != nil {
--- a/internal/configuration/sources/env/vpn.go
+++ b/internal/configuration/sources/env/vpn.go
@@ -7,20 +7,20 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readVPN() (vpn settings.VPN, err error) {
+func (s *Source) readVPN() (vpn settings.VPN, err error) {
 	vpn.Type = strings.ToLower(getCleanedEnv("VPN_TYPE"))

-	vpn.Provider, err = r.readProvider(vpn.Type)
+	vpn.Provider, err = s.readProvider(vpn.Type)
 	if err != nil {
 		return vpn, fmt.Errorf("VPN provider: %w", err)
 	}

-	vpn.OpenVPN, err = r.readOpenVPN()
+	vpn.OpenVPN, err = s.readOpenVPN()
 	if err != nil {
 		return vpn, fmt.Errorf("OpenVPN: %w", err)
 	}

-	vpn.Wireguard, err = r.readWireguard()
+	vpn.Wireguard, err = s.readWireguard()
 	if err != nil {
 		return vpn, fmt.Errorf("wireguard: %w", err)
 	}
--- a/internal/configuration/sources/env/wireguard.go
+++ b/internal/configuration/sources/env/wireguard.go
@@ -8,22 +8,22 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readWireguard() (wireguard settings.Wireguard, err error) {
+func (s *Source) readWireguard() (wireguard settings.Wireguard, err error) {
 	defer func() {
 		err = unsetEnvKeys([]string{"WIREGUARD_PRIVATE_KEY", "WIREGUARD_PRESHARED_KEY"}, err)
 	}()
 	wireguard.PrivateKey = envToStringPtr("WIREGUARD_PRIVATE_KEY")
 	wireguard.PreSharedKey = envToStringPtr("WIREGUARD_PRESHARED_KEY")
-	_, wireguard.Interface = r.getEnvWithRetro("VPN_INTERFACE", "WIREGUARD_INTERFACE")
-	wireguard.Addresses, err = r.readWireguardAddresses()
+	_, wireguard.Interface = s.getEnvWithRetro("VPN_INTERFACE", "WIREGUARD_INTERFACE")
+	wireguard.Addresses, err = s.readWireguardAddresses()
 	if err != nil {
 		return wireguard, err // already wrapped
 	}
 	return wireguard, nil
 }

-func (r *Reader) readWireguardAddresses() (addresses []net.IPNet, err error) {
-	key, addressesCSV := r.getEnvWithRetro("WIREGUARD_ADDRESSES", "WIREGUARD_ADDRESS")
+func (s *Source) readWireguardAddresses() (addresses []net.IPNet, err error) {
+	key, addressesCSV := s.getEnvWithRetro("WIREGUARD_ADDRESSES", "WIREGUARD_ADDRESS")
 	if addressesCSV == "" {
 		return nil, nil
 	}
@@ -31,6 +31,7 @@ func (r *Reader) readWireguardAddresses() (addresses []net.IPNet, err error) {
 	addressStrings := strings.Split(addressesCSV, ",")
 	addresses = make([]net.IPNet, len(addressStrings))
 	for i, addressString := range addressStrings {
+		addressString = strings.TrimSpace(addressString)
 		ip, ipNet, err := net.ParseCIDR(addressString)
 		if err != nil {
 			return nil, fmt.Errorf("environment variable %s: %w", key, err)
--- a/internal/configuration/sources/env/wireguardselection.go
+++ b/internal/configuration/sources/env/wireguardselection.go
@@ -9,14 +9,14 @@ import (
 	"github.com/qdm12/govalid/port"
 )

-func (r *Reader) readWireguardSelection() (
+func (s *Source) readWireguardSelection() (
 	selection settings.WireguardSelection, err error) {
-	selection.EndpointIP, err = r.readWireguardEndpointIP()
+	selection.EndpointIP, err = s.readWireguardEndpointIP()
 	if err != nil {
 		return selection, err
 	}

-	selection.EndpointPort, err = r.readWireguardCustomPort()
+	selection.EndpointPort, err = s.readWireguardCustomPort()
 	if err != nil {
 		return selection, err
 	}
@@ -28,29 +28,29 @@ func (r *Reader) readWireguardSelection() (

 var ErrIPAddressParse = errors.New("cannot parse IP address")

-func (r *Reader) readWireguardEndpointIP() (endpointIP net.IP, err error) {
-	key, s := r.getEnvWithRetro("VPN_ENDPOINT_IP", "WIREGUARD_ENDPOINT_IP")
-	if s == "" {
+func (s *Source) readWireguardEndpointIP() (endpointIP net.IP, err error) {
+	key, value := s.getEnvWithRetro("VPN_ENDPOINT_IP", "WIREGUARD_ENDPOINT_IP")
+	if value == "" {
 		return nil, nil
 	}

-	endpointIP = net.ParseIP(s)
+	endpointIP = net.ParseIP(value)
 	if endpointIP == nil {
 		return nil, fmt.Errorf("environment variable %s: %w: %s",
-			key, ErrIPAddressParse, s)
+			key, ErrIPAddressParse, value)
 	}

 	return endpointIP, nil
 }

-func (r *Reader) readWireguardCustomPort() (customPort *uint16, err error) {
-	key, s := r.getEnvWithRetro("VPN_ENDPOINT_PORT", "WIREGUARD_ENDPOINT_PORT")
-	if s == "" {
+func (s *Source) readWireguardCustomPort() (customPort *uint16, err error) {
+	key, value := s.getEnvWithRetro("VPN_ENDPOINT_PORT", "WIREGUARD_ENDPOINT_PORT")
+	if value == "" {
 		return nil, nil //nolint:nilnil
 	}

 	customPort = new(uint16)
-	*customPort, err = port.Validate(s)
+	*customPort, err = port.Validate(value)
 	if err != nil {
 		return nil, fmt.Errorf("environment variable %s: %w", key, err)
 	}
--- a/internal/configuration/sources/files/health.go
+++ b/internal/configuration/sources/files/health.go
@@ -2,4 +2,4 @@ package files

 import "github.com/qdm12/gluetun/internal/configuration/settings"

-func (r *Reader) ReadHealth() (settings settings.Health, err error) { return settings, nil }
+func (s *Source) ReadHealth() (settings settings.Health, err error) { return settings, nil }
--- a/internal/configuration/sources/files/openvpn.go
+++ b/internal/configuration/sources/files/openvpn.go
@@ -14,7 +14,7 @@ const (
 	openVPNEncryptedKey          = "/gluetun/openvpn_encrypted_key"
 )

-func (r *Reader) readOpenVPN() (settings settings.OpenVPN, err error) {
+func (s *Source) readOpenVPN() (settings settings.OpenVPN, err error) {
 	settings.Key, err = readPEMFile(OpenVPNClientKeyPath)
 	if err != nil {
 		return settings, fmt.Errorf("client key: %w", err)
--- a/internal/configuration/sources/files/reader.go
+++ b/internal/configuration/sources/files/reader.go
@@ -2,26 +2,23 @@ package files

 import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 )

-var _ sources.Source = (*Reader)(nil)
+type Source struct{}

-type Reader struct{}
-
-func New() *Reader {
-	return &Reader{}
+func New() *Source {
+	return &Source{}
 }

-func (r *Reader) String() string { return "files" }
+func (s *Source) String() string { return "files" }

-func (r *Reader) Read() (settings settings.Settings, err error) {
-	settings.VPN, err = r.readVPN()
+func (s *Source) Read() (settings settings.Settings, err error) {
+	settings.VPN, err = s.readVPN()
 	if err != nil {
 		return settings, err
 	}

-	settings.System, err = r.readSystem()
+	settings.System, err = s.readSystem()
 	if err != nil {
 		return settings, err
 	}
--- a/internal/configuration/sources/files/system.go
+++ b/internal/configuration/sources/files/system.go
@@ -4,7 +4,7 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readSystem() (system settings.System, err error) {
+func (s *Source) readSystem() (system settings.System, err error) {
 	// TODO timezone from /etc/localtime
 	return system, nil
 }
--- a/internal/configuration/sources/files/vpn.go
+++ b/internal/configuration/sources/files/vpn.go
@@ -6,8 +6,8 @@ import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )

-func (r *Reader) readVPN() (vpn settings.VPN, err error) {
-	vpn.OpenVPN, err = r.readOpenVPN()
+func (s *Source) readVPN() (vpn settings.VPN, err error) {
+	vpn.OpenVPN, err = s.readOpenVPN()
 	if err != nil {
 		return vpn, fmt.Errorf("OpenVPN: %w", err)
 	}
--- a/internal/configuration/sources/merge/reader.go
+++ b/internal/configuration/sources/merge/reader.go
@@ -1,29 +1,32 @@
-package mux
+package merge

 import (
 	"fmt"
 	"strings"

 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 )

-var _ sources.Source = (*Reader)(nil)
-
-type Reader struct {
-	sources []sources.Source
+type ConfigSource interface {
+	Read() (settings settings.Settings, err error)
+	ReadHealth() (settings settings.Health, err error)
+	String() string
 }

-func New(sources ...sources.Source) *Reader {
-	return &Reader{
+type Source struct {
+	sources []ConfigSource
+}
+
+func New(sources ...ConfigSource) *Source {
+	return &Source{
 		sources: sources,
 	}
 }

-func (r *Reader) String() string {
-	sources := make([]string, len(r.sources))
-	for i := range r.sources {
-		sources[i] = r.sources[i].String()
+func (s *Source) String() string {
+	sources := make([]string, len(s.sources))
+	for i := range s.sources {
+		sources[i] = s.sources[i].String()
 	}
 	return strings.Join(sources, ", ")
 }
@@ -31,8 +34,8 @@ func (r *Reader) String() string {
 // Read reads the settings for each source, merging unset fields
 // with field set by the next source.
 // It then set defaults to remaining unset fields.
-func (r *Reader) Read() (settings settings.Settings, err error) {
-	for _, source := range r.sources {
+func (s *Source) Read() (settings settings.Settings, err error) {
+	for _, source := range s.sources {
 		settingsFromSource, err := source.Read()
 		if err != nil {
 			return settings, fmt.Errorf("reading from %s: %w", source, err)
@@ -47,8 +50,8 @@ func (r *Reader) Read() (settings settings.Settings, err error) {
 // with field set by the next source.
 // It then set defaults to remaining unset fields, and validate
 // all the fields.
-func (r *Reader) ReadHealth() (settings settings.Health, err error) {
-	for _, source := range r.sources {
+func (s *Source) ReadHealth() (settings settings.Health, err error) {
+	for _, source := range s.sources {
 		settingsFromSource, err := source.ReadHealth()
 		if err != nil {
 			return settings, fmt.Errorf("reading from %s: %w", source, err)
--- a/internal/configuration/sources/secrets/health.go
+++ b/internal/configuration/sources/secrets/health.go
@@ -2,4 +2,4 @@ package secrets

 import "github.com/qdm12/gluetun/internal/configuration/settings"

-func (r *Reader) ReadHealth() (settings settings.Health, err error) { return settings, nil }
+func (s *Source) ReadHealth() (settings settings.Health, err error) { return settings, nil }
--- a/internal/configuration/sources/secrets/reader.go
+++ b/internal/configuration/sources/secrets/reader.go
@@ -2,21 +2,17 @@ package secrets

 import (
 	"github.com/qdm12/gluetun/internal/configuration/settings"
-	"github.com/qdm12/gluetun/internal/configuration/sources"
 )

-var _ sources.Source = (*Reader)(nil)
+type Source struct{}

-type Reader struct {
+func New() *Source {
+	return &Source{}
 }

-func New() *Reader {
-	return &Reader{}
-}
+func (s *Source) String() string { return "secret files" }

-func (r *Reader) String() string { return "secret files" }
-
-func (r *Reader) Read() (settings settings.Settings, err error) {
+func (s *Source) Read() (settings settings.Settings, err error) {
 	settings.VPN, err = readVPN()
 	if err != nil {
 		return settings, err
--- a/internal/constants/openvpn/ciphers.go
+++ b/internal/constants/openvpn/ciphers.go
@@ -1,8 +1,11 @@
 package openvpn

 const (
-	AES128cbc = "aes-128-cbc"
-	AES256cbc = "aes-256-cbc"
-	AES128gcm = "aes-128-gcm"
-	AES256gcm = "aes-256-gcm"
+	AES128cbc        = "aes-128-cbc"
+	AES192cbc        = "aes-192-cbc"
+	AES256cbc        = "aes-256-cbc"
+	AES128gcm        = "aes-128-gcm"
+	AES192gcm        = "aes-192-gcm"
+	AES256gcm        = "aes-256-gcm"
+	Chacha20Poly1305 = "chacha20-poly1305"
 )
--- a/internal/constants/providers/providers.go
+++ b/internal/constants/providers/providers.go
@@ -3,6 +3,7 @@ package providers
 const (
 	// Custom is the VPN provider name for custom
 	// VPN configurations.
+	Airvpn                = "airvpn"
 	Custom                = "custom"
 	Cyberghost            = "cyberghost"
 	Example               = "example"
@@ -32,6 +33,7 @@ const (
 // All returns all the providers except the custom provider.
 func All() []string {
 	return []string{
+		Airvpn,
 		Cyberghost,
 		Expressvpn,
 		Fastestvpn,
--- a/internal/firewall/enable.go
+++ b/internal/firewall/enable.go
@@ -101,6 +101,9 @@ func (c *Config) enable(ctx context.Context) (err error) {
 		if err := c.acceptOutputFromIPToSubnet(ctx, network.InterfaceName, network.IP, *network.IPNet, remove); err != nil {
 			return err
 		}
+		if err = c.acceptIpv6MulticastOutput(ctx, network.InterfaceName, remove); err != nil {
+			return err
+		}
 	}

 	if err = c.allowOutboundSubnets(ctx); err != nil {
--- a/internal/firewall/iptables.go
+++ b/internal/firewall/iptables.go
@@ -179,6 +179,18 @@ func (c *Config) acceptOutputFromIPToSubnet(ctx context.Context,
 	return c.runIP6tablesInstruction(ctx, instruction)
 }

+// NDP uses multicast address (theres no broadcast in IPv6 like ARP uses in IPv4).
+func (c *Config) acceptIpv6MulticastOutput(ctx context.Context,
+	intf string, remove bool) error {
+	interfaceFlag := "-o " + intf
+	if intf == "*" { // all interfaces
+		interfaceFlag = ""
+	}
+	instruction := fmt.Sprintf("%s OUTPUT %s -d ff02::1:ff/104 -j ACCEPT",
+		appendOrDelete(remove), interfaceFlag)
+	return c.runIP6tablesInstruction(ctx, instruction)
+}
+
 // Used for port forwarding, with intf set to tun.
 func (c *Config) acceptInputToPort(ctx context.Context, intf string, port uint16, remove bool) error {
 	interfaceFlag := "-i " + intf
--- a/internal/httpproxy/auth.go
+++ b/internal/httpproxy/auth.go
@@ -2,6 +2,7 @@ package httpproxy

 import (
 	"encoding/base64"
+	"fmt"
 	"net/http"
 	"strings"
 )
@@ -32,7 +33,8 @@ func (h *handler) isAuthorized(responseWriter http.ResponseWriter, request *http
 		return false
 	}
 	if h.username != usernamePassword[0] || h.password != usernamePassword[1] {
-		h.logger.Info("Username or password mismatch from " + request.RemoteAddr)
+		h.logger.Info(fmt.Sprintf("Username (%q) or password (%q) mismatch from %s",
+			usernamePassword[0], usernamePassword[1], request.RemoteAddr))
 		h.logger.Debug("username provided \"" + usernamePassword[0] +
 			"\" and password provided \"" + usernamePassword[1] + "\"")
 		responseWriter.WriteHeader(http.StatusUnauthorized)
--- a/internal/models/markdown.go
+++ b/internal/models/markdown.go
@@ -5,6 +5,7 @@ import (
 	"strings"

 	"github.com/qdm12/gluetun/internal/constants/providers"
+	"github.com/qdm12/gluetun/internal/constants/vpn"
 )

 func boolToMarkdown(b bool) string {
@@ -26,6 +27,7 @@ const (
 	hostnameHeader    = "Hostname"
 	ispHeader         = "ISP"
 	multiHopHeader    = "MultiHop"
+	nameHeader        = "Name"
 	numberHeader      = "Number"
 	ownedHeader       = "Owned"
 	portForwardHeader = "Port forwarding"
@@ -57,6 +59,8 @@ func (s *Server) ToMarkdown(headers ...string) (markdown string) {
 			fields[i] = s.ISP
 		case multiHopHeader:
 			fields[i] = boolToMarkdown(s.MultiHop)
+		case nameHeader:
+			fields[i] = s.ServerName
 		case numberHeader:
 			fields[i] = fmt.Sprint(s.Number)
 		case ownedHeader:
@@ -72,7 +76,7 @@ func (s *Server) ToMarkdown(headers ...string) (markdown string) {
 		case tcpHeader:
 			fields[i] = boolToMarkdown(s.TCP)
 		case udpHeader:
-			fields[i] = boolToMarkdown(s.UDP)
+			fields[i] = boolToMarkdown(s.UDP || s.VPN == vpn.Wireguard)
 		case vpnHeader:
 			fields[i] = s.VPN
 		}
@@ -98,6 +102,9 @@ func (s *Servers) ToMarkdown(vpnProvider string) (markdown string) {

 func getMarkdownHeaders(vpnProvider string) (headers []string) {
 	switch vpnProvider {
+	case providers.Airvpn:
+		return []string{regionHeader, countryHeader, cityHeader, vpnHeader,
+			udpHeader, tcpHeader, hostnameHeader, nameHeader}
 	case providers.Cyberghost:
 		return []string{countryHeader, hostnameHeader, tcpHeader, udpHeader}
 	case providers.Expressvpn:
--- a/internal/models/server.go
+++ b/internal/models/server.go
@@ -39,7 +39,8 @@ var (
 	ErrVPNFieldEmpty           = errors.New("vpn field is empty")
 	ErrHostnameFieldEmpty      = errors.New("hostname field is empty")
 	ErrIPsFieldEmpty           = errors.New("ips field is empty")
-	ErrNoNetworkProtocol       = errors.New("both TCP and UDP fields are false")
+	ErrNoNetworkProtocol       = errors.New("both TCP and UDP fields are false for OpenVPN")
+	ErrNetworkProtocolSet      = errors.New("no network protocol should be set")
 	ErrWireguardPublicKeyEmpty = errors.New("wireguard public key field is empty")
 )

@@ -51,7 +52,9 @@ func (s *Server) HasMinimumInformation() (err error) {
 		return ErrHostnameFieldEmpty
 	case len(s.IPs) == 0:
 		return ErrIPsFieldEmpty
-	case !s.TCP && !s.UDP:
+	case s.VPN == vpn.Wireguard && (s.TCP || s.UDP):
+		return ErrNetworkProtocolSet
+	case s.VPN == vpn.OpenVPN && !s.TCP && !s.UDP:
 		return ErrNoNetworkProtocol
 	case s.VPN == vpn.Wireguard && s.WgPubKey == "":
 		return ErrWireguardPublicKeyEmpty
--- a/internal/netlink/ipv6.go
+++ b/internal/netlink/ipv6.go
@@ -0,0 +1,30 @@
+package netlink
+
+import (
+	"fmt"
+
+	"github.com/vishvananda/netlink"
+)
+
+func (n *NetLink) IsIPv6Supported() (supported bool, err error) {
+	links, err := n.LinkList()
+	if err != nil {
+		return false, fmt.Errorf("listing links: %w", err)
+	}
+
+	for _, link := range links {
+		routes, err := n.RouteList(link, netlink.FAMILY_V6)
+		if err != nil {
+			return false, fmt.Errorf("listing IPv6 routes for link %s: %w",
+				link.Attrs().Name, err)
+		}
+
+		if len(routes) == 0 {
+			continue
+		}
+
+		return true, nil
+	}
+
+	return false, nil
+}
--- a/internal/openvpn/extract/extract.go
+++ b/internal/openvpn/extract/extract.go
@@ -81,7 +81,7 @@ func extractProto(line string) (protocol string, err error) {
 	}

 	switch fields[1] {
-	case "tcp", "udp":
+	case "tcp", "tcp4", "tcp6", "udp", "udp4", "udp6":
 	default:
 		return "", fmt.Errorf("%w: %s", errProtocolNotSupported, fields[1])
 	}
--- a/internal/provider/airvpn/connection.go
+++ b/internal/provider/airvpn/connection.go
@@ -0,0 +1,14 @@
+package airvpn
+
+import (
+	"github.com/qdm12/gluetun/internal/configuration/settings"
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
+)
+
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
+	connection models.Connection, err error) {
+	defaults := utils.NewConnectionDefaults(443, 1194, 1637) //nolint:gomnd
+	return utils.GetConnection(p.Name(),
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
+}
--- a/internal/provider/airvpn/openvpnconf.go
+++ b/internal/provider/airvpn/openvpnconf.go
@@ -0,0 +1,44 @@
+package airvpn
+
+import (
+	"fmt"
+
+	"github.com/qdm12/gluetun/internal/configuration/settings"
+	"github.com/qdm12/gluetun/internal/constants/openvpn"
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/utils"
+)
+
+func (p *Provider) OpenVPNConfig(connection models.Connection,
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
+	providerSettings := utils.OpenVPNProviderSettings{
+		AuthUserPass:  true,
+		RemoteCertTLS: true,
+		Auth:          openvpn.SHA512,
+		CA:            "MIIGVjCCBD6gAwIBAgIJAIzYQ+/kXyADMA0GCSqGSIb3DQEBDQUAMHkxCzAJBgNVBAYTAklUMQswCQYDVQQIEwJJVDEQMA4GA1UEBxMHUGVydWdpYTETMBEGA1UEChMKYWlydnBuLm9yZzEWMBQGA1UEAxMNYWlydnBuLm9yZyBDQTEeMBwGCSqGSIb3DQEJARYPaW5mb0BhaXJ2cG4ub3JnMCAXDTIxMTAwNjExNTQ0OFoYDzIxMjEwOTEyMTE1NDQ4WjB5MQswCQYDVQQGEwJJVDELMAkGA1UECBMCSVQxEDAOBgNVBAcTB1BlcnVnaWExEzARBgNVBAoTCmFpcnZwbi5vcmcxFjAUBgNVBAMTDWFpcnZwbi5vcmcgQ0ExHjAcBgkqhkiG9w0BCQEWD2luZm9AYWlydnBuLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMYbdmsls/rU82MZziaNPHRMuRSM/shdnfCek+PAX+XAr2ceBGqg8vQpj8AEm7MxWIPwKG3C2E19zs+4nu9I+03ziVIngkaZPG9mQ14tAtmy7UV/zw5xKmNbkSsEzTmJUF4Xz+WPBpqOAV9uCin1b9QrnIyOLiqCrkofHFeqwHxHisJ4WlYeg1PAWO9eG1XIyBeJP1cCH+8FiKbTbWbyieKjgrjyrthFnipTyC8Tv2HkzSCaIiW3q/W9pmyTD1yogFsJh58Yyy8FGTbHzbgKE9/oVrMzACdAey4Ee3p5cABG98UMENqfM8eVFKII/ol7pWh38w/J6mJNmCOCTZXFhRzWiE3EQQbM8ZNrJ43MslSV2i4/gH62MnReXLfT7C+VqEAOWqO3PcIZCYoyPtu1mN35SjrUHuBq7liJdH8g7tmkUAI8JklJuvAWzqu30p7CqTzOyV9UiujygOd1dGRWxr9zxCZ3pkTtX6gwaXY6CB1Y4uWYMSOTK3PH4HDaxJJqUlEBCY5A7xXRqc4jqMZgu5TaOcUOyepIe7AgrXXFvqIeaHs42xEtS1D53rhPMHTTDYzR8K8apQinQ36V/uexkqwRxTTw6gdBhS7BfvlkQ5g1JkmuoBeiFxd1VQeqBGUlESt9KSNwYwzTKqMeS+ilycEhFcoxhMNVe/NElujImJWlAgMBAAGjgd4wgdswHQYDVR0OBBYEFOUV1xOonjHj0TDX8R/04mPSUMiIMIGrBgNVHSMEgaMwgaCAFOUV1xOonjHj0TDX8R/04mPSUMiIoX2kezB5MQswCQYDVQQGEwJJVDELMAkGA1UECBMCSVQxEDAOBgNVBAcTB1BlcnVnaWExEzARBgNVBAoTCmFpcnZwbi5vcmcxFjAUBgNVBAMTDWFpcnZwbi5vcmcgQ0ExHjAcBgkqhkiG9w0BCQEWD2luZm9AYWlydnBuLm9yZ4IJAIzYQ+/kXyADMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQENBQADggIBAL76hAC3X5/ZR3q6iIIkfU4PuIAknES2gkgThV6QGCPIf6Lz1FRZNmR6tcJ5Jqlxq5tJDb6ImgU1swu+xoaVw8Fj2idxHVMPZqEoV3+/H2FB3fZnawZ4ftqf0qhs59oaMOijo6hnFf+nLosW/b8WDg8QXXDcBJ7IJlDaC3p0WAK7iNGHZFe54GVGyQLCsGbNpSMamSOV+B2pC8YrQ+RehKIxxij01EHFxBkcIRj4hH1a6gZ1mcmavzeweT2DfSmFJK5EHR8JeEG0TnwH+AACXuuh2NAeD1hWQNoaUShl06l9E3tJC+RlyilsjFx2ULfJQsm2z5Dmlm9gJ8+ESf4CzdWJBytxxKWmOFznzT9XnjiFJsfiIaNgs3yBg9QvQuUAYSzsUQ+V/hSbzSRQ9SmOClZ0OnFfMeE0hL7UJmp2WCGserqUWtd71hUEe+QOtIZ64BJwDIbRB7tvg/I3KdAARNA38HfX60m1qUXeZe/t7ysD68ttuxrKLRPAK2aEWtQrSJcc452e0Zjw0XUeZtq/9VZlqheuUe3S7RLdbmRGlAWMUOxlA+FLt6AehjYlWNyajEZhPKFiEwE3Uy9P+0K7sxzk1Aw5S6eScKY66zBX/1sgv6l2PrTjow/BqXkwGAtgkCQyVE0SWru59zzXbBLV1/qex6OalILYOpAZSgiC1FVd", //nolint:lll
+		TLSCrypt:      "a3a7d8f4e778d279d9076a8d47a9aa0c6054aed5752ddefa5efac1ea982740f1ffcabadf0d3709dae18c1fad61e14f72a8eb7cb931ed0209e67c1d325353a657a1198ef649f1c23861a2a19f2c6b27aa5e43be761e0c71e9c2e8d33b75af289effb1b1e4ec603d865f74e2b4348ff631c5c81202d90003ed263dca4022aa9861520e00cc26e40fa171b9985a2763ccb4c63560b7e6b0f897978fb25a2d5889cd6d46a29509fa09830aff18d6e81a8dc1a0182402e3039c3316180e618705ca35f2763f8a62ca5983d145faa2276532ae5e18459a0b729dc67f41b928e592b39467ec3d79c70205595718b1bce56ca4ff58e692ce09c8282d2770d2bf5c217c06",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         //nolint:lll
+		ExtraLines: []string{
+			"comp-lzo no", // Explicitly disable compression
+			"push-peer-info",
+		},
+	}
+
+	switch settings.Version {
+	case openvpn.Openvpn24:
+		providerSettings.Ciphers = []string{openvpn.AES256cbc}
+	case openvpn.Openvpn25:
+		providerSettings.Ciphers = []string{
+			openvpn.AES256gcm, openvpn.AES256cbc, openvpn.AES192gcm,
+			openvpn.AES192cbc, openvpn.AES128gcm, openvpn.AES128cbc,
+			openvpn.Chacha20Poly1305}
+	default:
+		panic(fmt.Sprintf("openvpn version %q is not implemented", settings.Version))
+	}
+
+	providerSettings.SetEnv = map[string]string{"UV_IPV6": "no"}
+	if ipv6Supported {
+		providerSettings.SetEnv["UV_IPV6"] = "yes"
+	}
+
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
+}
--- a/internal/provider/airvpn/provider.go
+++ b/internal/provider/airvpn/provider.go
@@ -0,0 +1,32 @@
+package airvpn
+
+import (
+	"math/rand"
+	"net/http"
+
+	"github.com/qdm12/gluetun/internal/constants/providers"
+	"github.com/qdm12/gluetun/internal/provider/airvpn/updater"
+	"github.com/qdm12/gluetun/internal/provider/common"
+	"github.com/qdm12/gluetun/internal/provider/utils"
+)
+
+type Provider struct {
+	storage    common.Storage
+	randSource rand.Source
+	utils.NoPortForwarder
+	common.Fetcher
+}
+
+func New(storage common.Storage, randSource rand.Source,
+	client *http.Client) *Provider {
+	return &Provider{
+		storage:         storage,
+		randSource:      randSource,
+		NoPortForwarder: utils.NewNoPortForwarding(providers.Example),
+		Fetcher:         updater.New(client),
+	}
+}
+
+func (p *Provider) Name() string {
+	return providers.Airvpn
+}
--- a/internal/provider/airvpn/updater/api.go
+++ b/internal/provider/airvpn/updater/api.go
@@ -0,0 +1,65 @@
+package updater
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net"
+	"net/http"
+
+	"github.com/qdm12/gluetun/internal/provider/common"
+)
+
+type apiData struct {
+	Servers []apiServer `json:"servers"`
+}
+
+type apiServer struct {
+	PublicName  string `json:"public_name"`
+	CountryName string `json:"country_name"`
+	CountryCode string `json:"country_code"`
+	Location    string `json:"location"`
+	Continent   string `json:"continent"`
+	IPv4In1     net.IP `json:"ip_v4_in1"`
+	IPv4In2     net.IP `json:"ip_v4_in2"`
+	IPv4In3     net.IP `json:"ip_v4_in3"`
+	IPv4In4     net.IP `json:"ip_v4_in4"`
+	IPv6In1     net.IP `json:"ip_v6_in1"`
+	IPv6In2     net.IP `json:"ip_v6_in2"`
+	IPv6In3     net.IP `json:"ip_v6_in3"`
+	IPv6In4     net.IP `json:"ip_v6_in4"`
+	Health      string `json:"health"`
+}
+
+func fetchAPI(ctx context.Context, client *http.Client) (
+	data apiData, err error) {
+	const url = "https://airvpn.org/api/status/"
+
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return data, fmt.Errorf("creating HTTP request: %w", err)
+	}
+
+	response, err := client.Do(request)
+	if err != nil {
+		return data, fmt.Errorf("doing HTTP request: %w", err)
+	}
+
+	if response.StatusCode != http.StatusOK {
+		_ = response.Body.Close()
+		return data, fmt.Errorf("%w: %d %s",
+			common.ErrHTTPStatusCodeNotOK, response.StatusCode, response.Status)
+	}
+
+	decoder := json.NewDecoder(response.Body)
+	if err := decoder.Decode(&data); err != nil {
+		_ = response.Body.Close()
+		return data, fmt.Errorf("unmarshaling response body: %w", err)
+	}
+
+	if err := response.Body.Close(); err != nil {
+		return data, fmt.Errorf("closing response body: %w", err)
+	}
+
+	return data, nil
+}
--- a/internal/provider/airvpn/updater/servers.go
+++ b/internal/provider/airvpn/updater/servers.go
@@ -0,0 +1,97 @@
+package updater
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"sort"
+
+	"github.com/qdm12/gluetun/internal/constants/vpn"
+	"github.com/qdm12/gluetun/internal/models"
+	"github.com/qdm12/gluetun/internal/provider/common"
+)
+
+func (u *Updater) FetchServers(ctx context.Context, minServers int) (
+	servers []models.Server, err error) {
+	data, err := fetchAPI(ctx, u.client)
+	if err != nil {
+		return nil, fmt.Errorf("fetching API: %w", err)
+	}
+
+	// every API server model has:
+	// - Wireguard server using IPv4In1
+	// - Wiregard server using IPv6In1
+	// - OpenVPN TCP+UDP+SSH+SSL server with tls-auth using IPv4In1 and IPv6In1
+	// - OpenVPN TCP+UDP+SSH+SSL server with tls-auth using IPv4In2 and IPv6In2
+	// - OpenVPN TCP+UDP+SSH+SSL server with tls-crypt using IPv4In3 and IPv6In3
+	// - OpenVPN TCP+UDP+SSH+SSL server with tls-crypt using IPv6In4 and IPv6In4
+	const numberOfServersPerAPIServer = 1 + // Wireguard server using IPv4In1
+		1 + // Wiregard server using IPv6In1
+		4 + // OpenVPN TCP server with tls-auth using IPv4In3, IPv6In3, IPv4In4, IPv6In4
+		4 // OpenVPN UDP server with tls-auth using IPv4In3, IPv6In3, IPv4In4, IPv6In4
+	projectedNumberOfServers := numberOfServersPerAPIServer * len(data.Servers)
+
+	if projectedNumberOfServers < minServers {
+		return nil, fmt.Errorf("%w: %d and expected at least %d",
+			common.ErrNotEnoughServers, projectedNumberOfServers, minServers)
+	}
+
+	servers = make([]models.Server, 0, projectedNumberOfServers)
+	for _, apiServer := range data.Servers {
+		if apiServer.Health != "ok" {
+			continue
+		}
+
+		baseServer := models.Server{
+			ServerName: apiServer.PublicName,
+			Country:    apiServer.CountryName,
+			City:       apiServer.Location,
+			Region:     apiServer.Continent,
+		}
+
+		baseWireguardServer := baseServer
+		baseWireguardServer.VPN = vpn.Wireguard
+		baseWireguardServer.WgPubKey = "PyLCXAQT8KkM4T+dUsOQfn+Ub3pGxfGlxkIApuig+hk="
+
+		ipv4WireguadServer := baseWireguardServer
+		ipv4WireguadServer.IPs = []net.IP{apiServer.IPv4In1}
+		ipv4WireguadServer.Hostname = apiServer.CountryCode + ".vpn.airdns.org"
+		servers = append(servers, ipv4WireguadServer)
+
+		ipv6WireguadServer := baseWireguardServer
+		ipv6WireguadServer.IPs = []net.IP{apiServer.IPv6In1}
+		ipv6WireguadServer.Hostname = apiServer.CountryCode + ".ipv6.vpn.airdns.org"
+		servers = append(servers, ipv6WireguadServer)
+
+		baseOpenVPNServer := baseServer
+		baseOpenVPNServer.VPN = vpn.OpenVPN
+		baseOpenVPNServer.UDP = true
+		baseOpenVPNServer.TCP = true
+
+		// Ignore IPs 1 and 2 since tls-crypt is superior to tls-auth really.
+
+		ipv4In3OpenVPNServer := baseOpenVPNServer
+		ipv4In3OpenVPNServer.IPs = []net.IP{apiServer.IPv4In3}
+		ipv4In3OpenVPNServer.Hostname = apiServer.CountryCode + "3.vpn.airdns.org"
+		servers = append(servers, ipv4In3OpenVPNServer)
+
+		ipv6In3OpenVPNServer := baseOpenVPNServer
+		ipv6In3OpenVPNServer.IPs = []net.IP{apiServer.IPv6In3}
+		ipv6In3OpenVPNServer.Hostname = apiServer.CountryCode + "3.ipv6.vpn.airdns.org"
+		servers = append(servers, ipv6In3OpenVPNServer)
+
+		ipv4In4OpenVPNServer := baseOpenVPNServer
+		ipv4In4OpenVPNServer.IPs = []net.IP{apiServer.IPv4In4}
+		ipv4In4OpenVPNServer.Hostname = apiServer.CountryCode + "4.vpn.airdns.org"
+		servers = append(servers, ipv4In4OpenVPNServer)
+
+		ipv6In4OpenVPNServer := baseOpenVPNServer
+		ipv6In4OpenVPNServer.IPs = []net.IP{apiServer.IPv6In4}
+		ipv6In4OpenVPNServer.Hostname = apiServer.CountryCode + "4.ipv6.vpn.airdns.org"
+		servers = append(servers, ipv6In4OpenVPNServer)
+	}
+
+	sort.Sort(models.SortableServers(servers))
+
+	return servers, nil
+}
--- a/internal/provider/airvpn/updater/updater.go
+++ b/internal/provider/airvpn/updater/updater.go
@@ -0,0 +1,15 @@
+package updater
+
+import (
+	"net/http"
+)
+
+type Updater struct {
+	client *http.Client
+}
+
+func New(client *http.Client) *Updater {
+	return &Updater{
+		client: client,
+	}
+}
--- a/internal/provider/common/updater.go
+++ b/internal/provider/common/updater.go
@@ -10,7 +10,10 @@ import (
 	"github.com/qdm12/gluetun/internal/updater/resolver"
 )

-var ErrNotEnoughServers = errors.New("not enough servers found")
+var (
+	ErrNotEnoughServers    = errors.New("not enough servers found")
+	ErrHTTPStatusCodeNotOK = errors.New("HTTP status code not OK")
+)

 type Fetcher interface {
 	FetchServers(ctx context.Context, minServers int) (servers []models.Server, err error)
--- a/internal/provider/custom/connection.go
+++ b/internal/provider/custom/connection.go
@@ -15,7 +15,7 @@ var (
 )

 // GetConnection gets the connection from the OpenVPN configuration file.
-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	switch selection.VPN {
 	case vpn.OpenVPN:
--- a/internal/provider/custom/openvpnconf.go
+++ b/internal/provider/custom/openvpnconf.go
@@ -15,7 +15,7 @@ import (
 var ErrExtractData = errors.New("failed extracting information from custom configuration file")

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	lines, _, err := p.extractor.Data(*settings.ConfFile)
 	if err != nil {
 		// Configuration file is already validated in settings validation in
@@ -24,13 +24,13 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		panic(fmt.Sprintf("failed extracting information from custom configuration file: %s", err))
 	}

-	lines = modifyConfig(lines, connection, settings)
+	lines = modifyConfig(lines, connection, settings, ipv6Supported)

 	return lines
 }

 func modifyConfig(lines []string, connection models.Connection,
-	settings settings.OpenVPN) (modified []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (modified []string) {
 	// Remove some lines
 	for _, line := range lines {
 		switch {
@@ -57,7 +57,7 @@ func modifyConfig(lines []string, connection models.Connection,
 				"cipher ", "ncp-ciphers ", "data-ciphers ", "data-ciphers-fallback "),
 			*settings.Auth != "" && strings.HasPrefix(line, "auth "),
 			*settings.MSSFix > 0 && strings.HasPrefix(line, "mssfix "),
-			!*settings.IPv6 && hasPrefixOneOf(line, "tun-ipv6",
+			!ipv6Supported && hasPrefixOneOf(line, "tun-ipv6",
 				`pull-filter ignore "route-ipv6"`,
 				`pull-filter ignore "ifconfig-ipv6"`):
 		default:
@@ -87,7 +87,7 @@ func modifyConfig(lines []string, connection models.Connection,
 	if *settings.MSSFix > 0 {
 		modified = append(modified, "mssfix "+strconv.Itoa(int(*settings.MSSFix)))
 	}
-	if !*settings.IPv6 {
+	if !ipv6Supported {
 		modified = append(modified, `pull-filter ignore "route-ipv6"`)
 		modified = append(modified, `pull-filter ignore "ifconfig-ipv6"`)
 	}
--- a/internal/provider/custom/openvpnconf_test.go
+++ b/internal/provider/custom/openvpnconf_test.go
@@ -19,10 +19,11 @@ func Test_modifyConfig(t *testing.T) {
 	t.Parallel()

 	testCases := map[string]struct {
-		lines      []string
-		settings   settings.OpenVPN
-		connection models.Connection
-		modified   []string
+		lines         []string
+		settings      settings.OpenVPN
+		connection    models.Connection
+		ipv6Supported bool
+		modified      []string
 	}{
 		"mixed": {
 			lines: []string{
@@ -49,6 +50,7 @@ func Test_modifyConfig(t *testing.T) {
 				Port:     1194,
 				Protocol: constants.UDP,
 			},
+			ipv6Supported: false,
 			modified: []string{
 				"up bla",
 				"keep me here",
@@ -82,7 +84,7 @@ func Test_modifyConfig(t *testing.T) {
 			t.Parallel()

 			modified := modifyConfig(testCase.lines,
-				testCase.connection, testCase.settings)
+				testCase.connection, testCase.settings, testCase.ipv6Supported)

 			assert.Equal(t, testCase.modified, modified)
 		})
--- a/internal/provider/cyberghost/connection.go
+++ b/internal/provider/cyberghost/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/cyberghost/openvpnconf.go
+++ b/internal/provider/cyberghost/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
@@ -22,5 +22,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		Ping: 10,
 		CA:   "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", //nolint:lll
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/cyberghost/updater/constants.go
+++ b/internal/provider/cyberghost/updater/constants.go
@@ -4,14 +4,12 @@ import "github.com/qdm12/gluetun/internal/constants"

 func getGroupIDToProtocol() map[string]string {
 	return map[string]string{
-		"87-1": constants.UDP, // Premium UDP Europe
-		"94-1": constants.UDP, // Premium UDP USA
-		"95-1": constants.UDP, // Premium UDP Asia
-		"87-8": constants.UDP, // NoSpy UDP Europe
-		"97-1": constants.TCP, // Premium TCP Europe
-		"93-1": constants.TCP, // Premium TCP USA
-		"96-1": constants.TCP, // Premium TCP Asia
-		"97-8": constants.TCP, // NoSpy TCP Europe
+		"87-1":  constants.UDP, // Premium UDP
+		"87-8":  constants.UDP, // NoSpy UDP
+		"87-19": constants.UDP, // Gaming UDP
+		"97-1":  constants.TCP, // Premium TCP
+		"97-8":  constants.TCP, // NoSpy TCP
+		"97-19": constants.TCP, // Gaming TCP
 	}
 }

--- a/internal/provider/example/connection.go
+++ b/internal/provider/example/connection.go
@@ -6,11 +6,11 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	// TODO: Set the default ports for each VPN protocol+network protocol
 	// combination. If one combination is not supported, set it to `0`.
 	defaults := utils.NewConnectionDefaults(443, 1194, 51820) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/example/openvpnconf.go
+++ b/internal/provider/example/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	// TODO: Set the necessary fields in `providerSettings` to
 	// generate the right OpenVPN configuration file.
 	//nolint:gomnd
@@ -22,5 +22,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		CA:            "MIIDZzCCAk+gAwIBAgIUVwHEFE6geihigDSNkBppm2Zamx0wDQYJKoZIhvcNAQELBQAwQzELMAkGA1UEBhMCQ0ExDzANBgNVBAgMBlF1ZWJlYzERMA8GA1UEBwwITW9udHJlYWwxEDAOBgNVBAoMB0dsdWV0dW4wHhcNMjIwNzAxMTY1MzE5WhcNMjcwNjMwMTY1MzE5WjBDMQswCQYDVQQGEwJDQTEPMA0GA1UECAwGUXVlYmVjMREwDwYDVQQHDAhNb250cmVhbDEQMA4GA1UECgwHR2x1ZXR1bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALmJRhTUr+87NFkHL2PWjIz7efHqQgrWuDQt8oOBHvl0Hm72N+ckO+5Q0zG4XtqlpBjFjGUSjfNUWSrRztbXlMmzDcjHKjYHUPepJpoF100fK2q3XPiFRl6sEXzYeOdFgpaTdmGHS6DL9aWeCoYA/k6NV8YqHXujr14gOYOAWG6cRimpTJf8DtEDcxtp1w6fOEoN0b5PvV7dcpLiva8LYyZKPvFYBzlc5BZxOLvq6bvhQm54R6zoHFpaKOf7FeqhxI6KOQu4IPwU12YBlOP5CbkMAQ1cWWVQ4pnh0Hwh71Sjm848jS/OcammNzsp4xWaKt/pzcix3fpJt/MDP/9fxA8CAwEAAaNTMFEwHQYDVR0OBBYEFCIQ9l28Yy1/3qJvFarXjhKdG9tVMB8GA1UdIwQYMBaAFCIQ9l28Yy1/3qJvFarXjhKdG9tVMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKLPmLTppXYTTOOxHhTMyHI0oTl7ID2PQfJsref+jDshB3hib98BC17b9ESpLnwx7ugg17NRl7RYutxjuVw/CK/gwAnTMg3D3mdAnKkMRr3UxnD89KprLIpf7WQCmyJaxalsD5jjgl3kuGM7jf2FJNxQz5RrXBGlQHa465ouov+Rp5v/K5Umyt6wsCZXEbOF0SdUhEGU3nxVbFsoPimNYSHHwc29USnQmyW1O/drFDoTcOK4GdHFEVkrHQgqwU8ay1fYGYfIUDhsV/5AAWgQC41r9FWr+VQgyJC94qmDg0c46RE123dL/YifVUl2DKuJ0aOY+OkSgwknKZ+FQd+8d6k=", //nolint:lll
 		TLSAuth:       "bc470c93ff9f5602a8abb27dee84a52814d10f20490ad23c47d5d82120c1bf859e93d0696b455d4a1b8d55d40c2685c41ca1d0aef29a3efd27274c4ef09020a3978fe45784b335da6df2d12db97bbb838416515f2a96f04715fd28949c6fe296a925cfada3f8b8928ed7fc963c1563272f5cf46e5e1d9c845d7703ca881497b7e6564a9d1dea9358adffd435295479f47d5298fabf5359613ff5992cb57ff081a04dfb81a26513a6b44a9b5490ad265f8a02384832a59cc3e075ad545461060b7bcab49bac815163cb80983dd51d5b1fd76170ffd904d8291071e96efc3fb777856c717b148d08a510f5687b8a8285dcffe737b98916dd15ef6235dee4266d3b",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 //nolint:lll
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/example/updater/servers.go
+++ b/internal/provider/example/updater/servers.go
@@ -99,10 +99,10 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 			Region:   serverData.Region,
 			City:     serverData.City,
 			WgPubKey: serverData.WgPubKey,
-			UDP:      true,
 		}
 		if serverData.OpenVPNHostname != "" {
 			server.VPN = vpn.OpenVPN
+			server.UDP = true
 			server.TCP = true
 			server.Hostname = serverData.OpenVPNHostname
 			server.IPs = hostToIPs[serverData.OpenVPNHostname]
--- a/internal/provider/expressvpn/connection.go
+++ b/internal/provider/expressvpn/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(0, 1195, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/expressvpn/connection_test.go
+++ b/internal/provider/expressvpn/connection_test.go
@@ -28,6 +28,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 		filteredServers []models.Server
 		storageErr      error
 		selection       settings.ServerSelection
+		ipv6Supported   bool
 		connection      models.Connection
 		errWrapped      error
 		errMessage      string
@@ -94,12 +95,12 @@ func Test_Provider_GetConnection(t *testing.T) {

 			if testCase.panicMessage != "" {
 				assert.PanicsWithValue(t, testCase.panicMessage, func() {
-					_, _ = provider.GetConnection(testCase.selection)
+					_, _ = provider.GetConnection(testCase.selection, testCase.ipv6Supported)
 				})
 				return
 			}

-			connection, err := provider.GetConnection(testCase.selection)
+			connection, err := provider.GetConnection(testCase.selection, testCase.ipv6Supported)

 			assert.ErrorIs(t, err, testCase.errWrapped)
 			if testCase.errWrapped != nil {
--- a/internal/provider/expressvpn/openvpnconf.go
+++ b/internal/provider/expressvpn/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		RemoteCertTLS: true,
@@ -31,5 +31,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		// Always verify against `Server` x509 name prefix, security hole I guess?
 		VerifyX509Name: "Server",
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/fastestvpn/connection.go
+++ b/internal/provider/fastestvpn/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(4443, 4443, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/fastestvpn/openvpnconf.go
+++ b/internal/provider/fastestvpn/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
@@ -32,5 +32,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 			"comp-lzo",
 		},
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/fastestvpn/updater/filename.go
+++ b/internal/provider/fastestvpn/updater/filename.go
@@ -15,15 +15,15 @@ func parseFilename(fileName string) (
 	country string, tcp, udp bool, err error,
 ) {
 	const (
-		tcpSuffix = "-TCP.ovpn"
-		udpSuffix = "-UDP.ovpn"
+		tcpSuffix = "-tcp.ovpn"
+		udpSuffix = "-udp.ovpn"
 	)
 	var suffix string
 	switch {
-	case strings.HasSuffix(fileName, tcpSuffix):
+	case strings.HasSuffix(strings.ToLower(fileName), tcpSuffix):
 		suffix = tcpSuffix
 		tcp = true
-	case strings.HasSuffix(fileName, udpSuffix):
+	case strings.HasSuffix(strings.ToLower(fileName), udpSuffix):
 		suffix = udpSuffix
 		udp = true
 	default:
--- a/internal/provider/fastestvpn/updater/resolve.go
+++ b/internal/provider/fastestvpn/updater/resolve.go
@@ -10,13 +10,14 @@ func parallelResolverSettings(hosts []string) (settings resolver.ParallelSetting
 	const (
 		maxFailRatio = 0.1
 		maxNoNew     = 1
-		maxFails     = 2
+		maxFails     = 4
+		maxDuration  = 3 * time.Second
 	)
 	return resolver.ParallelSettings{
 		Hosts:        hosts,
 		MaxFailRatio: maxFailRatio,
 		Repeat: resolver.RepeatSettings{
-			MaxDuration: time.Second,
+			MaxDuration: maxDuration,
 			MaxNoNew:    maxNoNew,
 			MaxFails:    maxFails,
 			SortIPs:     true,
--- a/internal/provider/hidemyass/connection.go
+++ b/internal/provider/hidemyass/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(8080, 553, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/hidemyass/openvpnconf.go
+++ b/internal/provider/hidemyass/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
@@ -21,5 +21,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		RSAKey:        "MIIEpAIBAAKCAQEA5XY3ERJYWs/YIeBoybivNlu+M32rJs+CAZsh7BnnetTxytI4ngsMRoqXETuis8udp2hsqEHsglLR9tlk9C8yCuKhxbkpdrXFWdISmUq5sa7/wqg/zJF1AZm5Jy0oHNyTHfG6XW61I/h9IN5dmcR9YLir8DVDBNllbtt0z+DnvOhYJOqC30ENahWkTmNKl1cT7EBrR5slddiBJleAb08z77pwsD310e6jWTBySsBcPy+xu/Jj2QgVil/3mstZZDI+noFzs3SkTFBkha/lNTP7NODBQ6m39iaJxz6ZR1xE3v7XU0H5WnpZIcQ2+kmu5Krk2y1GYMKL+9oaotXFPz9v+QIDAQABAoIBAQCcMcssOMOiFWc3MC3EWo4SP4MKQ9n0Uj5Z34LI151FdJyehlj54+VYQ1Cv71tCbjED2sZUBoP69mtsT/EzcsjqtfiOwgrifrs2+BOm+0HKHKiGlcbP9peiHkT10PxEITWXpYtJvGlbcfOjIxqt6B28cBjCK09ShrVQL9ylAKBearRRUacszppntMNTMtN/uG48ZR9Wm+xAczImdG6CrG5sLI/++JwM5PDChLvn5JgMGyOfQZdjNe1oSOVLmqFeG5uu/FS4oMon9+HtfjHJr4ZgA1yQ2wQh3GvEjlP8zwHxEpRJYbxpj6ZbjHZJ2HLX/Gcd9/cXiN8+fQ2zPIYQyG9dAoGBAPUUmt2nJNvl7gj0GbZZ3XR9o+hvj7bJ74W2NhMrw6kjrrzHTAUQd1sBQS8szAQCLqf2ou1aw9AMMBdsLAHydXxvbH7IBAla7rKr23iethtSfjhTNSgQLJHVZlNHfp3hzNtCQZ7j0qVjrteNotrdVF7kKPHDXAK00ICy6SPNjvrXAoGBAO+vdnO15jLeZbbi3lQNS4r8oCadyqyX7ouKE6MtKNhiPsNPGqHKiGcKs/+QylVgYvSmm7TgpsCAiEYeLSPT+Yq3y7HtwVpULlpfAhEJXmvn/6hGpOizx1WNGWhw7nHPWPDzf+jqCGzHdhK0aEZR3MZZQ+U+uKfGiJ8vrvgB7eGvAoGAWxxp5nU48rcsIw/8bxpBhgkfYk33M5EnBqKSv9XJS5wEXhIJZOiWNrLktNEGl4boKXE7aNoRacreJhcE1UR6AOS7hPZ+6atwiePyF4mJUeb9HZtxa493wk9/Vv6BR9il++1Jz/QKX4oLef8hyBP4Rb60qgxirG7kBLR+j9zfhskCgYEAzA5y5xIeuIIU0H4XUDG9dcebxSSjbwsuYIgeLdb9pjMGQhsvjjyyoh8/nT20tLkJpkXN3FFCRjNnUWLRhWYrVkkh1wqWiYOPrwqh5MU4KN/sDWSPcznTY+drkTpMFoKzsvdrl2zf3VR3FneXKv742bkXj601Ykko+XWMHcLutisCgYBSq8IrsjzfaTQiTGI9a7WWsvzK92bq7Abnfq7swAXWcJd/bnjTQKLrrvt2bmwNvlWKAb3c69BFMn0X4t4PuN0iJQ39D6aQAEaM7HwWAmjf5TbodbmgbGxdsUB4xcCIQQ1mvTkigXWrCg0YAD2GZSoaslXAAVv6nR5qWEIa0Hx9GA==",                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 //nolint:lll
 		Ping:          5,
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/ipvanish/connection.go
+++ b/internal/provider/ipvanish/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(0, 443, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/ipvanish/openvpnconf.go
+++ b/internal/provider/ipvanish/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
 		Ciphers: []string{
@@ -19,5 +19,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		TLSCipher:      "TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA",
 		CA:             "MIIErTCCA5WgAwIBAgIJAMYKzSS8uPKDMA0GCSqGSIb3DQEBDQUAMIGVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCRkwxFDASBgNVBAcTC1dpbnRlciBQYXJrMREwDwYDVQQKEwhJUFZhbmlzaDEVMBMGA1UECxMMSVBWYW5pc2ggVlBOMRQwEgYDVQQDEwtJUFZhbmlzaCBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBpcHZhbmlzaC5jb20wHhcNMTIwMTExMTkzMjIwWhcNMjgxMTAyMTkzMjIwWjCBlTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkZMMRQwEgYDVQQHEwtXaW50ZXIgUGFyazERMA8GA1UEChMISVBWYW5pc2gxFTATBgNVBAsTDElQVmFuaXNoIFZQTjEUMBIGA1UEAxMLSVBWYW5pc2ggQ0ExIzAhBgkqhkiG9w0BCQEWFHN1cHBvcnRAaXB2YW5pc2guY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt9DBWNr/IKOuY3TmDP5x7vYZR0DGxLbXU8TyAzBbjUtFFMbhxlHiXVQrZHmgzih94x7BgXM7tWpmMKYVb+gNaqMdWE680Qm3nOwmhy/dulXDkEHAwD05i/iTx4ZaUdtV2vsKBxRg1vdC4AEiwD7bqV4HOi13xcG971aQ55Mj1KeCdA0aNvpat1LWx2jjWxsfI8s2Lv5Fkoi1HO1+vTnnaEsJZrBgAkLXpItqP29Lik3/OBIvkBIxlKrhiVPixE5qNiD+eSPirsmROvsyIonoJtuY4Dw5K6pcNlKyYiwo1IOFYU3YxffwFJk+bSW4WVBhsdf5dGxq/uOHmuz5gdwxCwIDAQABo4H9MIH6MAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFEv9FCWJHefBcIPX9p8RHCVOGe6uMIHKBgNVHSMEgcIwgb+AFEv9FCWJHefBcIPX9p8RHCVOGe6uoYGbpIGYMIGVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCRkwxFDASBgNVBAcTC1dpbnRlciBQYXJrMREwDwYDVQQKEwhJUFZhbmlzaDEVMBMGA1UECxMMSVBWYW5pc2ggVlBOMRQwEgYDVQQDEwtJUFZhbmlzaCBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBpcHZhbmlzaC5jb22CCQDGCs0kvLjygzANBgkqhkiG9w0BAQ0FAAOCAQEAI2dkh/43ksV2fdYpVGhYaFZPVqCJoToCez0IvOmLeLGzow+EOSrY508oyjYeNP4VJEjApqo0NrMbKl8g/8bpLBcotOCF1c1HZ+y9v7648uumh01SMjsbBeHOuQcLb+7gX6c0pEmxWv8qj5JiW3/1L1bktnjW5Yp5oFkFSMXjOnIoYKHyKLjN2jtwH6XowUNYpg4qVtKU0CXPdOznWcd9/zSfa393HwJPeeVLbKYaFMC4IEbIUmKYtWyoJ9pJ58smU3pWsHZUg9Zc0LZZNjkNlBdQSLmUHAJ33Bd7pJS0JQeiWviC+4UTmzEWRKa7pDGnYRYNu2cUo0/voStphv8EVA==", //nolint:lll
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/ivpn/connection.go
+++ b/internal/provider/ivpn/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 58237) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/ivpn/connection_test.go
+++ b/internal/provider/ivpn/connection_test.go
@@ -29,6 +29,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 		filteredServers []models.Server
 		storageErr      error
 		selection       settings.ServerSelection
+		ipv6Supported   bool
 		connection      models.Connection
 		errWrapped      error
 		errMessage      string
@@ -103,7 +104,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 			parallelResolver := (common.ParallelResolver)(nil)
 			provider := New(storage, randSource, client, warner, parallelResolver)

-			connection, err := provider.GetConnection(testCase.selection)
+			connection, err := provider.GetConnection(testCase.selection, testCase.ipv6Supported)

 			assert.ErrorIs(t, err, testCase.errWrapped)
 			if testCase.errWrapped != nil {
--- a/internal/provider/ivpn/openvpnconf.go
+++ b/internal/provider/ivpn/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
@@ -25,5 +25,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 			"key-direction 1",
 		},
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/ivpn/updater/servers.go
+++ b/internal/provider/ivpn/updater/servers.go
@@ -17,17 +17,17 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 		return nil, fmt.Errorf("failed fetching API: %w", err)
 	}

-	hosts := make([]string, 0, len(data.Servers))
+	hosts := make(map[string]struct{}, len(data.Servers))

 	for _, serverData := range data.Servers {
 		openVPNHost := serverData.Hostnames.OpenVPN
 		if openVPNHost != "" {
-			hosts = append(hosts, openVPNHost)
+			hosts[openVPNHost] = struct{}{}
 		}

 		wireguardHost := serverData.Hostnames.Wireguard
 		if wireguardHost != "" {
-			hosts = append(hosts, wireguardHost)
+			hosts[wireguardHost] = struct{}{}
 		}
 	}

@@ -36,7 +36,13 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 			common.ErrNotEnoughServers, len(hosts), minServers)
 	}

-	resolveSettings := parallelResolverSettings(hosts)
+	hostsSlice := make(sort.StringSlice, 0, len(hosts))
+	for host := range hosts {
+		hostsSlice = append(hostsSlice, host)
+	}
+	hostsSlice.Sort() // for predictable unit tests
+
+	resolveSettings := parallelResolverSettings(hostsSlice)
 	hostToIPs, warnings, err := u.parallelResolver.Resolve(ctx, resolveSettings)
 	for _, warning := range warnings {
 		u.warner.Warn(warning)
@@ -50,31 +56,40 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 			common.ErrNotEnoughServers, len(servers), minServers)
 	}

-	servers = make([]models.Server, 0, len(hosts))
+	servers = make([]models.Server, 0, len(hostToIPs))
 	for _, serverData := range data.Servers {
-		vpnType := vpn.OpenVPN
-		hostname := serverData.Hostnames.OpenVPN
-		tcp := true
-		wgPubKey := ""
-		if hostname == "" {
-			vpnType = vpn.Wireguard
-			hostname = serverData.Hostnames.Wireguard
-			tcp = false
-			wgPubKey = serverData.WgPubKey
+		server := models.Server{
+			Country: serverData.Country,
+			City:    serverData.City,
+			ISP:     serverData.ISP,
 		}

-		server := models.Server{
-			VPN:      vpnType,
-			Country:  serverData.Country,
-			City:     serverData.City,
-			ISP:      serverData.ISP,
-			Hostname: hostname,
-			WgPubKey: wgPubKey,
-			TCP:      tcp,
-			UDP:      true,
-			IPs:      hostToIPs[hostname],
+		openVPNHostname := serverData.Hostnames.OpenVPN
+		wireguardHostname := serverData.Hostnames.Wireguard
+		if openVPNHostname == "" && wireguardHostname == "" {
+			warning := fmt.Sprintf("server data %v has no OpenVPN nor Wireguard hostname", serverData)
+			warnings = append(warnings, warning)
+			continue
+		}
+
+		if openVPNHostname != "" {
+			openVPNServer := server
+			openVPNServer.Hostname = openVPNHostname
+			openVPNServer.VPN = vpn.OpenVPN
+			openVPNServer.UDP = true
+			openVPNServer.TCP = true
+			openVPNServer.IPs = hostToIPs[openVPNHostname]
+			servers = append(servers, openVPNServer)
+		}
+
+		if wireguardHostname != "" {
+			wireguardServer := server
+			wireguardServer.Hostname = wireguardHostname
+			wireguardServer.VPN = vpn.Wireguard
+			wireguardServer.IPs = hostToIPs[wireguardHostname]
+			wireguardServer.WgPubKey = serverData.WgPubKey
+			servers = append(servers, wireguardServer)
 		}
-		servers = append(servers, server)
 	}

 	sort.Sort(models.SortableServers(servers))
--- a/internal/provider/ivpn/updater/servers_test.go
+++ b/internal/provider/ivpn/updater/servers_test.go
@@ -124,7 +124,7 @@ func Test_Updater_GetServers(t *testing.T) {
 					IPs: []net.IP{{3, 3, 3, 3}, {4, 4, 4, 4}}},
 				{VPN: vpn.Wireguard,
 					Country: "Country3", City: "City C",
-					Hostname: "hostc", UDP: true,
+					Hostname: "hostc",
 					WgPubKey: "xyz",
 					IPs:      []net.IP{{5, 5, 5, 5}, {6, 6, 6, 6}}},
 			},
--- a/internal/provider/mullvad/connection.go
+++ b/internal/provider/mullvad/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 51820) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/mullvad/connection_test.go
+++ b/internal/provider/mullvad/connection_test.go
@@ -29,6 +29,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 		filteredServers []models.Server
 		storageErr      error
 		selection       settings.ServerSelection
+		ipv6Supported   bool
 		connection      models.Connection
 		errWrapped      error
 		errMessage      string
@@ -101,7 +102,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 			client := (*http.Client)(nil)
 			provider := New(storage, randSource, client)

-			connection, err := provider.GetConnection(testCase.selection)
+			connection, err := provider.GetConnection(testCase.selection, testCase.ipv6Supported)

 			assert.ErrorIs(t, err, testCase.errWrapped)
 			if testCase.errWrapped != nil {
--- a/internal/provider/mullvad/openvpnconf.go
+++ b/internal/provider/mullvad/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
@@ -24,5 +24,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		CA:            "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", //nolint:lll
 		UDPLines:      []string{"fast-io"},
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/mullvad/updater/hosttoserver.go
+++ b/internal/provider/mullvad/updater/hosttoserver.go
@@ -40,7 +40,6 @@ func (hts hostToServer) add(data serverData) (err error) {
 		server.TCP = true
 	case "wireguard":
 		server.VPN = vpn.Wireguard
-		server.UDP = true
 	case "bridge":
 		// ignore bridge servers
 		return nil
--- a/internal/provider/nordvpn/connection.go
+++ b/internal/provider/nordvpn/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 1194, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/nordvpn/openvpnconf.go
+++ b/internal/provider/nordvpn/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
@@ -32,5 +32,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 			"comp-lzo no", // Explicitly disable compression
 		},
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/perfectprivacy/connection.go
+++ b/internal/provider/perfectprivacy/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(443, 443, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/perfectprivacy/openvpnconf.go
+++ b/internal/provider/perfectprivacy/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
@@ -33,5 +33,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 			`pull-filter ignore "redirect-gateway def1 ipv6"`,
 		},
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/privado/connection.go
+++ b/internal/provider/privado/connection.go
@@ -6,9 +6,9 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	defaults := utils.NewConnectionDefaults(0, 1194, 0) //nolint:gomnd
 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/privado/openvpnconf.go
+++ b/internal/provider/privado/openvpnconf.go
@@ -8,7 +8,7 @@ import (
 )

 func (p *Provider) OpenVPNConfig(connection models.Connection,
-	settings settings.OpenVPN) (lines []string) {
+	settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
 	//nolint:gomnd
 	providerSettings := utils.OpenVPNProviderSettings{
 		AuthUserPass: true,
@@ -21,5 +21,5 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		VerifyX509Type: "name",
 		CA:             "MIIFKDCCAxCgAwIBAgIJAMtrmqZxIV/OMA0GCSqGSIb3DQEBDQUAMBIxEDAOBgNVBAMMB1ByaXZhZG8wHhcNMjAwMTA4MjEyODQ1WhcNMzUwMTA5MjEyODQ1WjASMRAwDgYDVQQDDAdQcml2YWRvMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxPwOgiwNJzZTnKIXwAB0TSu/Lu2qt2U2I8obtQjwhi/7OrfmbmYykSdro70al2XPhnwAGGdCxW6LDnp0UN/IOhD11mgBPo14f5CLkBQjSJ6VN5miPbvK746LsNZl9H8rQGvDuPo4CG9BfPZMiDRGlsMxij/jztzgT1gmuxQ7WHfFRcNzBas1dHa9hV/d3TU6/t47x4SE/ljdcCtJiu7Zn6ODKQoys3mB7Luz2ngqUJWvkqsg+E4+3eJ0M8Hlbn5TPaRJBID7DAdYo6Vs6xGCYr981ThFcmoIQ10js10yANrrfGAzd03b3TnLAgko0uQMHjliMZL6L8sWOPHxyxJI0us88SFh4UgcFyRHKHPKux7w24SxAlZUYoUcTHp9VjG5XvDKYxzgV2RdM4ulBGbQRQ3y3/CyddsyQYMvA55Ets0LfPaBvDIcct70iXijGsdvlX1du3ArGpG7Vaje/RU4nbbGT6HYRdt5YyZfof288ukMOSj20nVcmS+c/4tqsxSerRb1aq5LOi1IemSkTMeC5gCbexk+L1vl7NT/58sxjGmu5bXwnvev/lIItfi2AlITrfUSEv19iDMKkeshwn/+sFJBMWYyluP+yJ56yR+MWoXvLlSWphLDTqq19yx3BZn0P1tgbXoR0g8PTdJFcz8z3RIb7myVLYulV1oGG/3rka0CAwEAAaOBgDB+MB0GA1UdDgQWBBTFtJkZCVDuDAD6k5bJzefjJdO3DTBCBgNVHSMEOzA5gBTFtJkZCVDuDAD6k5bJzefjJdO3DaEWpBQwEjEQMA4GA1UEAwwHUHJpdmFkb4IJAMtrmqZxIV/OMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBDQUAA4ICAQB7MUSXMeBb9wlSv4sUaT1JHEwE26nlBw+TKmezfuPU5pBlY0LYr6qQZY95DHqsRJ7ByUzGUrGo17dNGXlcuNc6TAaQQEDRPo6y+LVh2TWMk15TUMI+MkqryJtCret7xGvDigKYMJgBy58HN3RAVr1B7cL9youwzLgc2Y/NcFKvnQJKeiIYAJ7g0CcnJiQvgZTS7xdwkEBXfsngmUCIG320DLPEL+Ze0HiUrxwWljMRya6i40AeH3Zu2i532xX1wV5+cjA4RJWIKg6ri/Q54iFGtZrA9/nc6y9uoQHkmz8cGyVUmJxFzMrrIICVqUtVRxLhkTMe4UzwRWTBeGgtW4tS0yq1QonAKfOyjgRw/CeY55D2UGvnAFZdTadtYXS4Alu2P9zdwoEk3fzHiVmDjqfJVr5wz9383aABUFrPI3nz6ed/Z6LZflKh1k+DUDEp8NxU4klUULWsSOKoa5zGX51G8cdHxwQLImXvtGuN5eSR8jCTgxFZhdps/xes4KkyfIz9FMYG748M+uOTgKITf4zdJ9BAyiQaOufVQZ8WjhWzWk9YHec9VqPkzpWNGkVjiRI5ewuXwZzZ164tMv2hikBXSuUCnFz37/ZNwGlDi0oBdDszCk2GxccdFHHaCSmpjU5MrdJ+5IhtTKGeTx+US2hTIVHQFIO99DmacxSYvLNcSQ==", //nolint:lll
 	}
-	return utils.OpenVPNConfig(providerSettings, connection, settings)
+	return utils.OpenVPNConfig(providerSettings, connection, settings, ipv6Supported)
 }
--- a/internal/provider/privateinternetaccess/connection.go
+++ b/internal/provider/privateinternetaccess/connection.go
@@ -7,7 +7,7 @@ import (
 	"github.com/qdm12/gluetun/internal/provider/utils"
 )

-func (p *Provider) GetConnection(selection settings.ServerSelection) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, ipv6Supported bool) (
 	connection models.Connection, err error) {
 	// Set port defaults depending on encryption preset.
 	var defaults utils.ConnectionDefaults
@@ -21,5 +21,5 @@ func (p *Provider) GetConnection(selection settings.ServerSelection) (
 	}

 	return utils.GetConnection(p.Name(),
-		p.storage, selection, defaults, p.randSource)
+		p.storage, selection, defaults, ipv6Supported, p.randSource)
 }
--- a/internal/provider/privateinternetaccess/httpclient_test.go
+++ b/internal/provider/privateinternetaccess/httpclient_test.go
@@ -30,7 +30,7 @@ func Test_newHTTPClient(t *testing.T) {
 	piaTransport, ok := piaClient.Transport.(*http.Transport)
 	require.True(t, ok)

-	subjects := piaTransport.TLSClientConfig.RootCAs.Subjects()
+	subjects := piaTransport.TLSClientConfig.RootCAs.Subjects() //nolint:staticcheck
 	assert.NotEmpty(t, subjects)
 	piaCertFound := false
 	for _, subject := range subjects {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]	126804c15e	Chore(deps): Bump golang.org/x/text from 0.3.7 to 0.4.0 (#1198 )	2022-10-28 07:24:35 -04:00
dependabot[bot]	a7643c6201	Chore(deps): Bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (#1210 )	2022-10-28 07:24:20 -04:00
dependabot[bot]	db2de5fc84	Chore(deps): Bump docker/build-push-action from 3.1.1 to 3.2.0 (#1193 )	2022-10-28 07:24:04 -04:00
dependabot[bot]	5c7b9aa6a1	Chore(deps): Bump github.com/breml/rootcerts from 0.2.6 to 0.2.8 (#1173 )	2022-10-28 07:23:40 -04:00
Quentin McGaw	63890c159e	feat(servers): update FastestVPN servers	2022-10-28 11:02:39 +00:00
Quentin McGaw	e7d5ae5dc1	fix(fastestvpn): handle lowercase .ovpn filenames	2022-10-28 11:02:24 +00:00
Quentin McGaw	b275354a92	fix(env): trim space for wireguard addresses	2022-10-28 10:49:51 +00:00
Quentin McGaw	ac02a64d17	fix(ipinfo): handle `403` as too many requests	2022-10-28 10:35:29 +00:00
Quentin McGaw	9c80150e09	fix(publicip): no retry when too many requests to ipinfo.io	2022-10-28 10:35:09 +00:00
Quentin McGaw	31a8bc9062	feat(servers): update PureVPN	2022-10-28 09:11:33 +00:00
Quentin McGaw	f15dde6502	feat(providers): add AirVPN support (#1145 )	2022-10-17 02:54:56 -04:00
Quentin McGaw	f70609c464	fix(wireguard): ignore IPv6 addresses if IPv6 disabled	2022-10-17 06:31:32 +00:00
Quentin McGaw	c954e6f231	fix: parse `udp4`, `udp6`, `tcp4` or `tcp6`	2022-10-16 16:54:12 +00:00
Quentin McGaw	cb804577a9	feat(httpproxy): log credentials sent on mismatch	2022-10-02 09:31:03 +00:00
Quentin McGaw	e5be20d719	fix(exit): exit with `0` on successful shutdown	2022-09-14 13:23:31 +00:00
EkilDeew	875690ab18	feat(network): enable ipv6 connection and tunneling (#1114 ) Co-authored-by: Quentin McGaw <quentin.mcgaw@gmail.com>	2022-09-13 17:18:10 -07:00
Quentin McGaw	6a5aa8eddb	fix(openvpn): do not set `tun-ipv6` - Server should push `tun-ipv6` if it is available - Add ignore filter for `tun-ipv6` if ipv6 is not supported on client - Fixes #435	2022-09-14 00:03:31 +00:00
Quentin McGaw	7fdc7de210	feat(ipv6): use ipv6 endpoint IPs if supported	2022-09-12 21:31:37 +00:00
Quentin McGaw	dd7630997b	fix(vpnsecure): allow empty OpenVPN user+password	2022-09-10 14:46:17 +00:00
Quentin McGaw	aba5ca4536	fix(cyberghost): remove outdated server groups - Remove `94-1` pemium udp usa - Remove `95-1` premium udp asia - Remove `93-1` pemium udp usa - Remove `96-1` premium tcp asia - Update servers data	2022-09-08 12:19:12 +00:00
Quentin McGaw	7506625f40	chore(tests): fix netlink test for previous crash	2022-09-06 12:17:51 +00:00
Quentin McGaw	5ddd703f6a	feat(vpn): auto detection of IPv6 support - `OPENVPN_IPV6` removed - Affects OpenVPN - Use the same mechanism for OpenVPN and Wireguard - Check only once at program start since this is unlikely to change at runtime - Log if IPv6 is supported - Remove `IPv6` boolean from settings structs - Move IPv6 detection as a method on NetLinker	2022-09-06 12:16:29 +00:00
Quentin McGaw	71c51a7455	chore(provider/utils): do not check for empty wg keys	2022-09-05 15:50:02 +00:00
Quentin McGaw	284d4340b1	fix(tests): fix netlink wireguard test	2022-09-05 15:23:31 +00:00
Quentin McGaw	2c1281d0a2	hotfix(tests): panic tests for previous commit	2022-09-05 15:04:43 +00:00
Stijn Hoop	532df9f8d4	fix(privateinternetaccess): get token for port forwarding (#1132 )	2022-09-05 08:01:48 -07:00
Quentin McGaw	45b7da1058	chore(dev): improve missing provider panic string	2022-09-05 14:51:30 +00:00
Quentin McGaw	907daff483	chore(build): tidy Go modules dependencies	2022-09-04 23:01:02 +00:00
Quentin McGaw	7757e8a114	chore(dev): improve update command launch config - Run without `debug` mode - Run from workspace folder so it writes to the right path - Pick `-maintainer` or `-enduser` update mode	2022-09-04 18:40:08 +00:00
Quentin McGaw	e59e28152f	fix(ivpn): update mechanism for Wireguard servers	2022-09-02 00:36:13 +00:00
Quentin McGaw	2fe0594db7	feat(servers): update ProtonVPN servers data	2022-08-30 11:44:34 +00:00
Quentin McGaw	794e96b449	docs(readme): add ProtonVPN and PureVPN to Wireguard support	2022-08-29 00:31:38 +00:00
Quentin McGaw	07282f414c	chore(wireguard): upgrade wireguard depdencies	2022-08-27 18:37:24 +00:00
Quentin McGaw	e583f9de47	fix(codeql): fix integer parsing (false positive)	2022-08-27 16:45:29 +00:00
Quentin McGaw	8570e09eb9	chore(config): rename `Reader` to `Source` struct	2022-08-26 15:40:35 +00:00
Quentin McGaw	ae5cba519c	chore(config): define Source interface locally where needed	2022-08-26 15:03:59 +00:00
Quentin McGaw	26f3832187	chore(config): rename `mux` source to `merge`	2022-08-26 14:59:35 +00:00
Quentin McGaw	5989f29035	feat(surfshark): Wireguard support (#587 )	2022-08-26 07:55:46 -07:00
Quentin McGaw	4ace99f318	chore(servers): remove `"udp": true` for Wireguard	2022-08-25 13:24:22 +00:00
Quentin McGaw	d1c5e00df8	fix(updater): error when server has not the minimal information	2022-08-25 13:23:27 +00:00
Quentin McGaw	5eacb46226	feat(servers): update servers data for Ivpn, Mullvad and Windscribe	2022-08-25 13:05:20 +00:00
Quentin McGaw	6c17612310	chore(filter): no network protocol filter for Wireguard	2022-08-25 13:03:58 +00:00
Quentin McGaw	fba73a0a0f	fix(settings): `OPENVPN_CUSTOM_CONFIG` precedence for custom provider only if `VPN_SERVICE_PROVIDER` is empty	2022-08-25 04:01:17 +00:00
Quentin McGaw	4faef87c03	chore(build): bump Go from 1.18 to 1.19	2022-08-24 21:54:49 +00:00
Quentin McGaw	5914cb0e37	chore(build): bump Go from 1.17 to 1.18 - Unneeded disabled linters are: `rowserrcheck`, `sqlclosecheck` - Disabled linter is `wastedassign` which is tolerable	2022-08-24 21:54:08 +00:00