- No more global variables - Inject merged servers to configuration package - Fix #566: configuration parsing to use persisted servers.json - Move server data files from `internal/constants` to `internal/storage`
64 lines
1.7 KiB
Go
64 lines
1.7 KiB
Go
package configuration
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
"github.com/qdm12/golibs/params"
|
|
)
|
|
|
|
func (settings *Provider) readNordvpn(r reader) (err error) {
|
|
settings.Name = constants.Nordvpn
|
|
servers := r.servers.GetNordvpn()
|
|
|
|
settings.ServerSelection.TargetIP, err = readTargetIP(r.env)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
settings.ServerSelection.Regions, err = r.env.CSVInside("REGION", constants.NordvpnRegionChoices(servers))
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable REGION: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.Hostnames, err = r.env.CSVInside("SERVER_HOSTNAME", constants.NordvpnHostnameChoices(servers))
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable SERVER_HOSTNAME: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.Names, err = r.env.CSVInside("SERVER_NAME", constants.NordvpnHostnameChoices(servers))
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable SERVER_NAME: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.Numbers, err = readNordVPNServerNumbers(r.env)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return settings.ServerSelection.OpenVPN.readProtocolOnly(r.env)
|
|
}
|
|
|
|
func readNordVPNServerNumbers(env params.Interface) (numbers []uint16, err error) {
|
|
const possiblePortsCount = 65537
|
|
possibilities := make([]string, possiblePortsCount)
|
|
for i := range possibilities {
|
|
possibilities[i] = fmt.Sprintf("%d", i)
|
|
}
|
|
possibilities[65536] = ""
|
|
values, err := env.CSVInside("SERVER_NUMBER", possibilities)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
numbers = make([]uint16, len(values))
|
|
for i := range values {
|
|
n, err := strconv.Atoi(values[i])
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
numbers[i] = uint16(n)
|
|
}
|
|
return numbers, nil
|
|
}
|