Skip to content

feat: traceroute (mtr) support for gVisor TUN and WireGuard tunnels #70

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
xdqi wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

feat: traceroute (mtr) support for gVisor TUN and WireGuard tunnels #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7de582c
Add MAC address include/exclude filtering for nftables auto-redirect
nekohasekai Mar 3, 2026
73f8bbd
Make gtcpip public for external use
nekohasekai Apr 2, 2026
ab5c895
Add compatibility with docker bridge
nekohasekai Apr 24, 2026
812b89e
Add read waiter support for gVisor conn
nekohasekai Apr 27, 2026
87904db
Add DNS mode
nekohasekai May 2, 2026
2da50cf
feat: ICMP error forwarding and ping TTL support
xdqi May 4, 2026
3e6c690
feat: UDP and TCP DirectRoute for traceroute
xdqi May 4, 2026
db6db1a
feat: DirectRoute wrapper and configurable TTL decrement
xdqi May 4, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.DS_Store
!/README.md
/*.md
*.patch
0 internal/gtcpip/README.md → gtcpip/README.md
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/checksum/checksum.go → gtcpip/checksum/checksum.go
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/checksum/checksum_default.go → gtcpip/checksum/checksum_default.go
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/checksum/checksum_ts.go → gtcpip/checksum/checksum_ts.go
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/checksum/checksum_unsafe.go → gtcpip/checksum/checksum_unsafe.go
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/errors.go → gtcpip/errors.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/gtcpip/header/checksum.go → gtcpip/header/checksum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"encoding/binary"
"fmt"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing-tun/gtcpip/checksum"
)

// PseudoHeaderChecksum calculates the pseudo-header checksum for the given
Expand Down
2 changes: 1 addition & 1 deletion internal/gtcpip/header/eth.go → gtcpip/header/eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package header
import (
"encoding/binary"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/gtcpip"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/gtcpip/header/icmpv4.go → gtcpip/header/icmpv4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package header
import (
"encoding/binary"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing-tun/gtcpip/checksum"
)

// ICMPv4 represents an ICMPv4 header stored in a byte array.
Expand Down
4 changes: 2 additions & 2 deletions internal/gtcpip/header/icmpv6.go → gtcpip/header/icmpv6.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package header
import (
"encoding/binary"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing-tun/gtcpip/checksum"
)

// ICMPv6 represents an ICMPv6 header stored in a byte array.
Expand Down
2 changes: 1 addition & 1 deletion internal/gtcpip/header/interfaces.go → gtcpip/header/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package header
import (
"net/netip"

tcpip "github.com/sagernet/sing-tun/internal/gtcpip"
tcpip "github.com/sagernet/sing-tun/gtcpip"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/gtcpip/header/ipv4.go → gtcpip/header/ipv4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"net/netip"
"time"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing-tun/gtcpip/checksum"
"github.com/sagernet/sing/common"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/gtcpip/header/ipv6.go → gtcpip/header/ipv6.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"net/netip"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/gtcpip"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...l/gtcpip/header/ipv6_extension_headers.go → gtcpip/header/ipv6_extension_headers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"math"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing/common"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/gtcpip/header/ipv6_fragment.go → gtcpip/header/ipv6_fragment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package header
import (
"encoding/binary"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/gtcpip"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/gtcpip/header/ndp_neighbor_advert.go → gtcpip/header/ndp_neighbor_advert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package header

import "github.com/sagernet/sing-tun/internal/gtcpip"
import "github.com/sagernet/sing-tun/gtcpip"

// NDPNeighborAdvert is an NDP Neighbor Advertisement message. It will
// only contain the body of an ICMPv6 packet.
Expand Down
2 changes: 1 addition & 1 deletion ...nal/gtcpip/header/ndp_neighbor_solicit.go → gtcpip/header/ndp_neighbor_solicit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package header

import "github.com/sagernet/sing-tun/internal/gtcpip"
import "github.com/sagernet/sing-tun/gtcpip"

// NDPNeighborSolicit is an NDP Neighbor Solicitation message. It will only
// contain the body of an ICMPv6 packet.
Expand Down
2 changes: 1 addition & 1 deletion internal/gtcpip/header/ndp_options.go → gtcpip/header/ndp_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"math"
"time"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing/common"
)

Expand Down
0 internal/gtcpip/header/ndp_router_advert.go → gtcpip/header/ndp_router_advert.go
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/header/ndp_router_solicit.go → gtcpip/header/ndp_router_solicit.go
View file
Open in desktop
File renamed without changes.
0 ...cpip/header/ndpoptionidentifier_string.go → gtcpip/header/ndpoptionidentifier_string.go
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/header/netip.go → gtcpip/header/netip.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions internal/gtcpip/header/tcp.go → gtcpip/header/tcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package header
import (
"encoding/binary"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
"github.com/sagernet/sing-tun/internal/gtcpip/seqnum"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing-tun/gtcpip/checksum"
"github.com/sagernet/sing-tun/gtcpip/seqnum"

"github.com/google/btree"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/gtcpip/header/udp.go → gtcpip/header/udp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"encoding/binary"
"math"

"github.com/sagernet/sing-tun/internal/gtcpip"
"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
"github.com/sagernet/sing-tun/gtcpip"
"github.com/sagernet/sing-tun/gtcpip/checksum"
)

const (
Expand Down
0 internal/gtcpip/seqnum/seqnum.go → gtcpip/seqnum/seqnum.go
View file
Open in desktop
File renamed without changes.
0 internal/gtcpip/tcpip.go → gtcpip/tcpip.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/checksum_test/sum_bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"crypto/rand"
"testing"

"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
"github.com/sagernet/sing-tun/gtcpip/checksum"
"github.com/sagernet/sing-tun/internal/tschecksum"
)

Expand Down
2 changes: 1 addition & 1 deletion nfqueue_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"sync/atomic"

"github.com/sagernet/sing-tun/internal/gtcpip/header"
"github.com/sagernet/sing-tun/gtcpip/header"
E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/logger"
M "github.com/sagernet/sing/common/metadata"
Expand Down
11 changes: 11 additions & 0 deletions ping/conn_interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package ping

import "net/netip"

type readMsgConn interface {
ReadMsg(b, oob []byte) (n, oobn int, addr netip.Addr, err error)
}

type ttlSetter interface {
SetTTL(ttl uint8)
}
Loading