9105b33e9f
- 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
82 lines
2.3 KiB
Go
82 lines
2.3 KiB
Go
package configuration
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"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))
|
|
}
|
|
|
|
lines = append(lines, settings.ServerSelection.OpenVPN.lines()...)
|
|
|
|
return lines
|
|
}
|
|
|
|
func (settings *Provider) readMullvad(r reader) (err error) {
|
|
settings.Name = constants.Mullvad
|
|
|
|
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.Owned, err = r.env.YesNo("OWNED", params.Default("no"))
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable OWNED: %w", err)
|
|
}
|
|
|
|
return settings.ServerSelection.OpenVPN.readMullvad(r.env)
|
|
}
|
|
|
|
func (settings *OpenVPNSelection) readMullvad(env params.Env) (err error) {
|
|
settings.TCP, err = readProtocol(env)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
settings.CustomPort, err = readCustomPort(env, settings.TCP,
|
|
[]uint16{80, 443, 1401}, []uint16{53, 1194, 1195, 1196, 1197, 1300, 1301, 1302, 1303, 1400})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|