mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-22 05:42:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix: utsname needs to distinguish between arm and non-arm

Browse Source
This commit is contained in:
mzz2017
2023-03-08 16:52:32 +08:00
parent 1b5ef8a192
commit d0d731375a
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/ebpf_internal/utsname_int8.go Normal file
View File

@ -0,0 +1,18 @@
//go:build !(arm || arm64 || arm64be || armbe)
/*
* SPDX-License-Identifier: AGPL-3.0-only
* Copyright (c) 2023, v2rayA Organization <team@v2raya.org>
*/
package internal
// utsnameToString converts the utsname to a string and returns it.
func utsnameToString(unameArray [65]int8) string {
var byteString [65]byte
var indexLength int
for ; unameArray[indexLength] != 0; indexLength++ {
byteString[indexLength] = uint8(unameArray[indexLength])
}
return string(byteString[:indexLength])
}

18
pkg/ebpf_internal/utsname_uint8.go Normal file
View File

@ -0,0 +1,18 @@
//go:build arm || arm64 || arm64be || armbe
/*
* SPDX-License-Identifier: AGPL-3.0-only
* Copyright (c) 2023, v2rayA Organization <team@v2raya.org>
*/
package internal
// utsnameToString converts the utsname to a string and returns it.
func utsnameToString(unameArray [65]uint8) string {
var byteString [65]byte
var indexLength int
for ; unameArray[indexLength] != 0; indexLength++ {
byteString[indexLength] = unameArray[indexLength]
}
return string(byteString[:indexLength])
}

10
pkg/ebpf_internal/version.go
View File

@ -90,16 +90,6 @@ func (v Version) Kernel() uint32 {
return uint32(uint8(v[0]))<<16 | uint32(uint8(v[1]))<<8 | uint32(uint8(s))
}
// utsnameToString converts the utsname to a string and returns it.
func utsnameToString(unameArray [65]int8) string {
var byteString [65]byte
var indexLength int
for ; unameArray[indexLength] != 0; indexLength++ {
byteString[indexLength] = uint8(unameArray[indexLength])
}
return string(byteString[:indexLength])
}
// KernelVersion returns the version of the currently running kernel.
func KernelVersion() (Version, error) {
kernelVersion.once.Do(func() {