windows compatibility

Author: shawwwn

.gitignore

@@ -2,3 +2,5 @@
 *.exe
 /gtun
 *.sh
+*.zip
+/gole-*

Makefile

@@ -12,15 +12,16 @@ $(OUT): $(SOURCES)
 
 .PHONY: clean
 clean:
-	-rm $(OUT)
-	-rm ./client ./server
-	-rm ./gtun
-	-rm *.exe
-	-rm gole_darwin_amd64
-	-rm gole-linux-386 gole-linux-amd64 gole-linux-arm gole-linux-arm64
-	-rm gole-linux-mips gole-linux-mipsle
-	-rm gole-windows-386.exe gole-windows-amd64.exe
-	-rm *.zip
+	@-rm -f $(OUT)
+	@-rm -f ./client ./server
+	@-rm -f ./gtun
+	@-rm -f *.exe
+	@-rm -f gole_darwin_amd64
+	@-rm -f gole-linux-386 gole-linux-amd64
+	@-rm -f gole-linux-arm gole-linux-arm64
+	@-rm -f gole-linux-mips gole-linux-mipsle
+	@-rm -f gole-windows-386.exe gole-windows-amd64.exe
+	@-rm -f *.zip
 
 .PHONY: release
 release:
@@ -31,10 +32,11 @@ release:
 	GOOS=linux GOARCH=386 go build $(LDFLAGS) -o gole-linux-386 $(SOURCES)
 	GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -o gole-linux-amd64 $(SOURCES)
 	GOOS=linux GOARCH=arm go build $(LDFLAGS) -o gole-linux-arm $(SOURCES)
+	GOOS=linux GOARCH=arm64 go build $(LDFLAGS) -o gole-linux-arm64 $(SOURCES)
 	GOOS=linux GOARCH=mips go build $(LDFLAGS) -o gole-linux-mips $(SOURCES)
 	GOOS=linux GOARCH=mipsle go build $(LDFLAGS) -o gole-linux-mipsle $(SOURCES)
-	zip gole-linux-$(DATE).zip gole-linux-386 gole-linux-amd64 gole-linux-mips gole-linux-mipsle
-	rm gole-linux-386 gole-linux-amd64 gole-linux-mips gole-linux-mipsle
+	zip gole-linux-$(DATE).zip gole-linux-386 gole-linux-amd64 gole-linux-mips gole-linux-mipsle gole-linux-arm gole-linux-arm64
+	rm gole-linux-386 gole-linux-amd64 gole-linux-mips gole-linux-mipsle gole-linux-arm gole-linux-arm64
 
 	GOOS=windows GOARCH=386 go build $(LDFLAGS) -o gole-windows-386.exe $(SOURCES)
 	GOOS=windows GOARCH=amd64 go build $(LDFLAGS) -o gole-windows-amd64.exe $(SOURCES)

go.mod

@@ -14,4 +14,5 @@ require (
 	github.com/xtaci/smux v1.5.15
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777
+	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
 )

s5/s5_linux.go

@@ -8,13 +8,20 @@ import "time"
 func CreateDialer(bind net.Addr, fwmark int, dscp int) *net.Dialer {
 
 	// callback from dialer creation
-	var controlCallback = func(network, address string, c syscall.RawConn) error {
+	var ctrlCallback = func(network, address string, c syscall.RawConn) error {
 		return c.Control(func(fd uintptr) {
-			f := int(fd)
-			// log.Printf("open %s socket (fd=%d)", network, f)
-			err := syscall.SetsockoptInt(f, syscall.SOL_SOCKET, syscall.SO_MARK, fwmark)
-			if err != nil {
-				fmt.Println("set fwmark failed:", err)
+			var err error
+			if fwmark != 0 {
+				err = syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_MARK, fwmark)
+				if err != nil {
+					fmt.Println("set fwmark failed:", err)
+				}
+			}
+			if dscp != 0 {
+				err = syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_TOS, dscp << 2)
+				if err != nil {
+					fmt.Println("set dscp failed:", err)
+				}
 			}
 		})
 	}
@@ -24,9 +31,7 @@ func CreateDialer(bind net.Addr, fwmark int, dscp int) *net.Dialer {
 		Timeout: time.Duration(time.Second*30),
 	}
 
-	if fwmark != 0 {
-		dialer.Control = controlCallback
-	}
+	dialer.Control = ctrlCallback
 
 	return dialer
 }

s5/s5_windows.go

@@ -2,15 +2,32 @@ package s5
 
 import "net"
 import "time"
+import "syscall"
+import "fmt"
+import "golang.org/x/sys/windows"
 
 func CreateDialer(bind net.Addr, fwmark int, dscp int) *net.Dialer {
 
+	// callback from dialer creation
+	var ctrlCallback = func(network, address string, c syscall.RawConn) error {
+		return c.Control(func(fd uintptr) {
+			var err error
+			// do not support SO_MARK
+			if dscp != 0 {
+				err = syscall.SetsockoptInt(syscall.Handle(fd), windows.IPPROTO_IP, windows.IP_TOS, dscp << 2)
+				if err != nil {
+					fmt.Println("set dscp failed:", err)
+				}
+			}
+		})
+	}
+
 	dialer := &net.Dialer{
 		LocalAddr: bind,
 		Timeout: time.Duration(time.Second*30),
 	}
 
-	// TODO: Set fwmark,dscp on Windows
+	dialer.Control = ctrlCallback
 
 	return dialer
 }