From 39eea81c5c9c17f6f5d14b70b40286787795e50f Mon Sep 17 00:00:00 2001
From: v2ray <admin@v2ray.com>
Date: Mon, 1 Feb 2016 23:21:54 +0100
Subject: [PATCH] simplify router config

---
 app/router/rules/config.go      | 18 ++----------------
 app/router/rules/config_json.go | 12 ++++++++----
 app/router/rules/router.go      | 28 +++++++---------------------
 app/router/rules/router_test.go | 15 ++++++++++-----
 4 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/app/router/rules/config.go b/app/router/rules/config.go
index 0e6c91db..b90e1e8f 100644
--- a/app/router/rules/config.go
+++ b/app/router/rules/config.go
@@ -14,20 +14,6 @@ func (this *Rule) Apply(dest v2net.Destination) bool {
 }
 
 type RouterRuleConfig struct {
-	rules []*Rule
-}
-
-func NewRouterRuleConfig() *RouterRuleConfig {
-	return &RouterRuleConfig{
-		rules: make([]*Rule, 0, 16),
-	}
-}
-
-func (this *RouterRuleConfig) Add(rule *Rule) *RouterRuleConfig {
-	this.rules = append(this.rules, rule)
-	return this
-}
-
-func (this *RouterRuleConfig) Rules() []*Rule {
-	return this.rules
+	Rules         []*Rule
+	ResolveDomain bool
 }
diff --git a/app/router/rules/config_json.go b/app/router/rules/config_json.go
index 9719b2f7..3e7e5e8d 100644
--- a/app/router/rules/config_json.go
+++ b/app/router/rules/config_json.go
@@ -117,16 +117,20 @@ func ParseRule(msg json.RawMessage) *Rule {
 func init() {
 	router.RegisterRouterConfig("rules", func(data []byte) (interface{}, error) {
 		type JsonConfig struct {
-			RuleList []json.RawMessage `json:"rules"`
+			RuleList      []json.RawMessage `json:"rules"`
+			ResolveDomain bool              `json:"resolveDomain"`
 		}
 		jsonConfig := new(JsonConfig)
 		if err := json.Unmarshal(data, jsonConfig); err != nil {
 			return nil, err
 		}
-		config := NewRouterRuleConfig()
-		for _, rawRule := range jsonConfig.RuleList {
+		config := &RouterRuleConfig{
+			Rules:         make([]*Rule, len(jsonConfig.RuleList)),
+			ResolveDomain: jsonConfig.ResolveDomain,
+		}
+		for idx, rawRule := range jsonConfig.RuleList {
 			rule := ParseRule(rawRule)
-			config.Add(rule)
+			config.Rules[idx] = rule
 		}
 		return config, nil
 	})
diff --git a/app/router/rules/router.go b/app/router/rules/router.go
index 53ab166b..ea2f2424 100644
--- a/app/router/rules/router.go
+++ b/app/router/rules/router.go
@@ -38,24 +38,19 @@ func (this *cacheEntry) Extend() {
 }
 
 type Router struct {
-	rules []*Rule
-	cache *collect.ValidityMap
+	config *RouterRuleConfig
+	cache  *collect.ValidityMap
 }
 
-func NewRouter() *Router {
+func NewRouter(config *RouterRuleConfig) *Router {
 	return &Router{
-		rules: make([]*Rule, 0, 16),
-		cache: collect.NewValidityMap(3600),
+		config: config,
+		cache:  collect.NewValidityMap(3600),
 	}
 }
 
-func (this *Router) AddRule(rule *Rule) *Router {
-	this.rules = append(this.rules, rule)
-	return this
-}
-
 func (this *Router) takeDetourWithoutCache(dest v2net.Destination) (string, error) {
-	for _, rule := range this.rules {
+	for _, rule := range this.config.Rules {
 		if rule.Apply(dest) {
 			return rule.Tag, nil
 		}
@@ -78,16 +73,7 @@ type RouterFactory struct {
 }
 
 func (this *RouterFactory) Create(rawConfig interface{}) (router.Router, error) {
-	config := rawConfig.(*RouterRuleConfig)
-	rules := config.Rules()
-	router := NewRouter()
-	for _, rule := range rules {
-		if rule == nil {
-			return nil, ErrorInvalidRule
-		}
-		router.AddRule(rule)
-	}
-	return router, nil
+	return NewRouter(rawConfig.(*RouterRuleConfig)), nil
 }
 
 func init() {
diff --git a/app/router/rules/router_test.go b/app/router/rules/router_test.go
index 21477013..f743314e 100644
--- a/app/router/rules/router_test.go
+++ b/app/router/rules/router_test.go
@@ -12,11 +12,16 @@ import (
 func TestSimpleRouter(t *testing.T) {
 	v2testing.Current(t)
 
-	router := NewRouter().AddRule(
-		&Rule{
-			Tag:       "test",
-			Condition: NewNetworkMatcher(v2net.Network("tcp").AsList()),
-		})
+	config := &RouterRuleConfig{
+		Rules: []*Rule{
+			&Rule{
+				Tag:       "test",
+				Condition: NewNetworkMatcher(v2net.Network("tcp").AsList()),
+			},
+		},
+	}
+
+	router := NewRouter(config)
 
 	tag, err := router.TakeDetour(v2net.TCPDestination(v2net.DomainAddress("v2ray.com"), 80))
 	assert.Error(err).IsNil()