From 2a7209a0a96a566721367f0137bb98340e88978b Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 16 Aug 2019 13:06:20 +0800 Subject: [PATCH] remove dns cache size opt --- cmd/main.go | 1 - cmd/main_fakedns.go | 3 +-- component/dns/fakedns/server.go | 7 +++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index ff2a34d..5af311e 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -49,7 +49,6 @@ type CmdArgs struct { // FakeDNS EnableFakeDNS *bool - DNSCacheSize *int FakeIPRange *string FakeDNSAddr *string FakeDNSHosts *string diff --git a/cmd/main_fakedns.go b/cmd/main_fakedns.go index 4f28f77..7fdb932 100644 --- a/cmd/main_fakedns.go +++ b/cmd/main_fakedns.go @@ -11,7 +11,6 @@ import ( func init() { args.EnableFakeDNS = flag.Bool("fakeDNS", false, "Enable fake DNS") - args.DNSCacheSize = flag.Int("dnsCacheSize", 100, "Size of DNS LRU Cache") args.FakeDNSAddr = flag.String("fakeDNSAddr", ":53", "Listen address of fake DNS") args.FakeIPRange = flag.String("fakeIPRange", "198.18.0.0/15", "Fake IP CIDR range for DNS") args.FakeDNSHosts = flag.String("fakeDNSHosts", "", "DNS hosts mapping, e.g. 'example.com=1.1.1.1,example.net=2.2.2.2'") @@ -19,7 +18,7 @@ func init() { addPostFlagsInitFn(func() { if *args.EnableFakeDNS { var err error - fakeDNS, err = fakedns.NewServer(*args.FakeIPRange, *args.FakeDNSHosts, *args.DNSCacheSize) + fakeDNS, err = fakedns.NewServer(*args.FakeIPRange, *args.FakeDNSHosts) if err != nil { log.Fatalf("Create fake DNS server failed: %v", err) } diff --git a/component/dns/fakedns/server.go b/component/dns/fakedns/server.go index cb38b33..469b23a 100644 --- a/component/dns/fakedns/server.go +++ b/component/dns/fakedns/server.go @@ -13,6 +13,8 @@ import ( ) const ( + dnsCacheSize int = 1000 + dnsFakeTTL uint32 = 1 dnsDefaultTTL uint32 = 600 ) @@ -67,12 +69,13 @@ func (s *Server) IPToHost(ip net.IP) (string, bool) { return s.p.LookBack(ip) } -func NewServer(fakeIPRange, hosts string, size int) (*Server, error) { +func NewServer(fakeIPRange, hosts string) (*Server, error) { _, ipnet, err := net.ParseCIDR(fakeIPRange) if err != nil { return nil, err } - pool, err := fakeip.New(ipnet, size) + + pool, err := fakeip.New(ipnet, dnsCacheSize) if err != nil { return nil, err }