lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 07:26:24 -05:00
Code Issues Releases Wiki Activity

fix error introduced by rebase

Browse Source
This commit is contained in:
Shelikhoo 2022-01-02 16:19:52 +00:00 committed by Xiaokang Wang (Shelikhoo)
parent 0f2da63f0c
commit 1e98e0ae92
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/net/packetaddr/config.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package v2ray.core.net.packetaddr; package v2ray.core.net.packetaddr;
option csharp_namespace = "V2Ray.Core.Common.Net.Packetaddr"; option csharp_namespace = "V2Ray.Core.Common.Net.Packetaddr";
option go_package = "github.com/v2fly/v2ray-core/v4/common/net/packetaddr"; option go_package = "github.com/v2fly/v2ray-core/v5/common/net/packetaddr";
option java_package = "com.v2ray.core.common.net.packetaddr"; option java_package = "com.v2ray.core.common.net.packetaddr";
option java_multiple_files = true; option java_multiple_files = true;

2
common/net/packetaddr/packetaddr_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/v2fly/v2ray-core/v4/common/buf" "github.com/v2fly/v2ray-core/v5/common/buf"
) )
func TestPacketEncodingIPv4(t *testing.T) { func TestPacketEncodingIPv4(t *testing.T) {

4
proxy/socks/client.go
View File

@ -4,8 +4,8 @@ import (
"context" "context"
"time" "time"
"github.com/v2fly/v2ray-core/v4/common/net/packetaddr" "github.com/v2fly/v2ray-core/v5/common/net/packetaddr"
"github.com/v2fly/v2ray-core/v4/transport/internet/udp" "github.com/v2fly/v2ray-core/v5/transport/internet/udp"
core "github.com/v2fly/v2ray-core/v5" core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v5/common" "github.com/v2fly/v2ray-core/v5/common"

8
proxy/socks/config.pb.go
View File

@ -7,9 +7,9 @@
package socks package socks
import ( import (
net "github.com/v2fly/v2ray-core/v4/common/net"
packetaddr "github.com/v2fly/v2ray-core/v4/common/net/packetaddr" packetaddr "github.com/v2fly/v2ray-core/v4/common/net/packetaddr"
protocol "github.com/v2fly/v2ray-core/v4/common/protocol" net "github.com/v2fly/v2ray-core/v5/common/net"
protocol "github.com/v2fly/v2ray-core/v5/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl" protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect" reflect "reflect"
@ -27,7 +27,7 @@ const (
type AuthType int32 type AuthType int32
const ( const (
// NO_AUTH is for anounymous authentication. // NO_AUTH is for anonymous authentication.
AuthType_NO_AUTH AuthType = 0 AuthType_NO_AUTH AuthType = 0
// PASSWORD is for username/password authentication. // PASSWORD is for username/password authentication.
AuthType_PASSWORD AuthType = 1 AuthType_PASSWORD AuthType = 1
@ -395,7 +395,7 @@ var file_proxy_socks_config_proto_rawDesc = []byte{
0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78,
0x79, 0x2e, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x79, 0x2e, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75,
0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61,
0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
0x73, 0x6f, 0x63, 0x6b, 0x73, 0xaa, 0x02, 0x16, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0xaa, 0x02, 0x16, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f,
0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x73, 0x62, 0x06, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x73, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,

4
transport/internet/connection.go
View File

@ -3,8 +3,8 @@ package internet
import ( import (
"net" "net"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v4/features/stats" "github.com/v2fly/v2ray-core/v5/features/stats"
) )
type Connection interface { type Connection interface {