From 42d158bd859d5b869e0aff48db2f218d07330733 Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Fri, 17 Sep 2021 13:16:14 -0400
Subject: [PATCH] vprotogen refine (#717)
* Update all proto files with existing vprotogen
* Chore: remove protoc-gen-gofast
* Feat: vprotogen adds version detector to block generation code from old protobuf version
* Feat: vprotogen refine logic
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
---
app/commander/config.pb.go | 9 +-
app/dispatcher/config.pb.go | 9 +-
app/dns/config.pb.go | 32 +-
app/dns/fakedns/fakedns.pb.go | 34 +-
app/log/command/config.pb.go | 9 +-
app/log/config.pb.go | 11 +-
app/policy/config.pb.go | 9 +-
app/proxyman/command/command.pb.go | 9 +-
app/proxyman/config.pb.go | 9 +-
app/reverse/config.pb.go | 9 +-
app/router/command/command.pb.go | 11 +-
app/router/config.pb.go | 2 +-
app/stats/command/command.pb.go | 9 +-
app/stats/config.pb.go | 9 +-
common/log/log.pb.go | 9 +-
common/net/address.pb.go | 9 +-
common/net/destination.pb.go | 9 +-
common/net/network.pb.go | 9 +-
common/net/port.pb.go | 9 +-
common/protocol/headers.pb.go | 9 +-
common/protocol/server_spec.pb.go | 9 +-
common/protocol/user.pb.go | 9 +-
common/serial/typed_message.pb.go | 9 +-
core/config.pb.go | 9 +-
core/proto.go | 12 +-
infra/vprotogen/main.go | 190 ++++++-
proxy/blackhole/config.pb.go | 9 +-
proxy/dns/config.pb.go | 9 +-
proxy/dokodemo/config.pb.go | 9 +-
proxy/freedom/config.pb.go | 9 +-
proxy/http/config.pb.go | 9 +-
proxy/mtproto/config.pb.go | 9 +-
proxy/shadowsocks/config.pb.go | 7 +-
proxy/socks/config.pb.go | 9 +-
proxy/trojan/config.pb.go | 9 +-
proxy/vless/account.pb.go | 9 +-
proxy/vless/encoding/addons.pb.go | 481 +++++-------------
proxy/vless/encoding/encoding_test.go | 12 +-
proxy/vless/inbound/config.pb.go | 9 +-
proxy/vless/outbound/config.pb.go | 9 +-
proxy/vmess/account.pb.go | 9 +-
proxy/vmess/inbound/config.pb.go | 9 +-
proxy/vmess/outbound/config.pb.go | 9 +-
transport/global/config.pb.go | 9 +-
transport/internet/config.pb.go | 9 +-
transport/internet/domainsocket/config.pb.go | 9 +-
transport/internet/grpc/config.pb.go | 4 +-
transport/internet/grpc/encoding/stream.pb.go | 9 +-
transport/internet/headers/http/config.pb.go | 9 +-
transport/internet/headers/noop/config.pb.go | 9 +-
transport/internet/headers/srtp/config.pb.go | 9 +-
transport/internet/headers/tls/config.pb.go | 9 +-
transport/internet/headers/utp/config.pb.go | 9 +-
.../internet/headers/wechat/config.pb.go | 9 +-
.../internet/headers/wireguard/config.pb.go | 9 +-
transport/internet/http/config.pb.go | 4 +-
transport/internet/kcp/config.pb.go | 9 +-
transport/internet/quic/config.pb.go | 9 +-
transport/internet/tcp/config.pb.go | 9 +-
transport/internet/tls/config.pb.go | 7 +-
transport/internet/udp/config.pb.go | 9 +-
transport/internet/websocket/config.pb.go | 9 +-
transport/internet/xtls/config.pb.go | 7 +-
63 files changed, 455 insertions(+), 800 deletions(-)
diff --git a/app/commander/config.pb.go b/app/commander/config.pb.go
index c10693ec..a687217d 100644
--- a/app/commander/config.pb.go
+++ b/app/commander/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/commander/config.proto
package commander
import (
- proto "github.com/golang/protobuf/proto"
serial "github.com/xtls/xray-core/common/serial"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// Config is the settings for Commander.
type Config struct {
state protoimpl.MessageState
diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go
index bb39e36e..d53b1bc1 100644
--- a/app/dispatcher/config.pb.go
+++ b/app/dispatcher/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/dispatcher/config.proto
package dispatcher
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type SessionConfig struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
index 5a3368af..e85acad8 100644
--- a/app/dns/config.pb.go
+++ b/app/dns/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/dns/config.proto
package dns
import (
- proto "github.com/golang/protobuf/proto"
router "github.com/xtls/xray-core/app/router"
net "github.com/xtls/xray-core/common/net"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -23,10 +22,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type DomainMatchingType int32
const (
@@ -473,7 +468,7 @@ var file_app_dns_config_proto_rawDesc = []byte{
0x0c, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x12, 0x0a,
0x04, 0x72, 0x75, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x75, 0x6c,
0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52,
- 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x9f, 0x04, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+ 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0xa5, 0x04, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
0x12, 0x3f, 0x0a, 0x0b, 0x4e, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18,
0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d,
0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x2e, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
@@ -507,16 +502,17 @@ var file_app_dns_config_proto_rawDesc = []byte{
0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x02, 0x69, 0x70,
0x12, 0x25, 0x0a, 0x0e, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x6f, 0x6d, 0x61,
0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x65,
- 0x64, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2a, 0x45, 0x0a, 0x12, 0x44, 0x6f, 0x6d, 0x61, 0x69,
- 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a,
- 0x04, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x64, 0x6f,
- 0x6d, 0x61, 0x69, 0x6e, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72,
- 0x64, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x52, 0x65, 0x67, 0x65, 0x78, 0x10, 0x03, 0x42, 0x46,
- 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x64,
- 0x6e, 0x73, 0x50, 0x01, 0x5a, 0x21, 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,
- 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0xaa, 0x02, 0x0c, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x41,
- 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x64, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x4a, 0x04, 0x08, 0x07, 0x10, 0x08, 0x2a, 0x45, 0x0a,
+ 0x12, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x54,
+ 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0d, 0x0a,
+ 0x09, 0x53, 0x75, 0x62, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07,
+ 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x52, 0x65, 0x67,
+ 0x65, 0x78, 0x10, 0x03, 0x42, 0x46, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79,
+ 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x64, 0x6e, 0x73, 0x50, 0x01, 0x5a, 0x21, 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, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0xaa, 0x02, 0x0c,
+ 0x58, 0x72, 0x61, 0x79, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/app/dns/fakedns/fakedns.pb.go b/app/dns/fakedns/fakedns.pb.go
index 025029de..e9fe529b 100644
--- a/app/dns/fakedns/fakedns.pb.go
+++ b/app/dns/fakedns/fakedns.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.13.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/dns/fakedns/fakedns.proto
package fakedns
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type FakeDnsPool struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -85,19 +80,18 @@ var File_app_dns_fakedns_fakedns_proto protoreflect.FileDescriptor
var file_app_dns_fakedns_fakedns_proto_rawDesc = []byte{
0x0a, 0x1d, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0x2f, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e,
0x73, 0x2f, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
- 0x1a, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x61, 0x70, 0x70, 0x2e,
- 0x64, 0x6e, 0x73, 0x2e, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x22, 0x40, 0x0a, 0x0b, 0x46,
- 0x61, 0x6b, 0x65, 0x44, 0x6e, 0x73, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x70,
- 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x70, 0x50,
- 0x6f, 0x6f, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x72, 0x75, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x72, 0x75, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x5f, 0x0a,
- 0x1e, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
- 0x61, 0x70, 0x70, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x50,
- 0x01, 0x5a, 0x1e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x72,
- 0x65, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0x2f, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e,
- 0x73, 0xaa, 0x02, 0x1a, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41,
- 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x14, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x66, 0x61,
+ 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x22, 0x40, 0x0a, 0x0b, 0x46, 0x61, 0x6b, 0x65, 0x44, 0x6e, 0x73,
+ 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x70, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x70, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x18, 0x0a,
+ 0x07, 0x6c, 0x72, 0x75, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
+ 0x6c, 0x72, 0x75, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x5e, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x78,
+ 0x72, 0x61, 0x79, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x64, 0x6e, 0x73, 0x2e, 0x66, 0x61, 0x6b, 0x65,
+ 0x64, 0x6e, 0x73, 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, 0x61, 0x70, 0x70, 0x2f, 0x64, 0x6e, 0x73, 0x2f, 0x66, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73,
+ 0xaa, 0x02, 0x14, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x41, 0x70, 0x70, 0x2e, 0x44, 0x6e, 0x73, 0x2e,
+ 0x46, 0x61, 0x6b, 0x65, 0x64, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/app/log/command/config.pb.go b/app/log/command/config.pb.go
index db046b40..699ab600 100644
--- a/app/log/command/config.pb.go
+++ b/app/log/command/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/log/command/config.proto
package command
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/app/log/config.pb.go b/app/log/config.pb.go
index bc0e4946..77108f8a 100644
--- a/app/log/config.pb.go
+++ b/app/log/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/log/config.proto
package log
import (
- proto "github.com/golang/protobuf/proto"
log "github.com/xtls/xray-core/common/log"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type LogType int32
const (
@@ -134,7 +129,7 @@ func (x *Config) GetErrorLogLevel() log.Severity {
if x != nil {
return x.ErrorLogLevel
}
- return log.Severity_Unknown
+ return log.Severity(0)
}
func (x *Config) GetErrorLogPath() string {
diff --git a/app/policy/config.pb.go b/app/policy/config.pb.go
index 37597afd..2c359d24 100644
--- a/app/policy/config.pb.go
+++ b/app/policy/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/policy/config.proto
package policy
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Second struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/app/proxyman/command/command.pb.go b/app/proxyman/command/command.pb.go
index 74ad5cfd..cdf37750 100644
--- a/app/proxyman/command/command.pb.go
+++ b/app/proxyman/command/command.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/proxyman/command/command.proto
package command
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
serial "github.com/xtls/xray-core/common/serial"
core "github.com/xtls/xray-core/core"
@@ -24,10 +23,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type AddUserOperation struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go
index 4e42cfd5..a4a43ae0 100644
--- a/app/proxyman/config.pb.go
+++ b/app/proxyman/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc (unknown)
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/proxyman/config.proto
package proxyman
import (
- proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/common/net"
serial "github.com/xtls/xray-core/common/serial"
internet "github.com/xtls/xray-core/transport/internet"
@@ -24,10 +23,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type KnownProtocols int32
const (
diff --git a/app/reverse/config.pb.go b/app/reverse/config.pb.go
index 50e41edd..3195881d 100644
--- a/app/reverse/config.pb.go
+++ b/app/reverse/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/reverse/config.proto
package reverse
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Control_State int32
const (
diff --git a/app/router/command/command.pb.go b/app/router/command/command.pb.go
index 2017669d..4a600734 100644
--- a/app/router/command/command.pb.go
+++ b/app/router/command/command.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/router/command/command.proto
package command
import (
- proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/common/net"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// RoutingContext is the context with information relative to routing process.
// It conforms to the structure of xray.features.routing.Context and
// xray.features.routing.Route.
@@ -91,7 +86,7 @@ func (x *RoutingContext) GetNetwork() net.Network {
if x != nil {
return x.Network
}
- return net.Network_Unknown
+ return net.Network(0)
}
func (x *RoutingContext) GetSourceIPs() [][]byte {
diff --git a/app/router/config.pb.go b/app/router/config.pb.go
index 5938781b..9d390f1e 100644
--- a/app/router/config.pb.go
+++ b/app/router/config.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.26.0
+// protoc-gen-go v1.27.1
// protoc v3.15.8
// source: app/router/config.proto
diff --git a/app/stats/command/command.pb.go b/app/stats/command/command.pb.go
index 23e279e8..e88dbcc4 100644
--- a/app/stats/command/command.pb.go
+++ b/app/stats/command/command.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/stats/command/command.proto
package command
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type GetStatsRequest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/app/stats/config.pb.go b/app/stats/config.pb.go
index 6640100c..d2593103 100644
--- a/app/stats/config.pb.go
+++ b/app/stats/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: app/stats/config.proto
package stats
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/common/log/log.pb.go b/common/log/log.pb.go
index 4daf5de2..3ae243e7 100644
--- a/common/log/log.pb.go
+++ b/common/log/log.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/log/log.proto
package log
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Severity int32
const (
diff --git a/common/net/address.pb.go b/common/net/address.pb.go
index d838e094..feed2be1 100644
--- a/common/net/address.pb.go
+++ b/common/net/address.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/net/address.proto
package net
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// Address of a network host. It may be either an IP address or a domain
// address.
type IPOrDomain struct {
diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go
index 0eeb1ec5..8bb257d0 100644
--- a/common/net/destination.pb.go
+++ b/common/net/destination.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/net/destination.proto
package net
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// Endpoint of a network connection.
type Endpoint struct {
state protoimpl.MessageState
diff --git a/common/net/network.pb.go b/common/net/network.pb.go
index 1eb88b6d..ef7e4d25 100644
--- a/common/net/network.pb.go
+++ b/common/net/network.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/net/network.proto
package net
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Network int32
const (
diff --git a/common/net/port.pb.go b/common/net/port.pb.go
index 5f8cf2c1..b0b93a96 100644
--- a/common/net/port.pb.go
+++ b/common/net/port.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/net/port.proto
package net
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// PortRange represents a range of ports.
type PortRange struct {
state protoimpl.MessageState
diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go
index fbcf34b0..071434f6 100644
--- a/common/protocol/headers.pb.go
+++ b/common/protocol/headers.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.15.4
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/protocol/headers.proto
package protocol
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type SecurityType int32
const (
diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go
index 54b9fa9c..840ca558 100644
--- a/common/protocol/server_spec.pb.go
+++ b/common/protocol/server_spec.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/protocol/server_spec.proto
package protocol
import (
- proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/common/net"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type ServerEndpoint struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go
index 3fdae9f8..51dc89d7 100644
--- a/common/protocol/user.pb.go
+++ b/common/protocol/user.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/protocol/user.proto
package protocol
import (
- proto "github.com/golang/protobuf/proto"
serial "github.com/xtls/xray-core/common/serial"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// User is a generic user for all procotols.
type User struct {
state protoimpl.MessageState
diff --git a/common/serial/typed_message.pb.go b/common/serial/typed_message.pb.go
index 1894d5bb..b6cea588 100644
--- a/common/serial/typed_message.pb.go
+++ b/common/serial/typed_message.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: common/serial/typed_message.proto
package serial
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// TypedMessage is a serialized proto message along with its type name.
type TypedMessage struct {
state protoimpl.MessageState
diff --git a/core/config.pb.go b/core/config.pb.go
index 68a81fed..c0533a8d 100644
--- a/core/config.pb.go
+++ b/core/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.15.6
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: core/config.proto
package core
import (
- proto "github.com/golang/protobuf/proto"
serial "github.com/xtls/xray-core/common/serial"
global "github.com/xtls/xray-core/transport/global"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -23,10 +22,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// Config is the master config of Xray. Xray takes this config as input and
// functions accordingly.
type Config struct {
diff --git a/core/proto.go b/core/proto.go
index 1a1aaf34..030365cc 100644
--- a/core/proto.go
+++ b/core/proto.go
@@ -1,13 +1,5 @@
package core
-import "path/filepath"
-
-//go:generate go install -v google.golang.org/protobuf/cmd/protoc-gen-go
-//go:generate go install -v google.golang.org/grpc/cmd/protoc-gen-go-grpc
-//go:generate go get -v -u github.com/gogo/protobuf/protoc-gen-gofast
-//go:generate go install -v github.com/gogo/protobuf/protoc-gen-gofast
+//go:generate go install -v google.golang.org/protobuf/cmd/protoc-gen-go@latest
+//go:generate go install -v google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
//go:generate go run ../infra/vprotogen/main.go -pwd ./..
-
-// ProtoFilesUsingProtocGenGoFast is the map of Proto files
-// that use `protoc-gen-gofast` to generate pb.go files
-var ProtoFilesUsingProtocGenGoFast = map[string]bool{filepath.Join("proxy", "vless", "encoding", "addons.proto"): true}
diff --git a/infra/vprotogen/main.go b/infra/vprotogen/main.go
index 00dab23f..2327776e 100644
--- a/infra/vprotogen/main.go
+++ b/infra/vprotogen/main.go
@@ -3,18 +3,150 @@ package main
import (
"flag"
"fmt"
+ "go/build"
+ "io"
+ "io/ioutil"
+ "net/http"
"os"
"os/exec"
"path/filepath"
+ "regexp"
"runtime"
+ "strconv"
"strings"
-
- "github.com/xtls/xray-core/common"
- "github.com/xtls/xray-core/core"
)
var directory = flag.String("pwd", "", "Working directory of Xray vprotogen.")
+// envFile returns the name of the Go environment configuration file.
+// Copy from https://github.com/golang/go/blob/c4f2a9788a7be04daf931ac54382fbe2cb754938/src/cmd/go/internal/cfg/cfg.go#L150-L166
+func envFile() (string, error) {
+ if file := os.Getenv("GOENV"); file != "" {
+ if file == "off" {
+ return "", fmt.Errorf("GOENV=off")
+ }
+ return file, nil
+ }
+ dir, err := os.UserConfigDir()
+ if err != nil {
+ return "", err
+ }
+ if dir == "" {
+ return "", fmt.Errorf("missing user-config dir")
+ }
+ return filepath.Join(dir, "go", "env"), nil
+}
+
+// GetRuntimeEnv returns the value of runtime environment variable,
+// that is set by running following command: `go env -w key=value`.
+func GetRuntimeEnv(key string) (string, error) {
+ file, err := envFile()
+ if err != nil {
+ return "", err
+ }
+ if file == "" {
+ return "", fmt.Errorf("missing runtime env file")
+ }
+ var data []byte
+ var runtimeEnv string
+ data, readErr := ioutil.ReadFile(file)
+ if readErr != nil {
+ return "", readErr
+ }
+ envStrings := strings.Split(string(data), "\n")
+ for _, envItem := range envStrings {
+ envItem = strings.TrimSuffix(envItem, "\r")
+ envKeyValue := strings.Split(envItem, "=")
+ if strings.EqualFold(strings.TrimSpace(envKeyValue[0]), key) {
+ runtimeEnv = strings.TrimSpace(envKeyValue[1])
+ }
+ }
+ return runtimeEnv, nil
+}
+
+// GetGOBIN returns GOBIN environment variable as a string. It will NOT be empty.
+func GetGOBIN() string {
+ // The one set by user explicitly by `export GOBIN=/path` or `env GOBIN=/path command`
+ GOBIN := os.Getenv("GOBIN")
+ if GOBIN == "" {
+ var err error
+ // The one set by user by running `go env -w GOBIN=/path`
+ GOBIN, err = GetRuntimeEnv("GOBIN")
+ if err != nil {
+ // The default one that Golang uses
+ return filepath.Join(build.Default.GOPATH, "bin")
+ }
+ if GOBIN == "" {
+ return filepath.Join(build.Default.GOPATH, "bin")
+ }
+ return GOBIN
+ }
+ return GOBIN
+}
+
+func whichProtoc(suffix, targetedVersion string) (string, error) {
+ protoc := "protoc" + suffix
+
+ path, err := exec.LookPath(protoc)
+ if err != nil {
+ errStr := fmt.Sprintf(`
+Command "%s" not found.
+Make sure that %s is in your system path or current path.
+Download %s v%s or later from https://github.com/protocolbuffers/protobuf/releases
+`, protoc, protoc, protoc, targetedVersion)
+ return "", fmt.Errorf(errStr)
+ }
+ return path, nil
+}
+
+func getProjectProtocVersion(url string) (string, error) {
+ resp, err := http.Get(url)
+ if err != nil {
+ return "", fmt.Errorf("can not get the version of protobuf used in xray project")
+ }
+ defer resp.Body.Close()
+ body, err := io.ReadAll(resp.Body)
+ if err != nil {
+ return "", fmt.Errorf("can not read from body")
+ }
+ versionRegexp := regexp.MustCompile(`\/\/\s*protoc\s*v(\d+\.\d+\.\d+)`)
+ matched := versionRegexp.FindStringSubmatch(string(body))
+ return matched[1], nil
+}
+
+func getInstalledProtocVersion(protocPath string) (string, error) {
+ cmd := exec.Command(protocPath, "--version")
+ cmd.Env = append(cmd.Env, os.Environ()...)
+ output, cmdErr := cmd.CombinedOutput()
+ if cmdErr != nil {
+ return "", cmdErr
+ }
+ versionRegexp := regexp.MustCompile(`protoc\s*(\d+\.\d+\.\d+)`)
+ matched := versionRegexp.FindStringSubmatch(string(output))
+ return matched[1], nil
+}
+
+func parseVersion(s string, width int) int64 {
+ strList := strings.Split(s, ".")
+ format := fmt.Sprintf("%%s%%0%ds", width)
+ v := ""
+ for _, value := range strList {
+ v = fmt.Sprintf(format, v, value)
+ }
+ var result int64
+ var err error
+ if result, err = strconv.ParseInt(v, 10, 64); err != nil {
+ return 0
+ }
+ return result
+}
+
+func needToUpdate(targetedVersion, installedVersion string) bool {
+ vt := parseVersion(targetedVersion, 4)
+ vi := parseVersion(installedVersion, 4)
+ return vt > vi
+}
+
func main() {
flag.Usage = func() {
fmt.Fprintf(flag.CommandLine.Output(), "Usage of vprotogen:\n")
@@ -32,23 +164,45 @@ func main() {
}
pwd := *directory
- GOBIN := common.GetGOBIN()
+ GOBIN := GetGOBIN()
binPath := os.Getenv("PATH")
- pathSlice := []string{binPath, GOBIN, pwd}
+ pathSlice := []string{pwd, GOBIN, binPath}
binPath = strings.Join(pathSlice, string(os.PathListSeparator))
os.Setenv("PATH", binPath)
- EXE := ""
+ suffix := ""
if runtime.GOOS == "windows" {
- EXE = ".exe"
+ suffix = ".exe"
}
- protoc := "protoc" + EXE
- if path, err := exec.LookPath(protoc); err != nil {
- fmt.Println("Make sure that you have `" + protoc + "` in your system path or current path. To download it, please visit https://github.com/protocolbuffers/protobuf/releases")
+ targetedVersion, err := getProjectProtocVersion("https://raw.githubusercontent.com/xtls/xray-core/HEAD/core/config.pb.go")
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+
+ protoc, err := whichProtoc(suffix, targetedVersion)
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+
+ installedVersion, err := getInstalledProtocVersion(protoc)
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+
+ if needToUpdate(targetedVersion, installedVersion) {
+ fmt.Printf(`
+You are using an old protobuf version, please update to v%s or later.
+Download it from https://github.com/protocolbuffers/protobuf/releases
+
+ * Protobuf version used in xray project: v%s
+ * Protobuf version you have installed: v%s
+
+`, targetedVersion, targetedVersion, installedVersion)
os.Exit(1)
- } else {
- protoc = path
}
protoFilesMap := make(map[string][]string)
@@ -78,11 +232,13 @@ func main() {
for _, files := range protoFilesMap {
for _, relProtoFile := range files {
- var args []string
- if core.ProtoFilesUsingProtocGenGoFast[relProtoFile] {
- args = []string{"--gofast_out", pwd, "--gofast_opt", "paths=source_relative", "--plugin", "protoc-gen-gofast=" + GOBIN + "/protoc-gen-gofast" + EXE}
- } else {
- args = []string{"--go_out", pwd, "--go_opt", "paths=source_relative", "--go-grpc_out", pwd, "--go-grpc_opt", "paths=source_relative", "--plugin", "protoc-gen-go=" + GOBIN + "/protoc-gen-go" + EXE, "--plugin", "protoc-gen-go-grpc=" + GOBIN + "/protoc-gen-go-grpc" + EXE}
+ args := []string{
+ "--go_out", pwd,
+ "--go_opt", "paths=source_relative",
+ "--go-grpc_out", pwd,
+ "--go-grpc_opt", "paths=source_relative",
+ "--plugin", "protoc-gen-go=" + filepath.Join(GOBIN, "protoc-gen-go"+suffix),
+ "--plugin", "protoc-gen-go-grpc=" + filepath.Join(GOBIN, "protoc-gen-go-grpc"+suffix),
}
args = append(args, relProtoFile)
cmd := exec.Command(protoc, args...)
diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go
index 08ffed36..32a7794e 100644
--- a/proxy/blackhole/config.pb.go
+++ b/proxy/blackhole/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/blackhole/config.proto
package blackhole
import (
- proto "github.com/golang/protobuf/proto"
serial "github.com/xtls/xray-core/common/serial"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type NoneResponse struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/dns/config.pb.go b/proxy/dns/config.pb.go
index 62b7bf8d..a7344745 100644
--- a/proxy/dns/config.pb.go
+++ b/proxy/dns/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/dns/config.proto
package dns
import (
- proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/common/net"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go
index e176ac4d..0fb74e61 100644
--- a/proxy/dokodemo/config.pb.go
+++ b/proxy/dokodemo/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/dokodemo/config.proto
package dokodemo
import (
- proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/common/net"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/freedom/config.pb.go b/proxy/freedom/config.pb.go
index d06f0147..31997049 100644
--- a/proxy/freedom/config.pb.go
+++ b/proxy/freedom/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/freedom/config.proto
package freedom
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config_DomainStrategy int32
const (
diff --git a/proxy/http/config.pb.go b/proxy/http/config.pb.go
index b5a53864..830ff06c 100644
--- a/proxy/http/config.pb.go
+++ b/proxy/http/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/http/config.proto
package http
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Account struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/mtproto/config.pb.go b/proxy/mtproto/config.pb.go
index c8bb8d04..ab29a8c8 100644
--- a/proxy/mtproto/config.pb.go
+++ b/proxy/mtproto/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/mtproto/config.proto
package mtproto
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Account struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/shadowsocks/config.pb.go b/proxy/shadowsocks/config.pb.go
index 68b48891..7119f51d 100644
--- a/proxy/shadowsocks/config.pb.go
+++ b/proxy/shadowsocks/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
+// protoc-gen-go v1.27.1
// protoc v3.15.8
// source: proxy/shadowsocks/config.proto
package shadowsocks
import (
- proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/common/net"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -23,10 +22,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type CipherType int32
const (
diff --git a/proxy/socks/config.pb.go b/proxy/socks/config.pb.go
index 7557d07e..db7af2a4 100644
--- a/proxy/socks/config.pb.go
+++ b/proxy/socks/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/socks/config.proto
package socks
import (
- proto "github.com/golang/protobuf/proto"
net "github.com/xtls/xray-core/common/net"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -23,10 +22,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// AuthType is the authentication type of Socks proxy.
type AuthType int32
diff --git a/proxy/trojan/config.pb.go b/proxy/trojan/config.pb.go
index 7f0600b8..d6df2384 100644
--- a/proxy/trojan/config.pb.go
+++ b/proxy/trojan/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/trojan/config.proto
package trojan
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Account struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/vless/account.pb.go b/proxy/vless/account.pb.go
index 17029cbe..43d60a3b 100644
--- a/proxy/vless/account.pb.go
+++ b/proxy/vless/account.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/vless/account.proto
package vless
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Account struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/vless/encoding/addons.pb.go b/proxy/vless/encoding/addons.pb.go
index adc3be99..5981248b 100644
--- a/proxy/vless/encoding/addons.pb.go
+++ b/proxy/vless/encoding/addons.pb.go
@@ -1,380 +1,159 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/vless/encoding/addons.proto
package encoding
import (
- fmt "fmt"
- proto "github.com/golang/protobuf/proto"
- io "io"
- math "math"
- math_bits "math/bits"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ reflect "reflect"
+ sync "sync"
)
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
type Addons struct {
- Flow string `protobuf:"bytes,1,opt,name=Flow,proto3" json:"Flow,omitempty"`
- Seed []byte `protobuf:"bytes,2,opt,name=Seed,proto3" json:"Seed,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Flow string `protobuf:"bytes,1,opt,name=Flow,proto3" json:"Flow,omitempty"`
+ Seed []byte `protobuf:"bytes,2,opt,name=Seed,proto3" json:"Seed,omitempty"`
}
-func (m *Addons) Reset() { *m = Addons{} }
-func (m *Addons) String() string { return proto.CompactTextString(m) }
-func (*Addons) ProtoMessage() {}
-func (*Addons) Descriptor() ([]byte, []int) {
- return fileDescriptor_75ab671b0ca8b1cc, []int{0}
-}
-func (m *Addons) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *Addons) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Addons.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalToSizedBuffer(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
+func (x *Addons) Reset() {
+ *x = Addons{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_proxy_vless_encoding_addons_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
}
}
-func (m *Addons) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Addons.Merge(m, src)
-}
-func (m *Addons) XXX_Size() int {
- return m.Size()
-}
-func (m *Addons) XXX_DiscardUnknown() {
- xxx_messageInfo_Addons.DiscardUnknown(m)
+
+func (x *Addons) String() string {
+ return protoimpl.X.MessageStringOf(x)
}
-var xxx_messageInfo_Addons proto.InternalMessageInfo
+func (*Addons) ProtoMessage() {}
-func (m *Addons) GetFlow() string {
- if m != nil {
- return m.Flow
+func (x *Addons) ProtoReflect() protoreflect.Message {
+ mi := &file_proxy_vless_encoding_addons_proto_msgTypes[0]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use Addons.ProtoReflect.Descriptor instead.
+func (*Addons) Descriptor() ([]byte, []int) {
+ return file_proxy_vless_encoding_addons_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *Addons) GetFlow() string {
+ if x != nil {
+ return x.Flow
}
return ""
}
-func (m *Addons) GetSeed() []byte {
- if m != nil {
- return m.Seed
+func (x *Addons) GetSeed() []byte {
+ if x != nil {
+ return x.Seed
}
return nil
}
-func init() {
- proto.RegisterType((*Addons)(nil), "xray.proxy.vless.encoding.Addons")
-}
+var File_proxy_vless_encoding_addons_proto protoreflect.FileDescriptor
-func init() { proto.RegisterFile("proxy/vless/encoding/addons.proto", fileDescriptor_75ab671b0ca8b1cc) }
-
-var fileDescriptor_75ab671b0ca8b1cc = []byte{
- // 191 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x28, 0xca, 0xaf,
- 0xa8, 0xd4, 0x2f, 0xcb, 0x49, 0x2d, 0x2e, 0xd6, 0x4f, 0xcd, 0x4b, 0xce, 0x4f, 0xc9, 0xcc, 0x4b,
- 0xd7, 0x4f, 0x4c, 0x49, 0xc9, 0xcf, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xac,
- 0x28, 0x4a, 0xac, 0xd4, 0x03, 0xab, 0xd3, 0x03, 0xab, 0xd3, 0x83, 0xa9, 0x53, 0x32, 0xe0, 0x62,
- 0x73, 0x04, 0x2b, 0x15, 0x12, 0xe2, 0x62, 0x71, 0xcb, 0xc9, 0x2f, 0x97, 0x60, 0x54, 0x60, 0xd4,
- 0xe0, 0x0c, 0x02, 0xb3, 0x41, 0x62, 0xc1, 0xa9, 0xa9, 0x29, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x3c,
- 0x41, 0x60, 0xb6, 0x53, 0xed, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24,
- 0xc7, 0x38, 0xe3, 0xb1, 0x1c, 0x03, 0x97, 0x6c, 0x72, 0x7e, 0xae, 0x1e, 0x4e, 0x2b, 0x02, 0x18,
- 0xa3, 0xf4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x2b, 0x4a, 0x72,
- 0x8a, 0xf5, 0x41, 0x8a, 0x75, 0x93, 0xf3, 0x8b, 0x52, 0xf5, 0xb1, 0x39, 0x7e, 0x15, 0x93, 0x64,
- 0x04, 0xc8, 0xb4, 0x00, 0xb0, 0x69, 0x61, 0x60, 0xd3, 0x5c, 0xa1, 0x72, 0x49, 0x6c, 0x60, 0x2f,
- 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x32, 0xfc, 0x98, 0x28, 0xf7, 0x00, 0x00, 0x00,
-}
-
-func (m *Addons) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalToSizedBuffer(dAtA[:size])
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *Addons) MarshalTo(dAtA []byte) (int, error) {
- size := m.Size()
- return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Addons) MarshalToSizedBuffer(dAtA []byte) (int, error) {
- i := len(dAtA)
- _ = i
- var l int
- _ = l
- if m.XXX_unrecognized != nil {
- i -= len(m.XXX_unrecognized)
- copy(dAtA[i:], m.XXX_unrecognized)
- }
- if len(m.Seed) > 0 {
- i -= len(m.Seed)
- copy(dAtA[i:], m.Seed)
- i = encodeVarintAddons(dAtA, i, uint64(len(m.Seed)))
- i--
- dAtA[i] = 0x12
- }
- if len(m.Flow) > 0 {
- i -= len(m.Flow)
- copy(dAtA[i:], m.Flow)
- i = encodeVarintAddons(dAtA, i, uint64(len(m.Flow)))
- i--
- dAtA[i] = 0xa
- }
- return len(dAtA) - i, nil
-}
-
-func encodeVarintAddons(dAtA []byte, offset int, v uint64) int {
- offset -= sovAddons(v)
- base := offset
- for v >= 1<<7 {
- dAtA[offset] = uint8(v&0x7f | 0x80)
- v >>= 7
- offset++
- }
- dAtA[offset] = uint8(v)
- return base
-}
-func (m *Addons) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- l = len(m.Flow)
- if l > 0 {
- n += 1 + l + sovAddons(uint64(l))
- }
- l = len(m.Seed)
- if l > 0 {
- n += 1 + l + sovAddons(uint64(l))
- }
- if m.XXX_unrecognized != nil {
- n += len(m.XXX_unrecognized)
- }
- return n
-}
-
-func sovAddons(x uint64) (n int) {
- return (math_bits.Len64(x|1) + 6) / 7
-}
-func sozAddons(x uint64) (n int) {
- return sovAddons(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Addons) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowAddons
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: Addons: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Addons: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Flow", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowAddons
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthAddons
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthAddons
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Flow = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Seed", wireType)
- }
- var byteLen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowAddons
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- byteLen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if byteLen < 0 {
- return ErrInvalidLengthAddons
- }
- postIndex := iNdEx + byteLen
- if postIndex < 0 {
- return ErrInvalidLengthAddons
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Seed = append(m.Seed[:0], dAtA[iNdEx:postIndex]...)
- if m.Seed == nil {
- m.Seed = []byte{}
- }
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipAddons(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if (skippy < 0) || (iNdEx+skippy) < 0 {
- return ErrInvalidLengthAddons
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func skipAddons(dAtA []byte) (n int, err error) {
- l := len(dAtA)
- iNdEx := 0
- depth := 0
- for iNdEx < l {
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowAddons
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- wireType := int(wire & 0x7)
- switch wireType {
- case 0:
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowAddons
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- iNdEx++
- if dAtA[iNdEx-1] < 0x80 {
- break
- }
- }
- case 1:
- iNdEx += 8
- case 2:
- var length int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowAddons
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- length |= (int(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if length < 0 {
- return 0, ErrInvalidLengthAddons
- }
- iNdEx += length
- case 3:
- depth++
- case 4:
- if depth == 0 {
- return 0, ErrUnexpectedEndOfGroupAddons
- }
- depth--
- case 5:
- iNdEx += 4
- default:
- return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
- }
- if iNdEx < 0 {
- return 0, ErrInvalidLengthAddons
- }
- if depth == 0 {
- return iNdEx, nil
- }
- }
- return 0, io.ErrUnexpectedEOF
+var file_proxy_vless_encoding_addons_proto_rawDesc = []byte{
+ 0x0a, 0x21, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2f, 0x65, 0x6e,
+ 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x61, 0x64, 0x64, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
+ 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x30,
+ 0x0a, 0x06, 0x41, 0x64, 0x64, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x6c, 0x6f, 0x77,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x46, 0x6c, 0x6f, 0x77, 0x12, 0x12, 0x0a, 0x04,
+ 0x53, 0x65, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x53, 0x65, 0x65, 0x64,
+ 0x42, 0x6d, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x70, 0x72, 0x6f,
+ 0x78, 0x79, 0x2e, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e,
+ 0x67, 0x50, 0x01, 0x5a, 0x2e, 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, 0x70,
+ 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x76, 0x6c, 0x65, 0x73, 0x73, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x64,
+ 0x69, 0x6e, 0x67, 0xaa, 0x02, 0x19, 0x58, 0x72, 0x61, 0x79, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79,
+ 0x2e, 0x56, 0x6c, 0x65, 0x73, 0x73, 0x2e, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x62,
+ 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
- ErrInvalidLengthAddons = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowAddons = fmt.Errorf("proto: integer overflow")
- ErrUnexpectedEndOfGroupAddons = fmt.Errorf("proto: unexpected end of group")
+ file_proxy_vless_encoding_addons_proto_rawDescOnce sync.Once
+ file_proxy_vless_encoding_addons_proto_rawDescData = file_proxy_vless_encoding_addons_proto_rawDesc
)
+
+func file_proxy_vless_encoding_addons_proto_rawDescGZIP() []byte {
+ file_proxy_vless_encoding_addons_proto_rawDescOnce.Do(func() {
+ file_proxy_vless_encoding_addons_proto_rawDescData = protoimpl.X.CompressGZIP(file_proxy_vless_encoding_addons_proto_rawDescData)
+ })
+ return file_proxy_vless_encoding_addons_proto_rawDescData
+}
+
+var file_proxy_vless_encoding_addons_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_proxy_vless_encoding_addons_proto_goTypes = []interface{}{
+ (*Addons)(nil), // 0: xray.proxy.vless.encoding.Addons
+}
+var file_proxy_vless_encoding_addons_proto_depIdxs = []int32{
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_proxy_vless_encoding_addons_proto_init() }
+func file_proxy_vless_encoding_addons_proto_init() {
+ if File_proxy_vless_encoding_addons_proto != nil {
+ return
+ }
+ if !protoimpl.UnsafeEnabled {
+ file_proxy_vless_encoding_addons_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Addons); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_proxy_vless_encoding_addons_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 1,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_proxy_vless_encoding_addons_proto_goTypes,
+ DependencyIndexes: file_proxy_vless_encoding_addons_proto_depIdxs,
+ MessageInfos: file_proxy_vless_encoding_addons_proto_msgTypes,
+ }.Build()
+ File_proxy_vless_encoding_addons_proto = out.File
+ file_proxy_vless_encoding_addons_proto_rawDesc = nil
+ file_proxy_vless_encoding_addons_proto_goTypes = nil
+ file_proxy_vless_encoding_addons_proto_depIdxs = nil
+}
diff --git a/proxy/vless/encoding/encoding_test.go b/proxy/vless/encoding/encoding_test.go
index b8bfa73c..15b0468e 100644
--- a/proxy/vless/encoding/encoding_test.go
+++ b/proxy/vless/encoding/encoding_test.go
@@ -52,7 +52,11 @@ func TestRequestSerialization(t *testing.T) {
if r := cmp.Diff(actualRequest, expectedRequest, cmp.AllowUnexported(protocol.ID{})); r != "" {
t.Error(r)
}
- if r := cmp.Diff(actualAddons, expectedAddons); r != "" {
+
+ addonsComparer := func(x, y *Addons) bool {
+ return (x.Flow == y.Flow) && (cmp.Equal(x.Seed, y.Seed))
+ }
+ if r := cmp.Diff(actualAddons, expectedAddons, cmp.Comparer(addonsComparer)); r != "" {
t.Error(r)
}
}
@@ -120,7 +124,11 @@ func TestMuxRequest(t *testing.T) {
if r := cmp.Diff(actualRequest, expectedRequest, cmp.AllowUnexported(protocol.ID{})); r != "" {
t.Error(r)
}
- if r := cmp.Diff(actualAddons, expectedAddons); r != "" {
+
+ addonsComparer := func(x, y *Addons) bool {
+ return (x.Flow == y.Flow) && (cmp.Equal(x.Seed, y.Seed))
+ }
+ if r := cmp.Diff(actualAddons, expectedAddons, cmp.Comparer(addonsComparer)); r != "" {
t.Error(r)
}
}
diff --git a/proxy/vless/inbound/config.pb.go b/proxy/vless/inbound/config.pb.go
index bb253d69..69f68e53 100644
--- a/proxy/vless/inbound/config.pb.go
+++ b/proxy/vless/inbound/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/vless/inbound/config.proto
package inbound
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Fallback struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/vless/outbound/config.pb.go b/proxy/vless/outbound/config.pb.go
index b39657ff..c77b1a18 100644
--- a/proxy/vless/outbound/config.pb.go
+++ b/proxy/vless/outbound/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/vless/outbound/config.proto
package outbound
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/vmess/account.pb.go b/proxy/vmess/account.pb.go
index 74339fe6..6315815a 100644
--- a/proxy/vmess/account.pb.go
+++ b/proxy/vmess/account.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/vmess/account.proto
package vmess
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Account struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/vmess/inbound/config.pb.go b/proxy/vmess/inbound/config.pb.go
index b1a52ac4..f5bc1673 100644
--- a/proxy/vmess/inbound/config.pb.go
+++ b/proxy/vmess/inbound/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/vmess/inbound/config.proto
package inbound
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type DetourConfig struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/proxy/vmess/outbound/config.pb.go b/proxy/vmess/outbound/config.pb.go
index 7a6783bb..badc5591 100644
--- a/proxy/vmess/outbound/config.pb.go
+++ b/proxy/vmess/outbound/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: proxy/vmess/outbound/config.proto
package outbound
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/global/config.pb.go b/transport/global/config.pb.go
index 126b101d..d6fdfe47 100644
--- a/transport/global/config.pb.go
+++ b/transport/global/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/global/config.proto
package global
import (
- proto "github.com/golang/protobuf/proto"
internet "github.com/xtls/xray-core/transport/internet"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// Global transport settings. This affects all type of connections that go
// through Xray. Deprecated. Use each settings in StreamConfig.
//
diff --git a/transport/internet/config.pb.go b/transport/internet/config.pb.go
index 24f47e68..11b96079 100644
--- a/transport/internet/config.pb.go
+++ b/transport/internet/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/config.proto
package internet
import (
- proto "github.com/golang/protobuf/proto"
serial "github.com/xtls/xray-core/common/serial"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type TransportProtocol int32
const (
diff --git a/transport/internet/domainsocket/config.pb.go b/transport/internet/domainsocket/config.pb.go
index 0334e109..20152aa8 100644
--- a/transport/internet/domainsocket/config.pb.go
+++ b/transport/internet/domainsocket/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/domainsocket/config.proto
package domainsocket
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/grpc/config.pb.go b/transport/internet/grpc/config.pb.go
index d2ece121..a9d8b9d5 100644
--- a/transport/internet/grpc/config.pb.go
+++ b/transport/internet/grpc/config.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.26.0
-// protoc v3.17.3
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/grpc/config.proto
package grpc
diff --git a/transport/internet/grpc/encoding/stream.pb.go b/transport/internet/grpc/encoding/stream.pb.go
index 122ab50e..ae5bebe9 100644
--- a/transport/internet/grpc/encoding/stream.pb.go
+++ b/transport/internet/grpc/encoding/stream.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.15.6
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/grpc/encoding/stream.proto
package encoding
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Hunk struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/headers/http/config.pb.go b/transport/internet/headers/http/config.pb.go
index f370a968..a9956fdb 100644
--- a/transport/internet/headers/http/config.pb.go
+++ b/transport/internet/headers/http/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/headers/http/config.proto
package http
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Header struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/headers/noop/config.pb.go b/transport/internet/headers/noop/config.pb.go
index d8cce354..26dbfb43 100644
--- a/transport/internet/headers/noop/config.pb.go
+++ b/transport/internet/headers/noop/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/headers/noop/config.proto
package noop
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/headers/srtp/config.pb.go b/transport/internet/headers/srtp/config.pb.go
index 300e4504..88a467d9 100644
--- a/transport/internet/headers/srtp/config.pb.go
+++ b/transport/internet/headers/srtp/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/headers/srtp/config.proto
package srtp
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/headers/tls/config.pb.go b/transport/internet/headers/tls/config.pb.go
index 95b21e56..722626f7 100644
--- a/transport/internet/headers/tls/config.pb.go
+++ b/transport/internet/headers/tls/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/headers/tls/config.proto
package tls
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type PacketConfig struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/headers/utp/config.pb.go b/transport/internet/headers/utp/config.pb.go
index ebaa4978..babb5a64 100644
--- a/transport/internet/headers/utp/config.pb.go
+++ b/transport/internet/headers/utp/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/headers/utp/config.proto
package utp
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/headers/wechat/config.pb.go b/transport/internet/headers/wechat/config.pb.go
index 7dd697f8..8b9e98fd 100644
--- a/transport/internet/headers/wechat/config.pb.go
+++ b/transport/internet/headers/wechat/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/headers/wechat/config.proto
package wechat
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type VideoConfig struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/headers/wireguard/config.pb.go b/transport/internet/headers/wireguard/config.pb.go
index 4c78e85d..5fa9e6d4 100644
--- a/transport/internet/headers/wireguard/config.pb.go
+++ b/transport/internet/headers/wireguard/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/headers/wireguard/config.proto
package wireguard
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type WireguardConfig struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/http/config.pb.go b/transport/internet/http/config.pb.go
index fe37c6d8..c2f8ddf8 100644
--- a/transport/internet/http/config.pb.go
+++ b/transport/internet/http/config.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.26.0
-// protoc v3.17.3
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/http/config.proto
package http
diff --git a/transport/internet/kcp/config.pb.go b/transport/internet/kcp/config.pb.go
index fb5f2564..b0f3318a 100644
--- a/transport/internet/kcp/config.pb.go
+++ b/transport/internet/kcp/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/kcp/config.proto
package kcp
import (
- proto "github.com/golang/protobuf/proto"
serial "github.com/xtls/xray-core/common/serial"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
// Maximum Transmission Unit, in bytes.
type MTU struct {
state protoimpl.MessageState
diff --git a/transport/internet/quic/config.pb.go b/transport/internet/quic/config.pb.go
index 839c5305..50687318 100644
--- a/transport/internet/quic/config.pb.go
+++ b/transport/internet/quic/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/quic/config.proto
package quic
import (
- proto "github.com/golang/protobuf/proto"
protocol "github.com/xtls/xray-core/common/protocol"
serial "github.com/xtls/xray-core/common/serial"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -23,10 +22,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/tcp/config.pb.go b/transport/internet/tcp/config.pb.go
index addb4613..5aac3643 100644
--- a/transport/internet/tcp/config.pb.go
+++ b/transport/internet/tcp/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/tcp/config.proto
package tcp
import (
- proto "github.com/golang/protobuf/proto"
serial "github.com/xtls/xray-core/common/serial"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -22,10 +21,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/tls/config.pb.go b/transport/internet/tls/config.pb.go
index 437a244d..3c5f3dbc 100644
--- a/transport/internet/tls/config.pb.go
+++ b/transport/internet/tls/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
+// protoc-gen-go v1.27.1
// protoc v3.15.8
// source: transport/internet/tls/config.proto
package tls
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Certificate_Usage int32
const (
diff --git a/transport/internet/udp/config.pb.go b/transport/internet/udp/config.pb.go
index 7e22cf26..e3cd8c16 100644
--- a/transport/internet/udp/config.pb.go
+++ b/transport/internet/udp/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.14.0
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/udp/config.proto
package udp
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Config struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/websocket/config.pb.go b/transport/internet/websocket/config.pb.go
index 9db30c3b..e3ca7635 100644
--- a/transport/internet/websocket/config.pb.go
+++ b/transport/internet/websocket/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
-// protoc v3.15.6
+// protoc-gen-go v1.27.1
+// protoc v3.15.8
// source: transport/internet/websocket/config.proto
package websocket
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Header struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/transport/internet/xtls/config.pb.go b/transport/internet/xtls/config.pb.go
index 516efff4..a5c90cd5 100644
--- a/transport/internet/xtls/config.pb.go
+++ b/transport/internet/xtls/config.pb.go
@@ -1,13 +1,12 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.25.0
+// protoc-gen-go v1.27.1
// protoc v3.15.8
// source: transport/internet/xtls/config.proto
package xtls
import (
- proto "github.com/golang/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
@@ -21,10 +20,6 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
type Certificate_Usage int32
const (