hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-07-10 13:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: GeoSite & GeoIP

Browse Source
This commit is contained in:
JimhHan
2021-03-24 23:01:20 +08:00
parent 8382b29922
commit b11429eaee
54 changed files with 2110 additions and 1633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infra/conf/router_test.go
+17 -15
View File
@@ -7,6 +7,8 @@ import (
"github.com/golang/protobuf/proto"
"github.com/xtls/xray-core/app/router"
"github.com/xtls/xray-core/common/matcher/domain"
"github.com/xtls/xray-core/common/matcher/geoip"
"github.com/xtls/xray-core/common/net"
. "github.com/xtls/xray-core/infra/conf"
)
@@ -73,13 +75,13 @@ func TestRouterConfig(t *testing.T) {
},
Rule: []*router.RoutingRule{
{
Domain: []*router.Domain{
Domain: []*domain.Domain{
{
Type: router.Domain_Plain,
Type: domain.MatchingType_Keyword,
Value: "baidu.com",
},
{
Type: router.Domain_Plain,
Type: domain.MatchingType_Keyword,
Value: "qq.com",
},
},
@@ -88,9 +90,9 @@ func TestRouterConfig(t *testing.T) {
},
},
{
Geoip: []*router.GeoIP{
Geoip: []*geoip.GeoIP{
{
Cidr: []*router.CIDR{
Cidr: []*geoip.CIDR{
{
Ip: []byte{10, 0, 0, 0},
Prefix: 8,
@@ -161,13 +163,13 @@ func TestRouterConfig(t *testing.T) {
DomainStrategy: router.Config_IpIfNonMatch,
Rule: []*router.RoutingRule{
{
Domain: []*router.Domain{
Domain: []*domain.Domain{
{
Type: router.Domain_Plain,
Type: domain.MatchingType_Keyword,
Value: "baidu.com",
},
{
Type: router.Domain_Plain,
Type: domain.MatchingType_Keyword,
Value: "qq.com",
},
},
@@ -176,9 +178,9 @@ func TestRouterConfig(t *testing.T) {
},
},
{
Geoip: []*router.GeoIP{
Geoip: []*geoip.GeoIP{
{
Cidr: []*router.CIDR{
Cidr: []*geoip.CIDR{
{
Ip: []byte{10, 0, 0, 0},
Prefix: 8,
@@ -224,13 +226,13 @@ func TestRouterConfig(t *testing.T) {
DomainStrategy: router.Config_AsIs,
Rule: []*router.RoutingRule{
{
Domain: []*router.Domain{
Domain: []*domain.Domain{
{
Type: router.Domain_Plain,
Type: domain.MatchingType_Keyword,
Value: "baidu.com",
},
{
Type: router.Domain_Plain,
Type: domain.MatchingType_Keyword,
Value: "qq.com",
},
},
@@ -239,9 +241,9 @@ func TestRouterConfig(t *testing.T) {
},
},
{
Geoip: []*router.GeoIP{
Geoip: []*geoip.GeoIP{
{
Cidr: []*router.CIDR{
Cidr: []*geoip.CIDR{
{
Ip: []byte{10, 0, 0, 0},
Prefix: 8,