Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-18 13:04:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix xray panic

Browse Source
This commit is contained in:
arm64v8a
2023-08-25 13:59:30 +09:00
parent 69c1d01773
commit a39dc4a610
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go/cmd/nekoray_core/instance.go
View File

@@ -3,7 +3,6 @@ package main
import ( import (
"log" "log"
"strings" "strings"
"unsafe"
core "github.com/xtls/xray-core/core" core "github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/stats" "github.com/xtls/xray-core/features/stats"
@@ -41,7 +40,7 @@ func NewNekoV2rayInstance(configStr string) (*NekoV2RayInstance, error) {
} }
func (i *NekoV2RayInstance) CorePtr() uintptr { func (i *NekoV2RayInstance) CorePtr() uintptr {
return uintptr(unsafe.Pointer(i.Instance)) return 0
} }
func (i *NekoV2RayInstance) Close() error { func (i *NekoV2RayInstance) Close() error {

2
libs/get_source_env.sh
View File

@@ -1,6 +1,6 @@
if [ ! -z $ENV_NEKORAY ]; then if [ ! -z $ENV_NEKORAY ]; then
export COMMIT_SING_BOX_EXTRA="3c5d4ae9b771f216bc0eeabdf19d840c77e29858" export COMMIT_SING_BOX_EXTRA="3c5d4ae9b771f216bc0eeabdf19d840c77e29858"
export COMMIT_MATSURI_XRAY="02b41a79b8053031ffa6a546ae0de08c553bf391" export COMMIT_MATSURI_XRAY="92a8a7f4650fd2e904cd273dee7f5e77271b29de"
fi fi
if [ ! -z $ENV_SING_BOX_EXTRA ]; then if [ ! -z $ENV_SING_BOX_EXTRA ]; then