cc2235653a
- Paves the way for Wireguard - VPN struct contains Type, Openvpn and Provider configurations - OpenVPN specific options (e.g. client key) moved from Provider to Openvpn configuration struct - Move Provider configuration from OpenVPN configuration to VPN - HTTP control server returns only openvpn settings (not provider settings)
81 lines
2.3 KiB
Go
81 lines
2.3 KiB
Go
package configuration
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
"github.com/qdm12/golibs/params"
|
|
)
|
|
|
|
func (settings *Provider) mullvadLines() (lines []string) {
|
|
if len(settings.ServerSelection.Countries) > 0 {
|
|
lines = append(lines, lastIndent+"Countries: "+commaJoin(settings.ServerSelection.Countries))
|
|
}
|
|
|
|
if len(settings.ServerSelection.Cities) > 0 {
|
|
lines = append(lines, lastIndent+"Cities: "+commaJoin(settings.ServerSelection.Cities))
|
|
}
|
|
|
|
if len(settings.ServerSelection.Hostnames) > 0 {
|
|
lines = append(lines, lastIndent+"Hostnames: "+commaJoin(settings.ServerSelection.Hostnames))
|
|
}
|
|
|
|
if len(settings.ServerSelection.ISPs) > 0 {
|
|
lines = append(lines, lastIndent+"ISPs: "+commaJoin(settings.ServerSelection.ISPs))
|
|
}
|
|
|
|
if settings.ServerSelection.CustomPort > 0 {
|
|
lines = append(lines, lastIndent+"Custom port: "+strconv.Itoa(int(settings.ServerSelection.CustomPort)))
|
|
}
|
|
|
|
return lines
|
|
}
|
|
|
|
func (settings *Provider) readMullvad(r reader) (err error) {
|
|
settings.Name = constants.Mullvad
|
|
|
|
settings.ServerSelection.TCP, err = readProtocol(r.env)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
settings.ServerSelection.TargetIP, err = readTargetIP(r.env)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
settings.ServerSelection.Countries, err = r.env.CSVInside("COUNTRY", constants.MullvadCountryChoices())
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable COUNTRY: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.Cities, err = r.env.CSVInside("CITY", constants.MullvadCityChoices())
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable CITY: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.Hostnames, err = r.env.CSVInside("SERVER_HOSTNAME", constants.MullvadHostnameChoices())
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable SERVER_HOSTNAME: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.ISPs, err = r.env.CSVInside("ISP", constants.MullvadISPChoices())
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable ISP: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.CustomPort, err = readCustomPort(r.env, settings.ServerSelection.TCP,
|
|
[]uint16{80, 443, 1401}, []uint16{53, 1194, 1195, 1196, 1197, 1300, 1301, 1302, 1303, 1400})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
settings.ServerSelection.Owned, err = r.env.YesNo("OWNED", params.Default("no"))
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable OWNED: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|