Darien Raymond пре 8 година
родитељ
комит
682319a004
2 измењених фајлова са 95 додато и 42 уклоњено
  1. 86 42
      app/router/config.pb.go
  2. 9 0
      app/router/config.proto

+ 86 - 42
app/router/config.pb.go

@@ -70,7 +70,7 @@ var Config_DomainStrategy_value = map[string]int32{
 func (x Config_DomainStrategy) String() string {
 	return proto.EnumName(Config_DomainStrategy_name, int32(x))
 }
-func (Config_DomainStrategy) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{5, 0} }
+func (Config_DomainStrategy) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{7, 0} }
 
 // Domain for routing decision.
 type Domain struct {
@@ -166,6 +166,46 @@ func (m *GeoIPList) GetEntry() []*GeoIP {
 	return nil
 }
 
+type GeoSite struct {
+	CountryCode string    `protobuf:"bytes,1,opt,name=country_code,json=countryCode" json:"country_code,omitempty"`
+	Domain      []*Domain `protobuf:"bytes,2,rep,name=domain" json:"domain,omitempty"`
+}
+
+func (m *GeoSite) Reset()                    { *m = GeoSite{} }
+func (m *GeoSite) String() string            { return proto.CompactTextString(m) }
+func (*GeoSite) ProtoMessage()               {}
+func (*GeoSite) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+
+func (m *GeoSite) GetCountryCode() string {
+	if m != nil {
+		return m.CountryCode
+	}
+	return ""
+}
+
+func (m *GeoSite) GetDomain() []*Domain {
+	if m != nil {
+		return m.Domain
+	}
+	return nil
+}
+
+type GeoSiteList struct {
+	Entry []*GeoSite `protobuf:"bytes,1,rep,name=entry" json:"entry,omitempty"`
+}
+
+func (m *GeoSiteList) Reset()                    { *m = GeoSiteList{} }
+func (m *GeoSiteList) String() string            { return proto.CompactTextString(m) }
+func (*GeoSiteList) ProtoMessage()               {}
+func (*GeoSiteList) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+
+func (m *GeoSiteList) GetEntry() []*GeoSite {
+	if m != nil {
+		return m.Entry
+	}
+	return nil
+}
+
 type RoutingRule struct {
 	Tag         string                              `protobuf:"bytes,1,opt,name=tag" json:"tag,omitempty"`
 	Domain      []*Domain                           `protobuf:"bytes,2,rep,name=domain" json:"domain,omitempty"`
@@ -180,7 +220,7 @@ type RoutingRule struct {
 func (m *RoutingRule) Reset()                    { *m = RoutingRule{} }
 func (m *RoutingRule) String() string            { return proto.CompactTextString(m) }
 func (*RoutingRule) ProtoMessage()               {}
-func (*RoutingRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+func (*RoutingRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
 
 func (m *RoutingRule) GetTag() string {
 	if m != nil {
@@ -246,7 +286,7 @@ type Config struct {
 func (m *Config) Reset()                    { *m = Config{} }
 func (m *Config) String() string            { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()               {}
-func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
 
 func (m *Config) GetDomainStrategy() Config_DomainStrategy {
 	if m != nil {
@@ -267,6 +307,8 @@ func init() {
 	proto.RegisterType((*CIDR)(nil), "v2ray.core.app.router.CIDR")
 	proto.RegisterType((*GeoIP)(nil), "v2ray.core.app.router.GeoIP")
 	proto.RegisterType((*GeoIPList)(nil), "v2ray.core.app.router.GeoIPList")
+	proto.RegisterType((*GeoSite)(nil), "v2ray.core.app.router.GeoSite")
+	proto.RegisterType((*GeoSiteList)(nil), "v2ray.core.app.router.GeoSiteList")
 	proto.RegisterType((*RoutingRule)(nil), "v2ray.core.app.router.RoutingRule")
 	proto.RegisterType((*Config)(nil), "v2ray.core.app.router.Config")
 	proto.RegisterEnum("v2ray.core.app.router.Domain_Type", Domain_Type_name, Domain_Type_value)
@@ -276,43 +318,45 @@ func init() {
 func init() { proto.RegisterFile("v2ray.com/core/app/router/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 595 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0xc7, 0x3f, 0x3b, 0x89, 0xbf, 0x7a, 0x1c, 0x82, 0xb5, 0xa2, 0xc8, 0x14, 0x2a, 0x82, 0x85,
-	0x20, 0x07, 0x64, 0x4b, 0x41, 0xc0, 0x05, 0x54, 0x95, 0xb4, 0x42, 0x91, 0xa0, 0x8a, 0x96, 0x96,
-	0x03, 0x1c, 0xac, 0xad, 0xb3, 0x35, 0x2b, 0x92, 0xdd, 0xd5, 0x7a, 0x5d, 0x9a, 0x1b, 0x2f, 0xc0,
-	0x8b, 0xf0, 0x34, 0x3c, 0x12, 0xda, 0x5d, 0x17, 0x5a, 0xd4, 0x00, 0xb7, 0x9d, 0xf1, 0x6f, 0x66,
-	0xfe, 0x33, 0x9e, 0x81, 0x07, 0xa7, 0x63, 0x45, 0x56, 0x59, 0x29, 0x96, 0x79, 0x29, 0x14, 0xcd,
-	0x89, 0x94, 0xb9, 0x12, 0x8d, 0xa6, 0x2a, 0x2f, 0x05, 0x3f, 0x61, 0x55, 0x26, 0x95, 0xd0, 0x02,
-	0x6d, 0x9e, 0x73, 0x8a, 0x66, 0x44, 0xca, 0xcc, 0x31, 0x5b, 0xf7, 0x7f, 0x0b, 0x2f, 0xc5, 0x72,
-	0x29, 0x78, 0xce, 0xa9, 0xce, 0xa5, 0x50, 0xda, 0x05, 0x6f, 0x3d, 0x5c, 0x4f, 0x71, 0xaa, 0x3f,
-	0x0b, 0xf5, 0xc9, 0x81, 0xe9, 0x17, 0x0f, 0x82, 0x3d, 0xb1, 0x24, 0x8c, 0xa3, 0xa7, 0xd0, 0xd5,
-	0x2b, 0x49, 0x13, 0x6f, 0xe8, 0x8d, 0x06, 0xe3, 0x34, 0xbb, 0xb2, 0x7e, 0xe6, 0xe0, 0xec, 0x70,
-	0x25, 0x29, 0xb6, 0x3c, 0xba, 0x01, 0xbd, 0x53, 0xb2, 0x68, 0x68, 0xe2, 0x0f, 0xbd, 0x51, 0x88,
-	0x9d, 0x91, 0x8e, 0xa0, 0x6b, 0x18, 0x14, 0x42, 0x6f, 0xb6, 0x20, 0x8c, 0xc7, 0xff, 0x99, 0x27,
-	0xa6, 0x15, 0x3d, 0x8b, 0x3d, 0x04, 0xe7, 0x55, 0x63, 0x3f, 0xcd, 0xa0, 0x3b, 0x99, 0xee, 0x61,
-	0x34, 0x00, 0x9f, 0x49, 0x5b, 0xbd, 0x8f, 0x7d, 0x26, 0xd1, 0x4d, 0x08, 0xa4, 0xa2, 0x27, 0xec,
-	0xcc, 0x26, 0xbe, 0x86, 0x5b, 0x2b, 0xfd, 0x00, 0xbd, 0x57, 0x54, 0x4c, 0x67, 0xe8, 0x1e, 0xf4,
-	0x4b, 0xd1, 0x70, 0xad, 0x56, 0x45, 0x29, 0xe6, 0x4e, 0x78, 0x88, 0xa3, 0xd6, 0x37, 0x11, 0x73,
-	0x8a, 0x72, 0xe8, 0x96, 0x6c, 0xae, 0x12, 0x7f, 0xd8, 0x19, 0x45, 0xe3, 0xdb, 0x6b, 0x7a, 0x32,
-	0xe5, 0xb1, 0x05, 0xd3, 0x1d, 0x08, 0x6d, 0xf2, 0xd7, 0xac, 0xd6, 0x68, 0x0c, 0x3d, 0x6a, 0x52,
-	0x25, 0x9e, 0x0d, 0xbf, 0xb3, 0x26, 0xdc, 0x06, 0x60, 0x87, 0xa6, 0x5f, 0x3b, 0x10, 0x61, 0xd1,
-	0x68, 0xc6, 0x2b, 0xdc, 0x2c, 0x28, 0x8a, 0xa1, 0xa3, 0x49, 0xd5, 0x6a, 0x33, 0x4f, 0xf4, 0x04,
-	0x82, 0xb9, 0xed, 0xbd, 0x55, 0xb5, 0xfd, 0xc7, 0x49, 0xe3, 0x16, 0xfe, 0xd9, 0x4a, 0xe7, 0x1f,
-	0x5b, 0x41, 0x3b, 0x00, 0x66, 0x23, 0x0a, 0x45, 0x78, 0x45, 0x93, 0xee, 0xd0, 0x1b, 0x45, 0xe3,
-	0xe1, 0xc5, 0x30, 0xb7, 0x14, 0x19, 0xa7, 0x3a, 0x9b, 0x09, 0xa5, 0xb1, 0xe1, 0x70, 0x28, 0xcf,
-	0x9f, 0x68, 0x1f, 0xfa, 0xed, 0xb2, 0x14, 0x0b, 0x56, 0xeb, 0xa4, 0x67, 0x53, 0xa4, 0x6b, 0x52,
-	0x1c, 0x38, 0xd4, 0x0c, 0x0e, 0x47, 0xfc, 0x97, 0x81, 0x9e, 0x43, 0x54, 0x8b, 0x46, 0x95, 0xb4,
-	0xb0, 0xfa, 0x83, 0xbf, 0xeb, 0x07, 0xc7, 0x4f, 0x4c, 0x17, 0xdb, 0x00, 0x4d, 0x4d, 0x55, 0x41,
-	0x97, 0x84, 0x2d, 0x92, 0xff, 0x87, 0x9d, 0x51, 0x88, 0x43, 0xe3, 0xd9, 0x37, 0x0e, 0x74, 0x17,
-	0x22, 0xc6, 0x8f, 0x45, 0xc3, 0xe7, 0x85, 0x19, 0xf3, 0x86, 0xfd, 0x0e, 0xad, 0xeb, 0x90, 0x54,
-	0xe9, 0x77, 0x0f, 0x82, 0x89, 0xbd, 0x2b, 0x74, 0x04, 0xd7, 0xdd, 0x2c, 0x8b, 0x5a, 0x2b, 0xa2,
-	0x69, 0xb5, 0x6a, 0x77, 0xfd, 0xd1, 0x3a, 0x31, 0xee, 0x1e, 0xdd, 0x8f, 0x78, 0xdb, 0xc6, 0xe0,
-	0xc1, 0xfc, 0x92, 0x6d, 0xee, 0x46, 0x35, 0x0b, 0xda, 0xfe, 0xcd, 0x75, 0x77, 0x73, 0x61, 0x27,
-	0xb0, 0xe5, 0xd3, 0x67, 0x30, 0xb8, 0x9c, 0x19, 0x6d, 0x40, 0x77, 0xb7, 0x9e, 0xd6, 0xee, 0x54,
-	0x8e, 0x6a, 0x3a, 0x95, 0xb1, 0x87, 0x62, 0xe8, 0x4f, 0xe5, 0xf4, 0xe4, 0x40, 0xf0, 0x37, 0x44,
-	0x97, 0x1f, 0x63, 0xff, 0xe5, 0x0b, 0xb8, 0x55, 0x8a, 0xe5, 0xd5, 0x75, 0x66, 0xde, 0xfb, 0xc0,
-	0xbd, 0xbe, 0xf9, 0x9b, 0xef, 0xc6, 0x98, 0xac, 0xb2, 0x89, 0x21, 0x76, 0xa5, 0xb4, 0x12, 0xa8,
-	0x3a, 0x0e, 0xec, 0xe5, 0x3f, 0xfe, 0x11, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x12, 0x0e, 0x89, 0x89,
-	0x04, 0x00, 0x00,
+	// 626 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xdf, 0x6e, 0xd3, 0x30,
+	0x14, 0xc6, 0x49, 0xda, 0x66, 0xcb, 0x49, 0x29, 0x91, 0xc5, 0x50, 0x18, 0x0c, 0x4a, 0x84, 0xa0,
+	0x17, 0x28, 0x91, 0xca, 0xbf, 0x1b, 0xd0, 0x34, 0xba, 0x69, 0xaa, 0x04, 0x53, 0xe5, 0x6d, 0x5c,
+	0xc0, 0x45, 0x94, 0xa5, 0x5e, 0x88, 0x68, 0x6d, 0xcb, 0x71, 0xc6, 0x7a, 0xc7, 0x0b, 0xf0, 0x22,
+	0x3c, 0x0d, 0x8f, 0x84, 0x6c, 0xa7, 0xb0, 0xa2, 0x05, 0x26, 0xee, 0x6c, 0xe7, 0xf7, 0x9d, 0xf3,
+	0xe5, 0xf8, 0x1c, 0xc3, 0xa3, 0xb3, 0xa1, 0x48, 0x17, 0x51, 0xc6, 0xe6, 0x71, 0xc6, 0x04, 0x89,
+	0x53, 0xce, 0x63, 0xc1, 0x2a, 0x49, 0x44, 0x9c, 0x31, 0x7a, 0x5a, 0xe4, 0x11, 0x17, 0x4c, 0x32,
+	0xb4, 0xb1, 0xe4, 0x04, 0x89, 0x52, 0xce, 0x23, 0xc3, 0x6c, 0x3e, 0xfc, 0x43, 0x9e, 0xb1, 0xf9,
+	0x9c, 0xd1, 0x98, 0x12, 0x19, 0x73, 0x26, 0xa4, 0x11, 0x6f, 0x3e, 0x6e, 0xa6, 0x28, 0x91, 0x5f,
+	0x98, 0xf8, 0x6c, 0xc0, 0xf0, 0xab, 0x05, 0xce, 0x2e, 0x9b, 0xa7, 0x05, 0x45, 0x2f, 0xa0, 0x2d,
+	0x17, 0x9c, 0x04, 0x56, 0xdf, 0x1a, 0xf4, 0x86, 0x61, 0x74, 0x69, 0xfe, 0xc8, 0xc0, 0xd1, 0xd1,
+	0x82, 0x13, 0xac, 0x79, 0x74, 0x13, 0x3a, 0x67, 0xe9, 0xac, 0x22, 0x81, 0xdd, 0xb7, 0x06, 0x2e,
+	0x36, 0x9b, 0x70, 0x00, 0x6d, 0xc5, 0x20, 0x17, 0x3a, 0x93, 0x59, 0x5a, 0x50, 0xff, 0x9a, 0x5a,
+	0x62, 0x92, 0x93, 0x73, 0xdf, 0x42, 0xb0, 0xcc, 0xea, 0xdb, 0x61, 0x04, 0xed, 0xd1, 0x78, 0x17,
+	0xa3, 0x1e, 0xd8, 0x05, 0xd7, 0xd9, 0xbb, 0xd8, 0x2e, 0x38, 0xba, 0x05, 0x0e, 0x17, 0xe4, 0xb4,
+	0x38, 0xd7, 0x81, 0xaf, 0xe3, 0x7a, 0x17, 0x7e, 0x84, 0xce, 0x3e, 0x61, 0xe3, 0x09, 0x7a, 0x00,
+	0xdd, 0x8c, 0x55, 0x54, 0x8a, 0x45, 0x92, 0xb1, 0xa9, 0x31, 0xee, 0x62, 0xaf, 0x3e, 0x1b, 0xb1,
+	0x29, 0x41, 0x31, 0xb4, 0xb3, 0x62, 0x2a, 0x02, 0xbb, 0xdf, 0x1a, 0x78, 0xc3, 0x3b, 0x0d, 0xff,
+	0xa4, 0xd2, 0x63, 0x0d, 0x86, 0xdb, 0xe0, 0xea, 0xe0, 0x6f, 0x8b, 0x52, 0xa2, 0x21, 0x74, 0x88,
+	0x0a, 0x15, 0x58, 0x5a, 0x7e, 0xb7, 0x41, 0xae, 0x05, 0xd8, 0xa0, 0x61, 0x06, 0x6b, 0xfb, 0x84,
+	0x1d, 0x16, 0x92, 0x5c, 0xc5, 0xdf, 0x73, 0x70, 0xa6, 0xba, 0x0e, 0xb5, 0xc3, 0xad, 0xbf, 0x56,
+	0x1d, 0xd7, 0x70, 0x38, 0x02, 0xaf, 0x4e, 0xa2, 0x7d, 0x3e, 0x5b, 0xf5, 0x79, 0xaf, 0xd9, 0xa7,
+	0x92, 0x2c, 0x9d, 0x7e, 0x6b, 0x81, 0x87, 0x59, 0x25, 0x0b, 0x9a, 0xe3, 0x6a, 0x46, 0x90, 0x0f,
+	0x2d, 0x99, 0xe6, 0xb5, 0x4b, 0xb5, 0xfc, 0x4f, 0x77, 0xbf, 0x8a, 0xde, 0xba, 0x62, 0xd1, 0xd1,
+	0x36, 0x80, 0xea, 0xdd, 0x44, 0xa4, 0x34, 0x27, 0x41, 0xbb, 0x6f, 0x0d, 0xbc, 0x61, 0xff, 0xa2,
+	0xcc, 0xb4, 0x6f, 0x44, 0x89, 0x8c, 0x26, 0x4c, 0x48, 0xac, 0x38, 0xec, 0xf2, 0xe5, 0x12, 0xed,
+	0x41, 0xb7, 0x6e, 0xeb, 0x64, 0x56, 0x94, 0x32, 0xe8, 0xe8, 0x10, 0x61, 0x43, 0x88, 0x03, 0x83,
+	0xaa, 0xd2, 0x61, 0x8f, 0xfe, 0xde, 0xa0, 0x57, 0xe0, 0x95, 0xac, 0x12, 0x19, 0x49, 0xb4, 0x7f,
+	0xe7, 0xdf, 0xfe, 0xc1, 0xf0, 0x23, 0xf5, 0x17, 0x5b, 0x00, 0x55, 0x49, 0x44, 0x42, 0xe6, 0x69,
+	0x31, 0x0b, 0xd6, 0xfa, 0xad, 0x81, 0x8b, 0x5d, 0x75, 0xb2, 0xa7, 0x0e, 0xd0, 0x7d, 0xf0, 0x0a,
+	0x7a, 0xc2, 0x2a, 0x3a, 0x4d, 0x54, 0x99, 0xd7, 0xf5, 0x77, 0xa8, 0x8f, 0x8e, 0xd2, 0x3c, 0xfc,
+	0x61, 0x81, 0x33, 0xd2, 0x2f, 0x00, 0x3a, 0x86, 0x1b, 0xa6, 0x96, 0x49, 0x29, 0x45, 0x2a, 0x49,
+	0xbe, 0xa8, 0xa7, 0xf2, 0x49, 0x93, 0x19, 0xf3, 0x72, 0x98, 0x8b, 0x38, 0xac, 0x35, 0xb8, 0x37,
+	0x5d, 0xd9, 0xab, 0x09, 0x17, 0xd5, 0x8c, 0xd4, 0xb7, 0xd9, 0x34, 0xe1, 0x17, 0x7a, 0x02, 0x6b,
+	0x3e, 0x7c, 0x09, 0xbd, 0xd5, 0xc8, 0x68, 0x1d, 0xda, 0x3b, 0xe5, 0xb8, 0x34, 0x43, 0x7d, 0x5c,
+	0x92, 0x31, 0xf7, 0x2d, 0xe4, 0x43, 0x77, 0xcc, 0xc7, 0xa7, 0x07, 0x8c, 0xbe, 0x4b, 0x65, 0xf6,
+	0xc9, 0xb7, 0xdf, 0xbc, 0x86, 0xdb, 0x19, 0x9b, 0x5f, 0x9e, 0x67, 0x62, 0x7d, 0x70, 0xcc, 0xea,
+	0xbb, 0xbd, 0xf1, 0x7e, 0x88, 0xd3, 0x45, 0x34, 0x52, 0xc4, 0x0e, 0xe7, 0xda, 0x02, 0x11, 0x27,
+	0x8e, 0x7e, 0xa3, 0x9e, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xa3, 0xd9, 0xd0, 0x33, 0x05,
+	0x00, 0x00,
 }

+ 9 - 0
app/router/config.proto

@@ -46,6 +46,15 @@ message GeoIPList {
   repeated GeoIP entry = 1;
 }
 
+message GeoSite {
+  string country_code = 1;
+  repeated Domain domain = 2;
+}
+
+message GeoSiteList{
+  repeated GeoSite entry = 1;
+}
+
 message RoutingRule {
   string tag = 1;
   repeated Domain domain = 2;