fix geoip

daiedaie · Oct 17, 2016 · 4a67587 · 4a67587
1 parent 8b936bc
commit 4a67587
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 7,657 deletions.
diff --git a/tools/conf/router.go b/tools/conf/router.go
@@ -10,6 +10,8 @@ import (
 	"v2ray.com/core/common/log"
 	v2net "v2ray.com/core/common/net"
 	"v2ray.com/core/tools/geoip"
+
+	"github.com/golang/protobuf/proto"
 )
 
 type RouterRulesConfig struct {
@@ -173,9 +175,13 @@ func parseChinaIPRule(data []byte) (*router.RoutingRule, error) {
 		log.Error("Router: Invalid router rule: ", err)
 		return nil, err
 	}
+	var chinaIPs geoip.CountryIPRange
+	if err := proto.Unmarshal(geoip.ChinaIPs, &chinaIPs); err != nil {
+		return nil, err
+	}
 	return &router.RoutingRule{
 		Tag: rawRule.OutboundTag,
-		Ip:  geoip.ChinaIPs,
+		Ip:  chinaIPs.Ips,
 	}, nil
 }
 

diff --git a/tools/geoip/geoip.pb.go b/tools/geoip/geoip.pb.go
diff --git a/tools/geoip/geoip.proto b/tools/geoip/geoip.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package v2ray.core.tools.geoip;
+option go_package = "geoip";
+
+import "v2ray.com/core/app/router/config.proto";
+
+message CountryIPRange {
+  repeated v2ray.core.app.router.IP ips = 1;
+}