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

Maint: configuration Openvpn selection structure

Browse Source 
- Move network protocol from ServerSelection to OpenVPNSelection child
- Move PIA encryption preset from ServerSelection to OpenVPNSelection child
- Move custom port from ServerSelection to OpenVPNSelection child
This commit is contained in:
Quentin McGaw (desktop)
2021-08-17 16:54:22 +00:00
parent cc2235653a
commit 9105b33e9f
57 changed files with 321 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/provider/privateinternetaccess/port.go
View File

@@ -4,20 +4,21 @@ import (
"errors"
"fmt"
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/constants"
)
func getPort(tcp bool, encryptionPreset string, customPort uint16) (
func getPort(openvpnSelection configuration.OpenVPNSelection) (
port uint16, err error) {
if customPort == 0 {
return getDefaultPort(tcp, encryptionPreset), nil
if openvpnSelection.CustomPort == 0 {
return getDefaultPort(openvpnSelection.TCP, openvpnSelection.EncPreset), nil
}
if err := checkPort(customPort, tcp); err != nil {
if err := checkPort(openvpnSelection.CustomPort, openvpnSelection.TCP); err != nil {
return 0, err
}
return customPort, nil
return openvpnSelection.CustomPort, nil
}
func getDefaultPort(tcp bool, encryptionPreset string) (port uint16) {