Skip to content

Commit f94dd11

Browse files
LoyalsoldierLoyalsoldier
authored
Chore: change module name (v2fly#677)
1 parent 0957442 commit f94dd11

File tree

623 files changed

+2532
-2404
lines changed

Some content is hidden

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

623 files changed

+2532
-2404
lines changed

‎app/commander/commander.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package commander
44

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

77
import (
88
"context"
@@ -11,10 +11,10 @@ import (
1111

1212
"google.golang.org/grpc"
1313

14-
"v2ray.com/core"
15-
"v2ray.com/core/common"
16-
"v2ray.com/core/common/signal/done"
17-
"v2ray.com/core/features/outbound"
14+
core "github.com/v2fly/v2ray-core/v4"
15+
"github.com/v2fly/v2ray-core/v4/common"
16+
"github.com/v2fly/v2ray-core/v4/common/signal/done"
17+
"github.com/v2fly/v2ray-core/v4/features/outbound"
1818
)
1919

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

‎app/commander/config.pb.go

+5-4
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 = "v2ray.com/core/app/commander";
5+
option go_package = "github.com/v2fly/v2ray-core/v4/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 "v2ray.com/core/common/errors"
3+
import "github.com/v2fly/v2ray-core/v4/common/errors"
44

55
type errPathObjHolder struct{}
66

‎app/commander/outbound.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"context"
77
"sync"
88

9-
"v2ray.com/core/common"
10-
"v2ray.com/core/common/net"
11-
"v2ray.com/core/common/signal/done"
12-
"v2ray.com/core/transport"
9+
"github.com/v2fly/v2ray-core/v4/common"
10+
"github.com/v2fly/v2ray-core/v4/common/net"
11+
"github.com/v2fly/v2ray-core/v4/common/signal/done"
12+
"github.com/v2fly/v2ray-core/v4/transport"
1313
)
1414

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

‎app/commander/service.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import (
77

88
"google.golang.org/grpc"
99
"google.golang.org/grpc/reflection"
10-
"v2ray.com/core/common"
10+
11+
"github.com/v2fly/v2ray-core/v4/common"
1112
)
1213

1314
// Service is a Commander service.

‎app/dispatcher/config.pb.go

+4-3
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 = "v2ray.com/core/app/dispatcher";
5+
option go_package = "github.com/v2fly/v2ray-core/v4/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
@@ -2,28 +2,28 @@
22

33
package dispatcher
44

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

77
import (
88
"context"
99
"strings"
1010
"sync"
1111
"time"
1212

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

2929
var (

‎app/dispatcher/dispatcher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
package dispatcher
44

5-
//go:generate go run v2ray.com/core/common/errors/errorgen
5+
//go:generate go run github.com/v2fly/v2ray-core/v4/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 "v2ray.com/core/common/errors"
3+
import "github.com/v2fly/v2ray-core/v4/common/errors"
44

55
type errPathObjHolder struct{}
66

‎app/dispatcher/fakednssniffer.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ package dispatcher
55
import (
66
"context"
77

8-
"v2ray.com/core"
9-
"v2ray.com/core/common"
10-
"v2ray.com/core/common/net"
11-
"v2ray.com/core/common/session"
12-
"v2ray.com/core/features/dns"
8+
core "github.com/v2fly/v2ray-core/v4"
9+
"github.com/v2fly/v2ray-core/v4/common"
10+
"github.com/v2fly/v2ray-core/v4/common/net"
11+
"github.com/v2fly/v2ray-core/v4/common/session"
12+
"github.com/v2fly/v2ray-core/v4/features/dns"
1313
)
1414

1515
// newFakeDNSSniffer Create a Fake DNS metadata sniffer

‎app/dispatcher/sniffer.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package dispatcher
55
import (
66
"context"
77

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

1414
type SniffResult interface {

‎app/dispatcher/stats.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
package dispatcher
44

55
import (
6-
"v2ray.com/core/common"
7-
"v2ray.com/core/common/buf"
8-
"v2ray.com/core/features/stats"
6+
"github.com/v2fly/v2ray-core/v4/common"
7+
"github.com/v2fly/v2ray-core/v4/common/buf"
8+
"github.com/v2fly/v2ray-core/v4/features/stats"
99
)
1010

1111
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-
. "v2ray.com/core/app/dispatcher"
7-
"v2ray.com/core/common"
8-
"v2ray.com/core/common/buf"
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"
99
)
1010

1111
type TestCounter int64

‎app/dns/config.go

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

55
import (
6-
"v2ray.com/core/common/net"
7-
"v2ray.com/core/common/strmatcher"
8-
"v2ray.com/core/common/uuid"
6+
"github.com/v2fly/v2ray-core/v4/common/net"
7+
"github.com/v2fly/v2ray-core/v4/common/strmatcher"
8+
"github.com/v2fly/v2ray-core/v4/common/uuid"
99
)
1010

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

‎app/dns/config.pb.go

+6-5
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 = "v2ray.com/core/app/dns";
5+
option go_package = "github.com/v2fly/v2ray-core/v4/app/dns";
66
option java_package = "com.v2ray.core.app.dns";
77
option java_multiple_files = true;
88

‎app/dns/dns.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
// Package dns is an implementation of core.DNS feature.
44
package dns
55

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

88
import (
99
"context"
1010
"fmt"
1111
"sync"
1212

13-
"v2ray.com/core/app/router"
14-
"v2ray.com/core/common"
15-
"v2ray.com/core/common/errors"
16-
"v2ray.com/core/common/net"
17-
"v2ray.com/core/common/session"
18-
"v2ray.com/core/common/strmatcher"
19-
"v2ray.com/core/features"
20-
"v2ray.com/core/features/dns"
13+
"github.com/v2fly/v2ray-core/v4/app/router"
14+
"github.com/v2fly/v2ray-core/v4/common"
15+
"github.com/v2fly/v2ray-core/v4/common/errors"
16+
"github.com/v2fly/v2ray-core/v4/common/net"
17+
"github.com/v2fly/v2ray-core/v4/common/session"
18+
"github.com/v2fly/v2ray-core/v4/common/strmatcher"
19+
"github.com/v2fly/v2ray-core/v4/features"
20+
"github.com/v2fly/v2ray-core/v4/features/dns"
2121
)
2222

2323
// DNS is a DNS rely server.

‎app/dns/dns_test.go

+14-13
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@ import (
66

77
"github.com/google/go-cmp/cmp"
88
"github.com/miekg/dns"
9-
"v2ray.com/core"
10-
"v2ray.com/core/app/dispatcher"
11-
. "v2ray.com/core/app/dns"
12-
"v2ray.com/core/app/policy"
13-
"v2ray.com/core/app/proxyman"
14-
_ "v2ray.com/core/app/proxyman/outbound"
15-
"v2ray.com/core/app/router"
16-
"v2ray.com/core/common"
17-
"v2ray.com/core/common/net"
18-
"v2ray.com/core/common/serial"
19-
feature_dns "v2ray.com/core/features/dns"
20-
"v2ray.com/core/proxy/freedom"
21-
"v2ray.com/core/testing/servers/udp"
9+
10+
core "github.com/v2fly/v2ray-core/v4"
11+
"github.com/v2fly/v2ray-core/v4/app/dispatcher"
12+
. "github.com/v2fly/v2ray-core/v4/app/dns"
13+
"github.com/v2fly/v2ray-core/v4/app/policy"
14+
"github.com/v2fly/v2ray-core/v4/app/proxyman"
15+
_ "github.com/v2fly/v2ray-core/v4/app/proxyman/outbound"
16+
"github.com/v2fly/v2ray-core/v4/app/router"
17+
"github.com/v2fly/v2ray-core/v4/common"
18+
"github.com/v2fly/v2ray-core/v4/common/net"
19+
"github.com/v2fly/v2ray-core/v4/common/serial"
20+
feature_dns "github.com/v2fly/v2ray-core/v4/features/dns"
21+
"github.com/v2fly/v2ray-core/v4/proxy/freedom"
22+
"github.com/v2fly/v2ray-core/v4/testing/servers/udp"
2223
)
2324

2425
type staticHandler struct {

‎app/dns/dnscommon.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ import (
77
"time"
88

99
"golang.org/x/net/dns/dnsmessage"
10-
"v2ray.com/core/common"
11-
"v2ray.com/core/common/errors"
12-
"v2ray.com/core/common/net"
13-
dns_feature "v2ray.com/core/features/dns"
10+
11+
"github.com/v2fly/v2ray-core/v4/common"
12+
"github.com/v2fly/v2ray-core/v4/common/errors"
13+
"github.com/v2fly/v2ray-core/v4/common/net"
14+
dns_feature "github.com/v2fly/v2ray-core/v4/features/dns"
1415
)
1516

1617
// Fqdn normalize domain make sure it ends with '.'

‎app/dns/dnscommon_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import (
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/miekg/dns"
1212
"golang.org/x/net/dns/dnsmessage"
13-
"v2ray.com/core/common"
14-
"v2ray.com/core/common/net"
13+
14+
"github.com/v2fly/v2ray-core/v4/common"
15+
"github.com/v2fly/v2ray-core/v4/common/net"
1516
)
1617

1718
func Test_parseResponse(t *testing.T) {
@@ -147,8 +148,8 @@ func TestFqdn(t *testing.T) {
147148
args args
148149
want string
149150
}{
150-
{"with fqdn", args{"www.v2ray.com."}, "www.v2ray.com."},
151-
{"without fqdn", args{"www.v2ray.com"}, "www.v2ray.com."},
151+
{"with fqdn", args{"www.v2fly.org."}, "www.v2fly.org."},
152+
{"without fqdn", args{"www.v2fly.org"}, "www.v2fly.org."},
152153
}
153154
for _, tt := range tests {
154155
t.Run(tt.name, func(t *testing.T) {

‎app/dns/errors.generated.go

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

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

55
type errPathObjHolder struct{}
66

0 commit comments

Comments
 (0)