From d026a05073eabb55f163c3875f42d8e91f27f1bf Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 11 May 2019 17:41:19 +0200
Subject: ui: allow editing existing tunnels without changing name

---
 ui/editdialog.go | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'ui')

diff --git a/ui/editdialog.go b/ui/editdialog.go
index b4ed8ebe..72382120 100644
--- a/ui/editdialog.go
+++ b/ui/editdialog.go
@@ -28,13 +28,9 @@ type EditDialog struct {
 }
 
 func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel, clone bool) *conf.Config {
-	var (
-		title string
-		name  string
-	)
-
 	dlg := &EditDialog{}
 
+	var title string
 	if tunnel == nil || clone {
 		title = "Create new tunnel"
 	} else {
@@ -46,11 +42,10 @@ func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel, clone bool) *c
 		pk, _ := conf.NewPrivateKey()
 		dlg.config = conf.Config{Interface: conf.Interface{PrivateKey: *pk}}
 	} else {
-		name = tunnel.Name
+		dlg.config, _ = tunnel.StoredConfig()
 		if clone {
-			name += "-copy"
+			dlg.config.Name += "-copy"
 		}
-		dlg.config, _ = tunnel.StoredConfig()
 	}
 
 	layout := walk.NewGridLayout()
@@ -71,7 +66,7 @@ func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel, clone bool) *c
 
 	dlg.nameEdit, _ = walk.NewLineEdit(dlg)
 	layout.SetRange(dlg.nameEdit, walk.Rectangle{1, 0, 1, 1})
-	dlg.nameEdit.SetText(name)
+	dlg.nameEdit.SetText(dlg.config.Name)
 
 	pubkeyLabel, _ := walk.NewTextLabel(dlg)
 	layout.SetRange(pubkeyLabel, walk.Rectangle{0, 1, 1, 1})
@@ -114,6 +109,10 @@ func runTunnelEditDialog(owner walk.Form, tunnel *service.Tunnel, clone bool) *c
 	dlg.syntaxEdit.BlockUntunneledTrafficStateChanged().Attach(dlg.onBlockUntunneledTrafficStateChanged)
 	dlg.syntaxEdit.SetText(dlg.config.ToWgQuick())
 
+	if clone {
+		dlg.config.Name = ""
+	}
+
 	if tunnel != nil && !clone {
 		dlg.nameEdit.SetFocus() //TODO: This works around a walk issue with scrolling in weird ways <https://github.com/lxn/walk/issues/505>. We should fix this in walk instead of here.
 
@@ -263,18 +262,20 @@ func (dlg *EditDialog) onSaveButtonClicked() {
 		walk.MsgBox(dlg, "Invalid name", fmt.Sprintf("Tunnel name ‘%s’ is invalid.", newName), walk.MsgBoxIconWarning)
 		return
 	}
-
-	existingTunnelList, err := service.IPCClientTunnels()
-	if err != nil {
-		walk.MsgBox(dlg, "Unable to list existing tunnels", err.Error(), walk.MsgBoxIconError)
-		return
-	}
 	newNameLower := strings.ToLower(newName)
-	for _, tunnel := range existingTunnelList {
-		if strings.ToLower(tunnel.Name) == newNameLower {
-			walk.MsgBox(dlg, "Tunnel already exists", fmt.Sprintf("Another tunnel already exists with the name ‘%s’.", newName), walk.MsgBoxIconWarning)
+
+	if newNameLower != strings.ToLower(dlg.config.Name) {
+		existingTunnelList, err := service.IPCClientTunnels()
+		if err != nil {
+			walk.MsgBox(dlg, "Unable to list existing tunnels", err.Error(), walk.MsgBoxIconError)
 			return
 		}
+		for _, tunnel := range existingTunnelList {
+			if strings.ToLower(tunnel.Name) == newNameLower {
+				walk.MsgBox(dlg, "Tunnel already exists", fmt.Sprintf("Another tunnel already exists with the name ‘%s’.", newName), walk.MsgBoxIconWarning)
+				return
+			}
+		}
 	}
 
 	cfg, err := conf.FromWgQuick(dlg.syntaxEdit.Text(), newName)
-- 
cgit v1.2.3-59-g8ed1b