]> git.ipfire.org Git - thirdparty/wireguard-go.git/commitdiff
device: remove close processing fwmark
authorJosh Bleecher Snyder <josh@tailscale.com>
Mon, 25 Jan 2021 17:27:06 +0000 (09:27 -0800)
committerJosh Bleecher Snyder <josh@tailscale.com>
Mon, 25 Jan 2021 17:36:53 +0000 (09:36 -0800)
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>
device/uapi.go

index 69779de8cc5b504847dbe3dbc1f6730f88997f78..196b3593eee023addb9e727eed2287726596c62a 100644 (file)
@@ -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)
                }