Separate out mark setting for Windows

diff --git a/conn_default.go b/conn_default.go
index 9b2325c14b70593b5edae8645e576c3518927961..862032da09a8eaa9aec4a18b6730cb653a5d9746 100644 (file)
--- a/conn_default.go
+++ b/conn_default.go
@@ -8,10 +8,8 @@
 package main
 
 import (
-       "golang.org/x/sys/unix"
        "net"
        "os"
-       "runtime"
        "syscall"
 )
 
@@ -171,47 +169,3 @@ func (bind *NativeBind) Send(buff []byte, endpoint Endpoint) error {
        }
        return err
 }
-
-var fwmarkIoctl int
-
-func init() {
-       switch runtime.GOOS {
-       case "linux", "android":
-               fwmarkIoctl = 36 /* unix.SO_MARK */
-       case "freebsd":
-               fwmarkIoctl = 0x1015 /* unix.SO_USER_COOKIE */
-       case "openbsd":
-               fwmarkIoctl = 0x1021 /* unix.SO_RTABLE */
-       }
-}
-
-func (bind *NativeBind) SetMark(mark uint32) error {
-       if fwmarkIoctl == 0 {
-               return nil
-       }
-       if bind.ipv4 != nil {
-               fd, err := bind.ipv4.SyscallConn()
-               if err != nil {
-                       return err
-               }
-               err = fd.Control(func(fd uintptr) {
-                       err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark))
-               })
-               if err != nil {
-                       return err
-               }
-       }
-       if bind.ipv6 != nil {
-               fd, err := bind.ipv6.SyscallConn()
-               if err != nil {
-                       return err
-               }
-               err = fd.Control(func(fd uintptr) {
-                       err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark))
-               })
-               if err != nil {
-                       return err
-               }
-       }
-       return nil
-}

diff --git a/mark_default.go b/mark_default.go
new file mode 100644 (file)
index 0000000..7062606
--- /dev/null
+++ b/mark_default.go
@@ -0,0 +1,12 @@
+// +build !linux,!openbsd,!freebsd
+
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved.
+ */
+
+package main
+
+func (bind *NativeBind) SetMark(mark uint32) error {
+       return nil
+}

diff --git a/mark_unix.go b/mark_unix.go
new file mode 100644 (file)
index 0000000..0b9d7e0
--- /dev/null
+++ b/mark_unix.go
@@ -0,0 +1,57 @@
+// +build android openbsd freebsd
+
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved.
+ */
+
+package main
+
+import (
+       "golang.org/x/sys/unix"
+       "runtime"
+)
+
+var fwmarkIoctl int
+
+func init() {
+       switch runtime.GOOS {
+       case "linux", "android":
+               fwmarkIoctl = 36 /* unix.SO_MARK */
+       case "freebsd":
+               fwmarkIoctl = 0x1015 /* unix.SO_USER_COOKIE */
+       case "openbsd":
+               fwmarkIoctl = 0x1021 /* unix.SO_RTABLE */
+       }
+}
+
+func (bind *NativeBind) SetMark(mark uint32) error {
+       if fwmarkIoctl == 0 {
+               return nil
+       }
+       if bind.ipv4 != nil {
+               fd, err := bind.ipv4.SyscallConn()
+               if err != nil {
+                       return err
+               }
+               err = fd.Control(func(fd uintptr) {
+                       err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark))
+               })
+               if err != nil {
+                       return err
+               }
+       }
+       if bind.ipv6 != nil {
+               fd, err := bind.ipv6.SyscallConn()
+               if err != nil {
+                       return err
+               }
+               err = fd.Control(func(fd uintptr) {
+                       err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark))
+               })
+               if err != nil {
+                       return err
+               }
+       }
+       return nil
+}