mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-04-29 16:58:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

v1.1.0

Browse source
This commit is contained in:
RPRX 2020-12-04 09:36:16 +08:00
parent ed8d6d743c
commit 16544c18ab
627 changed files with 3247 additions and 2635 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/bitmask/byte_test.go
View file

@ -3,7 +3,7 @@ package bitmask_test
import (
"testing"
. "github.com/xtls/xray-core/v1/common/bitmask"
. "github.com/xtls/xray-core/common/bitmask"
)
func TestBitmaskByte(t *testing.T) {

4
common/buf/buf.go
View file

@ -1,4 +1,4 @@
// Package buf provides a light-weight memory allocation mechanism.
package buf // import "github.com/xtls/xray-core/v1/common/buf"
package buf // import "github.com/xtls/xray-core/common/buf"
//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
common/buf/buffer.go
View file

@ -3,7 +3,7 @@ package buf
import (
"io"
"github.com/xtls/xray-core/v1/common/bytespool"
"github.com/xtls/xray-core/common/bytespool"
)
const (

4
common/buf/buffer_test.go
View file

@ -6,8 +6,8 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/common"
. "github.com/xtls/xray-core/common/buf"
)
func TestBufferClear(t *testing.T) {

4
common/buf/copy.go
View file

@ -4,8 +4,8 @@ import (
"io"
"time"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/v1/common/signal"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/signal"
)
type dataHandler func(MultiBuffer)

6
common/buf/copy_test.go
View file

@ -7,9 +7,9 @@ import (
"github.com/golang/mock/gomock"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/v1/testing/mocks"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/testing/mocks"
)
func TestReadError(t *testing.T) {

2
common/buf/errors.generated.go
View file

@ -1,6 +1,6 @@
package buf
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

6
common/buf/io_test.go
View file

@ -5,9 +5,9 @@ import (
"io"
"testing"
. "github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/testing/servers/tcp"
. "github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/testing/servers/tcp"
)
func TestWriterCreation(t *testing.T) {

6
common/buf/multi_buffer.go
View file

@ -3,9 +3,9 @@ package buf
import (
"io"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/serial"
)
// ReadAllToBytes reads all content from the reader into a byte array, until EOF.

4
common/buf/multi_buffer_test.go
View file

@ -9,8 +9,8 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/common"
. "github.com/xtls/xray-core/common/buf"
)
func TestMultiBufferRead(t *testing.T) {

4
common/buf/reader.go
View file

@ -3,8 +3,8 @@ package buf
import (
"io"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
)
func readOneUDP(r io.Reader) (*Buffer, error) {

6
common/buf/reader_test.go
View file

@ -6,9 +6,9 @@ import (
"strings"
"testing"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/v1/common/buf"
"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/transport/pipe"
)
func TestBytesReaderWriteTo(t *testing.T) {

2
common/buf/readv_reader.go
View file

@ -7,7 +7,7 @@ import (
"runtime"
"syscall"
"github.com/xtls/xray-core/v1/common/platform"
"github.com/xtls/xray-core/common/platform"
)
type allocStrategy struct {

6
common/buf/readv_test.go
View file

@ -9,9 +9,9 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/testing/servers/tcp"
"github.com/xtls/xray-core/common"
. "github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/testing/servers/tcp"
"golang.org/x/sync/errgroup"
)

4
common/buf/writer.go
View file

@ -5,8 +5,8 @@ import (
"net"
"sync"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
)
// BufferToBytesWriter is a Writer that writes alloc.Buffer into underlying writer.

6
common/buf/writer_test.go
View file

@ -9,9 +9,9 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/v1/common/buf"
"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/transport/pipe"
)
func TestWriter(t *testing.T) {

4
common/common.go
View file

@ -10,10 +10,10 @@ import (
"path/filepath"
"strings"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/common/errors"
)
//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
var (
// ErrNoClue is for the situation that existing information is not enough to make a decision. For example, Router may return this error when there is no suitable route.

2
common/common_test.go
View file

@ -4,7 +4,7 @@ import (
"errors"
"testing"
. "github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/common"
)
func TestMust(t *testing.T) {

2
common/crypto/aes.go
View file

@ -4,7 +4,7 @@ import (
"crypto/aes"
"crypto/cipher"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/common"
)
// NewAesDecryptionStream creates a new AES encryption stream based on given key and IV.

8
common/crypto/auth.go
View file

@ -5,10 +5,10 @@ import (
"io"
"math/rand"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/bytespool"
"github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/bytespool"
"github.com/xtls/xray-core/common/protocol"
)
type BytesGenerator func() []byte

8
common/crypto/auth_test.go
View file

@ -10,10 +10,10 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
. "github.com/xtls/xray-core/v1/common/crypto"
"github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
. "github.com/xtls/xray-core/common/crypto"
"github.com/xtls/xray-core/common/protocol"
)
func TestAuthenticationReaderWriter(t *testing.T) {

2
common/crypto/benchmark_test.go
View file

@ -4,7 +4,7 @@ import (
"crypto/cipher"
"testing"
. "github.com/xtls/xray-core/v1/common/crypto"
. "github.com/xtls/xray-core/common/crypto"
)
const benchSize = 1024 * 1024

2
common/crypto/chacha20.go
View file

@ -3,7 +3,7 @@ package crypto
import (
"crypto/cipher"
"github.com/xtls/xray-core/v1/common/crypto/internal"
"github.com/xtls/xray-core/common/crypto/internal"
)
// NewChaCha20Stream creates a new Chacha20 encryption/descryption stream based on give key and IV.

4
common/crypto/chacha20_test.go
View file

@ -7,8 +7,8 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/v1/common/crypto"
"github.com/xtls/xray-core/common"
. "github.com/xtls/xray-core/common/crypto"
)
func mustDecodeHex(s string) []byte {

4
common/crypto/chunk.go
View file

@ -4,8 +4,8 @@ import (
"encoding/binary"
"io"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
)
// ChunkSizeDecoder is a utility class to decode size value from bytes.

6
common/crypto/chunk_test.go
View file

@ -5,9 +5,9 @@ import (
"io"
"testing"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
. "github.com/xtls/xray-core/v1/common/crypto"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
. "github.com/xtls/xray-core/common/crypto"
)
func TestChunkStreamIO(t *testing.T) {

4
common/crypto/crypto.go
View file

@ -1,4 +1,4 @@
// Package crypto provides common crypto libraries for Xray.
package crypto // import "github.com/xtls/xray-core/v1/common/crypto"
package crypto // import "github.com/xtls/xray-core/common/crypto"
//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
common/crypto/errors.generated.go
View file

@ -1,6 +1,6 @@
package crypto
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

2
common/crypto/io.go
View file

@ -4,7 +4,7 @@ import (
"crypto/cipher"
"io"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/common/buf"
)
type CryptionReader struct {

2
common/dice/dice.go
View file

@ -1,6 +1,6 @@
// Package dice contains common functions to generate random number.
// It also initialize math/rand with the time in seconds at launch time.
package dice // import "github.com/xtls/xray-core/v1/common/dice"
package dice // import "github.com/xtls/xray-core/common/dice"
import (
"math/rand"

2
common/dice/dice_test.go
View file

@ -4,7 +4,7 @@ import (
"math/rand"
"testing"
. "github.com/xtls/xray-core/v1/common/dice"
. "github.com/xtls/xray-core/common/dice"
)
func BenchmarkRoll1(b *testing.B) {

2
common/errors.generated.go
View file

@ -1,6 +1,6 @@
package common
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

2
common/errors/errorgen/main.go
View file

@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/common"
)
func main() {

10
common/errors/errors.go
View file

@ -1,15 +1,17 @@
// Package errors is a drop-in replacement for Golang lib 'errors'.
package errors // import "github.com/xtls/xray-core/v1/common/errors"
package errors // import "github.com/xtls/xray-core/common/errors"
import (
"os"
"reflect"
"strings"
"github.com/xtls/xray-core/v1/common/log"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common/log"
"github.com/xtls/xray-core/common/serial"
)
const trim = len("github.com/xtls/xray-core/")
type hasInnerError interface {
// Inner returns the underlying error of this one.
Inner() error
@ -37,7 +39,7 @@ func (err *Error) pkgPath() string {
if err.pathObj == nil {
return ""
}
return reflect.TypeOf(err.pathObj).PkgPath()
return reflect.TypeOf(err.pathObj).PkgPath()[trim:]
}
// Error implements error.Error().

8
common/errors/errors_test.go
View file

@ -7,8 +7,8 @@ import (
"github.com/google/go-cmp/cmp"
. "github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/v1/common/log"
. "github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/log"
)
func TestError(t *testing.T) {
@ -46,11 +46,11 @@ func TestErrorMessage(t *testing.T) {
}{
{
err: New("a").Base(New("b")).WithPathObj(e{}),
msg: "github.com/xtls/xray-core/v1/common/errors_test: a > b",
msg: "common/errors_test: a > b",
},
{
err: New("a").Base(New("b").WithPathObj(e{})),
msg: "a > github.com/xtls/xray-core/v1/common/errors_test: b",
msg: "a > common/errors_test: b",
},
}

2
common/interfaces.go
View file

@ -1,6 +1,6 @@
package common
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
// Closable is the interface for objects that can release its resources.
//

2
common/log/access.go
View file

@ -4,7 +4,7 @@ import (
"context"
"strings"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common/serial"
)
type logKey int

4
common/log/log.go
View file

@ -1,9 +1,9 @@
package log // import "github.com/xtls/xray-core/v1/common/log"
package log // import "github.com/xtls/xray-core/common/log"
import (
"sync"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common/serial"
)
// Message is the interface for all log messages.

10
common/log/log.pb.go
View file

@ -89,13 +89,13 @@ var file_common_log_log_proto_rawDesc = []byte{
0x69, 0x74, 0x79, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00,
0x12, 0x09, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x57,
0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f,
0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x44, 0x65, 0x62, 0x75, 0x67, 0x10, 0x04, 0x42, 0x52, 0x0a,
0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x44, 0x65, 0x62, 0x75, 0x67, 0x10, 0x04, 0x42, 0x4f, 0x0a,
0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
0x2e, 0x6c, 0x6f, 0x67, 0x50, 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
0x2e, 0x6c, 0x6f, 0x67, 0x50, 0x01, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72,
0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6c, 0x6f, 0x67, 0xaa,
0x02, 0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f,
0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x65, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6c, 0x6f, 0x67, 0xaa, 0x02, 0x0f, 0x58,
0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x67, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
common/log/log.proto
View file

@ -2,7 +2,7 @@ syntax = "proto3";
package xray.common.log;
option csharp_namespace = "Xray.Common.Log";
option go_package = "github.com/xtls/xray-core/v1/common/log";
option go_package = "github.com/xtls/xray-core/common/log";
option java_package = "com.xray.common.log";
option java_multiple_files = true;

4
common/log/log_test.go
View file

@ -5,8 +5,8 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common/log"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/common/log"
"github.com/xtls/xray-core/common/net"
)
type testLogger struct {

6
common/log/logger.go
View file

@ -6,9 +6,9 @@ import (
"os"
"time"
"github.com/xtls/xray-core/v1/common/platform"
"github.com/xtls/xray-core/v1/common/signal/done"
"github.com/xtls/xray-core/v1/common/signal/semaphore"
"github.com/xtls/xray-core/common/platform"
"github.com/xtls/xray-core/common/signal/done"
"github.com/xtls/xray-core/common/signal/semaphore"
)
// Writer is the interface for writing logs.

6
common/log/logger_test.go
View file

@ -7,9 +7,9 @@ import (
"testing"
"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/common"
"github.com/xtls/xray-core/common/buf"
. "github.com/xtls/xray-core/common/log"
)
func TestFileLogger(t *testing.T) {

24
common/mux/client.go
View file

@ -6,18 +6,18 @@ import (
"sync"
"time"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/errors"
"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/common/signal/done"
"github.com/xtls/xray-core/v1/common/task"
"github.com/xtls/xray-core/v1/proxy"
"github.com/xtls/xray-core/v1/transport"
"github.com/xtls/xray-core/v1/transport/internet"
"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/errors"
"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/common/signal/done"
"github.com/xtls/xray-core/common/task"
"github.com/xtls/xray-core/proxy"
"github.com/xtls/xray-core/transport"
"github.com/xtls/xray-core/transport/internet"
"github.com/xtls/xray-core/transport/pipe"
)
type ClientManager struct {

16
common/mux/client_test.go
View file

@ -6,14 +6,14 @@ import (
"time"
"github.com/golang/mock/gomock"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/errors"
"github.com/xtls/xray-core/v1/common/mux"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/session"
"github.com/xtls/xray-core/v1/testing/mocks"
"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/errors"
"github.com/xtls/xray-core/common/mux"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/session"
"github.com/xtls/xray-core/testing/mocks"
"github.com/xtls/xray-core/transport"
"github.com/xtls/xray-core/transport/pipe"
)
func TestIncrementalPickerFailure(t *testing.T) {

2
common/mux/errors.generated.go
View file

@ -1,6 +1,6 @@
package mux
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

12
common/mux/frame.go
View file

@ -4,12 +4,12 @@ import (
"encoding/binary"
"io"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/bitmask"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/bitmask"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
)
type SessionStatus byte

8
common/mux/frame_test.go
View file

@ -3,10 +3,10 @@ package mux_test
import (
"testing"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/mux"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/mux"
"github.com/xtls/xray-core/common/net"
)
func BenchmarkFrameWrite(b *testing.B) {

2
common/mux/mux.go
View file

@ -1,3 +1,3 @@
package mux
//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

12
common/mux/mux_test.go
View file

@ -6,12 +6,12 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
. "github.com/xtls/xray-core/v1/common/mux"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/protocol"
"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/mux"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/transport/pipe"
)
func readAll(reader buf.Reader) (buf.MultiBuffer, error) {

6
common/mux/reader.go
View file

@ -3,9 +3,9 @@ package mux
import (
"io"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/crypto"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/crypto"
"github.com/xtls/xray-core/common/serial"
)
// PacketReader is an io.Reader that reads whole chunk of Mux frames every time.

22
common/mux/server.go
View file

@ -4,17 +4,17 @@ import (
"context"
"io"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/errors"
"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/routing"
"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/errors"
"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/routing"
"github.com/xtls/xray-core/transport"
"github.com/xtls/xray-core/transport/pipe"
)
type Server struct {

6
common/mux/session.go
View file

@ -3,9 +3,9 @@ package mux
import (
"sync"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/protocol"
)
type SessionManager struct {

2
common/mux/session_test.go
View file

@ -3,7 +3,7 @@ package mux_test
import (
"testing"
. "github.com/xtls/xray-core/v1/common/mux"
. "github.com/xtls/xray-core/common/mux"
)
func TestSessionManagerAdd(t *testing.T) {

10
common/mux/writer.go
View file

@ -1,11 +1,11 @@
package mux
import (
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
)
type Writer struct {

10
common/net/address.pb.go
View file

@ -119,12 +119,12 @@ var file_common_net_address_proto_rawDesc = []byte{
0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x02, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x06, 0x64,
0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x64,
0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
0x42, 0x52, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d,
0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75,
0x42, 0x4f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d,
0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75,
0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d,
0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e,
0x65, 0x74, 0xaa, 0x02, 0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x63, 0x6f, 0x72, 0x65, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa,
0x02, 0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65,
0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
common/net/address.proto
View file

@ -2,7 +2,7 @@ syntax = "proto3";
package xray.common.net;
option csharp_namespace = "Xray.Common.Net";
option go_package = "github.com/xtls/xray-core/v1/common/net";
option go_package = "github.com/xtls/xray-core/common/net";
option java_package = "com.xray.common.net";
option java_multiple_files = true;

2
common/net/address_test.go
View file

@ -6,7 +6,7 @@ import (
"github.com/google/go-cmp/cmp"
. "github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/common/net"
)
func TestAddressProperty(t *testing.T) {

6
common/net/connection.go
View file

@ -7,9 +7,9 @@ import (
"net"
"time"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/signal/done"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/signal/done"
)
type ConnectionOption func(*connection)

10
common/net/destination.pb.go
View file

@ -107,12 +107,12 @@ var file_common_net_destination_proto_rawDesc = []byte{
0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x2e, 0x49, 0x50, 0x4f, 0x72, 0x44, 0x6f, 0x6d, 0x61,
0x69, 0x6e, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70,
0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x42,
0x52, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
0x4f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63,
0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65,
0x74, 0xaa, 0x02, 0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6f, 0x72, 0x65, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02,
0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
common/net/destination.proto
View file

@ -2,7 +2,7 @@ syntax = "proto3";
package xray.common.net;
option csharp_namespace = "Xray.Common.Net";
option go_package = "github.com/xtls/xray-core/v1/common/net";
option go_package = "github.com/xtls/xray-core/common/net";
option java_package = "com.xray.common.net";
option java_multiple_files = true;

2
common/net/destination_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/google/go-cmp/cmp"
. "github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/common/net"
)
func TestDestinationProperty(t *testing.T) {

2
common/net/errors.generated.go
View file

@ -1,6 +1,6 @@
package net
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

4
common/net/net.go
View file

@ -1,4 +1,4 @@
// Package net is a drop-in replacement to Golang's net package, with some more functionalities.
package net // import "github.com/xtls/xray-core/v1/common/net"
package net // import "github.com/xtls/xray-core/common/net"
//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

10
common/net/network.pb.go
View file

@ -143,12 +143,12 @@ var file_common_net_network_proto_rawDesc = []byte{
0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x06, 0x52, 0x61, 0x77, 0x54, 0x43, 0x50,
0x10, 0x01, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x43, 0x50, 0x10, 0x02, 0x12,
0x07, 0x0a, 0x03, 0x55, 0x44, 0x50, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x55, 0x4e, 0x49, 0x58,
0x10, 0x04, 0x42, 0x52, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63,
0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74,
0x10, 0x04, 0x42, 0x4f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63,
0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x24, 0x67, 0x69, 0x74,
0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61,
0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d,
0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65,
0x74, 0xaa, 0x02, 0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
common/net/network.proto
View file

@ -2,7 +2,7 @@ syntax = "proto3";
package xray.common.net;
option csharp_namespace = "Xray.Common.Net";
option go_package = "github.com/xtls/xray-core/v1/common/net";
option go_package = "github.com/xtls/xray-core/common/net";
option java_package = "com.xray.common.net";
option java_multiple_files = true;

11
common/net/port.pb.go
View file

@ -143,13 +143,12 @@ var file_common_net_port_proto_rawDesc = []byte{
0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x2e, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65,
0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x52, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78,
0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x4f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x78,
0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x50, 0x01,
0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c,
0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63,
0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x0f, 0x58, 0x72, 0x61, 0x79,
0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c,
0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
0x6f, 0x6e, 0x2f, 0x6e, 0x65, 0x74, 0xaa, 0x02, 0x0f, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f,
0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4e, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
common/net/port.proto
View file

@ -2,7 +2,7 @@ syntax = "proto3";
package xray.common.net;
option csharp_namespace = "Xray.Common.Net";
option go_package = "github.com/xtls/xray-core/v1/common/net";
option go_package = "github.com/xtls/xray-core/common/net";
option java_package = "com.xray.common.net";
option java_multiple_files = true;

2
common/net/port_test.go
View file

@ -3,7 +3,7 @@ package net_test
import (
"testing"
. "github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/common/net"
)
func TestPortRangeContains(t *testing.T) {

6
common/platform/ctlcmd/ctlcmd.go
View file

@ -6,11 +6,11 @@ import (
"os/exec"
"strings"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/platform"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/platform"
)
//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
func Run(args []string, input io.Reader) (buf.MultiBuffer, error) {
xctl := platform.GetToolLocation("xctl")

2
common/platform/ctlcmd/errors.generated.go
View file

@ -1,6 +1,6 @@
package ctlcmd
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

4
common/platform/filesystem/file.go
View file

@ -4,8 +4,8 @@ import (
"io"
"os"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/platform"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/platform"
)
type FileReaderFunc func(path string) (io.ReadCloser, error)

2
common/platform/platform.go
View file

@ -1,4 +1,4 @@
package platform // import "github.com/xtls/xray-core/v1/common/platform"
package platform // import "github.com/xtls/xray-core/common/platform"
import (
"os"

4
common/platform/platform_test.go
View file

@ -6,8 +6,8 @@ import (
"runtime"
"testing"
"github.com/xtls/xray-core/v1/common"
. "github.com/xtls/xray-core/v1/common/platform"
"github.com/xtls/xray-core/common"
. "github.com/xtls/xray-core/common/platform"
)
func TestNormalizeEnvName(t *testing.T) {

8
common/protocol/address.go
View file

@ -3,10 +3,10 @@ package protocol
import (
"io"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/serial"
)
type AddressOption func(*option)

8
common/protocol/address_test.go
View file

@ -6,10 +6,10 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net"
. "github.com/xtls/xray-core/common/protocol"
)
func TestAddressReading(t *testing.T) {

2
common/protocol/bittorrent/bittorrent.go
View file

@ -3,7 +3,7 @@ package bittorrent
import (
"errors"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/common"
)
type SniffHeader struct {

2
common/protocol/dns/errors.generated.go
View file

@ -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{}

6
common/protocol/dns/io.go
View file

@ -4,9 +4,9 @@ import (
"encoding/binary"
"sync"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/buf"
"github.com/xtls/xray-core/v1/common/serial"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/serial"
"golang.org/x/net/dns/dnsmessage"
)

2
common/protocol/errors.generated.go
View file

@ -1,6 +1,6 @@
package protocol
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

6
common/protocol/headers.go
View file

@ -3,9 +3,9 @@ package protocol
import (
"runtime"
"github.com/xtls/xray-core/v1/common/bitmask"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/v1/common/uuid"
"github.com/xtls/xray-core/common/bitmask"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/uuid"
)
// RequestCommand is a custom command in a proxy request.

12
common/protocol/headers.pb.go
View file

@ -147,13 +147,13 @@ var file_common_protocol_headers_proto_rawDesc = []byte{
0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x41, 0x45, 0x53, 0x31, 0x32, 0x38, 0x5f, 0x47, 0x43, 0x4d,
0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x43, 0x48, 0x41, 0x43, 0x48, 0x41, 0x32, 0x30, 0x5f, 0x50,
0x4f, 0x4c, 0x59, 0x31, 0x33, 0x30, 0x35, 0x10, 0x04, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e,
0x45, 0x10, 0x05, 0x42, 0x61, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e,
0x45, 0x10, 0x05, 0x42, 0x5e, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e,
0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50,
0x01, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74,
0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f,
0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0xaa,
0x02, 0x14, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72,
0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x01, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74,
0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x63, 0x6f, 0x6d,
0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0xaa, 0x02, 0x14, 0x58,
0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
0x63, 0x6f, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
common/protocol/headers.proto
View file

@ -2,7 +2,7 @@ syntax = "proto3";
package xray.common.protocol;
option csharp_namespace = "Xray.Common.Protocol";
option go_package = "github.com/xtls/xray-core/v1/common/protocol";
option go_package = "github.com/xtls/xray-core/common/protocol";
option java_package = "com.xray.common.protocol";
option java_multiple_files = true;

2
common/protocol/http/headers.go
View file

@ -5,7 +5,7 @@ import (
"strconv"
"strings"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/common/net"
)
// ParseXForwardedFor parses X-Forwarded-For header in http headers, and return the IP list in it.

6
common/protocol/http/headers_test.go
View file

@ -8,9 +8,9 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/v1/common/protocol/http"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
. "github.com/xtls/xray-core/common/protocol/http"
)
func TestParseXForwardedFor(t *testing.T) {

4
common/protocol/http/sniff.go
View file

@ -5,8 +5,8 @@ import (
"errors"
"strings"
"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"
)
type version byte

2
common/protocol/http/sniff_test.go
View file

@ -3,7 +3,7 @@ package http_test
import (
"testing"
. "github.com/xtls/xray-core/v1/common/protocol/http"
. "github.com/xtls/xray-core/common/protocol/http"
)
func TestHTTPHeaders(t *testing.T) {

4
common/protocol/id.go
View file

@ -5,8 +5,8 @@ import (
"crypto/md5"
"hash"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/uuid"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/uuid"
)
const (

4
common/protocol/id_test.go
View file

@ -3,8 +3,8 @@ package protocol_test
import (
"testing"
. "github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/v1/common/uuid"
. "github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/uuid"
)
func TestIdEquals(t *testing.T) {

4
common/protocol/protocol.go
View file

@ -1,3 +1,3 @@
package protocol // import "github.com/xtls/xray-core/v1/common/protocol"
package protocol // import "github.com/xtls/xray-core/common/protocol"
//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

4
common/protocol/server_picker_test.go
View file

@ -4,8 +4,8 @@ import (
"testing"
"time"
"github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/common/net"
. "github.com/xtls/xray-core/common/protocol"
)
func TestServerList(t *testing.T) {

4
common/protocol/server_spec.go
View file

@ -4,8 +4,8 @@ import (
"sync"
"time"
"github.com/xtls/xray-core/v1/common/dice"
"github.com/xtls/xray-core/v1/common/net"
"github.com/xtls/xray-core/common/dice"
"github.com/xtls/xray-core/common/net"
)
type ValidationStrategy interface {

14
common/protocol/server_spec.pb.go
View file

@ -8,7 +8,7 @@ package protocol
import (
proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/v1/common/net"
net "github.com/xtls/xray-core/common/net"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@ -107,14 +107,14 @@ var file_common_protocol_server_spec_proto_rawDesc = []byte{
0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2e, 0x0a,
0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x78, 0x72,
0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
0x6f, 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42, 0x61, 0x0a,
0x6f, 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42, 0x5e, 0x0a,
0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x01, 0x5a, 0x2c, 0x67, 0x69, 0x74,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x50, 0x01, 0x5a, 0x29, 0x67, 0x69, 0x74,
0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61,
0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0xaa, 0x02, 0x14, 0x58, 0x72, 0x61, 0x79,
0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0xaa, 0x02, 0x14, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x43, 0x6f,
0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
common/protocol/server_spec.proto
View file

@ -2,7 +2,7 @@ syntax = "proto3";
package xray.common.protocol;
option csharp_namespace = "Xray.Common.Protocol";
option go_package = "github.com/xtls/xray-core/v1/common/protocol";
option go_package = "github.com/xtls/xray-core/common/protocol";
option java_package = "com.xray.common.protocol";
option java_multiple_files = true;

10
common/protocol/server_spec_test.go
View file

@ -5,11 +5,11 @@ import (
"testing"
"time"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/net"
. "github.com/xtls/xray-core/v1/common/protocol"
"github.com/xtls/xray-core/v1/common/uuid"
"github.com/xtls/xray-core/v1/proxy/vmess"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
. "github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/uuid"
"github.com/xtls/xray-core/proxy/vmess"
)
func TestAlwaysValidStrategy(t *testing.T) {

2
common/protocol/time.go
View file

@ -3,7 +3,7 @@ package protocol
import (
"time"
"github.com/xtls/xray-core/v1/common/dice"
"github.com/xtls/xray-core/common/dice"
)
type Timestamp int64

2
common/protocol/time_test.go
View file

@ -4,7 +4,7 @@ import (
"testing"
"time"
. "github.com/xtls/xray-core/v1/common/protocol"
. "github.com/xtls/xray-core/common/protocol"
)
func TestGenerateRandomInt64InRange(t *testing.T) {

4
common/protocol/tls/cert/cert.go
View file

@ -12,10 +12,10 @@ import (
"math/big"
"time"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/common"
)
//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
type Certificate struct {
// Cerificate in ASN.1 DER format

4
common/protocol/tls/cert/cert_test.go
View file

@ -9,8 +9,8 @@ import (
"testing"
"time"
"github.com/xtls/xray-core/v1/common"
"github.com/xtls/xray-core/v1/common/task"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/task"
)
func TestGenerate(t *testing.T) {

2
common/protocol/tls/cert/errors.generated.go
View file

@ -1,6 +1,6 @@
package cert
import "github.com/xtls/xray-core/v1/common/errors"
import "github.com/xtls/xray-core/common/errors"
type errPathObjHolder struct{}

Some files were not shown because too many files have changed in this diff Show more