From: Josh Bleecher Snyder <josh@tailscale.com>
Date: Mon, 25 Jan 2021 17:27:06 +0000 (-0800)
Subject: device: remove close processing fwmark
X-Git-Tag: 0.0.20210212~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f2cc87ee66958226157c5bb77464eee23156c2;p=thirdparty%2Fwireguard-go.git

device: remove close processing fwmark

Also, a behavior change: Stop treating a blank value as 0.
It's not in the spec.

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

diff --git a/device/uapi.go b/device/uapi.go
index 69779de..196b359 100644
--- a/device/uapi.go
+++ b/device/uapi.go
@@ -202,22 +202,13 @@ func (device *Device) handleDeviceLine(key, value string) error {
 		}
 
 	case "fwmark":
-		// parse fwmark field
-		fwmark, err := func() (uint32, error) {
-			if value == "" {
-				return 0, nil
-			}
-			mark, err := strconv.ParseUint(value, 10, 32)
-			return uint32(mark), err
-		}()
-
+		mark, err := strconv.ParseUint(value, 10, 32)
 		if err != nil {
 			return ipcErrorf(ipc.IpcErrorInvalid, "invalid fwmark: %w", err)
 		}
 
 		device.log.Debug.Println("UAPI: Updating fwmark")
-
-		if err := device.BindSetMark(uint32(fwmark)); err != nil {
+		if err := device.BindSetMark(uint32(mark)); err != nil {
 			return ipcErrorf(ipc.IpcErrorPortInUse, "failed to update fwmark: %w", err)
 		}