From 2c7e70466e5335d22569409b203263b58088e77c Mon Sep 17 00:00:00 2001 From: Star Brilliant Date: Sun, 2 Aug 2020 05:53:21 +0800 Subject: [PATCH] Rewrite globalip_test --- .gitignore | 2 +- go.mod | 2 +- go.sum | 8 ++++++-- json-dns/globalip_test.go | 33 ++++++++++++++++++++++++++------- 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a81bbad..da0b4a8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,4 @@ doh-server/doh-server .glide/ .idea/ -vendor/ \ No newline at end of file +vendor/ diff --git a/go.mod b/go.mod index 829f220..b1b4528 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/BurntSushi/toml v0.3.1 github.com/gorilla/handlers v1.4.0 - github.com/infobloxopen/go-trees v0.0.0-20190313150506-2af4e13f9062 + github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 github.com/miekg/dns v1.1.31 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 diff --git a/go.sum b/go.sum index 31d2328..3b08733 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,12 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= -github.com/infobloxopen/go-trees v0.0.0-20190313150506-2af4e13f9062 h1:d3VSuNcgTCn21dNMm8g412Fck/XWFmMj4nJhhHT7ZZ0= -github.com/infobloxopen/go-trees v0.0.0-20190313150506-2af4e13f9062/go.mod h1:PcNJqIlcX/dj3DTG/+QQnRvSgTMG6CLpRMjWcv4+J6w= +github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 h1:w66aaP3c6SIQ0pi3QH1Tb4AMO3aWoEPxd1CNvLphbkA= +github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9/go.mod h1:BaIJzjD2ZnHmx2acPF6XfGLPzNCMiBbMRqJr+8/8uRI= github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo= github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -34,3 +36,5 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/json-dns/globalip_test.go b/json-dns/globalip_test.go index 330299f..10b6920 100644 --- a/json-dns/globalip_test.go +++ b/json-dns/globalip_test.go @@ -3,13 +3,32 @@ package jsonDNS import ( "fmt" "net" - "testing" ) -func TestFindIp(t *testing.T) { - - fmt.Println(IsGlobalIP(net.IP{127, 0, 0, 1})) - fmt.Println(IsGlobalIP(net.IP{192, 168, 0, 0})) - fmt.Println(IsGlobalIP(net.IP{110, 100, 100, 100})) - +func ExampleFindIP() { + fmt.Println(IsGlobalIP(net.ParseIP("127.0.0.1"))) + fmt.Println(IsGlobalIP(net.IP{192, 168, 1, 1})) + fmt.Println(IsGlobalIP(net.ParseIP("8.8.8.8"))) + fmt.Println(IsGlobalIP(net.IP{8, 8, 4, 4})) + fmt.Println(IsGlobalIP(net.ParseIP("::1"))) + fmt.Println(IsGlobalIP(net.IP{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})) + fmt.Println(IsGlobalIP(net.ParseIP("2001:4860:4860::8888"))) + fmt.Println(IsGlobalIP(net.IP{0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x44})) + fmt.Println(IsGlobalIP(net.ParseIP("::ffff:127.0.0.1"))) + fmt.Println(IsGlobalIP(net.IP{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 192, 168, 1, 1})) + fmt.Println(IsGlobalIP(net.ParseIP("::ffff:808:808"))) + fmt.Println(IsGlobalIP(net.IP{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 8, 8, 4, 4})) + // Output: + // false + // false + // true + // true + // false + // false + // true + // true + // false + // false + // true + // true }