Make gtcpip public for external use

nekohasekai · nekohasekai · commit 73f8bbda86a6 · 2026-04-20T09:20:56.000+08:00
diff --git a/gtcpip/README.md b/gtcpip/README.md
diff --git a/gtcpip/checksum/checksum.go b/gtcpip/checksum/checksum.go
diff --git a/gtcpip/checksum/checksum_default.go b/gtcpip/checksum/checksum_default.go
diff --git a/gtcpip/checksum/checksum_ts.go b/gtcpip/checksum/checksum_ts.go
diff --git a/gtcpip/checksum/checksum_unsafe.go b/gtcpip/checksum/checksum_unsafe.go
diff --git a/gtcpip/errors.go b/gtcpip/errors.go
diff --git a/gtcpip/header/checksum.go b/gtcpip/header/checksum.go
@@ -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
diff --git a/gtcpip/header/eth.go b/gtcpip/header/eth.go
@@ -17,7 +17,7 @@ package header
 import (
 	"encoding/binary"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip"
+	"github.com/sagernet/sing-tun/gtcpip"
 )
 
 const (
diff --git a/gtcpip/header/icmpv4.go b/gtcpip/header/icmpv4.go
@@ -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.
diff --git a/gtcpip/header/icmpv6.go b/gtcpip/header/icmpv6.go
@@ -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.
diff --git a/gtcpip/header/interfaces.go b/gtcpip/header/interfaces.go
@@ -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 (
diff --git a/gtcpip/header/ipv4.go b/gtcpip/header/ipv4.go
@@ -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"
 )
 
diff --git a/gtcpip/header/ipv6.go b/gtcpip/header/ipv6.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"net/netip"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip"
+	"github.com/sagernet/sing-tun/gtcpip"
 )
 
 const (
diff --git a/gtcpip/header/ipv6_extension_headers.go b/gtcpip/header/ipv6_extension_headers.go
@@ -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"
 )
 
diff --git a/gtcpip/header/ipv6_fragment.go b/gtcpip/header/ipv6_fragment.go
@@ -17,7 +17,7 @@ package header
 import (
 	"encoding/binary"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip"
+	"github.com/sagernet/sing-tun/gtcpip"
 )
 
 const (
diff --git a/gtcpip/header/ndp_neighbor_advert.go b/gtcpip/header/ndp_neighbor_advert.go
@@ -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.
diff --git a/gtcpip/header/ndp_neighbor_solicit.go b/gtcpip/header/ndp_neighbor_solicit.go
@@ -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.
diff --git a/gtcpip/header/ndp_options.go b/gtcpip/header/ndp_options.go
@@ -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"
 )
 
diff --git a/gtcpip/header/ndp_router_advert.go b/gtcpip/header/ndp_router_advert.go
diff --git a/gtcpip/header/ndp_router_solicit.go b/gtcpip/header/ndp_router_solicit.go
diff --git a/gtcpip/header/ndpoptionidentifier_string.go b/gtcpip/header/ndpoptionidentifier_string.go
diff --git a/gtcpip/header/netip.go b/gtcpip/header/netip.go
diff --git a/gtcpip/header/tcp.go b/gtcpip/header/tcp.go
@@ -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"
 )
diff --git a/gtcpip/header/udp.go b/gtcpip/header/udp.go
@@ -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 (
diff --git a/gtcpip/seqnum/seqnum.go b/gtcpip/seqnum/seqnum.go
diff --git a/gtcpip/tcpip.go b/gtcpip/tcpip.go
diff --git a/internal/checksum_test/sum_bench_test.go b/internal/checksum_test/sum_bench_test.go
@@ -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"
 )
 
diff --git a/nfqueue_linux.go b/nfqueue_linux.go
@@ -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"
diff --git a/ping/destination.go b/ping/destination.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/sagernet/sing-tun"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/control"
 	E "github.com/sagernet/sing/common/exceptions"
diff --git a/ping/destination_rewriter.go b/ping/destination_rewriter.go
@@ -4,7 +4,7 @@ import (
 	"net/netip"
 
 	"github.com/sagernet/sing-tun"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common/buf"
 )
 
diff --git a/ping/ping.go b/ping/ping.go
@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/control"
diff --git a/ping/ping_test.go b/ping/ping_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/sagernet/gvisor/pkg/rand"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing-tun/ping"
 	"github.com/sagernet/sing/common/buf"
 
diff --git a/ping/socket_linux_unprivileged.go b/ping/socket_linux_unprivileged.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/control"
diff --git a/ping/source_rewriter.go b/ping/source_rewriter.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/sagernet/sing-tun"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common/logger"
 )
 
diff --git a/redirect_nftables_rules.go b/redirect_nftables_rules.go
@@ -12,9 +12,8 @@ import (
 	"github.com/sagernet/nftables/expr"
 	"github.com/sagernet/nftables/userdata"
 	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/ranges"
-
 	E "github.com/sagernet/sing/common/exceptions"
+	"github.com/sagernet/sing/common/ranges"
 
 	"golang.org/x/exp/slices"
 	"golang.org/x/sys/unix"
diff --git a/redirect_route_linux.go b/redirect_route_linux.go
@@ -8,9 +8,9 @@ import (
 	"net/netip"
 
 	"github.com/sagernet/netlink"
-	E "github.com/sagernet/sing/common/exceptions"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/control"
+	E "github.com/sagernet/sing/common/exceptions"
 
 	"golang.org/x/sys/unix"
 )
diff --git a/stack_gvisor_tcp.go b/stack_gvisor_tcp.go
@@ -11,7 +11,7 @@ import (
 	"github.com/sagernet/gvisor/pkg/tcpip/header"
 	"github.com/sagernet/gvisor/pkg/tcpip/stack"
 	"github.com/sagernet/gvisor/pkg/tcpip/transport/tcp"
-	"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
+	"github.com/sagernet/sing-tun/gtcpip/checksum"
 	"github.com/sagernet/sing/common"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
diff --git a/stack_mixed.go b/stack_mixed.go
@@ -12,7 +12,7 @@ import (
 	"github.com/sagernet/gvisor/pkg/tcpip/link/channel"
 	"github.com/sagernet/gvisor/pkg/tcpip/stack"
 	"github.com/sagernet/gvisor/pkg/tcpip/transport/udp"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common/buf"
 	E "github.com/sagernet/sing/common/exceptions"
 )
diff --git a/stack_system.go b/stack_system.go
@@ -8,8 +8,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/checksum"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/control"
diff --git a/stack_system_packet.go b/stack_system_packet.go
@@ -4,7 +4,7 @@ import (
 	"net/netip"
 	"syscall"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common"
 )
 
diff --git a/tun_darwin.go b/tun_darwin.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing-tun/internal/rawfile_darwin"
 	"github.com/sagernet/sing-tun/internal/stopfd_darwin"
 	"github.com/sagernet/sing/common"
diff --git a/tun_linux.go b/tun_linux.go
@@ -14,8 +14,8 @@ import (
 	"unsafe"
 
 	"github.com/sagernet/netlink"
-	"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip/checksum"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/control"
 	E "github.com/sagernet/sing/common/exceptions"
diff --git a/tun_offload.go b/tun_offload.go
@@ -4,9 +4,9 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip"
-	"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip"
+	"github.com/sagernet/sing-tun/gtcpip/checksum"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 )
 
 const (
diff --git a/tun_offload_linux.go b/tun_offload_linux.go
@@ -13,9 +13,9 @@ import (
 	"io"
 	"unsafe"
 
-	"github.com/sagernet/sing-tun/internal/gtcpip"
-	"github.com/sagernet/sing-tun/internal/gtcpip/checksum"
-	"github.com/sagernet/sing-tun/internal/gtcpip/header"
+	"github.com/sagernet/sing-tun/gtcpip"
+	"github.com/sagernet/sing-tun/gtcpip/checksum"
+	"github.com/sagernet/sing-tun/gtcpip/header"
 
 	"golang.org/x/sys/unix"
 )

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ import (`
`20`	`20`	`"encoding/binary"`
`21`	`21`	`"fmt"`
`22`	`22`
`23`		`- "github.com/sagernet/sing-tun/internal/gtcpip"`
`24`		`- "github.com/sagernet/sing-tun/internal/gtcpip/checksum"`
	`23`	`+ "github.com/sagernet/sing-tun/gtcpip"`
	`24`	`+ "github.com/sagernet/sing-tun/gtcpip/checksum"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// PseudoHeaderChecksum calculates the pseudo-header checksum for the given`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package header`
`17`	`17`	`import (`
`18`	`18`	`"encoding/binary"`
`19`	`19`
`20`		`- "github.com/sagernet/sing-tun/internal/gtcpip"`
	`20`	`+ "github.com/sagernet/sing-tun/gtcpip"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ package header`
`17`	`17`	`import (`
`18`	`18`	`"encoding/binary"`
`19`	`19`
`20`		`- "github.com/sagernet/sing-tun/internal/gtcpip"`
`21`		`- "github.com/sagernet/sing-tun/internal/gtcpip/checksum"`
	`20`	`+ "github.com/sagernet/sing-tun/gtcpip"`
	`21`	`+ "github.com/sagernet/sing-tun/gtcpip/checksum"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// ICMPv4 represents an ICMPv4 header stored in a byte array.`