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

feat(vpn): auto detection of IPv6 support

Browse Source 
- `OPENVPN_IPV6` removed
- Affects OpenVPN
- Use the same mechanism for OpenVPN and Wireguard
- Check only once at program start since this is unlikely to change at runtime
- Log if IPv6 is supported
- Remove `IPv6` boolean from settings structs
- Move IPv6 detection as a method on NetLinker
This commit is contained in:
Quentin McGaw
2022-09-06 12:16:29 +00:00
parent 71c51a7455
commit 5ddd703f6a
45 changed files with 171 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/provider/custom/openvpnconf.go
View File

@@ -15,7 +15,7 @@ import (
var ErrExtractData = errors.New("failed extracting information from custom configuration file")
func (p *Provider) OpenVPNConfig(connection models.Connection,
settings settings.OpenVPN) (lines []string) {
settings settings.OpenVPN, ipv6Supported bool) (lines []string) {
lines, _, err := p.extractor.Data(*settings.ConfFile)
if err != nil {
// Configuration file is already validated in settings validation in
@@ -24,13 +24,13 @@ func (p *Provider) OpenVPNConfig(connection models.Connection,
panic(fmt.Sprintf("failed extracting information from custom configuration file: %s", err))
}
lines = modifyConfig(lines, connection, settings)
lines = modifyConfig(lines, connection, settings, ipv6Supported)
return lines
}
func modifyConfig(lines []string, connection models.Connection,
settings settings.OpenVPN) (modified []string) {
settings settings.OpenVPN, ipv6Supported bool) (modified []string) {
// Remove some lines
for _, line := range lines {
switch {
@@ -57,7 +57,7 @@ func modifyConfig(lines []string, connection models.Connection,
"cipher ", "ncp-ciphers ", "data-ciphers ", "data-ciphers-fallback "),
*settings.Auth != "" && strings.HasPrefix(line, "auth "),
*settings.MSSFix > 0 && strings.HasPrefix(line, "mssfix "),
!*settings.IPv6 && hasPrefixOneOf(line, "tun-ipv6",
!ipv6Supported && hasPrefixOneOf(line, "tun-ipv6",
`pull-filter ignore "route-ipv6"`,
`pull-filter ignore "ifconfig-ipv6"`):
default:
@@ -87,7 +87,7 @@ func modifyConfig(lines []string, connection models.Connection,
if *settings.MSSFix > 0 {
modified = append(modified, "mssfix "+strconv.Itoa(int(*settings.MSSFix)))
}
if !*settings.IPv6 {
if !ipv6Supported {
modified = append(modified, `pull-filter ignore "route-ipv6"`)
modified = append(modified, `pull-filter ignore "ifconfig-ipv6"`)
}