github/v2ray-core
4
0
Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-02 08:20:25 +00:00
Code Issues Releases Wiki Activity

unified import path

Browse Source
This commit is contained in:
v2ray
2016-08-20 20:55:45 +02:00
parent 6a878432dc
commit 07a86f549b
248 changed files with 759 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/shadowsocks/config.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"crypto/cipher"
"crypto/md5"
"github.com/v2ray/v2ray-core/common/crypto"
"github.com/v2ray/v2ray-core/common/protocol"
"v2ray.com/core/common/crypto"
"v2ray.com/core/common/protocol"
)
type Cipher interface {
proxy/shadowsocks/config_json.go
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"errors"
"strings"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/proxy/registry"
"v2ray.com/core/common"
"v2ray.com/core/common/log"
"v2ray.com/core/common/protocol"
"v2ray.com/core/proxy/registry"
)
func (this *Config) UnmarshalJSON(data []byte) error {
proxy/shadowsocks/config_json_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"encoding/json"
"testing"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/testing/assert"
)
func TestConfigParsing(t *testing.T) {
proxy/shadowsocks/ota.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"crypto/sha1"
"io"
"github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/log"
"github.com/v2ray/v2ray-core/common/serial"
"github.com/v2ray/v2ray-core/transport"
"v2ray.com/core/common/alloc"
"v2ray.com/core/common/log"
"v2ray.com/core/common/serial"
"v2ray.com/core/transport"
)
const (
proxy/shadowsocks/ota_test.go
+3 -3
View File
@@ -3,9 +3,9 @@ package shadowsocks_test
import (
"testing"
"github.com/v2ray/v2ray-core/common/alloc"
. "github.com/v2ray/v2ray-core/proxy/shadowsocks"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/common/alloc"
. "v2ray.com/core/proxy/shadowsocks"
"v2ray.com/core/testing/assert"
)
func TestNormalChunkReading(t *testing.T) {
proxy/shadowsocks/protocol.go
+5 -5
View File
@@ -4,11 +4,11 @@ import (
"bytes"
"io"
"github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/transport"
"v2ray.com/core/common/alloc"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
"v2ray.com/core/transport"
)
const (
proxy/shadowsocks/protocol_test.go
+6 -6
View File
@@ -4,12 +4,12 @@ import (
"io"
"testing"
"github.com/v2ray/v2ray-core/common/alloc"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/proxy"
. "github.com/v2ray/v2ray-core/proxy/shadowsocks"
"github.com/v2ray/v2ray-core/testing/assert"
"github.com/v2ray/v2ray-core/transport"
"v2ray.com/core/common/alloc"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/proxy"
. "v2ray.com/core/proxy/shadowsocks"
"v2ray.com/core/testing/assert"
"v2ray.com/core/transport"
)
func TestNormalRequestParsing(t *testing.T) {
proxy/shadowsocks/server.go
+13 -13
View File
@@ -6,19 +6,19 @@ import (
"io"
"sync"
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/app/dispatcher"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/crypto"
v2io "github.com/v2ray/v2ray-core/common/io"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/common/protocol"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/proxy/registry"
"github.com/v2ray/v2ray-core/transport/internet"
"github.com/v2ray/v2ray-core/transport/internet/udp"
"v2ray.com/core/app"
"v2ray.com/core/app/dispatcher"
"v2ray.com/core/common"
"v2ray.com/core/common/alloc"
"v2ray.com/core/common/crypto"
v2io "v2ray.com/core/common/io"
"v2ray.com/core/common/log"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/common/protocol"
"v2ray.com/core/proxy"
"v2ray.com/core/proxy/registry"
"v2ray.com/core/transport/internet"
"v2ray.com/core/transport/internet/udp"
)
type Server struct {