Skip to content

feat: add SetTunFd for TUN inbound support #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codewithtamim wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −0
Open

feat: add SetTunFd for TUN inbound support #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build/template/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ import "C"

func main() {}

//export CGoSetTunFd
func CGoSetTunFd(fd C.int) {
SetTunFd(int32(fd))
}

//export CGoInitDns
func CGoInitDns(base64Text *C.char) *C.char {
text := C.GoString(base64Text)
Expand Down
7 changes: 7 additions & 0 deletions xray/xray.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package xray
import (
"os"
"runtime/debug"
"strconv"

"github.com/xtls/libxray/memory"
"github.com/xtls/xray-core/common/cmdarg"
Expand Down Expand Up @@ -45,6 +46,12 @@ func StartXrayFromJSON(configJSON string) (*core.Instance, error) {
return server, nil
}

// SetTunFd sets the TUN file descriptor.
// Call this BEFORE RunXray/RunXrayFromJSON.
func SetTunFd(fd int32) {
os.Setenv("XRAY_TUN_FD", strconv.Itoa(int(fd)))
}

func InitEnv(datDir string, mphCachePath string) {
os.Setenv(platform.AssetLocation, datDir)
os.Setenv(platform.CertLocation, datDir)
Expand Down
6 changes: 6 additions & 0 deletions xray_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ import (
"github.com/xtls/libxray/xray"
)

// SetTunFd sets the TUN file descriptor.
// Call this BEFORE RunXray/RunXrayFromJSON.
func SetTunFd(fd int32) {
xray.SetTunFd(fd)
}

type CountGeoDataRequest struct {
DatDir string `json:"datDir,omitempty"`
Name string `json:"name,omitempty"`
Expand Down