From 07a86f549bdefbc30fe6651d91d99c5579d80f33 Mon Sep 17 00:00:00 2001 From: v2ray Date: Sat, 20 Aug 2016 20:55:45 +0200 Subject: [PATCH] unified import path --- .travis.yml | 6 ++- .vscode/tasks.json | 4 +- README.md | 8 ++-- app/api/api.go | 2 +- app/api/config.go | 2 +- app/dispatcher/dispatcher.go | 6 +-- app/dispatcher/impl/default.go | 16 ++++---- app/dispatcher/testing/dispatcher.go | 6 +-- app/dns/config.go | 2 +- app/dns/config_json.go | 2 +- app/dns/config_json_test.go | 6 +-- app/dns/dns.go | 2 +- app/dns/nameserver.go | 14 +++---- app/dns/server.go | 6 +-- app/dns/server_test.go | 20 +++++----- app/proxyman/proxyman.go | 4 +- app/router/config_cache.go | 2 +- app/router/config_json.go | 2 +- app/router/router.go | 8 ++-- app/router/rules/chinaip_gen.go | 4 +- app/router/rules/chinaip_init.go | 2 +- app/router/rules/chinaip_json.go | 2 +- app/router/rules/chinaip_json_test.go | 4 +- app/router/rules/chinaip_test.go | 6 +-- app/router/rules/chinasites_json.go | 2 +- app/router/rules/chinasites_json_test.go | 4 +- app/router/rules/chinasites_test.go | 6 +-- app/router/rules/condition.go | 2 +- app/router/rules/config.go | 2 +- app/router/rules/config_json.go | 8 ++-- app/router/rules/config_json_test.go | 6 +-- app/router/rules/router.go | 10 ++--- app/router/rules/router_test.go | 18 ++++----- app/space.go | 2 +- common/alloc/buffer.go | 2 +- common/alloc/buffer_test.go | 4 +- common/collect/string_list_json_test.go | 4 +- common/crypto/benchmark_test.go | 2 +- common/crypto/chacha20.go | 2 +- common/crypto/chacha20_test.go | 4 +- common/crypto/io.go | 2 +- common/io/buffered_reader.go | 2 +- common/io/buffered_reader_test.go | 6 +-- common/io/buffered_writer.go | 2 +- common/io/buffered_writer_test.go | 6 +-- common/io/chain_writer.go | 2 +- common/io/chan_reader.go | 2 +- common/io/reader.go | 4 +- common/io/reader_test.go | 6 +-- common/io/transport.go | 2 +- common/io/writer.go | 4 +- common/io/writer_test.go | 6 +-- common/loader/json_conf.go | 4 +- common/loader/loader.go | 2 +- common/log/access.go | 2 +- common/log/internal/log_entry.go | 4 +- common/log/internal/log_entry_test.go | 4 +- common/log/internal/log_writer.go | 4 +- common/log/log.go | 2 +- common/net/address.go | 4 +- common/net/address_json_test.go | 4 +- common/net/address_test.go | 4 +- common/net/destination_test.go | 4 +- common/net/ipnet_test.go | 4 +- common/net/network.go | 2 +- common/net/network_json.go | 2 +- common/net/network_json_test.go | 4 +- common/net/port.go | 2 +- common/net/port_json.go | 2 +- common/net/port_json_test.go | 4 +- common/net/port_test.go | 4 +- common/net/timed_io_test.go | 4 +- common/protocol/headers.go | 4 +- common/protocol/headers_test.go | 4 +- common/protocol/id.go | 2 +- common/protocol/id_test.go | 8 ++-- common/protocol/server_picker_test.go | 6 +-- common/protocol/server_spec.go | 4 +- common/protocol/server_spec_test.go | 6 +-- common/protocol/time.go | 4 +- common/protocol/time_test.go | 4 +- common/protocol/user_json_test.go | 4 +- common/protocol/user_validator.go | 2 +- common/retry/retry_test.go | 4 +- common/uuid/uuid_test.go | 4 +- common/web/service.go | 2 +- core.go | 2 +- proxy/blackhole/blackhole.go | 14 +++---- proxy/blackhole/config.go | 4 +- proxy/blackhole/config_json.go | 4 +- proxy/blackhole/config_json_test.go | 4 +- proxy/blackhole/config_test.go | 8 ++-- proxy/dokodemo/config.go | 2 +- proxy/dokodemo/config_json.go | 4 +- proxy/dokodemo/dokodemo.go | 20 +++++----- proxy/dokodemo/dokodemo_test.go | 26 ++++++------- proxy/dokodemo/sockopt_linux.go | 6 +-- proxy/dokodemo/sockopt_other.go | 4 +- proxy/freedom/config_json.go | 2 +- proxy/freedom/freedom.go | 26 ++++++------- proxy/freedom/freedom_test.go | 30 +++++++-------- proxy/http/config_json.go | 2 +- proxy/http/server.go | 20 +++++----- proxy/http/server_test.go | 16 ++++---- proxy/proxy.go | 10 ++--- proxy/registry/config_cache.go | 2 +- proxy/registry/config_cache_json.go | 2 +- proxy/registry/creator.go | 6 +-- proxy/registry/handler_cache.go | 8 ++-- proxy/shadowsocks/config.go | 4 +- proxy/shadowsocks/config_json.go | 8 ++-- proxy/shadowsocks/config_json_test.go | 2 +- proxy/shadowsocks/ota.go | 8 ++-- proxy/shadowsocks/ota_test.go | 6 +-- proxy/shadowsocks/protocol.go | 10 ++--- proxy/shadowsocks/protocol_test.go | 12 +++--- proxy/shadowsocks/server.go | 26 ++++++------- proxy/socks/account.go | 2 +- proxy/socks/client_config.go | 2 +- proxy/socks/client_config_json.go | 6 +-- proxy/socks/protocol/socks.go | 10 ++--- proxy/socks/protocol/socks4.go | 2 +- proxy/socks/protocol/socks4_test.go | 6 +-- proxy/socks/protocol/socks_test.go | 10 ++--- proxy/socks/protocol/udp.go | 8 ++-- proxy/socks/protocol/udp_test.go | 6 +-- proxy/socks/server.go | 20 +++++----- proxy/socks/server_config.go | 2 +- proxy/socks/server_config_json.go | 8 ++-- proxy/socks/server_config_json_test.go | 6 +-- proxy/socks/server_udp.go | 12 +++--- proxy/testing/mocks/inboundhandler.go | 8 ++-- proxy/testing/mocks/outboundhandler.go | 12 +++--- proxy/testing/proxy.go | 4 +- proxy/vmess/account_json.go | 6 +-- proxy/vmess/encoding/client.go | 12 +++--- proxy/vmess/encoding/commands.go | 12 +++--- proxy/vmess/encoding/commands_test.go | 10 ++--- proxy/vmess/encoding/encoding_test.go | 14 +++---- proxy/vmess/encoding/server.go | 14 +++---- proxy/vmess/inbound/command.go | 6 +-- proxy/vmess/inbound/config.go | 2 +- proxy/vmess/inbound/config_json.go | 6 +-- proxy/vmess/inbound/inbound.go | 32 ++++++++-------- proxy/vmess/io/io_test.go | 8 ++-- proxy/vmess/io/reader.go | 6 +-- proxy/vmess/io/writer.go | 4 +- proxy/vmess/outbound/command.go | 6 +-- proxy/vmess/outbound/config.go | 2 +- proxy/vmess/outbound/config_json.go | 14 +++---- proxy/vmess/outbound/config_json_test.go | 6 +-- proxy/vmess/outbound/outbound.go | 26 ++++++------- proxy/vmess/vmess.go | 6 +-- release/install-release.sh | 4 +- release/install.sh | 4 +- shell/point/config.go | 14 +++---- shell/point/config_json.go | 14 +++---- shell/point/config_json_test.go | 6 +-- shell/point/inbound_detour.go | 2 +- shell/point/inbound_detour_always.go | 12 +++--- shell/point/inbound_detour_dynamic.go | 14 +++---- shell/point/main/main.go | 38 +++++++++---------- shell/point/point.go | 24 ++++++------ testing/assert/address.go | 2 +- testing/assert/byte.go | 2 +- testing/assert/bytes.go | 2 +- testing/assert/destination.go | 2 +- testing/assert/int64.go | 2 +- testing/assert/intsubject.go | 2 +- testing/assert/pointer.go | 2 +- testing/assert/port.go | 2 +- testing/assert/uint16.go | 2 +- testing/assert/uint32.go | 2 +- testing/coverage/coverall | 2 +- testing/scenarios/dokodemo_test.go | 6 +-- testing/scenarios/dynamic_vmess_test.go | 6 +-- testing/scenarios/http_test.go | 6 +-- testing/scenarios/router_test.go | 6 +-- testing/scenarios/server_env.go | 20 +++++----- testing/scenarios/server_env_coverage.go | 4 +- testing/scenarios/shadowsocks_test.go | 6 +-- testing/scenarios/socks5_helper.go | 2 +- testing/scenarios/socks_end_test.go | 8 ++-- testing/servers/http/http.go | 2 +- testing/servers/tcp/tcp.go | 2 +- testing/servers/udp/udp.go | 2 +- tools/build/build.go | 2 +- tools/build/build_test.go | 2 +- tools/build/env_test.go | 2 +- tools/build/go.go | 4 +- tools/build/go_test.go | 2 +- tools/docker/Dockerfile | 4 +- tools/docker/gen-server-cfg.sh | 2 +- tools/git/git_test.go | 2 +- tools/release/make-release.sh | 2 +- tools/release/release-ci.sh | 2 +- transport/config.go | 6 +-- transport/config_json.go | 6 +-- transport/internet/authenticator.go | 6 +-- transport/internet/authenticator_json.go | 2 +- transport/internet/authenticator_test.go | 10 ++--- .../internet/authenticators/noop/noop.go | 4 +- .../internet/authenticators/srtp/srtp.go | 4 +- .../internet/authenticators/srtp/srtp_test.go | 6 +-- transport/internet/authenticators/utp/utp.go | 4 +- .../internet/authenticators/utp/utp_test.go | 6 +-- transport/internet/connection_json.go | 2 +- transport/internet/dialer.go | 4 +- transport/internet/dialer_test.go | 8 ++-- transport/internet/kcp/buffer.go | 2 +- transport/internet/kcp/buffer_test.go | 4 +- transport/internet/kcp/config.go | 2 +- transport/internet/kcp/config_json.go | 6 +-- transport/internet/kcp/connection.go | 6 +-- transport/internet/kcp/connection_test.go | 10 ++--- transport/internet/kcp/crypt.go | 6 +-- transport/internet/kcp/crypt_test.go | 6 +-- transport/internet/kcp/dialer.go | 8 ++-- transport/internet/kcp/kcp_test.go | 6 +-- transport/internet/kcp/listener.go | 14 +++---- transport/internet/kcp/output.go | 6 +-- transport/internet/kcp/receiving.go | 2 +- transport/internet/kcp/receiving_test.go | 6 +-- transport/internet/kcp/segment.go | 8 ++-- transport/internet/kcp/segment_test.go | 6 +-- transport/internet/kcp/sending.go | 2 +- transport/internet/kcp/sending_test.go | 6 +-- transport/internet/system_dialer.go | 2 +- transport/internet/tcp/connection.go | 2 +- transport/internet/tcp/connection_cache.go | 2 +- transport/internet/tcp/connection_test.go | 4 +- transport/internet/tcp/dialer.go | 6 +-- transport/internet/tcp/hub.go | 4 +- transport/internet/tcp_hub.go | 6 +-- transport/internet/udp/connection.go | 4 +- transport/internet/udp/hub.go | 10 ++--- transport/internet/udp/hub_linux.go | 2 +- transport/internet/udp/hub_linux_test.go | 12 +++--- transport/internet/udp/hub_other.go | 2 +- transport/internet/udp/udp_server.go | 12 +++--- transport/internet/ws/connection_cache.go | 4 +- transport/internet/ws/dialer.go | 6 +-- transport/internet/ws/hub.go | 6 +-- transport/internet/ws/ws.go | 2 +- transport/internet/ws/ws_test.go | 6 +-- transport/internet/ws/wsconn.go | 2 +- transport/ray/direct.go | 2 +- transport/ray/ray.go | 2 +- 248 files changed, 759 insertions(+), 757 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01842466..6603205c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,14 @@ language: go go: - 1.7 +go_import_path: v2ray.com/core + git: depth: 5 script: - - go test -tags json github.com/v2ray/v2ray-core/... - + - go test -tags json v2ray.com/core/... + after_success: - ./testing/coverage/coverall diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 34ac4010..9eaf9e81 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ "tasks": [ { "taskName": "build", - "args": ["-tags", "json", "github.com/v2ray/v2ray-core/..."], + "args": ["-tags", "json", "v2ray.com/core/..."], "isBuildCommand": true, "problemMatcher": { "owner": "go", @@ -21,7 +21,7 @@ }, { "taskName": "test", - "args": ["-tags", "json", "github.com/v2ray/v2ray-core/..."], + "args": ["-tags", "json", "v2ray.com/core/..."], "isBuildCommand": false } ] diff --git a/README.md b/README.md index 871cbd88..166305b2 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ [2]: https://travis-ci.org/v2ray/v2ray-core "Travis-CI Build Status" [3]: https://codecov.io/github/v2ray/v2ray-core/coverage.svg?branch=master "Coverage badge" [4]: https://codecov.io/github/v2ray/v2ray-core?branch=master "Codecov Status" -[5]: https://goreportcard.com/badge/github.com/v2ray/v2ray-core "Go Report badge" -[6]: https://goreportcard.com/report/github.com/v2ray/v2ray-core "Go Report" -[7]: https://godoc.org/github.com/v2ray/v2ray-core?status.svg "GoDoc badge" -[8]: https://godoc.org/github.com/v2ray/v2ray-core "GoDoc" +[5]: https://goreportcard.com/badge/v2ray.com/core "Go Report badge" +[6]: https://goreportcard.com/report/v2ray.com/core "Go Report" +[7]: https://godoc.org/v2ray.com/core?status.svg "GoDoc badge" +[8]: https://godoc.org/v2ray.com/core "GoDoc" [9]: https://codebeat.co/badges/f2354ca8-3e24-463d-a2e3-159af73b2477 "Codebeat badge" [10]: https://codebeat.co/projects/github-com-v2ray-v2ray-core "Codebeat" diff --git a/app/api/api.go b/app/api/api.go index f8e54727..6243c94f 100644 --- a/app/api/api.go +++ b/app/api/api.go @@ -1,7 +1,7 @@ package api import ( - "github.com/v2ray/v2ray-core/app" + "v2ray.com/core/app" ) const ( diff --git a/app/api/config.go b/app/api/config.go index 8c5fe81c..024416e3 100644 --- a/app/api/config.go +++ b/app/api/config.go @@ -1,7 +1,7 @@ package api import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Config struct { diff --git a/app/dispatcher/dispatcher.go b/app/dispatcher/dispatcher.go index 7af4c2f4..4cea8b6a 100644 --- a/app/dispatcher/dispatcher.go +++ b/app/dispatcher/dispatcher.go @@ -1,9 +1,9 @@ package dispatcher import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/ray" ) const ( diff --git a/app/dispatcher/impl/default.go b/app/dispatcher/impl/default.go index 5d601b20..75ef0396 100644 --- a/app/dispatcher/impl/default.go +++ b/app/dispatcher/impl/default.go @@ -1,14 +1,14 @@ package impl import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/proxyman" - "github.com/v2ray/v2ray-core/app/router" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/app/proxyman" + "v2ray.com/core/app/router" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/ray" ) type DefaultDispatcher struct { diff --git a/app/dispatcher/testing/dispatcher.go b/app/dispatcher/testing/dispatcher.go index 7ff42da7..b4035bf5 100644 --- a/app/dispatcher/testing/dispatcher.go +++ b/app/dispatcher/testing/dispatcher.go @@ -1,9 +1,9 @@ package testing import ( - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/ray" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/ray" ) type TestPacketDispatcher struct { diff --git a/app/dns/config.go b/app/dns/config.go index 3ba4ba32..29304169 100644 --- a/app/dns/config.go +++ b/app/dns/config.go @@ -3,7 +3,7 @@ package dns import ( "net" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Config struct { diff --git a/app/dns/config_json.go b/app/dns/config_json.go index d1f6528f..a84ce4ad 100644 --- a/app/dns/config_json.go +++ b/app/dns/config_json.go @@ -7,7 +7,7 @@ import ( "errors" "net" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/app/dns/config_json_test.go b/app/dns/config_json_test.go index 49e4b670..ed250711 100644 --- a/app/dns/config_json_test.go +++ b/app/dns/config_json_test.go @@ -6,9 +6,9 @@ import ( "encoding/json" "testing" - . "github.com/v2ray/v2ray-core/app/dns" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/app/dns" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestConfigParsing(t *testing.T) { diff --git a/app/dns/dns.go b/app/dns/dns.go index 9caaefd9..b84ae1d3 100644 --- a/app/dns/dns.go +++ b/app/dns/dns.go @@ -3,7 +3,7 @@ package dns import ( "net" - "github.com/v2ray/v2ray-core/app" + "v2ray.com/core/app" ) const ( diff --git a/app/dns/nameserver.go b/app/dns/nameserver.go index 9fbe2c8b..216fd8e7 100644 --- a/app/dns/nameserver.go +++ b/app/dns/nameserver.go @@ -5,13 +5,13 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/app/dispatcher" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/dice" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/internet/udp" + "v2ray.com/core/app/dispatcher" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/dice" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/internet/udp" "github.com/miekg/dns" ) diff --git a/app/dns/server.go b/app/dns/server.go index 1398d311..4bc4bd78 100644 --- a/app/dns/server.go +++ b/app/dns/server.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + "v2ray.com/core/common/log" "github.com/miekg/dns" ) diff --git a/app/dns/server_test.go b/app/dns/server_test.go index 19570f04..bf3b5252 100644 --- a/app/dns/server_test.go +++ b/app/dns/server_test.go @@ -4,16 +4,16 @@ import ( "net" "testing" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl" - . "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/app/proxyman" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/freedom" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + dispatchers "v2ray.com/core/app/dispatcher/impl" + . "v2ray.com/core/app/dns" + "v2ray.com/core/app/proxyman" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/freedom" + "v2ray.com/core/testing/assert" + "v2ray.com/core/transport/internet" ) func TestDnsAdd(t *testing.T) { diff --git a/app/proxyman/proxyman.go b/app/proxyman/proxyman.go index 63dca63a..28e6fead 100644 --- a/app/proxyman/proxyman.go +++ b/app/proxyman/proxyman.go @@ -3,8 +3,8 @@ package proxyman import ( "sync" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/proxy" + "v2ray.com/core/app" + "v2ray.com/core/proxy" ) const ( diff --git a/app/router/config_cache.go b/app/router/config_cache.go index 108c1635..ff309063 100644 --- a/app/router/config_cache.go +++ b/app/router/config_cache.go @@ -1,7 +1,7 @@ package router import ( - "github.com/v2ray/v2ray-core/common" + "v2ray.com/core/common" ) type ConfigObjectCreator func([]byte) (interface{}, error) diff --git a/app/router/config_json.go b/app/router/config_json.go index 9aeb1fc1..c558a136 100644 --- a/app/router/config_json.go +++ b/app/router/config_json.go @@ -5,7 +5,7 @@ package router import ( "encoding/json" - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/common/log" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/app/router/router.go b/app/router/router.go index 62658bea..e62fb965 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -1,10 +1,10 @@ package router import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" + "v2ray.com/core/app" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" ) const ( diff --git a/app/router/rules/chinaip_gen.go b/app/router/rules/chinaip_gen.go index ce0c8542..d3ccb6d5 100644 --- a/app/router/rules/chinaip_gen.go +++ b/app/router/rules/chinaip_gen.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) const ( @@ -65,7 +65,7 @@ func main() { fmt.Fprintln(file, "package rules") fmt.Fprintln(file, "import (") - fmt.Fprintln(file, "v2net \"github.com/v2ray/v2ray-core/common/net\"") + fmt.Fprintln(file, "v2net \"v2ray.com/core/common/net\"") fmt.Fprintln(file, ")") fmt.Fprintln(file, "var (") diff --git a/app/router/rules/chinaip_init.go b/app/router/rules/chinaip_init.go index a7fbb8b7..d7ff1ee8 100644 --- a/app/router/rules/chinaip_init.go +++ b/app/router/rules/chinaip_init.go @@ -1,7 +1,7 @@ package rules import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) var ( diff --git a/app/router/rules/chinaip_json.go b/app/router/rules/chinaip_json.go index d8f21bd0..c5ab85bb 100644 --- a/app/router/rules/chinaip_json.go +++ b/app/router/rules/chinaip_json.go @@ -5,7 +5,7 @@ package rules import ( "encoding/json" - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/common/log" ) func parseChinaIPRule(data []byte) (*Rule, error) { diff --git a/app/router/rules/chinaip_json_test.go b/app/router/rules/chinaip_json_test.go index d4f02927..0c8b44e5 100644 --- a/app/router/rules/chinaip_json_test.go +++ b/app/router/rules/chinaip_json_test.go @@ -5,8 +5,8 @@ package rules_test import ( "testing" - . "github.com/v2ray/v2ray-core/app/router/rules" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/app/router/rules" + "v2ray.com/core/testing/assert" ) func TestChinaIPJson(t *testing.T) { diff --git a/app/router/rules/chinaip_test.go b/app/router/rules/chinaip_test.go index 6cd959ee..e1187d9c 100644 --- a/app/router/rules/chinaip_test.go +++ b/app/router/rules/chinaip_test.go @@ -4,9 +4,9 @@ import ( "net" "testing" - . "github.com/v2ray/v2ray-core/app/router/rules" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/app/router/rules" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func makeDestination(ip string) v2net.Destination { diff --git a/app/router/rules/chinasites_json.go b/app/router/rules/chinasites_json.go index 7ccbf0b7..1a4e44e3 100644 --- a/app/router/rules/chinasites_json.go +++ b/app/router/rules/chinasites_json.go @@ -4,7 +4,7 @@ package rules import ( "encoding/json" - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/common/log" ) func parseChinaSitesRule(data []byte) (*Rule, error) { diff --git a/app/router/rules/chinasites_json_test.go b/app/router/rules/chinasites_json_test.go index e974e8b7..02687bf8 100644 --- a/app/router/rules/chinasites_json_test.go +++ b/app/router/rules/chinasites_json_test.go @@ -5,8 +5,8 @@ package rules_test import ( "testing" - . "github.com/v2ray/v2ray-core/app/router/rules" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/app/router/rules" + "v2ray.com/core/testing/assert" ) func TestChinaSitesJson(t *testing.T) { diff --git a/app/router/rules/chinasites_test.go b/app/router/rules/chinasites_test.go index 9f098545..516511d8 100644 --- a/app/router/rules/chinasites_test.go +++ b/app/router/rules/chinasites_test.go @@ -3,9 +3,9 @@ package rules_test import ( "testing" - . "github.com/v2ray/v2ray-core/app/router/rules" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/app/router/rules" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func makeDomainDestination(domain string) v2net.Destination { diff --git a/app/router/rules/condition.go b/app/router/rules/condition.go index 40cec2fd..6f527ee3 100644 --- a/app/router/rules/condition.go +++ b/app/router/rules/condition.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Condition interface { diff --git a/app/router/rules/config.go b/app/router/rules/config.go index 8204692a..de5df89e 100644 --- a/app/router/rules/config.go +++ b/app/router/rules/config.go @@ -1,7 +1,7 @@ package rules import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Rule struct { diff --git a/app/router/rules/config_json.go b/app/router/rules/config_json.go index e15afc3d..25d1b6dd 100644 --- a/app/router/rules/config_json.go +++ b/app/router/rules/config_json.go @@ -7,10 +7,10 @@ import ( "errors" "strings" - router "github.com/v2ray/v2ray-core/app/router" - "github.com/v2ray/v2ray-core/common/collect" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" + router "v2ray.com/core/app/router" + "v2ray.com/core/common/collect" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" ) type JsonRule struct { diff --git a/app/router/rules/config_json_test.go b/app/router/rules/config_json_test.go index 25635856..03c01361 100644 --- a/app/router/rules/config_json_test.go +++ b/app/router/rules/config_json_test.go @@ -5,9 +5,9 @@ package rules_test import ( "testing" - . "github.com/v2ray/v2ray-core/app/router/rules" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/app/router/rules" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestDomainRule(t *testing.T) { diff --git a/app/router/rules/router.go b/app/router/rules/router.go index 786dd042..b92d9cc2 100644 --- a/app/router/rules/router.go +++ b/app/router/rules/router.go @@ -3,11 +3,11 @@ package rules import ( "errors" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/app/router" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" + "v2ray.com/core/app" + "v2ray.com/core/app/dns" + "v2ray.com/core/app/router" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" ) var ( diff --git a/app/router/rules/router_test.go b/app/router/rules/router_test.go index 542e7a89..1c9a978a 100644 --- a/app/router/rules/router_test.go +++ b/app/router/rules/router_test.go @@ -3,15 +3,15 @@ package rules_test import ( "testing" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl" - "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/app/proxyman" - "github.com/v2ray/v2ray-core/app/router" - . "github.com/v2ray/v2ray-core/app/router/rules" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + dispatchers "v2ray.com/core/app/dispatcher/impl" + "v2ray.com/core/app/dns" + "v2ray.com/core/app/proxyman" + "v2ray.com/core/app/router" + . "v2ray.com/core/app/router/rules" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestSimpleRouter(t *testing.T) { diff --git a/app/space.go b/app/space.go index 7d7602f1..9851055a 100644 --- a/app/space.go +++ b/app/space.go @@ -3,7 +3,7 @@ package app import ( "errors" - "github.com/v2ray/v2ray-core/common" + "v2ray.com/core/common" ) var ( diff --git a/common/alloc/buffer.go b/common/alloc/buffer.go index 396d4b38..41eb2109 100644 --- a/common/alloc/buffer.go +++ b/common/alloc/buffer.go @@ -5,7 +5,7 @@ import ( "hash" "io" - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) const ( diff --git a/common/alloc/buffer_test.go b/common/alloc/buffer_test.go index c595438f..4198028b 100644 --- a/common/alloc/buffer_test.go +++ b/common/alloc/buffer_test.go @@ -3,8 +3,8 @@ package alloc_test import ( "testing" - . "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/alloc" + "v2ray.com/core/testing/assert" ) func TestBufferClear(t *testing.T) { diff --git a/common/collect/string_list_json_test.go b/common/collect/string_list_json_test.go index ca2fdc11..82b02aac 100644 --- a/common/collect/string_list_json_test.go +++ b/common/collect/string_list_json_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "testing" - . "github.com/v2ray/v2ray-core/common/collect" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/collect" + "v2ray.com/core/testing/assert" ) func TestStringListUnmarshalError(t *testing.T) { diff --git a/common/crypto/benchmark_test.go b/common/crypto/benchmark_test.go index 054e6c1b..c1c71d96 100644 --- a/common/crypto/benchmark_test.go +++ b/common/crypto/benchmark_test.go @@ -4,7 +4,7 @@ import ( "crypto/cipher" "testing" - . "github.com/v2ray/v2ray-core/common/crypto" + . "v2ray.com/core/common/crypto" ) const benchSize = 1024 * 1024 diff --git a/common/crypto/chacha20.go b/common/crypto/chacha20.go index e9b4b0a6..85946acf 100644 --- a/common/crypto/chacha20.go +++ b/common/crypto/chacha20.go @@ -3,7 +3,7 @@ package crypto import ( "crypto/cipher" - "github.com/v2ray/v2ray-core/common/crypto/internal" + "v2ray.com/core/common/crypto/internal" ) // NewChaCha20Stream creates a new Chacha20 encryption/descryption stream based on give key and IV. diff --git a/common/crypto/chacha20_test.go b/common/crypto/chacha20_test.go index 8805b4b8..14d57ab5 100644 --- a/common/crypto/chacha20_test.go +++ b/common/crypto/chacha20_test.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "testing" - . "github.com/v2ray/v2ray-core/common/crypto" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/crypto" + "v2ray.com/core/testing/assert" ) func mustDecodeHex(s string) []byte { diff --git a/common/crypto/io.go b/common/crypto/io.go index cf4d4bba..fa5bfdf0 100644 --- a/common/crypto/io.go +++ b/common/crypto/io.go @@ -4,7 +4,7 @@ import ( "crypto/cipher" "io" - "github.com/v2ray/v2ray-core/common" + "v2ray.com/core/common" ) type CryptionReader struct { diff --git a/common/io/buffered_reader.go b/common/io/buffered_reader.go index 2381ee87..8aeb55bc 100644 --- a/common/io/buffered_reader.go +++ b/common/io/buffered_reader.go @@ -4,7 +4,7 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) type BufferedReader struct { diff --git a/common/io/buffered_reader_test.go b/common/io/buffered_reader_test.go index ca937e52..71375b73 100644 --- a/common/io/buffered_reader_test.go +++ b/common/io/buffered_reader_test.go @@ -3,9 +3,9 @@ package io_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - . "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + . "v2ray.com/core/common/io" + "v2ray.com/core/testing/assert" ) func TestBufferedReader(t *testing.T) { diff --git a/common/io/buffered_writer.go b/common/io/buffered_writer.go index 8f8ef12b..0095c790 100644 --- a/common/io/buffered_writer.go +++ b/common/io/buffered_writer.go @@ -4,7 +4,7 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) type BufferedWriter struct { diff --git a/common/io/buffered_writer_test.go b/common/io/buffered_writer_test.go index c7df4524..c92e210f 100644 --- a/common/io/buffered_writer_test.go +++ b/common/io/buffered_writer_test.go @@ -3,9 +3,9 @@ package io_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - . "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + . "v2ray.com/core/common/io" + "v2ray.com/core/testing/assert" ) func TestBufferedWriter(t *testing.T) { diff --git a/common/io/chain_writer.go b/common/io/chain_writer.go index 56bbce3f..4d6fc479 100644 --- a/common/io/chain_writer.go +++ b/common/io/chain_writer.go @@ -4,7 +4,7 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) type ChainWriter struct { diff --git a/common/io/chan_reader.go b/common/io/chan_reader.go index e1fbdb93..a0f36af4 100644 --- a/common/io/chan_reader.go +++ b/common/io/chan_reader.go @@ -4,7 +4,7 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) type ChanReader struct { diff --git a/common/io/reader.go b/common/io/reader.go index dcaddd45..1c2dc770 100644 --- a/common/io/reader.go +++ b/common/io/reader.go @@ -3,8 +3,8 @@ package io import ( "io" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common" + "v2ray.com/core/common/alloc" ) // Reader extends io.Reader with alloc.Buffer. diff --git a/common/io/reader_test.go b/common/io/reader_test.go index e8fb4f6a..a687e694 100644 --- a/common/io/reader_test.go +++ b/common/io/reader_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - . "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + . "v2ray.com/core/common/io" + "v2ray.com/core/testing/assert" ) func TestAdaptiveReader(t *testing.T) { diff --git a/common/io/transport.go b/common/io/transport.go index 503fba3e..344eaa49 100644 --- a/common/io/transport.go +++ b/common/io/transport.go @@ -1,7 +1,7 @@ package io import ( - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/common/log" ) func Pipe(reader Reader, writer Writer) error { diff --git a/common/io/writer.go b/common/io/writer.go index 85e651e4..c77dd383 100644 --- a/common/io/writer.go +++ b/common/io/writer.go @@ -3,8 +3,8 @@ package io import ( "io" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common" + "v2ray.com/core/common/alloc" ) // Writer extends io.Writer with alloc.Buffer. diff --git a/common/io/writer_test.go b/common/io/writer_test.go index e800e9b1..ca3f8f1f 100644 --- a/common/io/writer_test.go +++ b/common/io/writer_test.go @@ -5,9 +5,9 @@ import ( "crypto/rand" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - . "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + . "v2ray.com/core/common/io" + "v2ray.com/core/testing/assert" ) func TestAdaptiveWriter(t *testing.T) { diff --git a/common/loader/json_conf.go b/common/loader/json_conf.go index 7be825c8..7305cd1f 100644 --- a/common/loader/json_conf.go +++ b/common/loader/json_conf.go @@ -5,8 +5,8 @@ package loader import ( "encoding/json" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/common" + "v2ray.com/core/common/log" ) type JSONConfigLoader struct { diff --git a/common/loader/loader.go b/common/loader/loader.go index f3441755..07cb54e2 100644 --- a/common/loader/loader.go +++ b/common/loader/loader.go @@ -2,7 +2,7 @@ package loader import ( "errors" - "github.com/v2ray/v2ray-core/common" + "v2ray.com/core/common" ) var ( diff --git a/common/log/access.go b/common/log/access.go index 989adcc2..f006d3c7 100644 --- a/common/log/access.go +++ b/common/log/access.go @@ -1,7 +1,7 @@ package log import ( - "github.com/v2ray/v2ray-core/common/log/internal" + "v2ray.com/core/common/log/internal" ) // AccessStatus is the status of an access request from clients. diff --git a/common/log/internal/log_entry.go b/common/log/internal/log_entry.go index 371fdc81..081038e5 100644 --- a/common/log/internal/log_entry.go +++ b/common/log/internal/log_entry.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common" + "v2ray.com/core/common/serial" ) func InterfaceToString(value interface{}) string { diff --git a/common/log/internal/log_entry_test.go b/common/log/internal/log_entry_test.go index eb9c52ae..1e42f145 100644 --- a/common/log/internal/log_entry_test.go +++ b/common/log/internal/log_entry_test.go @@ -3,8 +3,8 @@ package internal_test import ( "testing" - . "github.com/v2ray/v2ray-core/common/log/internal" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/log/internal" + "v2ray.com/core/testing/assert" ) func TestAccessLog(t *testing.T) { diff --git a/common/log/internal/log_writer.go b/common/log/internal/log_writer.go index c3ad8a39..65c4d560 100644 --- a/common/log/internal/log_writer.go +++ b/common/log/internal/log_writer.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/v2ray/v2ray-core/common/platform" - "github.com/v2ray/v2ray-core/common/signal" + "v2ray.com/core/common/platform" + "v2ray.com/core/common/signal" ) type LogWriter interface { diff --git a/common/log/log.go b/common/log/log.go index 5fac4096..5f3e2f64 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -1,7 +1,7 @@ package log import ( - "github.com/v2ray/v2ray-core/common/log/internal" + "v2ray.com/core/common/log/internal" ) type LogLevel int diff --git a/common/net/address.go b/common/net/address.go index 490538f3..c3bc9eb1 100644 --- a/common/net/address.go +++ b/common/net/address.go @@ -3,8 +3,8 @@ package net import ( "net" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/predicate" + "v2ray.com/core/common/log" + "v2ray.com/core/common/predicate" ) var ( diff --git a/common/net/address_json_test.go b/common/net/address_json_test.go index 9ccd68ce..f3d20da8 100644 --- a/common/net/address_json_test.go +++ b/common/net/address_json_test.go @@ -7,8 +7,8 @@ import ( "net" "testing" - . "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestIPParsing(t *testing.T) { diff --git a/common/net/address_test.go b/common/net/address_test.go index 2767d9d0..9d939c0d 100644 --- a/common/net/address_test.go +++ b/common/net/address_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestIPv4Address(t *testing.T) { diff --git a/common/net/destination_test.go b/common/net/destination_test.go index 7fcc22f1..2d4fb2f0 100644 --- a/common/net/destination_test.go +++ b/common/net/destination_test.go @@ -3,8 +3,8 @@ package net_test import ( "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestTCPDestination(t *testing.T) { diff --git a/common/net/ipnet_test.go b/common/net/ipnet_test.go index 623111f1..5a3258df 100644 --- a/common/net/ipnet_test.go +++ b/common/net/ipnet_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - . "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func parseCIDR(str string) *net.IPNet { diff --git a/common/net/network.go b/common/net/network.go index 1244fe98..ae42a946 100644 --- a/common/net/network.go +++ b/common/net/network.go @@ -3,7 +3,7 @@ package net import ( "strings" - "github.com/v2ray/v2ray-core/common/collect" + "v2ray.com/core/common/collect" ) const ( diff --git a/common/net/network_json.go b/common/net/network_json.go index f7fd7374..c3c135bd 100644 --- a/common/net/network_json.go +++ b/common/net/network_json.go @@ -5,7 +5,7 @@ package net import ( "encoding/json" - "github.com/v2ray/v2ray-core/common/collect" + "v2ray.com/core/common/collect" ) func (this *NetworkList) UnmarshalJSON(data []byte) error { diff --git a/common/net/network_json_test.go b/common/net/network_json_test.go index c66e9cbd..f02554fa 100644 --- a/common/net/network_json_test.go +++ b/common/net/network_json_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "testing" - . "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestArrayNetworkList(t *testing.T) { diff --git a/common/net/port.go b/common/net/port.go index e1422323..51a2998d 100644 --- a/common/net/port.go +++ b/common/net/port.go @@ -4,7 +4,7 @@ import ( "errors" "strconv" - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) var ( diff --git a/common/net/port_json.go b/common/net/port_json.go index 6e399a50..9347ac85 100644 --- a/common/net/port_json.go +++ b/common/net/port_json.go @@ -6,7 +6,7 @@ import ( "encoding/json" "strings" - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/common/log" ) func parseIntPort(data []byte) (Port, error) { diff --git a/common/net/port_json_test.go b/common/net/port_json_test.go index ca0c0554..1e11044a 100644 --- a/common/net/port_json_test.go +++ b/common/net/port_json_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "testing" - . "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestIntPort(t *testing.T) { diff --git a/common/net/port_test.go b/common/net/port_test.go index 80f52c3c..983ca509 100644 --- a/common/net/port_test.go +++ b/common/net/port_test.go @@ -3,8 +3,8 @@ package net_test import ( "testing" - . "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestPortRangeContains(t *testing.T) { diff --git a/common/net/timed_io_test.go b/common/net/timed_io_test.go index 305a93de..fc9847ea 100644 --- a/common/net/timed_io_test.go +++ b/common/net/timed_io_test.go @@ -3,8 +3,8 @@ package net_test import ( "testing" - . "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestTimeOutSettings(t *testing.T) { diff --git a/common/protocol/headers.go b/common/protocol/headers.go index b6844ff9..9fcbec9d 100644 --- a/common/protocol/headers.go +++ b/common/protocol/headers.go @@ -1,8 +1,8 @@ package protocol import ( - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/uuid" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/uuid" ) type RequestCommand byte diff --git a/common/protocol/headers_test.go b/common/protocol/headers_test.go index e746a279..ab7ad795 100644 --- a/common/protocol/headers_test.go +++ b/common/protocol/headers_test.go @@ -3,8 +3,8 @@ package protocol_test import ( "testing" - . "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/protocol" + "v2ray.com/core/testing/assert" ) func TestRequestOptionSet(t *testing.T) { diff --git a/common/protocol/id.go b/common/protocol/id.go index 271315e5..be31b655 100644 --- a/common/protocol/id.go +++ b/common/protocol/id.go @@ -6,7 +6,7 @@ import ( "errors" "hash" - "github.com/v2ray/v2ray-core/common/uuid" + "v2ray.com/core/common/uuid" ) const ( diff --git a/common/protocol/id_test.go b/common/protocol/id_test.go index f3edefbc..12788529 100644 --- a/common/protocol/id_test.go +++ b/common/protocol/id_test.go @@ -3,10 +3,10 @@ package protocol_test import ( "testing" - "github.com/v2ray/v2ray-core/common/predicate" - . "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/uuid" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/predicate" + . "v2ray.com/core/common/protocol" + "v2ray.com/core/common/uuid" + "v2ray.com/core/testing/assert" ) func TestCmdKey(t *testing.T) { diff --git a/common/protocol/server_picker_test.go b/common/protocol/server_picker_test.go index b5f6f926..bdb20cfc 100644 --- a/common/protocol/server_picker_test.go +++ b/common/protocol/server_picker_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - v2net "github.com/v2ray/v2ray-core/common/net" - . "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/testing/assert" + v2net "v2ray.com/core/common/net" + . "v2ray.com/core/common/protocol" + "v2ray.com/core/testing/assert" ) func TestServerList(t *testing.T) { diff --git a/common/protocol/server_spec.go b/common/protocol/server_spec.go index 359d7c59..98929399 100644 --- a/common/protocol/server_spec.go +++ b/common/protocol/server_spec.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/common/dice" - v2net "github.com/v2ray/v2ray-core/common/net" + "v2ray.com/core/common/dice" + v2net "v2ray.com/core/common/net" ) type ValidationStrategy interface { diff --git a/common/protocol/server_spec_test.go b/common/protocol/server_spec_test.go index 40211f0b..23aa7967 100644 --- a/common/protocol/server_spec_test.go +++ b/common/protocol/server_spec_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - v2net "github.com/v2ray/v2ray-core/common/net" - . "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/testing/assert" + v2net "v2ray.com/core/common/net" + . "v2ray.com/core/common/protocol" + "v2ray.com/core/testing/assert" ) type TestAccount struct { diff --git a/common/protocol/time.go b/common/protocol/time.go index 454d1c15..c7156f63 100644 --- a/common/protocol/time.go +++ b/common/protocol/time.go @@ -3,8 +3,8 @@ package protocol import ( "time" - "github.com/v2ray/v2ray-core/common/dice" - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/dice" + "v2ray.com/core/common/serial" ) type Timestamp int64 diff --git a/common/protocol/time_test.go b/common/protocol/time_test.go index 5fd7d6b5..10290dd0 100644 --- a/common/protocol/time_test.go +++ b/common/protocol/time_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - . "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/protocol" + "v2ray.com/core/testing/assert" ) func TestGenerateRandomInt64InRange(t *testing.T) { diff --git a/common/protocol/user_json_test.go b/common/protocol/user_json_test.go index de72387f..8d2c8992 100644 --- a/common/protocol/user_json_test.go +++ b/common/protocol/user_json_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "testing" - . "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/protocol" + "v2ray.com/core/testing/assert" ) func TestUserParsing(t *testing.T) { diff --git a/common/protocol/user_validator.go b/common/protocol/user_validator.go index dda6673c..77ae1657 100644 --- a/common/protocol/user_validator.go +++ b/common/protocol/user_validator.go @@ -1,7 +1,7 @@ package protocol import ( - "github.com/v2ray/v2ray-core/common" + "v2ray.com/core/common" ) type UserValidator interface { diff --git a/common/retry/retry_test.go b/common/retry/retry_test.go index 232da8fc..97dfd813 100644 --- a/common/retry/retry_test.go +++ b/common/retry/retry_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - . "github.com/v2ray/v2ray-core/common/retry" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/retry" + "v2ray.com/core/testing/assert" ) var ( diff --git a/common/uuid/uuid_test.go b/common/uuid/uuid_test.go index 38e1a025..147bf4ef 100644 --- a/common/uuid/uuid_test.go +++ b/common/uuid/uuid_test.go @@ -3,8 +3,8 @@ package uuid_test import ( "testing" - . "github.com/v2ray/v2ray-core/common/uuid" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/common/uuid" + "v2ray.com/core/testing/assert" ) func TestParseBytes(t *testing.T) { diff --git a/common/web/service.go b/common/web/service.go index d2da33d3..48a2b570 100644 --- a/common/web/service.go +++ b/common/web/service.go @@ -1,7 +1,7 @@ package web import ( - "github.com/v2ray/v2ray-core/common/protocol" + "v2ray.com/core/common/protocol" ) type Authenciation struct { diff --git a/core.go b/core.go index ff0720e9..36a61cd1 100644 --- a/core.go +++ b/core.go @@ -4,7 +4,7 @@ package core import ( "fmt" - "github.com/v2ray/v2ray-core/common/platform" + "v2ray.com/core/common/platform" ) var ( diff --git a/proxy/blackhole/blackhole.go b/proxy/blackhole/blackhole.go index b36541d2..49472864 100644 --- a/proxy/blackhole/blackhole.go +++ b/proxy/blackhole/blackhole.go @@ -1,13 +1,13 @@ package blackhole import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/ray" ) // BlackHole is an outbound connection that sliently swallow the entire payload. diff --git a/proxy/blackhole/config.go b/proxy/blackhole/config.go index f7d97610..09f95942 100644 --- a/proxy/blackhole/config.go +++ b/proxy/blackhole/config.go @@ -1,8 +1,8 @@ package blackhole import ( - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" ) type Config struct { diff --git a/proxy/blackhole/config_json.go b/proxy/blackhole/config_json.go index 65cba6ef..33b35284 100644 --- a/proxy/blackhole/config_json.go +++ b/proxy/blackhole/config_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/v2ray/v2ray-core/common/loader" - "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/common/loader" + "v2ray.com/core/proxy/registry" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/proxy/blackhole/config_json_test.go b/proxy/blackhole/config_json_test.go index b9094a94..3ce18f09 100644 --- a/proxy/blackhole/config_json_test.go +++ b/proxy/blackhole/config_json_test.go @@ -6,8 +6,8 @@ import ( "encoding/json" "testing" - . "github.com/v2ray/v2ray-core/proxy/blackhole" - "github.com/v2ray/v2ray-core/testing/assert" + . "v2ray.com/core/proxy/blackhole" + "v2ray.com/core/testing/assert" ) func TestHTTPResponseJSON(t *testing.T) { diff --git a/proxy/blackhole/config_test.go b/proxy/blackhole/config_test.go index f0152679..d765bd94 100644 --- a/proxy/blackhole/config_test.go +++ b/proxy/blackhole/config_test.go @@ -5,10 +5,10 @@ import ( "net/http" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" - . "github.com/v2ray/v2ray-core/proxy/blackhole" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" + . "v2ray.com/core/proxy/blackhole" + "v2ray.com/core/testing/assert" ) func TestHTTPResponse(t *testing.T) { diff --git a/proxy/dokodemo/config.go b/proxy/dokodemo/config.go index 8c281d29..701141b3 100644 --- a/proxy/dokodemo/config.go +++ b/proxy/dokodemo/config.go @@ -1,7 +1,7 @@ package dokodemo import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Config struct { diff --git a/proxy/dokodemo/config_json.go b/proxy/dokodemo/config_json.go index 026db982..cddec97d 100644 --- a/proxy/dokodemo/config_json.go +++ b/proxy/dokodemo/config_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy/registry" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy/registry" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/proxy/dokodemo/dokodemo.go b/proxy/dokodemo/dokodemo.go index adea2b82..94129cd4 100644 --- a/proxy/dokodemo/dokodemo.go +++ b/proxy/dokodemo/dokodemo.go @@ -3,16 +3,16 @@ package dokodemo import ( "sync" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/internet/udp" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/internet/udp" ) type DokodemoDoor struct { diff --git a/proxy/dokodemo/dokodemo_test.go b/proxy/dokodemo/dokodemo_test.go index e3acd68e..6eab8e90 100644 --- a/proxy/dokodemo/dokodemo_test.go +++ b/proxy/dokodemo/dokodemo_test.go @@ -4,19 +4,19 @@ import ( "net" "testing" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl" - "github.com/v2ray/v2ray-core/app/proxyman" - "github.com/v2ray/v2ray-core/common/dice" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - . "github.com/v2ray/v2ray-core/proxy/dokodemo" - "github.com/v2ray/v2ray-core/proxy/freedom" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" - "github.com/v2ray/v2ray-core/testing/servers/udp" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + dispatchers "v2ray.com/core/app/dispatcher/impl" + "v2ray.com/core/app/proxyman" + "v2ray.com/core/common/dice" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + . "v2ray.com/core/proxy/dokodemo" + "v2ray.com/core/proxy/freedom" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" + "v2ray.com/core/testing/servers/udp" + "v2ray.com/core/transport/internet" ) func TestDokodemoTCP(t *testing.T) { diff --git a/proxy/dokodemo/sockopt_linux.go b/proxy/dokodemo/sockopt_linux.go index 73da0a2b..8192bd15 100644 --- a/proxy/dokodemo/sockopt_linux.go +++ b/proxy/dokodemo/sockopt_linux.go @@ -5,9 +5,9 @@ package dokodemo import ( "syscall" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) const SO_ORIGINAL_DST = 80 diff --git a/proxy/dokodemo/sockopt_other.go b/proxy/dokodemo/sockopt_other.go index 73e5b821..0ebeca2c 100644 --- a/proxy/dokodemo/sockopt_other.go +++ b/proxy/dokodemo/sockopt_other.go @@ -3,8 +3,8 @@ package dokodemo import ( - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) func GetOriginalDestination(conn internet.Connection) v2net.Destination { diff --git a/proxy/freedom/config_json.go b/proxy/freedom/config_json.go index 631580b1..229bc175 100644 --- a/proxy/freedom/config_json.go +++ b/proxy/freedom/config_json.go @@ -7,7 +7,7 @@ import ( "errors" "strings" - "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/proxy/registry" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go index c0fbaeab..e25b221f 100644 --- a/proxy/freedom/freedom.go +++ b/proxy/freedom/freedom.go @@ -3,19 +3,19 @@ package freedom import ( "io" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/dice" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/retry" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/internet/tcp" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/app/dns" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/dice" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/retry" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/internet/tcp" + "v2ray.com/core/transport/ray" ) type FreedomConnection struct { diff --git a/proxy/freedom/freedom_test.go b/proxy/freedom/freedom_test.go index 1ccdcbe6..e124e8e6 100644 --- a/proxy/freedom/freedom_test.go +++ b/proxy/freedom/freedom_test.go @@ -4,21 +4,21 @@ import ( "net" "testing" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl" - "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/app/proxyman" - "github.com/v2ray/v2ray-core/app/router" - "github.com/v2ray/v2ray-core/app/router/rules" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - . "github.com/v2ray/v2ray-core/proxy/freedom" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + dispatchers "v2ray.com/core/app/dispatcher/impl" + "v2ray.com/core/app/dns" + "v2ray.com/core/app/proxyman" + "v2ray.com/core/app/router" + "v2ray.com/core/app/router/rules" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + . "v2ray.com/core/proxy/freedom" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/ray" ) func TestSinglePacket(t *testing.T) { diff --git a/proxy/http/config_json.go b/proxy/http/config_json.go index 0b76cfa9..fd6479d9 100644 --- a/proxy/http/config_json.go +++ b/proxy/http/config_json.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/proxy/registry" ) // UnmarshalJSON implements json.Unmarshaler diff --git a/proxy/http/server.go b/proxy/http/server.go index 8e40d12c..efcb69d0 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -9,16 +9,16 @@ import ( "strings" "sync" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - "github.com/v2ray/v2ray-core/common" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + "v2ray.com/core/common" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/ray" ) // Server is a HTTP proxy server. diff --git a/proxy/http/server_test.go b/proxy/http/server_test.go index 1516065e..249b56ac 100644 --- a/proxy/http/server_test.go +++ b/proxy/http/server_test.go @@ -6,15 +6,15 @@ import ( "strings" "testing" - testdispatcher "github.com/v2ray/v2ray-core/app/dispatcher/testing" - "github.com/v2ray/v2ray-core/common/dice" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - . "github.com/v2ray/v2ray-core/proxy/http" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/transport/internet" + testdispatcher "v2ray.com/core/app/dispatcher/testing" + "v2ray.com/core/common/dice" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + . "v2ray.com/core/proxy/http" + "v2ray.com/core/testing/assert" + "v2ray.com/core/transport/internet" - _ "github.com/v2ray/v2ray-core/transport/internet/tcp" + _ "v2ray.com/core/transport/internet/tcp" ) func TestHopByHopHeadersStrip(t *testing.T) { diff --git a/proxy/proxy.go b/proxy/proxy.go index 84dd17a3..28a17de7 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -2,11 +2,11 @@ package proxy import ( - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/ray" ) type HandlerState int diff --git a/proxy/registry/config_cache.go b/proxy/registry/config_cache.go index 633a28ee..a2cd63a3 100644 --- a/proxy/registry/config_cache.go +++ b/proxy/registry/config_cache.go @@ -1,6 +1,6 @@ package registry -import "github.com/v2ray/v2ray-core/common/loader" +import "v2ray.com/core/common/loader" var ( inboundConfigCache loader.ConfigLoader diff --git a/proxy/registry/config_cache_json.go b/proxy/registry/config_cache_json.go index ecc42170..526e088e 100644 --- a/proxy/registry/config_cache_json.go +++ b/proxy/registry/config_cache_json.go @@ -3,7 +3,7 @@ package registry import ( - "github.com/v2ray/v2ray-core/common/loader" + "v2ray.com/core/common/loader" ) func init() { diff --git a/proxy/registry/creator.go b/proxy/registry/creator.go index 49405176..0d193629 100644 --- a/proxy/registry/creator.go +++ b/proxy/registry/creator.go @@ -1,9 +1,9 @@ package registry import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/app" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/internet" ) type InboundHandlerFactory interface { diff --git a/proxy/registry/handler_cache.go b/proxy/registry/handler_cache.go index bc57cf2e..c8598c4f 100644 --- a/proxy/registry/handler_cache.go +++ b/proxy/registry/handler_cache.go @@ -1,10 +1,10 @@ package registry import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/app" + "v2ray.com/core/common" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/internet" ) var ( diff --git a/proxy/shadowsocks/config.go b/proxy/shadowsocks/config.go index 9ba221de..2f9f9193 100644 --- a/proxy/shadowsocks/config.go +++ b/proxy/shadowsocks/config.go @@ -4,8 +4,8 @@ import ( "crypto/cipher" "crypto/md5" - "github.com/v2ray/v2ray-core/common/crypto" - "github.com/v2ray/v2ray-core/common/protocol" + "v2ray.com/core/common/crypto" + "v2ray.com/core/common/protocol" ) type Cipher interface { diff --git a/proxy/shadowsocks/config_json.go b/proxy/shadowsocks/config_json.go index 81b9f19e..66afda59 100644 --- a/proxy/shadowsocks/config_json.go +++ b/proxy/shadowsocks/config_json.go @@ -7,10 +7,10 @@ import ( "errors" "strings" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + "v2ray.com/core/common/protocol" + "v2ray.com/core/proxy/registry" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/proxy/shadowsocks/config_json_test.go b/proxy/shadowsocks/config_json_test.go index 9f478328..97baab41 100644 --- a/proxy/shadowsocks/config_json_test.go +++ b/proxy/shadowsocks/config_json_test.go @@ -6,7 +6,7 @@ import ( "encoding/json" "testing" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/testing/assert" ) func TestConfigParsing(t *testing.T) { diff --git a/proxy/shadowsocks/ota.go b/proxy/shadowsocks/ota.go index 891b1442..5a6633d8 100644 --- a/proxy/shadowsocks/ota.go +++ b/proxy/shadowsocks/ota.go @@ -6,10 +6,10 @@ import ( "crypto/sha1" "io" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/serial" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + "v2ray.com/core/common/serial" + "v2ray.com/core/transport" ) const ( diff --git a/proxy/shadowsocks/ota_test.go b/proxy/shadowsocks/ota_test.go index 0dbbb0f8..87d8e512 100644 --- a/proxy/shadowsocks/ota_test.go +++ b/proxy/shadowsocks/ota_test.go @@ -3,9 +3,9 @@ package shadowsocks_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - . "github.com/v2ray/v2ray-core/proxy/shadowsocks" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + . "v2ray.com/core/proxy/shadowsocks" + "v2ray.com/core/testing/assert" ) func TestNormalChunkReading(t *testing.T) { diff --git a/proxy/shadowsocks/protocol.go b/proxy/shadowsocks/protocol.go index 00a1dcd9..b567c226 100644 --- a/proxy/shadowsocks/protocol.go +++ b/proxy/shadowsocks/protocol.go @@ -4,11 +4,11 @@ import ( "bytes" "io" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport" ) const ( diff --git a/proxy/shadowsocks/protocol_test.go b/proxy/shadowsocks/protocol_test.go index 803392b9..4a6b71a6 100644 --- a/proxy/shadowsocks/protocol_test.go +++ b/proxy/shadowsocks/protocol_test.go @@ -4,12 +4,12 @@ import ( "io" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - . "github.com/v2ray/v2ray-core/proxy/shadowsocks" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + . "v2ray.com/core/proxy/shadowsocks" + "v2ray.com/core/testing/assert" + "v2ray.com/core/transport" ) func TestNormalRequestParsing(t *testing.T) { diff --git a/proxy/shadowsocks/server.go b/proxy/shadowsocks/server.go index a86a7c1a..eb8e2e6e 100644 --- a/proxy/shadowsocks/server.go +++ b/proxy/shadowsocks/server.go @@ -6,19 +6,19 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/crypto" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/internet/udp" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + "v2ray.com/core/common" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/crypto" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/internet/udp" ) type Server struct { diff --git a/proxy/socks/account.go b/proxy/socks/account.go index a4a40b80..451dd0a3 100644 --- a/proxy/socks/account.go +++ b/proxy/socks/account.go @@ -1,7 +1,7 @@ package socks import ( - "github.com/v2ray/v2ray-core/common/protocol" + "v2ray.com/core/common/protocol" ) type Account struct { diff --git a/proxy/socks/client_config.go b/proxy/socks/client_config.go index 5cf0d5aa..26d0fbcc 100644 --- a/proxy/socks/client_config.go +++ b/proxy/socks/client_config.go @@ -1,7 +1,7 @@ package socks import ( - "github.com/v2ray/v2ray-core/common/protocol" + "v2ray.com/core/common/protocol" ) type ClientConfig struct { diff --git a/proxy/socks/client_config_json.go b/proxy/socks/client_config_json.go index 564d1b8f..6eca8dfd 100644 --- a/proxy/socks/client_config_json.go +++ b/proxy/socks/client_config_json.go @@ -6,9 +6,9 @@ import ( "encoding/json" "errors" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/proxy/registry" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/proxy/registry" ) func (this *ClientConfig) UnmarshalJSON(data []byte) error { diff --git a/proxy/socks/protocol/socks.go b/proxy/socks/protocol/socks.go index 5814da34..6057fb74 100644 --- a/proxy/socks/protocol/socks.go +++ b/proxy/socks/protocol/socks.go @@ -3,11 +3,11 @@ package protocol import ( "io" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport" ) const ( diff --git a/proxy/socks/protocol/socks4.go b/proxy/socks/protocol/socks4.go index 590ae87e..f9ebbbd1 100644 --- a/proxy/socks/protocol/socks4.go +++ b/proxy/socks/protocol/socks4.go @@ -4,7 +4,7 @@ import ( "errors" "io" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) var ( diff --git a/proxy/socks/protocol/socks4_test.go b/proxy/socks/protocol/socks4_test.go index b045bc51..af43ada8 100644 --- a/proxy/socks/protocol/socks4_test.go +++ b/proxy/socks/protocol/socks4_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" ) func TestSocks4AuthenticationRequestRead(t *testing.T) { diff --git a/proxy/socks/protocol/socks_test.go b/proxy/socks/protocol/socks_test.go index 49d9a578..0f12b19d 100644 --- a/proxy/socks/protocol/socks_test.go +++ b/proxy/socks/protocol/socks_test.go @@ -5,11 +5,11 @@ import ( "io" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/testing/assert" + "v2ray.com/core/transport" ) func TestHasAuthenticationMethod(t *testing.T) { diff --git a/proxy/socks/protocol/udp.go b/proxy/socks/protocol/udp.go index 77912c92..6c01571e 100644 --- a/proxy/socks/protocol/udp.go +++ b/proxy/socks/protocol/udp.go @@ -3,10 +3,10 @@ package protocol import ( "errors" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport" ) var ( diff --git a/proxy/socks/protocol/udp_test.go b/proxy/socks/protocol/udp_test.go index 0a03d37b..2e523934 100644 --- a/proxy/socks/protocol/udp_test.go +++ b/proxy/socks/protocol/udp_test.go @@ -3,9 +3,9 @@ package protocol import ( "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/transport" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/transport" ) func TestSingleByteUDPRequest(t *testing.T) { diff --git a/proxy/socks/server.go b/proxy/socks/server.go index fc5f2509..50693499 100644 --- a/proxy/socks/server.go +++ b/proxy/socks/server.go @@ -6,16 +6,16 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/proxy/socks/protocol" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/internet/udp" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/proxy/socks/protocol" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/internet/udp" ) var ( diff --git a/proxy/socks/server_config.go b/proxy/socks/server_config.go index c560908b..c895787f 100644 --- a/proxy/socks/server_config.go +++ b/proxy/socks/server_config.go @@ -1,7 +1,7 @@ package socks import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) const ( diff --git a/proxy/socks/server_config_json.go b/proxy/socks/server_config_json.go index cc8fc2fe..3ff3a753 100644 --- a/proxy/socks/server_config_json.go +++ b/proxy/socks/server_config_json.go @@ -6,10 +6,10 @@ import ( "encoding/json" "errors" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy/registry" ) const ( diff --git a/proxy/socks/server_config_json_test.go b/proxy/socks/server_config_json_test.go index da73ab84..74be8a24 100644 --- a/proxy/socks/server_config_json_test.go +++ b/proxy/socks/server_config_json_test.go @@ -5,9 +5,9 @@ package socks_test import ( "testing" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/proxy/socks" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/proxy/socks" + "v2ray.com/core/testing/assert" ) func TestDefaultIPAddress(t *testing.T) { diff --git a/proxy/socks/server_udp.go b/proxy/socks/server_udp.go index f02dff11..09a6d103 100644 --- a/proxy/socks/server_udp.go +++ b/proxy/socks/server_udp.go @@ -1,12 +1,12 @@ package socks import ( - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/socks/protocol" - "github.com/v2ray/v2ray-core/transport/internet/udp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/socks/protocol" + "v2ray.com/core/transport/internet/udp" ) func (this *Server) listenUDP() error { diff --git a/proxy/testing/mocks/inboundhandler.go b/proxy/testing/mocks/inboundhandler.go index bdbc83b3..68141676 100644 --- a/proxy/testing/mocks/inboundhandler.go +++ b/proxy/testing/mocks/inboundhandler.go @@ -4,10 +4,10 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/app/dispatcher" - v2io "github.com/v2ray/v2ray-core/common/io" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" + "v2ray.com/core/app/dispatcher" + v2io "v2ray.com/core/common/io" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" ) type InboundConnectionHandler struct { diff --git a/proxy/testing/mocks/outboundhandler.go b/proxy/testing/mocks/outboundhandler.go index b34a3a50..5579fc7a 100644 --- a/proxy/testing/mocks/outboundhandler.go +++ b/proxy/testing/mocks/outboundhandler.go @@ -4,12 +4,12 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/ray" ) type OutboundConnectionHandler struct { diff --git a/proxy/testing/proxy.go b/proxy/testing/proxy.go index a886012e..f39f8371 100644 --- a/proxy/testing/proxy.go +++ b/proxy/testing/proxy.go @@ -3,8 +3,8 @@ package testing import ( "fmt" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/common" + "v2ray.com/core/proxy/registry" ) var count = 0 diff --git a/proxy/vmess/account_json.go b/proxy/vmess/account_json.go index 546a3386..352088cb 100644 --- a/proxy/vmess/account_json.go +++ b/proxy/vmess/account_json.go @@ -5,9 +5,9 @@ package vmess import ( "encoding/json" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/uuid" + "v2ray.com/core/common/log" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/uuid" ) func (u *Account) UnmarshalJSON(data []byte) error { diff --git a/proxy/vmess/encoding/client.go b/proxy/vmess/encoding/client.go index aa35689a..1bb0be98 100644 --- a/proxy/vmess/encoding/client.go +++ b/proxy/vmess/encoding/client.go @@ -6,12 +6,12 @@ import ( "hash/fnv" "io" - "github.com/v2ray/v2ray-core/common/crypto" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/proxy/vmess" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/crypto" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/proxy/vmess" + "v2ray.com/core/transport" ) func hashTimestamp(t protocol.Timestamp) []byte { diff --git a/proxy/vmess/encoding/commands.go b/proxy/vmess/encoding/commands.go index af45ed42..5ac1fbd8 100644 --- a/proxy/vmess/encoding/commands.go +++ b/proxy/vmess/encoding/commands.go @@ -4,12 +4,12 @@ import ( "errors" "io" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/serial" - "github.com/v2ray/v2ray-core/common/uuid" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/serial" + "v2ray.com/core/common/uuid" + "v2ray.com/core/transport" ) var ( diff --git a/proxy/vmess/encoding/commands_test.go b/proxy/vmess/encoding/commands_test.go index 93615c8d..f57099e2 100644 --- a/proxy/vmess/encoding/commands_test.go +++ b/proxy/vmess/encoding/commands_test.go @@ -3,11 +3,11 @@ package encoding_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/uuid" - . "github.com/v2ray/v2ray-core/proxy/vmess/encoding" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/uuid" + . "v2ray.com/core/proxy/vmess/encoding" + "v2ray.com/core/testing/assert" ) func TestSwitchAccount(t *testing.T) { diff --git a/proxy/vmess/encoding/encoding_test.go b/proxy/vmess/encoding/encoding_test.go index fcf72edf..7954c634 100644 --- a/proxy/vmess/encoding/encoding_test.go +++ b/proxy/vmess/encoding/encoding_test.go @@ -3,13 +3,13 @@ package encoding_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/uuid" - "github.com/v2ray/v2ray-core/proxy/vmess" - . "github.com/v2ray/v2ray-core/proxy/vmess/encoding" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/uuid" + "v2ray.com/core/proxy/vmess" + . "v2ray.com/core/proxy/vmess/encoding" + "v2ray.com/core/testing/assert" ) func TestRequestSerialization(t *testing.T) { diff --git a/proxy/vmess/encoding/server.go b/proxy/vmess/encoding/server.go index d93332f0..9b6014e5 100644 --- a/proxy/vmess/encoding/server.go +++ b/proxy/vmess/encoding/server.go @@ -5,13 +5,13 @@ import ( "hash/fnv" "io" - "github.com/v2ray/v2ray-core/common/crypto" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/serial" - "github.com/v2ray/v2ray-core/proxy/vmess" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/crypto" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/serial" + "v2ray.com/core/proxy/vmess" + "v2ray.com/core/transport" ) type ServerSession struct { diff --git a/proxy/vmess/inbound/command.go b/proxy/vmess/inbound/command.go index ffaa66a2..cfe976a2 100644 --- a/proxy/vmess/inbound/command.go +++ b/proxy/vmess/inbound/command.go @@ -1,9 +1,9 @@ package inbound import ( - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/proxy/vmess" + "v2ray.com/core/common/log" + "v2ray.com/core/common/protocol" + "v2ray.com/core/proxy/vmess" ) func (this *VMessInboundHandler) generateCommand(request *protocol.RequestHeader) protocol.ResponseCommand { diff --git a/proxy/vmess/inbound/config.go b/proxy/vmess/inbound/config.go index 37b67bdd..67f31d6c 100644 --- a/proxy/vmess/inbound/config.go +++ b/proxy/vmess/inbound/config.go @@ -1,7 +1,7 @@ package inbound import ( - "github.com/v2ray/v2ray-core/common/protocol" + "v2ray.com/core/common/protocol" ) type DetourConfig struct { diff --git a/proxy/vmess/inbound/config_json.go b/proxy/vmess/inbound/config_json.go index e8ed83ef..10920277 100644 --- a/proxy/vmess/inbound/config_json.go +++ b/proxy/vmess/inbound/config_json.go @@ -6,9 +6,9 @@ import ( "encoding/json" "errors" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/proxy/vmess" + "v2ray.com/core/common/protocol" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/proxy/vmess" ) func (this *DetourConfig) UnmarshalJSON(data []byte) error { diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go index 9f01fb41..9e810f16 100644 --- a/proxy/vmess/inbound/inbound.go +++ b/proxy/vmess/inbound/inbound.go @@ -4,22 +4,22 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - "github.com/v2ray/v2ray-core/app/proxyman" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/uuid" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/proxy/vmess" - "github.com/v2ray/v2ray-core/proxy/vmess/encoding" - vmessio "github.com/v2ray/v2ray-core/proxy/vmess/io" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + "v2ray.com/core/app/proxyman" + "v2ray.com/core/common" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/uuid" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/proxy/vmess" + "v2ray.com/core/proxy/vmess/encoding" + vmessio "v2ray.com/core/proxy/vmess/io" + "v2ray.com/core/transport/internet" ) type userByEmail struct { diff --git a/proxy/vmess/io/io_test.go b/proxy/vmess/io/io_test.go index a2612180..f8bb265c 100644 --- a/proxy/vmess/io/io_test.go +++ b/proxy/vmess/io/io_test.go @@ -6,10 +6,10 @@ import ( "io" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" - . "github.com/v2ray/v2ray-core/proxy/vmess/io" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" + . "v2ray.com/core/proxy/vmess/io" + "v2ray.com/core/testing/assert" ) func TestAuthenticate(t *testing.T) { diff --git a/proxy/vmess/io/reader.go b/proxy/vmess/io/reader.go index b625ed3a..dfdee1bc 100644 --- a/proxy/vmess/io/reader.go +++ b/proxy/vmess/io/reader.go @@ -5,9 +5,9 @@ import ( "hash/fnv" "io" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/serial" - "github.com/v2ray/v2ray-core/transport" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/serial" + "v2ray.com/core/transport" ) // @Private diff --git a/proxy/vmess/io/writer.go b/proxy/vmess/io/writer.go index 42637b7e..f24fea50 100644 --- a/proxy/vmess/io/writer.go +++ b/proxy/vmess/io/writer.go @@ -3,8 +3,8 @@ package io import ( "hash/fnv" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" ) type AuthChunkWriter struct { diff --git a/proxy/vmess/outbound/command.go b/proxy/vmess/outbound/command.go index 3ffefbb9..cdad843a 100644 --- a/proxy/vmess/outbound/command.go +++ b/proxy/vmess/outbound/command.go @@ -3,9 +3,9 @@ package outbound import ( "time" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/proxy/vmess" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/proxy/vmess" ) func (this *VMessOutboundHandler) handleSwitchAccount(cmd *protocol.CommandSwitchAccount) { diff --git a/proxy/vmess/outbound/config.go b/proxy/vmess/outbound/config.go index 36d8f2c5..4eee663d 100644 --- a/proxy/vmess/outbound/config.go +++ b/proxy/vmess/outbound/config.go @@ -1,7 +1,7 @@ package outbound import ( - "github.com/v2ray/v2ray-core/common/protocol" + "v2ray.com/core/common/protocol" ) type Config struct { diff --git a/proxy/vmess/outbound/config_json.go b/proxy/vmess/outbound/config_json.go index ea722e73..3db3b1dc 100644 --- a/proxy/vmess/outbound/config_json.go +++ b/proxy/vmess/outbound/config_json.go @@ -6,13 +6,13 @@ import ( "encoding/json" "errors" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/serial" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/proxy/vmess" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/serial" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/proxy/vmess" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/proxy/vmess/outbound/config_json_test.go b/proxy/vmess/outbound/config_json_test.go index 3dcd8bf9..3d6d483e 100644 --- a/proxy/vmess/outbound/config_json_test.go +++ b/proxy/vmess/outbound/config_json_test.go @@ -6,9 +6,9 @@ import ( "encoding/json" "testing" - //"github.com/v2ray/v2ray-core/common/protocol" - . "github.com/v2ray/v2ray-core/proxy/vmess/outbound" - "github.com/v2ray/v2ray-core/testing/assert" + //"v2ray.com/core/common/protocol" + . "v2ray.com/core/proxy/vmess/outbound" + "v2ray.com/core/testing/assert" ) func TestConfigTargetParsing(t *testing.T) { diff --git a/proxy/vmess/outbound/outbound.go b/proxy/vmess/outbound/outbound.go index f8ca4e9f..9b36feba 100644 --- a/proxy/vmess/outbound/outbound.go +++ b/proxy/vmess/outbound/outbound.go @@ -4,19 +4,19 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/retry" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/proxy/registry" - "github.com/v2ray/v2ray-core/proxy/vmess/encoding" - vmessio "github.com/v2ray/v2ray-core/proxy/vmess/io" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/retry" + "v2ray.com/core/proxy" + "v2ray.com/core/proxy/registry" + "v2ray.com/core/proxy/vmess/encoding" + vmessio "v2ray.com/core/proxy/vmess/io" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/ray" ) type VMessOutboundHandler struct { diff --git a/proxy/vmess/vmess.go b/proxy/vmess/vmess.go index 8a37a001..d52410c4 100644 --- a/proxy/vmess/vmess.go +++ b/proxy/vmess/vmess.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/common/dice" - "github.com/v2ray/v2ray-core/common/protocol" - "github.com/v2ray/v2ray-core/common/signal" + "v2ray.com/core/common/dice" + "v2ray.com/core/common/protocol" + "v2ray.com/core/common/signal" ) type Account struct { diff --git a/release/install-release.sh b/release/install-release.sh index 4bf2c726..c7278a60 100755 --- a/release/install-release.sh +++ b/release/install-release.sh @@ -1,7 +1,7 @@ #!/bin/bash # This file is accessible as https://install.direct/go.sh -# Original source is located at github.com/v2ray/v2ray-core/release/install-release.sh +# Original source is located at v2ray.com/core/release/install-release.sh while [[ $# > 0 ]] do @@ -115,7 +115,7 @@ echo "Installing V2Ray ${VER} on ${ARCH}" if [ -n "$LOCAL" ]; then cp "$LOCAL" "/tmp/v2ray/v2ray.zip" else - DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/download/${VER}/v2ray-linux-${VDIS}.zip" + DOWNLOAD_LINK="https://v2ray.com/core/releases/download/${VER}/v2ray-linux-${VDIS}.zip" install_component "curl" diff --git a/release/install.sh b/release/install.sh index 9f80c730..fe1cca69 100755 --- a/release/install.sh +++ b/release/install.sh @@ -21,7 +21,7 @@ if [ -z "$GOPATH" ]; then export GOPATH=/v2ray fi -go get -u github.com/v2ray/v2ray-core +go get -u v2ray.com/core rm $GOPATH/bin/build -go install github.com/v2ray/v2ray-core/tools/build +go install v2ray.com/core/tools/build $GOPATH/bin/build diff --git a/shell/point/config.go b/shell/point/config.go index 2813e5ae..1b0f0f55 100644 --- a/shell/point/config.go +++ b/shell/point/config.go @@ -1,13 +1,13 @@ package point import ( - "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/app/router" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/app/dns" + "v2ray.com/core/app/router" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport" + "v2ray.com/core/transport/internet" ) type InboundConnectionConfig struct { diff --git a/shell/point/config_json.go b/shell/point/config_json.go index 2288fd74..5917d5f9 100644 --- a/shell/point/config_json.go +++ b/shell/point/config_json.go @@ -9,13 +9,13 @@ import ( "os" "strings" - "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/app/router" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/app/dns" + "v2ray.com/core/app/router" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport" + "v2ray.com/core/transport/internet" ) const ( diff --git a/shell/point/config_json_test.go b/shell/point/config_json_test.go index 664f03bb..f1ebc646 100644 --- a/shell/point/config_json_test.go +++ b/shell/point/config_json_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - _ "github.com/v2ray/v2ray-core/app/router/rules" - . "github.com/v2ray/v2ray-core/shell/point" + _ "v2ray.com/core/app/router/rules" + . "v2ray.com/core/shell/point" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/testing/assert" ) func TestClientSampleConfig(t *testing.T) { diff --git a/shell/point/inbound_detour.go b/shell/point/inbound_detour.go index 3e9bdcf1..81179c31 100644 --- a/shell/point/inbound_detour.go +++ b/shell/point/inbound_detour.go @@ -1,7 +1,7 @@ package point import ( - "github.com/v2ray/v2ray-core/proxy" + "v2ray.com/core/proxy" ) type InboundDetourHandler interface { diff --git a/shell/point/inbound_detour_always.go b/shell/point/inbound_detour_always.go index ca5804d9..61382342 100644 --- a/shell/point/inbound_detour_always.go +++ b/shell/point/inbound_detour_always.go @@ -1,12 +1,12 @@ package point import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/common/dice" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/retry" - "github.com/v2ray/v2ray-core/proxy" - proxyregistry "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/app" + "v2ray.com/core/common/dice" + "v2ray.com/core/common/log" + "v2ray.com/core/common/retry" + "v2ray.com/core/proxy" + proxyregistry "v2ray.com/core/proxy/registry" ) // Handler for inbound detour connections. diff --git a/shell/point/inbound_detour_dynamic.go b/shell/point/inbound_detour_dynamic.go index 066958df..ab455f81 100644 --- a/shell/point/inbound_detour_dynamic.go +++ b/shell/point/inbound_detour_dynamic.go @@ -4,13 +4,13 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/common/dice" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/retry" - "github.com/v2ray/v2ray-core/proxy" - proxyregistry "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/app" + "v2ray.com/core/common/dice" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/retry" + "v2ray.com/core/proxy" + proxyregistry "v2ray.com/core/proxy/registry" ) type InboundDetourHandlerDynamic struct { diff --git a/shell/point/main/main.go b/shell/point/main/main.go index 1f93dd32..d1217f36 100644 --- a/shell/point/main/main.go +++ b/shell/point/main/main.go @@ -8,29 +8,29 @@ import ( "path/filepath" "syscall" - "github.com/v2ray/v2ray-core" - _ "github.com/v2ray/v2ray-core/app/router/rules" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/shell/point" + "v2ray.com/core" + _ "v2ray.com/core/app/router/rules" + "v2ray.com/core/common/log" + "v2ray.com/core/shell/point" // The following are necessary as they register handlers in their init functions. - _ "github.com/v2ray/v2ray-core/proxy/blackhole" - _ "github.com/v2ray/v2ray-core/proxy/dokodemo" - _ "github.com/v2ray/v2ray-core/proxy/freedom" - _ "github.com/v2ray/v2ray-core/proxy/http" - _ "github.com/v2ray/v2ray-core/proxy/shadowsocks" - _ "github.com/v2ray/v2ray-core/proxy/socks" - _ "github.com/v2ray/v2ray-core/proxy/vmess/inbound" - _ "github.com/v2ray/v2ray-core/proxy/vmess/outbound" + _ "v2ray.com/core/proxy/blackhole" + _ "v2ray.com/core/proxy/dokodemo" + _ "v2ray.com/core/proxy/freedom" + _ "v2ray.com/core/proxy/http" + _ "v2ray.com/core/proxy/shadowsocks" + _ "v2ray.com/core/proxy/socks" + _ "v2ray.com/core/proxy/vmess/inbound" + _ "v2ray.com/core/proxy/vmess/outbound" - _ "github.com/v2ray/v2ray-core/transport/internet/kcp" - _ "github.com/v2ray/v2ray-core/transport/internet/tcp" - _ "github.com/v2ray/v2ray-core/transport/internet/udp" - _ "github.com/v2ray/v2ray-core/transport/internet/ws" + _ "v2ray.com/core/transport/internet/kcp" + _ "v2ray.com/core/transport/internet/tcp" + _ "v2ray.com/core/transport/internet/udp" + _ "v2ray.com/core/transport/internet/ws" - _ "github.com/v2ray/v2ray-core/transport/internet/authenticators/noop" - _ "github.com/v2ray/v2ray-core/transport/internet/authenticators/srtp" - _ "github.com/v2ray/v2ray-core/transport/internet/authenticators/utp" + _ "v2ray.com/core/transport/internet/authenticators/noop" + _ "v2ray.com/core/transport/internet/authenticators/srtp" + _ "v2ray.com/core/transport/internet/authenticators/utp" ) var ( diff --git a/shell/point/point.go b/shell/point/point.go index 69c72114..715f0364 100644 --- a/shell/point/point.go +++ b/shell/point/point.go @@ -5,18 +5,18 @@ package point import ( - "github.com/v2ray/v2ray-core/app" - "github.com/v2ray/v2ray-core/app/dispatcher" - dispatchers "github.com/v2ray/v2ray-core/app/dispatcher/impl" - "github.com/v2ray/v2ray-core/app/dns" - "github.com/v2ray/v2ray-core/app/proxyman" - "github.com/v2ray/v2ray-core/app/router" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/retry" - "github.com/v2ray/v2ray-core/proxy" - proxyregistry "github.com/v2ray/v2ray-core/proxy/registry" + "v2ray.com/core/app" + "v2ray.com/core/app/dispatcher" + dispatchers "v2ray.com/core/app/dispatcher/impl" + "v2ray.com/core/app/dns" + "v2ray.com/core/app/proxyman" + "v2ray.com/core/app/router" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/retry" + "v2ray.com/core/proxy" + proxyregistry "v2ray.com/core/proxy/registry" ) // Point shell of V2Ray. diff --git a/testing/assert/address.go b/testing/assert/address.go index 5f1058a3..28d2544b 100644 --- a/testing/assert/address.go +++ b/testing/assert/address.go @@ -1,7 +1,7 @@ package assert import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) func (this *Assert) Address(value v2net.Address) *AddressSubject { diff --git a/testing/assert/byte.go b/testing/assert/byte.go index 11ea5eda..ac250488 100644 --- a/testing/assert/byte.go +++ b/testing/assert/byte.go @@ -1,7 +1,7 @@ package assert import ( - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) func (this *Assert) Byte(value byte) *ByteSubject { diff --git a/testing/assert/bytes.go b/testing/assert/bytes.go index 3b59c75f..c791a2b5 100644 --- a/testing/assert/bytes.go +++ b/testing/assert/bytes.go @@ -3,7 +3,7 @@ package assert import ( "bytes" - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) func (this *Assert) Bytes(value []byte) *BytesSubject { diff --git a/testing/assert/destination.go b/testing/assert/destination.go index c4ce949a..38cee62c 100644 --- a/testing/assert/destination.go +++ b/testing/assert/destination.go @@ -1,7 +1,7 @@ package assert import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) func (this *Assert) Destination(value v2net.Destination) *DestinationSubject { diff --git a/testing/assert/int64.go b/testing/assert/int64.go index 09a76f46..8e5c7383 100644 --- a/testing/assert/int64.go +++ b/testing/assert/int64.go @@ -1,7 +1,7 @@ package assert import ( - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) func (this *Assert) Int64(value int64) *Int64Subject { diff --git a/testing/assert/intsubject.go b/testing/assert/intsubject.go index bc118346..4d101752 100644 --- a/testing/assert/intsubject.go +++ b/testing/assert/intsubject.go @@ -1,7 +1,7 @@ package assert import ( - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) func (this *Assert) Int(value int) *IntSubject { diff --git a/testing/assert/pointer.go b/testing/assert/pointer.go index f1e75a54..502d2204 100644 --- a/testing/assert/pointer.go +++ b/testing/assert/pointer.go @@ -3,7 +3,7 @@ package assert import ( "reflect" - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) func (this *Assert) Pointer(value interface{}) *PointerSubject { diff --git a/testing/assert/port.go b/testing/assert/port.go index b23d9d80..a534eff2 100644 --- a/testing/assert/port.go +++ b/testing/assert/port.go @@ -1,7 +1,7 @@ package assert import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) func (this *Assert) Port(value v2net.Port) *PortSubject { diff --git a/testing/assert/uint16.go b/testing/assert/uint16.go index 0789037f..806473ca 100644 --- a/testing/assert/uint16.go +++ b/testing/assert/uint16.go @@ -1,7 +1,7 @@ package assert import ( - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) func (this *Assert) Uint16(value uint16) *Uint16Subject { diff --git a/testing/assert/uint32.go b/testing/assert/uint32.go index a032b5fc..61fb9e9f 100644 --- a/testing/assert/uint32.go +++ b/testing/assert/uint32.go @@ -1,7 +1,7 @@ package assert import ( - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common/serial" ) func (this *Assert) Uint32(value uint32) *Uint32Subject { diff --git a/testing/coverage/coverall b/testing/coverage/coverall index 7d045730..3b6416bf 100755 --- a/testing/coverage/coverall +++ b/testing/coverage/coverall @@ -7,7 +7,7 @@ V2RAY_COV=${V2RAY_OUT}/cov COVERAGE_FILE=${V2RAY_COV}/coverage.txt function test_package { - DIR="github.com/v2ray/v2ray-core/$1" + DIR="v2ray.com/core/$1" DEP=$(go list -f '{{ join .Deps "\n" }}' $DIR | grep v2ray | tr '\n' ',') DEP=${DEP}$DIR RND_NAME=$(openssl rand -hex 16) diff --git a/testing/scenarios/dokodemo_test.go b/testing/scenarios/dokodemo_test.go index 53ed87ac..61451642 100644 --- a/testing/scenarios/dokodemo_test.go +++ b/testing/scenarios/dokodemo_test.go @@ -4,9 +4,9 @@ import ( "net" "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" ) func TestDokodemoTCP(t *testing.T) { diff --git a/testing/scenarios/dynamic_vmess_test.go b/testing/scenarios/dynamic_vmess_test.go index cec69c0d..472cf3f7 100644 --- a/testing/scenarios/dynamic_vmess_test.go +++ b/testing/scenarios/dynamic_vmess_test.go @@ -6,9 +6,9 @@ import ( "net" "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" ) func TestDynamicVMess(t *testing.T) { diff --git a/testing/scenarios/http_test.go b/testing/scenarios/http_test.go index 590c6db8..d471a343 100644 --- a/testing/scenarios/http_test.go +++ b/testing/scenarios/http_test.go @@ -6,9 +6,9 @@ import ( "net/url" "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - v2http "github.com/v2ray/v2ray-core/testing/servers/http" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + v2http "v2ray.com/core/testing/servers/http" ) func TestHttpProxy(t *testing.T) { diff --git a/testing/scenarios/router_test.go b/testing/scenarios/router_test.go index 05e9753d..af85f338 100644 --- a/testing/scenarios/router_test.go +++ b/testing/scenarios/router_test.go @@ -4,9 +4,9 @@ import ( "net" "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" ) func TestRouter(t *testing.T) { diff --git a/testing/scenarios/server_env.go b/testing/scenarios/server_env.go index d548aaba..7a1fd623 100644 --- a/testing/scenarios/server_env.go +++ b/testing/scenarios/server_env.go @@ -7,18 +7,18 @@ import ( "runtime" "time" - _ "github.com/v2ray/v2ray-core/app/router/rules" - "github.com/v2ray/v2ray-core/common/log" + _ "v2ray.com/core/app/router/rules" + "v2ray.com/core/common/log" // The following are necessary as they register handlers in their init functions. - _ "github.com/v2ray/v2ray-core/proxy/blackhole" - _ "github.com/v2ray/v2ray-core/proxy/dokodemo" - _ "github.com/v2ray/v2ray-core/proxy/freedom" - _ "github.com/v2ray/v2ray-core/proxy/http" - _ "github.com/v2ray/v2ray-core/proxy/shadowsocks" - _ "github.com/v2ray/v2ray-core/proxy/socks" - _ "github.com/v2ray/v2ray-core/proxy/vmess/inbound" - _ "github.com/v2ray/v2ray-core/proxy/vmess/outbound" + _ "v2ray.com/core/proxy/blackhole" + _ "v2ray.com/core/proxy/dokodemo" + _ "v2ray.com/core/proxy/freedom" + _ "v2ray.com/core/proxy/http" + _ "v2ray.com/core/proxy/shadowsocks" + _ "v2ray.com/core/proxy/socks" + _ "v2ray.com/core/proxy/vmess/inbound" + _ "v2ray.com/core/proxy/vmess/outbound" ) var ( diff --git a/testing/scenarios/server_env_coverage.go b/testing/scenarios/server_env_coverage.go index ffce2113..9d1b1073 100644 --- a/testing/scenarios/server_env_coverage.go +++ b/testing/scenarios/server_env_coverage.go @@ -7,7 +7,7 @@ import ( "os/exec" "path/filepath" - "github.com/v2ray/v2ray-core/common/uuid" + "v2ray.com/core/common/uuid" ) func BuildV2Ray() error { @@ -16,7 +16,7 @@ func BuildV2Ray() error { return nil } - cmd := exec.Command("go", "test", "-tags", "json coverage coveragemain", "-coverpkg", "github.com/v2ray/v2ray-core/...", "-c", "-o", binaryPath, GetSourcePath()) + cmd := exec.Command("go", "test", "-tags", "json coverage coveragemain", "-coverpkg", "v2ray.com/core/...", "-c", "-o", binaryPath, GetSourcePath()) return cmd.Run() } diff --git a/testing/scenarios/shadowsocks_test.go b/testing/scenarios/shadowsocks_test.go index fc8af5ee..d29b5f5a 100644 --- a/testing/scenarios/shadowsocks_test.go +++ b/testing/scenarios/shadowsocks_test.go @@ -4,9 +4,9 @@ import ( "net" "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" ssclient "github.com/shadowsocks/shadowsocks-go/shadowsocks" ) diff --git a/testing/scenarios/socks5_helper.go b/testing/scenarios/socks5_helper.go index bc713b72..97ceef7f 100644 --- a/testing/scenarios/socks5_helper.go +++ b/testing/scenarios/socks5_helper.go @@ -1,7 +1,7 @@ package scenarios import ( - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) const ( diff --git a/testing/scenarios/socks_end_test.go b/testing/scenarios/socks_end_test.go index 60a1f1cb..71718339 100644 --- a/testing/scenarios/socks_end_test.go +++ b/testing/scenarios/socks_end_test.go @@ -4,10 +4,10 @@ import ( "net" "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" - "github.com/v2ray/v2ray-core/testing/servers/udp" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" + "v2ray.com/core/testing/servers/udp" ) func TestTCPConnection(t *testing.T) { diff --git a/testing/servers/http/http.go b/testing/servers/http/http.go index bd041e40..0d305c8f 100644 --- a/testing/servers/http/http.go +++ b/testing/servers/http/http.go @@ -3,7 +3,7 @@ package tcp import ( "net/http" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Server struct { diff --git a/testing/servers/tcp/tcp.go b/testing/servers/tcp/tcp.go index 9874d1f2..9e6ac6ac 100644 --- a/testing/servers/tcp/tcp.go +++ b/testing/servers/tcp/tcp.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Server struct { diff --git a/testing/servers/udp/udp.go b/testing/servers/udp/udp.go index 13a1b864..2028318e 100644 --- a/testing/servers/udp/udp.go +++ b/testing/servers/udp/udp.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) type Server struct { diff --git a/tools/build/build.go b/tools/build/build.go index ccf62fd7..9d63af2d 100644 --- a/tools/build/build.go +++ b/tools/build/build.go @@ -7,7 +7,7 @@ import ( "path/filepath" "runtime" - "github.com/v2ray/v2ray-core/tools/git" + "v2ray.com/core/tools/git" ) var ( diff --git a/tools/build/build_test.go b/tools/build/build_test.go index bed8a1fb..82842d2c 100644 --- a/tools/build/build_test.go +++ b/tools/build/build_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/testing/assert" ) func cleanBinPath() { diff --git a/tools/build/env_test.go b/tools/build/env_test.go index 4dbfd84e..bf0baa9a 100644 --- a/tools/build/env_test.go +++ b/tools/build/env_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/testing/assert" ) func TestParseOS(t *testing.T) { diff --git a/tools/build/go.go b/tools/build/go.go index 9ba846b3..150e6f96 100644 --- a/tools/build/go.go +++ b/tools/build/go.go @@ -12,9 +12,9 @@ func buildV2Ray(targetFile string, version string, goOS GoOS, goArch GoArch) err if version != "custom" { year, month, day := time.Now().UTC().Date() today := fmt.Sprintf("%04d%02d%02d", year, int(month), day) - ldFlags = ldFlags + " -X github.com/v2ray/v2ray-core.version=" + version + " -X github.com/v2ray/v2ray-core.build=" + today + ldFlags = ldFlags + " -X v2ray.com/core.version=" + version + " -X v2ray.com/core.build=" + today } - cmd := exec.Command("go", "build", "-tags", "json", "-o", targetFile, "-compiler", "gc", "-ldflags", ldFlags, "github.com/v2ray/v2ray-core/shell/point/main") + cmd := exec.Command("go", "build", "-tags", "json", "-o", targetFile, "-compiler", "gc", "-ldflags", ldFlags, "v2ray.com/core/shell/point/main") cmd.Env = append(cmd.Env, "GOOS="+string(goOS), "GOARCH="+string(goArch)) cmd.Env = append(cmd.Env, os.Environ()...) output, err := cmd.CombinedOutput() diff --git a/tools/build/go_test.go b/tools/build/go_test.go index 3a26a52e..d01647ef 100644 --- a/tools/build/go_test.go +++ b/tools/build/go_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/testing/assert" ) func TestBuildAndRun(t *testing.T) { diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 33ee0099..a090829d 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,8 +1,8 @@ FROM golang:latest -RUN go get -u github.com/v2ray/v2ray-core \ +RUN go get -u v2ray.com/core/... \ && rm -f $GOPATH/bin/build \ - && go install github.com/v2ray/v2ray-core/tools/build \ + && go install v2ray.com/core/tools/build \ && build \ && mv bin/v2ray-custom-linux-64/v2ray bin \ && rm -rf pkg src diff --git a/tools/docker/gen-server-cfg.sh b/tools/docker/gen-server-cfg.sh index 4886746d..375bb041 100755 --- a/tools/docker/gen-server-cfg.sh +++ b/tools/docker/gen-server-cfg.sh @@ -11,11 +11,11 @@ echo "Generated client ID: $ID" cat < server-cfg.json { - "port": $PORT, "log" : { "access": "/go/access.log" }, "inbound": { + "port": $PORT, "protocol": "vmess", "settings": { "clients": [ diff --git a/tools/git/git_test.go b/tools/git/git_test.go index 4006f200..6eeb727d 100644 --- a/tools/git/git_test.go +++ b/tools/git/git_test.go @@ -3,7 +3,7 @@ package git import ( "testing" - "github.com/v2ray/v2ray-core/testing/assert" + "v2ray.com/core/testing/assert" ) func TestRevParse(t *testing.T) { diff --git a/tools/release/make-release.sh b/tools/release/make-release.sh index a212ffeb..aedb8702 100755 --- a/tools/release/make-release.sh +++ b/tools/release/make-release.sh @@ -15,7 +15,7 @@ MINOR=${PARTS[1]} MINOR=$((MINOR+1)) VERN=${MAJOR}.${MINOR} -pushd $GOPATH/src/github.com/v2ray/v2ray-core +pushd $GOPATH/src/v2ray.com/core echo "Adding a new tag: " "v$VER" git tag -s -a "v$VER" -m "$MSG" sed -i '' "s/\(version *= *\"\).*\(\"\)/\1$VERN\2/g" core.go diff --git a/tools/release/release-ci.sh b/tools/release/release-ci.sh index 07041879..958fd9c5 100755 --- a/tools/release/release-ci.sh +++ b/tools/release/release-ci.sh @@ -1,6 +1,6 @@ #!/bin/bash -go install github.com/v2ray/v2ray-core/tools/build +go install v2ray.com/core/tools/build $GOPATH/bin/build --os=windows --arch=x86 --zip $GOPATH/bin/build --os=windows --arch=x64 --zip diff --git a/transport/config.go b/transport/config.go index 55c7ccc1..dde8a791 100644 --- a/transport/config.go +++ b/transport/config.go @@ -1,9 +1,9 @@ package transport import ( - "github.com/v2ray/v2ray-core/transport/internet/kcp" - "github.com/v2ray/v2ray-core/transport/internet/tcp" - "github.com/v2ray/v2ray-core/transport/internet/ws" + "v2ray.com/core/transport/internet/kcp" + "v2ray.com/core/transport/internet/tcp" + "v2ray.com/core/transport/internet/ws" ) // Config for V2Ray transport layer. diff --git a/transport/config_json.go b/transport/config_json.go index 6dbd9c8f..b6e076d1 100644 --- a/transport/config_json.go +++ b/transport/config_json.go @@ -5,9 +5,9 @@ package transport import ( "encoding/json" - "github.com/v2ray/v2ray-core/transport/internet/kcp" - "github.com/v2ray/v2ray-core/transport/internet/tcp" - "github.com/v2ray/v2ray-core/transport/internet/ws" + "v2ray.com/core/transport/internet/kcp" + "v2ray.com/core/transport/internet/tcp" + "v2ray.com/core/transport/internet/ws" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/transport/internet/authenticator.go b/transport/internet/authenticator.go index 1c675a44..41af2c36 100644 --- a/transport/internet/authenticator.go +++ b/transport/internet/authenticator.go @@ -1,9 +1,9 @@ package internet import ( - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/loader" + "v2ray.com/core/common" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/loader" ) type Authenticator interface { diff --git a/transport/internet/authenticator_json.go b/transport/internet/authenticator_json.go index 200309c3..450cdc59 100644 --- a/transport/internet/authenticator_json.go +++ b/transport/internet/authenticator_json.go @@ -2,7 +2,7 @@ package internet -import "github.com/v2ray/v2ray-core/common/loader" +import "v2ray.com/core/common/loader" func init() { configCache = loader.NewJSONConfigLoader("type", "") diff --git a/transport/internet/authenticator_test.go b/transport/internet/authenticator_test.go index ce8d0871..290655cd 100644 --- a/transport/internet/authenticator_test.go +++ b/transport/internet/authenticator_test.go @@ -3,11 +3,11 @@ package internet_test import ( "testing" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet" - _ "github.com/v2ray/v2ray-core/transport/internet/authenticators/noop" - _ "github.com/v2ray/v2ray-core/transport/internet/authenticators/srtp" - _ "github.com/v2ray/v2ray-core/transport/internet/authenticators/utp" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet" + _ "v2ray.com/core/transport/internet/authenticators/noop" + _ "v2ray.com/core/transport/internet/authenticators/srtp" + _ "v2ray.com/core/transport/internet/authenticators/utp" ) func TestAllAuthenticatorLoadable(t *testing.T) { diff --git a/transport/internet/authenticators/noop/noop.go b/transport/internet/authenticators/noop/noop.go index 2016d127..2ea99b28 100644 --- a/transport/internet/authenticators/noop/noop.go +++ b/transport/internet/authenticators/noop/noop.go @@ -1,8 +1,8 @@ package noop import ( - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/alloc" + "v2ray.com/core/transport/internet" ) type NoOpAuthenticator struct{} diff --git a/transport/internet/authenticators/srtp/srtp.go b/transport/internet/authenticators/srtp/srtp.go index 0b4d9f00..84045325 100644 --- a/transport/internet/authenticators/srtp/srtp.go +++ b/transport/internet/authenticators/srtp/srtp.go @@ -3,8 +3,8 @@ package srtp import ( "math/rand" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/alloc" + "v2ray.com/core/transport/internet" ) type Config struct { diff --git a/transport/internet/authenticators/srtp/srtp_test.go b/transport/internet/authenticators/srtp/srtp_test.go index 7353ef5d..77eeac28 100644 --- a/transport/internet/authenticators/srtp/srtp_test.go +++ b/transport/internet/authenticators/srtp/srtp_test.go @@ -3,9 +3,9 @@ package srtp_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/authenticators/srtp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/authenticators/srtp" ) func TestSRTPOpenSeal(t *testing.T) { diff --git a/transport/internet/authenticators/utp/utp.go b/transport/internet/authenticators/utp/utp.go index 761e3a05..79deb2ac 100644 --- a/transport/internet/authenticators/utp/utp.go +++ b/transport/internet/authenticators/utp/utp.go @@ -3,8 +3,8 @@ package utp import ( "math/rand" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/alloc" + "v2ray.com/core/transport/internet" ) type Config struct { diff --git a/transport/internet/authenticators/utp/utp_test.go b/transport/internet/authenticators/utp/utp_test.go index effc469d..c7bedde8 100644 --- a/transport/internet/authenticators/utp/utp_test.go +++ b/transport/internet/authenticators/utp/utp_test.go @@ -3,9 +3,9 @@ package utp_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/authenticators/utp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/authenticators/utp" ) func TestUTPOpenSeal(t *testing.T) { diff --git a/transport/internet/connection_json.go b/transport/internet/connection_json.go index aff84812..ef8e8930 100644 --- a/transport/internet/connection_json.go +++ b/transport/internet/connection_json.go @@ -8,7 +8,7 @@ import ( "errors" "strings" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) func (this *TLSSettings) UnmarshalJSON(data []byte) error { diff --git a/transport/internet/dialer.go b/transport/internet/dialer.go index af9b4306..a527327f 100644 --- a/transport/internet/dialer.go +++ b/transport/internet/dialer.go @@ -5,8 +5,8 @@ import ( "errors" "net" - v2net "github.com/v2ray/v2ray-core/common/net" - v2tls "github.com/v2ray/v2ray-core/transport/internet/tls" + v2net "v2ray.com/core/common/net" + v2tls "v2ray.com/core/transport/internet/tls" ) var ( diff --git a/transport/internet/dialer_test.go b/transport/internet/dialer_test.go index cf6c0d5e..8778f5ff 100644 --- a/transport/internet/dialer_test.go +++ b/transport/internet/dialer_test.go @@ -3,10 +3,10 @@ package internet_test import ( "testing" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/testing/servers/tcp" - . "github.com/v2ray/v2ray-core/transport/internet" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/testing/servers/tcp" + . "v2ray.com/core/transport/internet" ) func TestDialDomain(t *testing.T) { diff --git a/transport/internet/kcp/buffer.go b/transport/internet/kcp/buffer.go index 05993496..98e2f913 100644 --- a/transport/internet/kcp/buffer.go +++ b/transport/internet/kcp/buffer.go @@ -3,7 +3,7 @@ package kcp import ( "sync" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) const ( diff --git a/transport/internet/kcp/buffer_test.go b/transport/internet/kcp/buffer_test.go index f6c7304d..c9fddb0b 100644 --- a/transport/internet/kcp/buffer_test.go +++ b/transport/internet/kcp/buffer_test.go @@ -3,8 +3,8 @@ package kcp_test import ( "testing" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/kcp" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/kcp" ) func TestBuffer(t *testing.T) { diff --git a/transport/internet/kcp/config.go b/transport/internet/kcp/config.go index 18b86fdf..b229f2fe 100644 --- a/transport/internet/kcp/config.go +++ b/transport/internet/kcp/config.go @@ -1,7 +1,7 @@ package kcp import ( - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/transport/internet" ) type Config struct { diff --git a/transport/internet/kcp/config_json.go b/transport/internet/kcp/config_json.go index 90629bec..4d419b80 100644 --- a/transport/internet/kcp/config_json.go +++ b/transport/internet/kcp/config_json.go @@ -5,9 +5,9 @@ package kcp import ( "encoding/json" - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common" + "v2ray.com/core/common/log" + "v2ray.com/core/transport/internet" ) func (this *Config) UnmarshalJSON(data []byte) error { diff --git a/transport/internet/kcp/connection.go b/transport/internet/kcp/connection.go index 1d8cf944..8a615af5 100644 --- a/transport/internet/kcp/connection.go +++ b/transport/internet/kcp/connection.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "time" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + "v2ray.com/core/transport/internet" ) var ( diff --git a/transport/internet/kcp/connection_test.go b/transport/internet/kcp/connection_test.go index c4ab5af4..fd7f51d0 100644 --- a/transport/internet/kcp/connection_test.go +++ b/transport/internet/kcp/connection_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/internet/authenticators/srtp" - . "github.com/v2ray/v2ray-core/transport/internet/kcp" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/internet/authenticators/srtp" + . "v2ray.com/core/transport/internet/kcp" ) type NoOpWriteCloser struct{} diff --git a/transport/internet/kcp/crypt.go b/transport/internet/kcp/crypt.go index cdb4b1f1..c586e7e3 100644 --- a/transport/internet/kcp/crypt.go +++ b/transport/internet/kcp/crypt.go @@ -3,9 +3,9 @@ package kcp import ( "hash/fnv" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/serial" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/serial" + "v2ray.com/core/transport/internet" ) type SimpleAuthenticator struct{} diff --git a/transport/internet/kcp/crypt_test.go b/transport/internet/kcp/crypt_test.go index 77f09cac..a91e57d1 100644 --- a/transport/internet/kcp/crypt_test.go +++ b/transport/internet/kcp/crypt_test.go @@ -4,9 +4,9 @@ import ( "crypto/rand" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/kcp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/kcp" ) func TestSimpleAuthenticator(t *testing.T) { diff --git a/transport/internet/kcp/dialer.go b/transport/internet/kcp/dialer.go index 8061db0a..e40c5065 100644 --- a/transport/internet/kcp/dialer.go +++ b/transport/internet/kcp/dialer.go @@ -4,10 +4,10 @@ import ( "net" "sync/atomic" - "github.com/v2ray/v2ray-core/common/dice" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/dice" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) var ( diff --git a/transport/internet/kcp/kcp_test.go b/transport/internet/kcp/kcp_test.go index 64464178..84515ae4 100644 --- a/transport/internet/kcp/kcp_test.go +++ b/transport/internet/kcp/kcp_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/kcp" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/kcp" ) func TestDialAndListen(t *testing.T) { diff --git a/transport/internet/kcp/listener.go b/transport/internet/kcp/listener.go index 5bdcb1a1..ae18cb89 100644 --- a/transport/internet/kcp/listener.go +++ b/transport/internet/kcp/listener.go @@ -5,13 +5,13 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/common/serial" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/internet" - "github.com/v2ray/v2ray-core/transport/internet/udp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/common/serial" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/internet" + "v2ray.com/core/transport/internet/udp" ) // Listener defines a server listening for connections diff --git a/transport/internet/kcp/output.go b/transport/internet/kcp/output.go index d9642f27..9a95e441 100644 --- a/transport/internet/kcp/output.go +++ b/transport/internet/kcp/output.go @@ -4,9 +4,9 @@ import ( "io" "sync" - "github.com/v2ray/v2ray-core/common/alloc" - v2io "github.com/v2ray/v2ray-core/common/io" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/alloc" + v2io "v2ray.com/core/common/io" + "v2ray.com/core/transport/internet" ) type SegmentWriter interface { diff --git a/transport/internet/kcp/receiving.go b/transport/internet/kcp/receiving.go index 33fbe6ea..88031eb0 100644 --- a/transport/internet/kcp/receiving.go +++ b/transport/internet/kcp/receiving.go @@ -3,7 +3,7 @@ package kcp import ( "sync" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) type ReceivingWindow struct { diff --git a/transport/internet/kcp/receiving_test.go b/transport/internet/kcp/receiving_test.go index 019baa92..00cae23e 100644 --- a/transport/internet/kcp/receiving_test.go +++ b/transport/internet/kcp/receiving_test.go @@ -3,9 +3,9 @@ package kcp_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/kcp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/kcp" ) func TestRecivingWindow(t *testing.T) { diff --git a/transport/internet/kcp/segment.go b/transport/internet/kcp/segment.go index 322db246..11482fc5 100644 --- a/transport/internet/kcp/segment.go +++ b/transport/internet/kcp/segment.go @@ -1,10 +1,10 @@ package kcp import ( - "github.com/v2ray/v2ray-core/common" - "github.com/v2ray/v2ray-core/common/alloc" - _ "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/serial" + "v2ray.com/core/common" + "v2ray.com/core/common/alloc" + _ "v2ray.com/core/common/log" + "v2ray.com/core/common/serial" ) type Command byte diff --git a/transport/internet/kcp/segment_test.go b/transport/internet/kcp/segment_test.go index da460038..6e63c773 100644 --- a/transport/internet/kcp/segment_test.go +++ b/transport/internet/kcp/segment_test.go @@ -3,9 +3,9 @@ package kcp_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/kcp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/kcp" ) func TestBadSegment(t *testing.T) { diff --git a/transport/internet/kcp/sending.go b/transport/internet/kcp/sending.go index 826a3e6a..6fb854cf 100644 --- a/transport/internet/kcp/sending.go +++ b/transport/internet/kcp/sending.go @@ -3,7 +3,7 @@ package kcp import ( "sync" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) type SendingWindow struct { diff --git a/transport/internet/kcp/sending_test.go b/transport/internet/kcp/sending_test.go index 19cc5280..e564a9e5 100644 --- a/transport/internet/kcp/sending_test.go +++ b/transport/internet/kcp/sending_test.go @@ -3,9 +3,9 @@ package kcp_test import ( "testing" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/kcp" + "v2ray.com/core/common/alloc" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/kcp" ) func TestSendingQueue(t *testing.T) { diff --git a/transport/internet/system_dialer.go b/transport/internet/system_dialer.go index 81c99f05..e6f39d87 100644 --- a/transport/internet/system_dialer.go +++ b/transport/internet/system_dialer.go @@ -4,7 +4,7 @@ import ( "net" "time" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) var ( diff --git a/transport/internet/tcp/connection.go b/transport/internet/tcp/connection.go index 2dda79dd..2f6447f2 100644 --- a/transport/internet/tcp/connection.go +++ b/transport/internet/tcp/connection.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/v2ray/v2ray-core/transport/internet/internal" + "v2ray.com/core/transport/internet/internal" ) type ConnectionManager interface { diff --git a/transport/internet/tcp/connection_cache.go b/transport/internet/tcp/connection_cache.go index 9baf002c..32b1abe7 100644 --- a/transport/internet/tcp/connection_cache.go +++ b/transport/internet/tcp/connection_cache.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/common/signal" + "v2ray.com/core/common/signal" ) type AwaitingConnection struct { diff --git a/transport/internet/tcp/connection_test.go b/transport/internet/tcp/connection_test.go index 4fd435ba..fdce1f5a 100644 --- a/transport/internet/tcp/connection_test.go +++ b/transport/internet/tcp/connection_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/tcp" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/tcp" ) func TestRawConnection(t *testing.T) { diff --git a/transport/internet/tcp/dialer.go b/transport/internet/tcp/dialer.go index e39827e7..8ca1bf52 100644 --- a/transport/internet/tcp/dialer.go +++ b/transport/internet/tcp/dialer.go @@ -3,9 +3,9 @@ package tcp import ( "net" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) var ( diff --git a/transport/internet/tcp/hub.go b/transport/internet/tcp/hub.go index ae3b85e7..a0af20b0 100644 --- a/transport/internet/tcp/hub.go +++ b/transport/internet/tcp/hub.go @@ -6,8 +6,8 @@ import ( "sync" "time" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) var ( diff --git a/transport/internet/tcp_hub.go b/transport/internet/tcp_hub.go index 82daa82d..08e13175 100644 --- a/transport/internet/tcp_hub.go +++ b/transport/internet/tcp_hub.go @@ -6,9 +6,9 @@ import ( "net" "sync" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - v2tls "github.com/v2ray/v2ray-core/transport/internet/tls" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + v2tls "v2ray.com/core/transport/internet/tls" ) var ( diff --git a/transport/internet/udp/connection.go b/transport/internet/udp/connection.go index 94591961..602081f3 100644 --- a/transport/internet/udp/connection.go +++ b/transport/internet/udp/connection.go @@ -3,8 +3,8 @@ package udp import ( "net" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) type Connection struct { diff --git a/transport/internet/udp/hub.go b/transport/internet/udp/hub.go index e83f411e..f0c13b2c 100644 --- a/transport/internet/udp/hub.go +++ b/transport/internet/udp/hub.go @@ -4,11 +4,11 @@ import ( "net" "sync" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/internet/internal" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/internet/internal" ) type UDPPayloadHandler func(*alloc.Buffer, *proxy.SessionInfo) diff --git a/transport/internet/udp/hub_linux.go b/transport/internet/udp/hub_linux.go index d43ea2c3..e883db0a 100644 --- a/transport/internet/udp/hub_linux.go +++ b/transport/internet/udp/hub_linux.go @@ -6,7 +6,7 @@ import ( "net" "syscall" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) func SetOriginalDestOptions(fd int) error { diff --git a/transport/internet/udp/hub_linux_test.go b/transport/internet/udp/hub_linux_test.go index 43003774..5c4f0af2 100644 --- a/transport/internet/udp/hub_linux_test.go +++ b/transport/internet/udp/hub_linux_test.go @@ -7,12 +7,12 @@ import ( "syscall" "testing" - "github.com/v2ray/v2ray-core/common/alloc" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/testing/assert" - "github.com/v2ray/v2ray-core/transport/internet/internal" - . "github.com/v2ray/v2ray-core/transport/internet/udp" + "v2ray.com/core/common/alloc" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/testing/assert" + "v2ray.com/core/transport/internet/internal" + . "v2ray.com/core/transport/internet/udp" ) func TestHubSocksOption(t *testing.T) { diff --git a/transport/internet/udp/hub_other.go b/transport/internet/udp/hub_other.go index 777c616d..cad6d764 100644 --- a/transport/internet/udp/hub_other.go +++ b/transport/internet/udp/hub_other.go @@ -5,7 +5,7 @@ package udp import ( "net" - v2net "github.com/v2ray/v2ray-core/common/net" + v2net "v2ray.com/core/common/net" ) func SetOriginalDestOptions(fd int) error { diff --git a/transport/internet/udp/udp_server.go b/transport/internet/udp/udp_server.go index 618540f8..eb2fc37a 100644 --- a/transport/internet/udp/udp_server.go +++ b/transport/internet/udp/udp_server.go @@ -4,12 +4,12 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/app/dispatcher" - "github.com/v2ray/v2ray-core/common/alloc" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/proxy" - "github.com/v2ray/v2ray-core/transport/ray" + "v2ray.com/core/app/dispatcher" + "v2ray.com/core/common/alloc" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/proxy" + "v2ray.com/core/transport/ray" ) type UDPResponseCallback func(destination v2net.Destination, payload *alloc.Buffer) diff --git a/transport/internet/ws/connection_cache.go b/transport/internet/ws/connection_cache.go index 10b5bc10..284a707b 100644 --- a/transport/internet/ws/connection_cache.go +++ b/transport/internet/ws/connection_cache.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/common/log" - "github.com/v2ray/v2ray-core/common/signal" + "v2ray.com/core/common/log" + "v2ray.com/core/common/signal" ) type AwaitingConnection struct { diff --git a/transport/internet/ws/dialer.go b/transport/internet/ws/dialer.go index 0d4f0844..4b5e250d 100644 --- a/transport/internet/ws/dialer.go +++ b/transport/internet/ws/dialer.go @@ -7,9 +7,9 @@ import ( "net" "github.com/gorilla/websocket" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) var ( diff --git a/transport/internet/ws/hub.go b/transport/internet/ws/hub.go index c5930211..d70f51b1 100644 --- a/transport/internet/ws/hub.go +++ b/transport/internet/ws/hub.go @@ -9,9 +9,9 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/v2ray/v2ray-core/common/log" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/transport/internet" + "v2ray.com/core/common/log" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/transport/internet" ) var ( diff --git a/transport/internet/ws/ws.go b/transport/internet/ws/ws.go index 23c2b8eb..7dbb8ee6 100644 --- a/transport/internet/ws/ws.go +++ b/transport/internet/ws/ws.go @@ -27,7 +27,7 @@ It is worth noting that accepting a non-valid cert is not supported as a self-si This transport was disscussed at -https://github.com/v2ray/v2ray-core/issues/224 +https://v2ray.com/core/issues/224 */ package ws diff --git a/transport/internet/ws/ws_test.go b/transport/internet/ws/ws_test.go index 7efc4ab4..36b58474 100644 --- a/transport/internet/ws/ws_test.go +++ b/transport/internet/ws/ws_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - v2net "github.com/v2ray/v2ray-core/common/net" - "github.com/v2ray/v2ray-core/testing/assert" - . "github.com/v2ray/v2ray-core/transport/internet/ws" + v2net "v2ray.com/core/common/net" + "v2ray.com/core/testing/assert" + . "v2ray.com/core/transport/internet/ws" ) func Test_Connect_ws(t *testing.T) { diff --git a/transport/internet/ws/wsconn.go b/transport/internet/ws/wsconn.go index ea605ee6..b32f35ba 100644 --- a/transport/internet/ws/wsconn.go +++ b/transport/internet/ws/wsconn.go @@ -8,7 +8,7 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/v2ray/v2ray-core/common/log" + "v2ray.com/core/common/log" ) type wsconn struct { diff --git a/transport/ray/direct.go b/transport/ray/direct.go index 550aa28f..86dcc931 100644 --- a/transport/ray/direct.go +++ b/transport/ray/direct.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/v2ray/v2ray-core/common/alloc" + "v2ray.com/core/common/alloc" ) const ( diff --git a/transport/ray/ray.go b/transport/ray/ray.go index 91812a97..7ff8a28f 100644 --- a/transport/ray/ray.go +++ b/transport/ray/ray.go @@ -1,7 +1,7 @@ package ray import ( - v2io "github.com/v2ray/v2ray-core/common/io" + v2io "v2ray.com/core/common/io" ) // OutboundRay is a transport interface for outbound connections.