From 00ec7e5ad916a08833327a4d36f168860e049b50 Mon Sep 17 00:00:00 2001 From: Toby Date: Sat, 19 Nov 2022 13:48:57 -0800 Subject: [PATCH] chore: move pktconns out of transport pkg --- cmd/client.go | 2 +- cmd/server.go | 2 +- pkg/core/client.go | 2 +- pkg/{transport => }/pktconns/faketcp/LICENSE | 0 pkg/{transport => }/pktconns/faketcp/obfs.go | 2 +- pkg/{transport => }/pktconns/faketcp/tcp_linux.go | 0 pkg/{transport => }/pktconns/faketcp/tcp_stub.go | 0 pkg/{transport => }/pktconns/faketcp/tcp_test.go | 0 pkg/{transport => }/pktconns/funcs.go | 8 ++++---- pkg/{transport => }/pktconns/obfs/obfs.go | 0 pkg/{transport => }/pktconns/obfs/obfs_test.go | 0 pkg/{transport => }/pktconns/udp/hop.go | 2 +- pkg/{transport => }/pktconns/udp/hop_test.go | 0 pkg/{transport => }/pktconns/udp/obfs.go | 2 +- pkg/{transport => }/pktconns/wechat/obfs.go | 2 +- 15 files changed, 11 insertions(+), 11 deletions(-) rename pkg/{transport => }/pktconns/faketcp/LICENSE (100%) rename pkg/{transport => }/pktconns/faketcp/obfs.go (97%) rename pkg/{transport => }/pktconns/faketcp/tcp_linux.go (100%) rename pkg/{transport => }/pktconns/faketcp/tcp_stub.go (100%) rename pkg/{transport => }/pktconns/faketcp/tcp_test.go (100%) rename pkg/{transport => }/pktconns/funcs.go (95%) rename pkg/{transport => }/pktconns/obfs/obfs.go (100%) rename pkg/{transport => }/pktconns/obfs/obfs_test.go (100%) rename pkg/{transport => }/pktconns/udp/hop.go (99%) rename pkg/{transport => }/pktconns/udp/hop_test.go (100%) rename pkg/{transport => }/pktconns/udp/obfs.go (97%) rename pkg/{transport => }/pktconns/wechat/obfs.go (97%) diff --git a/cmd/client.go b/cmd/client.go index 4504c94..9bfbac9 100644 --- a/cmd/client.go +++ b/cmd/client.go @@ -11,7 +11,7 @@ import ( "os" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns" + "github.com/apernet/hysteria/pkg/pktconns" "github.com/apernet/hysteria/pkg/pmtud" "github.com/apernet/hysteria/pkg/redirect" diff --git a/cmd/server.go b/cmd/server.go index 9b4401b..f69b829 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns" + "github.com/apernet/hysteria/pkg/pktconns" "github.com/apernet/hysteria/cmd/auth" "github.com/apernet/hysteria/pkg/acl" diff --git a/pkg/core/client.go b/pkg/core/client.go index ed51023..25415ed 100644 --- a/pkg/core/client.go +++ b/pkg/core/client.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns" + "github.com/apernet/hysteria/pkg/pktconns" "github.com/apernet/hysteria/pkg/congestion" diff --git a/pkg/transport/pktconns/faketcp/LICENSE b/pkg/pktconns/faketcp/LICENSE similarity index 100% rename from pkg/transport/pktconns/faketcp/LICENSE rename to pkg/pktconns/faketcp/LICENSE diff --git a/pkg/transport/pktconns/faketcp/obfs.go b/pkg/pktconns/faketcp/obfs.go similarity index 97% rename from pkg/transport/pktconns/faketcp/obfs.go rename to pkg/pktconns/faketcp/obfs.go index 28df79d..f8d89f9 100644 --- a/pkg/transport/pktconns/faketcp/obfs.go +++ b/pkg/pktconns/faketcp/obfs.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns/obfs" + "github.com/apernet/hysteria/pkg/pktconns/obfs" ) const udpBufferSize = 4096 diff --git a/pkg/transport/pktconns/faketcp/tcp_linux.go b/pkg/pktconns/faketcp/tcp_linux.go similarity index 100% rename from pkg/transport/pktconns/faketcp/tcp_linux.go rename to pkg/pktconns/faketcp/tcp_linux.go diff --git a/pkg/transport/pktconns/faketcp/tcp_stub.go b/pkg/pktconns/faketcp/tcp_stub.go similarity index 100% rename from pkg/transport/pktconns/faketcp/tcp_stub.go rename to pkg/pktconns/faketcp/tcp_stub.go diff --git a/pkg/transport/pktconns/faketcp/tcp_test.go b/pkg/pktconns/faketcp/tcp_test.go similarity index 100% rename from pkg/transport/pktconns/faketcp/tcp_test.go rename to pkg/pktconns/faketcp/tcp_test.go diff --git a/pkg/transport/pktconns/funcs.go b/pkg/pktconns/funcs.go similarity index 95% rename from pkg/transport/pktconns/funcs.go rename to pkg/pktconns/funcs.go index 6e3491f..23427c4 100644 --- a/pkg/transport/pktconns/funcs.go +++ b/pkg/pktconns/funcs.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns/faketcp" - "github.com/apernet/hysteria/pkg/transport/pktconns/obfs" - "github.com/apernet/hysteria/pkg/transport/pktconns/udp" - "github.com/apernet/hysteria/pkg/transport/pktconns/wechat" + "github.com/apernet/hysteria/pkg/pktconns/faketcp" + "github.com/apernet/hysteria/pkg/pktconns/obfs" + "github.com/apernet/hysteria/pkg/pktconns/udp" + "github.com/apernet/hysteria/pkg/pktconns/wechat" ) type ( diff --git a/pkg/transport/pktconns/obfs/obfs.go b/pkg/pktconns/obfs/obfs.go similarity index 100% rename from pkg/transport/pktconns/obfs/obfs.go rename to pkg/pktconns/obfs/obfs.go diff --git a/pkg/transport/pktconns/obfs/obfs_test.go b/pkg/pktconns/obfs/obfs_test.go similarity index 100% rename from pkg/transport/pktconns/obfs/obfs_test.go rename to pkg/pktconns/obfs/obfs_test.go diff --git a/pkg/transport/pktconns/udp/hop.go b/pkg/pktconns/udp/hop.go similarity index 99% rename from pkg/transport/pktconns/udp/hop.go rename to pkg/pktconns/udp/hop.go index ce46c61..259599d 100644 --- a/pkg/transport/pktconns/udp/hop.go +++ b/pkg/pktconns/udp/hop.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns/obfs" + "github.com/apernet/hysteria/pkg/pktconns/obfs" ) const ( diff --git a/pkg/transport/pktconns/udp/hop_test.go b/pkg/pktconns/udp/hop_test.go similarity index 100% rename from pkg/transport/pktconns/udp/hop_test.go rename to pkg/pktconns/udp/hop_test.go diff --git a/pkg/transport/pktconns/udp/obfs.go b/pkg/pktconns/udp/obfs.go similarity index 97% rename from pkg/transport/pktconns/udp/obfs.go rename to pkg/pktconns/udp/obfs.go index 64847c3..7aee8a9 100644 --- a/pkg/transport/pktconns/udp/obfs.go +++ b/pkg/pktconns/udp/obfs.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns/obfs" + "github.com/apernet/hysteria/pkg/pktconns/obfs" ) const udpBufferSize = 4096 diff --git a/pkg/transport/pktconns/wechat/obfs.go b/pkg/pktconns/wechat/obfs.go similarity index 97% rename from pkg/transport/pktconns/wechat/obfs.go rename to pkg/pktconns/wechat/obfs.go index 20bec2e..62a4d6b 100644 --- a/pkg/transport/pktconns/wechat/obfs.go +++ b/pkg/pktconns/wechat/obfs.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/apernet/hysteria/pkg/transport/pktconns/obfs" + "github.com/apernet/hysteria/pkg/pktconns/obfs" ) const udpBufferSize = 4096