mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 04:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: timeval in different arch

Browse source 
Signed-off-by: HystericalDragon <HystericalDragons@proton.me>
This commit is contained in:
HystericalDragon 2024-04-05 09:11:37 +08:00
parent 13586df2ba
commit 9520d84094
No known key found for this signature in database
GPG key ID: E205724F8931D99B
3 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/internal/sockopts/sockopts_linux.go
View file

@ -58,11 +58,7 @@ func fdControlUnixSocketImpl(c *net.UDPConn, path string) error {
}
defer unix.Close(socketFd)
timeoutUsec := fdControlUnixTimeout.Microseconds()
timeout := unix.Timeval{
Sec: timeoutUsec / 1e6,
Usec: timeoutUsec % 1e6,
}
timeout := unixTimeval()
_ = unix.SetsockoptTimeval(socketFd, unix.SOL_SOCKET, unix.SO_RCVTIMEO, &timeout)
_ = unix.SetsockoptTimeval(socketFd, unix.SOL_SOCKET, unix.SO_SNDTIMEO, &timeout)

15
app/internal/sockopts/timeval_linux_32.go Normal file
View file

@ -0,0 +1,15 @@
//go:build linux && (386 || arm || mips || mipsle || ppc)
package sockopts
import (
"golang.org/x/sys/unix"
)
func unixTimeval() unix.Timeval {
timeUsec := fdControlUnixTimeout.Microseconds()
return unix.Timeval{
Sec: int32(timeUsec / 1e6),
Usec: int32(timeUsec % 1e6),
}
}

15
app/internal/sockopts/timeval_linux_64.go Normal file
View file

@ -0,0 +1,15 @@
//go:build linux && (amd64 || arm64 || loong64 || mips64 || mips64le || ppc64 || ppc64le || riscv64 || s390x || sparc64)
package sockopts
import (
"golang.org/x/sys/unix"
)
func unixTimeval() unix.Timeval {
timeUsec := fdControlUnixTimeout.Microseconds()
return unix.Timeval{
Sec: timeUsec / 1e6,
Usec: timeUsec % 1e6,
}
}