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
69 lines
1.9 KiB
Go
69 lines
1.9 KiB
Go
package configuration
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
"github.com/qdm12/golibs/params"
|
|
)
|
|
|
|
func (settings *Provider) windscribeLines() (lines []string) {
|
|
if len(settings.ServerSelection.Regions) > 0 {
|
|
lines = append(lines, lastIndent+"Regions: "+commaJoin(settings.ServerSelection.Regions))
|
|
}
|
|
|
|
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))
|
|
}
|
|
|
|
lines = append(lines, settings.ServerSelection.OpenVPN.lines()...)
|
|
|
|
return lines
|
|
}
|
|
|
|
func (settings *Provider) readWindscribe(r reader) (err error) {
|
|
settings.Name = constants.Windscribe
|
|
|
|
settings.ServerSelection.TargetIP, err = readTargetIP(r.env)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
settings.ServerSelection.Regions, err = r.env.CSVInside("REGION", constants.WindscribeRegionChoices())
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable REGION: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.Cities, err = r.env.CSVInside("CITY", constants.WindscribeCityChoices())
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable CITY: %w", err)
|
|
}
|
|
|
|
settings.ServerSelection.Hostnames, err = r.env.CSVInside("SERVER_HOSTNAME", constants.WindscribeHostnameChoices())
|
|
if err != nil {
|
|
return fmt.Errorf("environment variable SERVER_HOSTNAME: %w", err)
|
|
}
|
|
|
|
return settings.ServerSelection.OpenVPN.readWindscribe(r.env)
|
|
}
|
|
|
|
func (settings *OpenVPNSelection) readWindscribe(env params.Env) (err error) {
|
|
settings.TCP, err = readProtocol(env)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
settings.CustomPort, err = readCustomPort(env, settings.TCP,
|
|
[]uint16{21, 22, 80, 123, 143, 443, 587, 1194, 3306, 8080, 54783},
|
|
[]uint16{53, 80, 123, 443, 1194, 54783})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|