Clean up code inside the configuration loaders

This commit is contained in:
NI
2020-02-08 11:17:56 +08:00
parent 921b887550
commit 9b2513c89d
3 changed files with 26 additions and 31 deletions

View File

@@ -170,32 +170,10 @@ func (c Configuration) Verify() error {
// Common returns common settings
func (c Configuration) Common() Common {
dialer := c.Dialer
if dialer == nil {
dialer = network.TCPDial()
}
if c.OnlyAllowPresetRemotes {
accessList := make(network.AllowedHosts, len(c.Presets))
for _, k := range c.Presets {
accessList[k.Host] = struct{}{}
}
dialer = network.AccessControlDial(accessList, dialer)
}
dialTimeout := c.DialTimeout
if dialTimeout <= 1*time.Second {
dialTimeout = 1 * time.Second
}
return Common{
HostName: c.HostName,
SharedKey: c.SharedKey,
Dialer: dialer,
Dialer: c.Dialer,
DialTimeout: c.DialTimeout,
Presets: c.Presets,
OnlyAllowPresetRemotes: c.OnlyAllowPresetRemotes,