add ci

.github/workflows/go.yml

@@ -0,0 +1,37 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Go
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  test:
+    name: go-test
+    runs-on: windows-latest
+    env:
+      CGO_ENABLED: 0 
+    steps:
+    - name: disable-auto-crlf
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+
+    - name: clone-repo
+      uses: actions/checkout@v4
+
+    - name: setup-go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.20'
+
+    - name: go-vet-fmt-test # fmt check see Test_Gofmt
+      run : |
+            go vet
+            go test -v -timeout 120s -tags "-race" ./... 
+
+

LICENCE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 lysShub
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2024 lysShub
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

divert_test.go

@@ -1,9 +1,13 @@
+//go:build windows
+// +build windows
+
 package divert
 
 import (
 	"math/rand"
 	"net"
 	"net/netip"
+	"os/exec"
 	"testing"
 	"time"
 
@@ -17,8 +21,18 @@ import (
 	"gvisor.dev/gvisor/pkg/tcpip/header"
 )
 
+var path = "embed\\WinDivert64.dll"
+
+func Test_Gofmt(t *testing.T) {
+	cmd := exec.Command("cmd", "/C", "gofmt", "-l", "-w", `.`)
+	out, err := cmd.CombinedOutput()
+
+	require.NoError(t, err)
+	require.Empty(t, string(out))
+}
+
 func Test_Load_DLL(t *testing.T) {
-	t.Run("embed", func(t *testing.T) {
+	runLoad(t, "embed", func(t *testing.T) {
 		e1 := Load(DLL)
 		require.NoError(t, e1)
 		require.NoError(t, Release())
@@ -28,22 +42,22 @@ func Test_Load_DLL(t *testing.T) {
 		require.NoError(t, Release())
 	})
 
-	t.Run("file", func(t *testing.T) {
-		e1 := Load("embed\\WinDivert64.dll")
+	runLoad(t, "file", func(t *testing.T) {
+		e1 := Load(path)
 		require.NoError(t, e1)
 		require.NoError(t, Release())
 
-		e2 := Load("embed\\WinDivert64.dll")
+		e2 := Load(path)
 		require.NoError(t, e2)
 		require.NoError(t, Release())
 	})
 
-	t.Run("load-fail", func(t *testing.T) {
+	runLoad(t, "load-fail", func(t *testing.T) {
 		err := Load("C:\\Windows\\System32\\ws2_32.dll")
 		require.NotNil(t, err)
 	})
 
-	t.Run("load-fail/open", func(t *testing.T) {
+	runLoad(t, "load-fail/open", func(t *testing.T) {
 		err := Load("C:\\Windows\\System32\\ws2_32.dll")
 		require.Error(t, err)
 
@@ -52,14 +66,14 @@ func Test_Load_DLL(t *testing.T) {
 		require.Nil(t, d)
 	})
 
-	t.Run("load-fail/release", func(t *testing.T) {
+	runLoad(t, "load-fail/release", func(t *testing.T) {
 		err := Load("C:\\Windows\\System32\\ws2_32.dll")
 		require.NotNil(t, err)
 
 		require.NoError(t, Release())
 	})
 
-	t.Run("load-fail/load", func(t *testing.T) {
+	runLoad(t, "load-fail/load", func(t *testing.T) {
 		e1 := Load("C:\\Windows\\System32\\ws2_32.dll")
 		require.NotNil(t, e1)
 		require.NoError(t, Release())
@@ -69,8 +83,8 @@ func Test_Load_DLL(t *testing.T) {
 		require.NoError(t, Release())
 	})
 
-	t.Run("load/load", func(t *testing.T) {
-		e1 := Load("embed\\WinDivert64.dll")
+	runLoad(t, "load/load", func(t *testing.T) {
+		e1 := Load(path)
 		require.NoError(t, e1)
 
 		e2 := Load(DLL)
@@ -79,20 +93,20 @@ func Test_Load_DLL(t *testing.T) {
 		require.NoError(t, Release())
 	})
 
-	t.Run("release/release", func(t *testing.T) {
+	runLoad(t, "release/release", func(t *testing.T) {
 		require.NoError(t, Release())
 		require.NoError(t, Release())
 	})
 
-	t.Run("load/release/release", func(t *testing.T) {
+	runLoad(t, "load/release/release", func(t *testing.T) {
 		err := Load(DLL)
 		require.NoError(t, err)
 
 		require.NoError(t, Release())
 		require.NoError(t, Release())
 	})
 
-	t.Run("load/open/release", func(t *testing.T) {
+	runLoad(t, "load/open/release", func(t *testing.T) {
 		err := Load(DLL)
 		require.NoError(t, err)
 		defer Release()
@@ -107,13 +121,13 @@ func Test_Load_DLL(t *testing.T) {
 		require.True(t, errors.Is(err, ErrNotLoad{}))
 	})
 
-	t.Run("open", func(t *testing.T) {
+	runLoad(t, "open", func(t *testing.T) {
 		d, err := Open("false", Network, 0, 0)
 		require.Nil(t, d)
 		require.True(t, errors.Is(err, ErrNotLoad{}))
 	})
 
-	t.Run("load/release/open", func(t *testing.T) {
+	runLoad(t, "load/release/open", func(t *testing.T) {
 		err := Load(DLL)
 		require.NoError(t, err)
 		require.NoError(t, Release())
@@ -124,6 +138,42 @@ func Test_Load_DLL(t *testing.T) {
 	})
 }
 
+func runLoad(t *testing.T, name string, fn func(t *testing.T)) {
+	t.Run(name, func(t *testing.T) {
+		fn(t)
+		Release()
+	})
+}
+
+func Test_MustLoad_DLL(t *testing.T) {
+	runLoad(t, "embed", func(t *testing.T) {
+		MustLoad(DLL)
+		Release()
+
+		MustLoad(DLL)
+
+		MustLoad(DLL)
+	})
+
+	runLoad(t, "file", func(t *testing.T) {
+		MustLoad(path)
+		Release()
+
+		MustLoad(path)
+
+		MustLoad(path)
+	})
+
+	runLoad(t, "load-fail", func(t *testing.T) {
+		defer func() {
+			e := recover()
+			require.NotNil(t, e, e)
+		}()
+
+		MustLoad("C:\\Windows\\System32\\ws2_32.dll")
+	})
+}
+
 func Test_Helper(t *testing.T) {
 	require.NoError(t, Load(DLL))
 	defer Release()

handle.go

@@ -184,7 +184,7 @@ func (d *Handle) recvCtx(ctx context.Context, ip []byte, addr *Address) (n int,
 			select {
 			case <-ctx.Done():
 				err = windows.CancelIoEx(windows.Handle(d.handle), ol)
-				if err != nil {
+				if err != nil && err != windows.ERROR_NOT_FOUND {
 					return 0, errors.WithStack(err)
 				}
 				return 0, handleError(ctx.Err())