From 1e98e0ae92484b46debed1812169b76ed66e82b3 Mon Sep 17 00:00:00 2001
From: Shelikhoo <xiaokangwang@outlook.com>
Date: Sun, 2 Jan 2022 16:19:52 +0000
Subject: [PATCH] fix error introduced by rebase

---
 common/net/packetaddr/config.proto       | 2 +-
 common/net/packetaddr/packetaddr_test.go | 2 +-
 proxy/socks/client.go                    | 4 ++--
 proxy/socks/config.pb.go                 | 8 ++++----
 transport/internet/connection.go         | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/net/packetaddr/config.proto b/common/net/packetaddr/config.proto
index 33269194331..edc3e0f051a 100644
--- a/common/net/packetaddr/config.proto
+++ b/common/net/packetaddr/config.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package v2ray.core.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_multiple_files = true;
 
diff --git a/common/net/packetaddr/packetaddr_test.go b/common/net/packetaddr/packetaddr_test.go
index e3cc8c0f2c5..d81468d3a58 100644
--- a/common/net/packetaddr/packetaddr_test.go
+++ b/common/net/packetaddr/packetaddr_test.go
@@ -6,7 +6,7 @@ import (
 
 	"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) {
diff --git a/proxy/socks/client.go b/proxy/socks/client.go
index 3e2c38e9982..4347010d7bc 100644
--- a/proxy/socks/client.go
+++ b/proxy/socks/client.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/v2fly/v2ray-core/v4/common/net/packetaddr"
-	"github.com/v2fly/v2ray-core/v4/transport/internet/udp"
+	"github.com/v2fly/v2ray-core/v5/common/net/packetaddr"
+	"github.com/v2fly/v2ray-core/v5/transport/internet/udp"
 
 	core "github.com/v2fly/v2ray-core/v5"
 	"github.com/v2fly/v2ray-core/v5/common"
diff --git a/proxy/socks/config.pb.go b/proxy/socks/config.pb.go
index 5d2b0363608..d9ce203b1cd 100644
--- a/proxy/socks/config.pb.go
+++ b/proxy/socks/config.pb.go
@@ -7,9 +7,9 @@
 package socks
 
 import (
-	net "github.com/v2fly/v2ray-core/v4/common/net"
 	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"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -27,7 +27,7 @@ const (
 type AuthType int32
 
 const (
-	// NO_AUTH is for anounymous authentication.
+	// NO_AUTH is for anonymous authentication.
 	AuthType_NO_AUTH AuthType = 0
 	// PASSWORD is for username/password authentication.
 	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,
 	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,
-	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,
 	0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x6f, 0x63, 0x6b, 0x73, 0x62, 0x06,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
diff --git a/transport/internet/connection.go b/transport/internet/connection.go
index 3484c1fd810..44ef8ebd50e 100644
--- a/transport/internet/connection.go
+++ b/transport/internet/connection.go
@@ -3,8 +3,8 @@ package internet
 import (
 	"net"
 
-	"github.com/v2fly/v2ray-core/v4/common"
-	"github.com/v2fly/v2ray-core/v4/features/stats"
+	"github.com/v2fly/v2ray-core/v5/common"
+	"github.com/v2fly/v2ray-core/v5/features/stats"
 )
 
 type Connection interface {