diff options
Diffstat (limited to '')
-rw-r--r-- | ui/tunneleditdialog.go (renamed from ui/tunnelconfigdialog.go) | 32 | ||||
-rw-r--r-- | ui/tunnelspage.go | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/ui/tunnelconfigdialog.go b/ui/tunneleditdialog.go index 12eaff5c..0abed9ed 100644 --- a/ui/tunnelconfigdialog.go +++ b/ui/tunneleditdialog.go @@ -41,7 +41,7 @@ const ( allowedIPsStateOther ) -type TunnelConfigDialog struct { +type TunnelEditDialog struct { *walk.Dialog nameEdit *walk.LineEdit pubkeyEdit *walk.LineEdit @@ -55,13 +55,13 @@ type TunnelConfigDialog struct { inCheckedChanged bool } -func runTunnelConfigDialog(owner walk.Form, tunnel *service.Tunnel) *conf.Config { +func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel) *conf.Config { var ( title string name string ) - dlg := &TunnelConfigDialog{tunnel: tunnel} + dlg := &TunnelEditDialog{tunnel: tunnel} if tunnel == nil { // Creating a new tunnel, create a new private key and use the default template @@ -143,7 +143,7 @@ func runTunnelConfigDialog(owner walk.Form, tunnel *service.Tunnel) *conf.Config return nil } -func (dlg *TunnelConfigDialog) updateAllowedIPsState() { +func (dlg *TunnelEditDialog) updateAllowedIPsState() { var newState allowedIPsState if len(dlg.config.Peers) == 1 { if allowedIPs := dlg.allowedIPsSet(); allowedIPs.IsSupersetOf(ipv4Wildcard) { @@ -165,16 +165,16 @@ func (dlg *TunnelConfigDialog) updateAllowedIPsState() { } } -func (dlg *TunnelConfigDialog) canExcludePrivateIPs() bool { +func (dlg *TunnelEditDialog) canExcludePrivateIPs() bool { return dlg.allowedIPsState == allowedIPsStateContainsIPV4PublicNetworks || dlg.allowedIPsState == allowedIPsStateContainsIPV4Wildcard } -func (dlg *TunnelConfigDialog) privateIPsExcluded() bool { +func (dlg *TunnelEditDialog) privateIPsExcluded() bool { return dlg.allowedIPsState == allowedIPsStateContainsIPV4PublicNetworks } -func (dlg *TunnelConfigDialog) setPrivateIPsExcluded(excluded bool) { +func (dlg *TunnelEditDialog) setPrivateIPsExcluded(excluded bool) { if !dlg.canExcludePrivateIPs() || dlg.privateIPsExcluded() == excluded { return } @@ -220,7 +220,7 @@ func (dlg *TunnelConfigDialog) setPrivateIPsExcluded(excluded bool) { dlg.replaceLine(configKeyAllowedIPs, strings.Join(output.ToSlice(), ", ")) } -func (dlg *TunnelConfigDialog) replaceLine(key, value string) { +func (dlg *TunnelEditDialog) replaceLine(key, value string) { text := dlg.syntaxEdit.Text() start := strings.Index(text, key) @@ -231,25 +231,25 @@ func (dlg *TunnelConfigDialog) replaceLine(key, value string) { dlg.syntaxEdit.SetText(strings.ReplaceAll(text, oldLine, newLine)) } -func (dlg *TunnelConfigDialog) updateExcludePrivateIPsCBVisible() { +func (dlg *TunnelEditDialog) updateExcludePrivateIPsCBVisible() { dlg.updateAllowedIPsState() dlg.excludePrivateIPsCB.SetVisible(dlg.canExcludePrivateIPs()) } -func (dlg *TunnelConfigDialog) dnsRoutes() []string { +func (dlg *TunnelEditDialog) dnsRoutes() []string { return dlg.routes(configKeyDNS) } -func (dlg *TunnelConfigDialog) allowedIPs() []string { +func (dlg *TunnelEditDialog) allowedIPs() []string { return dlg.routes(configKeyAllowedIPs) } -func (dlg *TunnelConfigDialog) allowedIPsSet() *orderedStringSet { +func (dlg *TunnelEditDialog) allowedIPsSet() *orderedStringSet { return orderedStringSetFromSlice(dlg.allowedIPs()) } -func (dlg *TunnelConfigDialog) routes(key string) []string { +func (dlg *TunnelEditDialog) routes(key string) []string { var routes []string lines := strings.Split(dlg.syntaxEdit.Text(), "\n") @@ -267,11 +267,11 @@ func (dlg *TunnelConfigDialog) routes(key string) []string { return routes } -func (dlg *TunnelConfigDialog) onExcludePrivateIPsCBCheckedChanged() { +func (dlg *TunnelEditDialog) onExcludePrivateIPsCBCheckedChanged() { dlg.setPrivateIPsExcluded(dlg.excludePrivateIPsCB.Checked()) } -func (dlg *TunnelConfigDialog) onSyntaxEditPrivateKeyChanged(privateKey string) { +func (dlg *TunnelEditDialog) onSyntaxEditPrivateKeyChanged(privateKey string) { if privateKey == dlg.lastPrivateKey { return } @@ -284,7 +284,7 @@ func (dlg *TunnelConfigDialog) onSyntaxEditPrivateKeyChanged(privateKey string) } } -func (dlg *TunnelConfigDialog) onSaveButtonClicked() { +func (dlg *TunnelEditDialog) onSaveButtonClicked() { newName := dlg.nameEdit.Text() if newName == "" { walk.MsgBox(dlg, "Invalid configuration", "Name is required", walk.MsgBoxIconWarning) diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go index e3053186..a74b6210 100644 --- a/ui/tunnelspage.go +++ b/ui/tunnelspage.go @@ -315,7 +315,7 @@ func (tp *TunnelsPage) onEditTunnel() { return } - if config := runTunnelConfigDialog(tp.Form(), tunnel); config != nil { + if config := runTunnelEditDialog(tp.Form(), tunnel); config != nil { go func() { priorState, err := tunnel.State() tunnel.Delete() @@ -329,7 +329,7 @@ func (tp *TunnelsPage) onEditTunnel() { } func (tp *TunnelsPage) onAddTunnel() { - if config := runTunnelConfigDialog(tp.Form(), nil); config != nil { + if config := runTunnelEditDialog(tp.Form(), nil); config != nil { // Save new tp.addTunnel(config) } |