github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

update proto def

pull/432/head
Darien Raymond 2017-04-02 14:24:10 +02:00
parent 9d6513d3d3
commit 2111c7e9ca
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
8 changed files with 93 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
app/proxyman/config.pb.go
View File

@ -69,7 +69,7 @@ var SessionFrame_FrameCommand_value = map[string]int32{
func (x SessionFrame_FrameCommand) String() string { func (x SessionFrame_FrameCommand) String() string {
return proto.EnumName(SessionFrame_FrameCommand_name, int32(x)) return proto.EnumName(SessionFrame_FrameCommand_name, int32(x))
} }
func (SessionFrame_FrameCommand) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} } func (SessionFrame_FrameCommand) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{8, 0} }
type InboundConfig struct { type InboundConfig struct {
} }
@ -219,7 +219,6 @@ type InboundHandlerConfig struct {
Tag string `protobuf:"bytes,1,opt,name=tag" json:"tag,omitempty"` Tag string `protobuf:"bytes,1,opt,name=tag" json:"tag,omitempty"`
ReceiverSettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,2,opt,name=receiver_settings,json=receiverSettings" json:"receiver_settings,omitempty"` ReceiverSettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,2,opt,name=receiver_settings,json=receiverSettings" json:"receiver_settings,omitempty"`
ProxySettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,3,opt,name=proxy_settings,json=proxySettings" json:"proxy_settings,omitempty"` ProxySettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,3,opt,name=proxy_settings,json=proxySettings" json:"proxy_settings,omitempty"`
DispatchSettings *DispatchConfig `protobuf:"bytes,4,opt,name=dispatch_settings,json=dispatchSettings" json:"dispatch_settings,omitempty"`
} }
func (m *InboundHandlerConfig) Reset() { *m = InboundHandlerConfig{} } func (m *InboundHandlerConfig) Reset() { *m = InboundHandlerConfig{} }
@ -248,13 +247,6 @@ func (m *InboundHandlerConfig) GetProxySettings() *v2ray_core_common_serial.Type
return nil return nil
} }
func (m *InboundHandlerConfig) GetDispatchSettings() *DispatchConfig {
if m != nil {
return m.DispatchSettings
}
return nil
}
type OutboundConfig struct { type OutboundConfig struct {
} }
@ -268,6 +260,7 @@ type SenderConfig struct {
Via *v2ray_core_common_net.IPOrDomain `protobuf:"bytes,1,opt,name=via" json:"via,omitempty"` Via *v2ray_core_common_net.IPOrDomain `protobuf:"bytes,1,opt,name=via" json:"via,omitempty"`
StreamSettings *v2ray_core_transport_internet.StreamConfig `protobuf:"bytes,2,opt,name=stream_settings,json=streamSettings" json:"stream_settings,omitempty"` StreamSettings *v2ray_core_transport_internet.StreamConfig `protobuf:"bytes,2,opt,name=stream_settings,json=streamSettings" json:"stream_settings,omitempty"`
ProxySettings *v2ray_core_transport_internet.ProxyConfig `protobuf:"bytes,3,opt,name=proxy_settings,json=proxySettings" json:"proxy_settings,omitempty"` ProxySettings *v2ray_core_transport_internet.ProxyConfig `protobuf:"bytes,3,opt,name=proxy_settings,json=proxySettings" json:"proxy_settings,omitempty"`
MultiplexSettings *MultiplexingConfig `protobuf:"bytes,4,opt,name=multiplex_settings,json=multiplexSettings" json:"multiplex_settings,omitempty"`
} }
func (m *SenderConfig) Reset() { *m = SenderConfig{} } func (m *SenderConfig) Reset() { *m = SenderConfig{} }
@ -296,13 +289,19 @@ func (m *SenderConfig) GetProxySettings() *v2ray_core_transport_internet.ProxyCo
return nil return nil
} }
func (m *SenderConfig) GetMultiplexSettings() *MultiplexingConfig {
if m != nil {
return m.MultiplexSettings
}
return nil
}
type OutboundHandlerConfig struct { type OutboundHandlerConfig struct {
Tag string `protobuf:"bytes,1,opt,name=tag" json:"tag,omitempty"` Tag string `protobuf:"bytes,1,opt,name=tag" json:"tag,omitempty"`
SenderSettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,2,opt,name=sender_settings,json=senderSettings" json:"sender_settings,omitempty"` SenderSettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,2,opt,name=sender_settings,json=senderSettings" json:"sender_settings,omitempty"`
ProxySettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,3,opt,name=proxy_settings,json=proxySettings" json:"proxy_settings,omitempty"` ProxySettings *v2ray_core_common_serial.TypedMessage `protobuf:"bytes,3,opt,name=proxy_settings,json=proxySettings" json:"proxy_settings,omitempty"`
Expire int64 `protobuf:"varint,4,opt,name=expire" json:"expire,omitempty"` Expire int64 `protobuf:"varint,4,opt,name=expire" json:"expire,omitempty"`
Comment string `protobuf:"bytes,5,opt,name=comment" json:"comment,omitempty"` Comment string `protobuf:"bytes,5,opt,name=comment" json:"comment,omitempty"`
DispatchSettings *DispatchConfig `protobuf:"bytes,6,opt,name=dispatch_settings,json=dispatchSettings" json:"dispatch_settings,omitempty"`
} }
func (m *OutboundHandlerConfig) Reset() { *m = OutboundHandlerConfig{} } func (m *OutboundHandlerConfig) Reset() { *m = OutboundHandlerConfig{} }
@ -345,13 +344,6 @@ func (m *OutboundHandlerConfig) GetComment() string {
return "" return ""
} }
func (m *OutboundHandlerConfig) GetDispatchSettings() *DispatchConfig {
if m != nil {
return m.DispatchSettings
}
return nil
}
type MultiplexingConfig struct { type MultiplexingConfig struct {
Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"` Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"`
} }
@ -368,22 +360,6 @@ func (m *MultiplexingConfig) GetEnabled() bool {
return false return false
} }
type DispatchConfig struct {
MuxSettings *MultiplexingConfig `protobuf:"bytes,1,opt,name=mux_settings,json=muxSettings" json:"mux_settings,omitempty"`
}
func (m *DispatchConfig) Reset() { *m = DispatchConfig{} }
func (m *DispatchConfig) String() string { return proto.CompactTextString(m) }
func (*DispatchConfig) ProtoMessage() {}
func (*DispatchConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
func (m *DispatchConfig) GetMuxSettings() *MultiplexingConfig {
if m != nil {
return m.MuxSettings
}
return nil
}
type SessionFrame struct { type SessionFrame struct {
Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
Command SessionFrame_FrameCommand `protobuf:"varint,2,opt,name=command,enum=v2ray.core.app.proxyman.SessionFrame_FrameCommand" json:"command,omitempty"` Command SessionFrame_FrameCommand `protobuf:"varint,2,opt,name=command,enum=v2ray.core.app.proxyman.SessionFrame_FrameCommand" json:"command,omitempty"`
@ -394,7 +370,7 @@ type SessionFrame struct {
func (m *SessionFrame) Reset() { *m = SessionFrame{} } func (m *SessionFrame) Reset() { *m = SessionFrame{} }
func (m *SessionFrame) String() string { return proto.CompactTextString(m) } func (m *SessionFrame) String() string { return proto.CompactTextString(m) }
func (*SessionFrame) ProtoMessage() {} func (*SessionFrame) ProtoMessage() {}
func (*SessionFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } func (*SessionFrame) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
func (m *SessionFrame) GetId() uint32 { func (m *SessionFrame) GetId() uint32 {
if m != nil { if m != nil {
@ -435,7 +411,6 @@ func init() {
proto.RegisterType((*SenderConfig)(nil), "v2ray.core.app.proxyman.SenderConfig") proto.RegisterType((*SenderConfig)(nil), "v2ray.core.app.proxyman.SenderConfig")
proto.RegisterType((*OutboundHandlerConfig)(nil), "v2ray.core.app.proxyman.OutboundHandlerConfig") proto.RegisterType((*OutboundHandlerConfig)(nil), "v2ray.core.app.proxyman.OutboundHandlerConfig")
proto.RegisterType((*MultiplexingConfig)(nil), "v2ray.core.app.proxyman.MultiplexingConfig") proto.RegisterType((*MultiplexingConfig)(nil), "v2ray.core.app.proxyman.MultiplexingConfig")
proto.RegisterType((*DispatchConfig)(nil), "v2ray.core.app.proxyman.DispatchConfig")
proto.RegisterType((*SessionFrame)(nil), "v2ray.core.app.proxyman.SessionFrame") proto.RegisterType((*SessionFrame)(nil), "v2ray.core.app.proxyman.SessionFrame")
proto.RegisterEnum("v2ray.core.app.proxyman.AllocationStrategy_Type", AllocationStrategy_Type_name, AllocationStrategy_Type_value) proto.RegisterEnum("v2ray.core.app.proxyman.AllocationStrategy_Type", AllocationStrategy_Type_name, AllocationStrategy_Type_value)
proto.RegisterEnum("v2ray.core.app.proxyman.SessionFrame_FrameCommand", SessionFrame_FrameCommand_name, SessionFrame_FrameCommand_value) proto.RegisterEnum("v2ray.core.app.proxyman.SessionFrame_FrameCommand", SessionFrame_FrameCommand_name, SessionFrame_FrameCommand_value)
@ -444,64 +419,61 @@ func init() {
func init() { proto.RegisterFile("v2ray.com/core/app/proxyman/config.proto", fileDescriptor0) } func init() { proto.RegisterFile("v2ray.com/core/app/proxyman/config.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{ var fileDescriptor0 = []byte{
// 931 bytes of a gzipped FileDescriptorProto // 891 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0x71, 0x6f, 0x1b, 0x35, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0x5d, 0x6f, 0x1b, 0x45,
0x1c, 0xdd, 0x5d, 0xba, 0xb4, 0xfd, 0x25, 0xbd, 0xde, 0xcc, 0xd8, 0x42, 0x00, 0x51, 0x22, 0xc4, 0x14, 0xed, 0xda, 0xa9, 0x9b, 0xdc, 0x24, 0xce, 0x76, 0x28, 0xad, 0x31, 0x20, 0x82, 0x85, 0x20,
0x2a, 0x86, 0x2e, 0x23, 0x13, 0x42, 0x48, 0x48, 0xa3, 0x4b, 0x8b, 0xa8, 0xa0, 0x6b, 0x70, 0x2a, 0xa2, 0x68, 0x5d, 0x5c, 0x21, 0x84, 0x84, 0x54, 0x52, 0x27, 0x88, 0x08, 0x42, 0xcc, 0xb8, 0xe2,
0xfe, 0x40, 0x48, 0xc1, 0xbd, 0xf3, 0x32, 0x8b, 0x3b, 0xfb, 0x64, 0x3b, 0x6d, 0xf2, 0x1f, 0x9f, 0xa1, 0x42, 0xb2, 0x26, 0xbb, 0xd3, 0x65, 0xc4, 0xee, 0xcc, 0x68, 0x66, 0x9c, 0x64, 0xdf, 0xf8,
0x85, 0x3f, 0xf9, 0x14, 0x7c, 0x05, 0xbe, 0x07, 0x1f, 0x02, 0xd9, 0xe7, 0x4b, 0xb2, 0x26, 0x47, 0x3d, 0xfc, 0x0a, 0x1e, 0x79, 0xe0, 0x1f, 0xf1, 0x82, 0xe6, 0x63, 0x1d, 0xb7, 0xce, 0xb6, 0x84,
0x29, 0xd5, 0xfe, 0xa9, 0xce, 0xd7, 0xf7, 0x9e, 0xed, 0xf7, 0xde, 0xef, 0x5a, 0xd8, 0xbf, 0xe8, 0xaa, 0x2f, 0xd1, 0xcc, 0xe6, 0x9c, 0x33, 0x73, 0xcf, 0xb9, 0x77, 0x64, 0xd8, 0x3b, 0x1b, 0x29,
0x49, 0x32, 0x8b, 0x62, 0x91, 0x75, 0x63, 0x21, 0x69, 0x97, 0xe4, 0x79, 0x37, 0x97, 0x62, 0x3a, 0x52, 0x25, 0xa9, 0x28, 0x87, 0xa9, 0x50, 0x74, 0x48, 0xa4, 0x1c, 0x4a, 0x25, 0x2e, 0xaa, 0x92,
0xcb, 0x08, 0xef, 0xc6, 0x82, 0xbf, 0x64, 0xe3, 0x28, 0x97, 0x42, 0x0b, 0xf4, 0xb0, 0x44, 0x4a, 0xf0, 0x61, 0x2a, 0xf8, 0x33, 0x96, 0x27, 0x52, 0x09, 0x23, 0xd0, 0xbd, 0x1a, 0xa9, 0x68, 0x42,
0x1a, 0x91, 0x3c, 0x8f, 0x4a, 0x54, 0xfb, 0xc9, 0x15, 0x89, 0x58, 0x64, 0x99, 0xe0, 0x5d, 0x45, 0xa4, 0x4c, 0x6a, 0x54, 0xff, 0xc1, 0x0b, 0x12, 0xa9, 0x28, 0x4b, 0xc1, 0x87, 0x9a, 0x2a, 0x46,
0x25, 0x23, 0x69, 0x57, 0xcf, 0x72, 0x9a, 0x8c, 0x32, 0xaa, 0x14, 0x19, 0xd3, 0x42, 0xaa, 0xfd, 0x8a, 0xa1, 0xa9, 0x24, 0xcd, 0x66, 0x25, 0xd5, 0x9a, 0xe4, 0xd4, 0x4b, 0xf5, 0x3f, 0xb9, 0x9a,
0x68, 0x3d, 0x83, 0x53, 0xdd, 0x25, 0x49, 0x22, 0xa9, 0x52, 0x0e, 0xf8, 0xb8, 0x1a, 0x98, 0x50, 0xc1, 0xa9, 0x19, 0x92, 0x2c, 0x53, 0x54, 0xeb, 0x00, 0xbc, 0xdf, 0x0c, 0xcc, 0xa8, 0x36, 0x8c,
0xa5, 0x19, 0x27, 0x9a, 0x09, 0xee, 0xc0, 0x1f, 0x55, 0x83, 0x73, 0x21, 0xb5, 0x43, 0x45, 0x57, 0x13, 0xc3, 0x04, 0x0f, 0xe0, 0x8f, 0x9a, 0xc1, 0x52, 0x28, 0x13, 0x50, 0xc9, 0x0b, 0x28, 0xa3,
0x50, 0x5a, 0x12, 0xae, 0xcc, 0xef, 0xbb, 0x8c, 0x6b, 0x2a, 0x0d, 0x7a, 0xf9, 0xda, 0x9d, 0x5d, 0x08, 0xd7, 0xf6, 0xff, 0x43, 0xc6, 0x0d, 0x55, 0x16, 0xbd, 0x5c, 0xf6, 0x60, 0x07, 0xb6, 0x8f,
0xd8, 0x39, 0xe6, 0xe7, 0x62, 0xc2, 0x93, 0xbe, 0x7d, 0xdd, 0xf9, 0xb3, 0x06, 0xe8, 0x20, 0x4d, 0xf8, 0xa9, 0x98, 0xf3, 0x6c, 0xec, 0x3e, 0x0f, 0xfe, 0x6c, 0x03, 0xda, 0x2f, 0x0a, 0x91, 0xba,
0x45, 0x6c, 0xf7, 0x1e, 0x6a, 0x49, 0x34, 0x1d, 0xcf, 0xd0, 0x21, 0x6c, 0x98, 0xab, 0xb6, 0xbc, 0xb3, 0xa7, 0x46, 0x11, 0x43, 0xf3, 0x0a, 0x1d, 0xc0, 0x9a, 0x2d, 0xb5, 0x17, 0xed, 0x46, 0x7b,
0x3d, 0x6f, 0x3f, 0xe8, 0x3d, 0x89, 0x2a, 0xdc, 0x8a, 0x56, 0xa9, 0xd1, 0xd9, 0x2c, 0xa7, 0xd8, 0xdd, 0xd1, 0x83, 0xa4, 0xc1, 0xad, 0x64, 0x95, 0x9a, 0x3c, 0xa9, 0x24, 0xc5, 0x8e, 0x8d, 0x7e,
0xb2, 0xd1, 0xaf, 0xd0, 0x88, 0x05, 0x8f, 0x27, 0x52, 0x52, 0x1e, 0xcf, 0x5a, 0xfe, 0x9e, 0xb7, 0x83, 0xcd, 0x54, 0xf0, 0x74, 0xae, 0x14, 0xe5, 0x69, 0xd5, 0x6b, 0xed, 0x46, 0x7b, 0x9b, 0xa3,
0xdf, 0xe8, 0x1d, 0xdf, 0x44, 0x6c, 0xf5, 0x55, 0x7f, 0x21, 0x88, 0x97, 0xd5, 0xd1, 0x08, 0x36, 0xa3, 0xeb, 0x88, 0xad, 0x7e, 0x1a, 0x5f, 0x0a, 0xe2, 0x65, 0x75, 0x34, 0x83, 0x5b, 0x8a, 0x3e,
0x25, 0x7d, 0x29, 0xa9, 0x7a, 0xd5, 0xaa, 0xd9, 0x8d, 0x8e, 0x6e, 0xb7, 0x11, 0x2e, 0xc4, 0x70, 0x53, 0x54, 0xff, 0xda, 0x6b, 0xbb, 0x83, 0x0e, 0x5f, 0xef, 0x20, 0xec, 0xc5, 0x70, 0xad, 0xda,
0xa9, 0xda, 0xfe, 0x1c, 0xde, 0xff, 0xd7, 0xe3, 0xa0, 0xfb, 0x70, 0xf7, 0x82, 0xa4, 0x93, 0xc2, 0xff, 0x02, 0xde, 0x7f, 0xe9, 0x75, 0xd0, 0x1d, 0xb8, 0x79, 0x46, 0x8a, 0xb9, 0x77, 0x6d, 0x1b,
0xb5, 0x1d, 0x5c, 0x2c, 0xda, 0x9f, 0xc1, 0x3b, 0x95, 0xe2, 0xeb, 0x29, 0x9d, 0x4f, 0x61, 0xc3, 0xfb, 0x4d, 0xff, 0x73, 0x78, 0xa7, 0x51, 0xfc, 0x6a, 0xca, 0xe0, 0x33, 0x58, 0xb3, 0x2e, 0x22,
0xb8, 0x88, 0x00, 0xea, 0x07, 0xe9, 0x25, 0x99, 0xa9, 0xf0, 0x8e, 0x79, 0xc6, 0x84, 0x27, 0x22, 0x80, 0xce, 0x7e, 0x71, 0x4e, 0x2a, 0x1d, 0xdf, 0xb0, 0x6b, 0x4c, 0x78, 0x26, 0xca, 0x38, 0x42,
0x0b, 0x3d, 0xd4, 0x84, 0xad, 0xa3, 0xa9, 0x89, 0x97, 0xa4, 0xa1, 0x6f, 0x22, 0x0c, 0x30, 0x8d, 0x5b, 0xb0, 0x7e, 0x78, 0x61, 0xe3, 0x25, 0x45, 0xdc, 0xb2, 0x11, 0x76, 0x31, 0x4d, 0x29, 0x3b,
0x29, 0xbb, 0xa0, 0xb2, 0x48, 0x15, 0x3d, 0x03, 0x30, 0x25, 0x18, 0x49, 0xc2, 0xc7, 0x85, 0x76, 0xa3, 0xca, 0xa7, 0x8a, 0x1e, 0x01, 0xd8, 0x26, 0x98, 0x29, 0xc2, 0x73, 0xaf, 0xbd, 0x39, 0xda,
0xa3, 0xb7, 0xb7, 0x6c, 0x47, 0xd1, 0xa6, 0x88, 0x53, 0x1d, 0x0d, 0x84, 0xd4, 0xd8, 0xe0, 0xf0, 0x5d, 0xb6, 0xc3, 0x77, 0x53, 0xc2, 0xa9, 0x49, 0x26, 0x42, 0x19, 0x6c, 0x71, 0x78, 0x43, 0xd6,
0x76, 0x5e, 0x3e, 0xa2, 0x2f, 0xa1, 0x9e, 0x32, 0xa5, 0x29, 0x77, 0xa1, 0x7d, 0x58, 0x41, 0x3e, 0x4b, 0xf4, 0x15, 0x74, 0x0a, 0xa6, 0x0d, 0xe5, 0x21, 0xb4, 0x0f, 0x1b, 0xc8, 0x47, 0x93, 0x13,
0x1e, 0x9c, 0xca, 0x43, 0x91, 0x11, 0xc6, 0xb1, 0x23, 0xa0, 0x9f, 0xe1, 0x2d, 0x32, 0xbf, 0xef, 0x75, 0x20, 0x4a, 0xc2, 0x38, 0x0e, 0x04, 0xf4, 0x0b, 0xbc, 0x45, 0x16, 0xf5, 0xce, 0x74, 0x28,
0x48, 0xb9, 0x0b, 0xbb, 0x4c, 0x1e, 0xdf, 0x20, 0x13, 0x8c, 0xc8, 0x6a, 0x31, 0xcf, 0x60, 0x57, 0x38, 0x64, 0x72, 0xff, 0x1a, 0x99, 0x60, 0x44, 0x56, 0x1b, 0xf3, 0x09, 0xec, 0x68, 0xa3, 0x28,
0x69, 0x49, 0x49, 0x36, 0x52, 0x54, 0x6b, 0xc6, 0xc7, 0xaa, 0xb5, 0xb1, 0xaa, 0x3c, 0x1f, 0x83, 0x29, 0x67, 0x9a, 0x1a, 0xc3, 0x78, 0xae, 0x7b, 0x6b, 0xab, 0xca, 0x8b, 0x31, 0x48, 0xea, 0x31,
0xa8, 0x1c, 0x83, 0x68, 0x68, 0x59, 0x85, 0x3f, 0x38, 0x28, 0x34, 0x86, 0x4e, 0x02, 0x7d, 0x0d, 0x48, 0xa6, 0x8e, 0xe5, 0xfd, 0xc1, 0x5d, 0xaf, 0x31, 0x0d, 0x12, 0xe8, 0x1b, 0x78, 0x4f, 0x79,
0xef, 0xc9, 0xc2, 0xc1, 0x91, 0x90, 0x6c, 0xcc, 0x38, 0x49, 0x47, 0x4b, 0x23, 0xd9, 0xba, 0xbb, 0x07, 0x67, 0x42, 0xb1, 0x9c, 0x71, 0x52, 0xcc, 0x96, 0x46, 0xb2, 0x77, 0x73, 0x37, 0xda, 0x5b,
0xe7, 0xed, 0x6f, 0xe1, 0xb6, 0xc3, 0x9c, 0x3a, 0xc8, 0xe1, 0x02, 0x81, 0xbe, 0x82, 0x96, 0x39, 0xc7, 0xfd, 0x80, 0x39, 0x09, 0x90, 0x83, 0x4b, 0x04, 0xfa, 0x1a, 0x7a, 0xf6, 0xb6, 0xe7, 0x33,
0xed, 0xe5, 0x28, 0x27, 0x4a, 0x19, 0x9d, 0x58, 0x70, 0x4e, 0x63, 0xcb, 0xae, 0x1b, 0xf6, 0x73, 0x49, 0xb4, 0xb6, 0x3a, 0xa9, 0xe0, 0x9c, 0xa6, 0x8e, 0xdd, 0xb1, 0xec, 0xc7, 0xad, 0x5e, 0x84,
0xbf, 0xe5, 0xe1, 0x07, 0x16, 0x33, 0x28, 0x20, 0xfd, 0x39, 0xa2, 0xf3, 0xbb, 0x0f, 0xf7, 0xdd, 0xef, 0x3a, 0xcc, 0xc4, 0x43, 0xc6, 0x0b, 0xc4, 0xe0, 0xef, 0x08, 0xee, 0x84, 0xb9, 0xfc, 0x8e,
0x5c, 0x7e, 0x4b, 0x78, 0x92, 0xce, 0x83, 0x0c, 0xa1, 0xa6, 0xc9, 0xd8, 0x26, 0xb8, 0x8d, 0xcd, 0xf0, 0xac, 0x58, 0x04, 0x19, 0x43, 0xdb, 0x90, 0xdc, 0x25, 0xb8, 0x81, 0xed, 0x12, 0x4d, 0xe1,
0x23, 0x1a, 0xc2, 0x3d, 0x77, 0x0c, 0xb9, 0xb0, 0xa0, 0x08, 0xe9, 0xe3, 0x35, 0x21, 0x15, 0xdf, 0x76, 0xb8, 0x86, 0xba, 0xb4, 0xc0, 0x87, 0xf4, 0xf1, 0x15, 0x21, 0xf9, 0x77, 0xcb, 0x0d, 0x65,
0x2d, 0x3b, 0x94, 0xc9, 0x49, 0xf1, 0xd9, 0xc2, 0x61, 0x29, 0x30, 0xbf, 0xff, 0x09, 0x04, 0x36, 0x76, 0xec, 0x9f, 0x2d, 0x1c, 0xd7, 0x02, 0x8b, 0xfa, 0x8f, 0xa1, 0xeb, 0x82, 0xb8, 0x54, 0x6c,
0x88, 0x85, 0x62, 0xed, 0x46, 0x8a, 0x3b, 0x96, 0x3d, 0x97, 0x3b, 0x83, 0x7b, 0x09, 0x53, 0x39, 0x5f, 0x4b, 0x71, 0xdb, 0xb1, 0x6b, 0xb9, 0x41, 0x0c, 0xdd, 0x93, 0xb9, 0x59, 0x7e, 0x66, 0xfe,
0xd1, 0xf1, 0xab, 0xab, 0x31, 0x3d, 0xaa, 0x2c, 0xc0, 0xa1, 0x63, 0xb8, 0x88, 0xc2, 0x52, 0xa1, 0x6a, 0xc1, 0xd6, 0x94, 0xf2, 0x6c, 0x51, 0xd8, 0x43, 0x68, 0x9f, 0x31, 0x12, 0x5a, 0xf3, 0x3f,
0x54, 0xed, 0x84, 0x10, 0x9c, 0x4e, 0xf4, 0xf2, 0xc7, 0xeb, 0x6f, 0x0f, 0x9a, 0x43, 0xca, 0x93, 0x74, 0x97, 0x45, 0x5f, 0x15, 0x7e, 0xeb, 0xf5, 0xc3, 0xff, 0xa9, 0xa1, 0xf8, 0x4f, 0x5f, 0x21,
0xb9, 0x5d, 0x4f, 0xa1, 0x76, 0xc1, 0x88, 0x2b, 0xfc, 0x7f, 0xe8, 0xac, 0x41, 0xaf, 0xab, 0x94, 0x3a, 0xb1, 0xa4, 0xa0, 0xf9, 0xbc, 0x01, 0xe8, 0x29, 0xa0, 0x72, 0x5e, 0x18, 0x26, 0x0b, 0x7a,
0x7f, 0xfb, 0x4a, 0xfd, 0x50, 0x61, 0xe9, 0x27, 0xd7, 0x88, 0x0e, 0x0c, 0xc9, 0x69, 0xbe, 0x6e, 0xf1, 0xd2, 0x46, 0x7d, 0x6e, 0x04, 0x8e, 0x6b, 0x0a, 0xe3, 0x79, 0xd0, 0xbd, 0xbd, 0x90, 0x59,
0x6b, 0xe7, 0x2f, 0x1f, 0xde, 0x2e, 0x1d, 0xb8, 0xae, 0x26, 0xa7, 0xb0, 0xab, 0xac, 0x33, 0xff, 0x98, 0xfb, 0x4f, 0x04, 0x6f, 0xd7, 0xee, 0xbe, 0xaa, 0x59, 0x4e, 0x60, 0x47, 0x3b, 0xd7, 0xff,
0xb7, 0x24, 0x41, 0x41, 0x7f, 0x53, 0x15, 0x79, 0x00, 0x75, 0x3a, 0xcd, 0x99, 0xa4, 0xb6, 0x17, 0x6f, 0xab, 0x74, 0x3d, 0xfd, 0x0d, 0x35, 0x0a, 0xba, 0x0b, 0x1d, 0x7a, 0x21, 0x99, 0xa2, 0xce,
0x35, 0xec, 0x56, 0xa8, 0x05, 0x9b, 0x46, 0x84, 0x72, 0x6d, 0x87, 0x6e, 0x1b, 0x97, 0xcb, 0xf5, 0x9b, 0x36, 0x0e, 0x3b, 0xd4, 0x83, 0x5b, 0x56, 0x84, 0x72, 0xe3, 0x46, 0x6f, 0x03, 0xd7, 0xdb,
0xa5, 0xaa, 0xdf, 0xb6, 0x54, 0x11, 0xa0, 0x93, 0x49, 0xaa, 0x59, 0x9e, 0xd2, 0x29, 0xe3, 0x63, 0x41, 0x02, 0x68, 0xd5, 0x26, 0x8b, 0xa7, 0x9c, 0x9c, 0x16, 0x34, 0x73, 0xd5, 0xaf, 0xe3, 0x7a,
0xe7, 0x67, 0x0b, 0x36, 0x29, 0x27, 0xe7, 0x29, 0x4d, 0xac, 0xa7, 0x5b, 0xb8, 0x5c, 0x76, 0x7e, 0x3b, 0xf8, 0xdd, 0x35, 0x9e, 0xd6, 0x4c, 0xf0, 0x6f, 0x15, 0x29, 0x29, 0xea, 0x42, 0x8b, 0x65,
0x81, 0xe0, 0x75, 0x4d, 0xf4, 0x02, 0x9a, 0xd9, 0x64, 0xba, 0x38, 0x92, 0x77, 0xcd, 0x87, 0x6e, 0xe1, 0xb9, 0x6d, 0xb1, 0x0c, 0xfd, 0xe0, 0x8f, 0x22, 0x3c, 0x73, 0xd6, 0x74, 0x47, 0xa3, 0xc6,
0x75, 0x3b, 0xdc, 0xc8, 0x26, 0xd3, 0xf9, 0x89, 0x7e, 0xf3, 0x4d, 0xa9, 0x95, 0x62, 0x82, 0x7f, 0x7c, 0x96, 0x75, 0x12, 0xf7, 0x77, 0xec, 0x99, 0xb8, 0x96, 0x40, 0x5f, 0x42, 0xc7, 0x10, 0x95,
0x23, 0x49, 0x46, 0x51, 0x00, 0x3e, 0x4b, 0xdc, 0x1f, 0x08, 0x9f, 0x25, 0xe8, 0xfb, 0xc2, 0x22, 0x53, 0x13, 0x7c, 0xf9, 0xa0, 0xa1, 0xb3, 0x0f, 0x79, 0x26, 0x05, 0xe3, 0x06, 0x07, 0xb8, 0xad,
0xc2, 0x13, 0x1b, 0x69, 0xd0, 0xeb, 0x55, 0xee, 0xb5, 0xac, 0x13, 0xd9, 0x9f, 0xfd, 0x82, 0x89, 0x40, 0x92, 0xaa, 0x10, 0x24, 0x73, 0x56, 0x6c, 0xe1, 0x7a, 0x3b, 0x78, 0x04, 0x5b, 0xcb, 0x67,
0x4b, 0x09, 0xf4, 0x05, 0xd4, 0x35, 0x91, 0x63, 0xaa, 0x5d, 0x9e, 0x1f, 0x54, 0x4c, 0xcd, 0x11, 0xa1, 0x2e, 0x40, 0xb8, 0xc8, 0x8f, 0xf4, 0x3c, 0xbe, 0x81, 0x76, 0x60, 0x33, 0xec, 0xbf, 0xa7,
0x4f, 0x72, 0xc1, 0xb8, 0xc6, 0x0e, 0x6e, 0x3c, 0xca, 0xc9, 0x2c, 0x15, 0x24, 0xb1, 0x11, 0x36, 0x54, 0xc6, 0xd1, 0x12, 0xe0, 0x90, 0x67, 0x71, 0xeb, 0xf1, 0x18, 0xde, 0x4d, 0x45, 0xd9, 0x54,
0x71, 0xb9, 0xec, 0x3c, 0x83, 0xe6, 0xf2, 0x5e, 0x28, 0x00, 0x70, 0x07, 0x79, 0x41, 0x2f, 0xc3, 0xd5, 0x24, 0x7a, 0xba, 0x5e, 0xaf, 0xff, 0x68, 0xdd, 0xfb, 0x79, 0x84, 0x49, 0x95, 0x8c, 0x2d,
0x3b, 0x68, 0x17, 0x1a, 0x6e, 0xfd, 0x1d, 0xa5, 0x79, 0xe8, 0x2d, 0x01, 0x8e, 0x78, 0x12, 0xfa, 0x6a, 0x5f, 0x4a, 0xdf, 0xe3, 0x25, 0xe1, 0xa7, 0x1d, 0xf7, 0xfb, 0xe1, 0xe1, 0xbf, 0x01, 0x00,
0xcf, 0xfb, 0xf0, 0x6e, 0x2c, 0xb2, 0xaa, 0x5b, 0x0d, 0xbc, 0x9f, 0xb6, 0xca, 0xe7, 0x3f, 0xfc, 0x00, 0xff, 0xff, 0x4c, 0xc8, 0xc1, 0x3b, 0x62, 0x09, 0x00, 0x00,
0x87, 0x3f, 0xf6, 0x30, 0x99, 0x45, 0x7d, 0x83, 0x3a, 0xc8, 0xf3, 0x62, 0x7e, 0x32, 0xc2, 0xcf,
0xeb, 0xf6, 0x3f, 0x9e, 0xa7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x84, 0xa5, 0xc3, 0xdd, 0x14,
0x0a, 0x00, 0x00,
} }

13
app/proxyman/config.proto
View File

@ -6,15 +6,15 @@ option go_package = "proxyman";
option java_package = "com.v2ray.core.app.proxyman"; option java_package = "com.v2ray.core.app.proxyman";
option java_multiple_files = true; option java_multiple_files = true;
message InboundConfig {
}
import "v2ray.com/core/common/serial/typed_message.proto"; import "v2ray.com/core/common/serial/typed_message.proto";
import "v2ray.com/core/common/net/address.proto"; import "v2ray.com/core/common/net/address.proto";
import "v2ray.com/core/common/net/destination.proto"; import "v2ray.com/core/common/net/destination.proto";
import "v2ray.com/core/common/net/port.proto"; import "v2ray.com/core/common/net/port.proto";
import "v2ray.com/core/transport/internet/config.proto"; import "v2ray.com/core/transport/internet/config.proto";
message InboundConfig {
}
message AllocationStrategy { message AllocationStrategy {
enum Type { enum Type {
// Always allocate all connection handlers. // Always allocate all connection handlers.
@ -60,7 +60,6 @@ message InboundHandlerConfig {
string tag = 1; string tag = 1;
v2ray.core.common.serial.TypedMessage receiver_settings = 2; v2ray.core.common.serial.TypedMessage receiver_settings = 2;
v2ray.core.common.serial.TypedMessage proxy_settings = 3; v2ray.core.common.serial.TypedMessage proxy_settings = 3;
DispatchConfig dispatch_settings = 4;
} }
message OutboundConfig { message OutboundConfig {
@ -72,6 +71,7 @@ message SenderConfig {
v2ray.core.common.net.IPOrDomain via = 1; v2ray.core.common.net.IPOrDomain via = 1;
v2ray.core.transport.internet.StreamConfig stream_settings = 2; v2ray.core.transport.internet.StreamConfig stream_settings = 2;
v2ray.core.transport.internet.ProxyConfig proxy_settings = 3; v2ray.core.transport.internet.ProxyConfig proxy_settings = 3;
MultiplexingConfig multiplex_settings = 4;
} }
message OutboundHandlerConfig { message OutboundHandlerConfig {
@ -80,17 +80,12 @@ message OutboundHandlerConfig {
v2ray.core.common.serial.TypedMessage proxy_settings = 3; v2ray.core.common.serial.TypedMessage proxy_settings = 3;
int64 expire = 4; int64 expire = 4;
string comment = 5; string comment = 5;
DispatchConfig dispatch_settings = 6;
} }
message MultiplexingConfig { message MultiplexingConfig {
bool enabled = 1; bool enabled = 1;
} }
message DispatchConfig {
MultiplexingConfig mux_settings = 1;
}
message SessionFrame { message SessionFrame {
uint32 id = 1; uint32 id = 1;

1
common/net/address.pb.go
View File

@ -15,6 +15,7 @@ var _ = math.Inf
// proto package needs to be updated. // proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
// Address of a network host. It may be either an IP address or a domain address.
type IPOrDomain struct { type IPOrDomain struct {
// Types that are valid to be assigned to Address: // Types that are valid to be assigned to Address:
// *IPOrDomain_Ip // *IPOrDomain_Ip

1
common/net/destination.pb.go
View File

@ -9,6 +9,7 @@ var _ = proto.Marshal
var _ = fmt.Errorf var _ = fmt.Errorf
var _ = math.Inf var _ = math.Inf
// Endpoint of a network connection.
type Endpoint struct { type Endpoint struct {
Network Network `protobuf:"varint,1,opt,name=network,enum=v2ray.core.common.net.Network" json:"network,omitempty"` Network Network `protobuf:"varint,1,opt,name=network,enum=v2ray.core.common.net.Network" json:"network,omitempty"`
Address *IPOrDomain `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"` Address *IPOrDomain `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"`

3
common/net/network.pb.go
View File

@ -13,9 +13,7 @@ type Network int32
const ( const (
Network_Unknown Network = 0 Network_Unknown Network = 0
// Native TCP provided by system.
Network_RawTCP Network = 1 Network_RawTCP Network = 1
// V2Ray specific TCP.
Network_TCP Network = 2 Network_TCP Network = 2
Network_UDP Network = 3 Network_UDP Network = 3
) )
@ -38,6 +36,7 @@ func (x Network) String() string {
} }
func (Network) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } func (Network) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
// NetworkList is a list of Networks.
type NetworkList struct { type NetworkList struct {
Network []Network `protobuf:"varint,1,rep,packed,name=network,enum=v2ray.core.common.net.Network" json:"network,omitempty"` Network []Network `protobuf:"varint,1,rep,packed,name=network,enum=v2ray.core.common.net.Network" json:"network,omitempty"`
} }

2
common/net/port.pb.go
View File

@ -11,7 +11,9 @@ var _ = math.Inf
// PortRange represents a range of ports. // PortRange represents a range of ports.
type PortRange struct { type PortRange struct {
// The port that this range starts from.
From uint32 `protobuf:"varint,1,opt,name=From" json:"From,omitempty"` From uint32 `protobuf:"varint,1,opt,name=From" json:"From,omitempty"`
// The port that this range ends with (inclusive).
To uint32 `protobuf:"varint,2,opt,name=To" json:"To,omitempty"` To uint32 `protobuf:"varint,2,opt,name=To" json:"To,omitempty"`
} }

1
common/protocol/user.pb.go
View File

@ -10,6 +10,7 @@ var _ = proto.Marshal
var _ = fmt.Errorf var _ = fmt.Errorf
var _ = math.Inf var _ = math.Inf
// User is a generic user for all procotols.
type User struct { type User struct {
Level uint32 `protobuf:"varint,1,opt,name=level" json:"level,omitempty"` Level uint32 `protobuf:"varint,1,opt,name=level" json:"level,omitempty"`
Email string `protobuf:"bytes,2,opt,name=email" json:"email,omitempty"` Email string `protobuf:"bytes,2,opt,name=email" json:"email,omitempty"`

2
config.pb.go
View File

@ -40,6 +40,7 @@ func (x ConfigFormat) String() string {
} }
func (ConfigFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func (ConfigFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
// Master config of V2Ray. V2Ray Core takes this config as input and functions accordingly.
type Config struct { type Config struct {
// Inbound handler configurations. Must have at least one item. // Inbound handler configurations. Must have at least one item.
Inbound []*v2ray_core_app_proxyman.InboundHandlerConfig `protobuf:"bytes,1,rep,name=inbound" json:"inbound,omitempty"` Inbound []*v2ray_core_app_proxyman.InboundHandlerConfig `protobuf:"bytes,1,rep,name=inbound" json:"inbound,omitempty"`
@ -47,6 +48,7 @@ type Config struct {
Outbound []*v2ray_core_app_proxyman.OutboundHandlerConfig `protobuf:"bytes,2,rep,name=outbound" json:"outbound,omitempty"` Outbound []*v2ray_core_app_proxyman.OutboundHandlerConfig `protobuf:"bytes,2,rep,name=outbound" json:"outbound,omitempty"`
// App configuration. Must be one in the app directory. // App configuration. Must be one in the app directory.
App []*v2ray_core_common_serial.TypedMessage `protobuf:"bytes,4,rep,name=app" json:"app,omitempty"` App []*v2ray_core_common_serial.TypedMessage `protobuf:"bytes,4,rep,name=app" json:"app,omitempty"`
// Transport settings.
Transport *v2ray_core_transport.Config `protobuf:"bytes,5,opt,name=transport" json:"transport,omitempty"` Transport *v2ray_core_transport.Config `protobuf:"bytes,5,opt,name=transport" json:"transport,omitempty"`
} }