From 933861a761ef9dc3e88f81e589d89de9daedf708 Mon Sep 17 00:00:00 2001
From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Mon, 15 Mar 2021 16:47:10 +0800
Subject: [PATCH] FakeDNS: use 198.18.0.0/15 as default IP pool (#779)

---
 app/dns/fakedns/fake.go         |  2 +-
 app/dns/fakedns/fakedns_test.go | 18 +++++++++---------
 infra/conf/fakedns.go           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/dns/fakedns/fake.go b/app/dns/fakedns/fake.go
index 0d2d9a617..3987e1629 100644
--- a/app/dns/fakedns/fake.go
+++ b/app/dns/fakedns/fake.go
@@ -45,7 +45,7 @@ func NewFakeDNSHolder() (*Holder, error) {
 	if fkdns, err = NewFakeDNSHolderConfigOnly(nil); err != nil {
 		return nil, newError("Unable to create Fake Dns Engine").Base(err).AtError()
 	}
-	err = fkdns.initialize("240.0.0.0/8", 65535)
+	err = fkdns.initialize("198.18.0.0/15", 65535)
 	if err != nil {
 		return nil, err
 	}
diff --git a/app/dns/fakedns/fakedns_test.go b/app/dns/fakedns/fakedns_test.go
index 1ddd587ac..f2f3dc26a 100644
--- a/app/dns/fakedns/fakedns_test.go
+++ b/app/dns/fakedns/fakedns_test.go
@@ -20,7 +20,7 @@ func TestFakeDnsHolderCreateMapping(t *testing.T) {
 	common.Must(err)
 
 	addr := fkdns.GetFakeIPForDomain("fakednstest.v2fly.org")
-	assert.Equal(t, "240.0.0.0", addr[0].IP().String())
+	assert.Equal(t, "198.18.0.0", addr[0].IP().String())
 }
 
 func TestFakeDnsHolderCreateMappingMany(t *testing.T) {
@@ -28,10 +28,10 @@ func TestFakeDnsHolderCreateMappingMany(t *testing.T) {
 	common.Must(err)
 
 	addr := fkdns.GetFakeIPForDomain("fakednstest.v2fly.org")
-	assert.Equal(t, "240.0.0.0", addr[0].IP().String())
+	assert.Equal(t, "198.18.0.0", addr[0].IP().String())
 
 	addr2 := fkdns.GetFakeIPForDomain("fakednstest2.v2fly.org")
-	assert.Equal(t, "240.0.0.1", addr2[0].IP().String())
+	assert.Equal(t, "198.18.0.1", addr2[0].IP().String())
 }
 
 func TestFakeDnsHolderCreateMappingManyAndResolve(t *testing.T) {
@@ -40,21 +40,21 @@ func TestFakeDnsHolderCreateMappingManyAndResolve(t *testing.T) {
 
 	{
 		addr := fkdns.GetFakeIPForDomain("fakednstest.v2fly.org")
-		assert.Equal(t, "240.0.0.0", addr[0].IP().String())
+		assert.Equal(t, "198.18.0.0", addr[0].IP().String())
 	}
 
 	{
 		addr2 := fkdns.GetFakeIPForDomain("fakednstest2.v2fly.org")
-		assert.Equal(t, "240.0.0.1", addr2[0].IP().String())
+		assert.Equal(t, "198.18.0.1", addr2[0].IP().String())
 	}
 
 	{
-		result := fkdns.GetDomainFromFakeDNS(net.ParseAddress("240.0.0.0"))
+		result := fkdns.GetDomainFromFakeDNS(net.ParseAddress("198.18.0.0"))
 		assert.Equal(t, "fakednstest.v2fly.org", result)
 	}
 
 	{
-		result := fkdns.GetDomainFromFakeDNS(net.ParseAddress("240.0.0.1"))
+		result := fkdns.GetDomainFromFakeDNS(net.ParseAddress("198.18.0.1"))
 		assert.Equal(t, "fakednstest2.v2fly.org", result)
 	}
 }
@@ -64,10 +64,10 @@ func TestFakeDnsHolderCreateMappingManySingleDomain(t *testing.T) {
 	common.Must(err)
 
 	addr := fkdns.GetFakeIPForDomain("fakednstest.v2fly.org")
-	assert.Equal(t, "240.0.0.0", addr[0].IP().String())
+	assert.Equal(t, "198.18.0.0", addr[0].IP().String())
 
 	addr2 := fkdns.GetFakeIPForDomain("fakednstest.v2fly.org")
-	assert.Equal(t, "240.0.0.0", addr2[0].IP().String())
+	assert.Equal(t, "198.18.0.0", addr2[0].IP().String())
 }
 
 func TestFakeDnsHolderCreateMappingAndRollOver(t *testing.T) {
diff --git a/infra/conf/fakedns.go b/infra/conf/fakedns.go
index b7f66d9d2..3d097f7fd 100644
--- a/infra/conf/fakedns.go
+++ b/infra/conf/fakedns.go
@@ -37,7 +37,7 @@ func (FakeDNSPostProcessingStage) Process(conf *Config) error {
 		if conf.FakeDNS == nil {
 			// Add a Fake DNS Config if there is none
 			conf.FakeDNS = &FakeDNSConfig{
-				IPPool:  "240.0.0.0/8",
+				IPPool:  "198.18.0.0/15",
 				LruSize: 65535,
 			}
 		}