From 8b881d7eb6e3b55106d20bcad73e72bedf500c1e Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Thu, 5 Apr 2018 18:47:36 +0800 Subject: [PATCH] Rename to prevent confusion --- app/proxyman/config.pb.go | 124 +++++++++++++++++----------------- app/proxyman/config.proto | 2 +- app/proxyman/outbound/unix.go | 2 +- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go index f89a96f5f..e754b7bc5 100644 --- a/app/proxyman/config.pb.go +++ b/app/proxyman/config.pb.go @@ -326,10 +326,10 @@ func (m *SenderConfig) GetMultiplexSettings() *MultiplexingConfig { } type UnixSenderConfig struct { - Via *v2ray_core_internet_domainsocket.DomainSocketSettings `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"` - 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"` + DomainSockSettings *v2ray_core_internet_domainsocket.DomainSocketSettings `protobuf:"bytes,1,opt,name=domainSockSettings" json:"domainSockSettings,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"` + MultiplexSettings *MultiplexingConfig `protobuf:"bytes,4,opt,name=multiplex_settings,json=multiplexSettings" json:"multiplex_settings,omitempty"` } func (m *UnixSenderConfig) Reset() { *m = UnixSenderConfig{} } @@ -337,9 +337,9 @@ func (m *UnixSenderConfig) String() string { return proto.CompactText func (*UnixSenderConfig) ProtoMessage() {} func (*UnixSenderConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } -func (m *UnixSenderConfig) GetVia() *v2ray_core_internet_domainsocket.DomainSocketSettings { +func (m *UnixSenderConfig) GetDomainSockSettings() *v2ray_core_internet_domainsocket.DomainSocketSettings { if m != nil { - return m.Via + return m.DomainSockSettings } return nil } @@ -410,60 +410,60 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/proxyman/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 868 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x4d, 0x6f, 0x1b, 0x45, - 0x18, 0xee, 0x7a, 0x1d, 0xdb, 0x7d, 0xd3, 0x38, 0xdb, 0xa1, 0x52, 0x8d, 0x01, 0xc9, 0x18, 0x44, - 0xad, 0x82, 0xd6, 0xc5, 0x15, 0x48, 0x88, 0x03, 0x84, 0xa4, 0x52, 0x12, 0x88, 0x62, 0xc6, 0x86, - 0x43, 0x85, 0x64, 0x4d, 0x76, 0x27, 0x66, 0x94, 0xdd, 0x99, 0xd5, 0xcc, 0xd8, 0xcd, 0xfe, 0x25, - 0x7e, 0x03, 0x07, 0x8e, 0x1c, 0xf8, 0x05, 0xdc, 0xf8, 0x27, 0x68, 0x77, 0x66, 0x37, 0xfe, 0x6c, - 0x09, 0x55, 0x6f, 0xbd, 0xcd, 0xda, 0xcf, 0xf3, 0xcc, 0xfb, 0x3e, 0xef, 0xc7, 0x2e, 0xf4, 0xe6, - 0x03, 0x49, 0x52, 0x3f, 0x10, 0x71, 0x3f, 0x10, 0x92, 0xf6, 0x49, 0x92, 0xf4, 0x13, 0x29, 0xae, - 0xd3, 0x98, 0xf0, 0x7e, 0x20, 0xf8, 0x25, 0x9b, 0xfa, 0x89, 0x14, 0x5a, 0xa0, 0x87, 0x05, 0x52, - 0x52, 0x9f, 0x24, 0x89, 0x5f, 0xa0, 0xda, 0x8f, 0x56, 0x24, 0x02, 0x11, 0xc7, 0x82, 0xf7, 0x39, - 0xd5, 0x7d, 0x12, 0x86, 0x92, 0x2a, 0x65, 0x14, 0xda, 0x1f, 0x6f, 0x07, 0x26, 0x42, 0x6a, 0x8b, - 0xf2, 0x57, 0x50, 0x5a, 0x12, 0xae, 0xb2, 0xff, 0xfb, 0x8c, 0x6b, 0x2a, 0x33, 0xf4, 0x62, 0x5c, - 0xed, 0xaf, 0x5f, 0x8d, 0x0f, 0x45, 0x4c, 0x18, 0x57, 0x22, 0xb8, 0x5a, 0x25, 0x3f, 0xd9, 0x1c, - 0x92, 0xa2, 0x92, 0x91, 0xa8, 0xaf, 0xd3, 0x84, 0x86, 0x93, 0x98, 0x2a, 0x45, 0xa6, 0xd4, 0x30, - 0xba, 0xfb, 0xb0, 0x77, 0xc2, 0x2f, 0xc4, 0x8c, 0x87, 0x87, 0xb9, 0x50, 0xf7, 0x0f, 0x17, 0xd0, - 0x41, 0x14, 0x89, 0x80, 0x68, 0x26, 0xf8, 0x48, 0x4b, 0xa2, 0xe9, 0x34, 0x45, 0x47, 0x50, 0xcd, - 0xe8, 0x2d, 0xa7, 0xe3, 0xf4, 0x9a, 0x83, 0x27, 0xfe, 0x16, 0xf7, 0xfc, 0x75, 0xaa, 0x3f, 0x4e, - 0x13, 0x8a, 0x73, 0x36, 0xba, 0x82, 0xdd, 0x40, 0xf0, 0x60, 0x26, 0x25, 0xe5, 0x41, 0xda, 0xaa, - 0x74, 0x9c, 0xde, 0xee, 0xe0, 0xe4, 0x36, 0x62, 0xeb, 0x3f, 0x1d, 0xde, 0x08, 0xe2, 0x45, 0x75, - 0x34, 0x81, 0xba, 0xa4, 0x97, 0x92, 0xaa, 0x5f, 0x5b, 0x6e, 0x7e, 0xd1, 0xb3, 0xd7, 0xbb, 0x08, - 0x1b, 0x31, 0x5c, 0xa8, 0xb6, 0xbf, 0x80, 0x0f, 0x5e, 0x1a, 0x0e, 0x7a, 0x00, 0x3b, 0x73, 0x12, - 0xcd, 0x8c, 0x6b, 0x7b, 0xd8, 0x3c, 0xb4, 0x3f, 0x87, 0x77, 0xb7, 0x8a, 0x6f, 0xa6, 0x74, 0x3f, - 0x83, 0x6a, 0xe6, 0x22, 0x02, 0xa8, 0x1d, 0x44, 0x2f, 0x48, 0xaa, 0xbc, 0x3b, 0xd9, 0x19, 0x13, - 0x1e, 0x8a, 0xd8, 0x73, 0xd0, 0x3d, 0x68, 0x3c, 0xbb, 0xce, 0xba, 0x83, 0x44, 0x5e, 0xa5, 0xfb, - 0xb7, 0x0b, 0x4d, 0x4c, 0x03, 0xca, 0xe6, 0x54, 0x9a, 0xaa, 0xa2, 0x6f, 0x00, 0xb2, 0x1e, 0x9a, - 0x48, 0xc2, 0xa7, 0x46, 0x7b, 0x77, 0xd0, 0x59, 0xb4, 0xc3, 0x74, 0x8a, 0xcf, 0xa9, 0xf6, 0x87, - 0x42, 0x6a, 0x9c, 0xe1, 0xf0, 0xdd, 0xa4, 0x38, 0xa2, 0xaf, 0xa0, 0x16, 0x31, 0xa5, 0x29, 0xb7, - 0x45, 0xfb, 0x70, 0x0b, 0xf9, 0x64, 0x78, 0x2e, 0x8f, 0xf2, 0xfe, 0xc4, 0x96, 0x80, 0x7e, 0x81, - 0x77, 0x48, 0x99, 0xef, 0x44, 0xd9, 0x84, 0x6d, 0x4d, 0x3e, 0xbd, 0x45, 0x4d, 0x30, 0x22, 0xeb, - 0x8d, 0x39, 0x86, 0x7d, 0xa5, 0x25, 0x25, 0xf1, 0x44, 0x51, 0xad, 0x19, 0x9f, 0xaa, 0x56, 0x75, - 0x5d, 0xb9, 0x9c, 0x22, 0xbf, 0x98, 0x22, 0x7f, 0x94, 0xb3, 0x8c, 0x3f, 0xb8, 0x69, 0x34, 0x46, - 0x56, 0x02, 0x7d, 0x0b, 0xef, 0x4b, 0xe3, 0xe0, 0x44, 0x48, 0x36, 0x65, 0x9c, 0x44, 0x93, 0x90, - 0x2a, 0xcd, 0x78, 0x7e, 0x7b, 0x6b, 0xa7, 0xe3, 0xf4, 0x1a, 0xb8, 0x6d, 0x31, 0xe7, 0x16, 0x72, - 0x74, 0x83, 0x40, 0x43, 0xd8, 0x37, 0x73, 0x3a, 0x11, 0x73, 0x2a, 0x25, 0x0b, 0x69, 0xab, 0xde, - 0x71, 0x7b, 0xcd, 0xc1, 0xa3, 0xad, 0x19, 0x7f, 0xcf, 0xc5, 0x0b, 0x3e, 0xcc, 0xc6, 0x32, 0x10, - 0x91, 0xc2, 0x4d, 0xc3, 0x3f, 0xb7, 0xf4, 0xd3, 0x6a, 0xa3, 0xe6, 0xd5, 0xbb, 0xbf, 0x57, 0x00, - 0xfd, 0xc4, 0xd9, 0xf5, 0x4a, 0x81, 0x2f, 0x01, 0x19, 0xf8, 0x48, 0x04, 0x57, 0x45, 0x1a, 0xb6, - 0x56, 0x5f, 0x2e, 0xde, 0x58, 0xe6, 0xbf, 0xb8, 0x45, 0xfc, 0xa3, 0x92, 0x4b, 0x75, 0xc1, 0xc6, - 0x1b, 0x14, 0xdf, 0x90, 0xdd, 0x6f, 0xc2, 0x2c, 0xc7, 0xab, 0x9c, 0x56, 0x1b, 0xae, 0x57, 0x3d, - 0xad, 0x36, 0x76, 0xbc, 0x9a, 0xb5, 0xef, 0x2f, 0x07, 0x1e, 0xd8, 0x85, 0x77, 0x4c, 0x78, 0x18, - 0x95, 0x06, 0x7a, 0xe0, 0x6a, 0x32, 0xcd, 0x47, 0xe3, 0x2e, 0xce, 0x8e, 0x68, 0x04, 0xf7, 0x6d, - 0x7d, 0xe5, 0x4d, 0xb2, 0xc6, 0xd1, 0x4f, 0x36, 0x74, 0xbf, 0x59, 0xb2, 0xf9, 0xb6, 0x0b, 0xcf, - 0xcc, 0x8e, 0xc5, 0x5e, 0x21, 0x50, 0x66, 0x7a, 0x06, 0xcd, 0x3c, 0x85, 0x1b, 0x45, 0xf7, 0x56, - 0x8a, 0x7b, 0x39, 0xbb, 0x90, 0xeb, 0x7a, 0xd0, 0x3c, 0x9f, 0xe9, 0xc5, 0xfd, 0xfd, 0x67, 0x05, - 0xee, 0x8d, 0x28, 0x0f, 0xcb, 0xc4, 0x9e, 0x82, 0x3b, 0x67, 0xc4, 0xce, 0xfc, 0x7f, 0x18, 0xdb, - 0x0c, 0xbd, 0xa9, 0xcc, 0x95, 0xd7, 0x2f, 0xf3, 0x8f, 0x5b, 0x92, 0x7f, 0xfc, 0x0a, 0xd1, 0x61, - 0x46, 0xb2, 0x9a, 0xcb, 0x06, 0xa0, 0xe7, 0x80, 0xe2, 0x59, 0xa4, 0x59, 0x12, 0xd1, 0xeb, 0x97, - 0xb6, 0xe4, 0x52, 0xf3, 0x9c, 0x15, 0x14, 0xc6, 0xa7, 0x56, 0xf7, 0x7e, 0x29, 0x53, 0x9a, 0xfb, - 0x4f, 0x05, 0xbc, 0x6c, 0xd4, 0x96, 0xec, 0x3c, 0x5e, 0xb4, 0xf3, 0xff, 0x4e, 0xd6, 0x5b, 0x8f, - 0x0b, 0x8f, 0x87, 0x80, 0xd6, 0x81, 0xa8, 0x05, 0x75, 0xca, 0xc9, 0x45, 0x44, 0xc3, 0xdc, 0xe8, - 0x06, 0x2e, 0x1e, 0x51, 0x67, 0xfd, 0x0b, 0x62, 0x6f, 0xe9, 0xb5, 0xff, 0xf8, 0x23, 0x68, 0x2e, - 0xef, 0x06, 0xd4, 0x80, 0xea, 0xf1, 0x78, 0x3c, 0xf4, 0xee, 0xa0, 0x3a, 0xb8, 0xe3, 0x1f, 0x46, - 0x9e, 0xf3, 0xdd, 0x21, 0xbc, 0x17, 0x88, 0x78, 0x5b, 0xec, 0x43, 0xe7, 0x79, 0xa3, 0x38, 0xff, - 0x56, 0x79, 0xf8, 0xf3, 0x00, 0x93, 0xd4, 0x3f, 0xcc, 0x50, 0x07, 0x49, 0x62, 0x9c, 0x8a, 0x09, - 0xbf, 0xa8, 0xe5, 0x9f, 0x50, 0x4f, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x04, 0x59, 0x29, 0xf6, - 0x75, 0x0a, 0x00, 0x00, + // 866 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x56, 0xdd, 0x6e, 0x1b, 0x45, + 0x14, 0xee, 0x7a, 0x1d, 0xdb, 0x3d, 0x69, 0x9c, 0xed, 0x50, 0xa9, 0xc6, 0x80, 0x64, 0x0c, 0xa2, + 0x56, 0x41, 0xeb, 0xe2, 0x0a, 0x24, 0xc4, 0x05, 0x84, 0xa4, 0x52, 0x13, 0x88, 0x62, 0xc6, 0x86, + 0x8b, 0x0a, 0xc9, 0x9a, 0xec, 0x4e, 0xcc, 0x28, 0xbb, 0x33, 0xab, 0x99, 0xb1, 0x9b, 0x7d, 0x25, + 0x9e, 0x81, 0x0b, 0x2e, 0xb9, 0xe0, 0x09, 0x78, 0x19, 0xd0, 0xee, 0xcc, 0x6e, 0xfc, 0xdb, 0x12, + 0x55, 0xe1, 0xa6, 0x77, 0xb3, 0xf6, 0xf7, 0x7d, 0x73, 0xce, 0x77, 0x7e, 0x34, 0xd0, 0x9b, 0x0f, + 0x24, 0x49, 0xfd, 0x40, 0xc4, 0xfd, 0x40, 0x48, 0xda, 0x27, 0x49, 0xd2, 0x4f, 0xa4, 0xb8, 0x4a, + 0x63, 0xc2, 0xfb, 0x81, 0xe0, 0x17, 0x6c, 0xea, 0x27, 0x52, 0x68, 0x81, 0x1e, 0x16, 0x48, 0x49, + 0x7d, 0x92, 0x24, 0x7e, 0x81, 0x6a, 0x3f, 0x5a, 0x91, 0x08, 0x44, 0x1c, 0x0b, 0xde, 0xe7, 0x54, + 0xf7, 0x49, 0x18, 0x4a, 0xaa, 0x94, 0x51, 0x68, 0x7f, 0xbc, 0x1d, 0x98, 0x08, 0xa9, 0x2d, 0xca, + 0x5f, 0x41, 0x69, 0x49, 0xb8, 0xca, 0xfe, 0xef, 0x33, 0xae, 0xa9, 0xcc, 0xd0, 0x8b, 0x71, 0xb5, + 0xbf, 0x7e, 0x3d, 0x3e, 0x14, 0x31, 0x61, 0x5c, 0x89, 0xe0, 0x72, 0x95, 0xfc, 0x64, 0x73, 0x48, + 0x8a, 0x4a, 0x46, 0xa2, 0xbe, 0x4e, 0x13, 0x1a, 0x4e, 0x62, 0xaa, 0x14, 0x99, 0x52, 0xc3, 0xe8, + 0xee, 0xc3, 0xde, 0x31, 0x3f, 0x17, 0x33, 0x1e, 0x1e, 0xe6, 0x42, 0xdd, 0x3f, 0x5c, 0x40, 0x07, + 0x51, 0x24, 0x02, 0xa2, 0x99, 0xe0, 0x23, 0x2d, 0x89, 0xa6, 0xd3, 0x14, 0x1d, 0x41, 0x35, 0xa3, + 0xb7, 0x9c, 0x8e, 0xd3, 0x6b, 0x0e, 0x9e, 0xf8, 0x5b, 0xdc, 0xf3, 0xd7, 0xa9, 0xfe, 0x38, 0x4d, + 0x28, 0xce, 0xd9, 0xe8, 0x12, 0x76, 0x03, 0xc1, 0x83, 0x99, 0x94, 0x94, 0x07, 0x69, 0xab, 0xd2, + 0x71, 0x7a, 0xbb, 0x83, 0xe3, 0x9b, 0x88, 0xad, 0xff, 0x74, 0x78, 0x2d, 0x88, 0x17, 0xd5, 0xd1, + 0x04, 0xea, 0x92, 0x5e, 0x48, 0xaa, 0x7e, 0x6d, 0xb9, 0xf9, 0x45, 0xcf, 0xde, 0xec, 0x22, 0x6c, + 0xc4, 0x70, 0xa1, 0xda, 0xfe, 0x02, 0x3e, 0x78, 0x65, 0x38, 0xe8, 0x01, 0xec, 0xcc, 0x49, 0x34, + 0x33, 0xae, 0xed, 0x61, 0xf3, 0xd1, 0xfe, 0x1c, 0xde, 0xdd, 0x2a, 0xbe, 0x99, 0xd2, 0xfd, 0x0c, + 0xaa, 0x99, 0x8b, 0x08, 0xa0, 0x76, 0x10, 0xbd, 0x24, 0xa9, 0xf2, 0xee, 0x64, 0x67, 0x4c, 0x78, + 0x28, 0x62, 0xcf, 0x41, 0xf7, 0xa0, 0xf1, 0xec, 0x2a, 0xeb, 0x0e, 0x12, 0x79, 0x95, 0xee, 0xdf, + 0x2e, 0x34, 0x31, 0x0d, 0x28, 0x9b, 0x53, 0x69, 0xaa, 0x8a, 0xbe, 0x01, 0xc8, 0x7a, 0x68, 0x22, + 0x09, 0x9f, 0x1a, 0xed, 0xdd, 0x41, 0x67, 0xd1, 0x0e, 0xd3, 0x29, 0x3e, 0xa7, 0xda, 0x1f, 0x0a, + 0xa9, 0x71, 0x86, 0xc3, 0x77, 0x93, 0xe2, 0x88, 0xbe, 0x82, 0x5a, 0xc4, 0x94, 0xa6, 0xdc, 0x16, + 0xed, 0xc3, 0x2d, 0xe4, 0xe3, 0xe1, 0x99, 0x3c, 0xca, 0xfb, 0x13, 0x5b, 0x02, 0xfa, 0x05, 0xde, + 0x21, 0x65, 0xbe, 0x13, 0x65, 0x13, 0xb6, 0x35, 0xf9, 0xf4, 0x06, 0x35, 0xc1, 0x88, 0xac, 0x37, + 0xe6, 0x18, 0xf6, 0x95, 0x96, 0x94, 0xc4, 0x13, 0x45, 0xb5, 0x66, 0x7c, 0xaa, 0x5a, 0xd5, 0x75, + 0xe5, 0x72, 0x8a, 0xfc, 0x62, 0x8a, 0xfc, 0x51, 0xce, 0x32, 0xfe, 0xe0, 0xa6, 0xd1, 0x18, 0x59, + 0x09, 0xf4, 0x2d, 0xbc, 0x2f, 0x8d, 0x83, 0x13, 0x21, 0xd9, 0x94, 0x71, 0x12, 0x4d, 0x42, 0xaa, + 0x34, 0xe3, 0xf9, 0xed, 0xad, 0x9d, 0x8e, 0xd3, 0x6b, 0xe0, 0xb6, 0xc5, 0x9c, 0x59, 0xc8, 0xd1, + 0x35, 0x02, 0x0d, 0x61, 0xdf, 0xcc, 0xe9, 0x44, 0xcc, 0xa9, 0x94, 0x2c, 0xa4, 0xad, 0x7a, 0xc7, + 0xed, 0x35, 0x07, 0x8f, 0xb6, 0x66, 0xfc, 0x3d, 0x17, 0x2f, 0xf9, 0x30, 0x1b, 0xcb, 0x40, 0x44, + 0x0a, 0x37, 0x0d, 0xff, 0xcc, 0xd2, 0x4f, 0xaa, 0x8d, 0x9a, 0x57, 0xef, 0xfe, 0x5e, 0x01, 0xf4, + 0x13, 0x67, 0x57, 0x2b, 0x05, 0xbe, 0x00, 0x64, 0xe0, 0x23, 0x11, 0x5c, 0x16, 0x69, 0xd8, 0x5a, + 0x7d, 0xb9, 0x78, 0x63, 0x99, 0xff, 0xe2, 0x16, 0xf1, 0x8f, 0x4a, 0x2e, 0xd5, 0x05, 0x1b, 0x6f, + 0x50, 0xbc, 0x25, 0xbb, 0x6f, 0xc3, 0x2c, 0xc7, 0xab, 0x9c, 0x54, 0x1b, 0xae, 0x57, 0x3d, 0xa9, + 0x36, 0x76, 0xbc, 0x9a, 0xb5, 0xef, 0x2f, 0x07, 0x1e, 0xd8, 0x85, 0xf7, 0x9c, 0xf0, 0x30, 0x2a, + 0x0d, 0xf4, 0xc0, 0xd5, 0x64, 0x9a, 0x8f, 0xc6, 0x5d, 0x9c, 0x1d, 0xd1, 0x08, 0xee, 0xdb, 0xfa, + 0xca, 0xeb, 0x64, 0x8d, 0xa3, 0x9f, 0x6c, 0xe8, 0x7e, 0xb3, 0x64, 0xf3, 0x6d, 0x17, 0x9e, 0x9a, + 0x1d, 0x8b, 0xbd, 0x42, 0xa0, 0xcc, 0xf4, 0x14, 0x9a, 0x79, 0x0a, 0xd7, 0x8a, 0xee, 0x8d, 0x14, + 0xf7, 0x72, 0x76, 0x21, 0xd7, 0xf5, 0xa0, 0x79, 0x36, 0xd3, 0x8b, 0xfb, 0xfb, 0xcf, 0x0a, 0xdc, + 0x1b, 0x51, 0x1e, 0x96, 0x89, 0x3d, 0x05, 0x77, 0xce, 0x88, 0x9d, 0xf9, 0xff, 0x30, 0xb6, 0x19, + 0x7a, 0x53, 0x99, 0x2b, 0x6f, 0x5e, 0xe6, 0x1f, 0xb7, 0x24, 0xff, 0xf8, 0x35, 0xa2, 0xc3, 0x8c, + 0x64, 0x35, 0x97, 0x0d, 0x40, 0x2f, 0x00, 0xc5, 0xb3, 0x48, 0xb3, 0x24, 0xa2, 0x57, 0xaf, 0x6c, + 0xc9, 0xa5, 0xe6, 0x39, 0x2d, 0x28, 0x8c, 0x4f, 0xad, 0xee, 0xfd, 0x52, 0xa6, 0x34, 0xf7, 0x9f, + 0x0a, 0x78, 0xd9, 0xa8, 0x2d, 0xd9, 0xb9, 0x79, 0xd0, 0x9c, 0xff, 0x63, 0xd0, 0xde, 0xbe, 0x0a, + 0x0c, 0x01, 0xad, 0x03, 0x51, 0x0b, 0xea, 0x94, 0x93, 0xf3, 0x88, 0x86, 0xb9, 0xef, 0x0d, 0x5c, + 0x7c, 0xa2, 0xce, 0xfa, 0xfb, 0x62, 0x6f, 0xe9, 0x51, 0xf0, 0xf8, 0x23, 0x68, 0x2e, 0x6f, 0x0e, + 0xd4, 0x80, 0xea, 0xf3, 0xf1, 0x78, 0xe8, 0xdd, 0x41, 0x75, 0x70, 0xc7, 0x3f, 0x8c, 0x3c, 0xe7, + 0xbb, 0x43, 0x78, 0x2f, 0x10, 0xf1, 0xb6, 0xd8, 0x87, 0xce, 0x8b, 0x46, 0x71, 0xfe, 0xad, 0xf2, + 0xf0, 0xe7, 0x01, 0x26, 0xa9, 0x7f, 0x98, 0xa1, 0x0e, 0x92, 0xc4, 0x38, 0x15, 0x13, 0x7e, 0x5e, + 0xcb, 0x1f, 0x58, 0x4f, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x97, 0xb5, 0xcf, 0xbd, 0x93, 0x0a, + 0x00, 0x00, } diff --git a/app/proxyman/config.proto b/app/proxyman/config.proto index 8444f26cd..7e937729b 100644 --- a/app/proxyman/config.proto +++ b/app/proxyman/config.proto @@ -91,7 +91,7 @@ message SenderConfig { message UnixSenderConfig { - v2ray.core.internet.domainsocket.DomainSocketSettings via = 1; + v2ray.core.internet.domainsocket.DomainSocketSettings domainSockSettings = 1; v2ray.core.transport.internet.StreamConfig stream_settings = 2; v2ray.core.transport.internet.ProxyConfig proxy_settings = 3; MultiplexingConfig multiplex_settings = 4; diff --git a/app/proxyman/outbound/unix.go b/app/proxyman/outbound/unix.go index d48d79c7d..d41a74630 100644 --- a/app/proxyman/outbound/unix.go +++ b/app/proxyman/outbound/unix.go @@ -112,7 +112,7 @@ func (h *UnixHandler) Dial(ctx context.Context, dest net.Destination) (internet. } } - return domainsocket.DialDS(ctx, h.senderSettings.GetVia().GetPath()) + return domainsocket.DialDS(ctx, h.senderSettings.GetDomainSockSettings().GetPath()) } // GetOutbound implements proxy.GetOutbound.