Browse Source

FakeDNS: use 198.18.0.0/15 as default IP pool (#779)

Loyalsoldier 4 years ago
parent
commit
933861a761
3 changed files with 11 additions and 11 deletions
  1. 1 1
      app/dns/fakedns/fake.go
  2. 9 9
      app/dns/fakedns/fakedns_test.go
  3. 1 1
      infra/conf/fakedns.go

+ 1 - 1
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
 	}

+ 9 - 9
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) {

+ 1 - 1
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,
 			}
 		}