update version: auto replacement to v5 path

kongshangufeng · Jan 2, 2022 · 3ef7fea · 3ef7fea
1 parent 9f0d7e7
commit 3ef7fea
Show file tree

Hide file tree

Showing 809 changed files with 2,669 additions and 2,641 deletions.
diff --git a/.github/linters/.golangci.yml b/.github/linters/.golangci.yml
@@ -4,7 +4,7 @@ run:
     - generated.*
 
 issues:
-  new: true
+  new: false
   exclude-rules:
     - linters:
         - staticcheck

diff --git a/app/browserforwarder/config.pb.go b/app/browserforwarder/config.pb.go
diff --git a/app/browserforwarder/config.proto b/app/browserforwarder/config.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package v2ray.core.app.browserforwarder;
 
 option csharp_namespace = "V2Ray.Core.App.Browserforwarder";
-option go_package = "github.com/v2fly/v2ray-core/v4/app/browserforwarder";
+option go_package = "github.com/v2fly/v2ray-core/v5/app/browserforwarder";
 option java_package = "com.v2ray.core.app.browserforwarder";
 option java_multiple_files = true;
 

diff --git a/app/browserforwarder/errors.generated.go b/app/browserforwarder/errors.generated.go
@@ -1,6 +1,6 @@
 package browserforwarder
 
-import "github.com/v2fly/v2ray-core/v4/common/errors"
+import "github.com/v2fly/v2ray-core/v5/common/errors"
 
 type errPathObjHolder struct{}
 

diff --git a/app/browserforwarder/forwarder.go b/app/browserforwarder/forwarder.go
@@ -10,14 +10,14 @@ import (
 
 	"github.com/v2fly/BrowserBridge/handler"
 
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/net"
-	"github.com/v2fly/v2ray-core/v4/common/platform/securedload"
-	"github.com/v2fly/v2ray-core/v4/features/extension"
-	"github.com/v2fly/v2ray-core/v4/transport/internet"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/platform/securedload"
+	"github.com/v2fly/v2ray-core/v5/features/extension"
+	"github.com/v2fly/v2ray-core/v5/transport/internet"
 )
 
-//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
+//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
 
 type Forwarder struct {
 	ctx context.Context

diff --git a/app/commander/commander.go b/app/commander/commander.go
@@ -1,6 +1,6 @@
 package commander
 
-//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
+//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
 
 import (
 	"context"
@@ -9,12 +9,12 @@ import (
 
 	"google.golang.org/grpc"
 
-	core "github.com/v2fly/v2ray-core/v4"
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/serial"
-	"github.com/v2fly/v2ray-core/v4/common/signal/done"
-	"github.com/v2fly/v2ray-core/v4/features/outbound"
-	"github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg"
+	core "github.com/v2fly/v2ray-core/v5"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/serial"
+	"github.com/v2fly/v2ray-core/v5/common/signal/done"
+	"github.com/v2fly/v2ray-core/v5/features/outbound"
+	"github.com/v2fly/v2ray-core/v5/infra/conf/v5cfg"
 )
 
 // Commander is a V2Ray feature that provides gRPC methods to external clients.

diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go
diff --git a/app/commander/config.proto b/app/commander/config.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package v2ray.core.app.commander;
 option csharp_namespace = "V2Ray.Core.App.Commander";
-option go_package = "github.com/v2fly/v2ray-core/v4/app/commander";
+option go_package = "github.com/v2fly/v2ray-core/v5/app/commander";
 option java_package = "com.v2ray.core.app.commander";
 option java_multiple_files = true;
 

diff --git a/app/commander/errors.generated.go b/app/commander/errors.generated.go
@@ -1,6 +1,6 @@
 package commander
 
-import "github.com/v2fly/v2ray-core/v4/common/errors"
+import "github.com/v2fly/v2ray-core/v5/common/errors"
 
 type errPathObjHolder struct{}
 

diff --git a/app/commander/outbound.go b/app/commander/outbound.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"sync"
 
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/net"
-	"github.com/v2fly/v2ray-core/v4/common/signal/done"
-	"github.com/v2fly/v2ray-core/v4/transport"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/signal/done"
+	"github.com/v2fly/v2ray-core/v5/transport"
 )
 
 // OutboundListener is a net.Listener for listening gRPC connections.

diff --git a/app/commander/service.go b/app/commander/service.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 
-	"github.com/v2fly/v2ray-core/v4/common"
+	"github.com/v2fly/v2ray-core/v5/common"
 )
 
 // Service is a Commander service.

diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go
diff --git a/app/dispatcher/config.proto b/app/dispatcher/config.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package v2ray.core.app.dispatcher;
 option csharp_namespace = "V2Ray.Core.App.Dispatcher";
-option go_package = "github.com/v2fly/v2ray-core/v4/app/dispatcher";
+option go_package = "github.com/v2fly/v2ray-core/v5/app/dispatcher";
 option java_package = "com.v2ray.core.app.dispatcher";
 option java_multiple_files = true;
 

diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go
@@ -1,27 +1,27 @@
 package dispatcher
 
-//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
+//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
 
 import (
 	"context"
 	"strings"
 	"sync"
 	"time"
 
-	core "github.com/v2fly/v2ray-core/v4"
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/buf"
-	"github.com/v2fly/v2ray-core/v4/common/log"
-	"github.com/v2fly/v2ray-core/v4/common/net"
-	"github.com/v2fly/v2ray-core/v4/common/protocol"
-	"github.com/v2fly/v2ray-core/v4/common/session"
-	"github.com/v2fly/v2ray-core/v4/features/outbound"
-	"github.com/v2fly/v2ray-core/v4/features/policy"
-	"github.com/v2fly/v2ray-core/v4/features/routing"
-	routing_session "github.com/v2fly/v2ray-core/v4/features/routing/session"
-	"github.com/v2fly/v2ray-core/v4/features/stats"
-	"github.com/v2fly/v2ray-core/v4/transport"
-	"github.com/v2fly/v2ray-core/v4/transport/pipe"
+	core "github.com/v2fly/v2ray-core/v5"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/buf"
+	"github.com/v2fly/v2ray-core/v5/common/log"
+	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/protocol"
+	"github.com/v2fly/v2ray-core/v5/common/session"
+	"github.com/v2fly/v2ray-core/v5/features/outbound"
+	"github.com/v2fly/v2ray-core/v5/features/policy"
+	"github.com/v2fly/v2ray-core/v5/features/routing"
+	routing_session "github.com/v2fly/v2ray-core/v5/features/routing/session"
+	"github.com/v2fly/v2ray-core/v5/features/stats"
+	"github.com/v2fly/v2ray-core/v5/transport"
+	"github.com/v2fly/v2ray-core/v5/transport/pipe"
 )
 
 var errSniffingTimeout = newError("timeout on sniffing")

diff --git a/app/dispatcher/dispatcher.go b/app/dispatcher/dispatcher.go
@@ -1,3 +1,3 @@
 package dispatcher
 
-//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
+//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
diff --git a/app/dispatcher/errors.generated.go b/app/dispatcher/errors.generated.go
@@ -1,6 +1,6 @@
 package dispatcher
 
-import "github.com/v2fly/v2ray-core/v4/common/errors"
+import "github.com/v2fly/v2ray-core/v5/common/errors"
 
 type errPathObjHolder struct{}
 

diff --git a/app/dispatcher/fakednssniffer.go b/app/dispatcher/fakednssniffer.go
@@ -7,11 +7,11 @@ import (
 	"context"
 	"strings"
 
-	core "github.com/v2fly/v2ray-core/v4"
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/net"
-	"github.com/v2fly/v2ray-core/v4/common/session"
-	"github.com/v2fly/v2ray-core/v4/features/dns"
+	core "github.com/v2fly/v2ray-core/v5"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/session"
+	"github.com/v2fly/v2ray-core/v5/features/dns"
 )
 
 // newFakeDNSSniffer Creates a Fake DNS metadata sniffer

diff --git a/app/dispatcher/sniffer.go b/app/dispatcher/sniffer.go
@@ -3,12 +3,12 @@ package dispatcher
 import (
 	"context"
 
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/net"
-	"github.com/v2fly/v2ray-core/v4/common/protocol/bittorrent"
-	"github.com/v2fly/v2ray-core/v4/common/protocol/http"
-	"github.com/v2fly/v2ray-core/v4/common/protocol/quic"
-	"github.com/v2fly/v2ray-core/v4/common/protocol/tls"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/protocol/bittorrent"
+	"github.com/v2fly/v2ray-core/v5/common/protocol/http"
+	"github.com/v2fly/v2ray-core/v5/common/protocol/quic"
+	"github.com/v2fly/v2ray-core/v5/common/protocol/tls"
 )
 
 type SniffResult interface {

diff --git a/app/dispatcher/stats.go b/app/dispatcher/stats.go
@@ -1,9 +1,9 @@
 package dispatcher
 
 import (
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/buf"
-	"github.com/v2fly/v2ray-core/v4/features/stats"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/buf"
+	"github.com/v2fly/v2ray-core/v5/features/stats"
 )
 
 type SizeStatWriter struct {

diff --git a/app/dispatcher/stats_test.go b/app/dispatcher/stats_test.go
@@ -3,9 +3,9 @@ package dispatcher_test
 import (
 	"testing"
 
-	. "github.com/v2fly/v2ray-core/v4/app/dispatcher"
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/buf"
+	. "github.com/v2fly/v2ray-core/v5/app/dispatcher"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/buf"
 )
 
 type TestCounter int64

diff --git a/app/dns/config.go b/app/dns/config.go
@@ -4,9 +4,9 @@
 package dns
 
 import (
-	"github.com/v2fly/v2ray-core/v4/common/net"
-	"github.com/v2fly/v2ray-core/v4/common/strmatcher"
-	"github.com/v2fly/v2ray-core/v4/common/uuid"
+	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/strmatcher"
+	"github.com/v2fly/v2ray-core/v5/common/uuid"
 )
 
 var typeMap = map[DomainMatchingType]strmatcher.Type{

diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
diff --git a/app/dns/config.proto b/app/dns/config.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package v2ray.core.app.dns;
 option csharp_namespace = "V2Ray.Core.App.Dns";
-option go_package = "github.com/v2fly/v2ray-core/v4/app/dns";
+option go_package = "github.com/v2fly/v2ray-core/v5/app/dns";
 option java_package = "com.v2ray.core.app.dns";
 option java_multiple_files = true;
 

diff --git a/app/dns/dns.go b/app/dns/dns.go
@@ -4,25 +4,25 @@
 // Package dns is an implementation of core.DNS feature.
 package dns
 
-//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
+//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
 
 import (
 	"context"
 	"fmt"
 	"strings"
 	"sync"
 
-	"github.com/v2fly/v2ray-core/v4/app/router"
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/common/errors"
-	"github.com/v2fly/v2ray-core/v4/common/net"
-	"github.com/v2fly/v2ray-core/v4/common/platform"
-	"github.com/v2fly/v2ray-core/v4/common/session"
-	"github.com/v2fly/v2ray-core/v4/common/strmatcher"
-	"github.com/v2fly/v2ray-core/v4/features"
-	"github.com/v2fly/v2ray-core/v4/features/dns"
-	"github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon"
-	"github.com/v2fly/v2ray-core/v4/infra/conf/geodata"
+	"github.com/v2fly/v2ray-core/v5/app/router"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/common/errors"
+	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/platform"
+	"github.com/v2fly/v2ray-core/v5/common/session"
+	"github.com/v2fly/v2ray-core/v5/common/strmatcher"
+	"github.com/v2fly/v2ray-core/v5/features"
+	"github.com/v2fly/v2ray-core/v5/features/dns"
+	"github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon"
+	"github.com/v2fly/v2ray-core/v5/infra/conf/geodata"
 )
 
 // DNS is a DNS rely server.