Skip to content
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

Jump to bottom

Feature: set open FD offset for iOS #418

Merged
merged 4 commits into from
Oct 12, 2024
Merged

Feature: set open FD offset for iOS #418

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f55f367
set ios offset open_unix.go
hossinasaadi Oct 11, 2024
b126e96
improve condition
hossinasaadi Oct 12, 2024
03565b6
fix lint
hossinasaadi Oct 12, 2024
9a2b2d1
Update parse.go
xjasonlyu Oct 12, 2024
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
7 changes: 6 additions & 1 deletion core/device/fdbased/open_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@ package fdbased
import (
"fmt"
"os"
"runtime"

"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/xjasonlyu/tun2socks/v2/core/device/iobased"
)

func open(fd int, mtu uint32, offset int) (device.Device, error) {
f := &FD{fd: fd, mtu: mtu}

// fd offset in ios
// https://stackoverflow.com/questions/69260852/ios-network-extension-packet-parsing/69487795#69487795
if offset == 0 && runtime.GOOS == "ios" {
hossinasaadi marked this conversation as resolved.
Show resolved Hide resolved
offset = 4
}
ep, err := iobased.New(os.NewFile(uintptr(fd), f.Name()), mtu, offset)
if err != nil {
return nil, fmt.Errorf("create endpoint: %w", err)
Expand Down