admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: only use Openvpn fast-io when using UDP

Browse Source
This commit is contained in:
Quentin McGaw
2021-05-18 23:46:20 +00:00
parent 13e75aaf20
commit a9589d8d5b
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/provider/mullvad/openvpnconf.go
View File

@@ -30,7 +30,6 @@ func (m *Mullvad) BuildConf(connection models.OpenVPNConnection,
"sndbuf 524288", "sndbuf 524288",
"rcvbuf 524288", "rcvbuf 524288",
"tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA", "tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-256-CBC-SHA",
"fast-io",
"script-security 2", "script-security 2",
// Added constant values // Added constant values
@@ -53,6 +52,10 @@ func (m *Mullvad) BuildConf(connection models.OpenVPNConnection,
lines = append(lines, "auth "+settings.Auth) lines = append(lines, "auth "+settings.Auth)
} }
if connection.Protocol == constants.UDP {
lines = append(lines, "fast-io")
}
if settings.Provider.ExtraConfigOptions.OpenVPNIPv6 { if settings.Provider.ExtraConfigOptions.OpenVPNIPv6 {
lines = append(lines, "tun-ipv6") lines = append(lines, "tun-ipv6")
} else { } else {

5
internal/provider/nordvpn/openvpnconf.go
View File

@@ -38,7 +38,6 @@ func (n *Nordvpn) BuildConf(connection models.OpenVPNConnection,
"mssfix " + strconv.Itoa(int(settings.MSSFix)), "mssfix " + strconv.Itoa(int(settings.MSSFix)),
"reneg-sec 0", "reneg-sec 0",
"comp-lzo no", "comp-lzo no",
"fast-io",
"key-direction 1", "key-direction 1",
"ping 15", "ping 15",
"ping-restart 0", "ping-restart 0",
@@ -60,6 +59,10 @@ func (n *Nordvpn) BuildConf(connection models.OpenVPNConnection,
"auth " + settings.Auth, "auth " + settings.Auth,
} }
if connection.Protocol == constants.UDP {
lines = append(lines, "fast-io")
}
if !settings.Root { if !settings.Root {
lines = append(lines, "user "+username) lines = append(lines, "user "+username)
} }

5
internal/provider/protonvpn/openvpnconf.go
View File

@@ -37,7 +37,6 @@ func (p *Protonvpn) BuildConf(connection models.OpenVPNConnection,
"tun-mtu-extra 32", "tun-mtu-extra 32",
"mssfix " + strconv.Itoa(int(settings.MSSFix)), "mssfix " + strconv.Itoa(int(settings.MSSFix)),
"reneg-sec 0", "reneg-sec 0",
"fast-io",
"key-direction 1", "key-direction 1",
"pull", "pull",
"comp-lzo no", "comp-lzo no",
@@ -59,6 +58,10 @@ func (p *Protonvpn) BuildConf(connection models.OpenVPNConnection,
"auth " + settings.Auth, "auth " + settings.Auth,
} }
if connection.Protocol == constants.UDP {
lines = append(lines, "fast-io")
}
if !settings.Root { if !settings.Root {
lines = append(lines, "user "+username) lines = append(lines, "user "+username)
} }

1
internal/provider/surfshark/openvpnconf.go
View File

@@ -39,7 +39,6 @@ func (s *Surfshark) BuildConf(connection models.OpenVPNConnection,
"tun-mtu-extra 32", "tun-mtu-extra 32",
"mssfix " + strconv.Itoa(int(settings.MSSFix)), "mssfix " + strconv.Itoa(int(settings.MSSFix)),
"reneg-sec 0", "reneg-sec 0",
"fast-io",
"key-direction 1", "key-direction 1",
"script-security 2", "script-security 2",
"ping-restart 0", "ping-restart 0",

5
internal/provider/torguard/openvpnconf.go
View File

@@ -37,7 +37,6 @@ func (t *Torguard) BuildConf(connection models.OpenVPNConnection,
"tun-mtu-extra 32", "tun-mtu-extra 32",
"mssfix " + strconv.Itoa(int(settings.MSSFix)), "mssfix " + strconv.Itoa(int(settings.MSSFix)),
"reneg-sec 0", "reneg-sec 0",
"fast-io",
"key-direction 1", "key-direction 1",
"script-security 2", "script-security 2",
"ncp-disable", "ncp-disable",
@@ -67,6 +66,10 @@ func (t *Torguard) BuildConf(connection models.OpenVPNConnection,
lines = append(lines, "user "+username) lines = append(lines, "user "+username)
} }
if connection.Protocol == constants.UDP {
lines = append(lines, "fast-io")
}
lines = append(lines, utils.WrapOpenvpnCA( lines = append(lines, utils.WrapOpenvpnCA(
constants.TorguardCertificate)...) constants.TorguardCertificate)...)
lines = append(lines, utils.WrapOpenvpnTLSAuth( lines = append(lines, utils.WrapOpenvpnTLSAuth(