OrgGo
/
clash
mirror of https://github.com/Dreamacro/clash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix(domain-trie): Incorrect result

This commit is contained in:
Dreamacro 2019-07-15 18:00:51 +08:00
parent 6077e825c5
commit 3497fdaf45
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
component/domain-trie/tire.go
View File

@ -75,6 +75,10 @@ func (t *Trie) Search(domain string) *Node {
n = child
}
if n.Data == nil {
return nil
}
return n
}

16
component/domain-trie/trie_test.go
View File

@ -5,6 +5,8 @@ import (
"testing"
)
var localIP = net.IP{127, 0, 0, 1}
func TestTrie_Basic(t *testing.T) {
tree := New()
domains := []string{
@ -13,7 +15,7 @@ func TestTrie_Basic(t *testing.T) {
}
for _, domain := range domains {
tree.Insert(domain, net.ParseIP("127.0.0.1"))
tree.Insert(domain, localIP)
}
node := tree.Search("example.com")
@ -21,7 +23,7 @@ func TestTrie_Basic(t *testing.T) {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(net.IP{127, 0, 0, 1}) {
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
}
@ -35,7 +37,7 @@ func TestTrie_Wildcard(t *testing.T) {
}
for _, domain := range domains {
tree.Insert(domain, nil)
tree.Insert(domain, localIP)
}
if tree.Search("sub.example.com") == nil {
@ -53,13 +55,17 @@ func TestTrie_Wildcard(t *testing.T) {
if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
}
if tree.Search("example.com") != nil {
t.Error("should recv nil")
}
}
func TestTrie_Boundary(t *testing.T) {
tree := New()
tree.Insert("*.dev", nil)
tree.Insert("*.dev", localIP)
if err := tree.Insert("com", nil); err == nil {
if err := tree.Insert("com", localIP); err == nil {
t.Error("should recv err")
}