From d7167f552d70bcbfebfe7b039c09b869761c3d86 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Tue, 7 Feb 2017 21:28:21 +0100 Subject: [PATCH] remove allowPassiveConnection from config --- app/proxyman/config.pb.go | 120 +++++++++++++++++++------------------- tools/conf/v2ray.go | 7 +-- 2 files changed, 61 insertions(+), 66 deletions(-) diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go index 5f6f1338..b4ab55af 100644 --- a/app/proxyman/config.pb.go +++ b/app/proxyman/config.pb.go @@ -444,64 +444,64 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/app/proxyman/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 929 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0xd1, 0x6e, 0x23, 0x35, - 0x14, 0xdd, 0x4c, 0xba, 0x69, 0x7b, 0x93, 0x4e, 0x67, 0xcd, 0xb2, 0x1b, 0x02, 0x88, 0x12, 0x21, - 0xb6, 0x62, 0xd1, 0x64, 0xc9, 0x0a, 0x01, 0x4f, 0x4b, 0x49, 0x8b, 0xa8, 0xa0, 0xdb, 0xe0, 0x54, - 0x3c, 0x20, 0xa4, 0xe0, 0xce, 0x78, 0xb3, 0x16, 0x33, 0xb6, 0x65, 0x3b, 0x6d, 0xe6, 0x8d, 0x6f, - 0xe1, 0x91, 0x6f, 0xe0, 0x81, 0x5f, 0xe0, 0x3f, 0xf8, 0x08, 0x34, 0x1e, 0x4f, 0x92, 0x6d, 0x32, - 0x94, 0x52, 0xed, 0x4b, 0x65, 0x8f, 0xcf, 0x3d, 0xb6, 0xcf, 0x39, 0xd7, 0x0d, 0xec, 0x5f, 0xf4, - 0x15, 0xc9, 0xc2, 0x48, 0xa4, 0xbd, 0x48, 0x28, 0xda, 0x23, 0x52, 0xf6, 0xa4, 0x12, 0xb3, 0x2c, - 0x25, 0xbc, 0x17, 0x09, 0xfe, 0x82, 0x4d, 0x42, 0xa9, 0x84, 0x11, 0xe8, 0x61, 0x89, 0x54, 0x34, - 0x24, 0x52, 0x86, 0x25, 0xaa, 0xf3, 0xe4, 0x0a, 0x45, 0x24, 0xd2, 0x54, 0xf0, 0x9e, 0xa6, 0x8a, - 0x91, 0xa4, 0x67, 0x32, 0x49, 0xe3, 0x71, 0x4a, 0xb5, 0x26, 0x13, 0x5a, 0x50, 0x75, 0x1e, 0xad, - 0xaf, 0xe0, 0xd4, 0xf4, 0x48, 0x1c, 0x2b, 0xaa, 0xb5, 0x03, 0x3e, 0xae, 0x06, 0xc6, 0x54, 0x1b, - 0xc6, 0x89, 0x61, 0x82, 0x3b, 0xf0, 0x07, 0xd5, 0x60, 0x29, 0x94, 0x71, 0xa8, 0xf0, 0x0a, 0xca, - 0x28, 0xc2, 0x75, 0xbe, 0xde, 0x63, 0xdc, 0x50, 0x95, 0xa3, 0x97, 0xaf, 0xdd, 0xdd, 0x85, 0x9d, - 0x63, 0x7e, 0x2e, 0xa6, 0x3c, 0x1e, 0xd8, 0xcf, 0xdd, 0x3f, 0xeb, 0x80, 0x0e, 0x92, 0x44, 0x44, - 0x76, 0xef, 0x91, 0x51, 0xc4, 0xd0, 0x49, 0x86, 0x0e, 0x61, 0x23, 0xbf, 0x6a, 0xbb, 0xb6, 0x57, - 0xdb, 0xf7, 0xfb, 0x4f, 0xc2, 0x0a, 0xb5, 0xc2, 0xd5, 0xd2, 0xf0, 0x2c, 0x93, 0x14, 0xdb, 0x6a, - 0xf4, 0x0b, 0x34, 0x23, 0xc1, 0xa3, 0xa9, 0x52, 0x94, 0x47, 0x59, 0xdb, 0xdb, 0xab, 0xed, 0x37, - 0xfb, 0xc7, 0x37, 0x21, 0x5b, 0xfd, 0x34, 0x58, 0x10, 0xe2, 0x65, 0x76, 0x34, 0x86, 0x4d, 0x45, - 0x5f, 0x28, 0xaa, 0x5f, 0xb6, 0xeb, 0x76, 0xa3, 0xa3, 0xdb, 0x6d, 0x84, 0x0b, 0x32, 0x5c, 0xb2, - 0x76, 0x3e, 0x85, 0x77, 0xff, 0xf5, 0x38, 0xe8, 0x3e, 0xdc, 0xbd, 0x20, 0xc9, 0xb4, 0x50, 0x6d, - 0x07, 0x17, 0x93, 0xce, 0x27, 0xf0, 0x56, 0x25, 0xf9, 0xfa, 0x92, 0xee, 0xc7, 0xb0, 0x91, 0xab, - 0x88, 0x00, 0x1a, 0x07, 0xc9, 0x25, 0xc9, 0x74, 0x70, 0x27, 0x1f, 0x63, 0xc2, 0x63, 0x91, 0x06, - 0x35, 0xd4, 0x82, 0xad, 0xa3, 0x59, 0x6e, 0x2f, 0x49, 0x02, 0xaf, 0xfb, 0x47, 0x1d, 0x7c, 0x4c, - 0x23, 0xca, 0x2e, 0xa8, 0x2a, 0x5c, 0x45, 0xcf, 0x00, 0xf2, 0x10, 0x8c, 0x15, 0xe1, 0x93, 0x82, - 0xbb, 0xd9, 0xdf, 0x5b, 0x96, 0xa3, 0x48, 0x53, 0xc8, 0xa9, 0x09, 0x87, 0x42, 0x19, 0x9c, 0xe3, - 0xf0, 0xb6, 0x2c, 0x87, 0xe8, 0x0b, 0x68, 0x24, 0x4c, 0x1b, 0xca, 0x9d, 0x69, 0xef, 0x57, 0x14, - 0x1f, 0x0f, 0x4f, 0xd5, 0xa1, 0x48, 0x09, 0xe3, 0xd8, 0x15, 0xa0, 0x9f, 0xe0, 0x0d, 0x32, 0xbf, - 0xef, 0x58, 0xbb, 0x0b, 0x3b, 0x4f, 0x1e, 0xdf, 0xc0, 0x13, 0x8c, 0xc8, 0x6a, 0x30, 0xcf, 0x60, - 0x57, 0x1b, 0x45, 0x49, 0x3a, 0xd6, 0xd4, 0x18, 0xc6, 0x27, 0xba, 0xbd, 0xb1, 0xca, 0x3c, 0x6f, - 0x83, 0xb0, 0x6c, 0x83, 0x70, 0x64, 0xab, 0x0a, 0x7d, 0xb0, 0x5f, 0x70, 0x8c, 0x1c, 0x05, 0xfa, - 0x12, 0xde, 0x51, 0x85, 0x82, 0x63, 0xa1, 0xd8, 0x84, 0x71, 0x92, 0x8c, 0x97, 0x5a, 0xb2, 0x7d, - 0x77, 0xaf, 0xb6, 0xbf, 0x85, 0x3b, 0x0e, 0x73, 0xea, 0x20, 0x87, 0x0b, 0x04, 0xfa, 0x1c, 0xda, - 0xf9, 0x69, 0x2f, 0xc7, 0x92, 0x68, 0x9d, 0xf3, 0x44, 0x82, 0x73, 0x1a, 0xd9, 0xea, 0x86, 0xad, - 0x7e, 0x60, 0xd7, 0x87, 0xc5, 0xf2, 0x60, 0xbe, 0xda, 0xfd, 0xcd, 0x83, 0xfb, 0xae, 0x27, 0xbf, - 0x21, 0x3c, 0x4e, 0xe6, 0x26, 0x06, 0x50, 0x37, 0x64, 0x62, 0xdd, 0xdb, 0xc6, 0xf9, 0x10, 0x8d, - 0xe0, 0x9e, 0x3b, 0x82, 0x5a, 0x5c, 0xbf, 0x30, 0xe8, 0xc3, 0x35, 0x06, 0x15, 0x6f, 0x96, 0x6d, - 0xc8, 0xf8, 0xa4, 0x78, 0xb2, 0x70, 0x50, 0x12, 0xcc, 0xef, 0x7e, 0x02, 0xbe, 0x35, 0x61, 0xc1, - 0x58, 0xbf, 0x11, 0xe3, 0x8e, 0xad, 0x9e, 0xd3, 0x9d, 0xc1, 0xbd, 0x98, 0x69, 0x49, 0x4c, 0xf4, - 0xf2, 0xaa, 0x45, 0x8f, 0x2a, 0xcd, 0x3f, 0x74, 0x15, 0xce, 0x9e, 0xa0, 0x64, 0x28, 0x59, 0xbb, - 0x01, 0xf8, 0xa7, 0x53, 0xb3, 0xfc, 0x70, 0xfd, 0x5d, 0x83, 0xd6, 0x88, 0xf2, 0x78, 0x2e, 0xd7, - 0x53, 0xa8, 0x5f, 0x30, 0xe2, 0xc2, 0xfe, 0x1f, 0xf2, 0x9a, 0xa3, 0xd7, 0xc5, 0xc9, 0xbb, 0x7d, - 0x9c, 0xbe, 0xaf, 0x90, 0xf4, 0xa3, 0x6b, 0x48, 0x87, 0x79, 0x91, 0xe3, 0x7c, 0x55, 0xd6, 0xee, - 0x5f, 0x1e, 0xbc, 0x59, 0x2a, 0x70, 0x5d, 0x4c, 0x4e, 0x61, 0x57, 0x5b, 0x65, 0xfe, 0x6f, 0x48, - 0xfc, 0xa2, 0xfc, 0x75, 0x45, 0xe4, 0x01, 0x34, 0xe8, 0x4c, 0x32, 0x45, 0x6d, 0x2e, 0xea, 0xd8, - 0xcd, 0x50, 0x1b, 0x36, 0x73, 0x12, 0xca, 0x8d, 0x6d, 0xb8, 0x6d, 0x5c, 0x4e, 0xd7, 0x87, 0xaa, - 0x71, 0xdb, 0x50, 0x85, 0x80, 0x4e, 0xa6, 0x89, 0x61, 0x32, 0xa1, 0x33, 0xc6, 0x27, 0x4e, 0xcf, - 0x36, 0x6c, 0x52, 0x4e, 0xce, 0x13, 0x1a, 0x5b, 0x4d, 0xb7, 0x70, 0x39, 0xed, 0xfe, 0x0c, 0xfe, - 0xab, 0x9c, 0xe8, 0x39, 0xb4, 0xd2, 0xe9, 0x6c, 0x71, 0xa4, 0xda, 0x35, 0x8f, 0xdc, 0xea, 0x76, - 0xb8, 0x99, 0x4e, 0x67, 0xf3, 0x13, 0xfd, 0xea, 0xe5, 0xa1, 0xd6, 0x9a, 0x09, 0xfe, 0xb5, 0x22, - 0x29, 0x45, 0x3e, 0x78, 0x2c, 0x76, 0xff, 0x1c, 0x3c, 0x16, 0xa3, 0xef, 0x0a, 0x89, 0x08, 0x8f, - 0xad, 0xa5, 0x7e, 0xbf, 0x5f, 0xb9, 0xd7, 0x32, 0x4f, 0x68, 0xff, 0x0e, 0x8a, 0x4a, 0x5c, 0x52, - 0xa0, 0xcf, 0xa0, 0x61, 0x88, 0x9a, 0x50, 0xe3, 0xfc, 0x7c, 0xaf, 0xa2, 0x6b, 0x8e, 0x78, 0x2c, - 0x05, 0xe3, 0x06, 0x3b, 0x78, 0xae, 0x91, 0x24, 0x59, 0x22, 0x48, 0x6c, 0x2d, 0x6c, 0xe1, 0x72, - 0xda, 0x7d, 0x06, 0xad, 0xe5, 0xbd, 0x90, 0x0f, 0xe0, 0x0e, 0xf2, 0x9c, 0x5e, 0x06, 0x77, 0xd0, - 0x2e, 0x34, 0xdd, 0xfc, 0x5b, 0x4a, 0x65, 0x50, 0x5b, 0x02, 0x1c, 0xf1, 0x38, 0xf0, 0xbe, 0x1a, - 0xc0, 0xdb, 0x91, 0x48, 0xab, 0x6e, 0x35, 0xac, 0xfd, 0xb8, 0x55, 0x8e, 0x7f, 0xf7, 0x1e, 0xfe, - 0xd0, 0xc7, 0x24, 0x0b, 0x07, 0x39, 0xea, 0x40, 0xca, 0xa2, 0x7f, 0x52, 0xc2, 0xcf, 0x1b, 0xf6, - 0xd7, 0xce, 0xd3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x78, 0xee, 0xf7, 0xe3, 0x10, 0x0a, 0x00, - 0x00, + // 931 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0x71, 0x6f, 0x1b, 0x35, + 0x1c, 0xdd, 0x5d, 0xba, 0xb4, 0xfd, 0x25, 0xbd, 0xde, 0xcc, 0xd8, 0x42, 0x00, 0x51, 0x22, 0xc4, + 0x2a, 0x86, 0x2e, 0x23, 0x13, 0x42, 0x48, 0x48, 0xa3, 0x4b, 0x8b, 0xa8, 0xa0, 0x6b, 0x70, 0x2a, + 0xfe, 0x40, 0x48, 0xc1, 0xbd, 0xf3, 0x32, 0x8b, 0x3b, 0xfb, 0x64, 0x3b, 0x6d, 0xf2, 0x1f, 0x9f, + 0x85, 0x3f, 0xf9, 0x14, 0x7c, 0x05, 0xbe, 0x07, 0x1f, 0x02, 0xd9, 0xe7, 0x4b, 0xb2, 0x26, 0x47, + 0x29, 0xd5, 0xfe, 0xa9, 0xce, 0xd7, 0xf7, 0x9e, 0xed, 0xf7, 0xde, 0xef, 0x5a, 0xd8, 0xbf, 0xe8, + 0x49, 0x32, 0x8b, 0x62, 0x91, 0x75, 0x63, 0x21, 0x69, 0x97, 0xe4, 0x79, 0x37, 0x97, 0x62, 0x3a, + 0xcb, 0x08, 0xef, 0xc6, 0x82, 0xbf, 0x64, 0xe3, 0x28, 0x97, 0x42, 0x0b, 0xf4, 0xb0, 0x44, 0x4a, + 0x1a, 0x91, 0x3c, 0x8f, 0x4a, 0x54, 0xfb, 0xc9, 0x15, 0x89, 0x58, 0x64, 0x99, 0xe0, 0x5d, 0x45, + 0x25, 0x23, 0x69, 0x57, 0xcf, 0x72, 0x9a, 0x8c, 0x32, 0xaa, 0x14, 0x19, 0xd3, 0x42, 0xaa, 0xfd, + 0x68, 0x3d, 0x83, 0x53, 0xdd, 0x25, 0x49, 0x22, 0xa9, 0x52, 0x0e, 0xf8, 0xb8, 0x1a, 0x98, 0x50, + 0xa5, 0x19, 0x27, 0x9a, 0x09, 0xee, 0xc0, 0x1f, 0x55, 0x83, 0x73, 0x21, 0xb5, 0x43, 0x45, 0x57, + 0x50, 0x5a, 0x12, 0xae, 0xcc, 0xef, 0xbb, 0x8c, 0x6b, 0x2a, 0x0d, 0x7a, 0xf9, 0xda, 0x9d, 0x5d, + 0xd8, 0x39, 0xe6, 0xe7, 0x62, 0xc2, 0x93, 0xbe, 0x7d, 0xdd, 0xf9, 0xb3, 0x06, 0xe8, 0x20, 0x4d, + 0x45, 0x6c, 0xf7, 0x1e, 0x6a, 0x49, 0x34, 0x1d, 0xcf, 0xd0, 0x21, 0x6c, 0x98, 0xab, 0xb6, 0xbc, + 0x3d, 0x6f, 0x3f, 0xe8, 0x3d, 0x89, 0x2a, 0xdc, 0x8a, 0x56, 0xa9, 0xd1, 0xd9, 0x2c, 0xa7, 0xd8, + 0xb2, 0xd1, 0xaf, 0xd0, 0x88, 0x05, 0x8f, 0x27, 0x52, 0x52, 0x1e, 0xcf, 0x5a, 0xfe, 0x9e, 0xb7, + 0xdf, 0xe8, 0x1d, 0xdf, 0x44, 0x6c, 0xf5, 0x55, 0x7f, 0x21, 0x88, 0x97, 0xd5, 0xd1, 0x08, 0x36, + 0x25, 0x7d, 0x29, 0xa9, 0x7a, 0xd5, 0xaa, 0xd9, 0x8d, 0x8e, 0x6e, 0xb7, 0x11, 0x2e, 0xc4, 0x70, + 0xa9, 0xda, 0xfe, 0x1c, 0xde, 0xff, 0xd7, 0xe3, 0xa0, 0xfb, 0x70, 0xf7, 0x82, 0xa4, 0x93, 0xc2, + 0xb5, 0x1d, 0x5c, 0x2c, 0xda, 0x9f, 0xc1, 0x3b, 0x95, 0xe2, 0xeb, 0x29, 0x9d, 0x4f, 0x61, 0xc3, + 0xb8, 0x88, 0x00, 0xea, 0x07, 0xe9, 0x25, 0x99, 0xa9, 0xf0, 0x8e, 0x79, 0xc6, 0x84, 0x27, 0x22, + 0x0b, 0x3d, 0xd4, 0x84, 0xad, 0xa3, 0xa9, 0x89, 0x97, 0xa4, 0xa1, 0x6f, 0x22, 0x0c, 0x30, 0x8d, + 0x29, 0xbb, 0xa0, 0xb2, 0x48, 0x15, 0x3d, 0x03, 0x30, 0x25, 0x18, 0x49, 0xc2, 0xc7, 0x85, 0x76, + 0xa3, 0xb7, 0xb7, 0x6c, 0x47, 0xd1, 0xa6, 0x88, 0x53, 0x1d, 0x0d, 0x84, 0xd4, 0xd8, 0xe0, 0xf0, + 0x76, 0x5e, 0x3e, 0xa2, 0x2f, 0xa1, 0x9e, 0x32, 0xa5, 0x29, 0x77, 0xa1, 0x7d, 0x58, 0x41, 0x3e, + 0x1e, 0x9c, 0xca, 0x43, 0x91, 0x11, 0xc6, 0xb1, 0x23, 0xa0, 0x9f, 0xe1, 0x2d, 0x32, 0xbf, 0xef, + 0x48, 0xb9, 0x0b, 0xbb, 0x4c, 0x1e, 0xdf, 0x20, 0x13, 0x8c, 0xc8, 0x6a, 0x31, 0xcf, 0x60, 0x57, + 0x69, 0x49, 0x49, 0x36, 0x52, 0x54, 0x6b, 0xc6, 0xc7, 0xaa, 0xb5, 0xb1, 0xaa, 0x3c, 0x1f, 0x83, + 0xa8, 0x1c, 0x83, 0x68, 0x68, 0x59, 0x85, 0x3f, 0x38, 0x28, 0x34, 0x86, 0x4e, 0x02, 0x7d, 0x0d, + 0xef, 0xc9, 0xc2, 0xc1, 0x91, 0x90, 0x6c, 0xcc, 0x38, 0x49, 0x47, 0x4b, 0x23, 0xd9, 0xba, 0xbb, + 0xe7, 0xed, 0x6f, 0xe1, 0xb6, 0xc3, 0x9c, 0x3a, 0xc8, 0xe1, 0x02, 0x81, 0xbe, 0x82, 0x96, 0x39, + 0xed, 0xe5, 0x28, 0x27, 0x4a, 0x19, 0x9d, 0x58, 0x70, 0x4e, 0x63, 0xcb, 0xae, 0x1b, 0xf6, 0x73, + 0xbf, 0xe5, 0xe1, 0x07, 0x16, 0x33, 0x28, 0x20, 0xfd, 0x39, 0xa2, 0xf3, 0xbb, 0x0f, 0xf7, 0xdd, + 0x5c, 0x7e, 0x4b, 0x78, 0x92, 0xce, 0x83, 0x0c, 0xa1, 0xa6, 0xc9, 0xd8, 0x26, 0xb8, 0x8d, 0xcd, + 0x23, 0x1a, 0xc2, 0x3d, 0x77, 0x0c, 0xb9, 0xb0, 0xa0, 0x08, 0xe9, 0xe3, 0x35, 0x21, 0x15, 0xdf, + 0x2d, 0x3b, 0x94, 0xc9, 0x49, 0xf1, 0xd9, 0xc2, 0x61, 0x29, 0x30, 0xbf, 0xff, 0x09, 0x04, 0x36, + 0x88, 0x85, 0x62, 0xed, 0x46, 0x8a, 0x3b, 0x96, 0x3d, 0x97, 0x3b, 0x83, 0x7b, 0x09, 0x53, 0x39, + 0xd1, 0xf1, 0xab, 0xab, 0x31, 0x3d, 0xaa, 0x2c, 0xc0, 0xa1, 0x63, 0xb8, 0x88, 0xc2, 0x52, 0xa1, + 0x54, 0xed, 0x84, 0x10, 0x9c, 0x4e, 0xf4, 0xf2, 0xc7, 0xeb, 0x6f, 0x0f, 0x9a, 0x43, 0xca, 0x93, + 0xb9, 0x5d, 0x4f, 0xa1, 0x76, 0xc1, 0x88, 0x2b, 0xfc, 0x7f, 0xe8, 0xac, 0x41, 0xaf, 0xab, 0x94, + 0x7f, 0xfb, 0x4a, 0xfd, 0x50, 0x61, 0xe9, 0x27, 0xd7, 0x88, 0x0e, 0x0c, 0xc9, 0x69, 0xbe, 0x6e, + 0x6b, 0xe7, 0x2f, 0x1f, 0xde, 0x2e, 0x1d, 0xb8, 0xae, 0x26, 0xa7, 0xb0, 0xab, 0xac, 0x33, 0xff, + 0xb7, 0x24, 0x41, 0x41, 0x7f, 0x53, 0x15, 0x79, 0x00, 0x75, 0x3a, 0xcd, 0x99, 0xa4, 0xb6, 0x17, + 0x35, 0xec, 0x56, 0xa8, 0x05, 0x9b, 0x46, 0x84, 0x72, 0x6d, 0x87, 0x6e, 0x1b, 0x97, 0xcb, 0xf5, + 0xa5, 0xaa, 0xdf, 0xb6, 0x54, 0x11, 0xa0, 0x93, 0x49, 0xaa, 0x59, 0x9e, 0xd2, 0x29, 0xe3, 0x63, + 0xe7, 0x67, 0x0b, 0x36, 0x29, 0x27, 0xe7, 0x29, 0x4d, 0xac, 0xa7, 0x5b, 0xb8, 0x5c, 0x76, 0x7e, + 0x81, 0xe0, 0x75, 0x4d, 0xf4, 0x02, 0x9a, 0xd9, 0x64, 0xba, 0x38, 0x92, 0x77, 0xcd, 0x87, 0x6e, + 0x75, 0x3b, 0xdc, 0xc8, 0x26, 0xd3, 0xf9, 0x89, 0x7e, 0xf3, 0x4d, 0xa9, 0x95, 0x62, 0x82, 0x7f, + 0x23, 0x49, 0x46, 0x51, 0x00, 0x3e, 0x4b, 0xdc, 0x1f, 0x08, 0x9f, 0x25, 0xe8, 0xfb, 0xc2, 0x22, + 0xc2, 0x13, 0x1b, 0x69, 0xd0, 0xeb, 0x55, 0xee, 0xb5, 0xac, 0x13, 0xd9, 0x9f, 0xfd, 0x82, 0x89, + 0x4b, 0x09, 0xf4, 0x05, 0xd4, 0x35, 0x91, 0x63, 0xaa, 0x5d, 0x9e, 0x1f, 0x54, 0x4c, 0xcd, 0x11, + 0x4f, 0x72, 0xc1, 0xb8, 0xc6, 0x0e, 0x6e, 0x3c, 0xca, 0xc9, 0x2c, 0x15, 0x24, 0xb1, 0x11, 0x36, + 0x71, 0xb9, 0xec, 0x3c, 0x83, 0xe6, 0xf2, 0x5e, 0x28, 0x00, 0x70, 0x07, 0x79, 0x41, 0x2f, 0xc3, + 0x3b, 0x68, 0x17, 0x1a, 0x6e, 0xfd, 0x1d, 0xa5, 0x79, 0xe8, 0x2d, 0x01, 0x8e, 0x78, 0x12, 0xfa, + 0xcf, 0xfb, 0xf0, 0x6e, 0x2c, 0xb2, 0xaa, 0x5b, 0x0d, 0xbc, 0x9f, 0xb6, 0xca, 0xe7, 0x3f, 0xfc, + 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, } diff --git a/tools/conf/v2ray.go b/tools/conf/v2ray.go index 55f9bdfa..ebd80ada 100644 --- a/tools/conf/v2ray.go +++ b/tools/conf/v2ray.go @@ -37,7 +37,6 @@ type InboundConnectionConfig struct { Protocol string `json:"protocol"` StreamSetting *StreamConfig `json:"streamSettings"` Settings json.RawMessage `json:"settings"` - AllowPassive bool `json:"allowPassive"` Tag string `json:"tag"` } @@ -47,7 +46,6 @@ func (v *InboundConnectionConfig) Build() (*proxyman.InboundHandlerConfig, error From: uint32(v.Port), To: uint32(v.Port), }, - AllowPassiveConnection: v.AllowPassive, } if v.Listen != nil { if v.Listen.Family().IsDomain() { @@ -173,13 +171,10 @@ type InboundDetourConfig struct { Tag string `json:"tag"` Allocation *InboundDetourAllocationConfig `json:"allocate"` StreamSetting *StreamConfig `json:"streamSettings"` - AllowPassive bool `json:"allowPassive"` } func (v *InboundDetourConfig) Build() (*proxyman.InboundHandlerConfig, error) { - receiverSettings := &proxyman.ReceiverConfig{ - AllowPassiveConnection: v.AllowPassive, - } + receiverSettings := &proxyman.ReceiverConfig{} if v.PortRange == nil { return nil, errors.New("Config: Port range not specified in InboundDetour.")