admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(config): provider name field as string instead of string pointer

Browse Source
This commit is contained in:
Quentin McGaw
2024-03-23 09:41:25 +00:00
parent 7674efe8d7
commit 62007bf1a1
6 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/configuration/settings/vpn.go
View File

@@ -33,12 +33,12 @@ func (v *VPN) Validate(storage Storage, ipv6Supported bool) (err error) {
}
if v.Type == vpn.OpenVPN {
err := v.OpenVPN.validate(*v.Provider.Name)
err := v.OpenVPN.validate(v.Provider.Name)
if err != nil {
return fmt.Errorf("OpenVPN settings: %w", err)
}
} else {
err := v.Wireguard.validate(*v.Provider.Name, ipv6Supported)
err := v.Wireguard.validate(v.Provider.Name, ipv6Supported)
if err != nil {
return fmt.Errorf("Wireguard settings: %w", err)
}
@@ -73,8 +73,8 @@ func (v *VPN) OverrideWith(other VPN) {
func (v *VPN) setDefaults() {
v.Type = gosettings.DefaultString(v.Type, vpn.OpenVPN)
v.Provider.setDefaults()
v.OpenVPN.setDefaults(*v.Provider.Name)
v.Wireguard.setDefaults(*v.Provider.Name)
v.OpenVPN.setDefaults(v.Provider.Name)
v.Wireguard.setDefaults(v.Provider.Name)
}
func (v VPN) String() string {