xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Feature: add default hosts localhost

Browse source
This commit is contained in:
Dreamacro 2020-06-07 17:25:51 +08:00
parent 2dece02df6
commit fb628e9c62
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
component/trie/domain.go
View file

@ -30,9 +30,13 @@ func validAndSplitDomain(domain string) ([]string, bool) {
parts := strings.Split(domain, domainStep) parts := strings.Split(domain, domainStep)
if len(parts) == 1 { if len(parts) == 1 {
if parts[0] == "" {
return nil, false return nil, false
} }
return parts, true
}
for _, part := range parts[1:] { for _, part := range parts[1:] {
if part == "" { if part == "" {
return nil, false return nil, false

3
component/trie/domain_test.go
View file

@ -14,6 +14,7 @@ func TestTrie_Basic(t *testing.T) {
domains := []string{ domains := []string{
"example.com", "example.com",
"google.com", "google.com",
"localhost",
} }
for _, domain := range domains { for _, domain := range domains {
@ -24,6 +25,8 @@ func TestTrie_Basic(t *testing.T) {
assert.NotNil(t, node) assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP)) assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) assert.NotNil(t, tree.Insert("", localIP))
assert.Nil(t, tree.Search(""))
assert.NotNil(t, tree.Search("localhost"))
} }
func TestTrie_Wildcard(t *testing.T) { func TestTrie_Wildcard(t *testing.T) {

6
config/config.go
View file

@ -418,6 +418,12 @@ func parseRules(cfg *RawConfig, proxies map[string]C.Proxy) ([]C.Rule, error) {
func parseHosts(cfg *RawConfig) (*trie.DomainTrie, error) { func parseHosts(cfg *RawConfig) (*trie.DomainTrie, error) {
tree := trie.New() tree := trie.New()
// add default hosts
if err := tree.Insert("localhost", net.IP{127, 0, 0, 1}); err != nil {
println(err.Error())
}
if len(cfg.Hosts) != 0 { if len(cfg.Hosts) != 0 {
for domain, ipStr := range cfg.Hosts { for domain, ipStr := range cfg.Hosts {
ip := net.ParseIP(ipStr) ip := net.ParseIP(ipStr)