178 lines
6.0 KiB
Diff
178 lines
6.0 KiB
Diff
From 0468b8b0addf825a274d81630087d62db495a562 Mon Sep 17 00:00:00 2001
|
|
From: Vorapol Rinsatitnon <vorapol.r@pm.me>
|
|
Date: Sat, 5 Oct 2024 14:27:19 +1000
|
|
Subject: [PATCH] Add sysSocket fallback (revert 7c1157f)
|
|
|
|
---
|
|
src/net/hook_windows.go | 1 +
|
|
src/net/internal/socktest/main_test.go | 2 +-
|
|
.../internal/socktest/main_windows_test.go | 22 ++++++++++++++
|
|
src/net/internal/socktest/sys_windows.go | 29 +++++++++++++++++++
|
|
src/net/main_windows_test.go | 3 ++
|
|
src/net/sock_windows.go | 14 +++++++++
|
|
src/syscall/exec_windows.go | 1 -
|
|
7 files changed, 70 insertions(+), 2 deletions(-)
|
|
create mode 100644 src/net/internal/socktest/main_windows_test.go
|
|
|
|
diff --git a/src/net/hook_windows.go b/src/net/hook_windows.go
|
|
index f7c5b5a..6b82be5 100644
|
|
--- a/src/net/hook_windows.go
|
|
+++ b/src/net/hook_windows.go
|
|
@@ -13,6 +13,7 @@ var (
|
|
hostsFilePath = windows.GetSystemDirectory() + "/Drivers/etc/hosts"
|
|
|
|
// Placeholders for socket system calls.
|
|
+ socketFunc func(int, int, int) (syscall.Handle, error) = syscall.Socket
|
|
wsaSocketFunc func(int32, int32, int32, *syscall.WSAProtocolInfo, uint32, uint32) (syscall.Handle, error) = windows.WSASocket
|
|
connectFunc func(syscall.Handle, syscall.Sockaddr) error = syscall.Connect
|
|
listenFunc func(syscall.Handle, int) error = syscall.Listen
|
|
diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go
|
|
index 967ce67..0197feb 100644
|
|
--- a/src/net/internal/socktest/main_test.go
|
|
+++ b/src/net/internal/socktest/main_test.go
|
|
@@ -2,7 +2,7 @@
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
-//go:build !js && !plan9 && !wasip1 && !windows
|
|
+//go:build !js && !plan9 && !wasip1
|
|
|
|
package socktest_test
|
|
|
|
diff --git a/src/net/internal/socktest/main_windows_test.go b/src/net/internal/socktest/main_windows_test.go
|
|
new file mode 100644
|
|
index 0000000..df1cb97
|
|
--- /dev/null
|
|
+++ b/src/net/internal/socktest/main_windows_test.go
|
|
@@ -0,0 +1,22 @@
|
|
+// Copyright 2015 The Go Authors. All rights reserved.
|
|
+// Use of this source code is governed by a BSD-style
|
|
+// license that can be found in the LICENSE file.
|
|
+
|
|
+package socktest_test
|
|
+
|
|
+import "syscall"
|
|
+
|
|
+var (
|
|
+ socketFunc func(int, int, int) (syscall.Handle, error)
|
|
+ closeFunc func(syscall.Handle) error
|
|
+)
|
|
+
|
|
+func installTestHooks() {
|
|
+ socketFunc = sw.Socket
|
|
+ closeFunc = sw.Closesocket
|
|
+}
|
|
+
|
|
+func uninstallTestHooks() {
|
|
+ socketFunc = syscall.Socket
|
|
+ closeFunc = syscall.Closesocket
|
|
+}
|
|
diff --git a/src/net/internal/socktest/sys_windows.go b/src/net/internal/socktest/sys_windows.go
|
|
index 2f02446..2b89362 100644
|
|
--- a/src/net/internal/socktest/sys_windows.go
|
|
+++ b/src/net/internal/socktest/sys_windows.go
|
|
@@ -9,6 +9,35 @@ import (
|
|
"syscall"
|
|
)
|
|
|
|
+// Socket wraps syscall.Socket.
|
|
+func (sw *Switch) Socket(family, sotype, proto int) (s syscall.Handle, err error) {
|
|
+ sw.once.Do(sw.init)
|
|
+ so := &Status{Cookie: cookie(family, sotype, proto)}
|
|
+ sw.fmu.RLock()
|
|
+ f, _ := sw.fltab[FilterSocket]
|
|
+ sw.fmu.RUnlock()
|
|
+ af, err := f.apply(so)
|
|
+ if err != nil {
|
|
+ return syscall.InvalidHandle, err
|
|
+ }
|
|
+ s, so.Err = syscall.Socket(family, sotype, proto)
|
|
+ if err = af.apply(so); err != nil {
|
|
+ if so.Err == nil {
|
|
+ syscall.Closesocket(s)
|
|
+ }
|
|
+ return syscall.InvalidHandle, err
|
|
+ }
|
|
+ sw.smu.Lock()
|
|
+ defer sw.smu.Unlock()
|
|
+ if so.Err != nil {
|
|
+ sw.stats.getLocked(so.Cookie).OpenFailed++
|
|
+ return syscall.InvalidHandle, so.Err
|
|
+ }
|
|
+ nso := sw.addLocked(s, family, sotype, proto)
|
|
+ sw.stats.getLocked(nso.Cookie).Opened++
|
|
+ return s, nil
|
|
+}
|
|
+
|
|
// WSASocket wraps [syscall.WSASocket].
|
|
func (sw *Switch) WSASocket(family, sotype, proto int32, protinfo *syscall.WSAProtocolInfo, group uint32, flags uint32) (s syscall.Handle, err error) {
|
|
sw.once.Do(sw.init)
|
|
diff --git a/src/net/main_windows_test.go b/src/net/main_windows_test.go
|
|
index bc024c0..07f21b7 100644
|
|
--- a/src/net/main_windows_test.go
|
|
+++ b/src/net/main_windows_test.go
|
|
@@ -8,6 +8,7 @@ import "internal/poll"
|
|
|
|
var (
|
|
// Placeholders for saving original socket system calls.
|
|
+ origSocket = socketFunc
|
|
origWSASocket = wsaSocketFunc
|
|
origClosesocket = poll.CloseFunc
|
|
origConnect = connectFunc
|
|
@@ -17,6 +18,7 @@ var (
|
|
)
|
|
|
|
func installTestHooks() {
|
|
+ socketFunc = sw.Socket
|
|
wsaSocketFunc = sw.WSASocket
|
|
poll.CloseFunc = sw.Closesocket
|
|
connectFunc = sw.Connect
|
|
@@ -26,6 +28,7 @@ func installTestHooks() {
|
|
}
|
|
|
|
func uninstallTestHooks() {
|
|
+ socketFunc = origSocket
|
|
wsaSocketFunc = origWSASocket
|
|
poll.CloseFunc = origClosesocket
|
|
connectFunc = origConnect
|
|
diff --git a/src/net/sock_windows.go b/src/net/sock_windows.go
|
|
index a519909..ebdf4c3 100644
|
|
--- a/src/net/sock_windows.go
|
|
+++ b/src/net/sock_windows.go
|
|
@@ -20,6 +20,20 @@ func maxListenerBacklog() int {
|
|
func sysSocket(family, sotype, proto int) (syscall.Handle, error) {
|
|
s, err := wsaSocketFunc(int32(family), int32(sotype), int32(proto),
|
|
nil, 0, windows.WSA_FLAG_OVERLAPPED|windows.WSA_FLAG_NO_HANDLE_INHERIT)
|
|
+ if err == nil {
|
|
+ return s, nil
|
|
+ }
|
|
+ // WSA_FLAG_NO_HANDLE_INHERIT flag is not supported on some
|
|
+ // old versions of Windows, see
|
|
+ // https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
|
|
+ // for details. Just use syscall.Socket, if windows.WSASocket failed.
|
|
+ // See ../syscall/exec_unix.go for description of ForkLock.
|
|
+ syscall.ForkLock.RLock()
|
|
+ s, err = socketFunc(family, sotype, proto)
|
|
+ if err == nil {
|
|
+ syscall.CloseOnExec(s)
|
|
+ }
|
|
+ syscall.ForkLock.RUnlock()
|
|
if err != nil {
|
|
return syscall.InvalidHandle, os.NewSyscallError("socket", err)
|
|
}
|
|
diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go
|
|
index 815dfd6..d197380 100644
|
|
--- a/src/syscall/exec_windows.go
|
|
+++ b/src/syscall/exec_windows.go
|
|
@@ -14,7 +14,6 @@ import (
|
|
"unsafe"
|
|
)
|
|
|
|
-// ForkLock is not used on Windows.
|
|
var ForkLock sync.RWMutex
|
|
|
|
// EscapeArg rewrites command line argument s as prescribed
|
|
--
|
|
2.47.0
|
|
|