lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-08 10:15:53 -05:00
Code Issues Releases Wiki Activity

update proto lib

Browse Source
This commit is contained in:
Darien Raymond
2018-09-14 11:00:59 +02:00
parent 1aeb3509c2
commit d068f357bd
46 changed files with 503 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
proxy/http/config.pb.go
View File

@@ -30,7 +30,7 @@ func (m *ServerConfig) Reset() { *m = ServerConfig{} }
func (m *ServerConfig) String() string { return proto.CompactTextString(m) }
func (*ServerConfig) ProtoMessage() {}
func (*ServerConfig) Descriptor() ([]byte, []int) {
return fileDescriptor_config_00149e53e8f51a9f, []int{0}
return fileDescriptor_e66c3db3a635d8e4, []int{0}
}
func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ServerConfig.Unmarshal(m, b)
@@ -38,8 +38,8 @@ func (m *ServerConfig) XXX_Unmarshal(b []byte) error {
func (m *ServerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ServerConfig.Marshal(b, m, deterministic)
}
func (dst *ServerConfig) XXX_Merge(src proto.Message) {
xxx_messageInfo_ServerConfig.Merge(dst, src)
func (m *ServerConfig) XXX_Merge(src proto.Message) {
xxx_messageInfo_ServerConfig.Merge(m, src)
}
func (m *ServerConfig) XXX_Size() int {
return xxx_messageInfo_ServerConfig.Size(m)
@@ -90,7 +90,7 @@ func (m *ClientConfig) Reset() { *m = ClientConfig{} }
func (m *ClientConfig) String() string { return proto.CompactTextString(m) }
func (*ClientConfig) ProtoMessage() {}
func (*ClientConfig) Descriptor() ([]byte, []int) {
return fileDescriptor_config_00149e53e8f51a9f, []int{1}
return fileDescriptor_e66c3db3a635d8e4, []int{1}
}
func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ClientConfig.Unmarshal(m, b)
@@ -98,8 +98,8 @@ func (m *ClientConfig) XXX_Unmarshal(b []byte) error {
func (m *ClientConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ClientConfig.Marshal(b, m, deterministic)
}
func (dst *ClientConfig) XXX_Merge(src proto.Message) {
xxx_messageInfo_ClientConfig.Merge(dst, src)
func (m *ClientConfig) XXX_Merge(src proto.Message) {
xxx_messageInfo_ClientConfig.Merge(m, src)
}
func (m *ClientConfig) XXX_Size() int {
return xxx_messageInfo_ClientConfig.Size(m)
@@ -117,10 +117,10 @@ func init() {
}
func init() {
proto.RegisterFile("v2ray.com/core/proxy/http/config.proto", fileDescriptor_config_00149e53e8f51a9f)
proto.RegisterFile("v2ray.com/core/proxy/http/config.proto", fileDescriptor_e66c3db3a635d8e4)
}
var fileDescriptor_config_00149e53e8f51a9f = []byte{
var fileDescriptor_e66c3db3a635d8e4 = []byte{
// 296 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x4a, 0x33, 0x31,
0x14, 0xc5, 0x99, 0x69, 0xbf, 0xcf, 0xf6, 0xda, 0x4a, 0x0d, 0x16, 0x46, 0x51, 0x28, 0x5d, 0x48,