rms/amnezia-tun2socks
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-tun2socks.git synced 2026-05-17 00:05:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Modifications for libxray (#2)

Browse Source 
* Rename module and move to awg
This commit is contained in:
albexk
2024-06-18 16:37:09 +03:00
committed by GitHub
parent 2b494a7517
commit 9fabebb17e
40 changed files with 120 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,5 +1,5 @@
BINARY := tun2socks
MODULE := github.com/xjasonlyu/tun2socks/v2
MODULE := github.com/amnezia-vpn/amnezia-tun2socks/v2
BUILD_DIR := build
BUILD_TAGS :=

2
core/device/fdbased/fd_unix.go
View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/tcpip/stack"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
)
const defaultMTU = 1500

2
core/device/fdbased/fd_windows.go
View File

@@ -3,7 +3,7 @@ package fdbased
import (
"errors"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
)
func Open(name string, mtu uint32) (device.Device, error) {

4
core/device/fdbased/open_linux.go
View File

@@ -1,5 +1,3 @@
//go:build (linux && amd64) || (linux && arm64)
package fdbased
import (
@@ -7,7 +5,7 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/link/fdbased"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
)
func open(fd int, mtu uint32) (device.Device, error) {

6
core/device/fdbased/open_others.go
View File

@@ -1,4 +1,4 @@
//go:build !(linux && amd64) && !(linux && arm64) && !windows
//go:build !linux && !windows
package fdbased
@@ -6,8 +6,8 @@ import (
"fmt"
"os"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/xjasonlyu/tun2socks/v2/core/device/iobased"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/iobased"
)
func open(fd int, mtu uint32) (device.Device, error) {

2
core/device/tun/tun.go
View File

@@ -2,7 +2,7 @@
package tun
import (
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
)
const Driver = "tun"

4
core/device/tun/tun_netstack.go
View File

@@ -1,4 +1,4 @@
//go:build (linux && amd64) || (linux && arm64)
//go:build linux
package tun
@@ -11,7 +11,7 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/link/tun"
"gvisor.dev/gvisor/pkg/tcpip/stack"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
)
type TUN struct {

8
core/device/tun/tun_wireguard.go
View File

@@ -1,4 +1,4 @@
//go:build !(linux && amd64) && !(linux && arm64)
//go:build !linux
package tun
@@ -6,10 +6,10 @@ import (
"fmt"
"sync"
"golang.zx2c4.com/wireguard/tun"
"github.com/amnezia-vpn/amneziawg-go/tun"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/xjasonlyu/tun2socks/v2/core/device/iobased"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/iobased"
)
type TUN struct {

2
core/device/tun/tun_wireguard_linux.go
View File

@@ -6,7 +6,7 @@ import (
"fmt"
"os"
"golang.zx2c4.com/wireguard/tun"
"github.com/amnezia-vpn/amneziawg-go/tun"
gun "gvisor.dev/gvisor/pkg/tcpip/link/tun"
)

2
core/device/tun/tun_wireguard_unix.go
View File

@@ -3,7 +3,7 @@
package tun
import (
"golang.zx2c4.com/wireguard/tun"
"github.com/amnezia-vpn/amneziawg-go/tun"
)
const (

2
core/device/tun/tun_wireguard_windows.go
View File

@@ -1,7 +1,7 @@
package tun
import (
"golang.zx2c4.com/wireguard/tun"
"github.com/amnezia-vpn/amneziawg-go/tun"
)
const (

2
core/nic.go
View File

@@ -6,7 +6,7 @@ import (
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/stack"
"github.com/xjasonlyu/tun2socks/v2/core/option"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option"
)
const (

2
core/route.go
View File

@@ -5,7 +5,7 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/header"
"gvisor.dev/gvisor/pkg/tcpip/stack"
"github.com/xjasonlyu/tun2socks/v2/core/option"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option"
)
func withRouteTable(nicID tcpip.NICID) option.Option {

4
core/stack.go
View File

@@ -9,8 +9,8 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
"gvisor.dev/gvisor/pkg/tcpip/transport/udp"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/xjasonlyu/tun2socks/v2/core/option"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option"
)
// Config is the configuration to create *stack.Stack.

4
core/tcp.go
View File

@@ -11,8 +11,8 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
"gvisor.dev/gvisor/pkg/waiter"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/xjasonlyu/tun2socks/v2/core/option"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option"
)
const (

4
core/udp.go
View File

@@ -7,8 +7,8 @@ import (
"gvisor.dev/gvisor/pkg/tcpip/transport/udp"
"gvisor.dev/gvisor/pkg/waiter"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/xjasonlyu/tun2socks/v2/core/option"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option"
)
func withUDPHandler(handle func(adapter.UDPConn)) option.Option {

2
dns/resolver.go
View File

@@ -3,7 +3,7 @@ package dns
import (
"net"
"github.com/xjasonlyu/tun2socks/v2/dialer"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer"
)
func init() {

26
engine/engine.go
View File

@@ -12,15 +12,15 @@ import (
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/stack"
"github.com/xjasonlyu/tun2socks/v2/core"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/xjasonlyu/tun2socks/v2/core/option"
"github.com/xjasonlyu/tun2socks/v2/dialer"
"github.com/xjasonlyu/tun2socks/v2/engine/mirror"
"github.com/xjasonlyu/tun2socks/v2/log"
"github.com/xjasonlyu/tun2socks/v2/proxy"
"github.com/xjasonlyu/tun2socks/v2/restapi"
"github.com/xjasonlyu/tun2socks/v2/tunnel"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/option"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/engine/mirror"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/log"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/restapi"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel"
)
var (
@@ -60,6 +60,14 @@ func Insert(k *Key) {
_engineMu.Unlock()
}
func StartTun2Socks() error {
return start()
}
func StopTun2Socks() error {
return stop()
}
func start() error {
_engineMu.Lock()
if _defaultKey == nil {

4
engine/mirror/tunnel.go
View File

@@ -1,8 +1,8 @@
package mirror
import (
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/xjasonlyu/tun2socks/v2/tunnel"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel"
)
var _ adapter.TransportHandler = (*Tunnel)(nil)

10
engine/parse.go
View File

@@ -7,11 +7,11 @@ import (
"net/url"
"strings"
"github.com/xjasonlyu/tun2socks/v2/core/device"
"github.com/xjasonlyu/tun2socks/v2/core/device/fdbased"
"github.com/xjasonlyu/tun2socks/v2/core/device/tun"
"github.com/xjasonlyu/tun2socks/v2/proxy"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/fdbased"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/device/tun"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
)
func parseRestAPI(s string) (*url.URL, error) {

14
go.mod
View File

@@ -1,9 +1,10 @@
module github.com/xjasonlyu/tun2socks/v2
module github.com/amnezia-vpn/amnezia-tun2socks/v2
go 1.20
go 1.22.3
require (
github.com/Dreamacro/go-shadowsocks2 v0.1.8
github.com/amnezia-vpn/amneziawg-go v0.2.11
github.com/docker/go-units v0.5.0
github.com/go-chi/chi/v5 v5.0.8
github.com/go-chi/cors v1.2.1
@@ -14,11 +15,10 @@ require (
github.com/stretchr/testify v1.7.1
go.uber.org/atomic v1.11.0
go.uber.org/automaxprocs v1.5.2
golang.org/x/sys v0.8.0
golang.org/x/sys v0.18.0
golang.org/x/time v0.3.0
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b
gopkg.in/yaml.v3 v3.0.1
gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259
)
require (
@@ -27,7 +27,7 @@ require (
github.com/google/btree v1.1.2 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
)

23
go.sum
View File

@@ -2,6 +2,8 @@ github.com/Dreamacro/go-shadowsocks2 v0.1.8 h1:Ixejp5JscEc866gAvm/l6TFd7BOBvDviK
github.com/Dreamacro/go-shadowsocks2 v0.1.8/go.mod h1:51y4Q6tJoCE7e8TmYXcQRqfoxPfE9Cvn79V6pB6Df7Y=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/amnezia-vpn/amneziawg-go v0.2.11 h1:JNGsxX4NIaYC/PpbUdwk23534HgS2SRMPgru6/K+364=
github.com/amnezia-vpn/amneziawg-go v0.2.11/go.mod h1:d7WpNfzCRLy7ufGElJBYpD58WRmNjyLyt3IDHPY8AmM=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -21,11 +23,13 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -36,23 +40,22 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME=
go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b h1:J1CaxgLerRR5lgx3wnr6L04cJFbWoceSK9JWBdglINo=
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b/go.mod h1:tqur9LnfstdR9ep2LaJT4lFUl0EjlHtge+gAjmsHUG4=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33 h1:64QentohifmKGeTgJCHilDgfmQVuYE45fsaS9psJ3zY=
gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33/go.mod h1:sQuqOkxbfJq/GS2uSnqHphtXclHyk/ZrAGhZBxxsq6g=
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 h1:TbRPT0HtzFP3Cno1zZo7yPzEEnfu8EjLfl6IU9VfqkQ=
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259/go.mod h1:AVgIgHMwK63XvmAzWG9vLQ41YnVHN0du0tEC46fI7yY=

2
log/event.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"time"
"github.com/xjasonlyu/tun2socks/v2/common/observable"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/common/observable"
)
var (

8
main.go
View File

@@ -10,10 +10,10 @@ import (
"go.uber.org/automaxprocs/maxprocs"
"gopkg.in/yaml.v3"
_ "github.com/xjasonlyu/tun2socks/v2/dns"
"github.com/xjasonlyu/tun2socks/v2/engine"
"github.com/xjasonlyu/tun2socks/v2/internal/version"
"github.com/xjasonlyu/tun2socks/v2/log"
_ "github.com/amnezia-vpn/amnezia-tun2socks/v2/dns"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/engine"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/log"
)
var (

4
proxy/base.go
View File

@@ -5,8 +5,8 @@ import (
"errors"
"net"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
)
var _ Proxy = (*Base)(nil)

6
proxy/direct.go
View File

@@ -4,9 +4,9 @@ import (
"context"
"net"
"github.com/xjasonlyu/tun2socks/v2/dialer"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
)
var _ Proxy = (*Direct)(nil)

6
proxy/http.go
View File

@@ -11,9 +11,9 @@ import (
"net/http"
"net/url"
"github.com/xjasonlyu/tun2socks/v2/dialer"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
)
type HTTP struct {

4
proxy/proxy.go
View File

@@ -6,8 +6,8 @@ import (
"net"
"time"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
)
const (

4
proxy/reject.go
View File

@@ -6,8 +6,8 @@ import (
"net"
"time"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
)
var _ Proxy = (*Reject)(nil)

10
proxy/shadowsocks.go
View File

@@ -8,11 +8,11 @@ import (
"github.com/Dreamacro/go-shadowsocks2/core"
"github.com/xjasonlyu/tun2socks/v2/dialer"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
obfs "github.com/xjasonlyu/tun2socks/v2/transport/simple-obfs"
"github.com/xjasonlyu/tun2socks/v2/transport/socks5"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
obfs "github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/simple-obfs"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/socks5"
)
var _ Proxy = (*Shadowsocks)(nil)

8
proxy/socks4.go
View File

@@ -5,10 +5,10 @@ import (
"fmt"
"net"
"github.com/xjasonlyu/tun2socks/v2/dialer"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
"github.com/xjasonlyu/tun2socks/v2/transport/socks4"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/socks4"
)
var _ Proxy = (*Socks4)(nil)

8
proxy/socks5.go
View File

@@ -7,10 +7,10 @@ import (
"io"
"net"
"github.com/xjasonlyu/tun2socks/v2/dialer"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy/proto"
"github.com/xjasonlyu/tun2socks/v2/transport/socks5"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/dialer"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy/proto"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/transport/socks5"
)
var _ Proxy = (*Socks5)(nil)

2
restapi/connections.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/go-chi/render"
"github.com/gorilla/websocket"
"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic"
)
const defaultInterval = 1000

6
restapi/server.go
View File

@@ -13,9 +13,9 @@ import (
"github.com/go-chi/render"
"github.com/gorilla/websocket"
V "github.com/xjasonlyu/tun2socks/v2/internal/version"
"github.com/xjasonlyu/tun2socks/v2/log"
"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"
V "github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/log"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic"
)
var (

2
transport/simple-obfs/http.go
View File

@@ -10,7 +10,7 @@ import (
"net"
"net/http"
"github.com/xjasonlyu/tun2socks/v2/common/pool"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool"
)
// HTTPObfs is shadowsocks http simple-obfs implementation

2
transport/simple-obfs/tls.go
View File

@@ -8,7 +8,7 @@ import (
"net"
"time"
"github.com/xjasonlyu/tun2socks/v2/common/pool"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool"
)
const (

2
tunnel/statistic/tracker.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/google/uuid"
"go.uber.org/atomic"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
)
type tracker interface {

12
tunnel/tcp.go
View File

@@ -6,12 +6,12 @@ import (
"sync"
"time"
"github.com/xjasonlyu/tun2socks/v2/common/pool"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/xjasonlyu/tun2socks/v2/log"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy"
"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/log"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic"
)
const (

2
tunnel/tunnel.go
View File

@@ -1,7 +1,7 @@
package tunnel
import (
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter"
)
// Unbuffered TCP/UDP queues.

12
tunnel/udp.go
View File

@@ -6,12 +6,12 @@ import (
"sync"
"time"
"github.com/xjasonlyu/tun2socks/v2/common/pool"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"github.com/xjasonlyu/tun2socks/v2/log"
M "github.com/xjasonlyu/tun2socks/v2/metadata"
"github.com/xjasonlyu/tun2socks/v2/proxy"
"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/common/pool"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/core/adapter"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/log"
M "github.com/amnezia-vpn/amnezia-tun2socks/v2/metadata"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/proxy"
"github.com/amnezia-vpn/amnezia-tun2socks/v2/tunnel/statistic"
)
// _udpSessionTimeout is the default timeout for each UDP session.