Format proto files using clang-format according to google style (#264)

* Format proto files using clang-format according to google style
* Regenerate pb.go files
This commit is contained in:
Loyalsoldier
2020-10-05 08:36:40 +08:00
committed by GitHub
parent a308620073
commit bb44d01096
47 changed files with 178 additions and 139 deletions
+2 -4
View File
@@ -8,11 +8,9 @@ option java_multiple_files = true;
import "common/serial/typed_message.proto";
message NoneResponse {
}
message NoneResponse {}
message HTTPResponse {
}
message HTTPResponse {}
message Config {
v2ray.core.common.serial.TypedMessage response = 1;
+2 -1
View File
@@ -31,7 +31,8 @@ type Config struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
// Server is the DNS server address. If specified, this address overrides the original one.
// Server is the DNS server address. If specified, this address overrides the
// original one.
Server *net.Endpoint `protobuf:"bytes,1,opt,name=server,proto3" json:"server,omitempty"`
}
+2 -1
View File
@@ -9,6 +9,7 @@ option java_multiple_files = true;
import "common/net/destination.proto";
message Config {
// Server is the DNS server address. If specified, this address overrides the original one.
// Server is the DNS server address. If specified, this address overrides the
// original one.
v2ray.core.common.net.Endpoint server = 1;
}
+2 -1
View File
@@ -79,7 +79,8 @@ type ServerConfig struct {
unknownFields protoimpl.UnknownFields
// User is a list of users that allowed to connect to this inbound.
// Although this is a repeated field, only the first user is effective for now.
// Although this is a repeated field, only the first user is effective for
// now.
User []*protocol.User `protobuf:"bytes,1,rep,name=user,proto3" json:"user,omitempty"`
}
+3 -4
View File
@@ -14,10 +14,9 @@ message Account {
message ServerConfig {
// User is a list of users that allowed to connect to this inbound.
// Although this is a repeated field, only the first user is effective for now.
// Although this is a repeated field, only the first user is effective for
// now.
repeated v2ray.core.common.protocol.User user = 1;
}
message ClientConfig {
}
message ClientConfig {}
+2 -1
View File
@@ -111,7 +111,8 @@ type Config struct {
unknownFields protoimpl.UnknownFields
Clients []*protocol.User `protobuf:"bytes,1,rep,name=clients,proto3" json:"clients,omitempty"`
// Decryption settings. Only applies to server side, and only accepts "none" for now.
// Decryption settings. Only applies to server side, and only accepts "none"
// for now.
Decryption string `protobuf:"bytes,2,opt,name=decryption,proto3" json:"decryption,omitempty"`
Fallbacks []*Fallback `protobuf:"bytes,3,rep,name=fallbacks,proto3" json:"fallbacks,omitempty"`
}
+2 -1
View File
@@ -18,7 +18,8 @@ message Fallback {
message Config {
repeated v2ray.core.common.protocol.User clients = 1;
// Decryption settings. Only applies to server side, and only accepts "none" for now.
// Decryption settings. Only applies to server side, and only accepts "none"
// for now.
string decryption = 2;
repeated Fallback fallbacks = 3;
}
+2 -1
View File
@@ -31,7 +31,8 @@ type Account struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
// ID of the account, in the form of a UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
// ID of the account, in the form of a UUID, e.g.,
// "66ad4540-b58c-4ad2-9926-ea63445a9b57".
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
// Number of alternative IDs. Client and server must share the same number.
AlterId uint32 `protobuf:"varint,2,opt,name=alter_id,json=alterId,proto3" json:"alter_id,omitempty"`
+2 -1
View File
@@ -9,7 +9,8 @@ option java_multiple_files = true;
import "common/protocol/headers.proto";
message Account {
// ID of the account, in the form of a UUID, e.g., "66ad4540-b58c-4ad2-9926-ea63445a9b57".
// ID of the account, in the form of a UUID, e.g.,
// "66ad4540-b58c-4ad2-9926-ea63445a9b57".
string id = 1;
// Number of alternative IDs. Client and server must share the same number.
uint32 alter_id = 2;