fix(httpproxy): redirect from http to https

Credits to @Thamos88 and @15ky3

.devcontainer/docker-compose.yml

@@ -18,8 +18,6 @@ services:
       - ~/.ssh:/mnt/ssh
       # Shell history persistence
       - ~/.zsh_history:/root/.zsh_history
-      # Git config
-      - ~/.gitconfig:/root/.gitconfig
     environment:
       - TZ=
     cap_add:

.golangci.yml

@@ -29,6 +29,10 @@ issues:
     - text: "returns interface \\(github\\.com\\/vishvananda\\/netlink\\.Link\\)"
       linters:
         - ireturn
+    - path: "internal\\/openvpn\\/pkcs8\\/descbc\\.go"
+      text: "newCipherDESCBCBlock returns interface \\(github\\.com\\/youmark\\/pkcs8\\.Cipher\\)"
+      linters:
+        - ireturn
 
 linters:
   enable:

Dockerfile

@@ -2,7 +2,7 @@ ARG ALPINE_VERSION=3.17
 ARG GO_ALPINE_VERSION=3.17
 ARG GO_VERSION=1.20
 ARG XCPUTRANSLATE_VERSION=v0.6.0
-ARG GOLANGCI_LINT_VERSION=v1.51.2
+ARG GOLANGCI_LINT_VERSION=v1.52.2
 ARG MOCKGEN_VERSION=v1.6.0
 ARG BUILDPLATFORM=linux/amd64
 
@@ -108,8 +108,8 @@ ENV VPN_SERVICE_PROVIDER=pia \
     OWNED_ONLY=no \
     # # Private Internet Access only:
     PRIVATE_INTERNET_ACCESS_OPENVPN_ENCRYPTION_PRESET= \
-    PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING=off \
-    PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
+    VPN_PORT_FORWARDING=off \
+    VPN_PORT_FORWARDING_STATUS_FILE="/tmp/gluetun/forwarded_port" \
     # # Cyberghost only:
     OPENVPN_CERT= \
     OPENVPN_KEY= \
@@ -141,6 +141,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
     # Health
     HEALTH_SERVER_ADDRESS=127.0.0.1:9999 \
     HEALTH_TARGET_ADDRESS=cloudflare.com:443 \
+    HEALTH_SUCCESS_WAIT_DURATION=5s \
     HEALTH_VPN_DURATION_INITIAL=6s \
     HEALTH_VPN_DURATION_ADDITION=5s \
     # DNS over TLS

cmd/gluetun/main.go

@@ -325,6 +325,11 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
 		return err
 	}
 
+	err = routingConf.AddLocalRules(localNetworks)
+	if err != nil {
+		return fmt.Errorf("adding local rules: %w", err)
+	}
+
 	const tunDevice = "/dev/net/tun"
 	if err := tun.Check(tunDevice); err != nil {
 		logger.Info(err.Error() + "; creating it...")

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/breml/rootcerts v0.2.10
-	github.com/fatih/color v1.14.1
+	github.com/fatih/color v1.15.0
 	github.com/golang/mock v1.6.0
 	github.com/qdm12/dns v1.11.0
 	github.com/qdm12/golibs v0.0.0-20210822203818-5c568b0777b6
@@ -16,34 +16,35 @@ require (
 	github.com/qdm12/ss-server v0.4.0
 	github.com/qdm12/updated v0.0.0-20210603204757-205acfe6937e
 	github.com/stretchr/testify v1.8.2
-	github.com/vishvananda/netlink v1.1.1-0.20211129163951-9ada19101fc5
+	github.com/vishvananda/netlink v1.2.1-beta.2
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
-	golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2
-	golang.org/x/sys v0.6.0
-	golang.org/x/text v0.8.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
+	golang.org/x/exp v0.0.0-20230519143937-03e91628a987
+	golang.org/x/net v0.10.0
+	golang.org/x/sys v0.8.0
+	golang.org/x/text v0.9.0
+	golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde
+	inet.af/netaddr v0.0.0-20220811202034-502d2d690317
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/google/go-cmp v0.5.7 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/josharian/native v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mdlayher/genetlink v1.2.0 // indirect
-	github.com/mdlayher/netlink v1.6.0 // indirect
+	github.com/mdlayher/netlink v1.6.2 // 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
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
-	go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
+	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
 	go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 // 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
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -14,8 +14,8 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
 github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -36,10 +36,12 @@ 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/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 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/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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=
@@ -64,8 +66,9 @@ github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPn
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 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/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
+github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
 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=
@@ -118,8 +121,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/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/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs=
+github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
@@ -128,10 +131,13 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqTosly
 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go4.org/intern v0.0.0-20210108033219-3eb7198706b2 h1:VFTf+jjIgsldaz/Mr00VaCSswHJrI2hIjQygE/W4IMg=
 go4.org/intern v0.0.0-20210108033219-3eb7198706b2/go.mod h1:vLqJ+12kCw61iCWsPto0EOHhBS+o4rO5VIucbc9g2Cc=
+go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
+go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222175341-b30ae309168e/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 h1:QJ/xcIANMLApehfgPCHnfK1hZiaMmbaTVmPv7DAoTbo=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -142,13 +148,16 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 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/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/exp v0.0.0-20230519143937-03e91628a987 h1:3xJIFvzUFbu4ls0BTBYcgbCGhA63eAOEMxIHugyXJqA=
+golang.org/x/exp v0.0.0-20230519143937-03e91628a987/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/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-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -157,12 +166,15 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 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/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 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/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -182,9 +194,11 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 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-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/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=
@@ -192,8 +206,9 @@ 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/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 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=
@@ -203,14 +218,13 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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/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=
+golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
+golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
+golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b h1:J1CaxgLerRR5lgx3wnr6L04cJFbWoceSK9JWBdglINo=
+golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde h1:ybF7AMzIUikL9x4LgwEmzhXtzRpKNqngme1VGDWz+Nk=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde/go.mod h1:mQqgjkW8GQQcJQsbBvK890TKqUK1DfKWkuBGbOkuMHQ=
 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=
@@ -223,6 +237,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 h1:Wobr37noukisGxpKo5jAsLREcpj61RxrWYzD8uwveOY=
 inet.af/netaddr v0.0.0-20210511181906-37180328850c/go.mod h1:z0nx+Dh+7N7CC8V5ayHtHGpZpxLQZZxkIaaz6HN65Ls=
-inet.af/netaddr v0.0.0-20210718074554-06ca8145d722 h1:Qws2rZnQudC58cIagVucPQDLmMi3kAXgxscsgD0v6DU=
-inet.af/netaddr v0.0.0-20210718074554-06ca8145d722/go.mod h1:z0nx+Dh+7N7CC8V5ayHtHGpZpxLQZZxkIaaz6HN65Ls=
+inet.af/netaddr v0.0.0-20220811202034-502d2d690317 h1:U2fwK6P2EqmopP/hFLTOAjWTki0qgd4GMJn5X8wOleU=
+inet.af/netaddr v0.0.0-20220811202034-502d2d690317/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k=

internal/alpine/version.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-func (a *Alpine) Version(ctx context.Context) (version string, err error) {
+func (a *Alpine) Version(context.Context) (version string, err error) {
 	file, err := os.OpenFile(a.alpineReleasePath, os.O_RDONLY, 0)
 	if err != nil {
 		return "", err

internal/cli/ci.go

@@ -2,6 +2,6 @@ package cli
 
 import "context"
 
-func (c *CLI) CI(context context.Context) error {
+func (c *CLI) CI(context.Context) error {
 	return nil
 }

internal/cli/formatservers.go

@@ -61,7 +61,7 @@ func (c *CLI) FormatServers(args []string) error {
 	}
 	switch len(providers) {
 	case 0:
-		return ErrProviderUnspecified
+		return fmt.Errorf("%w", ErrProviderUnspecified)
 	case 1:
 	default:
 		return fmt.Errorf("%w: %d specified: %s",

internal/cli/healthcheck.go

@@ -9,7 +9,7 @@ import (
 	"github.com/qdm12/gluetun/internal/healthcheck"
 )
 
-func (c *CLI) HealthCheck(ctx context.Context, source Source, warner Warner) error {
+func (c *CLI) HealthCheck(ctx context.Context, source Source, _ Warner) error {
 	// Extract the health server port from the configuration.
 	config, err := source.ReadHealth()
 	if err != nil {

internal/cli/nooplogger.go

@@ -8,9 +8,9 @@ func newNoopLogger() *noopLogger {
 	return new(noopLogger)
 }
 
-func (l *noopLogger) Debug(s string)                 {}
-func (l *noopLogger) Info(s string)                  {}
-func (l *noopLogger) Warn(s string)                  {}
-func (l *noopLogger) Error(s string)                 {}
-func (l *noopLogger) PatchLevel(level logging.Level) {}
-func (l *noopLogger) PatchPrefix(prefix string)      {}
+func (l *noopLogger) Debug(string)             {}
+func (l *noopLogger) Info(string)              {}
+func (l *noopLogger) Warn(string)              {}
+func (l *noopLogger) Error(string)             {}
+func (l *noopLogger) PatchLevel(logging.Level) {}
+func (l *noopLogger) PatchPrefix(string)       {}

internal/cli/openvpnconfig.go

@@ -3,8 +3,8 @@ package cli
 import (
 	"context"
 	"fmt"
-	"net"
 	"net/http"
+	"net/netip"
 	"strings"
 	"time"
 
@@ -28,11 +28,11 @@ type Unzipper interface {
 
 type ParallelResolver interface {
 	Resolve(ctx context.Context, settings resolver.ParallelSettings) (
-		hostToIPs map[string][]net.IP, warnings []string, err error)
+		hostToIPs map[string][]netip.Addr, warnings []string, err error)
 }
 
 type IPFetcher interface {
-	FetchMultiInfo(ctx context.Context, ips []net.IP) (data []ipinfo.Response, err error)
+	FetchMultiInfo(ctx context.Context, ips []netip.Addr) (data []ipinfo.Response, err error)
 }
 
 type IPv6Checker interface {

internal/cli/update.go

@@ -51,14 +51,14 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
 	}
 
 	if !endUserMode && !maintainerMode {
-		return ErrModeUnspecified
+		return fmt.Errorf("%w", ErrModeUnspecified)
 	}
 
 	if updateAll {
 		options.Providers = providers.All()
 	} else {
 		if csvProviders == "" {
-			return ErrNoProviderSpecified
+			return fmt.Errorf("%w", ErrNoProviderSpecified)
 		}
 		options.Providers = strings.Split(csvProviders, ",")
 	}

internal/configuration/settings/dns.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
@@ -13,9 +13,9 @@ type DNS struct {
 	// ServerAddress is the DNS server to use inside
 	// the Go program and for the system.
 	// It defaults to '127.0.0.1' to be used with the
-	// DoT server. It cannot be nil in the internal
+	// DoT server. It cannot be the zero value in the internal
 	// state.
-	ServerAddress net.IP
+	ServerAddress netip.Addr
 	// KeepNameserver is true if the Docker DNS server
 	// found in /etc/resolv.conf should be kept.
 	// Note settings this to true will go around the
@@ -39,8 +39,8 @@ func (d DNS) validate() (err error) {
 
 func (d *DNS) Copy() (copied DNS) {
 	return DNS{
-		ServerAddress:  helpers.CopyIP(d.ServerAddress),
-		KeepNameserver: helpers.CopyBoolPtr(d.KeepNameserver),
+		ServerAddress:  d.ServerAddress,
+		KeepNameserver: helpers.CopyPointer(d.KeepNameserver),
 		DoT:            d.DoT.copy(),
 	}
 }
@@ -49,7 +49,7 @@ func (d *DNS) Copy() (copied DNS) {
 // unset field of the receiver settings object.
 func (d *DNS) mergeWith(other DNS) {
 	d.ServerAddress = helpers.MergeWithIP(d.ServerAddress, other.ServerAddress)
-	d.KeepNameserver = helpers.MergeWithBool(d.KeepNameserver, other.KeepNameserver)
+	d.KeepNameserver = helpers.MergeWithPointer(d.KeepNameserver, other.KeepNameserver)
 	d.DoT.mergeWith(other.DoT)
 }
 
@@ -58,14 +58,14 @@ func (d *DNS) mergeWith(other DNS) {
 // settings.
 func (d *DNS) overrideWith(other DNS) {
 	d.ServerAddress = helpers.OverrideWithIP(d.ServerAddress, other.ServerAddress)
-	d.KeepNameserver = helpers.OverrideWithBool(d.KeepNameserver, other.KeepNameserver)
+	d.KeepNameserver = helpers.OverrideWithPointer(d.KeepNameserver, other.KeepNameserver)
 	d.DoT.overrideWith(other.DoT)
 }
 
 func (d *DNS) setDefaults() {
-	localhost := net.IPv4(127, 0, 0, 1) //nolint:gomnd
+	localhost := netip.AddrFrom4([4]byte{127, 0, 0, 1})
 	d.ServerAddress = helpers.DefaultIP(d.ServerAddress, localhost)
-	d.KeepNameserver = helpers.DefaultBool(d.KeepNameserver, false)
+	d.KeepNameserver = helpers.DefaultPointer(d.KeepNameserver, false)
 	d.DoT.setDefaults()
 }
 

internal/configuration/settings/dnsblacklist.go

@@ -3,12 +3,12 @@ package settings
 import (
 	"errors"
 	"fmt"
+	"net/netip"
 	"regexp"
 
 	"github.com/qdm12/dns/pkg/blacklist"
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
-	"inet.af/netaddr"
 )
 
 // DNSBlacklist is settings for the DNS blacklist building.
@@ -18,14 +18,14 @@ type DNSBlacklist struct {
 	BlockSurveillance    *bool
 	AllowedHosts         []string
 	AddBlockedHosts      []string
-	AddBlockedIPs        []netaddr.IP
-	AddBlockedIPPrefixes []netaddr.IPPrefix
+	AddBlockedIPs        []netip.Addr
+	AddBlockedIPPrefixes []netip.Prefix
 }
 
 func (b *DNSBlacklist) setDefaults() {
-	b.BlockMalicious = helpers.DefaultBool(b.BlockMalicious, true)
-	b.BlockAds = helpers.DefaultBool(b.BlockAds, false)
-	b.BlockSurveillance = helpers.DefaultBool(b.BlockSurveillance, true)
+	b.BlockMalicious = helpers.DefaultPointer(b.BlockMalicious, true)
+	b.BlockAds = helpers.DefaultPointer(b.BlockAds, false)
+	b.BlockSurveillance = helpers.DefaultPointer(b.BlockSurveillance, true)
 }
 
 var hostRegex = regexp.MustCompile(`^([a-zA-Z0-9]|[a-zA-Z0-9_][a-zA-Z0-9\-_]{0,61}[a-zA-Z0-9_])(\.([a-zA-Z0-9]|[a-zA-Z0-9_][a-zA-Z0-9\-_]{0,61}[a-zA-Z0-9]))*$`) //nolint:lll
@@ -53,34 +53,34 @@ func (b DNSBlacklist) validate() (err error) {
 
 func (b DNSBlacklist) copy() (copied DNSBlacklist) {
 	return DNSBlacklist{
-		BlockMalicious:       helpers.CopyBoolPtr(b.BlockMalicious),
-		BlockAds:             helpers.CopyBoolPtr(b.BlockAds),
-		BlockSurveillance:    helpers.CopyBoolPtr(b.BlockSurveillance),
-		AllowedHosts:         helpers.CopyStringSlice(b.AllowedHosts),
-		AddBlockedHosts:      helpers.CopyStringSlice(b.AddBlockedHosts),
-		AddBlockedIPs:        helpers.CopyNetaddrIPsSlice(b.AddBlockedIPs),
-		AddBlockedIPPrefixes: helpers.CopyIPPrefixSlice(b.AddBlockedIPPrefixes),
+		BlockMalicious:       helpers.CopyPointer(b.BlockMalicious),
+		BlockAds:             helpers.CopyPointer(b.BlockAds),
+		BlockSurveillance:    helpers.CopyPointer(b.BlockSurveillance),
+		AllowedHosts:         helpers.CopySlice(b.AllowedHosts),
+		AddBlockedHosts:      helpers.CopySlice(b.AddBlockedHosts),
+		AddBlockedIPs:        helpers.CopySlice(b.AddBlockedIPs),
+		AddBlockedIPPrefixes: helpers.CopySlice(b.AddBlockedIPPrefixes),
 	}
 }
 
 func (b *DNSBlacklist) mergeWith(other DNSBlacklist) {
-	b.BlockMalicious = helpers.MergeWithBool(b.BlockMalicious, other.BlockMalicious)
-	b.BlockAds = helpers.MergeWithBool(b.BlockAds, other.BlockAds)
-	b.BlockSurveillance = helpers.MergeWithBool(b.BlockSurveillance, other.BlockSurveillance)
-	b.AllowedHosts = helpers.MergeStringSlices(b.AllowedHosts, other.AllowedHosts)
-	b.AddBlockedHosts = helpers.MergeStringSlices(b.AddBlockedHosts, other.AddBlockedHosts)
-	b.AddBlockedIPs = helpers.MergeNetaddrIPsSlices(b.AddBlockedIPs, other.AddBlockedIPs)
-	b.AddBlockedIPPrefixes = helpers.MergeIPPrefixesSlices(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
+	b.BlockMalicious = helpers.MergeWithPointer(b.BlockMalicious, other.BlockMalicious)
+	b.BlockAds = helpers.MergeWithPointer(b.BlockAds, other.BlockAds)
+	b.BlockSurveillance = helpers.MergeWithPointer(b.BlockSurveillance, other.BlockSurveillance)
+	b.AllowedHosts = helpers.MergeSlices(b.AllowedHosts, other.AllowedHosts)
+	b.AddBlockedHosts = helpers.MergeSlices(b.AddBlockedHosts, other.AddBlockedHosts)
+	b.AddBlockedIPs = helpers.MergeSlices(b.AddBlockedIPs, other.AddBlockedIPs)
+	b.AddBlockedIPPrefixes = helpers.MergeSlices(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
 }
 
 func (b *DNSBlacklist) overrideWith(other DNSBlacklist) {
-	b.BlockMalicious = helpers.OverrideWithBool(b.BlockMalicious, other.BlockMalicious)
-	b.BlockAds = helpers.OverrideWithBool(b.BlockAds, other.BlockAds)
-	b.BlockSurveillance = helpers.OverrideWithBool(b.BlockSurveillance, other.BlockSurveillance)
-	b.AllowedHosts = helpers.OverrideWithStringSlice(b.AllowedHosts, other.AllowedHosts)
-	b.AddBlockedHosts = helpers.OverrideWithStringSlice(b.AddBlockedHosts, other.AddBlockedHosts)
-	b.AddBlockedIPs = helpers.OverrideWithNetaddrIPsSlice(b.AddBlockedIPs, other.AddBlockedIPs)
-	b.AddBlockedIPPrefixes = helpers.OverrideWithIPPrefixesSlice(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
+	b.BlockMalicious = helpers.OverrideWithPointer(b.BlockMalicious, other.BlockMalicious)
+	b.BlockAds = helpers.OverrideWithPointer(b.BlockAds, other.BlockAds)
+	b.BlockSurveillance = helpers.OverrideWithPointer(b.BlockSurveillance, other.BlockSurveillance)
+	b.AllowedHosts = helpers.OverrideWithSlice(b.AllowedHosts, other.AllowedHosts)
+	b.AddBlockedHosts = helpers.OverrideWithSlice(b.AddBlockedHosts, other.AddBlockedHosts)
+	b.AddBlockedIPs = helpers.OverrideWithSlice(b.AddBlockedIPs, other.AddBlockedIPs)
+	b.AddBlockedIPPrefixes = helpers.OverrideWithSlice(b.AddBlockedIPPrefixes, other.AddBlockedIPPrefixes)
 }
 
 func (b DNSBlacklist) ToBlacklistFormat() (settings blacklist.BuilderSettings, err error) {
@@ -90,8 +90,8 @@ func (b DNSBlacklist) ToBlacklistFormat() (settings blacklist.BuilderSettings, e
 		BlockSurveillance:    *b.BlockSurveillance,
 		AllowedHosts:         b.AllowedHosts,
 		AddBlockedHosts:      b.AddBlockedHosts,
-		AddBlockedIPs:        b.AddBlockedIPs,
-		AddBlockedIPPrefixes: b.AddBlockedIPPrefixes,
+		AddBlockedIPs:        netipAddressesToNetaddrIPs(b.AddBlockedIPs),
+		AddBlockedIPPrefixes: netipPrefixesToNetaddrIPPrefixes(b.AddBlockedIPPrefixes),
 	}, nil
 }
 

internal/configuration/settings/dot.go

@@ -54,8 +54,8 @@ func (d DoT) validate() (err error) {
 
 func (d *DoT) copy() (copied DoT) {
 	return DoT{
-		Enabled:      helpers.CopyBoolPtr(d.Enabled),
-		UpdatePeriod: helpers.CopyDurationPtr(d.UpdatePeriod),
+		Enabled:      helpers.CopyPointer(d.Enabled),
+		UpdatePeriod: helpers.CopyPointer(d.UpdatePeriod),
 		Unbound:      d.Unbound.copy(),
 		Blacklist:    d.Blacklist.copy(),
 	}
@@ -64,8 +64,8 @@ func (d *DoT) copy() (copied DoT) {
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (d *DoT) mergeWith(other DoT) {
-	d.Enabled = helpers.MergeWithBool(d.Enabled, other.Enabled)
-	d.UpdatePeriod = helpers.MergeWithDurationPtr(d.UpdatePeriod, other.UpdatePeriod)
+	d.Enabled = helpers.MergeWithPointer(d.Enabled, other.Enabled)
+	d.UpdatePeriod = helpers.MergeWithPointer(d.UpdatePeriod, other.UpdatePeriod)
 	d.Unbound.mergeWith(other.Unbound)
 	d.Blacklist.mergeWith(other.Blacklist)
 }
@@ -74,16 +74,16 @@ func (d *DoT) mergeWith(other DoT) {
 // settings object with any field set in the other
 // settings.
 func (d *DoT) overrideWith(other DoT) {
-	d.Enabled = helpers.OverrideWithBool(d.Enabled, other.Enabled)
-	d.UpdatePeriod = helpers.OverrideWithDurationPtr(d.UpdatePeriod, other.UpdatePeriod)
+	d.Enabled = helpers.OverrideWithPointer(d.Enabled, other.Enabled)
+	d.UpdatePeriod = helpers.OverrideWithPointer(d.UpdatePeriod, other.UpdatePeriod)
 	d.Unbound.overrideWith(other.Unbound)
 	d.Blacklist.overrideWith(other.Blacklist)
 }
 
 func (d *DoT) setDefaults() {
-	d.Enabled = helpers.DefaultBool(d.Enabled, true)
+	d.Enabled = helpers.DefaultPointer(d.Enabled, true)
 	const defaultUpdatePeriod = 24 * time.Hour
-	d.UpdatePeriod = helpers.DefaultDurationPtr(d.UpdatePeriod, defaultUpdatePeriod)
+	d.UpdatePeriod = helpers.DefaultPointer(d.UpdatePeriod, defaultUpdatePeriod)
 	d.Unbound.setDefaults()
 	d.Blacklist.setDefaults()
 }

internal/configuration/settings/firewall.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
@@ -12,7 +12,7 @@ import (
 type Firewall struct {
 	VPNInputPorts   []uint16
 	InputPorts      []uint16
-	OutboundSubnets []net.IPNet
+	OutboundSubnets []netip.Prefix
 	Enabled         *bool
 	Debug           *bool
 }
@@ -40,11 +40,11 @@ func hasZeroPort(ports []uint16) (has bool) {
 
 func (f *Firewall) copy() (copied Firewall) {
 	return Firewall{
-		VPNInputPorts:   helpers.CopyUint16Slice(f.VPNInputPorts),
-		InputPorts:      helpers.CopyUint16Slice(f.InputPorts),
-		OutboundSubnets: helpers.CopyIPNetSlice(f.OutboundSubnets),
-		Enabled:         helpers.CopyBoolPtr(f.Enabled),
-		Debug:           helpers.CopyBoolPtr(f.Debug),
+		VPNInputPorts:   helpers.CopySlice(f.VPNInputPorts),
+		InputPorts:      helpers.CopySlice(f.InputPorts),
+		OutboundSubnets: helpers.CopySlice(f.OutboundSubnets),
+		Enabled:         helpers.CopyPointer(f.Enabled),
+		Debug:           helpers.CopyPointer(f.Debug),
 	}
 }
 
@@ -53,27 +53,27 @@ func (f *Firewall) copy() (copied Firewall) {
 // It merges values of slices together, even if they
 // are set in the receiver settings.
 func (f *Firewall) mergeWith(other Firewall) {
-	f.VPNInputPorts = helpers.MergeUint16Slices(f.VPNInputPorts, other.VPNInputPorts)
-	f.InputPorts = helpers.MergeUint16Slices(f.InputPorts, other.InputPorts)
-	f.OutboundSubnets = helpers.MergeIPNetsSlices(f.OutboundSubnets, other.OutboundSubnets)
-	f.Enabled = helpers.MergeWithBool(f.Enabled, other.Enabled)
-	f.Debug = helpers.MergeWithBool(f.Debug, other.Debug)
+	f.VPNInputPorts = helpers.MergeSlices(f.VPNInputPorts, other.VPNInputPorts)
+	f.InputPorts = helpers.MergeSlices(f.InputPorts, other.InputPorts)
+	f.OutboundSubnets = helpers.MergeSlices(f.OutboundSubnets, other.OutboundSubnets)
+	f.Enabled = helpers.MergeWithPointer(f.Enabled, other.Enabled)
+	f.Debug = helpers.MergeWithPointer(f.Debug, other.Debug)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (f *Firewall) overrideWith(other Firewall) {
-	f.VPNInputPorts = helpers.OverrideWithUint16Slice(f.VPNInputPorts, other.VPNInputPorts)
-	f.InputPorts = helpers.OverrideWithUint16Slice(f.InputPorts, other.InputPorts)
-	f.OutboundSubnets = helpers.OverrideWithIPNetsSlice(f.OutboundSubnets, other.OutboundSubnets)
-	f.Enabled = helpers.OverrideWithBool(f.Enabled, other.Enabled)
-	f.Debug = helpers.OverrideWithBool(f.Debug, other.Debug)
+	f.VPNInputPorts = helpers.OverrideWithSlice(f.VPNInputPorts, other.VPNInputPorts)
+	f.InputPorts = helpers.OverrideWithSlice(f.InputPorts, other.InputPorts)
+	f.OutboundSubnets = helpers.OverrideWithSlice(f.OutboundSubnets, other.OutboundSubnets)
+	f.Enabled = helpers.OverrideWithPointer(f.Enabled, other.Enabled)
+	f.Debug = helpers.OverrideWithPointer(f.Debug, other.Debug)
 }
 
 func (f *Firewall) setDefaults() {
-	f.Enabled = helpers.DefaultBool(f.Enabled, true)
-	f.Debug = helpers.DefaultBool(f.Debug, false)
+	f.Enabled = helpers.DefaultPointer(f.Enabled, true)
+	f.Debug = helpers.DefaultPointer(f.Debug, false)
 }
 
 func (f Firewall) String() string {

internal/configuration/settings/health.go

@@ -20,13 +20,19 @@ type Health struct {
 	// duration of the HTTP server. It defaults to 100 milliseconds.
 	ReadHeaderTimeout time.Duration
 	// ReadTimeout is the HTTP read timeout duration of the
-	//  HTTP server. It defaults to 500 milliseconds.
+	// HTTP server. It defaults to 500 milliseconds.
 	ReadTimeout time.Duration
 	// TargetAddress is the address (host or host:port)
 	// to TCP dial to periodically for the health check.
 	// It cannot be the empty string in the internal state.
 	TargetAddress string
-	VPN           HealthyWait
+	// SuccessWait is the duration to wait to re-run the
+	// healthcheck after a successful healthcheck.
+	// It defaults to 5 seconds and cannot be zero in
+	// the internal state.
+	SuccessWait time.Duration
+	// VPN has health settings specific to the VPN loop.
+	VPN HealthyWait
 }
 
 func (h Health) Validate() (err error) {
@@ -51,6 +57,7 @@ func (h *Health) copy() (copied Health) {
 		ReadHeaderTimeout: h.ReadHeaderTimeout,
 		ReadTimeout:       h.ReadTimeout,
 		TargetAddress:     h.TargetAddress,
+		SuccessWait:       h.SuccessWait,
 		VPN:               h.VPN.copy(),
 	}
 }
@@ -59,9 +66,10 @@ func (h *Health) copy() (copied Health) {
 // unset field of the receiver settings object.
 func (h *Health) MergeWith(other Health) {
 	h.ServerAddress = helpers.MergeWithString(h.ServerAddress, other.ServerAddress)
-	h.ReadHeaderTimeout = helpers.MergeWithDuration(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
-	h.ReadTimeout = helpers.MergeWithDuration(h.ReadTimeout, other.ReadTimeout)
+	h.ReadHeaderTimeout = helpers.MergeWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.MergeWithNumber(h.ReadTimeout, other.ReadTimeout)
 	h.TargetAddress = helpers.MergeWithString(h.TargetAddress, other.TargetAddress)
+	h.SuccessWait = helpers.MergeWithNumber(h.SuccessWait, other.SuccessWait)
 	h.VPN.mergeWith(other.VPN)
 }
 
@@ -70,19 +78,22 @@ func (h *Health) MergeWith(other Health) {
 // settings.
 func (h *Health) OverrideWith(other Health) {
 	h.ServerAddress = helpers.OverrideWithString(h.ServerAddress, other.ServerAddress)
-	h.ReadHeaderTimeout = helpers.OverrideWithDuration(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
-	h.ReadTimeout = helpers.OverrideWithDuration(h.ReadTimeout, other.ReadTimeout)
+	h.ReadHeaderTimeout = helpers.OverrideWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.OverrideWithNumber(h.ReadTimeout, other.ReadTimeout)
 	h.TargetAddress = helpers.OverrideWithString(h.TargetAddress, other.TargetAddress)
+	h.SuccessWait = helpers.OverrideWithNumber(h.SuccessWait, other.SuccessWait)
 	h.VPN.overrideWith(other.VPN)
 }
 
 func (h *Health) SetDefaults() {
 	h.ServerAddress = helpers.DefaultString(h.ServerAddress, "127.0.0.1:9999")
 	const defaultReadHeaderTimeout = 100 * time.Millisecond
-	h.ReadHeaderTimeout = helpers.DefaultDuration(h.ReadHeaderTimeout, defaultReadHeaderTimeout)
+	h.ReadHeaderTimeout = helpers.DefaultNumber(h.ReadHeaderTimeout, defaultReadHeaderTimeout)
 	const defaultReadTimeout = 500 * time.Millisecond
-	h.ReadTimeout = helpers.DefaultDuration(h.ReadTimeout, defaultReadTimeout)
+	h.ReadTimeout = helpers.DefaultNumber(h.ReadTimeout, defaultReadTimeout)
 	h.TargetAddress = helpers.DefaultString(h.TargetAddress, "cloudflare.com:443")
+	const defaultSuccessWait = 5 * time.Second
+	h.SuccessWait = helpers.DefaultNumber(h.SuccessWait, defaultSuccessWait)
 	h.VPN.setDefaults()
 }
 
@@ -94,6 +105,7 @@ func (h Health) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Health settings:")
 	node.Appendf("Server listening address: %s", h.ServerAddress)
 	node.Appendf("Target address: %s", h.TargetAddress)
+	node.Appendf("Duration to wait after success: %s", h.SuccessWait)
 	node.Appendf("Read header timeout: %s", h.ReadHeaderTimeout)
 	node.Appendf("Read timeout: %s", h.ReadTimeout)
 	node.AppendNode(h.VPN.toLinesNode("VPN"))

internal/configuration/settings/healthywait.go

@@ -27,31 +27,31 @@ func (h HealthyWait) validate() (err error) {
 // unset field of the receiver settings object.
 func (h *HealthyWait) copy() (copied HealthyWait) {
 	return HealthyWait{
-		Initial:  helpers.CopyDurationPtr(h.Initial),
-		Addition: helpers.CopyDurationPtr(h.Addition),
+		Initial:  helpers.CopyPointer(h.Initial),
+		Addition: helpers.CopyPointer(h.Addition),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (h *HealthyWait) mergeWith(other HealthyWait) {
-	h.Initial = helpers.MergeWithDurationPtr(h.Initial, other.Initial)
-	h.Addition = helpers.MergeWithDurationPtr(h.Addition, other.Addition)
+	h.Initial = helpers.MergeWithPointer(h.Initial, other.Initial)
+	h.Addition = helpers.MergeWithPointer(h.Addition, other.Addition)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (h *HealthyWait) overrideWith(other HealthyWait) {
-	h.Initial = helpers.OverrideWithDurationPtr(h.Initial, other.Initial)
-	h.Addition = helpers.OverrideWithDurationPtr(h.Addition, other.Addition)
+	h.Initial = helpers.OverrideWithPointer(h.Initial, other.Initial)
+	h.Addition = helpers.OverrideWithPointer(h.Addition, other.Addition)
 }
 
 func (h *HealthyWait) setDefaults() {
 	const initialDurationDefault = 6 * time.Second
 	const additionDurationDefault = 5 * time.Second
-	h.Initial = helpers.DefaultDurationPtr(h.Initial, initialDurationDefault)
-	h.Addition = helpers.DefaultDurationPtr(h.Addition, additionDurationDefault)
+	h.Initial = helpers.DefaultPointer(h.Initial, initialDurationDefault)
+	h.Addition = helpers.DefaultPointer(h.Addition, additionDurationDefault)
 }
 
 func (h HealthyWait) String() string {

internal/configuration/settings/helpers/belong.go

@@ -22,7 +22,7 @@ var (
 
 func AreAllOneOf(values, choices []string) (err error) {
 	if len(values) > 0 && len(choices) == 0 {
-		return ErrNoChoice
+		return fmt.Errorf("%w", ErrNoChoice)
 	}
 
 	set := make(map[string]struct{}, len(choices))

internal/configuration/settings/helpers/copy.go

@@ -1,199 +1,20 @@
 package helpers
 
 import (
-	"net"
-	"time"
+	"net/netip"
 
-	"github.com/qdm12/log"
-	"inet.af/netaddr"
+	"golang.org/x/exp/slices"
 )
 
-func CopyStringPtr(original *string) (copied *string) {
+func CopyPointer[T any](original *T) (copied *T) {
 	if original == nil {
 		return nil
 	}
-	copied = new(string)
+	copied = new(T)
 	*copied = *original
 	return copied
 }
 
-func CopyBoolPtr(original *bool) (copied *bool) {
-	if original == nil {
-		return nil
-	}
-	copied = new(bool)
-	*copied = *original
-	return copied
-}
-
-func CopyUint8Ptr(original *uint8) (copied *uint8) {
-	if original == nil {
-		return nil
-	}
-	copied = new(uint8)
-	*copied = *original
-	return copied
-}
-
-func CopyUint16Ptr(original *uint16) (copied *uint16) {
-	if original == nil {
-		return nil
-	}
-	copied = new(uint16)
-	*copied = *original
-	return copied
-}
-
-func CopyUint32Ptr(original *uint32) (copied *uint32) {
-	if original == nil {
-		return nil
-	}
-	copied = new(uint32)
-	*copied = *original
-	return copied
-}
-
-func CopyIntPtr(original *int) (copied *int) {
-	if original == nil {
-		return nil
-	}
-	copied = new(int)
-	*copied = *original
-	return copied
-}
-
-func CopyDurationPtr(original *time.Duration) (copied *time.Duration) {
-	if original == nil {
-		return nil
-	}
-	copied = new(time.Duration)
-	*copied = *original
-	return copied
-}
-
-func CopyLogLevelPtr(original *log.Level) (copied *log.Level) {
-	if original == nil {
-		return nil
-	}
-	copied = new(log.Level)
-	*copied = *original
-	return copied
-}
-
-func CopyIP(original net.IP) (copied net.IP) {
-	if original == nil {
-		return nil
-	}
-	copied = make(net.IP, len(original))
-	copy(copied, original)
-	return copied
-}
-
-func CopyIPNet(original net.IPNet) (copied net.IPNet) {
-	if original.IP != nil {
-		copied.IP = make(net.IP, len(original.IP))
-		copy(copied.IP, original.IP)
-	}
-
-	if original.Mask != nil {
-		copied.Mask = make(net.IPMask, len(original.Mask))
-		copy(copied.Mask, original.Mask)
-	}
-
-	return copied
-}
-
-func CopyIPNetPtr(original *net.IPNet) (copied *net.IPNet) {
-	if original == nil {
-		return nil
-	}
-
-	copied = new(net.IPNet)
-	*copied = CopyIPNet(*original)
-	return copied
-}
-
-func CopyNetaddrIP(original netaddr.IP) (copied netaddr.IP) {
-	b, err := original.MarshalBinary()
-	if err != nil {
-		panic(err)
-	}
-
-	err = copied.UnmarshalBinary(b)
-	if err != nil {
-		panic(err)
-	}
-
-	return copied
-}
-
-func CopyIPPrefix(original netaddr.IPPrefix) (copied netaddr.IPPrefix) {
-	b, err := original.MarshalText()
-	if err != nil {
-		panic(err)
-	}
-
-	err = copied.UnmarshalText(b)
-	if err != nil {
-		panic(err)
-	}
-
-	return copied
-}
-
-func CopyStringSlice(original []string) (copied []string) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]string, len(original))
-	copy(copied, original)
-	return copied
-}
-
-func CopyUint16Slice(original []uint16) (copied []uint16) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]uint16, len(original))
-	copy(copied, original)
-	return copied
-}
-
-func CopyIPNetSlice(original []net.IPNet) (copied []net.IPNet) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]net.IPNet, len(original))
-	for i := range original {
-		copied[i] = CopyIPNet(original[i])
-	}
-	return copied
-}
-
-func CopyIPPrefixSlice(original []netaddr.IPPrefix) (copied []netaddr.IPPrefix) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]netaddr.IPPrefix, len(original))
-	for i := range original {
-		copied[i] = CopyIPPrefix(original[i])
-	}
-	return copied
-}
-
-func CopyNetaddrIPsSlice(original []netaddr.IP) (copied []netaddr.IP) {
-	if original == nil {
-		return nil
-	}
-
-	copied = make([]netaddr.IP, len(original))
-	for i := range original {
-		copied[i] = CopyNetaddrIP(original[i])
-	}
-
-	return copied
+func CopySlice[T string | uint16 | netip.Addr | netip.Prefix](original []T) (copied []T) {
+	return slices.Clone(original)
 }

internal/configuration/settings/helpers/default.go

@@ -1,57 +1,15 @@
 package helpers
 
 import (
-	"net"
-	"time"
-
-	"github.com/qdm12/log"
+	"net/netip"
 )
 
-func DefaultInt(existing *int, defaultValue int) (
-	result *int) {
+func DefaultPointer[T any](existing *T, defaultValue T) (
+	result *T) {
 	if existing != nil {
 		return existing
 	}
-	result = new(int)
-	*result = defaultValue
-	return result
-}
-
-func DefaultUint8(existing *uint8, defaultValue uint8) (
-	result *uint8) {
-	if existing != nil {
-		return existing
-	}
-	result = new(uint8)
-	*result = defaultValue
-	return result
-}
-
-func DefaultUint16(existing *uint16, defaultValue uint16) (
-	result *uint16) {
-	if existing != nil {
-		return existing
-	}
-	result = new(uint16)
-	*result = defaultValue
-	return result
-}
-func DefaultUint32(existing *uint32, defaultValue uint32) (
-	result *uint32) {
-	if existing != nil {
-		return existing
-	}
-	result = new(uint32)
-	*result = defaultValue
-	return result
-}
-
-func DefaultBool(existing *bool, defaultValue bool) (
-	result *bool) {
-	if existing != nil {
-		return existing
-	}
-	result = new(bool)
+	result = new(T)
 	*result = defaultValue
 	return result
 }
@@ -64,46 +22,17 @@ func DefaultString(existing string, defaultValue string) (
 	return defaultValue
 }
 
-func DefaultStringPtr(existing *string, defaultValue string) (result *string) {
-	if existing != nil {
-		return existing
-	}
-	result = new(string)
-	*result = defaultValue
-	return result
-}
-
-func DefaultDuration(existing time.Duration,
-	defaultValue time.Duration) (result time.Duration) {
+func DefaultNumber[T Number](existing T, defaultValue T) ( //nolint:ireturn
+	result T) {
 	if existing != 0 {
 		return existing
 	}
 	return defaultValue
 }
 
-func DefaultDurationPtr(existing *time.Duration,
-	defaultValue time.Duration) (result *time.Duration) {
-	if existing != nil {
-		return existing
-	}
-	result = new(time.Duration)
-	*result = defaultValue
-	return result
-}
-
-func DefaultLogLevel(existing *log.Level,
-	defaultValue log.Level) (result *log.Level) {
-	if existing != nil {
-		return existing
-	}
-	result = new(log.Level)
-	*result = defaultValue
-	return result
-}
-
-func DefaultIP(existing net.IP, defaultValue net.IP) (
-	result net.IP) {
-	if existing != nil {
+func DefaultIP(existing netip.Addr, defaultValue netip.Addr) (
+	result netip.Addr) {
+	if existing.IsValid() {
 		return existing
 	}
 	return defaultValue

internal/configuration/settings/helpers/generics.go

@@ -0,0 +1,10 @@
+package helpers
+
+import "time"
+
+type Number interface {
+	uint8 | uint16 | uint32 | uint64 | uint |
+		int8 | int16 | int32 | int64 | int |
+		float32 | float64 |
+		time.Duration
+}

internal/configuration/settings/helpers/merge.go

@@ -1,21 +1,17 @@
 package helpers
 
 import (
-	"net"
 	"net/http"
-	"time"
-
-	"github.com/qdm12/log"
-	"inet.af/netaddr"
+	"net/netip"
 )
 
-func MergeWithBool(existing, other *bool) (result *bool) {
+func MergeWithPointer[T any](existing, other *T) (result *T) {
 	if existing != nil {
 		return existing
 	} else if other == nil {
 		return nil
 	}
-	result = new(bool)
+	result = new(T)
 	*result = *other
 	return result
 }
@@ -27,111 +23,20 @@ func MergeWithString(existing, other string) (result string) {
 	return other
 }
 
-func MergeWithInt(existing, other int) (result int) {
+func MergeWithNumber[T Number](existing, other T) (result T) { //nolint:ireturn
 	if existing != 0 {
 		return existing
 	}
 	return other
 }
 
-func MergeWithFloat64(existing, other float64) (result float64) {
-	if existing != 0 {
+func MergeWithIP(existing, other netip.Addr) (result netip.Addr) {
+	if existing.IsValid() {
 		return existing
 	}
 	return other
 }
 
-func MergeWithStringPtr(existing, other *string) (result *string) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(string)
-	*result = *other
-	return result
-}
-
-func MergeWithIntPtr(existing, other *int) (result *int) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(int)
-	*result = *other
-	return result
-}
-
-func MergeWithUint8(existing, other *uint8) (result *uint8) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(uint8)
-	*result = *other
-	return result
-}
-
-func MergeWithUint16(existing, other *uint16) (result *uint16) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(uint16)
-	*result = *other
-	return result
-}
-
-func MergeWithUint32(existing, other *uint32) (result *uint32) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(uint32)
-	*result = *other
-	return result
-}
-
-func MergeWithIP(existing, other net.IP) (result net.IP) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = make(net.IP, len(other))
-	copy(result, other)
-	return result
-}
-
-func MergeWithDuration(existing, other time.Duration) (result time.Duration) {
-	if existing != 0 {
-		return existing
-	}
-	return other
-}
-
-func MergeWithDurationPtr(existing, other *time.Duration) (result *time.Duration) {
-	if existing != nil {
-		return existing
-	}
-	return other
-}
-
-func MergeWithLogLevel(existing, other *log.Level) (result *log.Level) {
-	if existing != nil {
-		return existing
-	} else if other == nil {
-		return nil
-	}
-	result = new(log.Level)
-	*result = *other
-	return result
-}
-
 func MergeWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
 	if existing != nil {
 		return existing
@@ -139,13 +44,13 @@ func MergeWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
 	return other
 }
 
-func MergeStringSlices(a, b []string) (result []string) {
+func MergeSlices[T comparable](a, b []T) (result []T) {
 	if a == nil && b == nil {
 		return nil
 	}
 
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]string, 0, len(a)+len(b))
+	seen := make(map[T]struct{}, len(a)+len(b))
+	result = make([]T, 0, len(a)+len(b))
 	for _, s := range a {
 		if _, ok := seen[s]; ok {
 			continue // duplicate
@@ -162,105 +67,3 @@ func MergeStringSlices(a, b []string) (result []string) {
 	}
 	return result
 }
-
-func MergeUint16Slices(a, b []uint16) (result []uint16) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[uint16]struct{}, len(a)+len(b))
-	result = make([]uint16, 0, len(a)+len(b))
-	for _, n := range a {
-		if _, ok := seen[n]; ok {
-			continue // duplicate
-		}
-		result = append(result, n)
-		seen[n] = struct{}{}
-	}
-	for _, n := range b {
-		if _, ok := seen[n]; ok {
-			continue // duplicate
-		}
-		result = append(result, n)
-		seen[n] = struct{}{}
-	}
-	return result
-}
-
-func MergeIPNetsSlices(a, b []net.IPNet) (result []net.IPNet) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]net.IPNet, 0, len(a)+len(b))
-	for _, ipNet := range a {
-		key := ipNet.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipNet)
-		seen[key] = struct{}{}
-	}
-	for _, ipNet := range b {
-		key := ipNet.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipNet)
-		seen[key] = struct{}{}
-	}
-	return result
-}
-
-func MergeNetaddrIPsSlices(a, b []netaddr.IP) (result []netaddr.IP) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]netaddr.IP, 0, len(a)+len(b))
-	for _, ip := range a {
-		key := ip.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ip)
-		seen[key] = struct{}{}
-	}
-	for _, ip := range b {
-		key := ip.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ip)
-		seen[key] = struct{}{}
-	}
-	return result
-}
-
-func MergeIPPrefixesSlices(a, b []netaddr.IPPrefix) (result []netaddr.IPPrefix) {
-	if a == nil && b == nil {
-		return nil
-	}
-
-	seen := make(map[string]struct{}, len(a)+len(b))
-	result = make([]netaddr.IPPrefix, 0, len(a)+len(b))
-	for _, ipPrefix := range a {
-		key := ipPrefix.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipPrefix)
-		seen[key] = struct{}{}
-	}
-	for _, ipPrefix := range b {
-		key := ipPrefix.String()
-		if _, ok := seen[key]; ok {
-			continue // duplicate
-		}
-		result = append(result, ipPrefix)
-		seen[key] = struct{}{}
-	}
-	return result
-}

internal/configuration/settings/helpers/override.go

@@ -1,19 +1,15 @@
 package helpers
 
 import (
-	"net"
 	"net/http"
-	"time"
-
-	"github.com/qdm12/log"
-	"inet.af/netaddr"
+	"net/netip"
 )
 
-func OverrideWithBool(existing, other *bool) (result *bool) {
+func OverrideWithPointer[T any](existing, other *T) (result *T) {
 	if other == nil {
 		return existing
 	}
-	result = new(bool)
+	result = new(T)
 	*result = *other
 	return result
 }
@@ -25,101 +21,20 @@ func OverrideWithString(existing, other string) (result string) {
 	return other
 }
 
-func OverrideWithInt(existing, other int) (result int) {
+func OverrideWithNumber[T Number](existing, other T) (result T) { //nolint:ireturn
 	if other == 0 {
 		return existing
 	}
 	return other
 }
 
-func OverrideWithFloat64(existing, other float64) (result float64) {
-	if other == 0 {
+func OverrideWithIP(existing, other netip.Addr) (result netip.Addr) {
+	if !other.IsValid() {
 		return existing
 	}
 	return other
 }
 
-func OverrideWithStringPtr(existing, other *string) (result *string) {
-	if other == nil {
-		return existing
-	}
-	result = new(string)
-	*result = *other
-	return result
-}
-
-func OverrideWithIntPtr(existing, other *int) (result *int) {
-	if other == nil {
-		return existing
-	}
-	result = new(int)
-	*result = *other
-	return result
-}
-
-func OverrideWithUint8(existing, other *uint8) (result *uint8) {
-	if other == nil {
-		return existing
-	}
-	result = new(uint8)
-	*result = *other
-	return result
-}
-
-func OverrideWithUint16(existing, other *uint16) (result *uint16) {
-	if other == nil {
-		return existing
-	}
-	result = new(uint16)
-	*result = *other
-	return result
-}
-
-func OverrideWithUint32(existing, other *uint32) (result *uint32) {
-	if other == nil {
-		return existing
-	}
-	result = new(uint32)
-	*result = *other
-	return result
-}
-
-func OverrideWithIP(existing, other net.IP) (result net.IP) {
-	if other == nil {
-		return existing
-	}
-	result = make(net.IP, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithDuration(existing, other time.Duration) (
-	result time.Duration) {
-	if other == 0 {
-		return existing
-	}
-	return other
-}
-
-func OverrideWithDurationPtr(existing, other *time.Duration) (
-	result *time.Duration) {
-	if other == nil {
-		return existing
-	}
-	result = new(time.Duration)
-	*result = *other
-	return result
-}
-
-func OverrideWithLogLevel(existing, other *log.Level) (result *log.Level) {
-	if other == nil {
-		return existing
-	}
-	result = new(log.Level)
-	*result = *other
-	return result
-}
-
 func OverrideWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
 	if other != nil {
 		return other
@@ -127,47 +42,11 @@ func OverrideWithHTTPHandler(existing, other http.Handler) (result http.Handler)
 	return existing
 }
 
-func OverrideWithStringSlice(existing, other []string) (result []string) {
+func OverrideWithSlice[T any](existing, other []T) (result []T) {
 	if other == nil {
 		return existing
 	}
-	result = make([]string, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithUint16Slice(existing, other []uint16) (result []uint16) {
-	if other == nil {
-		return existing
-	}
-	result = make([]uint16, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithIPNetsSlice(existing, other []net.IPNet) (result []net.IPNet) {
-	if other == nil {
-		return existing
-	}
-	result = make([]net.IPNet, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithNetaddrIPsSlice(existing, other []netaddr.IP) (result []netaddr.IP) {
-	if other == nil {
-		return existing
-	}
-	result = make([]netaddr.IP, len(other))
-	copy(result, other)
-	return result
-}
-
-func OverrideWithIPPrefixesSlice(existing, other []netaddr.IPPrefix) (result []netaddr.IPPrefix) {
-	if other == nil {
-		return existing
-	}
-	result = make([]netaddr.IPPrefix, len(other))
+	result = make([]T, len(other))
 	copy(result, other)
 	return result
 }

internal/configuration/settings/helpers/pointers.go

@@ -1,11 +0,0 @@
-package helpers
-
-import "time"
-
-// StringPtr returns a pointer to the string value
-// passed as argument.
-func StringPtr(s string) *string { return &s }
-
-// DurationPtr returns a pointer to the duration value
-// passed as argument.
-func DurationPtr(d time.Duration) *time.Duration { return &d }

internal/configuration/settings/httpproxy.go

@@ -56,12 +56,12 @@ func (h HTTPProxy) validate() (err error) {
 
 func (h *HTTPProxy) copy() (copied HTTPProxy) {
 	return HTTPProxy{
-		User:              helpers.CopyStringPtr(h.User),
-		Password:          helpers.CopyStringPtr(h.Password),
+		User:              helpers.CopyPointer(h.User),
+		Password:          helpers.CopyPointer(h.Password),
 		ListeningAddress:  h.ListeningAddress,
-		Enabled:           helpers.CopyBoolPtr(h.Enabled),
-		Stealth:           helpers.CopyBoolPtr(h.Stealth),
-		Log:               helpers.CopyBoolPtr(h.Log),
+		Enabled:           helpers.CopyPointer(h.Enabled),
+		Stealth:           helpers.CopyPointer(h.Stealth),
+		Log:               helpers.CopyPointer(h.Log),
 		ReadHeaderTimeout: h.ReadHeaderTimeout,
 		ReadTimeout:       h.ReadTimeout,
 	}
@@ -70,41 +70,41 @@ func (h *HTTPProxy) copy() (copied HTTPProxy) {
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (h *HTTPProxy) mergeWith(other HTTPProxy) {
-	h.User = helpers.MergeWithStringPtr(h.User, other.User)
-	h.Password = helpers.MergeWithStringPtr(h.Password, other.Password)
+	h.User = helpers.MergeWithPointer(h.User, other.User)
+	h.Password = helpers.MergeWithPointer(h.Password, other.Password)
 	h.ListeningAddress = helpers.MergeWithString(h.ListeningAddress, other.ListeningAddress)
-	h.Enabled = helpers.MergeWithBool(h.Enabled, other.Enabled)
-	h.Stealth = helpers.MergeWithBool(h.Stealth, other.Stealth)
-	h.Log = helpers.MergeWithBool(h.Log, other.Log)
-	h.ReadHeaderTimeout = helpers.MergeWithDuration(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
-	h.ReadTimeout = helpers.MergeWithDuration(h.ReadTimeout, other.ReadTimeout)
+	h.Enabled = helpers.MergeWithPointer(h.Enabled, other.Enabled)
+	h.Stealth = helpers.MergeWithPointer(h.Stealth, other.Stealth)
+	h.Log = helpers.MergeWithPointer(h.Log, other.Log)
+	h.ReadHeaderTimeout = helpers.MergeWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.MergeWithNumber(h.ReadTimeout, other.ReadTimeout)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (h *HTTPProxy) overrideWith(other HTTPProxy) {
-	h.User = helpers.OverrideWithStringPtr(h.User, other.User)
-	h.Password = helpers.OverrideWithStringPtr(h.Password, other.Password)
+	h.User = helpers.OverrideWithPointer(h.User, other.User)
+	h.Password = helpers.OverrideWithPointer(h.Password, other.Password)
 	h.ListeningAddress = helpers.OverrideWithString(h.ListeningAddress, other.ListeningAddress)
-	h.Enabled = helpers.OverrideWithBool(h.Enabled, other.Enabled)
-	h.Stealth = helpers.OverrideWithBool(h.Stealth, other.Stealth)
-	h.Log = helpers.OverrideWithBool(h.Log, other.Log)
-	h.ReadHeaderTimeout = helpers.OverrideWithDuration(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
-	h.ReadTimeout = helpers.OverrideWithDuration(h.ReadTimeout, other.ReadTimeout)
+	h.Enabled = helpers.OverrideWithPointer(h.Enabled, other.Enabled)
+	h.Stealth = helpers.OverrideWithPointer(h.Stealth, other.Stealth)
+	h.Log = helpers.OverrideWithPointer(h.Log, other.Log)
+	h.ReadHeaderTimeout = helpers.OverrideWithNumber(h.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	h.ReadTimeout = helpers.OverrideWithNumber(h.ReadTimeout, other.ReadTimeout)
 }
 
 func (h *HTTPProxy) setDefaults() {
-	h.User = helpers.DefaultStringPtr(h.User, "")
-	h.Password = helpers.DefaultStringPtr(h.Password, "")
+	h.User = helpers.DefaultPointer(h.User, "")
+	h.Password = helpers.DefaultPointer(h.Password, "")
 	h.ListeningAddress = helpers.DefaultString(h.ListeningAddress, ":8888")
-	h.Enabled = helpers.DefaultBool(h.Enabled, false)
-	h.Stealth = helpers.DefaultBool(h.Stealth, false)
-	h.Log = helpers.DefaultBool(h.Log, false)
+	h.Enabled = helpers.DefaultPointer(h.Enabled, false)
+	h.Stealth = helpers.DefaultPointer(h.Stealth, false)
+	h.Log = helpers.DefaultPointer(h.Log, false)
 	const defaultReadHeaderTimeout = time.Second
-	h.ReadHeaderTimeout = helpers.DefaultDuration(h.ReadHeaderTimeout, defaultReadHeaderTimeout)
+	h.ReadHeaderTimeout = helpers.DefaultNumber(h.ReadHeaderTimeout, defaultReadHeaderTimeout)
 	const defaultReadTimeout = 3 * time.Second
-	h.ReadTimeout = helpers.DefaultDuration(h.ReadTimeout, defaultReadTimeout)
+	h.ReadTimeout = helpers.DefaultNumber(h.ReadTimeout, defaultReadTimeout)
 }
 
 func (h HTTPProxy) String() string {

internal/configuration/settings/log.go

@@ -19,25 +19,25 @@ func (l Log) validate() (err error) {
 
 func (l *Log) copy() (copied Log) {
 	return Log{
-		Level: helpers.CopyLogLevelPtr(l.Level),
+		Level: helpers.CopyPointer(l.Level),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (l *Log) mergeWith(other Log) {
-	l.Level = helpers.MergeWithLogLevel(l.Level, other.Level)
+	l.Level = helpers.MergeWithPointer(l.Level, other.Level)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (l *Log) overrideWith(other Log) {
-	l.Level = helpers.OverrideWithLogLevel(l.Level, other.Level)
+	l.Level = helpers.OverrideWithPointer(l.Level, other.Level)
 }
 
 func (l *Log) setDefaults() {
-	l.Level = helpers.DefaultLogLevel(l.Level, log.LevelInfo)
+	l.Level = helpers.DefaultPointer(l.Level, log.LevelInfo)
 }
 
 func (l Log) String() string {

internal/configuration/settings/netaddr.go

@@ -0,0 +1,36 @@
+package settings
+
+import (
+	"net/netip"
+
+	"inet.af/netaddr"
+)
+
+func netipAddressToNetaddrIP(address netip.Addr) (ip netaddr.IP) {
+	if address.Is4() {
+		return netaddr.IPFrom4(address.As4())
+	}
+	return netaddr.IPFrom16(address.As16())
+}
+
+func netipAddressesToNetaddrIPs(addresses []netip.Addr) (ips []netaddr.IP) {
+	ips = make([]netaddr.IP, len(addresses))
+	for i := range addresses {
+		ips[i] = netipAddressToNetaddrIP(addresses[i])
+	}
+	return ips
+}
+
+func netipPrefixToNetaddrIPPrefix(prefix netip.Prefix) (ipPrefix netaddr.IPPrefix) {
+	netaddrIP := netipAddressToNetaddrIP(prefix.Addr())
+	bits := prefix.Bits()
+	return netaddr.IPPrefixFrom(netaddrIP, uint8(bits))
+}
+
+func netipPrefixesToNetaddrIPPrefixes(prefixes []netip.Prefix) (ipPrefixes []netaddr.IPPrefix) {
+	ipPrefixes = make([]netaddr.IPPrefix, len(prefixes))
+	for i := range ipPrefixes {
+		ipPrefixes[i] = netipPrefixToNetaddrIPPrefix(prefixes[i])
+	}
+	return ipPrefixes
+}

internal/configuration/settings/openvpn.go

@@ -100,14 +100,14 @@ func (o OpenVPN) validate(vpnProvider string) (err error) {
 		vpnProvider != providers.VPNSecure
 
 	if isUserRequired && *o.User == "" {
-		return ErrOpenVPNUserIsEmpty
+		return fmt.Errorf("%w", ErrOpenVPNUserIsEmpty)
 	}
 
 	passwordRequired := isUserRequired &&
 		(vpnProvider != providers.Ivpn || !ivpnAccountID.MatchString(*o.User))
 
 	if passwordRequired && *o.Password == "" {
-		return ErrOpenVPNPasswordIsEmpty
+		return fmt.Errorf("%w", ErrOpenVPNPasswordIsEmpty)
 	}
 
 	err = validateOpenVPNConfigFilepath(isCustom, *o.ConfFile)
@@ -160,7 +160,7 @@ func validateOpenVPNConfigFilepath(isCustom bool,
 	}
 
 	if confFile == "" {
-		return ErrFilepathMissing
+		return fmt.Errorf("%w", ErrFilepathMissing)
 	}
 
 	err = helpers.FileExists(confFile)
@@ -186,7 +186,7 @@ func validateOpenVPNClientCertificate(vpnProvider,
 		providers.VPNSecure,
 		providers.VPNUnlimited:
 		if clientCert == "" {
-			return ErrMissingValue
+			return fmt.Errorf("%w", ErrMissingValue)
 		}
 	}
 
@@ -209,7 +209,7 @@ func validateOpenVPNClientKey(vpnProvider, clientKey string) (err error) {
 		providers.VPNUnlimited,
 		providers.Wevpn:
 		if clientKey == "" {
-			return ErrMissingValue
+			return fmt.Errorf("%w", ErrMissingValue)
 		}
 	}
 
@@ -227,7 +227,7 @@ func validateOpenVPNClientKey(vpnProvider, clientKey string) (err error) {
 func validateOpenVPNEncryptedKey(vpnProvider,
 	encryptedPrivateKey string) (err error) {
 	if vpnProvider == providers.VPNSecure && encryptedPrivateKey == "" {
-		return ErrMissingValue
+		return fmt.Errorf("%w", ErrMissingValue)
 	}
 
 	if encryptedPrivateKey == "" {
@@ -244,21 +244,21 @@ func validateOpenVPNEncryptedKey(vpnProvider,
 func (o *OpenVPN) copy() (copied OpenVPN) {
 	return OpenVPN{
 		Version:       o.Version,
-		User:          helpers.CopyStringPtr(o.User),
-		Password:      helpers.CopyStringPtr(o.Password),
-		ConfFile:      helpers.CopyStringPtr(o.ConfFile),
-		Ciphers:       helpers.CopyStringSlice(o.Ciphers),
-		Auth:          helpers.CopyStringPtr(o.Auth),
-		Cert:          helpers.CopyStringPtr(o.Cert),
-		Key:           helpers.CopyStringPtr(o.Key),
-		EncryptedKey:  helpers.CopyStringPtr(o.EncryptedKey),
-		KeyPassphrase: helpers.CopyStringPtr(o.KeyPassphrase),
-		PIAEncPreset:  helpers.CopyStringPtr(o.PIAEncPreset),
-		MSSFix:        helpers.CopyUint16Ptr(o.MSSFix),
+		User:          helpers.CopyPointer(o.User),
+		Password:      helpers.CopyPointer(o.Password),
+		ConfFile:      helpers.CopyPointer(o.ConfFile),
+		Ciphers:       helpers.CopySlice(o.Ciphers),
+		Auth:          helpers.CopyPointer(o.Auth),
+		Cert:          helpers.CopyPointer(o.Cert),
+		Key:           helpers.CopyPointer(o.Key),
+		EncryptedKey:  helpers.CopyPointer(o.EncryptedKey),
+		KeyPassphrase: helpers.CopyPointer(o.KeyPassphrase),
+		PIAEncPreset:  helpers.CopyPointer(o.PIAEncPreset),
+		MSSFix:        helpers.CopyPointer(o.MSSFix),
 		Interface:     o.Interface,
 		ProcessUser:   o.ProcessUser,
-		Verbosity:     helpers.CopyIntPtr(o.Verbosity),
-		Flags:         helpers.CopyStringSlice(o.Flags),
+		Verbosity:     helpers.CopyPointer(o.Verbosity),
+		Flags:         helpers.CopySlice(o.Flags),
 	}
 }
 
@@ -266,21 +266,21 @@ func (o *OpenVPN) copy() (copied OpenVPN) {
 // unset field of the receiver settings object.
 func (o *OpenVPN) mergeWith(other OpenVPN) {
 	o.Version = helpers.MergeWithString(o.Version, other.Version)
-	o.User = helpers.MergeWithStringPtr(o.User, other.User)
-	o.Password = helpers.MergeWithStringPtr(o.Password, other.Password)
-	o.ConfFile = helpers.MergeWithStringPtr(o.ConfFile, other.ConfFile)
-	o.Ciphers = helpers.MergeStringSlices(o.Ciphers, other.Ciphers)
-	o.Auth = helpers.MergeWithStringPtr(o.Auth, other.Auth)
-	o.Cert = helpers.MergeWithStringPtr(o.Cert, other.Cert)
-	o.Key = helpers.MergeWithStringPtr(o.Key, other.Key)
-	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.MSSFix = helpers.MergeWithUint16(o.MSSFix, other.MSSFix)
+	o.User = helpers.MergeWithPointer(o.User, other.User)
+	o.Password = helpers.MergeWithPointer(o.Password, other.Password)
+	o.ConfFile = helpers.MergeWithPointer(o.ConfFile, other.ConfFile)
+	o.Ciphers = helpers.MergeSlices(o.Ciphers, other.Ciphers)
+	o.Auth = helpers.MergeWithPointer(o.Auth, other.Auth)
+	o.Cert = helpers.MergeWithPointer(o.Cert, other.Cert)
+	o.Key = helpers.MergeWithPointer(o.Key, other.Key)
+	o.EncryptedKey = helpers.MergeWithPointer(o.EncryptedKey, other.EncryptedKey)
+	o.KeyPassphrase = helpers.MergeWithPointer(o.KeyPassphrase, other.KeyPassphrase)
+	o.PIAEncPreset = helpers.MergeWithPointer(o.PIAEncPreset, other.PIAEncPreset)
+	o.MSSFix = helpers.MergeWithPointer(o.MSSFix, other.MSSFix)
 	o.Interface = helpers.MergeWithString(o.Interface, other.Interface)
 	o.ProcessUser = helpers.MergeWithString(o.ProcessUser, other.ProcessUser)
-	o.Verbosity = helpers.MergeWithIntPtr(o.Verbosity, other.Verbosity)
-	o.Flags = helpers.MergeStringSlices(o.Flags, other.Flags)
+	o.Verbosity = helpers.MergeWithPointer(o.Verbosity, other.Verbosity)
+	o.Flags = helpers.MergeSlices(o.Flags, other.Flags)
 }
 
 // overrideWith overrides fields of the receiver
@@ -288,48 +288,48 @@ func (o *OpenVPN) mergeWith(other OpenVPN) {
 // settings.
 func (o *OpenVPN) overrideWith(other OpenVPN) {
 	o.Version = helpers.OverrideWithString(o.Version, other.Version)
-	o.User = helpers.OverrideWithStringPtr(o.User, other.User)
-	o.Password = helpers.OverrideWithStringPtr(o.Password, other.Password)
-	o.ConfFile = helpers.OverrideWithStringPtr(o.ConfFile, other.ConfFile)
-	o.Ciphers = helpers.OverrideWithStringSlice(o.Ciphers, other.Ciphers)
-	o.Auth = helpers.OverrideWithStringPtr(o.Auth, other.Auth)
-	o.Cert = helpers.OverrideWithStringPtr(o.Cert, other.Cert)
-	o.Key = helpers.OverrideWithStringPtr(o.Key, other.Key)
-	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.MSSFix = helpers.OverrideWithUint16(o.MSSFix, other.MSSFix)
+	o.User = helpers.OverrideWithPointer(o.User, other.User)
+	o.Password = helpers.OverrideWithPointer(o.Password, other.Password)
+	o.ConfFile = helpers.OverrideWithPointer(o.ConfFile, other.ConfFile)
+	o.Ciphers = helpers.OverrideWithSlice(o.Ciphers, other.Ciphers)
+	o.Auth = helpers.OverrideWithPointer(o.Auth, other.Auth)
+	o.Cert = helpers.OverrideWithPointer(o.Cert, other.Cert)
+	o.Key = helpers.OverrideWithPointer(o.Key, other.Key)
+	o.EncryptedKey = helpers.OverrideWithPointer(o.EncryptedKey, other.EncryptedKey)
+	o.KeyPassphrase = helpers.OverrideWithPointer(o.KeyPassphrase, other.KeyPassphrase)
+	o.PIAEncPreset = helpers.OverrideWithPointer(o.PIAEncPreset, other.PIAEncPreset)
+	o.MSSFix = helpers.OverrideWithPointer(o.MSSFix, other.MSSFix)
 	o.Interface = helpers.OverrideWithString(o.Interface, other.Interface)
 	o.ProcessUser = helpers.OverrideWithString(o.ProcessUser, other.ProcessUser)
-	o.Verbosity = helpers.OverrideWithIntPtr(o.Verbosity, other.Verbosity)
-	o.Flags = helpers.OverrideWithStringSlice(o.Flags, other.Flags)
+	o.Verbosity = helpers.OverrideWithPointer(o.Verbosity, other.Verbosity)
+	o.Flags = helpers.OverrideWithSlice(o.Flags, other.Flags)
 }
 
 func (o *OpenVPN) setDefaults(vpnProvider string) {
 	o.Version = helpers.DefaultString(o.Version, openvpn.Openvpn25)
-	o.User = helpers.DefaultStringPtr(o.User, "")
+	o.User = helpers.DefaultPointer(o.User, "")
 	if vpnProvider == providers.Mullvad {
-		o.Password = helpers.DefaultStringPtr(o.Password, "m")
+		o.Password = helpers.DefaultPointer(o.Password, "m")
 	} else {
-		o.Password = helpers.DefaultStringPtr(o.Password, "")
+		o.Password = helpers.DefaultPointer(o.Password, "")
 	}
 
-	o.ConfFile = helpers.DefaultStringPtr(o.ConfFile, "")
-	o.Auth = helpers.DefaultStringPtr(o.Auth, "")
-	o.Cert = helpers.DefaultStringPtr(o.Cert, "")
-	o.Key = helpers.DefaultStringPtr(o.Key, "")
-	o.EncryptedKey = helpers.DefaultStringPtr(o.EncryptedKey, "")
-	o.KeyPassphrase = helpers.DefaultStringPtr(o.KeyPassphrase, "")
+	o.ConfFile = helpers.DefaultPointer(o.ConfFile, "")
+	o.Auth = helpers.DefaultPointer(o.Auth, "")
+	o.Cert = helpers.DefaultPointer(o.Cert, "")
+	o.Key = helpers.DefaultPointer(o.Key, "")
+	o.EncryptedKey = helpers.DefaultPointer(o.EncryptedKey, "")
+	o.KeyPassphrase = helpers.DefaultPointer(o.KeyPassphrase, "")
 
 	var defaultEncPreset string
 	if vpnProvider == providers.PrivateInternetAccess {
 		defaultEncPreset = presets.Strong
 	}
-	o.PIAEncPreset = helpers.DefaultStringPtr(o.PIAEncPreset, defaultEncPreset)
-	o.MSSFix = helpers.DefaultUint16(o.MSSFix, 0)
+	o.PIAEncPreset = helpers.DefaultPointer(o.PIAEncPreset, defaultEncPreset)
+	o.MSSFix = helpers.DefaultPointer(o.MSSFix, 0)
 	o.Interface = helpers.DefaultString(o.Interface, "tun0")
 	o.ProcessUser = helpers.DefaultString(o.ProcessUser, "root")
-	o.Verbosity = helpers.DefaultInt(o.Verbosity, 1)
+	o.Verbosity = helpers.DefaultPointer(o.Verbosity, 1)
 }
 
 func (o OpenVPN) String() string {

internal/configuration/settings/openvpnselection.go

@@ -130,37 +130,37 @@ func (o OpenVPNSelection) validate(vpnProvider string) (err error) {
 
 func (o *OpenVPNSelection) copy() (copied OpenVPNSelection) {
 	return OpenVPNSelection{
-		ConfFile:     helpers.CopyStringPtr(o.ConfFile),
-		TCP:          helpers.CopyBoolPtr(o.TCP),
-		CustomPort:   helpers.CopyUint16Ptr(o.CustomPort),
-		PIAEncPreset: helpers.CopyStringPtr(o.PIAEncPreset),
+		ConfFile:     helpers.CopyPointer(o.ConfFile),
+		TCP:          helpers.CopyPointer(o.TCP),
+		CustomPort:   helpers.CopyPointer(o.CustomPort),
+		PIAEncPreset: helpers.CopyPointer(o.PIAEncPreset),
 	}
 }
 
 func (o *OpenVPNSelection) mergeWith(other OpenVPNSelection) {
-	o.ConfFile = helpers.MergeWithStringPtr(o.ConfFile, other.ConfFile)
-	o.TCP = helpers.MergeWithBool(o.TCP, other.TCP)
-	o.CustomPort = helpers.MergeWithUint16(o.CustomPort, other.CustomPort)
-	o.PIAEncPreset = helpers.MergeWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
+	o.ConfFile = helpers.MergeWithPointer(o.ConfFile, other.ConfFile)
+	o.TCP = helpers.MergeWithPointer(o.TCP, other.TCP)
+	o.CustomPort = helpers.MergeWithPointer(o.CustomPort, other.CustomPort)
+	o.PIAEncPreset = helpers.MergeWithPointer(o.PIAEncPreset, other.PIAEncPreset)
 }
 
 func (o *OpenVPNSelection) overrideWith(other OpenVPNSelection) {
-	o.ConfFile = helpers.OverrideWithStringPtr(o.ConfFile, other.ConfFile)
-	o.TCP = helpers.OverrideWithBool(o.TCP, other.TCP)
-	o.CustomPort = helpers.OverrideWithUint16(o.CustomPort, other.CustomPort)
-	o.PIAEncPreset = helpers.OverrideWithStringPtr(o.PIAEncPreset, other.PIAEncPreset)
+	o.ConfFile = helpers.OverrideWithPointer(o.ConfFile, other.ConfFile)
+	o.TCP = helpers.OverrideWithPointer(o.TCP, other.TCP)
+	o.CustomPort = helpers.OverrideWithPointer(o.CustomPort, other.CustomPort)
+	o.PIAEncPreset = helpers.OverrideWithPointer(o.PIAEncPreset, other.PIAEncPreset)
 }
 
 func (o *OpenVPNSelection) setDefaults(vpnProvider string) {
-	o.ConfFile = helpers.DefaultStringPtr(o.ConfFile, "")
-	o.TCP = helpers.DefaultBool(o.TCP, false)
-	o.CustomPort = helpers.DefaultUint16(o.CustomPort, 0)
+	o.ConfFile = helpers.DefaultPointer(o.ConfFile, "")
+	o.TCP = helpers.DefaultPointer(o.TCP, false)
+	o.CustomPort = helpers.DefaultPointer(o.CustomPort, 0)
 
 	var defaultEncPreset string
 	if vpnProvider == providers.PrivateInternetAccess {
 		defaultEncPreset = presets.Strong
 	}
-	o.PIAEncPreset = helpers.DefaultStringPtr(o.PIAEncPreset, defaultEncPreset)
+	o.PIAEncPreset = helpers.DefaultPointer(o.PIAEncPreset, defaultEncPreset)
 }
 
 func (o OpenVPNSelection) String() string {

internal/configuration/settings/portforward.go

@@ -47,24 +47,24 @@ func (p PortForwarding) validate(vpnProvider string) (err error) {
 
 func (p *PortForwarding) copy() (copied PortForwarding) {
 	return PortForwarding{
-		Enabled:  helpers.CopyBoolPtr(p.Enabled),
-		Filepath: helpers.CopyStringPtr(p.Filepath),
+		Enabled:  helpers.CopyPointer(p.Enabled),
+		Filepath: helpers.CopyPointer(p.Filepath),
 	}
 }
 
 func (p *PortForwarding) mergeWith(other PortForwarding) {
-	p.Enabled = helpers.MergeWithBool(p.Enabled, other.Enabled)
-	p.Filepath = helpers.MergeWithStringPtr(p.Filepath, other.Filepath)
+	p.Enabled = helpers.MergeWithPointer(p.Enabled, other.Enabled)
+	p.Filepath = helpers.MergeWithPointer(p.Filepath, other.Filepath)
 }
 
 func (p *PortForwarding) overrideWith(other PortForwarding) {
-	p.Enabled = helpers.OverrideWithBool(p.Enabled, other.Enabled)
-	p.Filepath = helpers.OverrideWithStringPtr(p.Filepath, other.Filepath)
+	p.Enabled = helpers.OverrideWithPointer(p.Enabled, other.Enabled)
+	p.Filepath = helpers.OverrideWithPointer(p.Filepath, other.Filepath)
 }
 
 func (p *PortForwarding) setDefaults() {
-	p.Enabled = helpers.DefaultBool(p.Enabled, false)
-	p.Filepath = helpers.DefaultStringPtr(p.Filepath, "/tmp/gluetun/forwarded_port")
+	p.Enabled = helpers.DefaultPointer(p.Enabled, false)
+	p.Filepath = helpers.DefaultPointer(p.Filepath, "/tmp/gluetun/forwarded_port")
 }
 
 func (p PortForwarding) String() string {

internal/configuration/settings/provider.go

@@ -39,7 +39,7 @@ func (p *Provider) validate(vpnType string, storage Storage) (err error) {
 		}
 	}
 	if !helpers.IsOneOf(*p.Name, validNames...) {
-		return fmt.Errorf("%w: %q can only be one of %s",
+		return fmt.Errorf("%w for Wireguard: %q can only be one of %s",
 			ErrVPNProviderNameNotValid, *p.Name, helpers.ChoicesOrString(validNames))
 	}
 
@@ -58,26 +58,26 @@ func (p *Provider) validate(vpnType string, storage Storage) (err error) {
 
 func (p *Provider) copy() (copied Provider) {
 	return Provider{
-		Name:            helpers.CopyStringPtr(p.Name),
+		Name:            helpers.CopyPointer(p.Name),
 		ServerSelection: p.ServerSelection.copy(),
 		PortForwarding:  p.PortForwarding.copy(),
 	}
 }
 
 func (p *Provider) mergeWith(other Provider) {
-	p.Name = helpers.MergeWithStringPtr(p.Name, other.Name)
+	p.Name = helpers.MergeWithPointer(p.Name, other.Name)
 	p.ServerSelection.mergeWith(other.ServerSelection)
 	p.PortForwarding.mergeWith(other.PortForwarding)
 }
 
 func (p *Provider) overrideWith(other Provider) {
-	p.Name = helpers.OverrideWithStringPtr(p.Name, other.Name)
+	p.Name = helpers.OverrideWithPointer(p.Name, other.Name)
 	p.ServerSelection.overrideWith(other.ServerSelection)
 	p.PortForwarding.overrideWith(other.PortForwarding)
 }
 
 func (p *Provider) setDefaults() {
-	p.Name = helpers.DefaultStringPtr(p.Name, providers.PrivateInternetAccess)
+	p.Name = helpers.DefaultPointer(p.Name, providers.PrivateInternetAccess)
 	p.ServerSelection.setDefaults(*p.Name)
 	p.PortForwarding.setDefaults()
 }

internal/configuration/settings/publicip.go

@@ -42,25 +42,25 @@ func (p PublicIP) validate() (err error) {
 
 func (p *PublicIP) copy() (copied PublicIP) {
 	return PublicIP{
-		Period:     helpers.CopyDurationPtr(p.Period),
-		IPFilepath: helpers.CopyStringPtr(p.IPFilepath),
+		Period:     helpers.CopyPointer(p.Period),
+		IPFilepath: helpers.CopyPointer(p.IPFilepath),
 	}
 }
 
 func (p *PublicIP) mergeWith(other PublicIP) {
-	p.Period = helpers.MergeWithDurationPtr(p.Period, other.Period)
-	p.IPFilepath = helpers.MergeWithStringPtr(p.IPFilepath, other.IPFilepath)
+	p.Period = helpers.MergeWithPointer(p.Period, other.Period)
+	p.IPFilepath = helpers.MergeWithPointer(p.IPFilepath, other.IPFilepath)
 }
 
 func (p *PublicIP) overrideWith(other PublicIP) {
-	p.Period = helpers.OverrideWithDurationPtr(p.Period, other.Period)
-	p.IPFilepath = helpers.OverrideWithStringPtr(p.IPFilepath, other.IPFilepath)
+	p.Period = helpers.OverrideWithPointer(p.Period, other.Period)
+	p.IPFilepath = helpers.OverrideWithPointer(p.IPFilepath, other.IPFilepath)
 }
 
 func (p *PublicIP) setDefaults() {
 	const defaultPeriod = 12 * time.Hour
-	p.Period = helpers.DefaultDurationPtr(p.Period, defaultPeriod)
-	p.IPFilepath = helpers.DefaultStringPtr(p.IPFilepath, "/tmp/gluetun/ip")
+	p.Period = helpers.DefaultPointer(p.Period, defaultPeriod)
+	p.IPFilepath = helpers.DefaultPointer(p.IPFilepath, "/tmp/gluetun/ip")
 }
 
 func (p PublicIP) String() string {

internal/configuration/settings/server.go

@@ -43,29 +43,29 @@ func (c ControlServer) validate() (err error) {
 
 func (c *ControlServer) copy() (copied ControlServer) {
 	return ControlServer{
-		Address: helpers.CopyStringPtr(c.Address),
-		Log:     helpers.CopyBoolPtr(c.Log),
+		Address: helpers.CopyPointer(c.Address),
+		Log:     helpers.CopyPointer(c.Log),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (c *ControlServer) mergeWith(other ControlServer) {
-	c.Address = helpers.MergeWithStringPtr(c.Address, other.Address)
-	c.Log = helpers.MergeWithBool(c.Log, other.Log)
+	c.Address = helpers.MergeWithPointer(c.Address, other.Address)
+	c.Log = helpers.MergeWithPointer(c.Log, other.Log)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (c *ControlServer) overrideWith(other ControlServer) {
-	c.Address = helpers.OverrideWithStringPtr(c.Address, other.Address)
-	c.Log = helpers.OverrideWithBool(c.Log, other.Log)
+	c.Address = helpers.OverrideWithPointer(c.Address, other.Address)
+	c.Log = helpers.OverrideWithPointer(c.Log, other.Log)
 }
 
 func (c *ControlServer) setDefaults() {
-	c.Address = helpers.DefaultStringPtr(c.Address, ":8000")
-	c.Log = helpers.DefaultBool(c.Log, true)
+	c.Address = helpers.DefaultPointer(c.Address, ":8000")
+	c.Log = helpers.DefaultPointer(c.Log, true)
 }
 
 func (c ControlServer) String() string {

internal/configuration/settings/serverselection.go

@@ -3,7 +3,7 @@ package settings
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"strings"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
@@ -21,10 +21,10 @@ type ServerSelection struct { //nolint:maligned
 	VPN string
 	// TargetIP is the server endpoint IP address to use.
 	// It will override any IP address from the picked
-	// built-in server. It cannot be nil in the internal
-	// state, and can be set to an empty net.IP{} to indicate
+	// built-in server. It cannot be the empty value in the internal
+	// state, and can be set to the unspecified address to indicate
 	// there is not target IP address to use.
-	TargetIP net.IP
+	TargetIP netip.Addr
 	// Counties is the list of countries to filter VPN servers with.
 	Countries []string
 	// Regions is the list of regions to filter VPN servers with.
@@ -118,7 +118,7 @@ func (ss *ServerSelection) validate(vpnServiceProvider string,
 	}
 
 	if *ss.FreeOnly && *ss.PremiumOnly {
-		return ErrFreePremiumBothSet
+		return fmt.Errorf("%w", ErrFreePremiumBothSet)
 	}
 
 	if *ss.StreamOnly &&
@@ -202,19 +202,19 @@ func validateServerFilters(settings ServerSelection, filterChoices models.Filter
 func (ss *ServerSelection) copy() (copied ServerSelection) {
 	return ServerSelection{
 		VPN:          ss.VPN,
-		TargetIP:     helpers.CopyIP(ss.TargetIP),
-		Countries:    helpers.CopyStringSlice(ss.Countries),
-		Regions:      helpers.CopyStringSlice(ss.Regions),
-		Cities:       helpers.CopyStringSlice(ss.Cities),
-		ISPs:         helpers.CopyStringSlice(ss.ISPs),
-		Hostnames:    helpers.CopyStringSlice(ss.Hostnames),
-		Names:        helpers.CopyStringSlice(ss.Names),
-		Numbers:      helpers.CopyUint16Slice(ss.Numbers),
-		OwnedOnly:    helpers.CopyBoolPtr(ss.OwnedOnly),
-		FreeOnly:     helpers.CopyBoolPtr(ss.FreeOnly),
-		PremiumOnly:  helpers.CopyBoolPtr(ss.PremiumOnly),
-		StreamOnly:   helpers.CopyBoolPtr(ss.StreamOnly),
-		MultiHopOnly: helpers.CopyBoolPtr(ss.MultiHopOnly),
+		TargetIP:     ss.TargetIP,
+		Countries:    helpers.CopySlice(ss.Countries),
+		Regions:      helpers.CopySlice(ss.Regions),
+		Cities:       helpers.CopySlice(ss.Cities),
+		ISPs:         helpers.CopySlice(ss.ISPs),
+		Hostnames:    helpers.CopySlice(ss.Hostnames),
+		Names:        helpers.CopySlice(ss.Names),
+		Numbers:      helpers.CopySlice(ss.Numbers),
+		OwnedOnly:    helpers.CopyPointer(ss.OwnedOnly),
+		FreeOnly:     helpers.CopyPointer(ss.FreeOnly),
+		PremiumOnly:  helpers.CopyPointer(ss.PremiumOnly),
+		StreamOnly:   helpers.CopyPointer(ss.StreamOnly),
+		MultiHopOnly: helpers.CopyPointer(ss.MultiHopOnly),
 		OpenVPN:      ss.OpenVPN.copy(),
 		Wireguard:    ss.Wireguard.copy(),
 	}
@@ -223,18 +223,18 @@ func (ss *ServerSelection) copy() (copied ServerSelection) {
 func (ss *ServerSelection) mergeWith(other ServerSelection) {
 	ss.VPN = helpers.MergeWithString(ss.VPN, other.VPN)
 	ss.TargetIP = helpers.MergeWithIP(ss.TargetIP, other.TargetIP)
-	ss.Countries = helpers.MergeStringSlices(ss.Countries, other.Countries)
-	ss.Regions = helpers.MergeStringSlices(ss.Regions, other.Regions)
-	ss.Cities = helpers.MergeStringSlices(ss.Cities, other.Cities)
-	ss.ISPs = helpers.MergeStringSlices(ss.ISPs, other.ISPs)
-	ss.Hostnames = helpers.MergeStringSlices(ss.Hostnames, other.Hostnames)
-	ss.Names = helpers.MergeStringSlices(ss.Names, other.Names)
-	ss.Numbers = helpers.MergeUint16Slices(ss.Numbers, other.Numbers)
-	ss.OwnedOnly = helpers.MergeWithBool(ss.OwnedOnly, other.OwnedOnly)
-	ss.FreeOnly = helpers.MergeWithBool(ss.FreeOnly, other.FreeOnly)
-	ss.PremiumOnly = helpers.MergeWithBool(ss.PremiumOnly, other.PremiumOnly)
-	ss.StreamOnly = helpers.MergeWithBool(ss.StreamOnly, other.StreamOnly)
-	ss.MultiHopOnly = helpers.MergeWithBool(ss.MultiHopOnly, other.MultiHopOnly)
+	ss.Countries = helpers.MergeSlices(ss.Countries, other.Countries)
+	ss.Regions = helpers.MergeSlices(ss.Regions, other.Regions)
+	ss.Cities = helpers.MergeSlices(ss.Cities, other.Cities)
+	ss.ISPs = helpers.MergeSlices(ss.ISPs, other.ISPs)
+	ss.Hostnames = helpers.MergeSlices(ss.Hostnames, other.Hostnames)
+	ss.Names = helpers.MergeSlices(ss.Names, other.Names)
+	ss.Numbers = helpers.MergeSlices(ss.Numbers, other.Numbers)
+	ss.OwnedOnly = helpers.MergeWithPointer(ss.OwnedOnly, other.OwnedOnly)
+	ss.FreeOnly = helpers.MergeWithPointer(ss.FreeOnly, other.FreeOnly)
+	ss.PremiumOnly = helpers.MergeWithPointer(ss.PremiumOnly, other.PremiumOnly)
+	ss.StreamOnly = helpers.MergeWithPointer(ss.StreamOnly, other.StreamOnly)
+	ss.MultiHopOnly = helpers.MergeWithPointer(ss.MultiHopOnly, other.MultiHopOnly)
 
 	ss.OpenVPN.mergeWith(other.OpenVPN)
 	ss.Wireguard.mergeWith(other.Wireguard)
@@ -243,30 +243,30 @@ func (ss *ServerSelection) mergeWith(other ServerSelection) {
 func (ss *ServerSelection) overrideWith(other ServerSelection) {
 	ss.VPN = helpers.OverrideWithString(ss.VPN, other.VPN)
 	ss.TargetIP = helpers.OverrideWithIP(ss.TargetIP, other.TargetIP)
-	ss.Countries = helpers.OverrideWithStringSlice(ss.Countries, other.Countries)
-	ss.Regions = helpers.OverrideWithStringSlice(ss.Regions, other.Regions)
-	ss.Cities = helpers.OverrideWithStringSlice(ss.Cities, other.Cities)
-	ss.ISPs = helpers.OverrideWithStringSlice(ss.ISPs, other.ISPs)
-	ss.Hostnames = helpers.OverrideWithStringSlice(ss.Hostnames, other.Hostnames)
-	ss.Names = helpers.OverrideWithStringSlice(ss.Names, other.Names)
-	ss.Numbers = helpers.OverrideWithUint16Slice(ss.Numbers, other.Numbers)
-	ss.OwnedOnly = helpers.OverrideWithBool(ss.OwnedOnly, other.OwnedOnly)
-	ss.FreeOnly = helpers.OverrideWithBool(ss.FreeOnly, other.FreeOnly)
-	ss.PremiumOnly = helpers.OverrideWithBool(ss.PremiumOnly, other.PremiumOnly)
-	ss.StreamOnly = helpers.OverrideWithBool(ss.StreamOnly, other.StreamOnly)
-	ss.MultiHopOnly = helpers.OverrideWithBool(ss.MultiHopOnly, other.MultiHopOnly)
+	ss.Countries = helpers.OverrideWithSlice(ss.Countries, other.Countries)
+	ss.Regions = helpers.OverrideWithSlice(ss.Regions, other.Regions)
+	ss.Cities = helpers.OverrideWithSlice(ss.Cities, other.Cities)
+	ss.ISPs = helpers.OverrideWithSlice(ss.ISPs, other.ISPs)
+	ss.Hostnames = helpers.OverrideWithSlice(ss.Hostnames, other.Hostnames)
+	ss.Names = helpers.OverrideWithSlice(ss.Names, other.Names)
+	ss.Numbers = helpers.OverrideWithSlice(ss.Numbers, other.Numbers)
+	ss.OwnedOnly = helpers.OverrideWithPointer(ss.OwnedOnly, other.OwnedOnly)
+	ss.FreeOnly = helpers.OverrideWithPointer(ss.FreeOnly, other.FreeOnly)
+	ss.PremiumOnly = helpers.OverrideWithPointer(ss.PremiumOnly, other.PremiumOnly)
+	ss.StreamOnly = helpers.OverrideWithPointer(ss.StreamOnly, other.StreamOnly)
+	ss.MultiHopOnly = helpers.OverrideWithPointer(ss.MultiHopOnly, other.MultiHopOnly)
 	ss.OpenVPN.overrideWith(other.OpenVPN)
 	ss.Wireguard.overrideWith(other.Wireguard)
 }
 
 func (ss *ServerSelection) setDefaults(vpnProvider string) {
 	ss.VPN = helpers.DefaultString(ss.VPN, vpn.OpenVPN)
-	ss.TargetIP = helpers.DefaultIP(ss.TargetIP, net.IP{})
-	ss.OwnedOnly = helpers.DefaultBool(ss.OwnedOnly, false)
-	ss.FreeOnly = helpers.DefaultBool(ss.FreeOnly, false)
-	ss.PremiumOnly = helpers.DefaultBool(ss.PremiumOnly, false)
-	ss.StreamOnly = helpers.DefaultBool(ss.StreamOnly, false)
-	ss.MultiHopOnly = helpers.DefaultBool(ss.MultiHopOnly, false)
+	ss.TargetIP = helpers.DefaultIP(ss.TargetIP, netip.IPv4Unspecified())
+	ss.OwnedOnly = helpers.DefaultPointer(ss.OwnedOnly, false)
+	ss.FreeOnly = helpers.DefaultPointer(ss.FreeOnly, false)
+	ss.PremiumOnly = helpers.DefaultPointer(ss.PremiumOnly, false)
+	ss.StreamOnly = helpers.DefaultPointer(ss.StreamOnly, false)
+	ss.MultiHopOnly = helpers.DefaultPointer(ss.MultiHopOnly, false)
 	ss.OpenVPN.setDefaults(vpnProvider)
 	ss.Wireguard.setDefaults()
 }
@@ -278,7 +278,7 @@ func (ss ServerSelection) String() string {
 func (ss ServerSelection) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Server selection settings:")
 	node.Appendf("VPN type: %s", ss.VPN)
-	if len(ss.TargetIP) > 0 {
+	if !ss.TargetIP.IsUnspecified() {
 		node.Appendf("Target IP address: %s", ss.TargetIP)
 	}
 

internal/configuration/settings/settings_test.go

@@ -66,6 +66,7 @@ func Test_Settings_String(t *testing.T) {
 ├── Health settings:
 |   ├── Server listening address: 127.0.0.1:9999
 |   ├── Target address: cloudflare.com:443
+|   ├── Duration to wait after success: 5s
 |   ├── Read header timeout: 100ms
 |   ├── Read timeout: 500ms
 |   └── VPN wait durations:

internal/configuration/settings/shadowsocks.go

@@ -21,7 +21,7 @@ func (s Shadowsocks) validate() (err error) {
 
 func (s *Shadowsocks) copy() (copied Shadowsocks) {
 	return Shadowsocks{
-		Enabled:  helpers.CopyBoolPtr(s.Enabled),
+		Enabled:  helpers.CopyPointer(s.Enabled),
 		Settings: s.Settings.Copy(),
 	}
 }
@@ -29,7 +29,7 @@ func (s *Shadowsocks) copy() (copied Shadowsocks) {
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (s *Shadowsocks) mergeWith(other Shadowsocks) {
-	s.Enabled = helpers.MergeWithBool(s.Enabled, other.Enabled)
+	s.Enabled = helpers.MergeWithPointer(s.Enabled, other.Enabled)
 	s.Settings.MergeWith(other.Settings)
 }
 
@@ -37,12 +37,12 @@ func (s *Shadowsocks) mergeWith(other Shadowsocks) {
 // settings object with any field set in the other
 // settings.
 func (s *Shadowsocks) overrideWith(other Shadowsocks) {
-	s.Enabled = helpers.OverrideWithBool(s.Enabled, other.Enabled)
+	s.Enabled = helpers.OverrideWithPointer(s.Enabled, other.Enabled)
 	s.Settings.OverrideWith(other.Settings)
 }
 
 func (s *Shadowsocks) setDefaults() {
-	s.Enabled = helpers.DefaultBool(s.Enabled, false)
+	s.Enabled = helpers.DefaultPointer(s.Enabled, false)
 	s.Settings.SetDefaults()
 }
 

internal/configuration/settings/system.go

@@ -19,28 +19,28 @@ func (s System) validate() (err error) {
 
 func (s *System) copy() (copied System) {
 	return System{
-		PUID:     helpers.CopyUint32Ptr(s.PUID),
-		PGID:     helpers.CopyUint32Ptr(s.PGID),
+		PUID:     helpers.CopyPointer(s.PUID),
+		PGID:     helpers.CopyPointer(s.PGID),
 		Timezone: s.Timezone,
 	}
 }
 
 func (s *System) mergeWith(other System) {
-	s.PUID = helpers.MergeWithUint32(s.PUID, other.PUID)
-	s.PGID = helpers.MergeWithUint32(s.PGID, other.PGID)
+	s.PUID = helpers.MergeWithPointer(s.PUID, other.PUID)
+	s.PGID = helpers.MergeWithPointer(s.PGID, other.PGID)
 	s.Timezone = helpers.MergeWithString(s.Timezone, other.Timezone)
 }
 
 func (s *System) overrideWith(other System) {
-	s.PUID = helpers.OverrideWithUint32(s.PUID, other.PUID)
-	s.PGID = helpers.OverrideWithUint32(s.PGID, other.PGID)
+	s.PUID = helpers.OverrideWithPointer(s.PUID, other.PUID)
+	s.PGID = helpers.OverrideWithPointer(s.PGID, other.PGID)
 	s.Timezone = helpers.OverrideWithString(s.Timezone, other.Timezone)
 }
 
 func (s *System) setDefaults() {
 	const defaultID = 1000
-	s.PUID = helpers.DefaultUint32(s.PUID, defaultID)
-	s.PGID = helpers.DefaultUint32(s.PGID, defaultID)
+	s.PUID = helpers.DefaultPointer(s.PUID, defaultID)
+	s.PGID = helpers.DefaultPointer(s.PGID, defaultID)
 }
 
 func (s System) String() string {

internal/configuration/settings/unbound.go

@@ -3,13 +3,12 @@ package settings
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/dns/pkg/provider"
 	"github.com/qdm12/dns/pkg/unbound"
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gotree"
-	"inet.af/netaddr"
 )
 
 // Unbound is settings for the Unbound program.
@@ -21,7 +20,7 @@ type Unbound struct {
 	VerbosityDetailsLevel *uint8
 	ValidationLogLevel    *uint8
 	Username              string
-	Allowed               []netaddr.IPPrefix
+	Allowed               []netip.Prefix
 }
 
 func (u *Unbound) setDefaults() {
@@ -31,22 +30,22 @@ func (u *Unbound) setDefaults() {
 		}
 	}
 
-	u.Caching = helpers.DefaultBool(u.Caching, true)
-	u.IPv6 = helpers.DefaultBool(u.IPv6, false)
+	u.Caching = helpers.DefaultPointer(u.Caching, true)
+	u.IPv6 = helpers.DefaultPointer(u.IPv6, false)
 
 	const defaultVerbosityLevel = 1
-	u.VerbosityLevel = helpers.DefaultUint8(u.VerbosityLevel, defaultVerbosityLevel)
+	u.VerbosityLevel = helpers.DefaultPointer(u.VerbosityLevel, defaultVerbosityLevel)
 
 	const defaultVerbosityDetailsLevel = 0
-	u.VerbosityDetailsLevel = helpers.DefaultUint8(u.VerbosityDetailsLevel, defaultVerbosityDetailsLevel)
+	u.VerbosityDetailsLevel = helpers.DefaultPointer(u.VerbosityDetailsLevel, defaultVerbosityDetailsLevel)
 
 	const defaultValidationLogLevel = 0
-	u.ValidationLogLevel = helpers.DefaultUint8(u.ValidationLogLevel, defaultValidationLogLevel)
+	u.ValidationLogLevel = helpers.DefaultPointer(u.ValidationLogLevel, defaultValidationLogLevel)
 
 	if u.Allowed == nil {
-		u.Allowed = []netaddr.IPPrefix{
-			netaddr.IPPrefixFrom(netaddr.IPv4(0, 0, 0, 0), 0),
-			netaddr.IPPrefixFrom(netaddr.IPv6Raw([16]byte{}), 0),
+		u.Allowed = []netip.Prefix{
+			netip.PrefixFrom(netip.AddrFrom4([4]byte{}), 0),
+			netip.PrefixFrom(netip.AddrFrom16([16]byte{}), 0),
 		}
 	}
 
@@ -95,37 +94,37 @@ func (u Unbound) validate() (err error) {
 
 func (u Unbound) copy() (copied Unbound) {
 	return Unbound{
-		Providers:             helpers.CopyStringSlice(u.Providers),
-		Caching:               helpers.CopyBoolPtr(u.Caching),
-		IPv6:                  helpers.CopyBoolPtr(u.IPv6),
-		VerbosityLevel:        helpers.CopyUint8Ptr(u.VerbosityLevel),
-		VerbosityDetailsLevel: helpers.CopyUint8Ptr(u.VerbosityDetailsLevel),
-		ValidationLogLevel:    helpers.CopyUint8Ptr(u.ValidationLogLevel),
+		Providers:             helpers.CopySlice(u.Providers),
+		Caching:               helpers.CopyPointer(u.Caching),
+		IPv6:                  helpers.CopyPointer(u.IPv6),
+		VerbosityLevel:        helpers.CopyPointer(u.VerbosityLevel),
+		VerbosityDetailsLevel: helpers.CopyPointer(u.VerbosityDetailsLevel),
+		ValidationLogLevel:    helpers.CopyPointer(u.ValidationLogLevel),
 		Username:              u.Username,
-		Allowed:               helpers.CopyIPPrefixSlice(u.Allowed),
+		Allowed:               helpers.CopySlice(u.Allowed),
 	}
 }
 
 func (u *Unbound) mergeWith(other Unbound) {
-	u.Providers = helpers.MergeStringSlices(u.Providers, other.Providers)
-	u.Caching = helpers.MergeWithBool(u.Caching, other.Caching)
-	u.IPv6 = helpers.MergeWithBool(u.IPv6, other.IPv6)
-	u.VerbosityLevel = helpers.MergeWithUint8(u.VerbosityLevel, other.VerbosityLevel)
-	u.VerbosityDetailsLevel = helpers.MergeWithUint8(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
-	u.ValidationLogLevel = helpers.MergeWithUint8(u.ValidationLogLevel, other.ValidationLogLevel)
+	u.Providers = helpers.MergeSlices(u.Providers, other.Providers)
+	u.Caching = helpers.MergeWithPointer(u.Caching, other.Caching)
+	u.IPv6 = helpers.MergeWithPointer(u.IPv6, other.IPv6)
+	u.VerbosityLevel = helpers.MergeWithPointer(u.VerbosityLevel, other.VerbosityLevel)
+	u.VerbosityDetailsLevel = helpers.MergeWithPointer(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
+	u.ValidationLogLevel = helpers.MergeWithPointer(u.ValidationLogLevel, other.ValidationLogLevel)
 	u.Username = helpers.MergeWithString(u.Username, other.Username)
-	u.Allowed = helpers.MergeIPPrefixesSlices(u.Allowed, other.Allowed)
+	u.Allowed = helpers.MergeSlices(u.Allowed, other.Allowed)
 }
 
 func (u *Unbound) overrideWith(other Unbound) {
-	u.Providers = helpers.OverrideWithStringSlice(u.Providers, other.Providers)
-	u.Caching = helpers.OverrideWithBool(u.Caching, other.Caching)
-	u.IPv6 = helpers.OverrideWithBool(u.IPv6, other.IPv6)
-	u.VerbosityLevel = helpers.OverrideWithUint8(u.VerbosityLevel, other.VerbosityLevel)
-	u.VerbosityDetailsLevel = helpers.OverrideWithUint8(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
-	u.ValidationLogLevel = helpers.OverrideWithUint8(u.ValidationLogLevel, other.ValidationLogLevel)
+	u.Providers = helpers.OverrideWithSlice(u.Providers, other.Providers)
+	u.Caching = helpers.OverrideWithPointer(u.Caching, other.Caching)
+	u.IPv6 = helpers.OverrideWithPointer(u.IPv6, other.IPv6)
+	u.VerbosityLevel = helpers.OverrideWithPointer(u.VerbosityLevel, other.VerbosityLevel)
+	u.VerbosityDetailsLevel = helpers.OverrideWithPointer(u.VerbosityDetailsLevel, other.VerbosityDetailsLevel)
+	u.ValidationLogLevel = helpers.OverrideWithPointer(u.ValidationLogLevel, other.ValidationLogLevel)
 	u.Username = helpers.OverrideWithString(u.Username, other.Username)
-	u.Allowed = helpers.OverrideWithIPPrefixesSlice(u.Allowed, other.Allowed)
+	u.Allowed = helpers.OverrideWithSlice(u.Allowed, other.Allowed)
 }
 
 func (u Unbound) ToUnboundFormat() (settings unbound.Settings, err error) {
@@ -149,20 +148,30 @@ func (u Unbound) ToUnboundFormat() (settings unbound.Settings, err error) {
 		VerbosityDetailsLevel: *u.VerbosityDetailsLevel,
 		ValidationLogLevel:    *u.ValidationLogLevel,
 		AccessControl: unbound.AccessControlSettings{
-			Allowed: u.Allowed,
+			Allowed: netipPrefixesToNetaddrIPPrefixes(u.Allowed),
 		},
 		Username: u.Username,
 	}, nil
 }
 
-func (u Unbound) GetFirstPlaintextIPv4() (ipv4 net.IP, err error) {
+var (
+	ErrConvertingNetip = errors.New("converting net.IP to netip.Addr failed")
+)
+
+func (u Unbound) GetFirstPlaintextIPv4() (ipv4 netip.Addr, err error) {
 	s := u.Providers[0]
 	provider, err := provider.Parse(s)
 	if err != nil {
-		return nil, err
+		return ipv4, err
 	}
 
-	return provider.DNS().IPv4[0], nil
+	ip := provider.DNS().IPv4[0]
+	ipv4, ok := netip.AddrFromSlice(ip)
+	if !ok {
+		return ipv4, fmt.Errorf("%w: for ip %s (%#v)",
+			ErrConvertingNetip, ip, ip)
+	}
+	return ipv4.Unmap(), nil
 }
 
 func (u Unbound) String() string {

internal/configuration/settings/unbound_test.go

@@ -2,11 +2,11 @@ package settings
 
 import (
 	"encoding/json"
+	"net/netip"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"inet.af/netaddr"
 )
 
 func Test_Unbound_JSON(t *testing.T) {
@@ -20,9 +20,9 @@ func Test_Unbound_JSON(t *testing.T) {
 		VerbosityDetailsLevel: nil,
 		ValidationLogLevel:    uint8Ptr(0),
 		Username:              "user",
-		Allowed: []netaddr.IPPrefix{
-			netaddr.IPPrefixFrom(netaddr.IPv4(0, 0, 0, 0), 0),
-			netaddr.IPPrefixFrom(netaddr.IPv6Raw([16]byte{}), 0),
+		Allowed: []netip.Prefix{
+			netip.PrefixFrom(netip.AddrFrom4([4]byte{}), 0),
+			netip.PrefixFrom(netip.AddrFrom16([16]byte{}), 0),
 		},
 	}
 

internal/configuration/settings/updater.go

@@ -63,34 +63,34 @@ func (u Updater) Validate() (err error) {
 
 func (u *Updater) copy() (copied Updater) {
 	return Updater{
-		Period:     helpers.CopyDurationPtr(u.Period),
+		Period:     helpers.CopyPointer(u.Period),
 		DNSAddress: u.DNSAddress,
 		MinRatio:   u.MinRatio,
-		Providers:  helpers.CopyStringSlice(u.Providers),
+		Providers:  helpers.CopySlice(u.Providers),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (u *Updater) mergeWith(other Updater) {
-	u.Period = helpers.MergeWithDurationPtr(u.Period, other.Period)
+	u.Period = helpers.MergeWithPointer(u.Period, other.Period)
 	u.DNSAddress = helpers.MergeWithString(u.DNSAddress, other.DNSAddress)
-	u.MinRatio = helpers.MergeWithFloat64(u.MinRatio, other.MinRatio)
-	u.Providers = helpers.MergeStringSlices(u.Providers, other.Providers)
+	u.MinRatio = helpers.MergeWithNumber(u.MinRatio, other.MinRatio)
+	u.Providers = helpers.MergeSlices(u.Providers, other.Providers)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (u *Updater) overrideWith(other Updater) {
-	u.Period = helpers.OverrideWithDurationPtr(u.Period, other.Period)
+	u.Period = helpers.OverrideWithPointer(u.Period, other.Period)
 	u.DNSAddress = helpers.OverrideWithString(u.DNSAddress, other.DNSAddress)
-	u.MinRatio = helpers.OverrideWithFloat64(u.MinRatio, other.MinRatio)
-	u.Providers = helpers.OverrideWithStringSlice(u.Providers, other.Providers)
+	u.MinRatio = helpers.OverrideWithNumber(u.MinRatio, other.MinRatio)
+	u.Providers = helpers.OverrideWithSlice(u.Providers, other.Providers)
 }
 
 func (u *Updater) SetDefaults(vpnProvider string) {
-	u.Period = helpers.DefaultDurationPtr(u.Period, 0)
+	u.Period = helpers.DefaultPointer(u.Period, 0)
 	u.DNSAddress = helpers.DefaultString(u.DNSAddress, "1.1.1.1:53")
 
 	if u.MinRatio == 0 {

internal/configuration/settings/version.go

@@ -19,25 +19,25 @@ func (v Version) validate() (err error) {
 
 func (v *Version) copy() (copied Version) {
 	return Version{
-		Enabled: helpers.CopyBoolPtr(v.Enabled),
+		Enabled: helpers.CopyPointer(v.Enabled),
 	}
 }
 
 // mergeWith merges the other settings into any
 // unset field of the receiver settings object.
 func (v *Version) mergeWith(other Version) {
-	v.Enabled = helpers.MergeWithBool(v.Enabled, other.Enabled)
+	v.Enabled = helpers.MergeWithPointer(v.Enabled, other.Enabled)
 }
 
 // overrideWith overrides fields of the receiver
 // settings object with any field set in the other
 // settings.
 func (v *Version) overrideWith(other Version) {
-	v.Enabled = helpers.OverrideWithBool(v.Enabled, other.Enabled)
+	v.Enabled = helpers.OverrideWithPointer(v.Enabled, other.Enabled)
 }
 
 func (v *Version) setDefaults() {
-	v.Enabled = helpers.DefaultBool(v.Enabled, true)
+	v.Enabled = helpers.DefaultPointer(v.Enabled, true)
 }
 
 func (v Version) String() string {

internal/configuration/settings/wireguard.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 	"regexp"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
@@ -22,7 +22,7 @@ type Wireguard struct {
 	// It cannot be nil in the internal state.
 	PreSharedKey *string
 	// Addresses are the Wireguard interface addresses.
-	Addresses []net.IPNet
+	Addresses []netip.Prefix
 	// Interface is the name of the Wireguard interface
 	// to create. It cannot be the empty string in the
 	// internal state.
@@ -52,7 +52,7 @@ func (w Wireguard) validate(vpnProvider string, ipv6Supported bool) (err error)
 
 	// Validate PrivateKey
 	if *w.PrivateKey == "" {
-		return ErrWireguardPrivateKeyNotSet
+		return fmt.Errorf("%w", ErrWireguardPrivateKeyNotSet)
 	}
 	_, err = wgtypes.ParseKey(*w.PrivateKey)
 	if err != nil {
@@ -75,16 +75,15 @@ func (w Wireguard) validate(vpnProvider string, ipv6Supported bool) (err error)
 
 	// Validate Addresses
 	if len(w.Addresses) == 0 {
-		return ErrWireguardInterfaceAddressNotSet
+		return fmt.Errorf("%w", ErrWireguardInterfaceAddressNotSet)
 	}
 	for i, ipNet := range w.Addresses {
-		if ipNet.IP == nil || ipNet.Mask == nil {
+		if !ipNet.IsValid() {
 			return fmt.Errorf("%w: for address at index %d: %s",
 				ErrWireguardInterfaceAddressNotSet, i, ipNet.String())
 		}
 
-		ipv6Net := ipNet.IP.To4() == nil
-		if ipv6Net && !ipv6Supported {
+		if !ipv6Supported && ipNet.Addr().Is6() {
 			return fmt.Errorf("%w: address %s",
 				ErrWireguardInterfaceAddressIPv6, ipNet)
 		}
@@ -107,33 +106,33 @@ func (w Wireguard) validate(vpnProvider string, ipv6Supported bool) (err error)
 
 func (w *Wireguard) copy() (copied Wireguard) {
 	return Wireguard{
-		PrivateKey:     helpers.CopyStringPtr(w.PrivateKey),
-		PreSharedKey:   helpers.CopyStringPtr(w.PreSharedKey),
-		Addresses:      helpers.CopyIPNetSlice(w.Addresses),
+		PrivateKey:     helpers.CopyPointer(w.PrivateKey),
+		PreSharedKey:   helpers.CopyPointer(w.PreSharedKey),
+		Addresses:      helpers.CopySlice(w.Addresses),
 		Interface:      w.Interface,
 		Implementation: w.Implementation,
 	}
 }
 
 func (w *Wireguard) mergeWith(other Wireguard) {
-	w.PrivateKey = helpers.MergeWithStringPtr(w.PrivateKey, other.PrivateKey)
-	w.PreSharedKey = helpers.MergeWithStringPtr(w.PreSharedKey, other.PreSharedKey)
-	w.Addresses = helpers.MergeIPNetsSlices(w.Addresses, other.Addresses)
+	w.PrivateKey = helpers.MergeWithPointer(w.PrivateKey, other.PrivateKey)
+	w.PreSharedKey = helpers.MergeWithPointer(w.PreSharedKey, other.PreSharedKey)
+	w.Addresses = helpers.MergeSlices(w.Addresses, other.Addresses)
 	w.Interface = helpers.MergeWithString(w.Interface, other.Interface)
 	w.Implementation = helpers.MergeWithString(w.Implementation, other.Implementation)
 }
 
 func (w *Wireguard) overrideWith(other Wireguard) {
-	w.PrivateKey = helpers.OverrideWithStringPtr(w.PrivateKey, other.PrivateKey)
-	w.PreSharedKey = helpers.OverrideWithStringPtr(w.PreSharedKey, other.PreSharedKey)
-	w.Addresses = helpers.OverrideWithIPNetsSlice(w.Addresses, other.Addresses)
+	w.PrivateKey = helpers.OverrideWithPointer(w.PrivateKey, other.PrivateKey)
+	w.PreSharedKey = helpers.OverrideWithPointer(w.PreSharedKey, other.PreSharedKey)
+	w.Addresses = helpers.OverrideWithSlice(w.Addresses, other.Addresses)
 	w.Interface = helpers.OverrideWithString(w.Interface, other.Interface)
 	w.Implementation = helpers.OverrideWithString(w.Implementation, other.Implementation)
 }
 
 func (w *Wireguard) setDefaults() {
-	w.PrivateKey = helpers.DefaultStringPtr(w.PrivateKey, "")
-	w.PreSharedKey = helpers.DefaultStringPtr(w.PreSharedKey, "")
+	w.PrivateKey = helpers.DefaultPointer(w.PrivateKey, "")
+	w.PreSharedKey = helpers.DefaultPointer(w.PreSharedKey, "")
 	w.Interface = helpers.DefaultString(w.Interface, "wg0")
 	w.Implementation = helpers.DefaultString(w.Implementation, "auto")
 }

internal/configuration/settings/wireguardselection.go

@@ -2,7 +2,7 @@ package settings
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
 	"github.com/qdm12/gluetun/internal/constants/providers"
@@ -15,9 +15,9 @@ type WireguardSelection struct {
 	// It is only used with VPN providers generating Wireguard
 	// configurations specific to each server and user.
 	// To indicate it should not be used, it should be set
-	// to the empty net.IP{} slice. It can never be nil
+	// to netaddr.IPv4Unspecified(). It can never be the zero value
 	// in the internal state.
-	EndpointIP net.IP
+	EndpointIP netip.Addr
 	// EndpointPort is a the server port to use for the VPN server.
 	// It is optional for VPN providers IVPN, Mullvad, Surfshark
 	// and Windscribe, and compulsory for the others.
@@ -40,8 +40,8 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 		providers.Surfshark, providers.Windscribe:
 		// endpoint IP addresses are baked in
 	case providers.Custom:
-		if len(w.EndpointIP) == 0 {
-			return ErrWireguardEndpointIPNotSet
+		if !w.EndpointIP.IsValid() || w.EndpointIP.IsUnspecified() {
+			return fmt.Errorf("%w", ErrWireguardEndpointIPNotSet)
 		}
 	default: // Providers not supporting Wireguard
 	}
@@ -51,12 +51,12 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 	// EndpointPort is required
 	case providers.Custom:
 		if *w.EndpointPort == 0 {
-			return ErrWireguardEndpointPortNotSet
+			return fmt.Errorf("%w", ErrWireguardEndpointPortNotSet)
 		}
 	// EndpointPort cannot be set
 	case providers.Surfshark:
 		if *w.EndpointPort != 0 {
-			return ErrWireguardEndpointPortSet
+			return fmt.Errorf("%w", ErrWireguardEndpointPortSet)
 		}
 	case providers.Airvpn, providers.Ivpn, providers.Mullvad, providers.Windscribe:
 		// EndpointPort is optional and can be 0
@@ -92,7 +92,7 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 		// public keys are baked in
 	case providers.Custom:
 		if w.PublicKey == "" {
-			return ErrWireguardPublicKeyNotSet
+			return fmt.Errorf("%w", ErrWireguardPublicKeyNotSet)
 		}
 	default: // Providers not supporting Wireguard
 	}
@@ -109,27 +109,27 @@ func (w WireguardSelection) validate(vpnProvider string) (err error) {
 
 func (w *WireguardSelection) copy() (copied WireguardSelection) {
 	return WireguardSelection{
-		EndpointIP:   helpers.CopyIP(w.EndpointIP),
-		EndpointPort: helpers.CopyUint16Ptr(w.EndpointPort),
+		EndpointIP:   w.EndpointIP,
+		EndpointPort: helpers.CopyPointer(w.EndpointPort),
 		PublicKey:    w.PublicKey,
 	}
 }
 
 func (w *WireguardSelection) mergeWith(other WireguardSelection) {
 	w.EndpointIP = helpers.MergeWithIP(w.EndpointIP, other.EndpointIP)
-	w.EndpointPort = helpers.MergeWithUint16(w.EndpointPort, other.EndpointPort)
+	w.EndpointPort = helpers.MergeWithPointer(w.EndpointPort, other.EndpointPort)
 	w.PublicKey = helpers.MergeWithString(w.PublicKey, other.PublicKey)
 }
 
 func (w *WireguardSelection) overrideWith(other WireguardSelection) {
 	w.EndpointIP = helpers.OverrideWithIP(w.EndpointIP, other.EndpointIP)
-	w.EndpointPort = helpers.OverrideWithUint16(w.EndpointPort, other.EndpointPort)
+	w.EndpointPort = helpers.OverrideWithPointer(w.EndpointPort, other.EndpointPort)
 	w.PublicKey = helpers.OverrideWithString(w.PublicKey, other.PublicKey)
 }
 
 func (w *WireguardSelection) setDefaults() {
-	w.EndpointIP = helpers.DefaultIP(w.EndpointIP, net.IP{})
-	w.EndpointPort = helpers.DefaultUint16(w.EndpointPort, 0)
+	w.EndpointIP = helpers.DefaultIP(w.EndpointIP, netip.IPv4Unspecified())
+	w.EndpointPort = helpers.DefaultPointer(w.EndpointPort, 0)
 }
 
 func (w WireguardSelection) String() string {
@@ -139,7 +139,7 @@ func (w WireguardSelection) String() string {
 func (w WireguardSelection) toLinesNode() (node *gotree.Node) {
 	node = gotree.New("Wireguard selection settings:")
 
-	if len(w.EndpointIP) > 0 {
+	if !w.EndpointIP.IsUnspecified() {
 		node.Appendf("Endpoint IP address: %s", w.EndpointIP)
 	}
 

internal/configuration/sources/env/dns.go

@@ -2,7 +2,7 @@ package env
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 )
@@ -26,19 +26,19 @@ func (s *Source) readDNS() (dns settings.DNS, err error) {
 	return dns, nil
 }
 
-func (s *Source) readDNSServerAddress() (address net.IP, err error) {
+func (s *Source) readDNSServerAddress() (address netip.Addr, err error) {
 	key, value := s.getEnvWithRetro("DNS_ADDRESS", "DNS_PLAINTEXT_ADDRESS")
 	if value == "" {
-		return nil, nil
+		return address, nil
 	}
 
-	address = net.ParseIP(value)
-	if address == nil {
-		return nil, fmt.Errorf("environment variable %s: %w: %s", key, ErrIPAddressParse, value)
+	address, err = netip.ParseAddr(value)
+	if err != nil {
+		return address, fmt.Errorf("environment variable %s: %w", key, err)
 	}
 
 	// TODO remove in v4
-	if !address.Equal(net.IPv4(127, 0, 0, 1)) { //nolint:gomnd
+	if address.Unmap().Compare(netip.AddrFrom4([4]byte{127, 0, 0, 1})) != 0 {
 		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 serves." +

internal/configuration/sources/env/dnsblacklist.go

@@ -3,10 +3,10 @@ package env
 import (
 	"errors"
 	"fmt"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/govalid/binary"
-	"inet.af/netaddr"
 )
 
 func (s *Source) readDNSBlacklist() (blacklist settings.DNSBlacklist, err error) {
@@ -55,24 +55,24 @@ var (
 	ErrPrivateAddressNotValid = errors.New("private address is not a valid IP or CIDR range")
 )
 
-func readDoTPrivateAddresses() (ips []netaddr.IP,
-	ipPrefixes []netaddr.IPPrefix, err error) {
+func readDoTPrivateAddresses() (ips []netip.Addr,
+	ipPrefixes []netip.Prefix, err error) {
 	privateAddresses := envToCSV("DOT_PRIVATE_ADDRESS")
 	if len(privateAddresses) == 0 {
 		return nil, nil, nil
 	}
 
-	ips = make([]netaddr.IP, 0, len(privateAddresses))
-	ipPrefixes = make([]netaddr.IPPrefix, 0, len(privateAddresses))
+	ips = make([]netip.Addr, 0, len(privateAddresses))
+	ipPrefixes = make([]netip.Prefix, 0, len(privateAddresses))
 
 	for _, privateAddress := range privateAddresses {
-		ip, err := netaddr.ParseIP(privateAddress)
+		ip, err := netip.ParseAddr(privateAddress)
 		if err == nil {
 			ips = append(ips, ip)
 			continue
 		}
 
-		ipPrefix, err := netaddr.ParseIPPrefix(privateAddress)
+		ipPrefix, err := netip.ParsePrefix(privateAddress)
 		if err == nil {
 			ipPrefixes = append(ipPrefixes, ipPrefix)
 			continue

internal/configuration/sources/env/firewall.go

@@ -3,7 +3,7 @@ package env
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"strconv"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -24,7 +24,7 @@ func (s *Source) readFirewall() (firewall settings.Firewall, err error) {
 
 	outboundSubnetsKey, _ := s.getEnvWithRetro("FIREWALL_OUTBOUND_SUBNETS", "EXTRA_SUBNETS")
 	outboundSubnetStrings := envToCSV(outboundSubnetsKey)
-	firewall.OutboundSubnets, err = stringsToIPNets(outboundSubnetStrings)
+	firewall.OutboundSubnets, err = stringsToNetipPrefixes(outboundSubnetStrings)
 	if err != nil {
 		return firewall, fmt.Errorf("environment variable %s: %w", outboundSubnetsKey, err)
 	}
@@ -65,18 +65,16 @@ func stringsToPorts(ss []string) (ports []uint16, err error) {
 	return ports, nil
 }
 
-func stringsToIPNets(ss []string) (ipNets []net.IPNet, err error) {
+func stringsToNetipPrefixes(ss []string) (ipPrefixes []netip.Prefix, err error) {
 	if len(ss) == 0 {
 		return nil, nil
 	}
-	ipNets = make([]net.IPNet, len(ss))
+	ipPrefixes = make([]netip.Prefix, len(ss))
 	for i, s := range ss {
-		ip, ipNet, err := net.ParseCIDR(s)
+		ipPrefixes[i], err = netip.ParsePrefix(s)
 		if err != nil {
 			return nil, fmt.Errorf("parsing IP network %q: %w", s, err)
 		}
-		ipNet.IP = ip
-		ipNets[i] = *ipNet
 	}
-	return ipNets, nil
+	return ipPrefixes, nil
 }

internal/configuration/sources/env/health.go

@@ -11,6 +11,13 @@ func (s *Source) ReadHealth() (health settings.Health, err error) {
 	health.ServerAddress = getCleanedEnv("HEALTH_SERVER_ADDRESS")
 	_, health.TargetAddress = s.getEnvWithRetro("HEALTH_TARGET_ADDRESS", "HEALTH_ADDRESS_TO_PING")
 
+	successWaitPtr, err := envToDurationPtr("HEALTH_SUCCESS_WAIT_DURATION")
+	if err != nil {
+		return health, fmt.Errorf("environment variable HEALTH_SUCCESS_WAIT_DURATION: %w", err)
+	} else if successWaitPtr != nil {
+		health.SuccessWait = *successWaitPtr
+	}
+
 	health.VPN.Initial, err = s.readDurationWithRetro(
 		"HEALTH_VPN_DURATION_INITIAL",
 		"HEALTH_OPENVPN_DURATION_INITIAL")

internal/configuration/sources/env/helpers.go

@@ -29,14 +29,6 @@ func envToCSV(envKey string) (values []string) {
 	return lowerAndSplit(csv)
 }
 
-func envToInt(envKey string) (n int, err error) {
-	s := getCleanedEnv(envKey)
-	if s == "" {
-		return 0, nil
-	}
-	return strconv.Atoi(s)
-}
-
 func envToFloat64(envKey string) (f float64, err error) {
 	s := getCleanedEnv(envKey)
 	if s == "" {

internal/configuration/sources/env/portforward.go

@@ -9,6 +9,7 @@ import (
 func (s *Source) readPortForward() (
 	portForwarding settings.PortForwarding, err error) {
 	key, _ := s.getEnvWithRetro(
+		"VPN_PORT_FORWARDING",
 		"PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING",
 		"PORT_FORWARDING")
 	portForwarding.Enabled, err = envToBoolPtr(key)
@@ -17,6 +18,7 @@ func (s *Source) readPortForward() (
 	}
 
 	_, value := s.getEnvWithRetro(
+		"VPN_PORT_FORWARDING_STATUS_FILE",
 		"PRIVATE_INTERNET_ACCESS_VPN_PORT_FORWARDING_STATUS_FILE",
 		"PORT_FORWARDING_STATUS_FILE")
 	if value != "" {

internal/configuration/sources/env/pprof.go

@@ -12,12 +12,12 @@ func readPprof() (settings pprof.Settings, err error) {
 		return settings, fmt.Errorf("environment variable PPROF_ENABLED: %w", err)
 	}
 
-	settings.BlockProfileRate, err = envToInt("PPROF_BLOCK_PROFILE_RATE")
+	settings.BlockProfileRate, err = envToIntPtr("PPROF_BLOCK_PROFILE_RATE")
 	if err != nil {
 		return settings, fmt.Errorf("environment variable PPROF_BLOCK_PROFILE_RATE: %w", err)
 	}
 
-	settings.MutexProfileRate, err = envToInt("PPROF_MUTEX_PROFILE_RATE")
+	settings.MutexProfileRate, err = envToIntPtr("PPROF_MUTEX_PROFILE_RATE")
 	if err != nil {
 		return settings, fmt.Errorf("environment variable PPROF_MUTEX_PROFILE_RATE: %w", err)
 	}

internal/configuration/sources/env/serverselection.go

@@ -3,7 +3,7 @@ package env
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"strconv"
 	"strings"
 
@@ -113,16 +113,15 @@ var (
 	ErrInvalidIP = errors.New("invalid IP address")
 )
 
-func (s *Source) readOpenVPNTargetIP() (ip net.IP, err error) {
+func (s *Source) readOpenVPNTargetIP() (ip netip.Addr, err error) {
 	envKey, value := s.getEnvWithRetro("VPN_ENDPOINT_IP", "OPENVPN_TARGET_IP")
 	if value == "" {
-		return nil, nil
+		return ip, nil
 	}
 
-	ip = net.ParseIP(value)
-	if ip == nil {
-		return nil, fmt.Errorf("environment variable %s: %w: %s",
-			envKey, ErrInvalidIP, value)
+	ip, err = netip.ParseAddr(value)
+	if err != nil {
+		return ip, fmt.Errorf("environment variable %s: %w", envKey, err)
 	}
 
 	return ip, nil

internal/configuration/sources/env/wireguard.go

@@ -2,7 +2,7 @@ package env
 
 import (
 	"fmt"
-	"net"
+	"net/netip"
 	"os"
 	"strings"
 
@@ -24,22 +24,20 @@ func (s *Source) readWireguard() (wireguard settings.Wireguard, err error) {
 	return wireguard, nil
 }
 
-func (s *Source) readWireguardAddresses() (addresses []net.IPNet, err error) {
+func (s *Source) readWireguardAddresses() (addresses []netip.Prefix, err error) {
 	key, addressesCSV := s.getEnvWithRetro("WIREGUARD_ADDRESSES", "WIREGUARD_ADDRESS")
 	if addressesCSV == "" {
 		return nil, nil
 	}
 
 	addressStrings := strings.Split(addressesCSV, ",")
-	addresses = make([]net.IPNet, len(addressStrings))
+	addresses = make([]netip.Prefix, len(addressStrings))
 	for i, addressString := range addressStrings {
 		addressString = strings.TrimSpace(addressString)
-		ip, ipNet, err := net.ParseCIDR(addressString)
+		addresses[i], err = netip.ParsePrefix(addressString)
 		if err != nil {
 			return nil, fmt.Errorf("environment variable %s: %w", key, err)
 		}
-		ipNet.IP = ip
-		addresses[i] = *ipNet
 	}
 
 	return addresses, nil

internal/configuration/sources/env/wireguardselection.go

@@ -1,9 +1,8 @@
 package env
 
 import (
-	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
 	"github.com/qdm12/govalid/port"
@@ -26,18 +25,15 @@ func (s *Source) readWireguardSelection() (
 	return selection, nil
 }
 
-var ErrIPAddressParse = errors.New("cannot parse IP address")
-
-func (s *Source) readWireguardEndpointIP() (endpointIP net.IP, err error) {
+func (s *Source) readWireguardEndpointIP() (endpointIP netip.Addr, err error) {
 	key, value := s.getEnvWithRetro("VPN_ENDPOINT_IP", "WIREGUARD_ENDPOINT_IP")
 	if value == "" {
-		return nil, nil
+		return endpointIP, nil
 	}
 
-	endpointIP = net.ParseIP(value)
-	if endpointIP == nil {
-		return nil, fmt.Errorf("environment variable %s: %w: %s",
-			key, ErrIPAddressParse, value)
+	endpointIP, err = netip.ParseAddr(value)
+	if err != nil {
+		return endpointIP, fmt.Errorf("environment variable %s: %w", key, err)
 	}
 
 	return endpointIP, nil

internal/dns/plaintext.go

@@ -1,7 +1,7 @@
 package dns
 
 import (
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/dns/pkg/nameserver"
 )
@@ -12,14 +12,14 @@ func (l *Loop) useUnencryptedDNS(fallback bool) {
 	// Try with user provided plaintext ip address
 	// if it's not 127.0.0.1 (default for DoT)
 	targetIP := settings.ServerAddress
-	if targetIP != nil && !targetIP.Equal(net.IPv4(127, 0, 0, 1)) { //nolint:gomnd
+	if targetIP.Compare(netip.AddrFrom4([4]byte{127, 0, 0, 1})) != 0 {
 		if fallback {
 			l.logger.Info("falling back on plaintext DNS at address " + targetIP.String())
 		} else {
 			l.logger.Info("using plaintext DNS at address " + targetIP.String())
 		}
-		nameserver.UseDNSInternally(targetIP)
-		err := nameserver.UseDNSSystemWide(l.resolvConf, targetIP, *settings.KeepNameserver)
+		nameserver.UseDNSInternally(targetIP.AsSlice())
+		err := nameserver.UseDNSSystemWide(l.resolvConf, targetIP.AsSlice(), *settings.KeepNameserver)
 		if err != nil {
 			l.logger.Error(err.Error())
 		}
@@ -38,8 +38,8 @@ func (l *Loop) useUnencryptedDNS(fallback bool) {
 	} else {
 		l.logger.Info("using plaintext DNS at address " + targetIP.String())
 	}
-	nameserver.UseDNSInternally(targetIP)
-	err = nameserver.UseDNSSystemWide(l.resolvConf, targetIP, *settings.KeepNameserver)
+	nameserver.UseDNSInternally(targetIP.AsSlice())
+	err = nameserver.UseDNSSystemWide(l.resolvConf, targetIP.AsSlice(), *settings.KeepNameserver)
 	if err != nil {
 		l.logger.Error(err.Error())
 	}

internal/dns/setup.go

@@ -43,8 +43,8 @@ func (l *Loop) setupUnbound(ctx context.Context) (
 	}
 
 	// use Unbound
-	nameserver.UseDNSInternally(settings.ServerAddress)
-	err = nameserver.UseDNSSystemWide(l.resolvConf, settings.ServerAddress,
+	nameserver.UseDNSInternally(settings.ServerAddress.AsSlice())
+	err = nameserver.UseDNSSystemWide(l.resolvConf, settings.ServerAddress.AsSlice(),
 		*settings.KeepNameserver)
 	if err != nil {
 		l.logger.Error(err.Error())

internal/firewall/enable.go

@@ -98,7 +98,7 @@ func (c *Config) enable(ctx context.Context) (err error) {
 	}
 
 	for _, network := range c.localNetworks {
-		if err := c.acceptOutputFromIPToSubnet(ctx, network.InterfaceName, network.IP, *network.IPNet, remove); err != nil {
+		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 {
@@ -113,7 +113,7 @@ func (c *Config) enable(ctx context.Context) (err error) {
 	// Allows packets from any IP address to go through eth0 / local network
 	// to reach Gluetun.
 	for _, network := range c.localNetworks {
-		if err := c.acceptInputToSubnet(ctx, network.InterfaceName, *network.IPNet, remove); err != nil {
+		if err := c.acceptInputToSubnet(ctx, network.InterfaceName, network.IPNet, remove); err != nil {
 			return err
 		}
 	}
@@ -130,7 +130,7 @@ func (c *Config) enable(ctx context.Context) (err error) {
 }
 
 func (c *Config) allowVPNIP(ctx context.Context) (err error) {
-	if c.vpnConnection.IP == nil {
+	if !c.vpnConnection.IP.IsValid() {
 		return nil
 	}
 

internal/firewall/firewall.go

@@ -2,7 +2,7 @@ package firewall
 
 import (
 	"context"
-	"net"
+	"net/netip"
 	"sync"
 
 	"github.com/qdm12/gluetun/internal/models"
@@ -27,7 +27,7 @@ type Config struct { //nolint:maligned
 	enabled           bool
 	vpnConnection     models.Connection
 	vpnIntf           string
-	outboundSubnets   []net.IPNet
+	outboundSubnets   []netip.Prefix
 	allowedInputPorts map[uint16]map[string]struct{} // port to interfaces set mapping
 	stateMutex        sync.Mutex
 }

internal/firewall/iptables.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"net"
+	"net/netip"
 	"os"
 	"os/exec"
 	"strings"
@@ -95,14 +95,11 @@ func (c *Config) setIPv4AllPolicies(ctx context.Context, policy string) error {
 	default:
 		return fmt.Errorf("%w: %s", ErrPolicyUnknown, policy)
 	}
-	if err := c.runIptablesInstructions(ctx, []string{
+	return c.runIptablesInstructions(ctx, []string{
 		"--policy INPUT " + policy,
 		"--policy OUTPUT " + policy,
 		"--policy FORWARD " + policy,
-	}); err != nil {
-		return err
-	}
-	return nil
+	})
 }
 
 func (c *Config) acceptInputThroughInterface(ctx context.Context, intf string, remove bool) error {
@@ -111,9 +108,8 @@ func (c *Config) acceptInputThroughInterface(ctx context.Context, intf string, r
 	))
 }
 
-func (c *Config) acceptInputToSubnet(ctx context.Context, intf string, destination net.IPNet, remove bool) error {
-	isIP4Subnet := destination.IP.To4() != nil
-
+func (c *Config) acceptInputToSubnet(ctx context.Context, intf string,
+	destination netip.Prefix, remove bool) error {
 	interfaceFlag := "-i " + intf
 	if intf == "*" { // all interfaces
 		interfaceFlag = ""
@@ -122,7 +118,7 @@ func (c *Config) acceptInputToSubnet(ctx context.Context, intf string, destinati
 	instruction := fmt.Sprintf("%s INPUT %s -d %s -j ACCEPT",
 		appendOrDelete(remove), interfaceFlag, destination.String())
 
-	if isIP4Subnet {
+	if destination.Addr().Is4() {
 		return c.runIptablesInstruction(ctx, instruction)
 	}
 	if c.ip6Tables == "" {
@@ -149,8 +145,7 @@ func (c *Config) acceptOutputTrafficToVPN(ctx context.Context,
 	instruction := fmt.Sprintf("%s OUTPUT -d %s -o %s -p %s -m %s --dport %d -j ACCEPT",
 		appendOrDelete(remove), connection.IP, defaultInterface, connection.Protocol,
 		connection.Protocol, connection.Port)
-	isIPv4 := connection.IP.To4() != nil
-	if isIPv4 {
+	if connection.IP.Is4() {
 		return c.runIptablesInstruction(ctx, instruction)
 	} else if c.ip6Tables == "" {
 		return fmt.Errorf("accept output to VPN server: %w", ErrNeedIP6Tables)
@@ -160,8 +155,15 @@ func (c *Config) acceptOutputTrafficToVPN(ctx context.Context,
 
 // Thanks to @npawelek.
 func (c *Config) acceptOutputFromIPToSubnet(ctx context.Context,
-	intf string, sourceIP net.IP, destinationSubnet net.IPNet, remove bool) error {
-	doIPv4 := sourceIP.To4() != nil && destinationSubnet.IP.To4() != nil
+	intf string, sourceIP netip.Addr, destinationSubnet netip.Prefix, remove bool) error {
+	doIPv4 := sourceIP.Is4() && destinationSubnet.Addr().Is4()
+	doIPv6 := sourceIP.Is6() && destinationSubnet.Addr().Is6()
+	if !doIPv4 && !doIPv6 {
+		c.logger.Debug(fmt.Sprintf(
+			"source IP address %s and destination subnet %s are not of the same IP family, skipping...",
+			sourceIP, destinationSubnet))
+		return nil
+	}
 
 	interfaceFlag := "-o " + intf
 	if intf == "*" { // all interfaces

internal/firewall/outboundsubnets.go

@@ -3,18 +3,18 @@ package firewall
 import (
 	"context"
 	"fmt"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/subnet"
 )
 
-func (c *Config) SetOutboundSubnets(ctx context.Context, subnets []net.IPNet) (err error) {
+func (c *Config) SetOutboundSubnets(ctx context.Context, subnets []netip.Prefix) (err error) {
 	c.stateMutex.Lock()
 	defer c.stateMutex.Unlock()
 
 	if !c.enabled {
 		c.logger.Info("firewall disabled, only updating allowed subnets internal list")
-		c.outboundSubnets = make([]net.IPNet, len(subnets))
+		c.outboundSubnets = make([]netip.Prefix, len(subnets))
 		copy(c.outboundSubnets, subnets)
 		return nil
 	}
@@ -34,7 +34,7 @@ func (c *Config) SetOutboundSubnets(ctx context.Context, subnets []net.IPNet) (e
 	return nil
 }
 
-func (c *Config) removeOutboundSubnets(ctx context.Context, subnets []net.IPNet) {
+func (c *Config) removeOutboundSubnets(ctx context.Context, subnets []netip.Prefix) {
 	const remove = true
 	for _, subNet := range subnets {
 		for _, defaultRoute := range c.defaultRoutes {
@@ -49,7 +49,7 @@ func (c *Config) removeOutboundSubnets(ctx context.Context, subnets []net.IPNet)
 	}
 }
 
-func (c *Config) addOutboundSubnets(ctx context.Context, subnets []net.IPNet) error {
+func (c *Config) addOutboundSubnets(ctx context.Context, subnets []netip.Prefix) error {
 	const remove = false
 	for _, subnet := range subnets {
 		for _, defaultRoute := range c.defaultRoutes {

internal/firewall/vpn.go

@@ -25,7 +25,7 @@ func (c *Config) SetVPNConnection(ctx context.Context,
 	}
 
 	remove := true
-	if c.vpnConnection.IP != nil {
+	if c.vpnConnection.IP.IsValid() {
 		for _, defaultRoute := range c.defaultRoutes {
 			if err := c.acceptOutputTrafficToVPN(ctx, defaultRoute.NetInterface, c.vpnConnection, remove); err != nil {
 				c.logger.Error("cannot remove outdated VPN connection rule: " + err.Error())

internal/healthcheck/health.go

@@ -49,9 +49,8 @@ func (s *Server) runHealthcheckLoop(ctx context.Context, done chan<- struct{}) {
 			continue
 		}
 
-		// Success, check again in 5 seconds
-		const period = 5 * time.Second
-		timer := time.NewTimer(period)
+		// Success, check again after the success wait duration
+		timer := time.NewTimer(s.config.SuccessWait)
 		select {
 		case <-ctx.Done():
 			if !timer.Stop() {

internal/healthcheck/server.go

@@ -21,8 +21,12 @@ func NewServer(config settings.Health,
 	return &Server{
 		logger:  logger,
 		handler: newHandler(),
-		dialer:  &net.Dialer{},
-		config:  config,
+		dialer: &net.Dialer{
+			Resolver: &net.Resolver{
+				PreferGo: true,
+			},
+		},
+		config: config,
 		vpn: vpnHealth{
 			loop:        vpnLoop,
 			healthyWait: *config.VPN.Initial,

internal/httpproxy/handler.go

@@ -64,6 +64,9 @@ var hopHeaders = [...]string{ //nolint:gochecknoglobals
 }
 
 // Do not follow redirect, but directly return the redirect response.
-func returnRedirect(req *http.Request, via []*http.Request) error {
+func returnRedirect(*http.Request, []*http.Request) error {
+	// WARNING: do not wrap this error!
+	// The standard library code checking against it does not use
+	// Go 1.13 `errors.Is` but `==`, so we cannot wrap it.
 	return http.ErrUseLastResponse
 }

internal/httpserver/helpers_test.go

@@ -10,9 +10,9 @@ var _ Logger = (*testLogger)(nil)
 
 type testLogger struct{}
 
-func (t *testLogger) Info(msg string)  {}
-func (t *testLogger) Warn(msg string)  {}
-func (t *testLogger) Error(msg string) {}
+func (t *testLogger) Info(string)  {}
+func (t *testLogger) Warn(string)  {}
+func (t *testLogger) Error(string) {}
 
 var _ gomock.Matcher = (*regexMatcher)(nil)
 

internal/httpserver/settings.go

@@ -36,10 +36,10 @@ type Settings struct {
 func (s *Settings) SetDefaults() {
 	s.Address = helpers.DefaultString(s.Address, ":8000")
 	const defaultReadTimeout = 3 * time.Second
-	s.ReadHeaderTimeout = helpers.DefaultDuration(s.ReadHeaderTimeout, defaultReadTimeout)
-	s.ReadTimeout = helpers.DefaultDuration(s.ReadTimeout, defaultReadTimeout)
+	s.ReadHeaderTimeout = helpers.DefaultNumber(s.ReadHeaderTimeout, defaultReadTimeout)
+	s.ReadTimeout = helpers.DefaultNumber(s.ReadTimeout, defaultReadTimeout)
 	const defaultShutdownTimeout = 3 * time.Second
-	s.ShutdownTimeout = helpers.DefaultDuration(s.ShutdownTimeout, defaultShutdownTimeout)
+	s.ShutdownTimeout = helpers.DefaultNumber(s.ShutdownTimeout, defaultShutdownTimeout)
 }
 
 func (s Settings) Copy() Settings {
@@ -59,9 +59,9 @@ func (s *Settings) MergeWith(other Settings) {
 	if s.Logger == nil {
 		s.Logger = other.Logger
 	}
-	s.ReadHeaderTimeout = helpers.MergeWithDuration(s.ReadHeaderTimeout, other.ReadHeaderTimeout)
-	s.ReadTimeout = helpers.MergeWithDuration(s.ReadTimeout, other.ReadTimeout)
-	s.ShutdownTimeout = helpers.MergeWithDuration(s.ShutdownTimeout, other.ShutdownTimeout)
+	s.ReadHeaderTimeout = helpers.MergeWithNumber(s.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	s.ReadTimeout = helpers.MergeWithNumber(s.ReadTimeout, other.ReadTimeout)
+	s.ShutdownTimeout = helpers.MergeWithNumber(s.ShutdownTimeout, other.ShutdownTimeout)
 }
 
 func (s *Settings) OverrideWith(other Settings) {
@@ -70,9 +70,9 @@ func (s *Settings) OverrideWith(other Settings) {
 	if other.Logger != nil {
 		s.Logger = other.Logger
 	}
-	s.ReadHeaderTimeout = helpers.OverrideWithDuration(s.ReadHeaderTimeout, other.ReadHeaderTimeout)
-	s.ReadTimeout = helpers.OverrideWithDuration(s.ReadTimeout, other.ReadTimeout)
-	s.ShutdownTimeout = helpers.OverrideWithDuration(s.ShutdownTimeout, other.ShutdownTimeout)
+	s.ReadHeaderTimeout = helpers.OverrideWithNumber(s.ReadHeaderTimeout, other.ReadHeaderTimeout)
+	s.ReadTimeout = helpers.OverrideWithNumber(s.ReadTimeout, other.ReadTimeout)
+	s.ShutdownTimeout = helpers.OverrideWithNumber(s.ShutdownTimeout, other.ShutdownTimeout)
 }
 
 var (
@@ -91,11 +91,11 @@ func (s Settings) Validate() (err error) {
 	}
 
 	if s.Handler == nil {
-		return ErrHandlerIsNotSet
+		return fmt.Errorf("%w", ErrHandlerIsNotSet)
 	}
 
 	if s.Logger == nil {
-		return ErrLoggerIsNotSet
+		return fmt.Errorf("%w", ErrLoggerIsNotSet)
 	}
 
 	const minReadTimeout = time.Millisecond

internal/models/connection.go

@@ -1,14 +1,14 @@
 package models
 
 import (
-	"net"
+	"net/netip"
 )
 
 type Connection struct {
 	// Type is the connection type and can be "openvpn" or "wireguard"
 	Type string `json:"type"`
 	// IP is the VPN server IP address.
-	IP net.IP `json:"ip"`
+	IP netip.Addr `json:"ip"`
 	// Port is the VPN server port.
 	Port uint16 `json:"port"`
 	// Protocol can be "tcp" or "udp".
@@ -24,15 +24,15 @@ type Connection struct {
 }
 
 func (c *Connection) Equal(other Connection) bool {
-	return c.IP.Equal(other.IP) && c.Port == other.Port &&
+	return c.IP.Compare(other.IP) == 0 && c.Port == other.Port &&
 		c.Protocol == other.Protocol && c.Hostname == other.Hostname &&
 		c.ServerName == other.ServerName && c.PubKey == other.PubKey
 }
 
 // UpdateEmptyWith updates each field of the connection where the
 // value is not set using the value given as arguments.
-func (c *Connection) UpdateEmptyWith(ip net.IP, port uint16, protocol string) {
-	if c.IP == nil {
+func (c *Connection) UpdateEmptyWith(ip netip.Addr, port uint16, protocol string) {
+	if !c.IP.IsValid() {
 		c.IP = ip
 	}
 	if c.Port == 0 {

internal/models/publicip.go

@@ -1,22 +1,24 @@
 package models
 
-import "net"
+import (
+	"net/netip"
+)
 
 type PublicIP struct {
-	IP           net.IP `json:"public_ip,omitempty"`
-	Region       string `json:"region,omitempty"`
-	Country      string `json:"country,omitempty"`
-	City         string `json:"city,omitempty"`
-	Hostname     string `json:"hostname,omitempty"`
-	Location     string `json:"location,omitempty"`
-	Organization string `json:"organization,omitempty"`
-	PostalCode   string `json:"postal_code,omitempty"`
-	Timezone     string `json:"timezone,omitempty"`
+	IP           netip.Addr `json:"public_ip,omitempty"`
+	Region       string     `json:"region,omitempty"`
+	Country      string     `json:"country,omitempty"`
+	City         string     `json:"city,omitempty"`
+	Hostname     string     `json:"hostname,omitempty"`
+	Location     string     `json:"location,omitempty"`
+	Organization string     `json:"organization,omitempty"`
+	PostalCode   string     `json:"postal_code,omitempty"`
+	Timezone     string     `json:"timezone,omitempty"`
 }
 
 func (p *PublicIP) Copy() (publicIPCopy PublicIP) {
 	publicIPCopy = PublicIP{
-		IP:           make(net.IP, len(p.IP)),
+		IP:           p.IP,
 		Region:       p.Region,
 		Country:      p.Country,
 		City:         p.City,
@@ -26,6 +28,5 @@ func (p *PublicIP) Copy() (publicIPCopy PublicIP) {
 		PostalCode:   p.PostalCode,
 		Timezone:     p.Timezone,
 	}
-	copy(publicIPCopy.IP, p.IP)
 	return publicIPCopy
 }

internal/models/server.go

@@ -3,7 +3,7 @@ package models
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"reflect"
 	"strings"
 
@@ -13,26 +13,26 @@ import (
 type Server struct {
 	VPN string `json:"vpn,omitempty"`
 	// Surfshark: country is also used for multi-hop
-	Country     string   `json:"country,omitempty"`
-	Region      string   `json:"region,omitempty"`
-	City        string   `json:"city,omitempty"`
-	ISP         string   `json:"isp,omitempty"`
-	Owned       bool     `json:"owned,omitempty"`
-	Number      uint16   `json:"number,omitempty"`
-	ServerName  string   `json:"server_name,omitempty"`
-	Hostname    string   `json:"hostname,omitempty"`
-	TCP         bool     `json:"tcp,omitempty"`
-	UDP         bool     `json:"udp,omitempty"`
-	OvpnX509    string   `json:"x509,omitempty"`
-	RetroLoc    string   `json:"retroloc,omitempty"` // TODO remove in v4
-	MultiHop    bool     `json:"multihop,omitempty"`
-	WgPubKey    string   `json:"wgpubkey,omitempty"`
-	Free        bool     `json:"free,omitempty"`
-	Stream      bool     `json:"stream,omitempty"`
-	Premium     bool     `json:"premium,omitempty"`
-	PortForward bool     `json:"port_forward,omitempty"`
-	Keep        bool     `json:"keep,omitempty"`
-	IPs         []net.IP `json:"ips,omitempty"`
+	Country     string       `json:"country,omitempty"`
+	Region      string       `json:"region,omitempty"`
+	City        string       `json:"city,omitempty"`
+	ISP         string       `json:"isp,omitempty"`
+	Owned       bool         `json:"owned,omitempty"`
+	Number      uint16       `json:"number,omitempty"`
+	ServerName  string       `json:"server_name,omitempty"`
+	Hostname    string       `json:"hostname,omitempty"`
+	TCP         bool         `json:"tcp,omitempty"`
+	UDP         bool         `json:"udp,omitempty"`
+	OvpnX509    string       `json:"x509,omitempty"`
+	RetroLoc    string       `json:"retroloc,omitempty"` // TODO remove in v4
+	MultiHop    bool         `json:"multihop,omitempty"`
+	WgPubKey    string       `json:"wgpubkey,omitempty"`
+	Free        bool         `json:"free,omitempty"`
+	Stream      bool         `json:"stream,omitempty"`
+	Premium     bool         `json:"premium,omitempty"`
+	PortForward bool         `json:"port_forward,omitempty"`
+	Keep        bool         `json:"keep,omitempty"`
+	IPs         []netip.Addr `json:"ips,omitempty"`
 }
 
 var (
@@ -47,17 +47,15 @@ var (
 func (s *Server) HasMinimumInformation() (err error) {
 	switch {
 	case s.VPN == "":
-		return ErrVPNFieldEmpty
-	case s.Hostname == "":
-		return ErrHostnameFieldEmpty
+		return fmt.Errorf("%w", ErrVPNFieldEmpty)
 	case len(s.IPs) == 0:
-		return ErrIPsFieldEmpty
+		return fmt.Errorf("%w", ErrIPsFieldEmpty)
 	case s.VPN == vpn.Wireguard && (s.TCP || s.UDP):
-		return ErrNetworkProtocolSet
+		return fmt.Errorf("%w", ErrNetworkProtocolSet)
 	case s.VPN == vpn.OpenVPN && !s.TCP && !s.UDP:
-		return ErrNoNetworkProtocol
+		return fmt.Errorf("%w", ErrNoNetworkProtocol)
 	case s.VPN == vpn.Wireguard && s.WgPubKey == "":
-		return ErrWireguardPublicKeyEmpty
+		return fmt.Errorf("%w", ErrWireguardPublicKeyEmpty)
 	default:
 		return nil
 	}
@@ -74,13 +72,13 @@ func (s *Server) Equal(other Server) (equal bool) {
 	return reflect.DeepEqual(serverCopy, other)
 }
 
-func ipsAreEqual(a, b []net.IP) (equal bool) {
+func ipsAreEqual(a, b []netip.Addr) (equal bool) {
 	if len(a) != len(b) {
 		return false
 	}
 
 	for i := range a {
-		if !a[i].Equal(b[i]) {
+		if a[i].Compare(b[i]) != 0 {
 			return false
 		}
 	}

internal/models/server_test.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"net"
+	"net/netip"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -17,28 +17,28 @@ func Test_Server_Equal(t *testing.T) {
 	}{
 		"same IPs": {
 			a: &Server{
-				IPs: []net.IP{net.IPv4(1, 2, 3, 4)},
+				IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 			},
 			b: Server{
-				IPs: []net.IP{net.IPv4(1, 2, 3, 4)},
+				IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 			},
 			equal: true,
 		},
 		"same IP strings": {
 			a: &Server{
-				IPs: []net.IP{net.IPv4(1, 2, 3, 4)},
+				IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 			},
 			b: Server{
-				IPs: []net.IP{{1, 2, 3, 4}},
+				IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 			},
 			equal: true,
 		},
 		"different IPs": {
 			a: &Server{
-				IPs: []net.IP{{1, 2, 3, 4}, {2, 3, 4, 5}},
+				IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4}), netip.AddrFrom4([4]byte{2, 3, 4, 5})},
 			},
 			b: Server{
-				IPs: []net.IP{{1, 2, 3, 4}, {1, 2, 3, 4}},
+				IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4}), netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 			},
 		},
 		"all fields equal": {
@@ -61,7 +61,7 @@ func Test_Server_Equal(t *testing.T) {
 				Free:        true,
 				Stream:      true,
 				PortForward: true,
-				IPs:         []net.IP{net.IPv4(1, 2, 3, 4)},
+				IPs:         []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 				Keep:        true,
 			},
 			b: Server{
@@ -83,7 +83,7 @@ func Test_Server_Equal(t *testing.T) {
 				Free:        true,
 				Stream:      true,
 				PortForward: true,
-				IPs:         []net.IP{net.IPv4(1, 2, 3, 4)},
+				IPs:         []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 				Keep:        true,
 			},
 			equal: true,

internal/netlink/family.go

@@ -13,6 +13,19 @@ const (
 	FAMILY_V6  = netlink.FAMILY_V6
 )
 
+func FamilyToString(family int) string {
+	switch family {
+	case FAMILY_ALL:
+		return "all"
+	case FAMILY_V4:
+		return "v4"
+	case FAMILY_V6:
+		return "v6"
+	default:
+		return fmt.Sprint(family)
+	}
+}
+
 func (n *NetLink) IsWireguardSupported() (ok bool, err error) {
 	families, err := netlink.GenlFamilyList()
 	if err != nil {

internal/netlink/ipnet.go

@@ -1,11 +0,0 @@
-package netlink
-
-import (
-	"net"
-
-	"github.com/vishvananda/netlink"
-)
-
-func NewIPNet(ip net.IP) *net.IPNet {
-	return netlink.NewIPNet(ip)
-}

internal/openvpn/extract/extract.go

@@ -3,7 +3,7 @@ package extract
 import (
 	"errors"
 	"fmt"
-	"net"
+	"net/netip"
 	"strconv"
 	"strings"
 
@@ -25,12 +25,12 @@ func extractDataFromLines(lines []string) (
 
 		connection.UpdateEmptyWith(ip, port, protocol)
 
-		if connection.Protocol != "" && connection.IP != nil {
+		if connection.Protocol != "" && connection.IP.IsValid() {
 			break
 		}
 	}
 
-	if connection.IP == nil {
+	if !connection.IP.IsValid() {
 		return connection, errRemoteLineNotFound
 	}
 
@@ -49,24 +49,24 @@ func extractDataFromLines(lines []string) (
 }
 
 func extractDataFromLine(line string) (
-	ip net.IP, port uint16, protocol string, err error) {
+	ip netip.Addr, port uint16, protocol string, err error) {
 	switch {
 	case strings.HasPrefix(line, "proto "):
 		protocol, err = extractProto(line)
 		if err != nil {
-			return nil, 0, "", fmt.Errorf("extracting protocol from proto line: %w", err)
+			return ip, 0, "", fmt.Errorf("extracting protocol from proto line: %w", err)
 		}
-		return nil, 0, protocol, nil
+		return ip, 0, protocol, nil
 
 	case strings.HasPrefix(line, "remote "):
 		ip, port, protocol, err = extractRemote(line)
 		if err != nil {
-			return nil, 0, "", fmt.Errorf("extracting from remote line: %w", err)
+			return ip, 0, "", fmt.Errorf("extracting from remote line: %w", err)
 		}
 		return ip, port, protocol, nil
 	}
 
-	return nil, 0, "", nil
+	return ip, 0, "", nil
 }
 
 var (
@@ -95,19 +95,19 @@ var (
 	errPortNotValid          = errors.New("port is not valid")
 )
 
-func extractRemote(line string) (ip net.IP, port uint16,
+func extractRemote(line string) (ip netip.Addr, port uint16,
 	protocol string, err error) {
 	fields := strings.Fields(line)
 	n := len(fields)
 
 	if n < 2 || n > 4 {
-		return nil, 0, "", fmt.Errorf("%w: %s", errRemoteLineFieldsCount, line)
+		return netip.Addr{}, 0, "", fmt.Errorf("%w: %s", errRemoteLineFieldsCount, line)
 	}
 
 	host := fields[1]
-	ip = net.ParseIP(host)
-	if ip == nil {
-		return nil, 0, "", fmt.Errorf("%w: %s", errHostNotIP, host)
+	ip, err = netip.ParseAddr(host)
+	if err != nil {
+		return netip.Addr{}, 0, "", fmt.Errorf("%w: %s", errHostNotIP, host)
 		// TODO resolve hostname once there is an option to allow it through
 		// the firewall before the VPN is up.
 	}
@@ -115,9 +115,9 @@ func extractRemote(line string) (ip net.IP, port uint16,
 	if n > 2 { //nolint:gomnd
 		portInt, err := strconv.Atoi(fields[2])
 		if err != nil {
-			return nil, 0, "", fmt.Errorf("%w: %s", errPortNotValid, line)
+			return netip.Addr{}, 0, "", fmt.Errorf("%w: %s", errPortNotValid, line)
 		} else if portInt < 1 || portInt > 65535 {
-			return nil, 0, "", fmt.Errorf("%w: %d must be between 1 and 65535", errPortNotValid, portInt)
+			return netip.Addr{}, 0, "", fmt.Errorf("%w: %d must be between 1 and 65535", errPortNotValid, portInt)
 		}
 		port = uint16(portInt)
 	}
@@ -127,7 +127,7 @@ func extractRemote(line string) (ip net.IP, port uint16,
 		case "tcp", "udp":
 			protocol = fields[3]
 		default:
-			return nil, 0, "", fmt.Errorf("%w: %s", errProtocolNotSupported, fields[3])
+			return netip.Addr{}, 0, "", fmt.Errorf("%w: %s", errProtocolNotSupported, fields[3])
 		}
 	}
 

internal/openvpn/extract/extract_test.go

@@ -2,7 +2,7 @@ package extract
 
 import (
 	"errors"
-	"net"
+	"net/netip"
 	"testing"
 
 	"github.com/qdm12/gluetun/internal/constants"
@@ -22,7 +22,7 @@ func Test_extractDataFromLines(t *testing.T) {
 		"success": {
 			lines: []string{"bla bla", "proto tcp", "remote 1.2.3.4 1194 tcp", "dev tun6"},
 			connection: models.Connection{
-				IP:       net.IPv4(1, 2, 3, 4),
+				IP:       netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 				Port:     1194,
 				Protocol: constants.TCP,
 			},
@@ -34,7 +34,7 @@ func Test_extractDataFromLines(t *testing.T) {
 		"only use first values found": {
 			lines: []string{"proto udp", "proto tcp", "remote 1.2.3.4 443 tcp", "remote 5.2.3.4 1194 udp"},
 			connection: models.Connection{
-				IP:       net.IPv4(1, 2, 3, 4),
+				IP:       netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 				Port:     443,
 				Protocol: constants.UDP,
 			},
@@ -49,7 +49,7 @@ func Test_extractDataFromLines(t *testing.T) {
 		"default TCP port": {
 			lines: []string{"remote 1.2.3.4", "proto tcp"},
 			connection: models.Connection{
-				IP:       net.IPv4(1, 2, 3, 4),
+				IP:       netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 				Port:     443,
 				Protocol: constants.TCP,
 			},
@@ -57,7 +57,7 @@ func Test_extractDataFromLines(t *testing.T) {
 		"default UDP port": {
 			lines: []string{"remote 1.2.3.4", "proto udp"},
 			connection: models.Connection{
-				IP:       net.IPv4(1, 2, 3, 4),
+				IP:       netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 				Port:     1194,
 				Protocol: constants.UDP,
 			},
@@ -88,7 +88,7 @@ func Test_extractDataFromLine(t *testing.T) {
 
 	testCases := map[string]struct {
 		line     string
-		ip       net.IP
+		ip       netip.Addr
 		port     uint16
 		protocol string
 		isErr    error
@@ -110,7 +110,7 @@ func Test_extractDataFromLine(t *testing.T) {
 		},
 		"extract remote success": {
 			line:     "remote 1.2.3.4 1194 udp",
-			ip:       net.IPv4(1, 2, 3, 4),
+			ip:       netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 			port:     1194,
 			protocol: constants.UDP,
 		},
@@ -186,7 +186,7 @@ func Test_extractRemote(t *testing.T) {
 
 	testCases := map[string]struct {
 		line     string
-		ip       net.IP
+		ip       netip.Addr
 		port     uint16
 		protocol string
 		err      error
@@ -205,7 +205,7 @@ func Test_extractRemote(t *testing.T) {
 		},
 		"only IP host": {
 			line: "remote 1.2.3.4",
-			ip:   net.IPv4(1, 2, 3, 4),
+			ip:   netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 		},
 		"port not an integer": {
 			line: "remote 1.2.3.4 bad",
@@ -225,7 +225,7 @@ func Test_extractRemote(t *testing.T) {
 		},
 		"IP host and port": {
 			line: "remote 1.2.3.4 8000",
-			ip:   net.IPv4(1, 2, 3, 4),
+			ip:   netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 			port: 8000,
 		},
 		"invalid protocol": {
@@ -234,7 +234,7 @@ func Test_extractRemote(t *testing.T) {
 		},
 		"IP host and port and protocol": {
 			line:     "remote 1.2.3.4 8000 udp",
-			ip:       net.IPv4(1, 2, 3, 4),
+			ip:       netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 			port:     8000,
 			protocol: constants.UDP,
 		},

internal/openvpn/pkcs8/descbc.go

@@ -14,7 +14,7 @@ func init() { //nolint:gochecknoinits
 	pkcs8lib.RegisterCipher(oidDESCBC, newCipherDESCBCBlock)
 }
 
-func newCipherDESCBCBlock() pkcs8lib.Cipher { //nolint:ireturn
+func newCipherDESCBCBlock() pkcs8lib.Cipher {
 	return cipherDESCBC{}
 }
 

internal/portforward/run.go

@@ -34,8 +34,8 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
 			portCh <- port
 
 			// Infinite loop
-			err = startData.PortForwarder.KeepPortForward(ctx, l.client,
-				port, startData.Gateway, startData.ServerName)
+			err = startData.PortForwarder.KeepPortForward(ctx,
+				startData.Gateway, startData.ServerName)
 			errorCh <- err
 		}(pfCtx, startData)
 

internal/portforward/state/startdata.go

@@ -1,16 +1,16 @@
 package state
 
 import (
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/provider"
 )
 
 type StartData struct {
 	PortForwarder provider.PortForwarder
-	Gateway       net.IP // needed for PIA
-	ServerName    string // needed for PIA
-	Interface     string // tun0 for example
+	Gateway       netip.Addr // needed for PIA
+	ServerName    string     // needed for PIA
+	Interface     string     // tun0 for example
 }
 
 func (s *State) GetStartData() (startData StartData) {

internal/pprof/helpers_test.go

@@ -8,6 +8,8 @@ import (
 
 func boolPtr(b bool) *bool { return &b }
 
+func intPtr(n int) *int { return &n }
+
 var _ gomock.Matcher = (*regexMatcher)(nil)
 
 type regexMatcher struct {

internal/pprof/server.go

@@ -13,8 +13,8 @@ import (
 // with the settings given. It returns an error
 // if one of the settings is not valid.
 func New(settings Settings) (server *httpserver.Server, err error) {
-	runtime.SetBlockProfileRate(settings.BlockProfileRate)
-	runtime.SetMutexProfileFraction(settings.MutexProfileRate)
+	runtime.SetBlockProfileRate(*settings.BlockProfileRate)
+	runtime.SetMutexProfileFraction(*settings.MutexProfileRate)
 
 	handler := http.NewServeMux()
 	handler.HandleFunc("/debug/pprof/", pprof.Index)

internal/pprof/server_test.go

@@ -26,6 +26,8 @@ func Test_Server(t *testing.T) {
 
 	const httpServerShutdownTimeout = 10 * time.Second // 10s in case test worker is slow
 	settings := Settings{
+		BlockProfileRate: intPtr(0),
+		MutexProfileRate: intPtr(0),
 		HTTPServer: httpserver.Settings{
 			Address:         address,
 			Logger:          logger,
@@ -112,7 +114,8 @@ func Test_Server_BadSettings(t *testing.T) {
 	t.Parallel()
 
 	settings := Settings{
-		BlockProfileRate: -1,
+		BlockProfileRate: intPtr(-1),
+		MutexProfileRate: intPtr(0),
 	}
 
 	server, err := New(settings)

internal/pprof/settings.go

@@ -2,6 +2,7 @@ package pprof
 
 import (
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings/helpers"
@@ -16,26 +17,26 @@ type Settings struct {
 	Enabled *bool
 	// See runtime.SetBlockProfileRate
 	// Set to 0 to disable profiling.
-	BlockProfileRate int
+	BlockProfileRate *int
 	// See runtime.SetMutexProfileFraction
 	// Set to 0 to disable profiling.
-	MutexProfileRate int
+	MutexProfileRate *int
 	// HTTPServer contains settings to configure
 	// the HTTP server serving pprof data.
 	HTTPServer httpserver.Settings
 }
 
 func (s *Settings) SetDefaults() {
-	s.Enabled = helpers.DefaultBool(s.Enabled, false)
+	s.Enabled = helpers.DefaultPointer(s.Enabled, false)
 	s.HTTPServer.Address = helpers.DefaultString(s.HTTPServer.Address, "localhost:6060")
 	const defaultReadTimeout = 5 * time.Minute // for CPU profiling
-	s.HTTPServer.ReadTimeout = helpers.DefaultDuration(s.HTTPServer.ReadTimeout, defaultReadTimeout)
+	s.HTTPServer.ReadTimeout = helpers.DefaultNumber(s.HTTPServer.ReadTimeout, defaultReadTimeout)
 	s.HTTPServer.SetDefaults()
 }
 
 func (s Settings) Copy() (copied Settings) {
 	return Settings{
-		Enabled:          helpers.CopyBoolPtr(s.Enabled),
+		Enabled:          helpers.CopyPointer(s.Enabled),
 		BlockProfileRate: s.BlockProfileRate,
 		MutexProfileRate: s.MutexProfileRate,
 		HTTPServer:       s.HTTPServer.Copy(),
@@ -43,16 +44,16 @@ func (s Settings) Copy() (copied Settings) {
 }
 
 func (s *Settings) MergeWith(other Settings) {
-	s.Enabled = helpers.MergeWithBool(s.Enabled, other.Enabled)
-	s.BlockProfileRate = helpers.MergeWithInt(s.BlockProfileRate, other.BlockProfileRate)
-	s.MutexProfileRate = helpers.MergeWithInt(s.MutexProfileRate, other.MutexProfileRate)
+	s.Enabled = helpers.MergeWithPointer(s.Enabled, other.Enabled)
+	s.BlockProfileRate = helpers.MergeWithPointer(s.BlockProfileRate, other.BlockProfileRate)
+	s.MutexProfileRate = helpers.MergeWithPointer(s.MutexProfileRate, other.MutexProfileRate)
 	s.HTTPServer.MergeWith(other.HTTPServer)
 }
 
 func (s *Settings) OverrideWith(other Settings) {
-	s.Enabled = helpers.OverrideWithBool(s.Enabled, other.Enabled)
-	s.BlockProfileRate = helpers.OverrideWithInt(s.BlockProfileRate, other.BlockProfileRate)
-	s.MutexProfileRate = helpers.OverrideWithInt(s.MutexProfileRate, other.MutexProfileRate)
+	s.Enabled = helpers.OverrideWithPointer(s.Enabled, other.Enabled)
+	s.BlockProfileRate = helpers.OverrideWithPointer(s.BlockProfileRate, other.BlockProfileRate)
+	s.MutexProfileRate = helpers.OverrideWithPointer(s.MutexProfileRate, other.MutexProfileRate)
 	s.HTTPServer.OverrideWith(other.HTTPServer)
 }
 
@@ -62,12 +63,12 @@ var (
 )
 
 func (s Settings) Validate() (err error) {
-	if s.BlockProfileRate < 0 {
-		return ErrBlockProfileRateNegative
+	if *s.BlockProfileRate < 0 {
+		return fmt.Errorf("%w", ErrBlockProfileRateNegative)
 	}
 
-	if s.MutexProfileRate < 0 {
-		return ErrMutexProfileRateNegative
+	if *s.MutexProfileRate < 0 {
+		return fmt.Errorf("%w", ErrMutexProfileRateNegative)
 	}
 
 	return s.HTTPServer.Validate()
@@ -80,12 +81,12 @@ func (s Settings) ToLinesNode() (node *gotree.Node) {
 
 	node = gotree.New("Pprof settings:")
 
-	if s.BlockProfileRate > 0 {
-		node.Appendf("Block profile rate: %d", s.BlockProfileRate)
+	if *s.BlockProfileRate > 0 {
+		node.Appendf("Block profile rate: %d", *s.BlockProfileRate)
 	}
 
-	if s.MutexProfileRate > 0 {
-		node.Appendf("Mutex profile rate: %d", s.MutexProfileRate)
+	if *s.MutexProfileRate > 0 {
+		node.Appendf("Mutex profile rate: %d", *s.MutexProfileRate)
 	}
 
 	node.AppendNode(s.HTTPServer.ToLinesNode())

internal/pprof/settings_test.go

@@ -31,8 +31,8 @@ func Test_Settings_SetDefaults(t *testing.T) {
 		"non empty settings": {
 			initial: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address:           ":6061",
 					ReadHeaderTimeout: time.Second,
@@ -42,8 +42,8 @@ func Test_Settings_SetDefaults(t *testing.T) {
 			},
 			expected: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address:           ":6061",
 					ReadHeaderTimeout: time.Second,
@@ -77,8 +77,8 @@ func Test_Settings_Copy(t *testing.T) {
 		"non empty settings": {
 			initial: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address:         ":6061",
 					ShutdownTimeout: time.Second,
@@ -86,8 +86,8 @@ func Test_Settings_Copy(t *testing.T) {
 			},
 			expected: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address:         ":6061",
 					ShutdownTimeout: time.Second,
@@ -120,16 +120,16 @@ func Test_Settings_MergeWith(t *testing.T) {
 		"merge empty with filled": {
 			other: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
 			},
 			expected: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
@@ -138,16 +138,16 @@ func Test_Settings_MergeWith(t *testing.T) {
 		"merge filled with empty": {
 			settings: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
 			},
 			expected: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
@@ -179,16 +179,16 @@ func Test_Settings_OverrideWith(t *testing.T) {
 		"override empty with filled": {
 			other: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
 			},
 			expected: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
@@ -197,16 +197,16 @@ func Test_Settings_OverrideWith(t *testing.T) {
 		"override filled with empty": {
 			settings: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
 			},
 			expected: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
@@ -215,24 +215,24 @@ func Test_Settings_OverrideWith(t *testing.T) {
 		"override filled with filled": {
 			settings: Settings{
 				Enabled:          boolPtr(false),
-				BlockProfileRate: 1,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(1),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address: ":8001",
 				},
 			},
 			other: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 2,
-				MutexProfileRate: 3,
+				BlockProfileRate: intPtr(2),
+				MutexProfileRate: intPtr(3),
 				HTTPServer: httpserver.Settings{
 					Address: ":8002",
 				},
 			},
 			expected: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 2,
-				MutexProfileRate: 3,
+				BlockProfileRate: intPtr(2),
+				MutexProfileRate: intPtr(3),
 				HTTPServer: httpserver.Settings{
 					Address: ":8002",
 				},
@@ -262,27 +262,33 @@ func Test_Settings_Validate(t *testing.T) {
 	}{
 		"negative block profile rate": {
 			settings: Settings{
-				BlockProfileRate: -1,
+				BlockProfileRate: intPtr(-1),
+				MutexProfileRate: intPtr(0),
 			},
 			errWrapped: ErrBlockProfileRateNegative,
 			errMessage: ErrBlockProfileRateNegative.Error(),
 		},
 		"negative mutex profile rate": {
 			settings: Settings{
-				MutexProfileRate: -1,
+				BlockProfileRate: intPtr(0),
+				MutexProfileRate: intPtr(-1),
 			},
 			errWrapped: ErrMutexProfileRateNegative,
 			errMessage: ErrMutexProfileRateNegative.Error(),
 		},
 		"http server validation error": {
 			settings: Settings{
-				HTTPServer: httpserver.Settings{},
+				BlockProfileRate: intPtr(0),
+				MutexProfileRate: intPtr(0),
+				HTTPServer:       httpserver.Settings{},
 			},
 			errWrapped: address.ErrValueNotValid,
 			errMessage: "value is not valid: missing port in address",
 		},
 		"valid settings": {
 			settings: Settings{
+				BlockProfileRate: intPtr(0),
+				MutexProfileRate: intPtr(0),
 				HTTPServer: httpserver.Settings{
 					Address:           ":8000",
 					Handler:           http.NewServeMux(),
@@ -325,8 +331,8 @@ func Test_Settings_String(t *testing.T) {
 		"all values": {
 			settings: Settings{
 				Enabled:          boolPtr(true),
-				BlockProfileRate: 2,
-				MutexProfileRate: 1,
+				BlockProfileRate: intPtr(2),
+				MutexProfileRate: intPtr(1),
 				HTTPServer: httpserver.Settings{
 					Address:         ":8000",
 					ShutdownTimeout: time.Second,

internal/provider/airvpn/updater/api.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net"
 	"net/http"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/provider/common"
 )
@@ -15,20 +15,20 @@ type apiData struct {
 }
 
 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"`
+	PublicName  string     `json:"public_name"`
+	CountryName string     `json:"country_name"`
+	CountryCode string     `json:"country_code"`
+	Location    string     `json:"location"`
+	Continent   string     `json:"continent"`
+	IPv4In1     netip.Addr `json:"ip_v4_in1"`
+	IPv4In2     netip.Addr `json:"ip_v4_in2"`
+	IPv4In3     netip.Addr `json:"ip_v4_in3"`
+	IPv4In4     netip.Addr `json:"ip_v4_in4"`
+	IPv6In1     netip.Addr `json:"ip_v6_in1"`
+	IPv6In2     netip.Addr `json:"ip_v6_in2"`
+	IPv6In3     netip.Addr `json:"ip_v6_in3"`
+	IPv6In4     netip.Addr `json:"ip_v6_in4"`
+	Health      string     `json:"health"`
 }
 
 func fetchAPI(ctx context.Context, client *http.Client) (

internal/provider/airvpn/updater/servers.go

@@ -3,7 +3,7 @@ package updater
 import (
 	"context"
 	"fmt"
-	"net"
+	"net/netip"
 	"sort"
 	"strings"
 
@@ -57,12 +57,12 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 		baseWireguardServer.WgPubKey = "PyLCXAQT8KkM4T+dUsOQfn+Ub3pGxfGlxkIApuig+hk="
 
 		ipv4WireguadServer := baseWireguardServer
-		ipv4WireguadServer.IPs = []net.IP{apiServer.IPv4In1}
+		ipv4WireguadServer.IPs = []netip.Addr{apiServer.IPv4In1}
 		ipv4WireguadServer.Hostname = apiServer.CountryCode + ".vpn.airdns.org"
 		servers = append(servers, ipv4WireguadServer)
 
 		ipv6WireguadServer := baseWireguardServer
-		ipv6WireguadServer.IPs = []net.IP{apiServer.IPv6In1}
+		ipv6WireguadServer.IPs = []netip.Addr{apiServer.IPv6In1}
 		ipv6WireguadServer.Hostname = apiServer.CountryCode + ".ipv6.vpn.airdns.org"
 		servers = append(servers, ipv6WireguadServer)
 
@@ -74,22 +74,22 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
 		// Ignore IPs 1 and 2 since tls-crypt is superior to tls-auth really.
 
 		ipv4In3OpenVPNServer := baseOpenVPNServer
-		ipv4In3OpenVPNServer.IPs = []net.IP{apiServer.IPv4In3}
+		ipv4In3OpenVPNServer.IPs = []netip.Addr{apiServer.IPv4In3}
 		ipv4In3OpenVPNServer.Hostname = apiServer.CountryCode + "3.vpn.airdns.org"
 		servers = append(servers, ipv4In3OpenVPNServer)
 
 		ipv6In3OpenVPNServer := baseOpenVPNServer
-		ipv6In3OpenVPNServer.IPs = []net.IP{apiServer.IPv6In3}
+		ipv6In3OpenVPNServer.IPs = []netip.Addr{apiServer.IPv6In3}
 		ipv6In3OpenVPNServer.Hostname = apiServer.CountryCode + "3.ipv6.vpn.airdns.org"
 		servers = append(servers, ipv6In3OpenVPNServer)
 
 		ipv4In4OpenVPNServer := baseOpenVPNServer
-		ipv4In4OpenVPNServer.IPs = []net.IP{apiServer.IPv4In4}
+		ipv4In4OpenVPNServer.IPs = []netip.Addr{apiServer.IPv4In4}
 		ipv4In4OpenVPNServer.Hostname = apiServer.CountryCode + "4.vpn.airdns.org"
 		servers = append(servers, ipv4In4OpenVPNServer)
 
 		ipv6In4OpenVPNServer := baseOpenVPNServer
-		ipv6In4OpenVPNServer.IPs = []net.IP{apiServer.IPv6In4}
+		ipv6In4OpenVPNServer.IPs = []netip.Addr{apiServer.IPv6In4}
 		ipv6In4OpenVPNServer.Hostname = apiServer.CountryCode + "4.ipv6.vpn.airdns.org"
 		servers = append(servers, ipv6In4OpenVPNServer)
 	}

internal/provider/common/mocks.go

@@ -6,7 +6,7 @@ package common
 
 import (
 	context "context"
-	net "net"
+	netip "net/netip"
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
@@ -39,10 +39,10 @@ func (m *MockParallelResolver) EXPECT() *MockParallelResolverMockRecorder {
 }
 
 // Resolve mocks base method.
-func (m *MockParallelResolver) Resolve(arg0 context.Context, arg1 resolver.ParallelSettings) (map[string][]net.IP, []string, error) {
+func (m *MockParallelResolver) Resolve(arg0 context.Context, arg1 resolver.ParallelSettings) (map[string][]netip.Addr, []string, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Resolve", arg0, arg1)
-	ret0, _ := ret[0].(map[string][]net.IP)
+	ret0, _ := ret[0].(map[string][]netip.Addr)
 	ret1, _ := ret[1].([]string)
 	ret2, _ := ret[2].(error)
 	return ret0, ret1, ret2

internal/provider/common/mocks_generate_test.go

@@ -2,4 +2,5 @@ package common
 
 // Exceptionally, these mocks are exported since they are used by all
 // provider subpackages tests, and it reduces test code duplication a lot.
+// Note mocks.go might need to be removed before re-generating it.
 //go:generate mockgen -destination=mocks.go -package $GOPACKAGE . ParallelResolver,Storage,Unzipper,Warner

internal/provider/common/updater.go

@@ -3,7 +3,7 @@ package common
 import (
 	"context"
 	"errors"
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/models"
 	"github.com/qdm12/gluetun/internal/publicip/ipinfo"
@@ -21,7 +21,7 @@ type Fetcher interface {
 
 type ParallelResolver interface {
 	Resolve(ctx context.Context, settings resolver.ParallelSettings) (
-		hostToIPs map[string][]net.IP, warnings []string, err error)
+		hostToIPs map[string][]netip.Addr, warnings []string, err error)
 }
 
 type Unzipper interface {
@@ -34,5 +34,5 @@ type Warner interface {
 }
 
 type IPFetcher interface {
-	FetchMultiInfo(ctx context.Context, ips []net.IP) (data []ipinfo.Response, err error)
+	FetchMultiInfo(ctx context.Context, ips []netip.Addr) (data []ipinfo.Response, err error)
 }

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, ipv6Supported bool) (
+func (p *Provider) GetConnection(selection settings.ServerSelection, _ bool) (
 	connection models.Connection, err error) {
 	switch selection.VPN {
 	case vpn.OpenVPN:

internal/provider/custom/openvpnconf_test.go

@@ -1,7 +1,7 @@
 package custom
 
 import (
-	"net"
+	"net/netip"
 	"testing"
 
 	"github.com/qdm12/gluetun/internal/configuration/settings"
@@ -46,7 +46,7 @@ func Test_modifyConfig(t *testing.T) {
 				Verbosity:   intPtr(0),
 			}.WithDefaults(providers.Custom),
 			connection: models.Connection{
-				IP:       net.IPv4(1, 2, 3, 4),
+				IP:       netip.AddrFrom4([4]byte{1, 2, 3, 4}),
 				Port:     1194,
 				Protocol: constants.UDP,
 			},

internal/provider/cyberghost/updater/hosttoserver.go

@@ -1,7 +1,7 @@
 package updater
 
 import (
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/constants"
 	"github.com/qdm12/gluetun/internal/constants/vpn"
@@ -47,7 +47,7 @@ func (hts hostToServer) hostsSlice() (hosts []string) {
 	return hosts
 }
 
-func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]net.IP) {
+func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]netip.Addr) {
 	for host, IPs := range hostToIPs {
 		server := hts[host]
 		server.IPs = IPs

internal/provider/expressvpn/connection_test.go

@@ -3,7 +3,7 @@ package expressvpn
 import (
 	"errors"
 	"math/rand"
-	"net"
+	"net/netip"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -41,7 +41,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 		},
 		"default OpenVPN TCP port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
 				OpenVPN: settings.OpenVPNSelection{
@@ -52,7 +52,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 		},
 		"default OpenVPN UDP port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
 				OpenVPN: settings.OpenVPNSelection{
@@ -61,14 +61,14 @@ func Test_Provider_GetConnection(t *testing.T) {
 			}.WithDefaults(provider),
 			connection: models.Connection{
 				Type:     vpn.OpenVPN,
-				IP:       net.IPv4(1, 1, 1, 1),
+				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     1195,
 				Protocol: constants.UDP,
 			},
 		},
 		"default Wireguard port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
 				VPN: vpn.Wireguard,

internal/provider/fastestvpn/updater/hosttoserver.go

@@ -1,7 +1,7 @@
 package updater
 
 import (
-	"net"
+	"net/netip"
 
 	"github.com/qdm12/gluetun/internal/constants/vpn"
 	"github.com/qdm12/gluetun/internal/models"
@@ -33,7 +33,7 @@ func (hts hostToServer) toHostsSlice() (hosts []string) {
 	return hosts
 }
 
-func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]net.IP) {
+func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]netip.Addr) {
 	for host, IPs := range hostToIPs {
 		server := hts[host]
 		server.IPs = IPs

internal/provider/ipvanish/updater/hosttoserver.go

@@ -1,7 +1,7 @@
 package updater
 
 import (
-	"net"
+	"net/netip"
 	"sort"
 
 	"github.com/qdm12/gluetun/internal/constants/vpn"
@@ -38,7 +38,7 @@ func (hts hostToServer) toHostsSlice() (hosts []string) {
 	return hosts
 }
 
-func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]net.IP) {
+func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]netip.Addr) {
 	for host, IPs := range hostToIPs {
 		server := hts[host]
 		server.IPs = IPs

internal/provider/ipvanish/updater/hosttoserver_test.go

@@ -1,7 +1,7 @@
 package updater
 
 import (
-	"net"
+	"net/netip"
 	"testing"
 
 	"github.com/qdm12/gluetun/internal/constants/vpn"
@@ -134,17 +134,17 @@ func Test_hostToServer_adaptWithIPs(t *testing.T) {
 	t.Parallel()
 	testCases := map[string]struct {
 		initialHTS  hostToServer
-		hostToIPs   map[string][]net.IP
+		hostToIPs   map[string][]netip.Addr
 		expectedHTS hostToServer
 	}{
 		"create server": {
 			initialHTS: hostToServer{},
-			hostToIPs: map[string][]net.IP{
-				"A": {{1, 2, 3, 4}},
+			hostToIPs: map[string][]netip.Addr{
+				"A": {netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 			},
 			expectedHTS: hostToServer{
 				"A": models.Server{
-					IPs: []net.IP{{1, 2, 3, 4}},
+					IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 				},
 			},
 		},
@@ -154,13 +154,13 @@ func Test_hostToServer_adaptWithIPs(t *testing.T) {
 					Country: "country",
 				},
 			},
-			hostToIPs: map[string][]net.IP{
-				"A": {{1, 2, 3, 4}},
+			hostToIPs: map[string][]netip.Addr{
+				"A": {netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 			},
 			expectedHTS: hostToServer{
 				"A": models.Server{
 					Country: "country",
-					IPs:     []net.IP{{1, 2, 3, 4}},
+					IPs:     []netip.Addr{netip.AddrFrom4([4]byte{1, 2, 3, 4})},
 				},
 			},
 		},
@@ -170,7 +170,7 @@ func Test_hostToServer_adaptWithIPs(t *testing.T) {
 					Country: "country",
 				},
 			},
-			hostToIPs:   map[string][]net.IP{},
+			hostToIPs:   map[string][]netip.Addr{},
 			expectedHTS: hostToServer{},
 		},
 	}

internal/provider/ipvanish/updater/servers_test.go

@@ -3,7 +3,7 @@ package updater
 import (
 	"context"
 	"errors"
-	"net"
+	"net/netip"
 	"testing"
 	"time"
 
@@ -32,7 +32,7 @@ func Test_Updater_GetServers(t *testing.T) {
 		// Resolution
 		expectResolve    bool
 		resolverSettings resolver.ParallelSettings
-		hostToIPs        map[string][]net.IP
+		hostToIPs        map[string][]netip.Addr
 		resolveWarnings  []string
 		resolveErr       error
 
@@ -161,9 +161,9 @@ func Test_Updater_GetServers(t *testing.T) {
 					SortIPs:         true,
 				},
 			},
-			hostToIPs: map[string][]net.IP{
-				"hosta": {{1, 1, 1, 1}, {2, 2, 2, 2}},
-				"hostb": {{3, 3, 3, 3}, {4, 4, 4, 4}},
+			hostToIPs: map[string][]netip.Addr{
+				"hosta": {netip.AddrFrom4([4]byte{1, 1, 1, 1}), netip.AddrFrom4([4]byte{2, 2, 2, 2})},
+				"hostb": {netip.AddrFrom4([4]byte{3, 3, 3, 3}), netip.AddrFrom4([4]byte{4, 4, 4, 4})},
 			},
 			resolveWarnings: []string{"resolve warning"},
 			servers: []models.Server{
@@ -173,7 +173,7 @@ func Test_Updater_GetServers(t *testing.T) {
 					City:     "City A",
 					Hostname: "hosta",
 					UDP:      true,
-					IPs:      []net.IP{{1, 1, 1, 1}, {2, 2, 2, 2}},
+					IPs:      []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1}), netip.AddrFrom4([4]byte{2, 2, 2, 2})},
 				},
 				{
 					VPN:      vpn.OpenVPN,
@@ -181,7 +181,7 @@ func Test_Updater_GetServers(t *testing.T) {
 					City:     "City B",
 					Hostname: "hostb",
 					UDP:      true,
-					IPs:      []net.IP{{3, 3, 3, 3}, {4, 4, 4, 4}},
+					IPs:      []netip.Addr{netip.AddrFrom4([4]byte{3, 3, 3, 3}), netip.AddrFrom4([4]byte{4, 4, 4, 4})},
 				},
 			},
 		},

internal/provider/ivpn/connection_test.go

@@ -3,8 +3,8 @@ package ivpn
 import (
 	"errors"
 	"math/rand"
-	"net"
 	"net/http"
+	"net/netip"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -41,7 +41,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 		},
 		"default OpenVPN TCP port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
 				OpenVPN: settings.OpenVPNSelection{
@@ -50,14 +50,14 @@ func Test_Provider_GetConnection(t *testing.T) {
 			}.WithDefaults(provider),
 			connection: models.Connection{
 				Type:     vpn.OpenVPN,
-				IP:       net.IPv4(1, 1, 1, 1),
+				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     443,
 				Protocol: constants.TCP,
 			},
 		},
 		"default OpenVPN UDP port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
 				OpenVPN: settings.OpenVPNSelection{
@@ -66,21 +66,21 @@ func Test_Provider_GetConnection(t *testing.T) {
 			}.WithDefaults(provider),
 			connection: models.Connection{
 				Type:     vpn.OpenVPN,
-				IP:       net.IPv4(1, 1, 1, 1),
+				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     1194,
 				Protocol: constants.UDP,
 			},
 		},
 		"default Wireguard port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}, WgPubKey: "x"},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}, WgPubKey: "x"},
 			},
 			selection: settings.ServerSelection{
 				VPN: vpn.Wireguard,
 			}.WithDefaults(provider),
 			connection: models.Connection{
 				Type:     vpn.Wireguard,
-				IP:       net.IPv4(1, 1, 1, 1),
+				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     58237,
 				Protocol: constants.UDP,
 				PubKey:   "x",

internal/provider/ivpn/updater/servers_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 	"io"
-	"net"
 	"net/http"
+	"net/netip"
 	"strings"
 	"testing"
 	"time"
@@ -36,7 +36,7 @@ func Test_Updater_GetServers(t *testing.T) {
 		// Resolution
 		expectResolve   bool
 		resolveSettings resolver.ParallelSettings
-		hostToIPs       map[string][]net.IP
+		hostToIPs       map[string][]netip.Addr
 		resolveWarnings []string
 		resolveErr      error
 
@@ -109,24 +109,24 @@ func Test_Updater_GetServers(t *testing.T) {
 					SortIPs:         true,
 				},
 			},
-			hostToIPs: map[string][]net.IP{
-				"hosta": {{1, 1, 1, 1}, {2, 2, 2, 2}},
-				"hostb": {{3, 3, 3, 3}, {4, 4, 4, 4}},
-				"hostc": {{5, 5, 5, 5}, {6, 6, 6, 6}},
+			hostToIPs: map[string][]netip.Addr{
+				"hosta": {netip.AddrFrom4([4]byte{1, 1, 1, 1}), netip.AddrFrom4([4]byte{2, 2, 2, 2})},
+				"hostb": {netip.AddrFrom4([4]byte{3, 3, 3, 3}), netip.AddrFrom4([4]byte{4, 4, 4, 4})},
+				"hostc": {netip.AddrFrom4([4]byte{5, 5, 5, 5}), netip.AddrFrom4([4]byte{6, 6, 6, 6})},
 			},
 			resolveWarnings: []string{"resolve warning"},
 			servers: []models.Server{
 				{VPN: vpn.OpenVPN, Country: "Country1",
 					City: "City A", Hostname: "hosta", TCP: true, UDP: true,
-					IPs: []net.IP{{1, 1, 1, 1}, {2, 2, 2, 2}}},
+					IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1}), netip.AddrFrom4([4]byte{2, 2, 2, 2})}},
 				{VPN: vpn.OpenVPN, Country: "Country2",
 					City: "City B", Hostname: "hostb", TCP: true, UDP: true,
-					IPs: []net.IP{{3, 3, 3, 3}, {4, 4, 4, 4}}},
+					IPs: []netip.Addr{netip.AddrFrom4([4]byte{3, 3, 3, 3}), netip.AddrFrom4([4]byte{4, 4, 4, 4})}},
 				{VPN: vpn.Wireguard,
 					Country: "Country3", City: "City C",
 					Hostname: "hostc",
 					WgPubKey: "xyz",
-					IPs:      []net.IP{{5, 5, 5, 5}, {6, 6, 6, 6}}},
+					IPs:      []netip.Addr{netip.AddrFrom4([4]byte{5, 5, 5, 5}), netip.AddrFrom4([4]byte{6, 6, 6, 6})}},
 			},
 		},
 	}

internal/provider/mullvad/connection_test.go

@@ -3,8 +3,8 @@ package mullvad
 import (
 	"errors"
 	"math/rand"
-	"net"
 	"net/http"
+	"net/netip"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -41,7 +41,7 @@ func Test_Provider_GetConnection(t *testing.T) {
 		},
 		"default OpenVPN TCP port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
 				OpenVPN: settings.OpenVPNSelection{
@@ -50,14 +50,14 @@ func Test_Provider_GetConnection(t *testing.T) {
 			}.WithDefaults(provider),
 			connection: models.Connection{
 				Type:     vpn.OpenVPN,
-				IP:       net.IPv4(1, 1, 1, 1),
+				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     443,
 				Protocol: constants.TCP,
 			},
 		},
 		"default OpenVPN UDP port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}},
 			},
 			selection: settings.ServerSelection{
 				OpenVPN: settings.OpenVPNSelection{
@@ -66,21 +66,21 @@ func Test_Provider_GetConnection(t *testing.T) {
 			}.WithDefaults(provider),
 			connection: models.Connection{
 				Type:     vpn.OpenVPN,
-				IP:       net.IPv4(1, 1, 1, 1),
+				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     1194,
 				Protocol: constants.UDP,
 			},
 		},
 		"default Wireguard port": {
 			filteredServers: []models.Server{
-				{IPs: []net.IP{net.IPv4(1, 1, 1, 1)}, WgPubKey: "x"},
+				{IPs: []netip.Addr{netip.AddrFrom4([4]byte{1, 1, 1, 1})}, WgPubKey: "x"},
 			},
 			selection: settings.ServerSelection{
 				VPN: vpn.Wireguard,
 			}.WithDefaults(provider),
 			connection: models.Connection{
 				Type:     vpn.Wireguard,
-				IP:       net.IPv4(1, 1, 1, 1),
+				IP:       netip.AddrFrom4([4]byte{1, 1, 1, 1}),
 				Port:     51820,
 				Protocol: constants.UDP,
 				PubKey:   "x",

internal/provider/mullvad/openvpnconf.go

@@ -15,6 +15,7 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
 		Ciphers: []string{
 			openvpn.AES256cbc,
 			openvpn.AES128gcm,
+			openvpn.AES256gcm,
 		},
 		Ping:          10,
 		RemoteCertTLS: true,