소스 검색

rename ws to websocket

Darien Raymond 8 년 전
부모
커밋
7dc7937443
45개의 변경된 파일548개의 추가작업 그리고 507개의 파일을 삭제
  1. 6 5
      app/dispatcher/config.pb.go
  2. 20 18
      app/dns/config.pb.go
  3. 34 33
      app/router/config.pb.go
  4. 22 21
      app/web/config.pb.go
  5. 6 5
      common/net/address.pb.go
  6. 16 15
      common/net/destination.pb.go
  7. 5 4
      common/net/network.pb.go
  8. 6 4
      common/net/port.pb.go
  9. 6 5
      common/protocol/headers.pb.go
  10. 17 16
      common/protocol/server_spec.pb.go
  11. 15 14
      common/protocol/user.pb.go
  12. 5 4
      common/serial/typed_message.pb.go
  13. 47 46
      config.pb.go
  14. 1 1
      main/distro/all/all.go
  15. 5 4
      proxy/blackhole/config.pb.go
  16. 20 19
      proxy/dokodemo/config.pb.go
  17. 5 4
      proxy/freedom/config.pb.go
  18. 5 4
      proxy/http/config.pb.go
  19. 29 28
      proxy/shadowsocks/config.pb.go
  20. 30 29
      proxy/socks/config.pb.go
  21. 17 16
      proxy/vmess/account.pb.go
  22. 20 19
      proxy/vmess/inbound/config.pb.go
  23. 15 14
      proxy/vmess/outbound/config.pb.go
  24. 3 3
      tools/conf/transport_internet.go
  25. 5 4
      transport/config.pb.go
  26. 22 21
      transport/internet/config.pb.go
  27. 26 25
      transport/internet/headers/http/config.pb.go
  28. 5 4
      transport/internet/headers/noop/config.pb.go
  29. 18 17
      transport/internet/headers/srtp/config.pb.go
  30. 6 4
      transport/internet/headers/utp/config.pb.go
  31. 32 31
      transport/internet/kcp/config.pb.go
  32. 19 18
      transport/internet/tcp/config.pb.go
  33. 18 16
      transport/internet/tls/config.pb.go
  34. 1 1
      transport/internet/websocket/config.go
  35. 25 21
      transport/internet/websocket/config.pb.go
  36. 4 4
      transport/internet/websocket/config.proto
  37. 2 1
      transport/internet/websocket/connection.go
  38. 1 1
      transport/internet/websocket/connection_cache.go
  39. 1 1
      transport/internet/websocket/dialer.go
  40. 1 1
      transport/internet/websocket/hub.go
  41. 2 1
      transport/internet/websocket/stopablehttplistener.go
  42. 1 1
      transport/internet/websocket/stopabletlslistener.go
  43. 1 1
      transport/internet/websocket/ws.go
  44. 2 2
      transport/internet/websocket/ws_test.go
  45. 1 1
      transport/internet/websocket/wsconn.go

+ 6 - 5
app/dispatcher/config.pb.go

@@ -43,13 +43,14 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/app/dispatcher/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 114 bytes of a gzipped FileDescriptorProto
+	// 134 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2a, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0x2c, 0x28, 0xd0, 0x4f,
 	0xc9, 0x2c, 0x2e, 0x48, 0x2c, 0x49, 0xce, 0x48, 0x2d, 0xd2, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c,
 	0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x84, 0xa9, 0x2d, 0x4a, 0xd5, 0x4b, 0x2c, 0x28,
-	0xd0, 0x43, 0xa8, 0x53, 0xe2, 0xe0, 0x62, 0x73, 0x06, 0x2b, 0x75, 0xb2, 0xe0, 0x92, 0x4d, 0xce,
-	0xcf, 0xd5, 0xc3, 0xa9, 0xd4, 0x89, 0x1b, 0xa2, 0x30, 0x00, 0x64, 0x64, 0x14, 0x17, 0x42, 0x22,
-	0x89, 0x0d, 0x6c, 0x8b, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xc1, 0x99, 0x9d, 0x93, 0x00,
-	0x00, 0x00,
+	0xd0, 0x43, 0xa8, 0x53, 0xe2, 0xe0, 0x62, 0x73, 0x06, 0x2b, 0x75, 0x0a, 0xe1, 0x92, 0x4d, 0xce,
+	0xcf, 0xd5, 0xc3, 0xa9, 0xd4, 0x89, 0x1b, 0xa2, 0x30, 0x00, 0x64, 0x64, 0x14, 0x17, 0x42, 0x62,
+	0x15, 0x93, 0x64, 0x98, 0x51, 0x50, 0x62, 0xa5, 0x9e, 0x33, 0x48, 0x93, 0x63, 0x41, 0x81, 0x9e,
+	0x0b, 0x5c, 0x2e, 0x89, 0x0d, 0xec, 0x02, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x60, 0xf8,
+	0x2f, 0x3b, 0xaf, 0x00, 0x00, 0x00,
 }

+ 20 - 18
app/dns/config.pb.go

@@ -64,22 +64,24 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/app/dns/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 272 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0x31, 0x4b, 0xc4, 0x30,
-	0x14, 0x80, 0x49, 0xcb, 0x1d, 0x98, 0x2e, 0x92, 0x41, 0x4a, 0x17, 0xab, 0x22, 0x16, 0x85, 0x04,
-	0xea, 0xa0, 0xe8, 0xe4, 0xe9, 0x81, 0x2e, 0x7a, 0xd4, 0x4d, 0xa7, 0xd8, 0x44, 0x29, 0x9a, 0xf7,
-	0x42, 0x12, 0x0b, 0xfd, 0xc1, 0xfe, 0x0f, 0xb9, 0x06, 0xf1, 0xd0, 0xbb, 0x2d, 0x84, 0xef, 0xcb,
-	0xfb, 0xf2, 0xe8, 0x41, 0x5f, 0x3b, 0x39, 0xf0, 0x16, 0x8d, 0x68, 0xd1, 0x69, 0x21, 0xad, 0x15,
-	0x0a, 0xbc, 0x68, 0x11, 0x5e, 0xbb, 0x37, 0x6e, 0x1d, 0x06, 0x64, 0xec, 0x07, 0x72, 0x9a, 0x4b,
-	0x6b, 0xb9, 0x02, 0x5f, 0x1c, 0xfd, 0x11, 0x5b, 0x34, 0x06, 0x41, 0x80, 0x0e, 0x42, 0x2a, 0xe5,
-	0xb4, 0xf7, 0x51, 0x2e, 0x4e, 0x36, 0x83, 0x4a, 0xfb, 0xd0, 0x81, 0x0c, 0x1d, 0x42, 0x84, 0xf7,
-	0xbf, 0x08, 0x9d, 0x5e, 0x8f, 0xa3, 0xd9, 0x15, 0xcd, 0xee, 0xa5, 0xd1, 0x8f, 0xda, 0xf5, 0xda,
-	0xf9, 0x9c, 0x94, 0x69, 0x95, 0xd5, 0xbb, 0x7c, 0x25, 0x25, 0xbe, 0xc4, 0x41, 0x07, 0x3e, 0x07,
-	0x65, 0xb1, 0x83, 0xd0, 0xac, 0x3a, 0xec, 0x92, 0x4e, 0x6e, 0xd1, 0x07, 0x9f, 0x27, 0xa3, 0x7c,
-	0xc8, 0xff, 0xff, 0x83, 0xc7, 0x69, 0x7c, 0xe4, 0xe6, 0x10, 0xdc, 0xd0, 0x44, 0xa7, 0x78, 0xa6,
-	0xf4, 0xf7, 0x92, 0x6d, 0xd3, 0xf4, 0x5d, 0x0f, 0x39, 0x29, 0x49, 0xb5, 0xd5, 0x2c, 0x8f, 0xec,
-	0x8c, 0x4e, 0x7a, 0xf9, 0xf1, 0xa9, 0xf3, 0xa4, 0x24, 0x55, 0x56, 0xef, 0x6d, 0x28, 0xbb, 0x5b,
-	0x3c, 0xb8, 0x1b, 0x34, 0xb2, 0x83, 0x26, 0xf2, 0x17, 0xc9, 0x39, 0x99, 0x1d, 0xd3, 0x9d, 0x16,
-	0xcd, 0x9a, 0x9e, 0x59, 0x16, 0x83, 0x16, 0xcb, 0x75, 0x3c, 0xa5, 0x0a, 0xfc, 0xcb, 0x74, 0x5c,
-	0xcd, 0xe9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x43, 0x85, 0xa5, 0x73, 0xab, 0x01, 0x00, 0x00,
+	// 290 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x90, 0xcd, 0x4a, 0x03, 0x31,
+	0x10, 0x80, 0xd9, 0x2d, 0x2d, 0x98, 0xbd, 0x48, 0x0e, 0xb2, 0xf4, 0x62, 0x55, 0xc4, 0x82, 0x30,
+	0x81, 0xf5, 0xa0, 0xe8, 0x41, 0xfa, 0x07, 0x7a, 0xd1, 0xb2, 0x82, 0x07, 0x3d, 0xc5, 0x4d, 0x94,
+	0x45, 0x33, 0x13, 0x92, 0x58, 0xd8, 0x57, 0xf2, 0xbd, 0x7c, 0x0f, 0xd9, 0x0d, 0x62, 0x51, 0x7b,
+	0x0b, 0xe1, 0xfb, 0x32, 0x5f, 0x86, 0x1d, 0xac, 0x0a, 0x27, 0x1b, 0xa8, 0xc8, 0x88, 0x8a, 0x9c,
+	0x16, 0xd2, 0x5a, 0xa1, 0xd0, 0x8b, 0x8a, 0xf0, 0xb9, 0x7e, 0x01, 0xeb, 0x28, 0x10, 0xe7, 0xdf,
+	0x90, 0xd3, 0x20, 0xad, 0x05, 0x85, 0x7e, 0x78, 0xf4, 0x4b, 0xac, 0xc8, 0x18, 0x42, 0x81, 0x3a,
+	0x08, 0xa9, 0x94, 0xd3, 0xde, 0x47, 0x79, 0x78, 0xbc, 0x19, 0x54, 0xda, 0x87, 0x1a, 0x65, 0xa8,
+	0x09, 0x23, 0xbc, 0xff, 0x99, 0xb0, 0xc1, 0xac, 0x1b, 0xcd, 0x27, 0x2c, 0xbb, 0x91, 0x46, 0xdf,
+	0x69, 0xb7, 0xd2, 0xce, 0xe7, 0xc9, 0xa8, 0x37, 0xce, 0x8a, 0x5d, 0x58, 0x4b, 0x89, 0x2f, 0x01,
+	0xea, 0x00, 0x0b, 0x54, 0x96, 0x6a, 0x0c, 0xe5, 0xba, 0xc3, 0x2f, 0x58, 0xff, 0x8a, 0x7c, 0xf0,
+	0x79, 0xda, 0xc9, 0x87, 0xf0, 0xf7, 0x1f, 0x10, 0xa7, 0x41, 0xc7, 0x2d, 0x30, 0xb8, 0xa6, 0x8c,
+	0xce, 0xf0, 0x91, 0xb1, 0x9f, 0x4b, 0xbe, 0xcd, 0x7a, 0xaf, 0xba, 0xc9, 0x93, 0x51, 0x32, 0xde,
+	0x2a, 0xdb, 0x23, 0x3f, 0x65, 0xfd, 0x95, 0x7c, 0x7b, 0xd7, 0x79, 0x3a, 0x4a, 0xc6, 0x59, 0xb1,
+	0xb7, 0xa1, 0xec, 0x7a, 0x79, 0xeb, 0xe6, 0x64, 0x64, 0x8d, 0x65, 0xe4, 0xcf, 0xd3, 0xb3, 0x64,
+	0x7a, 0xc9, 0x76, 0x2a, 0x32, 0xff, 0xf4, 0x4c, 0xb3, 0x18, 0xb4, 0x6c, 0xd7, 0xf1, 0xd0, 0x53,
+	0xe8, 0x3f, 0x52, 0x7e, 0x5f, 0x94, 0xb2, 0x81, 0x59, 0x8b, 0x4d, 0xac, 0x85, 0x39, 0xfa, 0xa7,
+	0x41, 0xb7, 0xaf, 0x93, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x18, 0xf5, 0xa2, 0xc0, 0x01,
+	0x00, 0x00,
 }

+ 34 - 33
app/router/config.pb.go

@@ -190,38 +190,39 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/app/router/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 520 bytes of a gzipped FileDescriptorProto
+	// 538 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0xd1, 0x6e, 0xd3, 0x3e,
-	0x14, 0xc6, 0xff, 0x69, 0xb3, 0xfc, 0x97, 0x93, 0x51, 0x22, 0x0b, 0x50, 0x18, 0x4c, 0x44, 0x11,
-	0x82, 0x5e, 0xa0, 0x04, 0x15, 0x01, 0x37, 0x48, 0x88, 0x75, 0xbb, 0xa8, 0x04, 0x53, 0x65, 0xb6,
-	0x1b, 0x6e, 0x22, 0x2f, 0x75, 0x83, 0x45, 0x62, 0x5b, 0x8e, 0x33, 0xd6, 0x87, 0xe0, 0xdd, 0x78,
-	0x24, 0x64, 0x3b, 0x13, 0x1b, 0x5a, 0xe1, 0xce, 0xe7, 0xf4, 0xf7, 0x1d, 0x7f, 0x3d, 0xfe, 0x02,
-	0xcf, 0x2e, 0x66, 0x8a, 0x6c, 0xf2, 0x4a, 0xb4, 0x45, 0x25, 0x14, 0x2d, 0x88, 0x94, 0x85, 0x12,
-	0xbd, 0xa6, 0xaa, 0xa8, 0x04, 0x5f, 0xb3, 0x3a, 0x97, 0x4a, 0x68, 0x81, 0xee, 0x5f, 0x71, 0x8a,
-	0xe6, 0x44, 0xca, 0xdc, 0x31, 0xfb, 0x4f, 0xff, 0x90, 0x57, 0xa2, 0x6d, 0x05, 0x2f, 0x38, 0xd5,
-	0x85, 0x14, 0x4a, 0x3b, 0xf1, 0xfe, 0xf3, 0xed, 0x14, 0xa7, 0xfa, 0xbb, 0x50, 0xdf, 0x1c, 0x98,
-	0x69, 0x08, 0x8e, 0x44, 0x4b, 0x18, 0x47, 0x6f, 0xc0, 0xd7, 0x1b, 0x49, 0x13, 0x2f, 0xf5, 0xa6,
-	0x93, 0x59, 0x96, 0xdf, 0x7a, 0x7d, 0xee, 0xe0, 0xfc, 0x74, 0x23, 0x29, 0xb6, 0x3c, 0xba, 0x07,
-	0x3b, 0x17, 0xa4, 0xe9, 0x69, 0x32, 0x4a, 0xbd, 0x69, 0x88, 0x5d, 0x91, 0x3d, 0x06, 0xdf, 0x30,
-	0x28, 0x84, 0x9d, 0x65, 0x43, 0x18, 0x8f, 0xff, 0x33, 0x47, 0x4c, 0x6b, 0x7a, 0x19, 0x7b, 0x59,
-	0x0e, 0xfe, 0x7c, 0x71, 0x84, 0xd1, 0x04, 0x46, 0x4c, 0xda, 0x1b, 0xf7, 0xf0, 0x88, 0x49, 0xf4,
-	0x00, 0x02, 0xa9, 0xe8, 0x9a, 0x5d, 0xda, 0x61, 0x77, 0xf0, 0x50, 0x65, 0x3f, 0xc6, 0x10, 0x61,
-	0xd1, 0x6b, 0xc6, 0x6b, 0xdc, 0x37, 0x14, 0xc5, 0x30, 0xd6, 0xa4, 0xb6, 0xc2, 0x10, 0x9b, 0x23,
-	0x7a, 0x0d, 0xc1, 0xca, 0x5a, 0x4b, 0x46, 0xe9, 0x78, 0x1a, 0xcd, 0x0e, 0xfe, 0xea, 0x1f, 0x0f,
-	0x30, 0x2a, 0xc0, 0xaf, 0xd8, 0x4a, 0x25, 0x63, 0x2b, 0x7a, 0xb4, 0x45, 0x64, 0xbc, 0x62, 0x0b,
-	0xa2, 0xf7, 0x00, 0x66, 0xcd, 0xa5, 0x22, 0xbc, 0xa6, 0x89, 0x9f, 0x7a, 0xd3, 0x68, 0x96, 0x5e,
-	0x97, 0xb9, 0x4d, 0xe7, 0x9c, 0xea, 0x7c, 0x29, 0x94, 0xc6, 0x86, 0xc3, 0xa1, 0xbc, 0x3a, 0xa2,
-	0x63, 0xd8, 0x1b, 0x5e, 0xa0, 0x6c, 0x58, 0xa7, 0x93, 0x1d, 0x3b, 0x22, 0xdb, 0x32, 0xe2, 0xc4,
-	0xa1, 0x1f, 0x59, 0xa7, 0x71, 0xc4, 0x7f, 0x17, 0xe8, 0x1d, 0x44, 0x9d, 0xe8, 0x55, 0x45, 0x4b,
-	0xeb, 0x3f, 0xf8, 0xb7, 0x7f, 0x70, 0xfc, 0xdc, 0xfc, 0x8b, 0x03, 0x80, 0xbe, 0xa3, 0xaa, 0xa4,
-	0x2d, 0x61, 0x4d, 0xf2, 0x7f, 0x3a, 0x9e, 0x86, 0x38, 0x34, 0x9d, 0x63, 0xd3, 0x40, 0x4f, 0x20,
-	0x62, 0xfc, 0x5c, 0xf4, 0x7c, 0x55, 0x9a, 0x35, 0xef, 0xda, 0xdf, 0x61, 0x68, 0x9d, 0x92, 0x3a,
-	0xfb, 0xe9, 0x41, 0x30, 0xb7, 0x61, 0x45, 0x67, 0x70, 0xd7, 0xed, 0xb2, 0xec, 0xb4, 0x22, 0x9a,
-	0xd6, 0x9b, 0x21, 0x41, 0x2f, 0xb6, 0x99, 0x71, 0x21, 0x77, 0x0f, 0xf1, 0x79, 0xd0, 0xe0, 0xc9,
-	0xea, 0x46, 0x6d, 0xd2, 0xa8, 0xfa, 0x86, 0x0e, 0xaf, 0xb9, 0x2d, 0x8d, 0xd7, 0x32, 0x81, 0x2d,
-	0x9f, 0xbd, 0x85, 0xc9, 0xcd, 0xc9, 0x68, 0x17, 0xfc, 0x0f, 0xdd, 0xa2, 0x73, 0x01, 0x3c, 0xeb,
-	0xe8, 0x42, 0xc6, 0x1e, 0x8a, 0x61, 0x6f, 0x21, 0x17, 0xeb, 0x13, 0xc1, 0x3f, 0x11, 0x5d, 0x7d,
-	0x8d, 0x47, 0x87, 0x2f, 0xe1, 0x61, 0x25, 0xda, 0xdb, 0xef, 0x39, 0x8c, 0x9c, 0xe9, 0xa5, 0xf9,
-	0x64, 0xbe, 0x04, 0xae, 0x79, 0x1e, 0xd8, 0x2f, 0xe8, 0xd5, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0xe4, 0x89, 0x6f, 0xa7, 0xd1, 0x03, 0x00, 0x00,
+	0x14, 0xc6, 0xff, 0x69, 0xb3, 0xfc, 0x97, 0x93, 0x51, 0x22, 0x8b, 0xa1, 0x30, 0x98, 0x88, 0x22,
+	0x04, 0xbd, 0x40, 0x89, 0x54, 0x04, 0xdc, 0x20, 0xa1, 0xad, 0x9b, 0x44, 0x25, 0x98, 0x26, 0xb3,
+	0x71, 0xc1, 0x4d, 0xe4, 0xa5, 0x5e, 0xb0, 0x48, 0x6c, 0xcb, 0x71, 0xc6, 0xfa, 0x10, 0xbc, 0x08,
+	0x4f, 0xc3, 0x23, 0x21, 0xdb, 0x99, 0xd8, 0xd0, 0x0a, 0x77, 0x3e, 0xa7, 0xbf, 0xef, 0xf8, 0xeb,
+	0xf1, 0x17, 0x78, 0x7a, 0x31, 0x53, 0x64, 0x95, 0x57, 0xa2, 0x2d, 0x2a, 0xa1, 0x68, 0x41, 0xa4,
+	0x2c, 0x94, 0xe8, 0x35, 0x55, 0x45, 0x25, 0xf8, 0x39, 0xab, 0x73, 0xa9, 0x84, 0x16, 0x68, 0xfb,
+	0x8a, 0x53, 0x34, 0x27, 0x52, 0xe6, 0x8e, 0xd9, 0x79, 0xf2, 0x87, 0xbc, 0x12, 0x6d, 0x2b, 0x78,
+	0xc1, 0xa9, 0x2e, 0xa4, 0x50, 0xda, 0x89, 0x77, 0x9e, 0xad, 0xa7, 0x38, 0xd5, 0xdf, 0x84, 0xfa,
+	0xea, 0xc0, 0x4c, 0x43, 0x70, 0x20, 0x5a, 0xc2, 0x38, 0x7a, 0x05, 0xbe, 0x5e, 0x49, 0x9a, 0x78,
+	0xa9, 0x37, 0x9d, 0xcc, 0xb2, 0xfc, 0xd6, 0xeb, 0x73, 0x07, 0xe7, 0x27, 0x2b, 0x49, 0xb1, 0xe5,
+	0xd1, 0x3d, 0xd8, 0xb8, 0x20, 0x4d, 0x4f, 0x93, 0x51, 0xea, 0x4d, 0x43, 0xec, 0x8a, 0xec, 0x11,
+	0xf8, 0x86, 0x41, 0x21, 0x6c, 0x1c, 0x37, 0x84, 0xf1, 0xf8, 0x3f, 0x73, 0xc4, 0xb4, 0xa6, 0x97,
+	0xb1, 0x97, 0xe5, 0xe0, 0xcf, 0x17, 0x07, 0x18, 0x4d, 0x60, 0xc4, 0xa4, 0xbd, 0x71, 0x0b, 0x8f,
+	0x98, 0x44, 0xf7, 0x21, 0x90, 0x8a, 0x9e, 0xb3, 0x4b, 0x3b, 0xec, 0x0e, 0x1e, 0xaa, 0xec, 0xfb,
+	0x18, 0x22, 0x2c, 0x7a, 0xcd, 0x78, 0x8d, 0xfb, 0x86, 0xa2, 0x18, 0xc6, 0x9a, 0xd4, 0x56, 0x18,
+	0x62, 0x73, 0x44, 0x2f, 0x21, 0x58, 0x5a, 0x6b, 0xc9, 0x28, 0x1d, 0x4f, 0xa3, 0xd9, 0xee, 0x5f,
+	0xfd, 0xe3, 0x01, 0x46, 0x05, 0xf8, 0x15, 0x5b, 0xaa, 0x64, 0x6c, 0x45, 0x0f, 0xd7, 0x88, 0x8c,
+	0x57, 0x6c, 0x41, 0xf4, 0x16, 0xc0, 0xac, 0xb9, 0x54, 0x84, 0xd7, 0x34, 0xf1, 0x53, 0x6f, 0x1a,
+	0xcd, 0xd2, 0xeb, 0x32, 0xb7, 0xe9, 0x9c, 0x53, 0x9d, 0x1f, 0x0b, 0xa5, 0xb1, 0xe1, 0x70, 0x28,
+	0xaf, 0x8e, 0xe8, 0x10, 0xb6, 0x86, 0x17, 0x28, 0x1b, 0xd6, 0xe9, 0x64, 0xc3, 0x8e, 0xc8, 0xd6,
+	0x8c, 0x38, 0x72, 0xe8, 0x7b, 0xd6, 0x69, 0x1c, 0xf1, 0xdf, 0x05, 0x7a, 0x03, 0x51, 0x27, 0x7a,
+	0x55, 0xd1, 0xd2, 0xfa, 0x0f, 0xfe, 0xed, 0x1f, 0x1c, 0x3f, 0x37, 0xff, 0x62, 0x17, 0xa0, 0xef,
+	0xa8, 0x2a, 0x69, 0x4b, 0x58, 0x93, 0xfc, 0x9f, 0x8e, 0xa7, 0x21, 0x0e, 0x4d, 0xe7, 0xd0, 0x34,
+	0xd0, 0x63, 0x88, 0x18, 0x3f, 0x13, 0x3d, 0x5f, 0x96, 0x66, 0xcd, 0x9b, 0xf6, 0x77, 0x18, 0x5a,
+	0x27, 0xa4, 0xce, 0x7e, 0x7a, 0x10, 0xcc, 0x6d, 0x58, 0xd1, 0x29, 0xdc, 0x75, 0xbb, 0x2c, 0x3b,
+	0xad, 0x88, 0xa6, 0xf5, 0x6a, 0x48, 0xd0, 0xf3, 0x75, 0x66, 0x5c, 0xc8, 0xdd, 0x43, 0x7c, 0x1c,
+	0x34, 0x78, 0xb2, 0xbc, 0x51, 0x9b, 0x34, 0xaa, 0xbe, 0xa1, 0xc3, 0x6b, 0xae, 0x4b, 0xe3, 0xb5,
+	0x4c, 0x60, 0xcb, 0x67, 0xaf, 0x61, 0x72, 0x73, 0x32, 0xda, 0x04, 0x7f, 0xaf, 0x5b, 0x74, 0x2e,
+	0x80, 0xa7, 0x1d, 0x5d, 0xc8, 0xd8, 0x43, 0x31, 0x6c, 0x2d, 0xe4, 0xe2, 0xfc, 0x48, 0xf0, 0x0f,
+	0x44, 0x57, 0x5f, 0xe2, 0xd1, 0xfe, 0x3b, 0x78, 0x50, 0x89, 0xf6, 0xf6, 0x7b, 0xf6, 0x23, 0x67,
+	0xfa, 0xd8, 0x7c, 0x32, 0x9f, 0x03, 0xd7, 0xfc, 0x31, 0xda, 0xfe, 0x34, 0xc3, 0x64, 0x95, 0xcf,
+	0x0d, 0xbc, 0x27, 0xa5, 0x75, 0x43, 0xd5, 0x59, 0x60, 0xbf, 0xac, 0x17, 0xbf, 0x02, 0x00, 0x00,
+	0xff, 0xff, 0x27, 0x56, 0x8a, 0x08, 0xe9, 0x03, 0x00, 0x00,
 }

+ 22 - 21
app/web/config.pb.go

@@ -204,25 +204,26 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/app/web/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 312 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0xc1, 0x4b, 0xc3, 0x30,
-	0x14, 0xc6, 0xad, 0xdb, 0x8a, 0x7d, 0xbd, 0x05, 0x19, 0x65, 0x07, 0x19, 0x53, 0x64, 0x78, 0x48,
-	0xa5, 0xde, 0xc4, 0x53, 0x9d, 0xe2, 0x45, 0x94, 0xea, 0xc9, 0x83, 0x92, 0x76, 0xcf, 0x19, 0x58,
-	0x9b, 0xf0, 0x1a, 0x56, 0xfa, 0x1f, 0xf9, 0x67, 0x4a, 0x93, 0xea, 0x44, 0x77, 0xcb, 0xcb, 0xfb,
-	0xbe, 0xf7, 0xbe, 0xfc, 0x02, 0xc7, 0x9b, 0x84, 0x44, 0xcb, 0x0b, 0x55, 0xc6, 0x85, 0x22, 0x8c,
-	0x85, 0xd6, 0x71, 0x83, 0x79, 0x5c, 0xa8, 0xea, 0x5d, 0xae, 0xb8, 0x26, 0x65, 0x14, 0x63, 0xdf,
-	0x22, 0x42, 0x2e, 0xb4, 0xe6, 0x0d, 0xe6, 0x93, 0xf3, 0x3f, 0xc6, 0x42, 0x95, 0xa5, 0xaa, 0xe2,
-	0x1a, 0x49, 0x8a, 0x75, 0x6c, 0x5a, 0x8d, 0xcb, 0xb7, 0x12, 0xeb, 0x5a, 0xac, 0xd0, 0x4d, 0x99,
-	0x7d, 0x7a, 0x00, 0xb7, 0x72, 0x8d, 0x4f, 0x48, 0x1b, 0x24, 0x76, 0x09, 0x23, 0xac, 0x0c, 0xb5,
-	0x91, 0x37, 0x1d, 0xcc, 0xc3, 0xe4, 0x84, 0xff, 0x5f, 0xc2, 0xb7, 0x72, 0x7e, 0xd3, 0x69, 0x33,
-	0x67, 0x99, 0xbc, 0xc2, 0xc8, 0xd6, 0xec, 0x10, 0x86, 0x9d, 0x26, 0xf2, 0xa6, 0xde, 0x3c, 0xb8,
-	0xdb, 0xcb, 0x6c, 0xc5, 0x8e, 0x20, 0x58, 0x48, 0xc2, 0xc2, 0x28, 0x6a, 0xa3, 0xfd, 0xbe, 0xb5,
-	0xbd, 0x62, 0x0c, 0x86, 0x5a, 0x98, 0x8f, 0x68, 0xd0, 0xb5, 0x32, 0x7b, 0x4e, 0x43, 0x08, 0x3a,
-	0xef, 0x03, 0x2d, 0x24, 0xcd, 0x96, 0xe0, 0xf7, 0x29, 0xc7, 0xe0, 0x2f, 0x55, 0x29, 0x64, 0x65,
-	0x63, 0x06, 0x59, 0x5f, 0xb1, 0x14, 0x0e, 0x6a, 0x34, 0x46, 0x56, 0xab, 0xda, 0x6e, 0x08, 0x93,
-	0xd3, 0xdf, 0x0f, 0x70, 0x34, 0xb8, 0xa3, 0xc1, 0x9f, 0x3b, 0x1a, 0xf7, 0x0e, 0x46, 0xf6, 0xe3,
-	0x9b, 0x5d, 0x81, 0x7f, 0x6d, 0x31, 0xb3, 0x04, 0xfc, 0xda, 0xee, 0xeb, 0x61, 0x4c, 0x76, 0xc1,
-	0x70, 0x89, 0xb2, 0x5e, 0x99, 0x9e, 0xc1, 0xb8, 0x50, 0xe5, 0x0e, 0x61, 0x1a, 0xba, 0xa9, 0x8f,
-	0x1d, 0xf5, 0x97, 0x41, 0x83, 0x79, 0xee, 0xdb, 0x1f, 0xb8, 0xf8, 0x0a, 0x00, 0x00, 0xff, 0xff,
-	0x21, 0xbf, 0x92, 0xe3, 0xee, 0x01, 0x00, 0x00,
+	// 328 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0xcf, 0x4a, 0xc3, 0x40,
+	0x10, 0x87, 0x4d, 0xff, 0x04, 0x33, 0xb9, 0x2d, 0x52, 0x42, 0x0f, 0x52, 0xaa, 0x48, 0x4f, 0x1b,
+	0x89, 0x37, 0x11, 0xc4, 0xb4, 0x8a, 0x17, 0x51, 0xa2, 0x28, 0x78, 0x50, 0x36, 0xe9, 0x58, 0x17,
+	0x9a, 0xec, 0xb2, 0x59, 0x5a, 0xf2, 0x46, 0xe2, 0x53, 0xca, 0xee, 0x46, 0x2b, 0xda, 0x5b, 0x26,
+	0xf3, 0xfd, 0x66, 0x26, 0x5f, 0xe0, 0x60, 0x95, 0x28, 0xd6, 0xd0, 0x42, 0x94, 0x71, 0x21, 0x14,
+	0xc6, 0x4c, 0xca, 0x78, 0x8d, 0x79, 0x5c, 0x88, 0xea, 0x8d, 0x2f, 0xa8, 0x54, 0x42, 0x0b, 0x42,
+	0xbe, 0x21, 0x85, 0x94, 0x49, 0x49, 0xd7, 0x98, 0x0f, 0x8f, 0xff, 0x04, 0x0b, 0x51, 0x96, 0xa2,
+	0x8a, 0x6b, 0x54, 0x9c, 0x2d, 0x63, 0xdd, 0x48, 0x9c, 0xbf, 0x96, 0x58, 0xd7, 0x6c, 0x81, 0x6e,
+	0xca, 0xf8, 0xc3, 0x03, 0xb8, 0xe2, 0x4b, 0xbc, 0x47, 0xb5, 0x42, 0x45, 0x4e, 0xa1, 0x8f, 0x95,
+	0x56, 0x4d, 0xe4, 0x8d, 0xba, 0x93, 0x30, 0x39, 0xa4, 0xff, 0x97, 0xd0, 0x0d, 0x4e, 0x2f, 0x0d,
+	0x9b, 0xb9, 0xc8, 0xf0, 0x05, 0xfa, 0xb6, 0x26, 0x7b, 0xd0, 0x33, 0x4c, 0xe4, 0x8d, 0xbc, 0x49,
+	0x70, 0xbd, 0x93, 0xd9, 0x8a, 0xec, 0x43, 0x30, 0xe3, 0x0a, 0x0b, 0x2d, 0x54, 0x13, 0x75, 0xda,
+	0xd6, 0xe6, 0x15, 0x21, 0xd0, 0x93, 0x4c, 0xbf, 0x47, 0x5d, 0xd3, 0xca, 0xec, 0x73, 0x1a, 0x42,
+	0x60, 0xb2, 0xb7, 0x6a, 0xc6, 0xd5, 0x78, 0x0e, 0x7e, 0x7b, 0xe5, 0x00, 0xfc, 0xb9, 0x28, 0x19,
+	0xaf, 0xec, 0x99, 0x41, 0xd6, 0x56, 0x24, 0x85, 0xdd, 0x1a, 0xb5, 0xe6, 0xd5, 0xa2, 0xb6, 0x1b,
+	0xc2, 0xe4, 0xe8, 0xf7, 0x07, 0x38, 0x1b, 0xd4, 0xd9, 0xa0, 0x0f, 0xc6, 0xc6, 0x8d, 0x93, 0x91,
+	0xfd, 0xe4, 0xc6, 0x67, 0xe0, 0x4f, 0xad, 0x66, 0x92, 0x80, 0x5f, 0xdb, 0x7d, 0xad, 0x8c, 0xe1,
+	0x36, 0x19, 0xee, 0xa2, 0xac, 0x25, 0xd3, 0x73, 0x18, 0x14, 0xa2, 0xdc, 0x02, 0xa6, 0xa1, 0x9b,
+	0x7a, 0x67, 0xac, 0x3f, 0x77, 0xd7, 0x98, 0x7f, 0x76, 0xc8, 0x63, 0x92, 0xb1, 0x86, 0x4e, 0x0d,
+	0x76, 0x21, 0x25, 0x7d, 0xc2, 0x3c, 0xf7, 0xed, 0x6f, 0x39, 0xf9, 0x0a, 0x00, 0x00, 0xff, 0xff,
+	0xc9, 0x59, 0x48, 0x03, 0x03, 0x02, 0x00, 0x00,
 }

+ 6 - 5
common/net/address.pb.go

@@ -154,7 +154,7 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/net/address.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 163 bytes of a gzipped FileDescriptorProto
+	// 181 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,
 	0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x4f, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0xd6, 0x2b, 0x28,
@@ -162,8 +162,9 @@ var fileDescriptor0 = []byte{
 	0x51, 0x72, 0xe6, 0xe2, 0xf2, 0x0c, 0xf0, 0x2f, 0x72, 0xc9, 0xcf, 0x4d, 0xcc, 0xcc, 0x13, 0x12,
 	0xe0, 0x62, 0xca, 0x2c, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0xf1, 0x60, 0x08, 0x62, 0xca, 0x2c,
 	0x10, 0x92, 0xe0, 0x62, 0x4b, 0x01, 0xcb, 0x49, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x7a, 0x30, 0x04,
-	0x41, 0xf9, 0x4e, 0x9c, 0x5c, 0xec, 0x50, 0x1b, 0x9c, 0xf4, 0xb8, 0x24, 0x93, 0xf3, 0x73, 0xf5,
-	0xb0, 0xda, 0xe0, 0xc4, 0xe3, 0x08, 0x51, 0x15, 0x00, 0x72, 0x46, 0x14, 0x73, 0x5e, 0x6a, 0x49,
-	0x12, 0x1b, 0xd8, 0x49, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x40, 0xbb, 0x8c, 0xbd,
-	0x00, 0x00, 0x00,
+	0x41, 0xf9, 0x4e, 0x9c, 0x5c, 0xec, 0x50, 0x1b, 0x9c, 0xdc, 0xb8, 0x24, 0x93, 0xf3, 0x73, 0xf5,
+	0xb0, 0xda, 0xe0, 0xc4, 0xe3, 0x08, 0x51, 0x15, 0x00, 0x72, 0x46, 0x14, 0x73, 0x5e, 0x6a, 0xc9,
+	0x2a, 0x26, 0xd1, 0x30, 0xa3, 0xa0, 0xc4, 0x4a, 0x3d, 0x67, 0x90, 0x52, 0x67, 0x88, 0x52, 0xbf,
+	0xd4, 0x92, 0x24, 0x36, 0xb0, 0x53, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x88, 0x8a, 0x6d,
+	0x70, 0xd5, 0x00, 0x00, 0x00,
 }

+ 16 - 15
common/net/destination.pb.go

@@ -38,19 +38,20 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/net/destination.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 219 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4b, 0x04, 0x31,
-	0x10, 0x46, 0x89, 0x27, 0x9e, 0x44, 0x14, 0x09, 0x08, 0xab, 0x85, 0xac, 0x36, 0x2e, 0x08, 0x09,
-	0xc4, 0x46, 0xb0, 0x3b, 0xce, 0xc2, 0x46, 0x8f, 0x2d, 0xed, 0x62, 0x32, 0x45, 0x90, 0xcc, 0x2c,
-	0xb3, 0x83, 0xe2, 0x0f, 0xf1, 0xff, 0x8a, 0x97, 0x5b, 0x6c, 0xee, 0xec, 0x52, 0xbc, 0xf7, 0xc8,
-	0x37, 0xfa, 0xf6, 0xc3, 0x73, 0xf8, 0xb2, 0x91, 0x8a, 0x8b, 0xc4, 0xe0, 0x22, 0x95, 0x42, 0xe8,
-	0x10, 0xc4, 0x25, 0x18, 0x25, 0x63, 0x90, 0x4c, 0x68, 0x07, 0x26, 0x21, 0x73, 0x36, 0xc1, 0x0c,
-	0xb6, 0x82, 0x16, 0x41, 0x2e, 0x6e, 0x76, 0x37, 0x10, 0xe4, 0x93, 0xf8, 0xbd, 0xfa, 0xff, 0x81,
-	0x21, 0x25, 0x86, 0x71, 0xac, 0xe0, 0xf5, 0xb7, 0xd2, 0x87, 0x8f, 0x98, 0x06, 0xca, 0x28, 0xe6,
-	0x5e, 0xcf, 0x37, 0x99, 0x46, 0xb5, 0xaa, 0x3b, 0xf1, 0x97, 0x76, 0xeb, 0x3f, 0xec, 0x73, 0xa5,
-	0xfa, 0x09, 0x37, 0x0f, 0x7a, 0xbe, 0xe9, 0x36, 0x7b, 0xad, 0xea, 0x8e, 0xfc, 0xd5, 0x0e, 0xf3,
-	0x69, 0xf5, 0xc2, 0x4b, 0x2a, 0x21, 0x63, 0x3f, 0x19, 0xc6, 0xe8, 0xfd, 0x81, 0x58, 0x9a, 0x59,
-	0xab, 0xba, 0xe3, 0x7e, 0xfd, 0x5e, 0x78, 0x7d, 0x1e, 0xa9, 0x6c, 0x8f, 0x2c, 0x4e, 0x97, 0x7f,
-	0x07, 0x5b, 0xfd, 0xce, 0x78, 0x9d, 0x21, 0xc8, 0xdb, 0xc1, 0x7a, 0xd2, 0xdd, 0x4f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x97, 0xbf, 0x9f, 0x8e, 0x6a, 0x01, 0x00, 0x00,
+	// 237 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a,
+	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,
+	0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x4f, 0x49, 0x2d, 0x2e, 0xc9, 0xcc, 0x4b, 0x2c, 0xc9, 0xcc,
+	0xcf, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0x29, 0x2e, 0x4a, 0xd5, 0x83, 0x28,
+	0xd4, 0xcb, 0x4b, 0x2d, 0x91, 0x52, 0xc7, 0x6d, 0x46, 0x5e, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36,
+	0x44, 0x3f, 0x3e, 0x85, 0x89, 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0x10, 0x85, 0x4a, 0x53, 0x19,
+	0xb9, 0x38, 0x5c, 0xf3, 0x52, 0x0a, 0xf2, 0x33, 0xf3, 0x4a, 0x84, 0x2c, 0xb8, 0xd8, 0xa1, 0xc6,
+	0x48, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x19, 0xc9, 0xe9, 0x61, 0x75, 0x87, 0x9e, 0x1f, 0x44, 0x55,
+	0x10, 0x4c, 0xb9, 0x90, 0x35, 0x17, 0x3b, 0xd4, 0x5c, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x6e, 0x23,
+	0x45, 0x1c, 0x3a, 0x3d, 0x03, 0xfc, 0x8b, 0x5c, 0xf2, 0x73, 0x13, 0x33, 0xf3, 0x82, 0x60, 0x3a,
+	0x84, 0x84, 0xb8, 0x58, 0x0a, 0xf2, 0x8b, 0x4a, 0x24, 0x98, 0x15, 0x18, 0x35, 0x78, 0x83, 0xc0,
+	0x6c, 0x27, 0x2f, 0x2e, 0xc9, 0xe4, 0xfc, 0x5c, 0xec, 0x86, 0x38, 0x09, 0xb8, 0x20, 0x02, 0x2c,
+	0x00, 0xe4, 0x8d, 0x28, 0xe6, 0xbc, 0xd4, 0x92, 0x55, 0x4c, 0xa2, 0x61, 0x46, 0x41, 0x89, 0x95,
+	0x7a, 0xce, 0x20, 0xe5, 0xce, 0x10, 0xe5, 0x7e, 0xa9, 0x25, 0x49, 0x6c, 0x60, 0xaf, 0x1a, 0x03,
+	0x02, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x3a, 0x5c, 0x8c, 0x82, 0x01, 0x00, 0x00,
 }

+ 5 - 4
common/net/network.pb.go

@@ -65,7 +65,7 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/net/network.proto", fileDescriptor2) }
 
 var fileDescriptor2 = []byte{
-	// 203 bytes of a gzipped FileDescriptorProto
+	// 221 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,
 	0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0x01, 0xe1, 0xf2, 0xfc, 0xa2, 0x6c, 0xbd, 0x82, 0xa2, 0xfc, 0x92,
@@ -76,7 +76,8 @@ var fileDescriptor2 = []byte{
 	0x79, 0x02, 0x0c, 0x42, 0x5c, 0x5c, 0x6c, 0x41, 0x89, 0xe5, 0x21, 0xce, 0x01, 0x02, 0x8c, 0x42,
 	0xec, 0x5c, 0xcc, 0x20, 0x06, 0x13, 0x88, 0x11, 0xea, 0x12, 0x20, 0xc0, 0x0c, 0x62, 0x78, 0x3b,
 	0x07, 0x08, 0xb0, 0x08, 0xf1, 0x72, 0x71, 0x86, 0xa7, 0x26, 0x05, 0xe7, 0x27, 0x67, 0xa7, 0x96,
-	0x08, 0xb0, 0x3a, 0xe9, 0x71, 0x49, 0x26, 0xe7, 0xe7, 0x62, 0xb7, 0xdb, 0x89, 0x07, 0x6a, 0x51,
-	0x00, 0xc8, 0x63, 0x51, 0xcc, 0x79, 0xa9, 0x25, 0x49, 0x6c, 0x60, 0x4f, 0x1a, 0x03, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0x6e, 0x52, 0xf1, 0x92, 0x0f, 0x01, 0x00, 0x00,
+	0x08, 0xb0, 0x3a, 0xb9, 0x71, 0x49, 0x26, 0xe7, 0xe7, 0x62, 0xb7, 0xdb, 0x89, 0x07, 0x6a, 0x51,
+	0x00, 0xc8, 0x63, 0x51, 0xcc, 0x79, 0xa9, 0x25, 0xab, 0x98, 0x44, 0xc3, 0x8c, 0x82, 0x12, 0x2b,
+	0xf5, 0x9c, 0x41, 0x4a, 0x9d, 0x21, 0x4a, 0xfd, 0x52, 0x4b, 0x92, 0xd8, 0xc0, 0x9e, 0x37, 0x06,
+	0x04, 0x00, 0x00, 0xff, 0xff, 0x18, 0xab, 0xfe, 0x3a, 0x27, 0x01, 0x00, 0x00,
 }

+ 6 - 4
common/net/port.pb.go

@@ -31,14 +31,16 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/net/port.proto", fileDescriptor3) }
 
 var fileDescriptor3 = []byte{
-	// 144 bytes of a gzipped FileDescriptorProto
+	// 163 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x29, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,
 	0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0xd1, 0x2f, 0xc8, 0x2f, 0x2a, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9,
 	0x17, 0x12, 0x85, 0xa9, 0x2a, 0x4a, 0xd5, 0x83, 0xa8, 0xd0, 0xcb, 0x4b, 0x2d, 0x51, 0xd2, 0xe7,
 	0xe2, 0x0c, 0xc8, 0x2f, 0x2a, 0x09, 0x4a, 0xcc, 0x4b, 0x4f, 0x15, 0x12, 0xe2, 0x62, 0x71, 0x2b,
 	0xca, 0xcf, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x02, 0xb3, 0x85, 0xf8, 0xb8, 0x98, 0x42,
-	0xf2, 0x25, 0x98, 0xc0, 0x22, 0x4c, 0x21, 0xf9, 0x4e, 0xda, 0x5c, 0x92, 0xc9, 0xf9, 0xb9, 0x7a,
-	0x58, 0x4d, 0x73, 0x02, 0x9b, 0x15, 0x00, 0xb2, 0x2f, 0x8a, 0x39, 0x2f, 0xb5, 0x24, 0x89, 0x0d,
-	0x6c, 0xb7, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xe5, 0xb2, 0xd0, 0xa3, 0x00, 0x00, 0x00,
+	0xf2, 0x25, 0x98, 0xc0, 0x22, 0x4c, 0x21, 0xf9, 0x4e, 0xce, 0x5c, 0x92, 0xc9, 0xf9, 0xb9, 0x7a,
+	0x58, 0x4d, 0x73, 0x02, 0x9b, 0x15, 0x00, 0xb2, 0x2f, 0x8a, 0x39, 0x2f, 0xb5, 0x64, 0x15, 0x93,
+	0x68, 0x98, 0x51, 0x50, 0x62, 0xa5, 0x9e, 0x33, 0x48, 0x9d, 0x33, 0x44, 0x9d, 0x5f, 0x6a, 0x49,
+	0x12, 0x1b, 0xd8, 0x4d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, 0xed, 0x95, 0xd7, 0xbb,
+	0x00, 0x00, 0x00,
 }

+ 6 - 5
common/protocol/headers.pb.go

@@ -63,7 +63,7 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/protocol/headers.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 241 bytes of a gzipped FileDescriptorProto
+	// 259 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x29, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,
 	0xcf, 0xd3, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0xce, 0xcf, 0xd1, 0xcf, 0x48, 0x4d, 0x4c, 0x49,
@@ -76,8 +76,9 @@ var fileDescriptor1 = []byte{
 	0xc4, 0xc1, 0xc5, 0xe2, 0x18, 0x1a, 0xe2, 0x2f, 0xc0, 0x24, 0xc4, 0xc7, 0xc5, 0xe5, 0xe8, 0x1a,
 	0x6c, 0x68, 0x64, 0x11, 0xef, 0xee, 0xec, 0x2b, 0xc0, 0x2c, 0x24, 0xca, 0x25, 0xe8, 0xec, 0xe1,
 	0xe8, 0xec, 0xe1, 0x68, 0x64, 0x10, 0x1f, 0xe0, 0xef, 0x13, 0x69, 0x68, 0x6c, 0x60, 0x2a, 0xc0,
-	0x02, 0xd2, 0xe0, 0xe7, 0xef, 0xe7, 0x2a, 0xc0, 0xea, 0x64, 0xc1, 0x25, 0x97, 0x9c, 0x9f, 0x8b,
-	0xc7, 0x61, 0x4e, 0x3c, 0x1e, 0x90, 0x00, 0x08, 0x00, 0x09, 0x44, 0x71, 0xc0, 0xc4, 0x93, 0xd8,
-	0xc0, 0x2c, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xda, 0x88, 0xd8, 0x40, 0x01, 0x00,
-	0x00,
+	0x02, 0xd2, 0xe0, 0xe7, 0xef, 0xe7, 0x2a, 0xc0, 0xea, 0x14, 0xca, 0x25, 0x97, 0x9c, 0x9f, 0x8b,
+	0xc7, 0x61, 0x4e, 0x3c, 0x1e, 0x90, 0x00, 0x08, 0x00, 0x09, 0x44, 0x71, 0xc0, 0xc4, 0x57, 0x31,
+	0x49, 0x85, 0x19, 0x05, 0x25, 0x56, 0xea, 0x39, 0x83, 0x34, 0x39, 0x43, 0x34, 0x05, 0x40, 0x25,
+	0x93, 0xd8, 0xc0, 0xca, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xc5, 0x09, 0x7c, 0x5d,
+	0x01, 0x00, 0x00,
 }

+ 17 - 16
common/protocol/server_spec.pb.go

@@ -46,20 +46,21 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/protocol/server_spec.proto", fileDescriptor2) }
 
 var fileDescriptor2 = []byte{
-	// 230 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x3d, 0x4b, 0x04, 0x31,
-	0x10, 0x86, 0x59, 0xef, 0x50, 0xc9, 0xa1, 0x42, 0xaa, 0x65, 0x0b, 0x89, 0x36, 0xae, 0xcd, 0x44,
-	0x56, 0xbb, 0xeb, 0x0e, 0x2d, 0xac, 0x3c, 0xf6, 0xb0, 0xb1, 0x91, 0x35, 0x3b, 0xc5, 0x81, 0xc9,
-	0x84, 0x49, 0x3c, 0xf0, 0x97, 0xf8, 0x77, 0x65, 0x13, 0x53, 0xf9, 0xd5, 0x0d, 0x6f, 0x9e, 0xf7,
-	0x23, 0xe2, 0x6a, 0xd7, 0xf1, 0xf0, 0x0e, 0x86, 0xac, 0x36, 0xc4, 0xa8, 0x0d, 0x59, 0x4b, 0x4e,
-	0x7b, 0xa6, 0x48, 0x86, 0x5e, 0x75, 0x40, 0xde, 0x21, 0x3f, 0x07, 0x8f, 0x06, 0x92, 0x28, 0x9b,
-	0xe2, 0x60, 0x84, 0x4c, 0x43, 0xa1, 0x9b, 0x8b, 0x9f, 0xd3, 0x1c, 0x46, 0x3d, 0x8c, 0x23, 0x63,
-	0x08, 0x99, 0x6d, 0x2e, 0xff, 0xa9, 0x7d, 0x0b, 0xc8, 0x19, 0x3d, 0xff, 0xa8, 0xc4, 0xf1, 0x26,
-	0xad, 0xb8, 0x73, 0xa3, 0xa7, 0xad, 0x8b, 0x72, 0x29, 0x0e, 0xbe, 0xe2, 0xea, 0x4a, 0x55, 0xed,
-	0xa2, 0x3b, 0x83, 0xef, 0xa3, 0x1c, 0x46, 0xb8, 0x5f, 0x3f, 0xf0, 0x2d, 0xd9, 0x61, 0xeb, 0xfa,
-	0xe2, 0x90, 0x52, 0xcc, 0x3d, 0x71, 0xac, 0xf7, 0x54, 0xd5, 0x1e, 0xf5, 0xe9, 0x96, 0x37, 0x62,
-	0x3e, 0x35, 0xd6, 0x33, 0x35, 0x6b, 0x17, 0x9d, 0x82, 0xdf, 0xbf, 0x08, 0x8f, 0x01, 0xb9, 0x4f,
-	0xf4, 0x6a, 0x29, 0x4e, 0x0d, 0xd9, 0x3f, 0xe0, 0xd5, 0x49, 0x1e, 0xbe, 0xf1, 0x68, 0xd6, 0x93,
-	0xf6, 0x74, 0x58, 0x9e, 0x5e, 0xf6, 0xd3, 0x75, 0xfd, 0x19, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x28,
-	0xb3, 0x3a, 0x81, 0x01, 0x00, 0x00,
+	// 251 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8f, 0x3f, 0x4f, 0xf3, 0x30,
+	0x10, 0xc6, 0x95, 0xb6, 0x7a, 0x5f, 0xe4, 0x0a, 0x90, 0x3c, 0x45, 0x19, 0x50, 0x60, 0x21, 0x2c,
+	0x67, 0x14, 0xd8, 0xd8, 0x5a, 0x18, 0x98, 0x88, 0x52, 0x81, 0x10, 0x0b, 0x0a, 0xce, 0x0d, 0x95,
+	0xb0, 0xcf, 0x3a, 0x9b, 0x4a, 0xfd, 0x24, 0x7c, 0x07, 0x3e, 0x25, 0x8a, 0xdd, 0x4c, 0xfc, 0xdb,
+	0xac, 0xbb, 0xdf, 0xef, 0x9e, 0xc7, 0xe2, 0x7c, 0x53, 0x73, 0xb7, 0x05, 0x4d, 0x46, 0x69, 0x62,
+	0x54, 0x9a, 0x8c, 0x21, 0xab, 0x1c, 0x53, 0x20, 0x4d, 0xaf, 0xca, 0x23, 0x6f, 0x90, 0x9f, 0xbd,
+	0x43, 0x0d, 0x71, 0x28, 0x8b, 0xd1, 0x60, 0x84, 0x44, 0xc3, 0x48, 0x17, 0xa7, 0xdf, 0x5f, 0xb3,
+	0x18, 0x54, 0xd7, 0xf7, 0x8c, 0xde, 0x27, 0xb6, 0x38, 0xfb, 0x23, 0xf6, 0xcd, 0x23, 0x27, 0xf4,
+	0xe4, 0x3d, 0x13, 0x07, 0xab, 0xd8, 0xe2, 0xc6, 0xf6, 0x8e, 0xd6, 0x36, 0xc8, 0x2b, 0xf1, 0x7f,
+	0x77, 0x2e, 0xcf, 0xca, 0xac, 0x9a, 0xd7, 0xc7, 0xf0, 0xb5, 0x94, 0xc5, 0x00, 0xb7, 0xcd, 0x1d,
+	0x5f, 0x93, 0xe9, 0xd6, 0xb6, 0x1d, 0x0d, 0x29, 0xc5, 0xcc, 0x11, 0x87, 0x7c, 0x52, 0x66, 0xd5,
+	0x7e, 0x1b, 0xdf, 0xf2, 0x52, 0xcc, 0x86, 0xc4, 0x7c, 0x5a, 0x4e, 0xab, 0x79, 0x5d, 0xc2, 0xcf,
+	0x5f, 0x84, 0x7b, 0x8f, 0xdc, 0x46, 0x7a, 0xf1, 0x28, 0x8e, 0x34, 0x99, 0x5f, 0xe0, 0xc5, 0x61,
+	0x2a, 0xbe, 0x72, 0xa8, 0x9b, 0x61, 0xf6, 0xb4, 0x37, 0xae, 0x3e, 0x26, 0xc5, 0x43, 0xdd, 0x76,
+	0x5b, 0x58, 0x0e, 0xde, 0x32, 0x79, 0xcd, 0x6e, 0xf9, 0xf2, 0x2f, 0x62, 0x17, 0x9f, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x90, 0x81, 0xc4, 0x33, 0x9e, 0x01, 0x00, 0x00,
 }

+ 15 - 14
common/protocol/user.pb.go

@@ -40,18 +40,19 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/protocol/user.proto", fileDescriptor3) }
 
 var fileDescriptor3 = []byte{
-	// 204 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2c, 0x33, 0x2a, 0x4a,
-	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,
-	0xcf, 0xd3, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0xce, 0xcf, 0xd1, 0x2f, 0x2d, 0x4e, 0x2d, 0xd2,
-	0x03, 0xf3, 0x84, 0xa4, 0x60, 0x4a, 0x8b, 0x52, 0xf5, 0x20, 0xca, 0xf4, 0x60, 0xca, 0xa4, 0x0c,
-	0xb0, 0x1b, 0x53, 0x9c, 0x5a, 0x94, 0x99, 0x98, 0xa3, 0x5f, 0x52, 0x59, 0x90, 0x9a, 0x12, 0x9f,
-	0x9b, 0x5a, 0x5c, 0x9c, 0x98, 0x9e, 0x0a, 0xd1, 0xa4, 0x54, 0xc2, 0xc5, 0x12, 0x5a, 0x9c, 0x5a,
-	0x24, 0x24, 0xc2, 0xc5, 0x9a, 0x93, 0x5a, 0x96, 0x9a, 0x23, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x1b,
-	0x04, 0xe1, 0x80, 0x44, 0x53, 0x73, 0x13, 0x33, 0x73, 0x24, 0x98, 0x14, 0x18, 0x35, 0x38, 0x83,
-	0x20, 0x1c, 0x21, 0x07, 0x2e, 0xf6, 0xc4, 0xe4, 0xe4, 0xfc, 0xd2, 0xbc, 0x12, 0x09, 0x66, 0x05,
-	0x46, 0x0d, 0x6e, 0x23, 0x35, 0x3d, 0x4c, 0x37, 0x41, 0xec, 0xd4, 0x0b, 0x01, 0xd9, 0xe9, 0x0b,
-	0xb1, 0x32, 0x08, 0xa6, 0xcd, 0xc9, 0x94, 0x4b, 0x2e, 0x39, 0x3f, 0x57, 0x0f, 0xb7, 0x4f, 0x9c,
-	0x38, 0x41, 0xae, 0x0a, 0x00, 0xf1, 0xa2, 0x38, 0x60, 0x82, 0x49, 0x6c, 0x60, 0x96, 0x31, 0x20,
-	0x00, 0x00, 0xff, 0xff, 0x2e, 0x02, 0xab, 0x48, 0x2e, 0x01, 0x00, 0x00,
+	// 222 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x8f, 0xcf, 0x4a, 0xc4, 0x30,
+	0x10, 0xc6, 0xc9, 0xfa, 0x77, 0x23, 0x5e, 0x8a, 0x87, 0xd2, 0x83, 0x14, 0x0f, 0x52, 0x2f, 0x13,
+	0xa9, 0x2f, 0x20, 0xbb, 0x67, 0xa1, 0x04, 0xf5, 0xe0, 0x45, 0x62, 0x1c, 0xa4, 0x90, 0x74, 0x4a,
+	0x92, 0x16, 0xfa, 0x4a, 0x3e, 0xa5, 0xa4, 0x31, 0x27, 0xdd, 0xe3, 0x37, 0xf9, 0xfd, 0xf2, 0xcd,
+	0xf0, 0xbb, 0xb9, 0x75, 0x6a, 0x01, 0x4d, 0x56, 0x68, 0x72, 0x28, 0x34, 0x59, 0x4b, 0x83, 0x18,
+	0x1d, 0x05, 0xd2, 0x64, 0xc4, 0xe4, 0xd1, 0xc1, 0x9a, 0x8a, 0x2a, 0xa3, 0x0e, 0x21, 0x61, 0x90,
+	0xb1, 0xea, 0xfe, 0xff, 0x6f, 0x3c, 0xba, 0x5e, 0x19, 0x11, 0x96, 0x11, 0x3f, 0xdf, 0x2d, 0x7a,
+	0xaf, 0xbe, 0x30, 0x49, 0x37, 0x81, 0x1f, 0xbf, 0x78, 0x74, 0xc5, 0x15, 0x3f, 0x31, 0x38, 0xa3,
+	0x29, 0x59, 0xcd, 0x9a, 0x4b, 0x99, 0x42, 0x9c, 0xa2, 0x55, 0xbd, 0x29, 0x37, 0x35, 0x6b, 0xb6,
+	0x32, 0x85, 0xe2, 0x91, 0x9f, 0x29, 0xad, 0x69, 0x1a, 0x42, 0x79, 0x54, 0xb3, 0xe6, 0xa2, 0xbd,
+	0x85, 0xbf, 0x3b, 0xa5, 0x4e, 0x78, 0x8e, 0x9d, 0x4f, 0xa9, 0x52, 0x66, 0x6d, 0x27, 0xf9, 0xb5,
+	0x26, 0x0b, 0x87, 0x2f, 0xd9, 0x6d, 0xe3, 0x56, 0x5d, 0x4c, 0x6f, 0xe7, 0x79, 0xf8, 0xbd, 0xa9,
+	0x5e, 0x5b, 0xa9, 0x16, 0xd8, 0x47, 0x63, 0x9f, 0x8c, 0xee, 0xf7, 0xf1, 0xe3, 0x74, 0xc5, 0x1e,
+	0x7e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x5d, 0xb5, 0xb7, 0x4b, 0x01, 0x00, 0x00,
 }

+ 5 - 4
common/serial/typed_message.pb.go

@@ -48,7 +48,7 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/common/serial/typed_message.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 156 bytes of a gzipped FileDescriptorProto
+	// 174 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0x28, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd,
 	0xcf, 0xd3, 0x2f, 0x4e, 0x2d, 0xca, 0x4c, 0xcc, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x4d, 0x89, 0xcf,
@@ -56,7 +56,8 @@ var fileDescriptor0 = []byte{
 	0x28, 0x4a, 0xd5, 0x83, 0xa8, 0xd6, 0x83, 0xa8, 0x56, 0xb2, 0xe0, 0xe2, 0x09, 0x01, 0x69, 0xf0,
 	0x85, 0xa8, 0x17, 0x12, 0xe2, 0x62, 0x01, 0x19, 0x20, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0x04,
 	0x66, 0x0b, 0x89, 0x70, 0xb1, 0x96, 0x25, 0xe6, 0x94, 0xa6, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0xf0,
-	0x04, 0x41, 0x38, 0x4e, 0x96, 0x5c, 0x32, 0xc9, 0xf9, 0xb9, 0x7a, 0xb8, 0x4c, 0x76, 0x12, 0x44,
-	0x36, 0x37, 0x00, 0xe4, 0x8c, 0x28, 0x36, 0x88, 0x54, 0x12, 0x1b, 0xd8, 0x55, 0xc6, 0x80, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xb5, 0x17, 0x99, 0x4c, 0xc9, 0x00, 0x00, 0x00,
+	0x04, 0x41, 0x38, 0x4e, 0x21, 0x5c, 0x32, 0xc9, 0xf9, 0xb9, 0x7a, 0xb8, 0x4c, 0x76, 0x12, 0x44,
+	0x36, 0x37, 0x00, 0xe4, 0x8c, 0x28, 0x36, 0x88, 0xd4, 0x2a, 0x26, 0x89, 0x30, 0xa3, 0xa0, 0xc4,
+	0x4a, 0x3d, 0x67, 0x90, 0x2e, 0x67, 0x88, 0xae, 0x60, 0xb0, 0x54, 0x12, 0x1b, 0xd8, 0xc1, 0xc6,
+	0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x74, 0x15, 0xc3, 0xe2, 0xe4, 0x00, 0x00, 0x00,
 }

+ 47 - 46
config.pb.go

@@ -298,51 +298,52 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 733 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x95, 0xed, 0x6e, 0xd3, 0x3a,
+	// 745 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x95, 0xd1, 0x6e, 0xd3, 0x3a,
 	0x1c, 0xc6, 0x97, 0xb6, 0xeb, 0xda, 0x7f, 0xb7, 0x9e, 0xca, 0xe7, 0xe8, 0x9c, 0x9c, 0xc1, 0x50,
-	0xe9, 0x5e, 0x28, 0x03, 0xa5, 0x50, 0x84, 0x98, 0x90, 0x60, 0xec, 0x05, 0xa4, 0x81, 0xa0, 0x25,
-	0xdd, 0x27, 0xbe, 0x44, 0x5e, 0xea, 0x65, 0x91, 0x12, 0x3b, 0xb2, 0xdd, 0x6d, 0xbd, 0x04, 0xee,
-	0x86, 0x5b, 0xe1, 0x0a, 0xb8, 0x15, 0x64, 0x3b, 0x4d, 0x3b, 0xda, 0x6e, 0x93, 0x10, 0xdf, 0xd2,
-	0xe4, 0xf9, 0x3d, 0x76, 0x9e, 0xe7, 0x1f, 0x17, 0xee, 0x9c, 0xb7, 0x39, 0x1e, 0x3a, 0x3e, 0x8b,
-	0x5b, 0x3e, 0xe3, 0xa4, 0xe5, 0x33, 0x7a, 0x1a, 0x06, 0x4e, 0xc2, 0x99, 0x64, 0x08, 0x46, 0x0f,
-	0x39, 0x59, 0x7d, 0x32, 0x25, 0x8c, 0x63, 0x46, 0x5b, 0x82, 0xf0, 0x10, 0x47, 0x2d, 0x39, 0x4c,
-	0x48, 0xdf, 0x8b, 0x89, 0x10, 0x38, 0x20, 0x86, 0x5e, 0xdd, 0x98, 0x4d, 0x50, 0x22, 0x5b, 0x09,
-	0xe3, 0x32, 0x55, 0x3d, 0x98, 0xaf, 0xc2, 0xfd, 0x3e, 0x27, 0x42, 0xa4, 0xc2, 0xad, 0xd9, 0xc2,
-	0x88, 0x05, 0x57, 0x36, 0xbd, 0xea, 0xfc, 0xa2, 0x93, 0x1c, 0x53, 0xa1, 0x16, 0x6c, 0x85, 0x54,
-	0x12, 0xae, 0x8c, 0xaf, 0xe8, 0x37, 0xe7, 0xea, 0x27, 0x65, 0x8d, 0xe7, 0xb0, 0xb6, 0x17, 0x45,
-	0xcc, 0xc7, 0x32, 0x64, 0xb4, 0x27, 0x39, 0x96, 0x24, 0x18, 0x1e, 0x30, 0xea, 0x0f, 0x38, 0x27,
-	0xd4, 0x1f, 0xa2, 0x7f, 0x60, 0xf1, 0x1c, 0x47, 0x03, 0x62, 0x5b, 0x75, 0xab, 0xb9, 0xe2, 0x9a,
-	0x1f, 0x8d, 0xa7, 0xf0, 0xff, 0x34, 0xe6, 0x92, 0x53, 0x4e, 0xc4, 0xd9, 0x1c, 0xe4, 0x6b, 0x0e,
-	0xd0, 0x34, 0x83, 0x5e, 0x40, 0x41, 0xa5, 0xac, 0xb5, 0xd5, 0xf6, 0xba, 0x33, 0xee, 0xc6, 0x99,
-	0x56, 0x3b, 0xc7, 0xc3, 0x84, 0xb8, 0x1a, 0x40, 0x1f, 0xa0, 0xe2, 0x8f, 0xf7, 0x69, 0xe7, 0xea,
-	0x56, 0xb3, 0xd2, 0x7e, 0x78, 0x3d, 0x3f, 0xf1, 0x62, 0xee, 0x24, 0x8d, 0x76, 0x61, 0x89, 0x9b,
-	0xdd, 0xdb, 0x79, 0x6d, 0xb4, 0x79, 0xbd, 0x51, 0xfa, 0xaa, 0xee, 0x88, 0x6a, 0x3c, 0x86, 0x82,
-	0xda, 0x1b, 0x02, 0x28, 0xee, 0x45, 0x17, 0x78, 0x28, 0x6a, 0x0b, 0xea, 0xda, 0xc5, 0xb4, 0xcf,
-	0xe2, 0x9a, 0x85, 0x96, 0xa1, 0xf4, 0xf6, 0x52, 0xf5, 0x84, 0xa3, 0x5a, 0xae, 0xf1, 0x3d, 0x0f,
-	0xff, 0x1d, 0xd1, 0x13, 0x36, 0xa0, 0xfd, 0x03, 0x46, 0x29, 0xf1, 0x95, 0xf7, 0x81, 0xee, 0x05,
-	0xed, 0x43, 0x49, 0x10, 0x29, 0x43, 0x1a, 0x08, 0x1d, 0x4a, 0xa5, 0xbd, 0x35, 0xb9, 0x17, 0x33,
-	0x1f, 0x8e, 0x19, 0x50, 0x9d, 0x47, 0xff, 0xa3, 0x99, 0x4f, 0x37, 0xe3, 0xd0, 0x2e, 0x80, 0xaa,
-	0xda, 0xe3, 0x98, 0x06, 0x24, 0x8d, 0xa6, 0x3e, 0xc3, 0x85, 0x12, 0xe9, 0x74, 0x19, 0x97, 0xae,
-	0xd2, 0xb9, 0xe5, 0x64, 0x74, 0x89, 0x5e, 0x43, 0x39, 0x0a, 0x85, 0x24, 0xd4, 0x63, 0x34, 0x4d,
-	0xe4, 0xfe, 0x1c, 0xfe, 0xa8, 0xdb, 0xe1, 0x87, 0x2c, 0xc6, 0x21, 0x75, 0x4b, 0x86, 0xe9, 0x50,
-	0x54, 0x83, 0xbc, 0xc4, 0x81, 0x5d, 0xa8, 0x5b, 0xcd, 0xb2, 0xab, 0x2e, 0x51, 0x07, 0xfe, 0xc6,
-	0x59, 0x8c, 0x9e, 0x48, 0x73, 0xb4, 0x17, 0xb5, 0xf7, 0xbd, 0x1b, 0xd2, 0x46, 0x78, 0x7a, 0x70,
-	0x8e, 0xe1, 0x2f, 0x21, 0x39, 0xc1, 0xb1, 0x97, 0xc5, 0x55, 0xd4, 0x66, 0x8f, 0x26, 0xcd, 0xb2,
-	0xb1, 0x77, 0x46, 0x9f, 0x89, 0xd3, 0xd3, 0x94, 0x49, 0xdb, 0xad, 0x1a, 0x8f, 0xde, 0x28, 0xb9,
-	0x1d, 0xb0, 0xd5, 0x5a, 0x17, 0x5e, 0x82, 0x85, 0x08, 0xcf, 0x89, 0xe7, 0x67, 0xfd, 0xd8, 0x4b,
-	0x75, 0xab, 0x59, 0x72, 0xff, 0xd5, 0xcf, 0xbb, 0xe6, 0xf1, 0xb8, 0xbd, 0xc6, 0x8f, 0x1c, 0xd8,
-	0x9d, 0x81, 0xfc, 0x73, 0xa5, 0x1e, 0xc2, 0xb2, 0x20, 0xb4, 0xef, 0xc9, 0x33, 0xce, 0x06, 0xc1,
-	0x59, 0x5a, 0xeb, 0x2d, 0x6a, 0xa9, 0x28, 0xec, 0xd8, 0x50, 0xb3, 0x62, 0xcb, 0xff, 0x7e, 0x6c,
-	0x9f, 0xa1, 0x9a, 0x70, 0x76, 0x39, 0x1c, 0x9b, 0x9a, 0x62, 0xb7, 0x6f, 0x30, 0xed, 0x2a, 0x28,
-	0xf5, 0x5c, 0xd1, 0x0e, 0x99, 0xe5, 0xd4, 0x08, 0x35, 0xbe, 0xe5, 0xa0, 0x98, 0xe6, 0xf9, 0x0a,
-	0x96, 0x42, 0xf3, 0xfd, 0xd8, 0x56, 0x3d, 0xdf, 0xac, 0x5c, 0x3d, 0x38, 0xe6, 0x7c, 0x5a, 0xee,
-	0x88, 0x41, 0x6f, 0xa0, 0xc4, 0xd2, 0xaa, 0xec, 0x9c, 0xe6, 0x37, 0x26, 0xf9, 0x79, 0x35, 0xba,
-	0x19, 0x85, 0x5a, 0x90, 0x8f, 0x58, 0x90, 0x46, 0xb7, 0x36, 0xa3, 0x83, 0x88, 0x05, 0x4e, 0x4a,
-	0x29, 0x25, 0xda, 0x81, 0x3c, 0x4e, 0x12, 0xbb, 0xa0, 0x57, 0xbb, 0x6d, 0xf9, 0x0a, 0x41, 0x2f,
-	0xa1, 0x9c, 0x25, 0x97, 0xc6, 0x7a, 0x77, 0x76, 0xac, 0xe9, 0x7a, 0x63, 0xf9, 0xf6, 0x16, 0x2c,
-	0x9b, 0x9b, 0xef, 0x18, 0x8f, 0xb1, 0x54, 0xc7, 0x50, 0x57, 0x9d, 0xfb, 0x27, 0x83, 0xd3, 0xda,
-	0x02, 0x2a, 0x41, 0xe1, 0x7d, 0xaf, 0xf3, 0xa9, 0x66, 0xed, 0xaf, 0x43, 0xd5, 0x67, 0xf1, 0x84,
-	0xeb, 0x7e, 0xc5, 0x70, 0x5a, 0xfd, 0xa5, 0xa0, 0x6e, 0x9d, 0x14, 0xf5, 0x5f, 0xc6, 0xb3, 0x9f,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x0d, 0xbe, 0x70, 0x63, 0x5d, 0x07, 0x00, 0x00,
+	0x29, 0xdb, 0x28, 0x03, 0xa5, 0xa3, 0x08, 0x31, 0x21, 0xc1, 0xd8, 0x3a, 0x90, 0x06, 0x82, 0x16,
+	0x77, 0xe2, 0x82, 0x9b, 0xc8, 0x4b, 0xbd, 0x2c, 0x52, 0x62, 0x47, 0xb6, 0xbb, 0x2d, 0x8f, 0xc0,
+	0xab, 0x70, 0xc5, 0xab, 0xf0, 0x04, 0xbc, 0x0a, 0x72, 0x92, 0xa6, 0x1d, 0x6d, 0xb7, 0x49, 0x88,
+	0xbb, 0x34, 0xf9, 0x7e, 0x9f, 0x9d, 0xef, 0xfb, 0xc7, 0x85, 0x5b, 0x67, 0x6d, 0x41, 0x22, 0xcb,
+	0xe1, 0x41, 0xcb, 0xe1, 0x82, 0xb6, 0x1c, 0xce, 0x4e, 0x3c, 0xd7, 0x0a, 0x05, 0x57, 0x1c, 0xc1,
+	0xe8, 0xa1, 0xa0, 0xab, 0xdb, 0x53, 0xc2, 0x20, 0xe0, 0xac, 0x25, 0xa9, 0xf0, 0x88, 0xdf, 0x52,
+	0x51, 0x48, 0x07, 0x76, 0x40, 0xa5, 0x24, 0x2e, 0x4d, 0xe8, 0xd5, 0xf5, 0xd9, 0x04, 0xa3, 0xaa,
+	0x15, 0x72, 0xa1, 0x52, 0xd5, 0xfd, 0xf9, 0x2a, 0x32, 0x18, 0x08, 0x2a, 0x65, 0x2a, 0xdc, 0x9c,
+	0x2d, 0xf4, 0xb9, 0x7b, 0x69, 0xd3, 0xab, 0xd6, 0x2f, 0x3a, 0x25, 0x08, 0x93, 0x7a, 0xc1, 0x96,
+	0xc7, 0x14, 0x15, 0xda, 0xf8, 0x92, 0x7e, 0x63, 0xae, 0x7e, 0x52, 0xd6, 0x78, 0x0a, 0x6b, 0x7b,
+	0xbe, 0xcf, 0x1d, 0xa2, 0x3c, 0xce, 0xfa, 0x4a, 0x10, 0x45, 0xdd, 0xa8, 0xc3, 0x99, 0x33, 0x14,
+	0x82, 0x32, 0x27, 0x42, 0xff, 0xc0, 0xe2, 0x19, 0xf1, 0x87, 0xd4, 0x34, 0xea, 0x46, 0x73, 0x05,
+	0x27, 0x3f, 0x1a, 0x8f, 0xe1, 0xff, 0x69, 0x0c, 0xd3, 0x13, 0x41, 0xe5, 0xe9, 0x1c, 0xe4, 0x4b,
+	0x0e, 0xd0, 0x34, 0x83, 0x9e, 0x41, 0x41, 0xa7, 0x1c, 0x6b, 0xab, 0xed, 0x7b, 0xd6, 0xb8, 0x1b,
+	0x6b, 0x5a, 0x6d, 0x1d, 0x45, 0x21, 0xc5, 0x31, 0x80, 0xde, 0x41, 0xc5, 0x19, 0xef, 0xd3, 0xcc,
+	0xd5, 0x8d, 0x66, 0xa5, 0xfd, 0xe0, 0x6a, 0x7e, 0xe2, 0xc5, 0xf0, 0x24, 0x8d, 0x76, 0x61, 0x49,
+	0x24, 0xbb, 0x37, 0xf3, 0xb1, 0xd1, 0xc6, 0xd5, 0x46, 0xe9, 0xab, 0xe2, 0x11, 0xd5, 0x78, 0x04,
+	0x05, 0xbd, 0x37, 0x04, 0x50, 0xdc, 0xf3, 0xcf, 0x49, 0x24, 0x6b, 0x0b, 0xfa, 0x1a, 0x13, 0x36,
+	0xe0, 0x41, 0xcd, 0x40, 0xcb, 0x50, 0x7a, 0x7d, 0xa1, 0x7b, 0x22, 0x7e, 0x2d, 0xd7, 0xf8, 0x9e,
+	0x87, 0xff, 0x0e, 0xd9, 0x31, 0x1f, 0xb2, 0x41, 0x87, 0x33, 0x46, 0x1d, 0xed, 0xdd, 0x89, 0x7b,
+	0x41, 0xfb, 0x50, 0x92, 0x54, 0x29, 0x8f, 0xb9, 0x32, 0x0e, 0xa5, 0xd2, 0xde, 0x9c, 0xdc, 0x4b,
+	0x32, 0x1f, 0x56, 0x32, 0xa0, 0x71, 0x1e, 0x83, 0xf7, 0xc9, 0x7c, 0xe2, 0x8c, 0x43, 0xbb, 0x00,
+	0xba, 0x6a, 0x5b, 0x10, 0xe6, 0xd2, 0x34, 0x9a, 0xfa, 0x0c, 0x17, 0x46, 0x95, 0xd5, 0xe3, 0x42,
+	0x61, 0xad, 0xc3, 0xe5, 0x70, 0x74, 0x89, 0x5e, 0x42, 0xd9, 0xf7, 0xa4, 0xa2, 0xcc, 0xe6, 0x2c,
+	0x4d, 0xe4, 0xee, 0x1c, 0xfe, 0xb0, 0xd7, 0x15, 0x07, 0x3c, 0x20, 0x1e, 0xc3, 0xa5, 0x84, 0xe9,
+	0x32, 0x54, 0x83, 0xbc, 0x22, 0xae, 0x59, 0xa8, 0x1b, 0xcd, 0x32, 0xd6, 0x97, 0xa8, 0x0b, 0x7f,
+	0x93, 0x2c, 0x46, 0x5b, 0xa6, 0x39, 0x9a, 0x8b, 0xb1, 0xf7, 0x9d, 0x6b, 0xd2, 0x46, 0x64, 0x7a,
+	0x70, 0x8e, 0xe0, 0x2f, 0xa9, 0x04, 0x25, 0x81, 0x9d, 0xc5, 0x55, 0x8c, 0xcd, 0x1e, 0x4e, 0x9a,
+	0x65, 0x63, 0x6f, 0x8d, 0x3e, 0x13, 0xab, 0x1f, 0x53, 0x49, 0xda, 0xb8, 0x9a, 0x78, 0xf4, 0x47,
+	0xc9, 0xed, 0x80, 0xa9, 0xd7, 0x3a, 0xb7, 0x43, 0x22, 0xa5, 0x77, 0x46, 0x6d, 0x27, 0xeb, 0xc7,
+	0x5c, 0xaa, 0x1b, 0xcd, 0x12, 0xfe, 0x37, 0x7e, 0xde, 0x4b, 0x1e, 0x8f, 0xdb, 0x6b, 0xfc, 0xc8,
+	0x81, 0xd9, 0x1d, 0xaa, 0x3f, 0x57, 0xea, 0x01, 0x2c, 0x4b, 0xca, 0x06, 0xb6, 0x3a, 0x15, 0x7c,
+	0xe8, 0x9e, 0xa6, 0xb5, 0xde, 0xa0, 0x96, 0x8a, 0xc6, 0x8e, 0x12, 0x6a, 0x56, 0x6c, 0xf9, 0xdf,
+	0x8f, 0xed, 0x23, 0x54, 0x43, 0xc1, 0x2f, 0xa2, 0xb1, 0x69, 0x52, 0xec, 0xd6, 0x35, 0xa6, 0x3d,
+	0x0d, 0xa5, 0x9e, 0x2b, 0xb1, 0x43, 0x66, 0x39, 0x35, 0x42, 0x8d, 0x6f, 0x39, 0x28, 0xa6, 0x79,
+	0xbe, 0x80, 0x25, 0x2f, 0xf9, 0x7e, 0x4c, 0xa3, 0x9e, 0x6f, 0x56, 0x2e, 0x1f, 0x1c, 0x73, 0x3e,
+	0x2d, 0x3c, 0x62, 0xd0, 0x2b, 0x28, 0xf1, 0xb4, 0x2a, 0x33, 0x17, 0xf3, 0xeb, 0x93, 0xfc, 0xbc,
+	0x1a, 0x71, 0x46, 0xa1, 0x16, 0xe4, 0x7d, 0xee, 0xa6, 0xd1, 0xad, 0xcd, 0xe8, 0xc0, 0xe7, 0xae,
+	0x95, 0x52, 0x5a, 0x89, 0x76, 0x20, 0x4f, 0xc2, 0xd0, 0x2c, 0xc4, 0xab, 0xdd, 0xb4, 0x7c, 0x8d,
+	0xa0, 0xe7, 0x50, 0xce, 0x92, 0x4b, 0x63, 0xbd, 0x3d, 0x3b, 0xd6, 0x74, 0xbd, 0xb1, 0x7c, 0x6b,
+	0x13, 0x96, 0x93, 0x9b, 0x6f, 0xb8, 0x08, 0x88, 0xd2, 0xc7, 0x50, 0x4f, 0x9f, 0xfb, 0xc7, 0xc3,
+	0x93, 0xda, 0x02, 0x2a, 0x41, 0xe1, 0x6d, 0xbf, 0xfb, 0xa1, 0x66, 0xec, 0x6f, 0x43, 0xd5, 0xe1,
+	0xc1, 0x84, 0xeb, 0x7e, 0x25, 0xe1, 0x62, 0xf5, 0xe7, 0x82, 0xbe, 0xf5, 0x35, 0x07, 0x9f, 0xda,
+	0x98, 0x44, 0x56, 0x87, 0x0b, 0x7a, 0x5c, 0x8c, 0xff, 0x3f, 0x9e, 0xfc, 0x0c, 0x00, 0x00, 0xff,
+	0xff, 0xff, 0x44, 0xf3, 0xc8, 0x6a, 0x07, 0x00, 0x00,
 }

+ 1 - 1
main/distro/all/all.go

@@ -21,7 +21,7 @@ import (
 	_ "v2ray.com/core/transport/internet/tcp"
 	_ "v2ray.com/core/transport/internet/tls"
 	_ "v2ray.com/core/transport/internet/udp"
-	_ "v2ray.com/core/transport/internet/ws"
+	_ "v2ray.com/core/transport/internet/websocket"
 
 	_ "v2ray.com/core/transport/internet/headers/http"
 	_ "v2ray.com/core/transport/internet/headers/noop"

+ 5 - 4
proxy/blackhole/config.pb.go

@@ -72,7 +72,7 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/blackhole/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 205 bytes of a gzipped FileDescriptorProto
+	// 223 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8,
 	0xd4, 0x4f, 0xca, 0x49, 0x4c, 0xce, 0xce, 0xc8, 0xcf, 0x49, 0xd5, 0x4f, 0xce, 0xcf, 0x4b, 0xcb,
@@ -83,7 +83,8 @@ var fileDescriptor0 = []byte{
 	0x41, 0x7e, 0x5e, 0x71, 0x2a, 0x88, 0xef, 0x11, 0x12, 0x12, 0x00, 0xe7, 0xfb, 0x70, 0xb1, 0x39,
 	0x83, 0x6d, 0x17, 0x72, 0xe2, 0xe2, 0x28, 0x82, 0x8a, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b,
 	0xa9, 0xe9, 0x21, 0x39, 0x05, 0x62, 0x95, 0x1e, 0xc4, 0x2a, 0xbd, 0x10, 0x90, 0x55, 0xbe, 0x10,
-	0x9b, 0x82, 0xe0, 0xfa, 0x9c, 0x2c, 0xb8, 0xe4, 0x92, 0xf3, 0x73, 0xf5, 0x70, 0xfb, 0xc0, 0x89,
-	0x1b, 0x62, 0x5b, 0x00, 0xc8, 0x71, 0x51, 0x9c, 0x70, 0xf1, 0x24, 0x36, 0xb0, 0x73, 0x8d, 0x01,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x03, 0x0e, 0x8c, 0x2b, 0x01, 0x00, 0x00,
+	0x9b, 0x82, 0xe0, 0xfa, 0x9c, 0x42, 0xb9, 0xe4, 0x92, 0xf3, 0x73, 0xf5, 0x70, 0xfb, 0xc0, 0x89,
+	0x1b, 0x62, 0x5b, 0x00, 0xc8, 0x71, 0x51, 0x9c, 0x70, 0xf1, 0x55, 0x4c, 0x52, 0x61, 0x46, 0x41,
+	0x89, 0x95, 0x7a, 0xce, 0x20, 0x4d, 0x01, 0x60, 0x4d, 0x4e, 0x30, 0xc9, 0x24, 0x36, 0xb0, 0x5f,
+	0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xca, 0x68, 0xd4, 0x4f, 0x48, 0x01, 0x00, 0x00,
 }

+ 20 - 19
proxy/dokodemo/config.pb.go

@@ -64,23 +64,24 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/dokodemo/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 275 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4b, 0x33, 0x31,
-	0x10, 0xc6, 0xd9, 0xf7, 0xad, 0x6d, 0xc9, 0xfa, 0x07, 0x72, 0x8a, 0x82, 0xb0, 0xf6, 0xd2, 0xc5,
-	0x43, 0x02, 0x15, 0xbc, 0x78, 0xab, 0x7a, 0x10, 0x44, 0xcb, 0x1e, 0xbd, 0x94, 0x35, 0x9b, 0x4a,
-	0xe8, 0x26, 0xb3, 0xcc, 0x8e, 0xd6, 0x7e, 0x5e, 0xbf, 0x88, 0x98, 0xec, 0xa2, 0x08, 0xf5, 0x96,
-	0x79, 0xf8, 0xe5, 0x37, 0xc3, 0xc3, 0xce, 0xdf, 0x66, 0x58, 0x6e, 0xa5, 0x06, 0xa7, 0x34, 0xa0,
-	0x51, 0x0d, 0xc2, 0xfb, 0x56, 0x55, 0xb0, 0x86, 0xca, 0x38, 0x50, 0x1a, 0xfc, 0xca, 0xbe, 0xc8,
-	0x06, 0x81, 0x80, 0x1f, 0xf7, 0x2c, 0x1a, 0x19, 0x38, 0xd9, 0x73, 0x27, 0xd3, 0x5f, 0x1a, 0x0d,
-	0xce, 0x81, 0x57, 0xde, 0x90, 0x2a, 0xab, 0x0a, 0x4d, 0xdb, 0x46, 0xc7, 0x5f, 0xa0, 0x37, 0xb4,
-	0x01, 0x5c, 0x47, 0x70, 0xf2, 0x91, 0xb0, 0xe1, 0x75, 0xd8, 0xce, 0xaf, 0xd8, 0xa8, 0x93, 0x88,
-	0x24, 0x4b, 0xf2, 0x74, 0x76, 0x26, 0x7f, 0x5c, 0x12, 0x0d, 0xd2, 0x1b, 0x92, 0x77, 0x8b, 0x47,
-	0xbc, 0x01, 0x57, 0x5a, 0x5f, 0xf4, 0x3f, 0x38, 0x67, 0x83, 0x06, 0x90, 0xc4, 0xbf, 0x2c, 0xc9,
-	0x0f, 0x8a, 0xf0, 0xe6, 0xb7, 0x6c, 0xbf, 0x5b, 0xb6, 0xac, 0x6d, 0x4b, 0xe2, 0x7f, 0xb0, 0x4e,
-	0x76, 0x58, 0x1f, 0x22, 0x7a, 0x6f, 0x5b, 0x2a, 0x52, 0xff, 0x3d, 0x70, 0xc1, 0x46, 0x64, 0x9d,
-	0x81, 0x57, 0x12, 0x83, 0x60, 0xef, 0x47, 0x3e, 0x65, 0x47, 0x2b, 0xa8, 0x6b, 0xd8, 0x2c, 0xd1,
-	0x54, 0x16, 0x8d, 0x26, 0xb1, 0x97, 0x25, 0xf9, 0xb8, 0x38, 0x8c, 0x71, 0xd1, 0xa5, 0xf3, 0x4b,
-	0x76, 0xaa, 0xc1, 0xc9, 0x9d, 0xc5, 0xce, 0xd3, 0xd8, 0xc1, 0xe2, 0xab, 0x93, 0xa7, 0x71, 0x1f,
-	0x3f, 0x0f, 0x43, 0x49, 0x17, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x21, 0x97, 0x31, 0xca, 0xbf,
-	0x01, 0x00, 0x00,
+	// 293 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x4f, 0x4b, 0xfb, 0x30,
+	0x18, 0xc7, 0xe9, 0x7e, 0xfb, 0x6d, 0x23, 0xf5, 0x0f, 0xe4, 0x94, 0x09, 0x42, 0xdd, 0x65, 0xc5,
+	0x43, 0x02, 0xf5, 0xe8, 0x6d, 0x9b, 0x07, 0x41, 0xb4, 0xe4, 0xe0, 0xc1, 0xcb, 0xa8, 0x69, 0x26,
+	0x61, 0x4d, 0x9e, 0x92, 0x46, 0x67, 0xdf, 0x92, 0x6f, 0xcb, 0x37, 0x22, 0x4b, 0x5a, 0x14, 0x61,
+	0xde, 0xfa, 0x3c, 0xfd, 0x7c, 0x3f, 0x4f, 0xf8, 0xa2, 0xcb, 0xb7, 0xcc, 0x16, 0x2d, 0x15, 0xa0,
+	0x99, 0x00, 0x2b, 0x59, 0x6d, 0xe1, 0xbd, 0x65, 0x25, 0x6c, 0xa1, 0x94, 0x1a, 0x98, 0x00, 0xb3,
+	0x51, 0x2f, 0xb4, 0xb6, 0xe0, 0x00, 0x4f, 0x7b, 0xd6, 0x4a, 0xea, 0x39, 0xda, 0x73, 0x67, 0xf3,
+	0x5f, 0x1a, 0x01, 0x5a, 0x83, 0x61, 0x46, 0x3a, 0x56, 0x94, 0xa5, 0x95, 0x4d, 0x13, 0x1c, 0x7f,
+	0x81, 0x46, 0xba, 0x1d, 0xd8, 0x6d, 0x00, 0x67, 0x9f, 0x11, 0x1a, 0x2d, 0xfd, 0x75, 0x7c, 0x8d,
+	0xc6, 0x9d, 0x84, 0x44, 0x49, 0x94, 0xc6, 0xd9, 0x05, 0xfd, 0xf1, 0x92, 0x60, 0xa0, 0x46, 0x3a,
+	0x7a, 0x9b, 0x3f, 0xd8, 0x15, 0xe8, 0x42, 0x19, 0xde, 0x27, 0x30, 0x46, 0xc3, 0x1a, 0xac, 0x23,
+	0x83, 0x24, 0x4a, 0x8f, 0xb9, 0xff, 0xc6, 0x37, 0xe8, 0xa8, 0x3b, 0xb6, 0xae, 0x54, 0xe3, 0xc8,
+	0x3f, 0x6f, 0x9d, 0x1d, 0xb0, 0xde, 0x07, 0xf4, 0x4e, 0x35, 0x8e, 0xc7, 0xe6, 0x7b, 0xc0, 0x04,
+	0x8d, 0x9d, 0xd2, 0x12, 0x5e, 0x1d, 0x19, 0x7a, 0x7b, 0x3f, 0xe2, 0x39, 0x3a, 0xdd, 0x40, 0x55,
+	0xc1, 0x6e, 0x6d, 0x65, 0xa9, 0xac, 0x14, 0x8e, 0xfc, 0x4f, 0xa2, 0x74, 0xc2, 0x4f, 0xc2, 0x9a,
+	0x77, 0xdb, 0x05, 0x47, 0xe7, 0x02, 0x34, 0x3d, 0x58, 0xec, 0x22, 0x0e, 0x1d, 0xe4, 0xfb, 0x4e,
+	0x9e, 0x26, 0xfd, 0xfa, 0x63, 0x30, 0x7d, 0xcc, 0x78, 0xd1, 0xd2, 0xe5, 0x3e, 0x92, 0xfb, 0xc8,
+	0xaa, 0xfb, 0xf7, 0x3c, 0xf2, 0x05, 0x5e, 0x7d, 0x05, 0x00, 0x00, 0xff, 0xff, 0x88, 0x4d, 0x7b,
+	0x60, 0xdb, 0x01, 0x00, 0x00,
 }

+ 5 - 4
proxy/freedom/config.pb.go

@@ -67,7 +67,7 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/freedom/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 199 bytes of a gzipped FileDescriptorProto
+	// 217 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x2c, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8,
 	0xd4, 0x4f, 0x2b, 0x4a, 0x4d, 0x4d, 0x01, 0x0b, 0xe5, 0xa5, 0x65, 0xa6, 0xeb, 0x15, 0x14, 0xe5,
@@ -78,7 +78,8 @@ var fileDescriptor0 = []byte{
 	0x5c, 0xec, 0x25, 0x99, 0xb9, 0xa9, 0xf9, 0xa5, 0x25, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xbc, 0x41,
 	0x30, 0xae, 0x92, 0x3a, 0x17, 0x1f, 0xaa, 0x5e, 0x21, 0x4e, 0x2e, 0x56, 0xc7, 0xe0, 0x78, 0xcf,
 	0x60, 0x01, 0x06, 0x21, 0x2e, 0x2e, 0xb6, 0xd0, 0x60, 0xd7, 0x78, 0xcf, 0x00, 0x01, 0x46, 0x27,
-	0x13, 0x2e, 0x99, 0xe4, 0xfc, 0x5c, 0x9c, 0x0e, 0x71, 0xe2, 0x86, 0xb8, 0x24, 0x00, 0xe4, 0xdb,
-	0x28, 0x76, 0xa8, 0x68, 0x12, 0x1b, 0xd8, 0xf7, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36,
-	0x2d, 0x5d, 0x28, 0x2a, 0x01, 0x00, 0x00,
+	0x7f, 0x2e, 0x99, 0xe4, 0xfc, 0x5c, 0x9c, 0x0e, 0x71, 0xe2, 0x86, 0xb8, 0x24, 0x00, 0xe4, 0xdb,
+	0x28, 0x76, 0xa8, 0xe8, 0x2a, 0x26, 0x89, 0x30, 0xa3, 0xa0, 0xc4, 0x4a, 0x3d, 0x67, 0x90, 0x86,
+	0x00, 0xb0, 0x06, 0x37, 0x88, 0x54, 0x12, 0x1b, 0x38, 0x60, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0xae, 0x54, 0x8c, 0x36, 0x45, 0x01, 0x00, 0x00,
 }

+ 5 - 4
proxy/http/config.pb.go

@@ -56,15 +56,16 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/http/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 147 bytes of a gzipped FileDescriptorProto
+	// 167 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2b, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x28, 0xca, 0xaf, 0xa8,
 	0xd4, 0xcf, 0x28, 0x29, 0x29, 0xd0, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca,
 	0x2f, 0xc9, 0x17, 0x12, 0x85, 0xa9, 0x2b, 0x4a, 0xd5, 0x03, 0xab, 0xd1, 0x03, 0xa9, 0x51, 0xd2,
 	0xe0, 0xe2, 0x09, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0x72, 0x06, 0x2b, 0x16, 0x92, 0xe0, 0x62, 0x2f,
 	0xc9, 0xcc, 0x4d, 0xcd, 0x2f, 0x2d, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x82, 0x71, 0x95,
-	0xf8, 0xb8, 0x78, 0x9c, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0x20, 0x2a, 0x9d, 0xf4, 0xb8, 0x24, 0x93,
+	0xf8, 0xb8, 0x78, 0x9c, 0x73, 0x32, 0x53, 0xf3, 0x4a, 0x20, 0x2a, 0x9d, 0xdc, 0xb8, 0x24, 0x93,
 	0xf3, 0x73, 0xf5, 0xb0, 0x1a, 0xeb, 0xc4, 0x0d, 0x51, 0x14, 0x00, 0xb2, 0x3a, 0x8a, 0x05, 0x24,
-	0x94, 0xc4, 0x06, 0x76, 0x87, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x71, 0x5d, 0x1f, 0xb1,
-	0x00, 0x00, 0x00,
+	0xb4, 0x8a, 0x49, 0x34, 0xcc, 0x28, 0x28, 0xb1, 0x52, 0xcf, 0x19, 0xa4, 0x34, 0x00, 0xac, 0xd4,
+	0xa3, 0xa4, 0xa4, 0x20, 0x89, 0x0d, 0xec, 0x3e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa1,
+	0x81, 0x13, 0x9c, 0xc9, 0x00, 0x00, 0x00,
 }

+ 29 - 28
proxy/shadowsocks/config.pb.go

@@ -141,32 +141,33 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/shadowsocks/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 431 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x91, 0x4f, 0x6f, 0xd3, 0x40,
-	0x10, 0xc5, 0xeb, 0x24, 0x6a, 0xc3, 0x6c, 0x00, 0xb3, 0xa7, 0x28, 0x42, 0xc2, 0xca, 0x29, 0x54,
-	0x62, 0xdd, 0x9a, 0x3f, 0xe2, 0xc0, 0xc5, 0x31, 0xa9, 0x5a, 0x21, 0xa5, 0xc8, 0x4d, 0x85, 0x84,
-	0x90, 0x2c, 0x77, 0x3d, 0x10, 0x8b, 0xd8, 0xb3, 0xda, 0xb5, 0x5b, 0xf2, 0x91, 0xf9, 0x16, 0xc8,
-	0xeb, 0x24, 0x44, 0x1c, 0xc2, 0xcd, 0x33, 0x7e, 0xef, 0xf9, 0xcd, 0xcf, 0xf0, 0xea, 0x3e, 0xd0,
-	0xe9, 0x5a, 0x48, 0x2a, 0x7c, 0x49, 0x1a, 0x7d, 0xa5, 0xe9, 0xd7, 0xda, 0x37, 0xcb, 0x34, 0xa3,
-	0x07, 0x43, 0xf2, 0xa7, 0xf1, 0x25, 0x95, 0xdf, 0xf3, 0x1f, 0x42, 0x69, 0xaa, 0x88, 0x3f, 0xdf,
-	0xca, 0x35, 0x0a, 0x2b, 0x15, 0x7b, 0xd2, 0xd1, 0xcb, 0x7f, 0xc2, 0x24, 0x15, 0x05, 0x95, 0xbe,
-	0xb5, 0x4a, 0x5a, 0xf9, 0xb5, 0x41, 0xdd, 0x06, 0x8d, 0xce, 0xfe, 0x23, 0x35, 0xa8, 0xef, 0x51,
-	0x27, 0x46, 0xa1, 0x6c, 0x1d, 0xe3, 0xdf, 0x0e, 0x9c, 0x84, 0x52, 0x52, 0x5d, 0x56, 0x7c, 0x04,
-	0x7d, 0x95, 0x1a, 0xf3, 0x40, 0x3a, 0x1b, 0x3a, 0x9e, 0x33, 0x79, 0x14, 0xef, 0x66, 0x7e, 0x05,
-	0x4c, 0xe6, 0x6a, 0x89, 0x3a, 0xa9, 0xd6, 0x0a, 0x87, 0x1d, 0xcf, 0x99, 0x3c, 0x09, 0x26, 0xe2,
-	0x50, 0x71, 0x11, 0x59, 0xc3, 0x62, 0xad, 0x30, 0x06, 0xb9, 0x7b, 0xe6, 0x11, 0x74, 0xa9, 0x4a,
-	0x87, 0x5d, 0x1b, 0x71, 0x7e, 0x38, 0x62, 0x53, 0x4d, 0x5c, 0x97, 0xb8, 0xc8, 0x0b, 0x0c, 0xeb,
-	0x6a, 0x19, 0x37, 0xee, 0x71, 0x00, 0x6c, 0x6f, 0xc7, 0xfb, 0xd0, 0x0b, 0xeb, 0x8a, 0xdc, 0x23,
-	0x3e, 0x80, 0xfe, 0xc7, 0xdc, 0xa4, 0x77, 0x2b, 0xcc, 0x5c, 0x87, 0x33, 0x38, 0x99, 0x95, 0xed,
-	0xd0, 0x19, 0x23, 0x0c, 0x6e, 0x2c, 0x80, 0xc8, 0xc2, 0xe7, 0x2f, 0x80, 0xd5, 0x99, 0x4a, 0xb0,
-	0x15, 0xd8, 0x93, 0xfb, 0x31, 0xd4, 0x99, 0xda, 0x58, 0xf8, 0x1b, 0xe8, 0x35, 0x70, 0xed, 0xb5,
-	0x2c, 0xf0, 0xf6, 0xab, 0xb6, 0x64, 0xc5, 0x96, 0xac, 0xb8, 0x35, 0xa8, 0x63, 0xab, 0x1e, 0xc7,
-	0x30, 0x88, 0x56, 0x39, 0x96, 0xd5, 0xe6, 0x33, 0x53, 0x38, 0x6e, 0xb9, 0x0f, 0x1d, 0xaf, 0x3b,
-	0x61, 0xc1, 0xe9, 0xa1, 0x9c, 0xb6, 0xe0, 0xac, 0xcc, 0x14, 0xe5, 0x65, 0x15, 0x6f, 0x9c, 0xa7,
-	0xdf, 0x00, 0xfe, 0xd2, 0x6c, 0xae, 0xba, 0x9d, 0x7f, 0x9a, 0x5f, 0x7f, 0x99, 0xbb, 0x47, 0xfc,
-	0x29, 0xb0, 0x70, 0x76, 0x93, 0x9c, 0x07, 0xef, 0x93, 0xe8, 0x62, 0xea, 0x3a, 0xdb, 0x45, 0xf0,
-	0xf6, 0x9d, 0x5d, 0x74, 0x1a, 0x24, 0xd1, 0x65, 0x18, 0x5d, 0x86, 0xc1, 0x99, 0xdb, 0xe5, 0xcf,
-	0xe0, 0xf1, 0x76, 0x4a, 0xae, 0x66, 0x17, 0x0b, 0xb7, 0x37, 0xfd, 0x00, 0x9e, 0xa4, 0xe2, 0xe0,
-	0x9f, 0x98, 0xb2, 0xf6, 0x9a, 0xcf, 0x4d, 0xd1, 0xaf, 0x6c, 0xef, 0xcd, 0xdd, 0xb1, 0x2d, 0xff,
-	0xfa, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x59, 0xf6, 0xcd, 0xed, 0xf5, 0x02, 0x00, 0x00,
+	// 448 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x51, 0xdd, 0x6e, 0xd3, 0x4c,
+	0x14, 0xac, 0x93, 0xa8, 0xcd, 0x77, 0x36, 0x1f, 0x98, 0xbd, 0x8a, 0xa2, 0x4a, 0x58, 0xb9, 0x0a,
+	0x95, 0x58, 0xb7, 0xcb, 0x8f, 0xb8, 0x75, 0x4c, 0xaa, 0x56, 0x48, 0x69, 0xe5, 0xa4, 0x20, 0x01,
+	0x92, 0xe5, 0xae, 0x17, 0x62, 0x11, 0xfb, 0xac, 0x76, 0xed, 0x16, 0xbf, 0x12, 0x6f, 0xc6, 0x5b,
+	0x20, 0xaf, 0x93, 0x36, 0xe2, 0x22, 0xdc, 0xf9, 0x9c, 0x33, 0x33, 0x9e, 0x99, 0x85, 0x97, 0x77,
+	0x5c, 0x27, 0x35, 0x13, 0x98, 0xfb, 0x02, 0xb5, 0xf4, 0x95, 0xc6, 0x9f, 0xb5, 0x6f, 0x56, 0x49,
+	0x8a, 0xf7, 0x06, 0xc5, 0x0f, 0xe3, 0x0b, 0x2c, 0xbe, 0x65, 0xdf, 0x99, 0xd2, 0x58, 0x22, 0x3d,
+	0xde, 0xc2, 0xb5, 0x64, 0x16, 0xca, 0x76, 0xa0, 0xa3, 0x17, 0x7f, 0x89, 0x09, 0xcc, 0x73, 0x2c,
+	0x7c, 0x4b, 0x15, 0xb8, 0xf6, 0x2b, 0x23, 0x75, 0x2b, 0x34, 0x3a, 0xfd, 0x07, 0xd4, 0x48, 0x7d,
+	0x27, 0x75, 0x6c, 0x94, 0x14, 0x2d, 0x63, 0xfc, 0xdb, 0x81, 0xa3, 0x40, 0x08, 0xac, 0x8a, 0x92,
+	0x8e, 0xa0, 0xaf, 0x12, 0x63, 0xee, 0x51, 0xa7, 0x43, 0xc7, 0x73, 0x26, 0xff, 0x45, 0x0f, 0x33,
+	0xbd, 0x04, 0x22, 0x32, 0xb5, 0x92, 0x3a, 0x2e, 0x6b, 0x25, 0x87, 0x1d, 0xcf, 0x99, 0x3c, 0xe1,
+	0x13, 0xb6, 0xcf, 0x38, 0x0b, 0x2d, 0x61, 0x59, 0x2b, 0x19, 0x81, 0x78, 0xf8, 0xa6, 0x21, 0x74,
+	0xb1, 0x4c, 0x86, 0x5d, 0x2b, 0x71, 0xb6, 0x5f, 0x62, 0x63, 0x8d, 0x5d, 0x15, 0x72, 0x99, 0xe5,
+	0x32, 0xa8, 0xca, 0x55, 0xd4, 0xb0, 0xc7, 0x1c, 0xc8, 0xce, 0x8e, 0xf6, 0xa1, 0x17, 0x54, 0x25,
+	0xba, 0x07, 0x74, 0x00, 0xfd, 0xf7, 0x99, 0x49, 0x6e, 0xd7, 0x32, 0x75, 0x1d, 0x4a, 0xe0, 0x68,
+	0x56, 0xb4, 0x43, 0x67, 0x2c, 0x61, 0xb0, 0xb0, 0x05, 0x84, 0xb6, 0x7c, 0xfa, 0x1c, 0x48, 0x95,
+	0xaa, 0x58, 0xb6, 0x00, 0x1b, 0xb9, 0x1f, 0x41, 0x95, 0xaa, 0x0d, 0x85, 0xbe, 0x86, 0x5e, 0x53,
+	0xae, 0x4d, 0x4b, 0xb8, 0xb7, 0x6b, 0xb5, 0x6d, 0x96, 0x6d, 0x9b, 0x65, 0x37, 0x46, 0xea, 0xc8,
+	0xa2, 0xc7, 0x11, 0x0c, 0xc2, 0x75, 0x26, 0x8b, 0x72, 0xf3, 0x9b, 0x29, 0x1c, 0xb6, 0xbd, 0x0f,
+	0x1d, 0xaf, 0x3b, 0x21, 0xfc, 0x64, 0x9f, 0x4e, 0x6b, 0x70, 0x56, 0xa4, 0x0a, 0xb3, 0xa2, 0x8c,
+	0x36, 0xcc, 0x93, 0xaf, 0x00, 0x8f, 0x6d, 0x36, 0xa9, 0x6e, 0xe6, 0x1f, 0xe6, 0x57, 0x9f, 0xe6,
+	0xee, 0x01, 0x7d, 0x0a, 0x24, 0x98, 0x2d, 0xe2, 0x33, 0xfe, 0x2e, 0x0e, 0xcf, 0xa7, 0xae, 0xb3,
+	0x5d, 0xf0, 0x37, 0x6f, 0xed, 0xa2, 0xd3, 0x54, 0x12, 0x5e, 0x04, 0xe1, 0x45, 0xc0, 0x4f, 0xdd,
+	0x2e, 0x7d, 0x06, 0xff, 0x6f, 0xa7, 0xf8, 0x72, 0x76, 0xbe, 0x74, 0x7b, 0xd3, 0x2f, 0xe0, 0x09,
+	0xcc, 0xf7, 0xbe, 0xc4, 0x94, 0xb4, 0x69, 0xae, 0x1b, 0xa3, 0x9f, 0xc9, 0xce, 0xe5, 0x57, 0xe7,
+	0xf8, 0x23, 0x8f, 0x92, 0x9a, 0x85, 0x0d, 0xf1, 0xda, 0x12, 0x17, 0x8f, 0xe7, 0xdb, 0x43, 0x9b,
+	0xed, 0xd5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0xb9, 0x5c, 0xee, 0x14, 0x03, 0x00, 0x00,
 }

+ 30 - 29
proxy/socks/config.pb.go

@@ -116,33 +116,34 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/socks/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 435 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0x51, 0x6f, 0xd3, 0x30,
-	0x10, 0xc7, 0x49, 0x4b, 0xd7, 0xec, 0xd2, 0xa1, 0xca, 0x42, 0x28, 0xca, 0x0b, 0xa1, 0x12, 0x22,
-	0xda, 0x83, 0x33, 0x85, 0x17, 0xc4, 0xc4, 0x43, 0xba, 0x55, 0x82, 0x97, 0xb5, 0x72, 0x87, 0x90,
-	0x78, 0xa9, 0x3c, 0xc7, 0xb0, 0x68, 0x8d, 0x6d, 0xd9, 0x4e, 0x21, 0x5f, 0x93, 0x4f, 0x84, 0x1a,
-	0x27, 0xd3, 0x40, 0xed, 0x9b, 0xcf, 0x77, 0xf7, 0xbf, 0xfb, 0xff, 0x0e, 0xde, 0xed, 0x32, 0x4d,
-	0x1b, 0xcc, 0x64, 0x95, 0x32, 0xa9, 0x79, 0xaa, 0xb4, 0xfc, 0xdd, 0xa4, 0x46, 0xb2, 0x07, 0x93,
-	0x32, 0x29, 0x7e, 0x94, 0x3f, 0xb1, 0xd2, 0xd2, 0x4a, 0xf4, 0xaa, 0x2f, 0xd4, 0x1c, 0xb7, 0x45,
-	0xb8, 0x2d, 0x8a, 0xfe, 0x17, 0x60, 0xb2, 0xaa, 0xa4, 0x48, 0x05, 0xb7, 0x29, 0x2d, 0x0a, 0xcd,
-	0x8d, 0x71, 0x02, 0xd1, 0xc5, 0xe1, 0xc2, 0x36, 0xc9, 0xe4, 0x36, 0x35, 0x5c, 0xef, 0xb8, 0xde,
-	0x18, 0xc5, 0x99, 0xeb, 0x98, 0xe5, 0x30, 0xce, 0x19, 0x93, 0xb5, 0xb0, 0x28, 0x02, 0xbf, 0x36,
-	0x5c, 0x0b, 0x5a, 0xf1, 0xd0, 0x8b, 0xbd, 0xe4, 0x94, 0x3c, 0xc6, 0xfb, 0x9c, 0xa2, 0xc6, 0xfc,
-	0x92, 0xba, 0x08, 0x07, 0x2e, 0xd7, 0xc7, 0xb3, 0x3f, 0x03, 0x98, 0xac, 0x5b, 0xe1, 0xab, 0xd6,
-	0x0c, 0xfa, 0x04, 0xa7, 0xb4, 0xb6, 0xf7, 0x1b, 0xdb, 0x28, 0xa7, 0xf4, 0x22, 0x8b, 0xf1, 0x61,
-	0x6b, 0x38, 0xaf, 0xed, 0xfd, 0x6d, 0xa3, 0x38, 0xf1, 0x69, 0xf7, 0x42, 0x37, 0xe0, 0x53, 0xb7,
-	0x92, 0x09, 0x07, 0xf1, 0x30, 0x09, 0xb2, 0xec, 0x58, 0xf7, 0xd3, 0xb1, 0xb8, 0xf3, 0x61, 0x16,
-	0xc2, 0xea, 0x86, 0x3c, 0x6a, 0xa0, 0x4b, 0x18, 0x77, 0x94, 0xc2, 0x61, 0xec, 0x25, 0x41, 0xf6,
-	0xe6, 0xa9, 0x9c, 0x43, 0x84, 0x05, 0xb7, 0xf8, 0xcb, 0x6a, 0xa9, 0xaf, 0x65, 0x45, 0x4b, 0x41,
-	0xfa, 0x0e, 0xf4, 0x1a, 0x82, 0xba, 0x50, 0x1b, 0x2e, 0xe8, 0xdd, 0x96, 0x17, 0xe1, 0xf3, 0xd8,
-	0x4b, 0x7c, 0x02, 0x75, 0xa1, 0x16, 0xee, 0x07, 0x85, 0x30, 0xb6, 0x65, 0xc5, 0x65, 0x6d, 0xc3,
-	0x51, 0xec, 0x25, 0x67, 0xa4, 0x0f, 0xa3, 0x4b, 0x38, 0xfb, 0x67, 0x25, 0x34, 0x85, 0xe1, 0x03,
-	0x6f, 0x3a, 0xb6, 0xfb, 0x27, 0x7a, 0x09, 0xa3, 0x1d, 0xdd, 0xd6, 0xbc, 0x63, 0xea, 0x82, 0x8f,
-	0x83, 0x0f, 0xde, 0x8c, 0xc0, 0xe4, 0x6a, 0x5b, 0x72, 0x61, 0x3b, 0xa6, 0x73, 0x38, 0x71, 0xc7,
-	0x0b, 0xbd, 0x16, 0xc9, 0xf9, 0x01, 0x0f, 0xfd, 0x99, 0x3b, 0x2c, 0x0b, 0x51, 0x28, 0x59, 0x0a,
-	0x4b, 0xba, 0xce, 0xf3, 0xb7, 0xe0, 0xf7, 0xb8, 0x51, 0x00, 0xe3, 0x9b, 0xe5, 0x26, 0xff, 0x7a,
-	0xfb, 0x79, 0xfa, 0x0c, 0x4d, 0xc0, 0x5f, 0xe5, 0xeb, 0xf5, 0xb7, 0x25, 0xb9, 0x9e, 0x7a, 0xf3,
-	0x0b, 0x88, 0x98, 0xac, 0x8e, 0x20, 0x9f, 0x07, 0x6e, 0xa1, 0xd5, 0x7e, 0xd6, 0xf7, 0x51, 0xfb,
-	0x77, 0x77, 0xd2, 0x4e, 0x7e, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xcd, 0xac, 0xc7, 0xe9,
-	0x02, 0x00, 0x00,
+	// 453 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0x41, 0x6f, 0xd3, 0x30,
+	0x14, 0xc7, 0x49, 0x4b, 0xd7, 0xec, 0xa5, 0x43, 0x95, 0x85, 0xa6, 0x28, 0x17, 0x42, 0x25, 0x44,
+	0xb4, 0x83, 0x83, 0xc2, 0x05, 0x31, 0x71, 0x48, 0xbb, 0x4a, 0xec, 0xb2, 0x56, 0xee, 0x00, 0x89,
+	0x4b, 0xe5, 0x39, 0x86, 0x45, 0x6b, 0xec, 0xc8, 0x76, 0x0a, 0xf9, 0x4a, 0x7c, 0x1c, 0x3e, 0x11,
+	0x4a, 0x9c, 0x4c, 0x63, 0xea, 0x6e, 0x7e, 0x7e, 0xff, 0xf7, 0xf7, 0xfb, 0xff, 0x0c, 0x6f, 0xf7,
+	0x89, 0xa2, 0x35, 0x66, 0xb2, 0x88, 0x99, 0x54, 0x3c, 0x2e, 0x95, 0xfc, 0x5d, 0xc7, 0x5a, 0xb2,
+	0x3b, 0x1d, 0x33, 0x29, 0x7e, 0xe4, 0x3f, 0x71, 0xa9, 0xa4, 0x91, 0xe8, 0xb4, 0x17, 0x2a, 0x8e,
+	0x5b, 0x11, 0x6e, 0x45, 0xc1, 0x63, 0x03, 0x26, 0x8b, 0x42, 0x8a, 0x58, 0x70, 0x13, 0xd3, 0x2c,
+	0x53, 0x5c, 0x6b, 0x6b, 0x10, 0xbc, 0x3b, 0x2c, 0x6c, 0x9b, 0x4c, 0xee, 0x62, 0xcd, 0xd5, 0x9e,
+	0xab, 0xad, 0x2e, 0x39, 0xb3, 0x13, 0xb3, 0x14, 0xc6, 0x29, 0x63, 0xb2, 0x12, 0x06, 0x05, 0xe0,
+	0x56, 0x9a, 0x2b, 0x41, 0x0b, 0xee, 0x3b, 0xa1, 0x13, 0x1d, 0x93, 0xfb, 0xba, 0xe9, 0x95, 0x54,
+	0xeb, 0x5f, 0x52, 0x65, 0xfe, 0xc0, 0xf6, 0xfa, 0x7a, 0xf6, 0x77, 0x00, 0x93, 0x4d, 0x6b, 0xbc,
+	0x68, 0xc3, 0xa0, 0x4f, 0x70, 0x4c, 0x2b, 0x73, 0xbb, 0x35, 0x75, 0x69, 0x9d, 0x5e, 0x24, 0x21,
+	0x3e, 0x1c, 0x0d, 0xa7, 0x95, 0xb9, 0xbd, 0xae, 0x4b, 0x4e, 0x5c, 0xda, 0x9d, 0xd0, 0x15, 0xb8,
+	0xd4, 0xae, 0xa4, 0xfd, 0x41, 0x38, 0x8c, 0xbc, 0x24, 0x79, 0x6a, 0xfa, 0xe1, 0xb3, 0xb8, 0xcb,
+	0xa1, 0x97, 0xc2, 0xa8, 0x9a, 0xdc, 0x7b, 0xa0, 0x73, 0x18, 0x77, 0x94, 0xfc, 0x61, 0xe8, 0x44,
+	0x5e, 0xf2, 0xfa, 0xa1, 0x9d, 0x45, 0x84, 0x05, 0x37, 0xf8, 0x72, 0xbd, 0x52, 0x17, 0xb2, 0xa0,
+	0xb9, 0x20, 0xfd, 0x04, 0x7a, 0x05, 0x5e, 0x95, 0x95, 0x5b, 0x2e, 0xe8, 0xcd, 0x8e, 0x67, 0xfe,
+	0xf3, 0xd0, 0x89, 0x5c, 0x02, 0x55, 0x56, 0x2e, 0xed, 0x0d, 0xf2, 0x61, 0x6c, 0xf2, 0x82, 0xcb,
+	0xca, 0xf8, 0xa3, 0xd0, 0x89, 0x4e, 0x48, 0x5f, 0x06, 0xe7, 0x70, 0xf2, 0xdf, 0x4a, 0x68, 0x0a,
+	0xc3, 0x3b, 0x5e, 0x77, 0x6c, 0x9b, 0x23, 0x7a, 0x09, 0xa3, 0x3d, 0xdd, 0x55, 0xbc, 0x63, 0x6a,
+	0x8b, 0x8f, 0x83, 0x0f, 0xce, 0x8c, 0xc0, 0x64, 0xb1, 0xcb, 0xb9, 0x30, 0x1d, 0xd3, 0x39, 0x1c,
+	0xd9, 0xcf, 0xf3, 0x9d, 0x16, 0xc9, 0xd9, 0x81, 0x0c, 0xfd, 0x37, 0x77, 0x58, 0x96, 0x22, 0x2b,
+	0x65, 0x2e, 0x0c, 0xe9, 0x26, 0xcf, 0xde, 0x80, 0xdb, 0xe3, 0x46, 0x1e, 0x8c, 0xaf, 0x56, 0xdb,
+	0xf4, 0xcb, 0xf5, 0xe7, 0xe9, 0x33, 0x34, 0x01, 0x77, 0x9d, 0x6e, 0x36, 0xdf, 0x56, 0xe4, 0x62,
+	0xea, 0xcc, 0x2f, 0x21, 0x60, 0xb2, 0x78, 0x02, 0xf9, 0xdc, 0xb3, 0x0b, 0xad, 0x9b, 0xb7, 0xbe,
+	0x8f, 0xda, 0xbb, 0x3f, 0x83, 0xd3, 0xaf, 0x09, 0xa1, 0x35, 0x5e, 0x34, 0xe2, 0x75, 0x2b, 0xde,
+	0x34, 0x8d, 0x9b, 0xa3, 0x76, 0xa5, 0xf7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x8f, 0x57,
+	0x58, 0x02, 0x03, 0x00, 0x00,
 }

+ 17 - 16
proxy/vmess/account.pb.go

@@ -57,20 +57,21 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/account.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 233 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0xcf, 0xcf, 0x4a, 0xc3, 0x40,
-	0x10, 0x06, 0x70, 0x36, 0xa2, 0xd5, 0xf5, 0x0f, 0x9a, 0x83, 0xc4, 0x9e, 0x82, 0xa7, 0x20, 0x32,
-	0x8b, 0xf5, 0x09, 0xac, 0x27, 0x6f, 0x92, 0x1e, 0x04, 0x2f, 0x25, 0xce, 0x8e, 0x75, 0xa1, 0x9b,
-	0x29, 0xb3, 0xdb, 0x62, 0x1e, 0xc2, 0x77, 0x16, 0x37, 0x09, 0x88, 0x78, 0xdc, 0xe5, 0x9b, 0xdf,
-	0x7c, 0xa3, 0xab, 0xdd, 0x4c, 0x9a, 0x0e, 0x90, 0xbd, 0x41, 0x16, 0x32, 0x1b, 0xe1, 0xcf, 0xce,
-	0xec, 0x3c, 0x85, 0x60, 0x1a, 0x44, 0xde, 0xb6, 0x11, 0x36, 0xc2, 0x91, 0xf3, 0xcb, 0x31, 0x29,
-	0x04, 0x29, 0x05, 0x29, 0x35, 0xbd, 0xfd, 0x23, 0x20, 0x7b, 0xcf, 0xad, 0x49, 0x43, 0xc8, 0x6b,
-	0xf3, 0x41, 0x8d, 0x25, 0x09, 0xbd, 0x72, 0xfd, 0xa5, 0xf4, 0xe4, 0xa1, 0x77, 0xf3, 0x33, 0x9d,
-	0x39, 0x5b, 0xa8, 0x52, 0x55, 0x47, 0x75, 0xe6, 0x6c, 0x7e, 0xa5, 0x0f, 0x9b, 0x75, 0x24, 0x59,
-	0x3a, 0x5b, 0x64, 0xa5, 0xaa, 0x4e, 0xeb, 0x49, 0x7a, 0x3f, 0xd9, 0xfc, 0x45, 0x5f, 0x04, 0xc2,
-	0xad, 0xb8, 0xd8, 0x2d, 0x03, 0xc5, 0xe8, 0xda, 0x55, 0x28, 0xf6, 0x4a, 0x55, 0x1d, 0xcf, 0x6e,
-	0xe0, 0x57, 0xb1, 0x7e, 0x39, 0x8c, 0xcb, 0x61, 0x31, 0x0c, 0x3d, 0x72, 0xfb, 0xee, 0x56, 0xf5,
-	0xf9, 0x88, 0x2c, 0x06, 0x63, 0x7e, 0xa7, 0xa7, 0xc8, 0x1e, 0xfe, 0xbf, 0x6d, 0x7e, 0x32, 0x54,
-	0x7d, 0xfe, 0xf1, 0x5e, 0xf7, 0xd3, 0xe7, 0xdb, 0x41, 0xd2, 0xef, 0xbf, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0xd1, 0x70, 0xc9, 0x65, 0x3b, 0x01, 0x00, 0x00,
+	// 250 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x8f, 0x4f, 0x4b, 0xc3, 0x30,
+	0x18, 0xc6, 0x49, 0x45, 0xa7, 0xf1, 0x0f, 0xda, 0xc3, 0xa8, 0x3b, 0x15, 0x4f, 0x45, 0xe4, 0x0d,
+	0xd4, 0x4f, 0xe0, 0x76, 0xd2, 0xd3, 0xe8, 0x60, 0x82, 0x97, 0x11, 0x93, 0x38, 0x03, 0x4b, 0xdf,
+	0xf1, 0x26, 0x1b, 0xf6, 0x43, 0xf8, 0x45, 0xfc, 0x94, 0xd2, 0xb4, 0x05, 0x91, 0x1d, 0x93, 0xfc,
+	0x9e, 0xdf, 0xf3, 0x84, 0x17, 0xfb, 0x92, 0x64, 0x03, 0x0a, 0x9d, 0x50, 0x48, 0x46, 0x6c, 0x09,
+	0xbf, 0x1a, 0xb1, 0x77, 0xc6, 0x7b, 0x21, 0x95, 0xc2, 0x5d, 0x1d, 0x60, 0x4b, 0x18, 0x30, 0x1d,
+	0x0f, 0x24, 0x19, 0x88, 0x14, 0x44, 0x6a, 0xf2, 0xf0, 0xcf, 0xa0, 0xd0, 0x39, 0xac, 0x45, 0x0c,
+	0x29, 0xdc, 0x88, 0x4f, 0x23, 0xb5, 0x21, 0xdf, 0x59, 0xee, 0xbe, 0x19, 0x1f, 0x3d, 0x75, 0xde,
+	0xf4, 0x8a, 0x27, 0x56, 0x67, 0x2c, 0x67, 0xc5, 0x59, 0x95, 0x58, 0x9d, 0xde, 0xf2, 0x53, 0xb9,
+	0x09, 0x86, 0x56, 0x56, 0x67, 0x49, 0xce, 0x8a, 0xcb, 0x6a, 0x14, 0xcf, 0xcf, 0x3a, 0x7d, 0xe5,
+	0x37, 0xde, 0xa8, 0x1d, 0xd9, 0xd0, 0xac, 0xbc, 0x09, 0xc1, 0xd6, 0x6b, 0x9f, 0x1d, 0xe5, 0xac,
+	0x38, 0x2f, 0xef, 0xe1, 0xcf, 0xb0, 0xae, 0x1c, 0x86, 0x72, 0x58, 0xf4, 0xa1, 0x19, 0xd6, 0x1f,
+	0x76, 0x5d, 0x5d, 0x0f, 0x92, 0x45, 0xef, 0x98, 0xbe, 0xf0, 0x89, 0x42, 0x07, 0x87, 0xff, 0x36,
+	0xbd, 0xe8, 0xa7, 0xce, 0x5b, 0xdf, 0xdb, 0x71, 0xbc, 0xfc, 0x49, 0xc6, 0xcb, 0xb2, 0x92, 0x0d,
+	0xcc, 0x5a, 0x7a, 0x1e, 0xe9, 0x65, 0xfb, 0xf0, 0x7e, 0x12, 0x6b, 0x1f, 0x7f, 0x03, 0x00, 0x00,
+	0xff, 0xff, 0x5d, 0x45, 0x43, 0x16, 0x54, 0x01, 0x00, 0x00,
 }

+ 20 - 19
proxy/vmess/inbound/config.pb.go

@@ -91,23 +91,24 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/inbound/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 283 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x4b, 0xc3, 0x40,
-	0x10, 0xc5, 0x49, 0xab, 0x89, 0x4e, 0xac, 0x87, 0xe0, 0x21, 0x7a, 0x28, 0x21, 0xa7, 0x0a, 0xba,
-	0x0b, 0xd1, 0x93, 0x27, 0xa9, 0x01, 0xf1, 0x26, 0x01, 0x2f, 0x5e, 0x24, 0xdd, 0x4c, 0x25, 0x90,
-	0x64, 0xca, 0x66, 0x13, 0xec, 0x87, 0xf4, 0x3b, 0x49, 0x27, 0x1b, 0xfc, 0x73, 0xb0, 0xc7, 0x19,
-	0xde, 0xef, 0xcd, 0x7b, 0x03, 0xb2, 0x4f, 0x74, 0xbe, 0x15, 0x8a, 0x6a, 0xa9, 0x48, 0xa3, 0xdc,
-	0x68, 0xfa, 0xd8, 0xca, 0xbe, 0xc6, 0xb6, 0x95, 0x65, 0xb3, 0xa2, 0xae, 0x29, 0xa4, 0xa2, 0x66,
-	0x5d, 0xbe, 0x8b, 0x8d, 0x26, 0x43, 0xc1, 0x7c, 0x04, 0x34, 0x0a, 0x16, 0x0b, 0x16, 0x0b, 0x2b,
-	0xbe, 0xb8, 0xfc, 0x63, 0xa8, 0xa8, 0xae, 0xa9, 0x91, 0x0c, 0x2b, 0xaa, 0x64, 0xd7, 0xa2, 0x1e,
-	0xac, 0xe2, 0x39, 0x9c, 0xa4, 0x68, 0xa8, 0xd3, 0x0f, 0x7c, 0x20, 0x38, 0x85, 0x89, 0xa1, 0xd0,
-	0x89, 0x9c, 0xc5, 0x71, 0x36, 0x31, 0x14, 0xdf, 0xc3, 0x2c, 0xc5, 0x75, 0xde, 0x55, 0xc6, 0x0a,
-	0xce, 0xe1, 0x28, 0xaf, 0x0c, 0xea, 0xb7, 0xb2, 0x60, 0xd9, 0x2c, 0xf3, 0x78, 0x7e, 0x2a, 0x82,
-	0x33, 0x38, 0xac, 0xb0, 0xc7, 0x2a, 0x9c, 0xf0, 0x7e, 0x18, 0xe2, 0x4f, 0x07, 0x5c, 0xcb, 0xde,
-	0xc2, 0xc1, 0xee, 0x74, 0xe8, 0x44, 0xd3, 0x85, 0x9f, 0x44, 0xe2, 0x47, 0x8d, 0x21, 0xa2, 0x18,
-	0x23, 0x8a, 0x97, 0x16, 0x75, 0xc6, 0xea, 0xe0, 0x11, 0xbc, 0x62, 0x88, 0xc0, 0xc6, 0x7e, 0x72,
-	0x2d, 0xfe, 0xef, 0x2f, 0x7e, 0x25, 0xce, 0x46, 0x3a, 0x48, 0xc1, 0x2d, 0xb8, 0x6b, 0x38, 0x65,
-	0x9f, 0xab, 0xfd, 0x3e, 0xdf, 0x9f, 0xc9, 0x2c, 0xbb, 0xbc, 0x83, 0x58, 0x51, 0xbd, 0x07, 0x5d,
-	0xfa, 0x03, 0xf5, 0xbc, 0xeb, 0xf3, 0xea, 0xd9, 0xed, 0xca, 0xe5, 0x7e, 0x37, 0x5f, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0xf7, 0x79, 0xbc, 0x25, 0xf2, 0x01, 0x00, 0x00,
+	// 302 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xcf, 0x4e, 0x83, 0x40,
+	0x10, 0xc6, 0x03, 0xd5, 0xa2, 0x8b, 0xf5, 0x40, 0x3c, 0xa0, 0x07, 0x42, 0x38, 0xd5, 0x44, 0x77,
+	0x13, 0xf4, 0x01, 0x4c, 0x4b, 0x62, 0x7a, 0x6b, 0x36, 0xb1, 0x07, 0x3d, 0x18, 0xba, 0x6c, 0x0d,
+	0x09, 0x30, 0xcd, 0xb2, 0x10, 0x79, 0x25, 0xdf, 0xc5, 0x77, 0x32, 0xcc, 0x42, 0xfc, 0x73, 0xb0,
+	0xc7, 0x99, 0x7c, 0xbf, 0x6f, 0xbe, 0x6f, 0x08, 0x6b, 0x63, 0x95, 0x76, 0x54, 0x40, 0xc9, 0x04,
+	0x28, 0xc9, 0xf6, 0x0a, 0xde, 0x3b, 0xd6, 0x96, 0xb2, 0xae, 0x59, 0x5e, 0x6d, 0xa1, 0xa9, 0x32,
+	0x26, 0xa0, 0xda, 0xe5, 0x6f, 0x74, 0xaf, 0x40, 0x83, 0x17, 0x8c, 0x80, 0x92, 0x14, 0xc5, 0x14,
+	0xc5, 0x74, 0x10, 0x5f, 0x5d, 0xff, 0x31, 0x14, 0x50, 0x96, 0x50, 0x31, 0x84, 0x05, 0x14, 0xac,
+	0xa9, 0xa5, 0x32, 0x56, 0x51, 0x40, 0xce, 0x12, 0xa9, 0xa1, 0x51, 0x4b, 0x3c, 0xe0, 0x9d, 0x13,
+	0x5b, 0x83, 0x6f, 0x85, 0xd6, 0xfc, 0x94, 0xdb, 0x1a, 0xa2, 0x07, 0x32, 0x4b, 0xe4, 0x2e, 0x6d,
+	0x0a, 0x3d, 0x08, 0x2e, 0xc9, 0x49, 0x5a, 0x68, 0xa9, 0x5e, 0xf3, 0x0c, 0x65, 0x33, 0xee, 0xe0,
+	0xbc, 0xca, 0xbc, 0x0b, 0x72, 0x5c, 0xc8, 0x56, 0x16, 0xbe, 0x8d, 0x7b, 0x33, 0x44, 0x9f, 0x16,
+	0x99, 0x0e, 0xec, 0x3d, 0x39, 0xea, 0x4f, 0xfb, 0x56, 0x38, 0x99, 0xbb, 0x71, 0x48, 0x7f, 0xd4,
+	0x30, 0x11, 0xe9, 0x18, 0x91, 0x3e, 0xd5, 0x52, 0x71, 0x54, 0x7b, 0x8f, 0xc4, 0xc9, 0x4c, 0x04,
+	0x34, 0x76, 0xe3, 0x5b, 0xfa, 0x7f, 0x7f, 0xfa, 0x2b, 0x31, 0x1f, 0x69, 0x2f, 0x21, 0xd3, 0x0c,
+	0xbb, 0xfa, 0x13, 0xf4, 0xb9, 0x39, 0xec, 0xf3, 0xfd, 0x19, 0x3e, 0xb0, 0x8b, 0x17, 0x12, 0x09,
+	0x28, 0x0f, 0xa0, 0x0b, 0xd7, 0x50, 0xeb, 0xbe, 0xcf, 0xb3, 0x33, 0x6c, 0x3f, 0xec, 0x60, 0x13,
+	0xf3, 0xb4, 0xa3, 0xcb, 0x1e, 0x5b, 0x23, 0xb6, 0x41, 0x6c, 0x65, 0x04, 0xdb, 0x29, 0x3e, 0xe0,
+	0xee, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x49, 0x28, 0x20, 0xa9, 0x13, 0x02, 0x00, 0x00,
 }

+ 15 - 14
proxy/vmess/outbound/config.pb.go

@@ -52,18 +52,19 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/proxy/vmess/outbound/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 193 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8e, 0x31, 0x6b, 0xc3, 0x30,
-	0x10, 0x46, 0x29, 0x05, 0x63, 0xe4, 0xcd, 0x53, 0xe9, 0xd2, 0xd2, 0x2e, 0xa5, 0xc3, 0xa9, 0xb8,
-	0x6b, 0x27, 0x97, 0x76, 0x36, 0xce, 0x96, 0x25, 0xc4, 0xe7, 0x4b, 0x30, 0x44, 0x3a, 0x71, 0xb2,
-	0x45, 0xfc, 0xef, 0x43, 0x64, 0x14, 0x42, 0x96, 0xac, 0xc7, 0xf7, 0xde, 0x3b, 0xf5, 0x15, 0x2a,
-	0xd9, 0xce, 0x80, 0x6c, 0x34, 0xb2, 0x90, 0x76, 0xc2, 0xc7, 0x59, 0x07, 0x43, 0xde, 0x6b, 0x9e,
-	0xc6, 0x8e, 0x27, 0xdb, 0x6b, 0x64, 0xbb, 0x1b, 0xf6, 0xe0, 0x84, 0x47, 0x2e, 0x5f, 0x12, 0x21,
-	0x04, 0x71, 0x0d, 0x71, 0x0d, 0x69, 0xfd, 0x7c, 0xab, 0x44, 0x36, 0x86, 0xad, 0x8e, 0x34, 0xf2,
-	0x41, 0x7b, 0x92, 0x40, 0xb2, 0xf1, 0x8e, 0x70, 0x51, 0xbe, 0x35, 0x2a, 0xfb, 0x8d, 0x89, 0xf2,
-	0x5f, 0xe5, 0x2d, 0x21, 0x0d, 0x81, 0xe4, 0xe9, 0xe1, 0xf5, 0xf1, 0xa3, 0xa8, 0x3e, 0xe1, 0xaa,
-	0xb7, 0xa8, 0x20, 0xa9, 0x60, 0x15, 0x55, 0x7f, 0xb6, 0x77, 0x3c, 0xd8, 0xb1, 0xbd, 0xb0, 0xf5,
-	0x8f, 0x7a, 0x47, 0x36, 0x70, 0xe7, 0xd5, 0xba, 0x58, 0xb2, 0xcd, 0xd9, 0xb7, 0xce, 0xd3, 0xb9,
-	0xcb, 0x62, 0xe0, 0xfb, 0x14, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xb2, 0x8a, 0x78, 0x1d, 0x01, 0x00,
-	0x00,
+	// 213 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x8e, 0xb1, 0x4a, 0xc4, 0x40,
+	0x10, 0x86, 0x51, 0xe1, 0x38, 0xf6, 0xba, 0xab, 0xc4, 0xe6, 0x44, 0x1b, 0xb1, 0x98, 0x95, 0xf8,
+	0x06, 0x77, 0x68, 0x6b, 0x88, 0x90, 0xc2, 0x42, 0x49, 0x26, 0xa3, 0x04, 0xdc, 0x9d, 0x65, 0x36,
+	0x59, 0xcc, 0x2b, 0xf9, 0x94, 0x92, 0x89, 0x2b, 0x62, 0x63, 0x3b, 0x7c, 0xdf, 0xf7, 0x8f, 0xb9,
+	0x49, 0x85, 0x34, 0x13, 0x20, 0x3b, 0x8b, 0x2c, 0x64, 0x83, 0xf0, 0xc7, 0x64, 0x93, 0xa3, 0x18,
+	0x2d, 0x8f, 0x43, 0xcb, 0xa3, 0xef, 0x2c, 0xb2, 0x7f, 0xed, 0xdf, 0x20, 0x08, 0x0f, 0xbc, 0xdd,
+	0x65, 0x43, 0x08, 0x94, 0x06, 0xa5, 0x21, 0xd3, 0x67, 0x7f, 0x93, 0xc8, 0xce, 0xb1, 0xb7, 0x6a,
+	0x23, 0xbf, 0xdb, 0x48, 0x92, 0x48, 0x5e, 0x62, 0x20, 0x5c, 0x92, 0x17, 0xa5, 0x59, 0x1d, 0x74,
+	0x62, 0x7b, 0x6f, 0xd6, 0x15, 0x21, 0xf5, 0x89, 0xe4, 0xf4, 0xe8, 0xfc, 0xe4, 0x6a, 0x53, 0x5c,
+	0xc3, 0xaf, 0xbd, 0x25, 0x05, 0x39, 0x05, 0x8f, 0x9a, 0xba, 0xf3, 0x5d, 0xe0, 0xde, 0x0f, 0xd5,
+	0x8f, 0xbb, 0x7f, 0x36, 0x97, 0xc8, 0x0e, 0xfe, 0x79, 0x75, 0xbf, 0x59, 0x66, 0xcb, 0xb9, 0xf7,
+	0xb4, 0xce, 0xe7, 0xcf, 0xe3, 0x5d, 0x5d, 0x54, 0xcd, 0x04, 0x87, 0x59, 0x2c, 0x55, 0xac, 0x55,
+	0x7c, 0xf8, 0x26, 0xda, 0x95, 0xbe, 0x70, 0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0x51, 0x8a, 0x44,
+	0x99, 0x3f, 0x01, 0x00, 0x00,
 }

+ 3 - 3
tools/conf/transport_internet.go

@@ -12,7 +12,7 @@ import (
 	"v2ray.com/core/transport/internet/kcp"
 	"v2ray.com/core/transport/internet/tcp"
 	"v2ray.com/core/transport/internet/tls"
-	"v2ray.com/core/transport/internet/ws"
+	"v2ray.com/core/transport/internet/websocket"
 )
 
 var (
@@ -129,11 +129,11 @@ type WebSocketConfig struct {
 }
 
 func (v *WebSocketConfig) Build() (*serial.TypedMessage, error) {
-	config := &ws.Config{
+	config := &websocket.Config{
 		Path: v.Path,
 	}
 	if v.ConnectionReuse != nil {
-		config.ConnectionReuse = &ws.ConnectionReuse{
+		config.ConnectionReuse = &websocket.ConnectionReuse{
 			Enable: *v.ConnectionReuse,
 		}
 	}

+ 5 - 4
transport/config.pb.go

@@ -53,7 +53,7 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/transport/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 165 bytes of a gzipped FileDescriptorProto
+	// 180 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2d, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,
 	0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0x4f, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f,
@@ -61,8 +61,9 @@ var fileDescriptor0 = []byte{
 	0xaf, 0x24, 0xb5, 0x28, 0x2f, 0x15, 0xd5, 0x14, 0xa5, 0x64, 0x2e, 0x36, 0x67, 0x30, 0x5f, 0x28,
 	0x92, 0x4b, 0x20, 0x2f, 0xb5, 0xa4, 0x3c, 0xbf, 0x28, 0x3b, 0xbe, 0x38, 0xb5, 0xa4, 0x24, 0x33,
 	0x2f, 0xbd, 0x58, 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x4f, 0x0f, 0x9b, 0x55, 0x7a, 0x30,
-	0x03, 0xf5, 0xfc, 0x20, 0xda, 0x82, 0xa1, 0xba, 0x82, 0xf8, 0xf3, 0x50, 0x05, 0x9c, 0x8c, 0xb8,
+	0x03, 0xf5, 0xfc, 0x20, 0xda, 0x82, 0xa1, 0xba, 0x82, 0xf8, 0xf3, 0x50, 0x05, 0x9c, 0x3c, 0xb9,
 	0x24, 0x92, 0xf3, 0x73, 0xb1, 0x9a, 0xe2, 0xc4, 0x0d, 0xb1, 0x3e, 0x00, 0xe4, 0x9a, 0x28, 0x4e,
-	0xb8, 0x78, 0x12, 0x1b, 0xd8, 0x7d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xfb, 0x2d,
-	0x01, 0x0e, 0x01, 0x00, 0x00,
+	0xb8, 0xf8, 0x2a, 0x26, 0x91, 0x30, 0xa3, 0xa0, 0xc4, 0x4a, 0x3d, 0x67, 0x90, 0xf2, 0x10, 0x98,
+	0x70, 0x12, 0x1b, 0xd8, 0xd9, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xde, 0xf9, 0x7b,
+	0x25, 0x01, 0x00, 0x00,
 }

+ 22 - 21
transport/internet/config.pb.go

@@ -97,26 +97,27 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/transport/internet/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 325 bytes of a gzipped FileDescriptorProto
+	// 344 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0xcf, 0x4a, 0xc3, 0x40,
-	0x10, 0xc6, 0x49, 0x2b, 0xda, 0x6e, 0xab, 0xad, 0x39, 0x95, 0x82, 0x5a, 0x2b, 0x68, 0x2e, 0x4e,
-	0x24, 0x5e, 0x3c, 0xd7, 0xb3, 0x22, 0xa9, 0x17, 0xbd, 0x94, 0x18, 0xc7, 0x10, 0x34, 0xbb, 0x65,
-	0x76, 0xfc, 0x93, 0xa7, 0xf0, 0x09, 0x7c, 0x57, 0x49, 0x36, 0x1b, 0x4a, 0x28, 0x45, 0xf0, 0x36,
-	0x84, 0x6f, 0xbe, 0xfc, 0xe6, 0xc7, 0x0a, 0xf8, 0x08, 0x28, 0xca, 0x21, 0x56, 0x99, 0x1f, 0x2b,
-	0x42, 0x9f, 0x29, 0x92, 0x7a, 0xa9, 0x88, 0xfd, 0x54, 0x32, 0x92, 0x44, 0xf6, 0x63, 0x25, 0x5f,
-	0xd2, 0x04, 0x96, 0xa4, 0x58, 0xb9, 0x07, 0x36, 0x4f, 0x08, 0x75, 0x16, 0x6c, 0x76, 0x7c, 0xd6,
-	0xa8, 0x8b, 0x55, 0x96, 0x29, 0xe9, 0x17, 0x35, 0x12, 0xf9, 0x53, 0xd1, 0xab, 0xe9, 0x19, 0x5f,
-	0xac, 0x0f, 0x6a, 0xa4, 0x34, 0x7a, 0xf3, 0x39, 0x5f, 0xe2, 0xf3, 0x22, 0x43, 0xad, 0xa3, 0x04,
-	0xcd, 0xc6, 0xf4, 0xdb, 0x11, 0x83, 0x5b, 0xd3, 0x31, 0x47, 0xe6, 0x54, 0x26, 0xda, 0xbd, 0x12,
-	0x3b, 0x55, 0xed, 0xc8, 0x99, 0x38, 0xde, 0x5e, 0x70, 0x08, 0x2b, 0x7c, 0xa6, 0x13, 0x24, 0x32,
-	0x54, 0x8b, 0xa1, 0x8d, 0xbb, 0x33, 0xd1, 0xd1, 0x55, 0xcb, 0xa8, 0x35, 0x71, 0xbc, 0x5e, 0x70,
-	0xba, 0x66, 0xd5, 0xe0, 0xc0, 0x7d, 0x81, 0x73, 0x63, 0x68, 0xc2, 0x7a, 0x6f, 0xfa, 0xd3, 0x12,
-	0xfd, 0x39, 0x13, 0x46, 0xd9, 0x75, 0xa9, 0xe8, 0x1f, 0x38, 0x0f, 0x62, 0x58, 0x8d, 0x8b, 0x15,
-	0xac, 0xb6, 0xd7, 0x0b, 0x00, 0x36, 0x1a, 0x87, 0x86, 0x92, 0x70, 0x20, 0x1b, 0x8e, 0x4e, 0xc4,
-	0xae, 0xc6, 0xf8, 0x9d, 0x52, 0xce, 0x17, 0x85, 0xd7, 0x51, 0x7b, 0xe2, 0x78, 0xdd, 0xb0, 0x6f,
-	0x3f, 0x16, 0xc7, 0xb9, 0x73, 0xb1, 0x5f, 0x87, 0x6a, 0x80, 0xad, 0x12, 0xe0, 0xaf, 0x5e, 0x86,
-	0xb6, 0xc0, 0xfe, 0x79, 0x7a, 0x24, 0x7a, 0x77, 0xa4, 0xbe, 0xf2, 0xca, 0xce, 0x50, 0xb4, 0x39,
-	0x4a, 0x4a, 0x33, 0xdd, 0xb0, 0x18, 0x67, 0xe7, 0xe2, 0x38, 0x56, 0xd9, 0xe6, 0x03, 0x1f, 0x3b,
-	0x76, 0x7a, 0xda, 0x2e, 0x1f, 0xc2, 0xe5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x32, 0x45,
-	0x30, 0xb4, 0x02, 0x00, 0x00,
+	0x10, 0xc6, 0x49, 0x2b, 0xda, 0x6e, 0xab, 0xad, 0x39, 0x95, 0x42, 0xb5, 0x56, 0xd0, 0x9c, 0x26,
+	0x12, 0x2f, 0x9e, 0xdb, 0x93, 0x87, 0x8a, 0xa4, 0x45, 0xd0, 0x4b, 0x59, 0xe3, 0x18, 0x82, 0x66,
+	0xb7, 0xec, 0x8e, 0x7f, 0xf2, 0x14, 0x3e, 0x81, 0x2f, 0xe0, 0x53, 0x4a, 0x92, 0xdd, 0x50, 0x4a,
+	0x29, 0x82, 0xb7, 0x21, 0xf9, 0xe6, 0xcb, 0x6f, 0x7e, 0x84, 0xc1, 0x7b, 0xa0, 0x78, 0x06, 0x91,
+	0x4c, 0xfd, 0x48, 0x2a, 0xf4, 0x49, 0x71, 0xa1, 0x97, 0x52, 0x91, 0x9f, 0x08, 0x42, 0x25, 0x90,
+	0xfc, 0x48, 0x8a, 0xe7, 0x24, 0x86, 0xa5, 0x92, 0x24, 0xdd, 0x81, 0xcd, 0x2b, 0x84, 0x2a, 0x0b,
+	0x36, 0xdb, 0x3f, 0x5f, 0xab, 0x8b, 0x64, 0x9a, 0x4a, 0xe1, 0xe7, 0x35, 0x02, 0xe9, 0x43, 0xaa,
+	0x97, 0xb2, 0xa7, 0x7f, 0xb1, 0x39, 0xa8, 0x51, 0x25, 0xfc, 0xd5, 0xa7, 0x6c, 0x89, 0x4f, 0x8b,
+	0x14, 0xb5, 0xe6, 0x31, 0x96, 0x1b, 0xa3, 0x2f, 0x87, 0x75, 0x6e, 0xca, 0x8e, 0x19, 0x12, 0x25,
+	0x22, 0xd6, 0xee, 0x15, 0xdb, 0x33, 0xb5, 0x3d, 0x67, 0xe8, 0x78, 0x07, 0xc1, 0x11, 0xac, 0xf0,
+	0x95, 0x9d, 0x20, 0x90, 0xc0, 0x2c, 0x86, 0x36, 0xee, 0x8e, 0x59, 0x43, 0x9b, 0x96, 0x5e, 0x6d,
+	0xe8, 0x78, 0xad, 0xe0, 0x6c, 0xc3, 0x6a, 0x89, 0x03, 0xf3, 0x1c, 0x67, 0x5a, 0xd2, 0x84, 0xd5,
+	0xde, 0xe8, 0xbb, 0xc6, 0xda, 0x33, 0x52, 0xc8, 0xd3, 0x49, 0xa1, 0xe8, 0x1f, 0x38, 0xf7, 0xac,
+	0x6b, 0xc6, 0xc5, 0x0a, 0x56, 0xdd, 0x6b, 0x05, 0x00, 0x5b, 0x8d, 0xc3, 0x9a, 0x92, 0xb0, 0x23,
+	0xd6, 0x1c, 0x9d, 0xb2, 0x7d, 0x8d, 0xd1, 0x9b, 0x4a, 0x28, 0x5b, 0xe4, 0x5e, 0x7b, 0xf5, 0xa1,
+	0xe3, 0x35, 0xc3, 0xb6, 0x7d, 0x98, 0x1f, 0xe7, 0xce, 0xd8, 0x61, 0x15, 0xaa, 0x00, 0x76, 0x0a,
+	0x80, 0xbf, 0x7a, 0xe9, 0xda, 0x02, 0xfb, 0xe5, 0xd1, 0x31, 0x6b, 0xdd, 0x2a, 0xf9, 0x99, 0x19,
+	0x3b, 0x5d, 0x56, 0x27, 0x1e, 0x17, 0x66, 0x9a, 0x61, 0x3e, 0x8e, 0xa7, 0xec, 0x24, 0x92, 0xe9,
+	0xf6, 0x03, 0x1f, 0x1a, 0x76, 0xfa, 0xa9, 0x0d, 0xee, 0x82, 0x90, 0x67, 0x30, 0xc9, 0x93, 0xf3,
+	0x2a, 0x79, 0x6d, 0xde, 0x3f, 0xee, 0x16, 0x3f, 0xca, 0xe5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x5e, 0x2e, 0x73, 0x09, 0xd4, 0x02, 0x00, 0x00,
 }

+ 26 - 25
transport/internet/headers/http/config.pb.go

@@ -187,29 +187,30 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 373 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x93, 0x4f, 0x4b, 0xf3, 0x40,
-	0x10, 0xc6, 0x49, 0xd3, 0x37, 0x7d, 0x3b, 0x45, 0x91, 0x45, 0x24, 0x27, 0x2d, 0x39, 0x15, 0x0f,
-	0x1b, 0x48, 0xbd, 0xa8, 0xb7, 0xf6, 0x22, 0x42, 0x41, 0xb6, 0xd0, 0x83, 0xb7, 0x98, 0x8e, 0x36,
-	0x60, 0x77, 0xe3, 0xee, 0xa6, 0xe0, 0x37, 0xf0, 0x0b, 0xf9, 0xd9, 0xbc, 0xca, 0xfe, 0x49, 0xad,
-	0x07, 0xc1, 0x28, 0xde, 0x66, 0xda, 0x79, 0x7e, 0xcc, 0xf3, 0x64, 0x07, 0x2e, 0x37, 0x99, 0xcc,
-	0x9f, 0x69, 0x21, 0xd6, 0x69, 0x21, 0x24, 0xa6, 0x5a, 0xe6, 0x5c, 0x55, 0x42, 0xea, 0xb4, 0xe4,
-	0x1a, 0x25, 0x47, 0x9d, 0xae, 0x30, 0x5f, 0xa2, 0x54, 0xe9, 0x4a, 0xeb, 0x2a, 0x2d, 0x04, 0xbf,
-	0x2f, 0x1f, 0x68, 0x25, 0x85, 0x16, 0xe4, 0xb4, 0x11, 0x4b, 0xa4, 0x5b, 0x21, 0x6d, 0x84, 0xd4,
-	0x0b, 0xa9, 0x11, 0x26, 0x19, 0x44, 0x57, 0xb6, 0x27, 0x04, 0xba, 0x3c, 0x5f, 0x63, 0x1c, 0x0c,
-	0x83, 0x51, 0x9f, 0xd9, 0x9a, 0x1c, 0xc2, 0xbf, 0x4d, 0xfe, 0x58, 0x63, 0xdc, 0x19, 0x86, 0xa3,
-	0x3e, 0x73, 0x4d, 0x72, 0x02, 0xbd, 0x05, 0x4a, 0x55, 0x0a, 0xfe, 0x31, 0xe0, 0x54, 0x7e, 0xe0,
-	0x18, 0xa2, 0x19, 0xea, 0x95, 0x58, 0x7e, 0xf1, 0xff, 0x4b, 0x07, 0xf6, 0x18, 0x3e, 0xd5, 0xa8,
-	0xf4, 0xd4, 0x2e, 0x4e, 0x66, 0xd0, 0xdb, 0x38, 0xa4, 0x9d, 0x1c, 0x64, 0x63, 0xfa, 0x7d, 0x13,
-	0xd4, 0x6f, 0xc3, 0x1a, 0x06, 0xb9, 0x86, 0x68, 0x6d, 0x17, 0x88, 0x3b, 0x96, 0x96, 0xb5, 0xa1,
-	0xb9, 0xd5, 0x99, 0x27, 0x90, 0x03, 0x08, 0x6b, 0x59, 0xc6, 0xa1, 0x4d, 0xc0, 0x94, 0x86, 0xee,
-	0x04, 0x71, 0x77, 0x18, 0xb6, 0xa5, 0xbb, 0xb4, 0x99, 0x27, 0x24, 0x67, 0x10, 0xcd, 0x75, 0xae,
-	0x6b, 0x65, 0xf2, 0x2f, 0xc4, 0x72, 0x9b, 0xbf, 0xa9, 0xc9, 0x11, 0x44, 0x12, 0x73, 0x25, 0xb8,
-	0xf5, 0xd1, 0x67, 0xbe, 0x4b, 0xde, 0x02, 0xd8, 0x67, 0xa8, 0x2a, 0xc1, 0x15, 0xfe, 0x59, 0x82,
-	0xca, 0xee, 0xf5, 0x93, 0x04, 0x9d, 0x23, 0xe6, 0x09, 0x3b, 0x79, 0x85, 0xbf, 0xce, 0xeb, 0x35,
-	0x80, 0xc8, 0x3b, 0x9e, 0x43, 0x4f, 0xba, 0x47, 0xe4, 0x1d, 0x9f, 0xb7, 0xe1, 0x7e, 0x7a, 0x7f,
-	0xac, 0x21, 0x91, 0x05, 0xfc, 0x97, 0x3e, 0x58, 0xef, 0xfc, 0xa2, 0x1d, 0x75, 0xf7, 0xa3, 0xb0,
-	0x2d, 0x6b, 0x32, 0x05, 0x73, 0xcc, 0x2d, 0x50, 0x93, 0x81, 0x63, 0xdc, 0x98, 0x93, 0xbe, 0xed,
-	0x9a, 0x9f, 0xee, 0x22, 0x7b, 0xdf, 0xe3, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x13, 0x70,
-	0x63, 0x1e, 0x04, 0x00, 0x00,
+	// 399 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0x4f, 0x6b, 0xdb, 0x30,
+	0x18, 0xc6, 0xb1, 0x9d, 0x39, 0xcb, 0x1b, 0x36, 0x86, 0x18, 0xc3, 0xa7, 0x2d, 0xf8, 0x14, 0x72,
+	0x90, 0xc1, 0xd9, 0x65, 0xdb, 0x2d, 0xb9, 0x64, 0x85, 0x40, 0x51, 0x4a, 0x0e, 0xbd, 0xa9, 0x8e,
+	0xda, 0x18, 0x1a, 0xc9, 0x95, 0xe4, 0x40, 0xbe, 0x41, 0x3f, 0x4b, 0xef, 0xfd, 0x6c, 0xbd, 0x16,
+	0xfd, 0xb1, 0x9b, 0x1e, 0x0a, 0x75, 0x4b, 0x6f, 0xef, 0x6b, 0xbf, 0xcf, 0x8f, 0xf7, 0x79, 0x2c,
+	0x19, 0xfe, 0xed, 0x73, 0x49, 0x0f, 0xb8, 0x10, 0xbb, 0xac, 0x10, 0x92, 0x65, 0x5a, 0x52, 0xae,
+	0x2a, 0x21, 0x75, 0x56, 0x72, 0xcd, 0x24, 0x67, 0x3a, 0xdb, 0x32, 0xba, 0x61, 0x52, 0x65, 0x5b,
+	0xad, 0xab, 0xac, 0x10, 0xfc, 0xb2, 0xbc, 0xc2, 0x95, 0x14, 0x5a, 0xa0, 0x49, 0x23, 0x96, 0x0c,
+	0xb7, 0x42, 0xdc, 0x08, 0xb1, 0x17, 0x62, 0x23, 0x4c, 0x73, 0x88, 0x17, 0xb6, 0x47, 0x08, 0x7a,
+	0x9c, 0xee, 0x58, 0x12, 0x8c, 0x82, 0xf1, 0x80, 0xd8, 0x1a, 0x7d, 0x87, 0x4f, 0x7b, 0x7a, 0x5d,
+	0xb3, 0x24, 0x1c, 0x45, 0xe3, 0x01, 0x71, 0x4d, 0xfa, 0x0b, 0xfa, 0x6b, 0x26, 0x55, 0x29, 0xf8,
+	0xd3, 0x80, 0x53, 0xf9, 0x81, 0x9f, 0x10, 0x2f, 0x99, 0xde, 0x8a, 0xcd, 0x0b, 0xef, 0x6f, 0x43,
+	0xf8, 0x42, 0xd8, 0x4d, 0xcd, 0x94, 0x9e, 0xdb, 0xc5, 0xd1, 0x12, 0xfa, 0x7b, 0x87, 0xb4, 0x93,
+	0xc3, 0x7c, 0x8a, 0x5f, 0x6f, 0x02, 0xfb, 0x6d, 0x48, 0xc3, 0x40, 0x27, 0x10, 0xef, 0xec, 0x02,
+	0x49, 0x68, 0x69, 0x79, 0x17, 0x9a, 0x5b, 0x9d, 0x78, 0x02, 0xfa, 0x06, 0x51, 0x2d, 0xcb, 0x24,
+	0xb2, 0x09, 0x98, 0xd2, 0xd0, 0x9d, 0x20, 0xe9, 0x8d, 0xa2, 0xae, 0x74, 0x97, 0x36, 0xf1, 0x84,
+	0xf4, 0x37, 0xc4, 0x2b, 0x4d, 0x75, 0xad, 0x4c, 0xfe, 0x85, 0xd8, 0xb4, 0xf9, 0x9b, 0x1a, 0xfd,
+	0x80, 0x58, 0x32, 0xaa, 0x04, 0xb7, 0x3e, 0x06, 0xc4, 0x77, 0xe9, 0x43, 0x00, 0x5f, 0x09, 0x53,
+	0x95, 0xe0, 0x8a, 0x7d, 0x58, 0x82, 0xca, 0xee, 0xf5, 0x96, 0x04, 0x9d, 0x23, 0xe2, 0x09, 0x47,
+	0x79, 0x45, 0xef, 0xce, 0xeb, 0x3e, 0x80, 0xd8, 0x3b, 0x5e, 0x41, 0x5f, 0xba, 0x43, 0xe4, 0x1d,
+	0xff, 0xe9, 0xc2, 0x7d, 0x76, 0xfe, 0x48, 0x43, 0x42, 0x6b, 0xf8, 0x2c, 0x7d, 0xb0, 0xde, 0xf9,
+	0xdf, 0x6e, 0xd4, 0xe3, 0x8f, 0x42, 0x5a, 0xd6, 0xac, 0x02, 0x73, 0x99, 0x3b, 0xa0, 0x66, 0x43,
+	0xc7, 0x38, 0x35, 0x57, 0xfa, 0xbc, 0x67, 0x1e, 0xdd, 0x85, 0x93, 0x75, 0x4e, 0xe8, 0x01, 0xcf,
+	0x8d, 0xfe, 0xac, 0xd5, 0xff, 0x6f, 0xf4, 0x0b, 0xaf, 0x5f, 0x68, 0x5d, 0x5d, 0xc4, 0xf6, 0x67,
+	0x30, 0x7d, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x30, 0x13, 0xcf, 0x4b, 0x04, 0x00, 0x00,
 }

+ 5 - 4
transport/internet/headers/noop/config.pb.go

@@ -45,14 +45,15 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 135 bytes of a gzipped FileDescriptorProto
+	// 160 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x2e, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,
 	0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0x2d, 0xd1, 0xcf, 0x48,
 	0x4d, 0x4c, 0x49, 0x2d, 0x2a, 0xd6, 0xcf, 0xcb, 0xcf, 0x2f, 0xd0, 0x4f, 0xce, 0xcf, 0x4b, 0xcb,
 	0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xd2, 0x82, 0x69, 0x2e, 0x4a, 0xd5, 0x83, 0x6b,
 	0xd4, 0x83, 0x69, 0xd4, 0x83, 0x6a, 0xd4, 0x03, 0x69, 0x54, 0xe2, 0xe0, 0x62, 0x73, 0x06, 0xeb,
-	0x75, 0x72, 0xe6, 0x02, 0x59, 0xa7, 0x47, 0xbc, 0x5e, 0x27, 0x6e, 0x88, 0xce, 0x00, 0x90, 0xa5,
-	0x51, 0x2c, 0x20, 0xa1, 0x24, 0x36, 0xb0, 0x0b, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x20,
-	0x38, 0xb6, 0x7b, 0xc0, 0x00, 0x00, 0x00,
+	0x75, 0x2a, 0xe0, 0x02, 0x59, 0xa7, 0x47, 0xbc, 0x5e, 0x27, 0x6e, 0x88, 0xce, 0x00, 0x90, 0xa5,
+	0x51, 0x2c, 0x20, 0xa1, 0x55, 0x4c, 0x5a, 0x61, 0x46, 0x41, 0x89, 0x95, 0x7a, 0xce, 0x20, 0xfd,
+	0x21, 0x70, 0xfd, 0x9e, 0x30, 0xfd, 0x1e, 0x50, 0xfd, 0x7e, 0xf9, 0xf9, 0x05, 0x49, 0x6c, 0x60,
+	0xe7, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x89, 0x52, 0x33, 0x81, 0xed, 0x00, 0x00, 0x00,
 }

+ 18 - 17
transport/internet/headers/srtp/config.pb.go

@@ -51,21 +51,22 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 242 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
-	0x10, 0x86, 0x15, 0x28, 0x81, 0x5e, 0x61, 0xf1, 0x80, 0x3c, 0x80, 0x54, 0x98, 0x2a, 0x06, 0x5b,
-	0x82, 0x91, 0xad, 0x79, 0x01, 0x54, 0x31, 0xb1, 0x54, 0xc6, 0x39, 0x4a, 0x04, 0xf5, 0x59, 0xe7,
-	0x23, 0x22, 0xef, 0xc5, 0x03, 0x22, 0x9b, 0x04, 0x56, 0xc6, 0xff, 0x3b, 0x7d, 0x27, 0xfd, 0x3f,
-	0xdc, 0xf7, 0xb7, 0xec, 0x06, 0xe3, 0x69, 0x6f, 0x3d, 0x31, 0x5a, 0x61, 0x17, 0x52, 0x24, 0x16,
-	0xdb, 0x05, 0x41, 0x0e, 0x28, 0xf6, 0x15, 0x5d, 0x8b, 0x9c, 0x6c, 0x62, 0x89, 0xd6, 0x53, 0x78,
-	0xe9, 0x76, 0x26, 0x32, 0x09, 0xa9, 0x9b, 0x49, 0x66, 0x34, 0xbf, 0xa2, 0x99, 0x44, 0x33, 0x8a,
-	0x26, 0x8b, 0xd7, 0x5f, 0x15, 0xd4, 0x4d, 0x91, 0x95, 0x86, 0xe3, 0x1e, 0x39, 0x75, 0x14, 0x74,
-	0xb5, 0xac, 0x56, 0x67, 0x9b, 0x29, 0xe6, 0x4b, 0x74, 0x6d, 0xdb, 0x85, 0x9d, 0x3e, 0x58, 0x56,
-	0xab, 0x93, 0xcd, 0x14, 0xd5, 0x05, 0xcc, 0xf1, 0x53, 0x30, 0x14, 0xeb, 0xb0, 0xdc, 0xfe, 0x80,
-	0xba, 0x04, 0xf0, 0x89, 0xfd, 0xd6, 0xd3, 0x47, 0x10, 0x3d, 0x2b, 0x4f, 0xe7, 0x99, 0x34, 0x19,
-	0xa8, 0x73, 0xa8, 0xf7, 0x8e, 0xdf, 0x90, 0xf5, 0x51, 0x31, 0xc7, 0xa4, 0xae, 0xe0, 0x34, 0xba,
-	0xe1, 0x9d, 0x5c, 0xbb, 0x95, 0x21, 0xa2, 0xae, 0x8b, 0xb8, 0x18, 0xd9, 0xe3, 0x10, 0x71, 0xdd,
-	0x40, 0xde, 0xc6, 0xfc, 0xbf, 0xe8, 0x7a, 0xf1, 0xd3, 0xf2, 0x21, 0x2f, 0xf4, 0x34, 0xcb, 0xe8,
-	0xb9, 0x2e, 0x73, 0xdd, 0x7d, 0x07, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x26, 0x70, 0x90, 0x6d, 0x01,
-	0x00, 0x00,
+	// 264 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0xd0, 0xb1, 0x4f, 0x03, 0x21,
+	0x14, 0x06, 0xf0, 0x5c, 0xad, 0xa7, 0xa5, 0xba, 0x30, 0x18, 0x06, 0x4d, 0xaa, 0x53, 0xd3, 0x01,
+	0x92, 0x3a, 0xba, 0xb5, 0x8b, 0x6e, 0xe6, 0x6c, 0x1c, 0x5c, 0x1a, 0xe4, 0x9e, 0xf5, 0xa2, 0x05,
+	0xf2, 0x78, 0x36, 0xf2, 0x2f, 0x39, 0xfb, 0x07, 0x1a, 0xf0, 0xa8, 0xab, 0xe3, 0xf7, 0x91, 0x1f,
+	0xc9, 0xfb, 0xd8, 0xcd, 0x6e, 0x8e, 0x3a, 0x4a, 0xe3, 0xb6, 0xca, 0x38, 0x04, 0x45, 0xa8, 0x6d,
+	0xf0, 0x0e, 0x49, 0x75, 0x96, 0x00, 0x2d, 0x90, 0x7a, 0x05, 0xdd, 0x02, 0x06, 0x15, 0x90, 0xbc,
+	0x32, 0xce, 0xbe, 0x74, 0x1b, 0xe9, 0xd1, 0x91, 0xe3, 0xb3, 0x82, 0x11, 0xe4, 0x1e, 0xca, 0x02,
+	0x65, 0x0f, 0x65, 0x82, 0x57, 0xdf, 0x15, 0xab, 0x97, 0x19, 0x73, 0xc1, 0x8e, 0x76, 0x80, 0xa1,
+	0x73, 0x56, 0x54, 0x93, 0x6a, 0x7a, 0xda, 0x94, 0x98, 0x5e, 0xbc, 0x6e, 0xdb, 0xce, 0x6e, 0xc4,
+	0x60, 0x52, 0x4d, 0x8f, 0x9b, 0x12, 0xf9, 0x39, 0x1b, 0xc1, 0x27, 0x81, 0xcd, 0xea, 0x20, 0xbf,
+	0xfd, 0x15, 0xfc, 0x82, 0x31, 0x13, 0xd0, 0xac, 0x8d, 0xfb, 0xb0, 0x24, 0x86, 0xf9, 0xd3, 0x51,
+	0x6a, 0x96, 0xa9, 0xe0, 0x67, 0xac, 0xde, 0x6a, 0x7c, 0x03, 0x14, 0x87, 0x59, 0xf6, 0x89, 0x5f,
+	0xb2, 0x13, 0xaf, 0xe3, 0xbb, 0xd3, 0xed, 0x9a, 0xa2, 0x07, 0x51, 0x67, 0x38, 0xee, 0xbb, 0x55,
+	0xf4, 0xb0, 0xf0, 0x2c, 0x6d, 0x23, 0xff, 0x7f, 0xe8, 0x62, 0xfc, 0x7b, 0xe5, 0x7d, 0x5a, 0xe8,
+	0x69, 0x98, 0xaa, 0xaf, 0xc1, 0xec, 0x71, 0xde, 0xe8, 0x28, 0x97, 0xc9, 0xaf, 0xf6, 0xfe, 0xae,
+	0xf8, 0xdb, 0xde, 0x3f, 0x20, 0xf9, 0xe7, 0x3a, 0x6f, 0x7b, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff,
+	0xd5, 0x92, 0x8f, 0x21, 0x9a, 0x01, 0x00, 0x00,
 }

+ 6 - 4
transport/internet/headers/utp/config.pb.go

@@ -46,7 +46,7 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 158 bytes of a gzipped FileDescriptorProto
+	// 182 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x2a, 0x33, 0x2a, 0x4a,
 	0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0x29, 0x4a, 0xcc, 0x2b,
 	0x2e, 0xc8, 0x2f, 0x2a, 0xd1, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0x2d, 0xd1, 0xcf, 0x48,
@@ -54,7 +54,9 @@ var fileDescriptor0 = []byte{
 	0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xd2, 0x84, 0xe9, 0x2d, 0x4a, 0xd5, 0x83, 0xeb, 0xd3,
 	0x83, 0xe9, 0xd3, 0x83, 0xea, 0xd3, 0x2b, 0x2d, 0x29, 0x50, 0x52, 0xe2, 0x62, 0x73, 0x06, 0x6b,
 	0x15, 0x92, 0xe0, 0x62, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd4,
-	0xe0, 0x0d, 0x82, 0x71, 0x9d, 0x1c, 0xb9, 0x74, 0x93, 0xf3, 0x73, 0xf5, 0x88, 0x36, 0xd4, 0x89,
-	0x1b, 0x62, 0x64, 0x00, 0xc8, 0x31, 0x51, 0xcc, 0xa5, 0x25, 0x05, 0x49, 0x6c, 0x60, 0x87, 0x19,
-	0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x45, 0x8a, 0x52, 0x04, 0xd6, 0x00, 0x00, 0x00,
+	0xe0, 0x0d, 0x82, 0x71, 0x9d, 0x72, 0xb9, 0x74, 0x93, 0xf3, 0x73, 0xf5, 0x88, 0x36, 0xd4, 0x89,
+	0x1b, 0x62, 0x64, 0x00, 0xc8, 0x31, 0x51, 0xcc, 0xa5, 0x25, 0x05, 0xab, 0x98, 0x34, 0xc3, 0x8c,
+	0x82, 0x12, 0x2b, 0xf5, 0x9c, 0x41, 0xba, 0x43, 0xe0, 0xba, 0x3d, 0x61, 0xba, 0x3d, 0xa0, 0xba,
+	0x43, 0x4b, 0x0a, 0x92, 0xd8, 0xc0, 0x9e, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x91, 0x1b,
+	0x92, 0x61, 0x02, 0x01, 0x00, 0x00,
 }

+ 32 - 31
transport/internet/kcp/config.pb.go

@@ -192,35 +192,36 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/transport/internet/kcp/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 472 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x53, 0x5d, 0x6f, 0xd3, 0x30,
-	0x14, 0xd5, 0xe8, 0x5a, 0xc6, 0xcd, 0xb6, 0x96, 0x08, 0xa1, 0x08, 0x24, 0xb4, 0x55, 0x62, 0x1a,
-	0x0f, 0x38, 0xd0, 0xbd, 0xc0, 0x6b, 0xcb, 0xcb, 0x84, 0x8a, 0xc0, 0x4a, 0x85, 0x34, 0x09, 0x05,
-	0xd7, 0xb9, 0x2d, 0x56, 0x1b, 0x3b, 0x72, 0x9c, 0x55, 0xe5, 0x1f, 0xf1, 0x2f, 0x91, 0xed, 0x76,
-	0xfd, 0x40, 0x63, 0x79, 0x4b, 0x7c, 0xcf, 0x3d, 0xb6, 0xce, 0x07, 0xf4, 0x6e, 0x7b, 0x9a, 0x2d,
-	0x09, 0x57, 0x79, 0xcc, 0x95, 0xc6, 0xd8, 0x68, 0x26, 0xcb, 0x42, 0x69, 0x13, 0x0b, 0x69, 0x50,
-	0x4b, 0x34, 0xf1, 0x8c, 0x17, 0x31, 0x57, 0x72, 0x22, 0xa6, 0xa4, 0xd0, 0xca, 0xa8, 0xf0, 0x7c,
-	0xbd, 0xa3, 0x91, 0xdc, 0xe1, 0xc9, 0x1a, 0x4f, 0x66, 0xbc, 0x78, 0xf1, 0x6e, 0x8f, 0x96, 0xab,
-	0x3c, 0x57, 0x32, 0x2e, 0x51, 0x0b, 0x36, 0x8f, 0xcd, 0xb2, 0xc0, 0x2c, 0xcd, 0xb1, 0x2c, 0xd9,
-	0x14, 0x3d, 0x69, 0xf7, 0x25, 0x34, 0x86, 0xc9, 0x28, 0x7c, 0x06, 0xcd, 0x5b, 0x36, 0xaf, 0x30,
-	0x3a, 0x38, 0x3b, 0xb8, 0x3c, 0xa1, 0xfe, 0xc7, 0x0e, 0x93, 0xe4, 0xfa, 0x9e, 0xe1, 0x05, 0x9c,
-	0x8e, 0x8a, 0xb9, 0x90, 0xb3, 0x01, 0x2b, 0x18, 0x17, 0x66, 0x79, 0x0f, 0xee, 0x12, 0x3a, 0x9f,
-	0xd4, 0x42, 0xd6, 0x40, 0x9e, 0x43, 0xf0, 0x5d, 0x0b, 0x83, 0xfd, 0x6a, 0x32, 0x41, 0x1d, 0x86,
-	0x70, 0x58, 0x8a, 0xdf, 0x6b, 0x8c, 0xfb, 0xee, 0x9e, 0x01, 0x50, 0x64, 0xd9, 0x7f, 0x10, 0x6f,
-	0xa0, 0x3d, 0x50, 0x52, 0x22, 0x37, 0x42, 0x49, 0x8a, 0x55, 0x89, 0xe1, 0x73, 0x68, 0xa1, 0x64,
-	0xe3, 0xb9, 0x07, 0x1e, 0xd1, 0xd5, 0x5f, 0xf7, 0x4f, 0x13, 0x5a, 0x03, 0xa7, 0x70, 0xf8, 0x01,
-	0x1a, 0xb9, 0xa9, 0xdc, 0x3c, 0xe8, 0x5d, 0x90, 0x07, 0x95, 0x26, 0xc3, 0x64, 0x44, 0xed, 0x8a,
-	0xdd, 0x34, 0x46, 0x44, 0x8f, 0x6a, 0x6f, 0x26, 0xc9, 0x35, 0xb5, 0x2b, 0xe1, 0x0d, 0xb4, 0x2b,
-	0x27, 0x60, 0xca, 0x57, 0xba, 0x44, 0x0d, 0xc7, 0xf2, 0xbe, 0x06, 0xcb, 0xae, 0xf4, 0xf4, 0xb4,
-	0xda, 0xb5, 0xe2, 0x27, 0x3c, 0xcd, 0x56, 0xa2, 0x6f, 0xd8, 0x0f, 0x1d, 0xfb, 0x55, 0x0d, 0xf6,
-	0x7d, 0xc3, 0x68, 0x27, 0xdb, 0xb7, 0xf0, 0x15, 0x00, 0x57, 0x72, 0x8a, 0xa5, 0xd5, 0x39, 0x6a,
-	0x3a, 0x61, 0xb7, 0x4e, 0xc2, 0x6f, 0x70, 0xbc, 0xb0, 0x66, 0xa6, 0x63, 0xe7, 0x55, 0xd4, 0x72,
-	0x97, 0x93, 0x1a, 0x97, 0x6f, 0x65, 0x80, 0x06, 0x8b, 0xad, 0x40, 0x7c, 0x81, 0x40, 0x23, 0xcb,
-	0xd6, 0x8c, 0x8f, 0x1d, 0xe3, 0xdb, 0x1a, 0x8c, 0x9b, 0xc8, 0x50, 0xd0, 0x9b, 0xf8, 0x7c, 0x86,
-	0x93, 0x5f, 0xc8, 0x32, 0xd4, 0xa9, 0xef, 0x59, 0x74, 0xf4, 0xaf, 0x89, 0xbe, 0x41, 0xc4, 0x37,
-	0x88, 0x24, 0xb6, 0x41, 0x43, 0x5f, 0x20, 0x7a, 0xec, 0x97, 0x57, 0x09, 0xfa, 0x01, 0x1d, 0x7e,
-	0x97, 0xbb, 0x54, 0xdb, 0xe0, 0x45, 0x4f, 0x1c, 0x5f, 0xaf, 0xc6, 0x0b, 0xf7, 0x22, 0x4b, 0xdb,
-	0x7c, 0xf7, 0xa0, 0xff, 0x11, 0x5e, 0x73, 0x95, 0x3f, 0xcc, 0xd4, 0x0f, 0xfc, 0x7b, 0xbe, 0xda,
-	0x76, 0xdf, 0x34, 0x66, 0xbc, 0x18, 0xb7, 0x5c, 0xd3, 0xaf, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff,
-	0xc4, 0x62, 0x24, 0xb7, 0x74, 0x04, 0x00, 0x00,
+	// 491 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x54, 0xdf, 0x6f, 0xd3, 0x30,
+	0x18, 0xd4, 0xd6, 0xad, 0x8c, 0x2f, 0xdb, 0x5a, 0x22, 0x84, 0x22, 0x90, 0xd0, 0x5a, 0x89, 0x69,
+	0x3c, 0xe0, 0x40, 0xf6, 0xc2, 0x73, 0xcb, 0x4b, 0x35, 0x15, 0x81, 0x95, 0x82, 0x34, 0x69, 0x0a,
+	0xae, 0xf3, 0xb5, 0x44, 0x6d, 0xec, 0xc8, 0x71, 0x56, 0x95, 0xff, 0x08, 0xfe, 0x4a, 0x64, 0xa7,
+	0xe9, 0x2f, 0x34, 0x96, 0xb7, 0xd8, 0xbe, 0x3b, 0x5b, 0xf7, 0xdd, 0x05, 0x82, 0xfb, 0x40, 0xb1,
+	0x25, 0xe1, 0x32, 0xf5, 0xb9, 0x54, 0xe8, 0x6b, 0xc5, 0x44, 0x9e, 0x49, 0xa5, 0xfd, 0x44, 0x68,
+	0x54, 0x02, 0xb5, 0x3f, 0xe3, 0x99, 0xcf, 0xa5, 0x98, 0x24, 0x53, 0x92, 0x29, 0xa9, 0xa5, 0xdb,
+	0xa9, 0x38, 0x0a, 0xc9, 0x1a, 0x4f, 0x2a, 0x3c, 0x99, 0xf1, 0xec, 0xe5, 0xfb, 0x3d, 0x59, 0x2e,
+	0xd3, 0x54, 0x0a, 0x3f, 0x47, 0x95, 0xb0, 0xb9, 0xaf, 0x97, 0x19, 0xc6, 0x51, 0x8a, 0x79, 0xce,
+	0xa6, 0x58, 0x8a, 0x76, 0x5f, 0x41, 0x63, 0x18, 0x8e, 0xdc, 0xe7, 0x70, 0x7c, 0xcf, 0xe6, 0x05,
+	0x7a, 0x07, 0x17, 0x07, 0x57, 0x67, 0xb4, 0x5c, 0x98, 0xc3, 0x30, 0x1c, 0x3c, 0x70, 0x78, 0x09,
+	0xe7, 0xa3, 0x6c, 0x9e, 0x88, 0x59, 0x9f, 0x65, 0x8c, 0x27, 0x7a, 0xf9, 0x00, 0xee, 0x0a, 0xda,
+	0x9f, 0xe4, 0x42, 0xd4, 0x40, 0x76, 0xc0, 0xf9, 0xae, 0x12, 0x8d, 0xbd, 0x62, 0x32, 0x41, 0xe5,
+	0xba, 0x70, 0x94, 0x27, 0xbf, 0x2a, 0x8c, 0xfd, 0xee, 0x5e, 0x00, 0x50, 0x64, 0xf1, 0x7f, 0x10,
+	0x6f, 0xa1, 0xd5, 0x97, 0x42, 0x20, 0xd7, 0x89, 0x14, 0x14, 0x8b, 0x1c, 0xdd, 0x17, 0xd0, 0x44,
+	0xc1, 0xc6, 0xf3, 0x12, 0x78, 0x42, 0x57, 0xab, 0xee, 0xef, 0x63, 0x68, 0xf6, 0xad, 0xc3, 0xee,
+	0x47, 0x68, 0xa4, 0xba, 0xb0, 0xe7, 0x4e, 0x70, 0x49, 0x1e, 0x75, 0x9a, 0x0c, 0xc3, 0x11, 0x35,
+	0x14, 0xc3, 0xd4, 0x3a, 0xf1, 0x0e, 0x6b, 0x33, 0xc3, 0x70, 0x40, 0x0d, 0xc5, 0xbd, 0x85, 0x56,
+	0x61, 0x0d, 0x8c, 0xf8, 0xca, 0x17, 0xaf, 0x61, 0x55, 0x3e, 0xd4, 0x50, 0xd9, 0xb5, 0x9e, 0x9e,
+	0x17, 0xbb, 0xa3, 0xf8, 0x01, 0xcf, 0xe2, 0x95, 0xe9, 0x1b, 0xf5, 0x23, 0xab, 0x7e, 0x5d, 0x43,
+	0x7d, 0x7f, 0x60, 0xb4, 0x1d, 0xef, 0x8f, 0xf0, 0x35, 0x00, 0x97, 0x62, 0x8a, 0xb9, 0xf1, 0xd9,
+	0x3b, 0xb6, 0xc6, 0x6e, 0xed, 0xb8, 0x5f, 0xe1, 0x74, 0x61, 0x86, 0x19, 0x8d, 0xed, 0xac, 0xbc,
+	0xa6, 0xbd, 0x9c, 0xd4, 0xb8, 0x7c, 0x2b, 0x03, 0xd4, 0x59, 0x6c, 0x05, 0xe2, 0x33, 0x38, 0x0a,
+	0x59, 0x5c, 0x29, 0x3e, 0xb1, 0x8a, 0xef, 0x6a, 0x28, 0x6e, 0x22, 0x43, 0x41, 0x6d, 0xe2, 0x73,
+	0x03, 0x67, 0x3f, 0x91, 0xc5, 0xa8, 0xa2, 0xb2, 0x67, 0xde, 0xc9, 0xbf, 0x43, 0x2c, 0x1b, 0x44,
+	0xca, 0x06, 0x91, 0xd0, 0x34, 0x68, 0x58, 0x16, 0x88, 0x9e, 0x96, 0xe4, 0x55, 0x82, 0xee, 0xa0,
+	0xcd, 0xd7, 0xb9, 0x8b, 0x94, 0x09, 0x9e, 0xf7, 0xd4, 0xea, 0x05, 0x35, 0x5e, 0xb8, 0x17, 0x59,
+	0xda, 0xe2, 0xbb, 0x1b, 0xbd, 0x3b, 0x78, 0xc3, 0x65, 0xfa, 0xb8, 0x52, 0xcf, 0x29, 0xdf, 0xf3,
+	0xc5, 0xb4, 0xfb, 0xb6, 0x31, 0xe3, 0xd9, 0x9f, 0xc3, 0xce, 0xb7, 0x80, 0xb2, 0x25, 0xe9, 0x1b,
+	0x56, 0xb8, 0x66, 0x0d, 0x2a, 0xd6, 0x0d, 0xcf, 0xc6, 0x4d, 0xfb, 0x37, 0xb8, 0xfe, 0x1b, 0x00,
+	0x00, 0xff, 0xff, 0x77, 0xae, 0x78, 0x3a, 0x98, 0x04, 0x00, 0x00,
 }

+ 19 - 18
transport/internet/tcp/config.pb.go

@@ -71,22 +71,23 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/transport/internet/tcp/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 257 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x41, 0x4b, 0xc3, 0x40,
-	0x10, 0x85, 0x89, 0x42, 0x90, 0x2d, 0x18, 0xc9, 0x41, 0x8a, 0x27, 0x2d, 0x28, 0x7a, 0xd9, 0x95,
-	0x78, 0xf2, 0xda, 0x9e, 0x45, 0x89, 0x9e, 0x04, 0x09, 0xdb, 0xe9, 0x18, 0x03, 0xdd, 0x9d, 0x65,
-	0x76, 0x14, 0xfa, 0xcf, 0xfc, 0x79, 0x92, 0x6c, 0x5b, 0x24, 0x97, 0x1e, 0x17, 0xde, 0xf7, 0xf6,
-	0x7d, 0xa3, 0xaa, 0x9f, 0x8a, 0xed, 0x46, 0x03, 0x39, 0x03, 0xc4, 0x68, 0x84, 0xad, 0x8f, 0x81,
-	0x58, 0x4c, 0xe7, 0x05, 0xd9, 0xa3, 0x18, 0x81, 0x60, 0x80, 0xfc, 0x67, 0xd7, 0xea, 0xc0, 0x24,
-	0x54, 0x5e, 0xed, 0x18, 0x46, 0xbd, 0xcf, 0xeb, 0x5d, 0x5e, 0x0b, 0x84, 0x8b, 0xfb, 0x51, 0x2d,
-	0x90, 0x73, 0xe4, 0x4d, 0x44, 0xee, 0xec, 0xda, 0xc8, 0x26, 0xe0, 0xaa, 0x71, 0x18, 0xa3, 0x6d,
-	0x31, 0x95, 0xce, 0xee, 0x54, 0xb1, 0x20, 0xef, 0x11, 0xa4, 0x23, 0x5f, 0xe3, 0x77, 0xc4, 0xf2,
-	0x5c, 0xe5, 0xe8, 0xed, 0x72, 0x8d, 0xd3, 0xec, 0x32, 0xbb, 0x3d, 0xa9, 0xb7, 0xaf, 0xd9, 0x6f,
-	0xa6, 0xf2, 0xc5, 0x30, 0xa8, 0xfc, 0x50, 0x67, 0xb0, 0xa7, 0x1a, 0xee, 0xb1, 0x21, 0x3c, 0xa9,
-	0x2a, 0x7d, 0x70, 0xa5, 0x1e, 0x7d, 0x58, 0x17, 0x30, 0x5a, 0xf0, 0xac, 0x8a, 0x2f, 0xb4, 0x2b,
-	0xe4, 0x26, 0xa2, 0x48, 0xe7, 0xdb, 0x38, 0x3d, 0x1a, 0xda, 0x6f, 0xfe, 0xb7, 0x27, 0x39, 0x9d,
-	0xe4, 0xf4, 0x5b, 0x2f, 0xf7, 0x94, 0xdc, 0xea, 0xd3, 0x84, 0xbf, 0x6e, 0xe9, 0xf9, 0xa3, 0xba,
-	0x06, 0x72, 0x87, 0xa7, 0xcd, 0x27, 0x49, 0xf0, 0xa5, 0xbf, 0xcd, 0xfb, 0xb1, 0x40, 0x58, 0xe6,
-	0xc3, 0x9d, 0x1e, 0xfe, 0x02, 0x00, 0x00, 0xff, 0xff, 0x15, 0x9d, 0x12, 0x13, 0xb2, 0x01, 0x00,
-	0x00,
+	// 277 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4a, 0xc3, 0x40,
+	0x10, 0x86, 0x69, 0x85, 0x22, 0x5b, 0x30, 0x92, 0x83, 0x14, 0x4f, 0xb6, 0xa0, 0xe8, 0x65, 0x57,
+	0xe2, 0x1b, 0x34, 0x27, 0x0f, 0xa2, 0xc4, 0xe0, 0x41, 0x28, 0x61, 0x3b, 0x1d, 0x63, 0xa0, 0xd9,
+	0x59, 0x76, 0x47, 0x21, 0xaf, 0xe4, 0x13, 0xf8, 0x78, 0x92, 0x6c, 0x13, 0x24, 0x97, 0x1e, 0x17,
+	0xfe, 0xef, 0xdf, 0xff, 0x1b, 0x91, 0x7c, 0x27, 0x4e, 0x37, 0x12, 0xa8, 0x56, 0x40, 0x0e, 0x15,
+	0x3b, 0x6d, 0xbc, 0x25, 0xc7, 0xaa, 0x32, 0x8c, 0xce, 0x20, 0x2b, 0x06, 0xab, 0x80, 0xcc, 0x47,
+	0x55, 0x4a, 0xeb, 0x88, 0x29, 0x5e, 0xf6, 0x8c, 0x43, 0x39, 0xe4, 0x65, 0x9f, 0x97, 0x0c, 0xf6,
+	0xf2, 0x7e, 0x54, 0x0b, 0x54, 0xd7, 0x64, 0x94, 0x47, 0x57, 0xe9, 0xbd, 0xe2, 0xc6, 0xe2, 0xae,
+	0xa8, 0xd1, 0x7b, 0x5d, 0x62, 0x28, 0x5d, 0xdd, 0x89, 0x28, 0x25, 0x63, 0x10, 0xb8, 0x22, 0x93,
+	0xe1, 0x97, 0xc7, 0xf8, 0x42, 0xcc, 0xd0, 0xe8, 0xed, 0x1e, 0x17, 0x93, 0xab, 0xc9, 0xed, 0x69,
+	0x76, 0x78, 0xad, 0x7e, 0x27, 0x62, 0x96, 0x76, 0x83, 0xe2, 0x8d, 0x38, 0x87, 0x81, 0x2a, 0x5c,
+	0x8b, 0x75, 0xe1, 0x79, 0x92, 0xc8, 0xa3, 0x2b, 0xe5, 0xe8, 0xc3, 0x2c, 0x82, 0xd1, 0x82, 0x67,
+	0x11, 0x7d, 0xa2, 0xde, 0xa1, 0x2b, 0x3c, 0x32, 0x57, 0xa6, 0xf4, 0x8b, 0x69, 0xd7, 0x7e, 0xf3,
+	0xbf, 0x3d, 0xc8, 0xc9, 0x20, 0x27, 0xf3, 0x56, 0xee, 0x29, 0xb8, 0x65, 0x67, 0x01, 0x7f, 0x3d,
+	0xd0, 0xeb, 0x8d, 0xb8, 0x06, 0xaa, 0x8f, 0x4f, 0x5b, 0xcf, 0x83, 0xe0, 0x4b, 0x7b, 0x9b, 0xf7,
+	0x13, 0x06, 0xfb, 0x33, 0x5d, 0xbe, 0x25, 0x99, 0x6e, 0x64, 0xda, 0x52, 0xf9, 0x40, 0x3d, 0xf6,
+	0x54, 0x0e, 0x76, 0x3b, 0xeb, 0x6e, 0xf9, 0xf0, 0x17, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x15, 0xa3,
+	0xb6, 0xd6, 0x01, 0x00, 0x00,
 }

+ 18 - 16
transport/internet/tls/config.pb.go

@@ -70,20 +70,22 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/transport/internet/tls/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 240 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x50, 0xc1, 0x4a, 0x03, 0x31,
-	0x10, 0x65, 0xbb, 0x50, 0x74, 0xa2, 0x22, 0x39, 0xed, 0xcd, 0xb5, 0x50, 0xd8, 0x53, 0x02, 0xeb,
-	0xc9, 0xa3, 0xed, 0x49, 0x04, 0x29, 0x7b, 0xf4, 0x52, 0x62, 0x98, 0x4a, 0x20, 0x9b, 0x94, 0xc9,
-	0x58, 0xe9, 0xef, 0xf8, 0xa5, 0xd2, 0xac, 0x2d, 0xdb, 0x53, 0x6f, 0xc9, 0x9b, 0x37, 0xef, 0xbd,
-	0x79, 0xd0, 0xee, 0x5a, 0x32, 0x7b, 0x65, 0x63, 0xaf, 0x6d, 0x24, 0xd4, 0x4c, 0x26, 0xa4, 0x6d,
-	0x24, 0xd6, 0x2e, 0x30, 0x52, 0x40, 0xd6, 0xec, 0x93, 0xb6, 0x31, 0x6c, 0xdc, 0x97, 0xda, 0x52,
-	0xe4, 0x28, 0x1f, 0x8f, 0x3b, 0x84, 0xea, 0xc4, 0x57, 0x47, 0xbe, 0x62, 0x9f, 0x66, 0x2f, 0x20,
-	0x96, 0x48, 0xec, 0x36, 0xce, 0x1a, 0x46, 0x59, 0x9f, 0x7d, 0xab, 0xa2, 0x2e, 0x9a, 0x9b, 0xee,
-	0x8c, 0x71, 0x0f, 0xe5, 0x1b, 0xee, 0xab, 0x49, 0x9e, 0x1c, 0x9e, 0xb3, 0xdf, 0x02, 0xa6, 0xcb,
-	0x6c, 0x2b, 0xe7, 0x70, 0x67, 0xbc, 0x8f, 0x3f, 0x6b, 0x17, 0x12, 0xda, 0x6f, 0x1a, 0x14, 0xae,
-	0xba, 0xdb, 0x8c, 0xbe, 0xfe, 0x83, 0x72, 0x05, 0xc2, 0x8e, 0x5c, 0x26, 0x75, 0xd9, 0x88, 0x56,
-	0xa9, 0x8b, 0x69, 0xd5, 0x28, 0x48, 0x37, 0x96, 0x90, 0x0f, 0x20, 0x12, 0xd2, 0x0e, 0x69, 0x1d,
-	0x4c, 0x8f, 0x55, 0x59, 0x17, 0xcd, 0x75, 0x07, 0x03, 0xf4, 0x6e, 0x7a, 0x5c, 0x3c, 0xc3, 0xdc,
-	0xc6, 0xfe, 0xb2, 0xc5, 0x42, 0x0c, 0xa7, 0xac, 0x0e, 0x05, 0x7e, 0x94, 0xec, 0xd3, 0xe7, 0x34,
-	0x97, 0xf9, 0xf4, 0x17, 0x00, 0x00, 0xff, 0xff, 0x42, 0x2a, 0x28, 0x66, 0x82, 0x01, 0x00, 0x00,
+	// 261 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4b, 0xc3, 0x30,
+	0x14, 0xc6, 0x69, 0x0b, 0x43, 0x53, 0x15, 0xe9, 0xa9, 0x37, 0xbb, 0xc1, 0xa0, 0xa7, 0x04, 0xea,
+	0x5f, 0xe0, 0x7a, 0x1a, 0x82, 0x8c, 0x30, 0x3c, 0x08, 0x32, 0x62, 0x78, 0x93, 0x40, 0x9a, 0x8c,
+	0x97, 0xe7, 0xa4, 0xff, 0x8e, 0x47, 0xff, 0x4a, 0x69, 0x6b, 0x47, 0x77, 0xda, 0x2d, 0xf9, 0xf2,
+	0xfd, 0xde, 0xf7, 0xf2, 0xb1, 0xea, 0x58, 0xa1, 0x6a, 0xb9, 0xf6, 0x8d, 0xd0, 0x1e, 0x41, 0x10,
+	0x2a, 0x17, 0x0e, 0x1e, 0x49, 0x18, 0x47, 0x80, 0x0e, 0x48, 0x90, 0x0d, 0x42, 0x7b, 0xb7, 0x37,
+	0x9f, 0xfc, 0x80, 0x9e, 0x7c, 0x36, 0x1f, 0x19, 0x04, 0x7e, 0xf2, 0xf3, 0xd1, 0xcf, 0xc9, 0x86,
+	0xc5, 0x13, 0x4b, 0x6b, 0x40, 0x32, 0x7b, 0xa3, 0x15, 0x41, 0x56, 0x9c, 0x5d, 0xf3, 0xa8, 0x88,
+	0xca, 0x1b, 0x79, 0xe6, 0xb8, 0x67, 0xc9, 0x33, 0xb4, 0x79, 0xdc, 0xbf, 0x74, 0xc7, 0xc5, 0x4f,
+	0xc4, 0x66, 0x75, 0x1f, 0x9b, 0x2d, 0xd9, 0x9d, 0xb2, 0xd6, 0x7f, 0xef, 0x8c, 0x0b, 0xa0, 0xbf,
+	0x70, 0x98, 0x70, 0x25, 0x6f, 0x7b, 0x75, 0xfd, 0x2f, 0x66, 0x1b, 0x96, 0xea, 0x49, 0x4a, 0x5c,
+	0x24, 0x65, 0x5a, 0x71, 0x7e, 0x71, 0x5b, 0x3e, 0x59, 0x44, 0x4e, 0x47, 0x64, 0x0f, 0x2c, 0x0d,
+	0x80, 0x47, 0xc0, 0x9d, 0x53, 0x0d, 0xe4, 0x49, 0x11, 0x95, 0xd7, 0x92, 0x0d, 0xd2, 0x8b, 0x6a,
+	0x60, 0xf5, 0xce, 0x96, 0xda, 0x37, 0x97, 0x23, 0x56, 0xe9, 0xf0, 0x95, 0x4d, 0x57, 0xe0, 0x5b,
+	0x42, 0x36, 0xfc, 0xc6, 0xf3, 0xd7, 0x4a, 0xaa, 0x96, 0xd7, 0x1d, 0xb5, 0x3d, 0x51, 0xeb, 0x91,
+	0xda, 0xda, 0xf0, 0x31, 0xeb, 0x0b, 0x7f, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xeb, 0x52,
+	0x64, 0xa6, 0x01, 0x00, 0x00,
 }

+ 1 - 1
transport/internet/ws/config.go → transport/internet/websocket/config.go

@@ -1,4 +1,4 @@
-package ws
+package websocket
 
 import (
 	v2net "v2ray.com/core/common/net"

+ 25 - 21
transport/internet/ws/config.pb.go → transport/internet/websocket/config.pb.go

@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go.
-// source: v2ray.com/core/transport/internet/ws/config.proto
+// source: v2ray.com/core/transport/internet/websocket/config.proto
 // DO NOT EDIT!
 
 /*
-Package ws is a generated protocol buffer package.
+Package websocket is a generated protocol buffer package.
 
 It is generated from these files:
-	v2ray.com/core/transport/internet/ws/config.proto
+	v2ray.com/core/transport/internet/websocket/config.proto
 
 It has these top-level messages:
 	ConnectionReuse
 	Config
 */
-package ws
+package websocket
 
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
@@ -58,25 +58,29 @@ func (m *Config) GetConnectionReuse() *ConnectionReuse {
 }
 
 func init() {
-	proto.RegisterType((*ConnectionReuse)(nil), "v2ray.core.transport.internet.ws.ConnectionReuse")
-	proto.RegisterType((*Config)(nil), "v2ray.core.transport.internet.ws.Config")
+	proto.RegisterType((*ConnectionReuse)(nil), "v2ray.core.transport.internet.websocket.ConnectionReuse")
+	proto.RegisterType((*Config)(nil), "v2ray.core.transport.internet.websocket.Config")
 }
 
-func init() { proto.RegisterFile("v2ray.com/core/transport/internet/ws/config.proto", fileDescriptor0) }
+func init() {
+	proto.RegisterFile("v2ray.com/core/transport/internet/websocket/config.proto", fileDescriptor0)
+}
 
 var fileDescriptor0 = []byte{
-	// 204 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x31, 0x4b, 0xc6, 0x30,
-	0x10, 0x86, 0xe9, 0x87, 0x14, 0xcd, 0x37, 0x54, 0x32, 0x48, 0xc7, 0x52, 0x1c, 0xea, 0x92, 0xd0,
-	0x3a, 0xb8, 0xb7, 0x7f, 0x40, 0x32, 0x8a, 0x20, 0x69, 0x38, 0xb5, 0x60, 0xef, 0xca, 0x25, 0x5a,
-	0xf4, 0xd7, 0x4b, 0xa3, 0xed, 0xd0, 0xa5, 0x5b, 0x02, 0xef, 0xf3, 0x3e, 0x77, 0x27, 0xea, 0xaf,
-	0x86, 0xed, 0xb7, 0x72, 0x34, 0x6a, 0x47, 0x0c, 0x3a, 0xb0, 0x45, 0x3f, 0x11, 0x07, 0x3d, 0x60,
-	0x00, 0x46, 0x08, 0x7a, 0xf6, 0xda, 0x11, 0xbe, 0x0e, 0x6f, 0x6a, 0x62, 0x0a, 0x24, 0x8b, 0x15,
-	0x61, 0x50, 0x5b, 0x5c, 0xad, 0x71, 0x35, 0xfb, 0xf2, 0x4e, 0x64, 0x1d, 0x21, 0x82, 0x0b, 0x03,
-	0xa1, 0x81, 0x4f, 0x0f, 0xf2, 0x46, 0xa4, 0x80, 0xb6, 0xff, 0x80, 0x3c, 0x29, 0x92, 0xea, 0xd2,
-	0xfc, 0xff, 0xca, 0x1f, 0x91, 0x76, 0xb1, 0x5c, 0x3e, 0x8b, 0x6b, 0xb7, 0x41, 0x2f, 0xbc, 0x50,
-	0x31, 0x7b, 0x6e, 0x6a, 0x75, 0x64, 0x54, 0x3b, 0x9d, 0xc9, 0xdc, 0xce, 0x2f, 0xc5, 0xc5, 0x64,
-	0xc3, 0x7b, 0x7e, 0x2a, 0x92, 0xea, 0xca, 0xc4, 0x77, 0xfb, 0x20, 0x6e, 0x1d, 0x8d, 0x87, 0xe5,
-	0xed, 0xf9, 0x6f, 0xc2, 0xc7, 0x65, 0xfb, 0xa7, 0xd3, 0xec, 0xfb, 0x34, 0x1e, 0xe2, 0xfe, 0x37,
-	0x00, 0x00, 0xff, 0xff, 0x28, 0x43, 0x58, 0xd9, 0x3d, 0x01, 0x00, 0x00,
+	// 233 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x90, 0xb1, 0x4a, 0x03, 0x41,
+	0x10, 0x86, 0xb9, 0x20, 0x87, 0xd9, 0x14, 0x91, 0x2b, 0x24, 0x65, 0x48, 0x93, 0x88, 0xb0, 0x0b,
+	0x67, 0x93, 0x3a, 0x57, 0xd9, 0xc9, 0x22, 0x0a, 0x36, 0xb2, 0x37, 0x8c, 0x7a, 0x68, 0x66, 0x8e,
+	0xb9, 0x51, 0x49, 0xe9, 0xeb, 0xf8, 0x94, 0x72, 0x67, 0x76, 0x8b, 0x54, 0xd7, 0xed, 0x0e, 0xf3,
+	0xfd, 0xdf, 0xf0, 0x9b, 0xed, 0x57, 0x29, 0xe1, 0x60, 0x81, 0xf7, 0x0e, 0x58, 0xd0, 0xa9, 0x04,
+	0xea, 0x5a, 0x16, 0x75, 0x0d, 0x29, 0x0a, 0xa1, 0xba, 0x6f, 0xac, 0x3b, 0x86, 0x77, 0x54, 0x07,
+	0x4c, 0x2f, 0xcd, 0xab, 0x6d, 0x85, 0x95, 0x8b, 0x75, 0x24, 0x05, 0x6d, 0xa2, 0x6c, 0xa4, 0x6c,
+	0xa2, 0x56, 0x57, 0x66, 0x5e, 0x31, 0x11, 0x82, 0x36, 0x4c, 0x1e, 0x3f, 0x3b, 0x2c, 0x2e, 0x4d,
+	0x8e, 0x14, 0xea, 0x0f, 0x5c, 0x64, 0xcb, 0x6c, 0x73, 0xee, 0x8f, 0xbf, 0xd5, 0x4f, 0x66, 0xf2,
+	0x6a, 0x90, 0x14, 0x60, 0x2e, 0x20, 0x51, 0xcf, 0xd2, 0x63, 0xc3, 0xf2, 0xac, 0xdc, 0xda, 0x91,
+	0x66, 0x7b, 0xa2, 0xf5, 0x73, 0x38, 0xb9, 0xa3, 0x30, 0x67, 0x6d, 0xd0, 0xb7, 0xc5, 0x64, 0x99,
+	0x6d, 0xa6, 0x7e, 0x78, 0xef, 0xd8, 0x5c, 0x03, 0xef, 0xc7, 0x3a, 0x76, 0xb3, 0xff, 0x7b, 0xef,
+	0xfa, 0x4e, 0x9e, 0xa6, 0x69, 0xfe, 0x3b, 0x59, 0x3f, 0x94, 0x3e, 0x1c, 0x6c, 0xd5, 0x27, 0xdc,
+	0xa7, 0x84, 0xdb, 0x98, 0xf0, 0x18, 0x37, 0xeb, 0x7c, 0xe8, 0xf3, 0xe6, 0x2f, 0x00, 0x00, 0xff,
+	0xff, 0x62, 0x54, 0x39, 0x72, 0x8b, 0x01, 0x00, 0x00,
 }

+ 4 - 4
transport/internet/ws/config.proto → transport/internet/websocket/config.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-package v2ray.core.transport.internet.ws;
-option csharp_namespace = "V2Ray.Core.Transport.Internet.Ws";
-option go_package = "ws";
-option java_package = "com.v2ray.core.transport.internet.ws";
+package v2ray.core.transport.internet.websocket;
+option csharp_namespace = "V2Ray.Core.Transport.Internet.Websocket";
+option go_package = "websocket";
+option java_package = "com.v2ray.core.transport.internet.websocket";
 option java_outer_classname = "ConfigProto";
 
 message ConnectionReuse {

+ 2 - 1
transport/internet/ws/connection.go → transport/internet/websocket/connection.go

@@ -1,9 +1,10 @@
-package ws
+package websocket
 
 import (
 	"io"
 	"net"
 	"time"
+
 	"v2ray.com/core/common/errors"
 )
 

+ 1 - 1
transport/internet/ws/connection_cache.go → transport/internet/websocket/connection_cache.go

@@ -1,4 +1,4 @@
-package ws
+package websocket
 
 import (
 	"net"

+ 1 - 1
transport/internet/ws/dialer.go → transport/internet/websocket/dialer.go

@@ -1,4 +1,4 @@
-package ws
+package websocket
 
 import (
 	"io/ioutil"

+ 1 - 1
transport/internet/ws/hub.go → transport/internet/websocket/hub.go

@@ -1,4 +1,4 @@
-package ws
+package websocket
 
 import (
 	"crypto/tls"

+ 2 - 1
transport/internet/ws/stopablehttplistener.go → transport/internet/websocket/stopablehttplistener.go

@@ -1,7 +1,8 @@
-package ws
+package websocket
 
 import (
 	"net"
+
 	"v2ray.com/core/common/errors"
 )
 

+ 1 - 1
transport/internet/ws/stopabletlslistener.go → transport/internet/websocket/stopabletlslistener.go

@@ -1,4 +1,4 @@
-package ws
+package websocket
 
 import "crypto/tls"
 

+ 1 - 1
transport/internet/ws/ws.go → transport/internet/websocket/ws.go

@@ -30,4 +30,4 @@ This transport was disscussed at
 https://github.com/v2ray/v2ray-core/issues/224
 
 */
-package ws
+package websocket

+ 2 - 2
transport/internet/ws/ws_test.go → transport/internet/websocket/ws_test.go

@@ -1,4 +1,4 @@
-package ws_test
+package websocket_test
 
 import (
 	"io/ioutil"
@@ -10,7 +10,7 @@ import (
 	"v2ray.com/core/testing/assert"
 	"v2ray.com/core/transport/internet"
 	v2tls "v2ray.com/core/transport/internet/tls"
-	. "v2ray.com/core/transport/internet/ws"
+	. "v2ray.com/core/transport/internet/websocket"
 )
 
 func Test_listenWSAndDial(t *testing.T) {

+ 1 - 1
transport/internet/ws/wsconn.go → transport/internet/websocket/wsconn.go

@@ -1,4 +1,4 @@
-package ws
+package websocket
 
 import (
 	"bufio"