snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

device: remove close processing fwmark

Browse source 
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>
This commit is contained in:
Josh Bleecher Snyder 2021-01-25 09:27:06 -08:00
parent 2b8665f5f9
commit d8f2cc87ee
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
device/uapi.go
View file

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