Skip to content

Commit 16544c1

Browse files
RPRXRPRX
committed
v1.1.0
1 parent ed8d6d7 commit 16544c1

File tree

627 files changed

+3245
-2633
lines changed

Some content is hidden

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

627 files changed

+3245
-2633
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 github.com/xtls/xray-core/v1/common/errors/errorgen
5+
//go:generate go run github.com/xtls/xray-core/common/errors/errorgen
66

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

1212
"google.golang.org/grpc"
1313

14-
"github.com/xtls/xray-core/v1/common"
15-
"github.com/xtls/xray-core/v1/common/signal/done"
16-
core "github.com/xtls/xray-core/v1/core"
17-
"github.com/xtls/xray-core/v1/features/outbound"
14+
"github.com/xtls/xray-core/common"
15+
"github.com/xtls/xray-core/common/signal/done"
16+
core "github.com/xtls/xray-core/core"
17+
"github.com/xtls/xray-core/features/outbound"
1818
)
1919

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

‎app/commander/config.pb.go

+7-7
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 xray.app.commander;
44
option csharp_namespace = "Xray.App.Commander";
5-
option go_package = "github.com/xtls/xray-core/v1/app/commander";
5+
option go_package = "github.com/xtls/xray-core/app/commander";
66
option java_package = "com.xray.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/xtls/xray-core/v1/common/errors"
3+
import "github.com/xtls/xray-core/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-
"github.com/xtls/xray-core/v1/common"
10-
"github.com/xtls/xray-core/v1/common/net"
11-
"github.com/xtls/xray-core/v1/common/signal/done"
12-
"github.com/xtls/xray-core/v1/transport"
9+
"github.com/xtls/xray-core/common"
10+
"github.com/xtls/xray-core/common/net"
11+
"github.com/xtls/xray-core/common/signal/done"
12+
"github.com/xtls/xray-core/transport"
1313
)
1414

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

‎app/commander/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package commander
55
import (
66
"context"
77

8-
"github.com/xtls/xray-core/v1/common"
8+
"github.com/xtls/xray-core/common"
99
"google.golang.org/grpc"
1010
"google.golang.org/grpc/reflection"
1111
)

‎app/dispatcher/config.pb.go

+6-6
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 xray.app.dispatcher;
44
option csharp_namespace = "Xray.App.Dispatcher";
5-
option go_package = "github.com/xtls/xray-core/v1/app/dispatcher";
5+
option go_package = "github.com/xtls/xray-core/app/dispatcher";
66
option java_package = "com.xray.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 github.com/xtls/xray-core/v1/common/errors/errorgen
5+
//go:generate go run github.com/xtls/xray-core/common/errors/errorgen
66

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

13-
"github.com/xtls/xray-core/v1/common"
14-
"github.com/xtls/xray-core/v1/common/buf"
15-
"github.com/xtls/xray-core/v1/common/log"
16-
"github.com/xtls/xray-core/v1/common/net"
17-
"github.com/xtls/xray-core/v1/common/protocol"
18-
"github.com/xtls/xray-core/v1/common/session"
19-
"github.com/xtls/xray-core/v1/core"
20-
"github.com/xtls/xray-core/v1/features/outbound"
21-
"github.com/xtls/xray-core/v1/features/policy"
22-
"github.com/xtls/xray-core/v1/features/routing"
23-
routing_session "github.com/xtls/xray-core/v1/features/routing/session"
24-
"github.com/xtls/xray-core/v1/features/stats"
25-
"github.com/xtls/xray-core/v1/transport"
26-
"github.com/xtls/xray-core/v1/transport/pipe"
13+
"github.com/xtls/xray-core/common"
14+
"github.com/xtls/xray-core/common/buf"
15+
"github.com/xtls/xray-core/common/log"
16+
"github.com/xtls/xray-core/common/net"
17+
"github.com/xtls/xray-core/common/protocol"
18+
"github.com/xtls/xray-core/common/session"
19+
"github.com/xtls/xray-core/core"
20+
"github.com/xtls/xray-core/features/outbound"
21+
"github.com/xtls/xray-core/features/policy"
22+
"github.com/xtls/xray-core/features/routing"
23+
routing_session "github.com/xtls/xray-core/features/routing/session"
24+
"github.com/xtls/xray-core/features/stats"
25+
"github.com/xtls/xray-core/transport"
26+
"github.com/xtls/xray-core/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 github.com/xtls/xray-core/v1/common/errors/errorgen
5+
//go:generate go run github.com/xtls/xray-core/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/xtls/xray-core/v1/common/errors"
3+
import "github.com/xtls/xray-core/common/errors"
44

55
type errPathObjHolder struct{}
66

‎app/dispatcher/sniffer.go

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

55
import (
6-
"github.com/xtls/xray-core/v1/common"
7-
"github.com/xtls/xray-core/v1/common/protocol/bittorrent"
8-
"github.com/xtls/xray-core/v1/common/protocol/http"
9-
"github.com/xtls/xray-core/v1/common/protocol/tls"
6+
"github.com/xtls/xray-core/common"
7+
"github.com/xtls/xray-core/common/protocol/bittorrent"
8+
"github.com/xtls/xray-core/common/protocol/http"
9+
"github.com/xtls/xray-core/common/protocol/tls"
1010
)
1111

1212
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-
"github.com/xtls/xray-core/v1/common"
7-
"github.com/xtls/xray-core/v1/common/buf"
8-
"github.com/xtls/xray-core/v1/features/stats"
6+
"github.com/xtls/xray-core/common"
7+
"github.com/xtls/xray-core/common/buf"
8+
"github.com/xtls/xray-core/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-
. "github.com/xtls/xray-core/v1/app/dispatcher"
7-
"github.com/xtls/xray-core/v1/common"
8-
"github.com/xtls/xray-core/v1/common/buf"
6+
. "github.com/xtls/xray-core/app/dispatcher"
7+
"github.com/xtls/xray-core/common"
8+
"github.com/xtls/xray-core/common/buf"
99
)
1010

1111
type TestCounter int64

‎app/dns/config.pb.go

+6-7
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 xray.app.dns;
44
option csharp_namespace = "Xray.App.Dns";
5-
option go_package = "github.com/xtls/xray-core/v1/app/dns";
5+
option go_package = "github.com/xtls/xray-core/app/dns";
66
option java_package = "com.xray.app.dns";
77
option java_multiple_files = true;
88

‎app/dns/dns.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Package dns is an implementation of core.DNS feature.
22
package dns
33

4-
//go:generate go run github.com/xtls/xray-core/v1/common/errors/errorgen
4+
//go:generate go run github.com/xtls/xray-core/common/errors/errorgen

‎app/dns/dnscommon.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"encoding/binary"
77
"time"
88

9-
"github.com/xtls/xray-core/v1/common"
10-
"github.com/xtls/xray-core/v1/common/errors"
11-
"github.com/xtls/xray-core/v1/common/net"
12-
dns_feature "github.com/xtls/xray-core/v1/features/dns"
9+
"github.com/xtls/xray-core/common"
10+
"github.com/xtls/xray-core/common/errors"
11+
"github.com/xtls/xray-core/common/net"
12+
dns_feature "github.com/xtls/xray-core/features/dns"
1313
"golang.org/x/net/dns/dnsmessage"
1414
)
1515

‎app/dns/dnscommon_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/google/go-cmp/cmp"
1111
"github.com/miekg/dns"
12-
"github.com/xtls/xray-core/v1/common"
13-
"github.com/xtls/xray-core/v1/common/net"
12+
"github.com/xtls/xray-core/common"
13+
"github.com/xtls/xray-core/common/net"
1414
"golang.org/x/net/dns/dnsmessage"
1515
)
1616

‎app/dns/dohdns.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ import (
1414
"sync/atomic"
1515
"time"
1616

17-
"github.com/xtls/xray-core/v1/common"
18-
"github.com/xtls/xray-core/v1/common/net"
19-
"github.com/xtls/xray-core/v1/common/protocol/dns"
20-
"github.com/xtls/xray-core/v1/common/session"
21-
"github.com/xtls/xray-core/v1/common/signal/pubsub"
22-
"github.com/xtls/xray-core/v1/common/task"
23-
dns_feature "github.com/xtls/xray-core/v1/features/dns"
24-
"github.com/xtls/xray-core/v1/features/routing"
25-
"github.com/xtls/xray-core/v1/transport/internet"
17+
"github.com/xtls/xray-core/common"
18+
"github.com/xtls/xray-core/common/net"
19+
"github.com/xtls/xray-core/common/protocol/dns"
20+
"github.com/xtls/xray-core/common/session"
21+
"github.com/xtls/xray-core/common/signal/pubsub"
22+
"github.com/xtls/xray-core/common/task"
23+
dns_feature "github.com/xtls/xray-core/features/dns"
24+
"github.com/xtls/xray-core/features/routing"
25+
"github.com/xtls/xray-core/transport/internet"
2626
"golang.org/x/net/dns/dnsmessage"
2727
)
2828

‎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 "github.com/xtls/xray-core/v1/common/errors"
3+
import "github.com/xtls/xray-core/common/errors"
44

55
type errPathObjHolder struct{}
66

‎app/dns/hosts.go

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

55
import (
6-
"github.com/xtls/xray-core/v1/common"
7-
"github.com/xtls/xray-core/v1/common/net"
8-
"github.com/xtls/xray-core/v1/common/strmatcher"
9-
"github.com/xtls/xray-core/v1/features"
6+
"github.com/xtls/xray-core/common"
7+
"github.com/xtls/xray-core/common/net"
8+
"github.com/xtls/xray-core/common/strmatcher"
9+
"github.com/xtls/xray-core/features"
1010
)
1111

1212
// StaticHosts represents static domain-ip mapping in DNS server.

‎app/dns/hosts_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"github.com/google/go-cmp/cmp"
77

8-
. "github.com/xtls/xray-core/v1/app/dns"
9-
"github.com/xtls/xray-core/v1/common"
10-
"github.com/xtls/xray-core/v1/common/net"
8+
. "github.com/xtls/xray-core/app/dns"
9+
"github.com/xtls/xray-core/common"
10+
"github.com/xtls/xray-core/common/net"
1111
)
1212

1313
func TestStaticHosts(t *testing.T) {

‎app/dns/nameserver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package dns
55
import (
66
"context"
77

8-
"github.com/xtls/xray-core/v1/common/net"
9-
"github.com/xtls/xray-core/v1/features/dns/localdns"
8+
"github.com/xtls/xray-core/common/net"
9+
"github.com/xtls/xray-core/features/dns/localdns"
1010
)
1111

1212
// IPOption is an object for IP query options.

‎app/dns/nameserver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"testing"
66
"time"
77

8-
. "github.com/xtls/xray-core/v1/app/dns"
9-
"github.com/xtls/xray-core/v1/common"
8+
. "github.com/xtls/xray-core/app/dns"
9+
"github.com/xtls/xray-core/common"
1010
)
1111

1212
func TestLocalNameServer(t *testing.T) {

0 commit comments

Comments
 (0)