Skip to content

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@RPRX
RPRX committed Dec 4, 2020
1 parent ed8d6d7 commit 16544c1
Show file tree
Hide file tree
Showing 627 changed files with 3,245 additions and 2,633 deletions.
10 changes: 5 additions & 5 deletions app/commander/commander.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package commander

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

import (
"context"
Expand All @@ -11,10 +11,10 @@ import (

"google.golang.org/grpc"

"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/signal/done"
core "github.com/xtls/xray-core/v1/core"
"github.com/xtls/xray-core/v1/features/outbound"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/signal/done"
core "github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/outbound"
)

// Commander is a Xray feature that provides gRPC methods to external clients.
Expand Down
14 changes: 7 additions & 7 deletions app/commander/config.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/commander/config.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package xray.app.commander;
option csharp_namespace = "Xray.App.Commander";
option go_package = "github.com/xtls/xray-core/v1/app/commander";
option go_package = "github.com/xtls/xray-core/app/commander";
option java_package = "com.xray.app.commander";
option java_multiple_files = true;

Expand Down
2 changes: 1 addition & 1 deletion app/commander/errors.generated.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package commander

import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"

type errPathObjHolder struct{}

Expand Down
8 changes: 4 additions & 4 deletions app/commander/outbound.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"context"
"sync"

"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/signal/done"
"github.com/xtls/xray-core/v1/transport"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/signal/done"
"github.com/xtls/xray-core/transport"
)

// OutboundListener is a net.Listener for listening gRPC connections.
Expand Down
2 changes: 1 addition & 1 deletion app/commander/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package commander
import (
"context"

"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/common"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
)
Expand Down
12 changes: 6 additions & 6 deletions app/dispatcher/config.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/dispatcher/config.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package xray.app.dispatcher;
option csharp_namespace = "Xray.App.Dispatcher";
option go_package = "github.com/xtls/xray-core/v1/app/dispatcher";
option go_package = "github.com/xtls/xray-core/app/dispatcher";
option java_package = "com.xray.app.dispatcher";
option java_multiple_files = true;

Expand Down
30 changes: 15 additions & 15 deletions app/dispatcher/default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@

package dispatcher

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

import (
"context"
"strings"
"sync"
"time"

"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/log"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/v1/common/session"
"github.com/xtls/xray-core/v1/core"
"github.com/xtls/xray-core/v1/features/outbound"
"github.com/xtls/xray-core/v1/features/policy"
"github.com/xtls/xray-core/v1/features/routing"
routing_session "github.com/xtls/xray-core/v1/features/routing/session"
"github.com/xtls/xray-core/v1/features/stats"
"github.com/xtls/xray-core/v1/transport"
"github.com/xtls/xray-core/v1/transport/pipe"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/log"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/outbound"
"github.com/xtls/xray-core/features/policy"
"github.com/xtls/xray-core/features/routing"
routing_session "github.com/xtls/xray-core/features/routing/session"
"github.com/xtls/xray-core/features/stats"
"github.com/xtls/xray-core/transport"
"github.com/xtls/xray-core/transport/pipe"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion app/dispatcher/dispatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

package dispatcher

//go:generate go run github.com/xtls/xray-core/v1/common/errors/errorgen
//go:generate go run github.com/xtls/xray-core/common/errors/errorgen
2 changes: 1 addition & 1 deletion app/dispatcher/errors.generated.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dispatcher

import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"

type errPathObjHolder struct{}

Expand Down
8 changes: 4 additions & 4 deletions app/dispatcher/sniffer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
package dispatcher

import (
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/protocol/bittorrent"
"github.com/xtls/xray-core/v1/common/protocol/http"
"github.com/xtls/xray-core/v1/common/protocol/tls"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/protocol/bittorrent"
"github.com/xtls/xray-core/common/protocol/http"
"github.com/xtls/xray-core/common/protocol/tls"
)

type SniffResult interface {
Expand Down
6 changes: 3 additions & 3 deletions app/dispatcher/stats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
package dispatcher

import (
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/features/stats"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/features/stats"
)

type SizeStatWriter struct {
Expand Down
6 changes: 3 additions & 3 deletions app/dispatcher/stats_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package dispatcher_test
import (
"testing"

. "github.com/xtls/xray-core/v1/app/dispatcher"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
. "github.com/xtls/xray-core/app/dispatcher"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
)

type TestCounter int64
Expand Down
13 changes: 6 additions & 7 deletions app/dns/config.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/dns/config.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package xray.app.dns;
option csharp_namespace = "Xray.App.Dns";
option go_package = "github.com/xtls/xray-core/v1/app/dns";
option go_package = "github.com/xtls/xray-core/app/dns";
option java_package = "com.xray.app.dns";
option java_multiple_files = true;

Expand Down
2 changes: 1 addition & 1 deletion app/dns/dns.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Package dns is an implementation of core.DNS feature.
package dns

//go:generate go run github.com/xtls/xray-core/v1/common/errors/errorgen
//go:generate go run github.com/xtls/xray-core/common/errors/errorgen
8 changes: 4 additions & 4 deletions app/dns/dnscommon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"encoding/binary"
"time"

"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/v1/common/net"
dns_feature "github.com/xtls/xray-core/v1/features/dns"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
dns_feature "github.com/xtls/xray-core/features/dns"
"golang.org/x/net/dns/dnsmessage"
)

Expand Down
4 changes: 2 additions & 2 deletions app/dns/dnscommon_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/miekg/dns"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
"golang.org/x/net/dns/dnsmessage"
)

Expand Down
18 changes: 9 additions & 9 deletions app/dns/dohdns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import (
"sync/atomic"
"time"

"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/protocol/dns"
"github.com/xtls/xray-core/v1/common/session"
"github.com/xtls/xray-core/v1/common/signal/pubsub"
"github.com/xtls/xray-core/v1/common/task"
dns_feature "github.com/xtls/xray-core/v1/features/dns"
"github.com/xtls/xray-core/v1/features/routing"
"github.com/xtls/xray-core/v1/transport/internet"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol/dns"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/common/signal/pubsub"
"github.com/xtls/xray-core/common/task"
dns_feature "github.com/xtls/xray-core/features/dns"
"github.com/xtls/xray-core/features/routing"
"github.com/xtls/xray-core/transport/internet"
"golang.org/x/net/dns/dnsmessage"
)

Expand Down
2 changes: 1 addition & 1 deletion app/dns/errors.generated.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dns

import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"

type errPathObjHolder struct{}

Expand Down
8 changes: 4 additions & 4 deletions app/dns/hosts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
package dns

import (
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/strmatcher"
"github.com/xtls/xray-core/v1/features"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/strmatcher"
"github.com/xtls/xray-core/features"
)

// StaticHosts represents static domain-ip mapping in DNS server.
Expand Down
6 changes: 3 additions & 3 deletions app/dns/hosts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

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

. "github.com/xtls/xray-core/v1/app/dns"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/app/dns"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
)

func TestStaticHosts(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions app/dns/nameserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package dns
import (
"context"

"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/features/dns/localdns"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/features/dns/localdns"
)

// IPOption is an object for IP query options.
Expand Down
4 changes: 2 additions & 2 deletions app/dns/nameserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

. "github.com/xtls/xray-core/v1/app/dns"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/app/dns"
"github.com/xtls/xray-core/common"
)

func TestLocalNameServer(t *testing.T) {
Expand Down
Loading

0 comments on commit 16544c1

Please sign in to comment.