Skip to content

Commit 3ef7fea

Browse files
xiaokangwangxiaokangwang
committed
update version: auto replacement to v5 path
1 parent 9f0d7e7 commit 3ef7fea

File tree

809 files changed

+2669
-2641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

809 files changed

+2669
-2641
lines changed

‎.github/linters/.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run:
44
- generated.*
55

66
issues:
7-
new: true
7+
new: false
88
exclude-rules:
99
- linters:
1010
- staticcheck

‎app/browserforwarder/config.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/browserforwarder/config.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ syntax = "proto3";
33
package v2ray.core.app.browserforwarder;
44

55
option csharp_namespace = "V2Ray.Core.App.Browserforwarder";
6-
option go_package = "github.com/v2fly/v2ray-core/v4/app/browserforwarder";
6+
option go_package = "github.com/v2fly/v2ray-core/v5/app/browserforwarder";
77
option java_package = "com.v2ray.core.app.browserforwarder";
88
option java_multiple_files = true;
99

‎app/browserforwarder/errors.generated.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package browserforwarder
22

3-
import "github.com/v2fly/v2ray-core/v4/common/errors"
3+
import "github.com/v2fly/v2ray-core/v5/common/errors"
44

55
type errPathObjHolder struct{}
66

‎app/browserforwarder/forwarder.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010

1111
"github.com/v2fly/BrowserBridge/handler"
1212

13-
"github.com/v2fly/v2ray-core/v4/common"
14-
"github.com/v2fly/v2ray-core/v4/common/net"
15-
"github.com/v2fly/v2ray-core/v4/common/platform/securedload"
16-
"github.com/v2fly/v2ray-core/v4/features/extension"
17-
"github.com/v2fly/v2ray-core/v4/transport/internet"
13+
"github.com/v2fly/v2ray-core/v5/common"
14+
"github.com/v2fly/v2ray-core/v5/common/net"
15+
"github.com/v2fly/v2ray-core/v5/common/platform/securedload"
16+
"github.com/v2fly/v2ray-core/v5/features/extension"
17+
"github.com/v2fly/v2ray-core/v5/transport/internet"
1818
)
1919

20-
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
20+
//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
2121

2222
type Forwarder struct {
2323
ctx context.Context

‎app/commander/commander.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package commander
22

3-
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
3+
//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
44

55
import (
66
"context"
@@ -9,12 +9,12 @@ import (
99

1010
"google.golang.org/grpc"
1111

12-
core "github.com/v2fly/v2ray-core/v4"
13-
"github.com/v2fly/v2ray-core/v4/common"
14-
"github.com/v2fly/v2ray-core/v4/common/serial"
15-
"github.com/v2fly/v2ray-core/v4/common/signal/done"
16-
"github.com/v2fly/v2ray-core/v4/features/outbound"
17-
"github.com/v2fly/v2ray-core/v4/infra/conf/v5cfg"
12+
core "github.com/v2fly/v2ray-core/v5"
13+
"github.com/v2fly/v2ray-core/v5/common"
14+
"github.com/v2fly/v2ray-core/v5/common/serial"
15+
"github.com/v2fly/v2ray-core/v5/common/signal/done"
16+
"github.com/v2fly/v2ray-core/v5/features/outbound"
17+
"github.com/v2fly/v2ray-core/v5/infra/conf/v5cfg"
1818
)
1919

2020
// Commander is a V2Ray feature that provides gRPC methods to external clients.

‎app/commander/config.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/commander/config.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package v2ray.core.app.commander;
44
option csharp_namespace = "V2Ray.Core.App.Commander";
5-
option go_package = "github.com/v2fly/v2ray-core/v4/app/commander";
5+
option go_package = "github.com/v2fly/v2ray-core/v5/app/commander";
66
option java_package = "com.v2ray.core.app.commander";
77
option java_multiple_files = true;
88

‎app/commander/errors.generated.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package commander
22

3-
import "github.com/v2fly/v2ray-core/v4/common/errors"
3+
import "github.com/v2fly/v2ray-core/v5/common/errors"
44

55
type errPathObjHolder struct{}
66

‎app/commander/outbound.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"sync"
66

7-
"github.com/v2fly/v2ray-core/v4/common"
8-
"github.com/v2fly/v2ray-core/v4/common/net"
9-
"github.com/v2fly/v2ray-core/v4/common/signal/done"
10-
"github.com/v2fly/v2ray-core/v4/transport"
7+
"github.com/v2fly/v2ray-core/v5/common"
8+
"github.com/v2fly/v2ray-core/v5/common/net"
9+
"github.com/v2fly/v2ray-core/v5/common/signal/done"
10+
"github.com/v2fly/v2ray-core/v5/transport"
1111
)
1212

1313
// OutboundListener is a net.Listener for listening gRPC connections.

‎app/commander/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"google.golang.org/grpc"
77
"google.golang.org/grpc/reflection"
88

9-
"github.com/v2fly/v2ray-core/v4/common"
9+
"github.com/v2fly/v2ray-core/v5/common"
1010
)
1111

1212
// Service is a Commander service.

‎app/dispatcher/config.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/dispatcher/config.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package v2ray.core.app.dispatcher;
44
option csharp_namespace = "V2Ray.Core.App.Dispatcher";
5-
option go_package = "github.com/v2fly/v2ray-core/v4/app/dispatcher";
5+
option go_package = "github.com/v2fly/v2ray-core/v5/app/dispatcher";
66
option java_package = "com.v2ray.core.app.dispatcher";
77
option java_multiple_files = true;
88

‎app/dispatcher/default.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
package dispatcher
22

3-
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
3+
//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
44

55
import (
66
"context"
77
"strings"
88
"sync"
99
"time"
1010

11-
core "github.com/v2fly/v2ray-core/v4"
12-
"github.com/v2fly/v2ray-core/v4/common"
13-
"github.com/v2fly/v2ray-core/v4/common/buf"
14-
"github.com/v2fly/v2ray-core/v4/common/log"
15-
"github.com/v2fly/v2ray-core/v4/common/net"
16-
"github.com/v2fly/v2ray-core/v4/common/protocol"
17-
"github.com/v2fly/v2ray-core/v4/common/session"
18-
"github.com/v2fly/v2ray-core/v4/features/outbound"
19-
"github.com/v2fly/v2ray-core/v4/features/policy"
20-
"github.com/v2fly/v2ray-core/v4/features/routing"
21-
routing_session "github.com/v2fly/v2ray-core/v4/features/routing/session"
22-
"github.com/v2fly/v2ray-core/v4/features/stats"
23-
"github.com/v2fly/v2ray-core/v4/transport"
24-
"github.com/v2fly/v2ray-core/v4/transport/pipe"
11+
core "github.com/v2fly/v2ray-core/v5"
12+
"github.com/v2fly/v2ray-core/v5/common"
13+
"github.com/v2fly/v2ray-core/v5/common/buf"
14+
"github.com/v2fly/v2ray-core/v5/common/log"
15+
"github.com/v2fly/v2ray-core/v5/common/net"
16+
"github.com/v2fly/v2ray-core/v5/common/protocol"
17+
"github.com/v2fly/v2ray-core/v5/common/session"
18+
"github.com/v2fly/v2ray-core/v5/features/outbound"
19+
"github.com/v2fly/v2ray-core/v5/features/policy"
20+
"github.com/v2fly/v2ray-core/v5/features/routing"
21+
routing_session "github.com/v2fly/v2ray-core/v5/features/routing/session"
22+
"github.com/v2fly/v2ray-core/v5/features/stats"
23+
"github.com/v2fly/v2ray-core/v5/transport"
24+
"github.com/v2fly/v2ray-core/v5/transport/pipe"
2525
)
2626

2727
var errSniffingTimeout = newError("timeout on sniffing")

‎app/dispatcher/dispatcher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package dispatcher
22

3-
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
3+
//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen

‎app/dispatcher/errors.generated.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dispatcher
22

3-
import "github.com/v2fly/v2ray-core/v4/common/errors"
3+
import "github.com/v2fly/v2ray-core/v5/common/errors"
44

55
type errPathObjHolder struct{}
66

‎app/dispatcher/fakednssniffer.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"context"
88
"strings"
99

10-
core "github.com/v2fly/v2ray-core/v4"
11-
"github.com/v2fly/v2ray-core/v4/common"
12-
"github.com/v2fly/v2ray-core/v4/common/net"
13-
"github.com/v2fly/v2ray-core/v4/common/session"
14-
"github.com/v2fly/v2ray-core/v4/features/dns"
10+
core "github.com/v2fly/v2ray-core/v5"
11+
"github.com/v2fly/v2ray-core/v5/common"
12+
"github.com/v2fly/v2ray-core/v5/common/net"
13+
"github.com/v2fly/v2ray-core/v5/common/session"
14+
"github.com/v2fly/v2ray-core/v5/features/dns"
1515
)
1616

1717
// newFakeDNSSniffer Creates a Fake DNS metadata sniffer

‎app/dispatcher/sniffer.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package dispatcher
33
import (
44
"context"
55

6-
"github.com/v2fly/v2ray-core/v4/common"
7-
"github.com/v2fly/v2ray-core/v4/common/net"
8-
"github.com/v2fly/v2ray-core/v4/common/protocol/bittorrent"
9-
"github.com/v2fly/v2ray-core/v4/common/protocol/http"
10-
"github.com/v2fly/v2ray-core/v4/common/protocol/quic"
11-
"github.com/v2fly/v2ray-core/v4/common/protocol/tls"
6+
"github.com/v2fly/v2ray-core/v5/common"
7+
"github.com/v2fly/v2ray-core/v5/common/net"
8+
"github.com/v2fly/v2ray-core/v5/common/protocol/bittorrent"
9+
"github.com/v2fly/v2ray-core/v5/common/protocol/http"
10+
"github.com/v2fly/v2ray-core/v5/common/protocol/quic"
11+
"github.com/v2fly/v2ray-core/v5/common/protocol/tls"
1212
)
1313

1414
type SniffResult interface {

‎app/dispatcher/stats.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package dispatcher
22

33
import (
4-
"github.com/v2fly/v2ray-core/v4/common"
5-
"github.com/v2fly/v2ray-core/v4/common/buf"
6-
"github.com/v2fly/v2ray-core/v4/features/stats"
4+
"github.com/v2fly/v2ray-core/v5/common"
5+
"github.com/v2fly/v2ray-core/v5/common/buf"
6+
"github.com/v2fly/v2ray-core/v5/features/stats"
77
)
88

99
type SizeStatWriter struct {

‎app/dispatcher/stats_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package dispatcher_test
33
import (
44
"testing"
55

6-
. "github.com/v2fly/v2ray-core/v4/app/dispatcher"
7-
"github.com/v2fly/v2ray-core/v4/common"
8-
"github.com/v2fly/v2ray-core/v4/common/buf"
6+
. "github.com/v2fly/v2ray-core/v5/app/dispatcher"
7+
"github.com/v2fly/v2ray-core/v5/common"
8+
"github.com/v2fly/v2ray-core/v5/common/buf"
99
)
1010

1111
type TestCounter int64

‎app/dns/config.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package dns
55

66
import (
7-
"github.com/v2fly/v2ray-core/v4/common/net"
8-
"github.com/v2fly/v2ray-core/v4/common/strmatcher"
9-
"github.com/v2fly/v2ray-core/v4/common/uuid"
7+
"github.com/v2fly/v2ray-core/v5/common/net"
8+
"github.com/v2fly/v2ray-core/v5/common/strmatcher"
9+
"github.com/v2fly/v2ray-core/v5/common/uuid"
1010
)
1111

1212
var typeMap = map[DomainMatchingType]strmatcher.Type{

‎app/dns/config.pb.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/dns/config.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package v2ray.core.app.dns;
44
option csharp_namespace = "V2Ray.Core.App.Dns";
5-
option go_package = "github.com/v2fly/v2ray-core/v4/app/dns";
5+
option go_package = "github.com/v2fly/v2ray-core/v5/app/dns";
66
option java_package = "com.v2ray.core.app.dns";
77
option java_multiple_files = true;
88

‎app/dns/dns.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
// Package dns is an implementation of core.DNS feature.
55
package dns
66

7-
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
7+
//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen
88

99
import (
1010
"context"
1111
"fmt"
1212
"strings"
1313
"sync"
1414

15-
"github.com/v2fly/v2ray-core/v4/app/router"
16-
"github.com/v2fly/v2ray-core/v4/common"
17-
"github.com/v2fly/v2ray-core/v4/common/errors"
18-
"github.com/v2fly/v2ray-core/v4/common/net"
19-
"github.com/v2fly/v2ray-core/v4/common/platform"
20-
"github.com/v2fly/v2ray-core/v4/common/session"
21-
"github.com/v2fly/v2ray-core/v4/common/strmatcher"
22-
"github.com/v2fly/v2ray-core/v4/features"
23-
"github.com/v2fly/v2ray-core/v4/features/dns"
24-
"github.com/v2fly/v2ray-core/v4/infra/conf/cfgcommon"
25-
"github.com/v2fly/v2ray-core/v4/infra/conf/geodata"
15+
"github.com/v2fly/v2ray-core/v5/app/router"
16+
"github.com/v2fly/v2ray-core/v5/common"
17+
"github.com/v2fly/v2ray-core/v5/common/errors"
18+
"github.com/v2fly/v2ray-core/v5/common/net"
19+
"github.com/v2fly/v2ray-core/v5/common/platform"
20+
"github.com/v2fly/v2ray-core/v5/common/session"
21+
"github.com/v2fly/v2ray-core/v5/common/strmatcher"
22+
"github.com/v2fly/v2ray-core/v5/features"
23+
"github.com/v2fly/v2ray-core/v5/features/dns"
24+
"github.com/v2fly/v2ray-core/v5/infra/conf/cfgcommon"
25+
"github.com/v2fly/v2ray-core/v5/infra/conf/geodata"
2626
)
2727

2828
// DNS is a DNS rely server.

0 commit comments

Comments
 (0)