lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 07:26:24 -05:00
Code Issues Releases Wiki Activity

Fix test break for windows: better error handling

Browse Source
This commit is contained in:
Shelikhoo 2019-06-06 22:14:50 +08:00
parent 7718b9629c
commit a32d6416e5
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/buf/readv_constraint_windows.go
View File

@ -9,16 +9,16 @@ func checkReadVConstraint(conn syscall.RawConn) (bool, error) {
var isSocketReady = false var isSocketReady = false
var reason error var reason error
/* /*
In Windows, WSARecv system call only support socket connection. In Windows, WSARecv system call only support socket connection.
It it required to check if the given fd is of a socket type It it required to check if the given fd is of a socket type
Fix https://github.com/v2ray/v2ray-core/issues/1666 Fix https://github.com/v2ray/v2ray-core/issues/1666
Additional Information: Additional Information:
https://docs.microsoft.com/en-us/windows/desktop/api/winsock2/nf-winsock2-wsarecv https://docs.microsoft.com/en-us/windows/desktop/api/winsock2/nf-winsock2-wsarecv
https://docs.microsoft.com/en-us/windows/desktop/api/winsock/nf-winsock-getsockopt https://docs.microsoft.com/en-us/windows/desktop/api/winsock/nf-winsock-getsockopt
https://docs.microsoft.com/en-us/windows/desktop/WinSock/sol-socket-socket-options https://docs.microsoft.com/en-us/windows/desktop/WinSock/sol-socket-socket-options
*/ */
err := conn.Control(func(fd uintptr) { err := conn.Control(func(fd uintptr) {
@ -33,5 +33,9 @@ func checkReadVConstraint(conn syscall.RawConn) (bool, error) {
reason = err reason = err
}) })
return isSocketReady, err if err != nil {
return false, err
}
return isSocketReady, reason
} }