device: simplify handling of IPC set endpoint

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>

diff --git a/device/uapi.go b/device/uapi.go
index 196b3593eee023addb9e727eed2287726596c62a..bf3845921b444b42abef6dcbb19f256f46a1d56b 100644 (file)
--- a/device/uapi.go
+++ b/device/uapi.go
@@ -301,21 +301,13 @@ func (device *Device) handlePeerLine(peer *ipcSetPeer, key, value string) error
 
        case "endpoint":
                device.log.Debug.Println(peer, "- UAPI: Updating endpoint")
-
-               err := func() error {
-                       peer.Lock()
-                       defer peer.Unlock()
-                       endpoint, err := conn.CreateEndpoint(value)
-                       if err != nil {
-                               return err
-                       }
-                       peer.endpoint = endpoint
-                       return nil
-               }()
-
+               endpoint, err := conn.CreateEndpoint(value)
                if err != nil {
                        return ipcErrorf(ipc.IpcErrorInvalid, "failed to set endpoint %v: %w", value, err)
                }
+               peer.Lock()
+               defer peer.Unlock()
+               peer.endpoint = endpoint
 
        case "persistent_keepalive_interval":
                device.log.Debug.Println(peer, "- UAPI: Updating persistent keepalive interval")