docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
ShadowsocksR | <mask> Reject
<mask>
<mask> Shadowsocks
<mask> Snell
<mask> Socks5
<mask> Http
<mask> Vmess
</s> Feature: add ssr support (#805)
* Refactor ssr stream cipher to expose iv and key
References:
https://github.com/Dreamacro/go-shadowsocks2
https://github.com/sh4d0wfiend/go-shadowsocksr2
* Implement ssr obfs
Reference:
https://github.com/mzz2017/shadowsocksR
* Implement ssr protocol
References:
https://github.com/mzz2017/shadowsocksR
https://github.com/shadowsocksRb/shadowsocksr-libev
https://github.com/shadowsocksr-backup/shadowsocksr </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.5 h1:BizWSjmwzAyQoslz6YhJYMiAGT99j9cnm9zlxVr+kyI=
github.com/Dreamacro/go-shadowsocks2 v0.1.5/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU=
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a h1:JhQFrFOkCpRB8qsN6PrzHFzjy/8iQpFFk5cbOiplh6s=
github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU= </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.5
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/33a6579a3a59d220ce018958b17343dc247409b8 | constant/adapters.go |
case ShadowsocksR:
return "ShadowsocksR" | <mask> return "Reject"
<mask>
<mask> case Shadowsocks:
<mask> return "Shadowsocks"
<mask> case Snell:
<mask> return "Snell"
<mask> case Socks5:
<mask> return "Socks5"
</s> Feature: add ssr support (#805)
* Refactor ssr stream cipher to expose iv and key
References:
https://github.com/Dreamacro/go-shadowsocks2
https://github.com/sh4d0wfiend/go-shadowsocksr2
* Implement ssr obfs
Reference:
https://github.com/mzz2017/shadowsocksR
* Implement ssr protocol
References:
https://github.com/mzz2017/shadowsocksR
https://github.com/shadowsocksRb/shadowsocksr-libev
https://github.com/shadowsocksr-backup/shadowsocksr </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.5 h1:BizWSjmwzAyQoslz6YhJYMiAGT99j9cnm9zlxVr+kyI=
github.com/Dreamacro/go-shadowsocks2 v0.1.5/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU=
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a h1:JhQFrFOkCpRB8qsN6PrzHFzjy/8iQpFFk5cbOiplh6s=
github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU= </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.5
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/33a6579a3a59d220ce018958b17343dc247409b8 | constant/adapters.go |
github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.5
<mask> github.com/eapache/queue v1.1.0 // indirect
<mask> github.com/go-chi/chi v4.1.2+incompatible
<mask> github.com/go-chi/cors v1.1.1
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v3.3.0+incompatible
</s> Feature: add ssr support (#805)
* Refactor ssr stream cipher to expose iv and key
References:
https://github.com/Dreamacro/go-shadowsocks2
https://github.com/sh4d0wfiend/go-shadowsocksr2
* Implement ssr obfs
Reference:
https://github.com/mzz2017/shadowsocksR
* Implement ssr protocol
References:
https://github.com/mzz2017/shadowsocksR
https://github.com/shadowsocksRb/shadowsocksr-libev
https://github.com/shadowsocksr-backup/shadowsocksr </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.5 h1:BizWSjmwzAyQoslz6YhJYMiAGT99j9cnm9zlxVr+kyI=
github.com/Dreamacro/go-shadowsocks2 v0.1.5/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU=
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a h1:JhQFrFOkCpRB8qsN6PrzHFzjy/8iQpFFk5cbOiplh6s=
github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/33a6579a3a59d220ce018958b17343dc247409b8 | go.mod |
github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a h1:JhQFrFOkCpRB8qsN6PrzHFzjy/8iQpFFk5cbOiplh6s=
github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU= | <mask> github.com/Dreamacro/go-shadowsocks2 v0.1.5 h1:BizWSjmwzAyQoslz6YhJYMiAGT99j9cnm9zlxVr+kyI=
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.5/go.mod h1:LSXCjyHesPY3pLjhwff1mQX72ItcBT/N2xNC685cYeU=
<mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
<mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
<mask> github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
</s> Feature: add ssr support (#805)
* Refactor ssr stream cipher to expose iv and key
References:
https://github.com/Dreamacro/go-shadowsocks2
https://github.com/sh4d0wfiend/go-shadowsocksr2
* Implement ssr obfs
Reference:
https://github.com/mzz2017/shadowsocksR
* Implement ssr protocol
References:
https://github.com/mzz2017/shadowsocksR
https://github.com/shadowsocksRb/shadowsocksr-libev
https://github.com/shadowsocksr-backup/shadowsocksr </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.5
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.6-0.20200722122336-8e5c7db4f96a | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/33a6579a3a59d220ce018958b17343dc247409b8 | go.sum |
err := fmt.Errorf("cannot parse") | <mask> return nil, fmt.Errorf("Proxy %d missing type", idx)
<mask> }
<mask>
<mask> var proxy C.ProxyAdapter
<mask> err := fmt.Errorf("can't parse")
<mask> switch proxyType {
<mask> case "ss":
<mask> ssOption := &adapters.ShadowSocksOption{}
<mask> err = decoder.Decode(mapping, ssOption)
<mask> if err != nil {
</s> Chore: update dependencies & fix typo </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") </s> remove errIPNotFound = errors.New("ip not found")
</s> add errIPNotFound = errors.New("cannot found ip") </s> remove return nil, errors.New("GeoIP can't use")
</s> add return nil, errors.New("GeoIP cannot use") </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | config/config.go |
err := fmt.Errorf("cannot parse") | <mask> }
<mask> var group C.ProxyAdapter
<mask> ps := []C.Proxy{}
<mask>
<mask> err := fmt.Errorf("can't parse")
<mask> switch groupType {
<mask> case "url-test":
<mask> urlTestOption := &adapters.URLTestOption{}
<mask> err = decoder.Decode(mapping, urlTestOption)
<mask> if err != nil {
</s> Chore: update dependencies & fix typo </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") </s> remove errIPNotFound = errors.New("ip not found")
</s> add errIPNotFound = errors.New("cannot found ip") </s> remove return nil, errors.New("GeoIP can't use")
</s> add return nil, errors.New("GeoIP cannot use") </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | config/config.go |
errIPNotFound = errors.New("cannot found ip") | <mask> "net"
<mask> )
<mask>
<mask> var (
<mask> errIPNotFound = errors.New("ip not found")
<mask> )
<mask>
<mask> // ResolveIP with a host, return ip
<mask> func ResolveIP(host string) (net.IP, error) {
<mask> if DefaultResolver != nil {
</s> Chore: update dependencies & fix typo </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | dns/iputil.go |
return nil, errIPNotFound | <mask> }
<mask>
<mask> ip, open := <-ch
<mask> if !open {
<mask> return nil, errors.New("can't found ip")
<mask> }
<mask>
<mask> return ip, nil
<mask> }
<mask>
</s> Chore: update dependencies & fix typo </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove return nil, errors.New("GeoIP can't use")
</s> add return nil, errors.New("GeoIP cannot use") </s> remove errIPNotFound = errors.New("ip not found")
</s> add errIPNotFound = errors.New("cannot found ip") </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | dns/resolver.go |
return nil, errIPNotFound | <mask> }
<mask>
<mask> ips := r.msgToIP(msg)
<mask> if len(ips) == 0 {
<mask> return nil, errors.New("can't found ip")
<mask> }
<mask>
<mask> ip = ips[0]
<mask> return
<mask> }
</s> Chore: update dependencies & fix typo </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove return nil, errors.New("GeoIP can't use")
</s> add return nil, errors.New("GeoIP cannot use") </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove errIPNotFound = errors.New("ip not found")
</s> add errIPNotFound = errors.New("cannot found ip") </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | dns/resolver.go |
return nil, errors.New("GeoIP cannot use") | <mask> fallbackMsg := r.asyncExchange(r.fallback, m)
<mask> res := <-msgCh
<mask> if res.Error == nil {
<mask> if mmdb == nil {
<mask> return nil, errors.New("GeoIP can't use")
<mask> }
<mask>
<mask> if ips := r.msgToIP(res.Msg); len(ips) != 0 {
<mask> if record, _ := mmdb.Country(ips[0]); record.Country.IsoCode == "CN" || record.Country.IsoCode == "" {
<mask> // release channel
</s> Chore: update dependencies & fix typo </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") </s> remove return nil, errors.New("can't found ip")
</s> add return nil, errIPNotFound </s> remove err := fmt.Errorf("can't parse")
</s> add err := fmt.Errorf("cannot parse") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | dns/resolver.go |
return nil, errIPNotFound | <mask> }
<mask>
<mask> ips := r.msgToIP(msg)
<mask> if len(ips) == 0 {
<mask> return nil, errors.New("can't found ip")
<mask> }
<mask>
<mask> ip = ips[0]
<mask> return
<mask> }
</s> Chore: update dependencies & fix typo | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | dns/resolver.go |
github.com/oschwald/geoip2-golang v1.3.0
github.com/oschwald/maxminddb-golang v1.3.1 // indirect
github.com/sirupsen/logrus v1.4.2 | <mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v3.2.0+incompatible
<mask> github.com/gorilla/websocket v1.4.0
<mask> github.com/miekg/dns v1.1.14
<mask> github.com/oschwald/geoip2-golang v1.2.1
<mask> github.com/oschwald/maxminddb-golang v1.3.0 // indirect
<mask> github.com/sirupsen/logrus v1.4.1
<mask> golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
<mask> gopkg.in/eapache/channels.v1 v1.1.0
<mask> gopkg.in/yaml.v2 v2.2.2
</s> Chore: update dependencies & fix typo </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect </s> remove github.com/oschwald/geoip2-golang v1.2.1 h1:3iz+jmeJc6fuCyWeKgtXSXu7+zvkxJbHFXkMT5FVebU=
github.com/oschwald/geoip2-golang v1.2.1/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.0 h1:oTh8IBSj10S5JNlUDg5WjJ1QdBMdeaZIkPEVfESSWgE=
github.com/oschwald/maxminddb-golang v1.3.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
</s> add github.com/oschwald/geoip2-golang v1.3.0 h1:D+Hsdos1NARPbzZ2aInUHZL+dApIzo8E0ErJVsWcku8=
github.com/oschwald/geoip2-golang v1.3.0/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.1 h1:kPc5+ieL5CC/Zn0IaXJPxDFlUxKTQEU8QBTtmfQDAIo=
github.com/oschwald/maxminddb-golang v1.3.1/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY= </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> remove github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
</s> add github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | go.mod |
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect | <mask> github.com/oschwald/maxminddb-golang v1.3.0 // indirect
<mask> github.com/sirupsen/logrus v1.4.1
<mask> golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
<mask> gopkg.in/eapache/channels.v1 v1.1.0
<mask> gopkg.in/yaml.v2 v2.2.2
<mask> )
</s> Chore: update dependencies & fix typo </s> remove github.com/oschwald/geoip2-golang v1.2.1
github.com/oschwald/maxminddb-golang v1.3.0 // indirect
github.com/sirupsen/logrus v1.4.1
</s> add github.com/oschwald/geoip2-golang v1.3.0
github.com/oschwald/maxminddb-golang v1.3.1 // indirect
github.com/sirupsen/logrus v1.4.2 </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> remove github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
</s> add github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= </s> remove errIPNotFound = errors.New("ip not found")
</s> add errIPNotFound = errors.New("cannot found ip") </s> remove github.com/oschwald/geoip2-golang v1.2.1 h1:3iz+jmeJc6fuCyWeKgtXSXu7+zvkxJbHFXkMT5FVebU=
github.com/oschwald/geoip2-golang v1.2.1/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.0 h1:oTh8IBSj10S5JNlUDg5WjJ1QdBMdeaZIkPEVfESSWgE=
github.com/oschwald/maxminddb-golang v1.3.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
</s> add github.com/oschwald/geoip2-golang v1.3.0 h1:D+Hsdos1NARPbzZ2aInUHZL+dApIzo8E0ErJVsWcku8=
github.com/oschwald/geoip2-golang v1.3.0/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.1 h1:kPc5+ieL5CC/Zn0IaXJPxDFlUxKTQEU8QBTtmfQDAIo=
github.com/oschwald/maxminddb-golang v1.3.1/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | go.mod |
github.com/oschwald/geoip2-golang v1.3.0 h1:D+Hsdos1NARPbzZ2aInUHZL+dApIzo8E0ErJVsWcku8=
github.com/oschwald/geoip2-golang v1.3.0/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.1 h1:kPc5+ieL5CC/Zn0IaXJPxDFlUxKTQEU8QBTtmfQDAIo=
github.com/oschwald/maxminddb-golang v1.3.1/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY= | <mask> github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
<mask> github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
<mask> github.com/miekg/dns v1.1.14 h1:wkQWn9wIp4mZbwW8XV6Km6owkvRPbOiV004ZM2CkGvA=
<mask> github.com/miekg/dns v1.1.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
<mask> github.com/oschwald/geoip2-golang v1.2.1 h1:3iz+jmeJc6fuCyWeKgtXSXu7+zvkxJbHFXkMT5FVebU=
<mask> github.com/oschwald/geoip2-golang v1.2.1/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
<mask> github.com/oschwald/maxminddb-golang v1.3.0 h1:oTh8IBSj10S5JNlUDg5WjJ1QdBMdeaZIkPEVfESSWgE=
<mask> github.com/oschwald/maxminddb-golang v1.3.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
<mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
<mask> github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
<mask> github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
<mask> github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
</s> Chore: update dependencies & fix typo </s> remove github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
</s> add github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= </s> remove github.com/oschwald/geoip2-golang v1.2.1
github.com/oschwald/maxminddb-golang v1.3.0 // indirect
github.com/sirupsen/logrus v1.4.1
</s> add github.com/oschwald/geoip2-golang v1.3.0
github.com/oschwald/maxminddb-golang v1.3.1 // indirect
github.com/sirupsen/logrus v1.4.2 </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | go.sum |
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= | <mask> github.com/oschwald/maxminddb-golang v1.3.0 h1:oTh8IBSj10S5JNlUDg5WjJ1QdBMdeaZIkPEVfESSWgE=
<mask> github.com/oschwald/maxminddb-golang v1.3.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
<mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
<mask> github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
<mask> github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
<mask> github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
<mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
</s> Chore: update dependencies & fix typo </s> remove github.com/oschwald/geoip2-golang v1.2.1 h1:3iz+jmeJc6fuCyWeKgtXSXu7+zvkxJbHFXkMT5FVebU=
github.com/oschwald/geoip2-golang v1.2.1/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.0 h1:oTh8IBSj10S5JNlUDg5WjJ1QdBMdeaZIkPEVfESSWgE=
github.com/oschwald/maxminddb-golang v1.3.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
</s> add github.com/oschwald/geoip2-golang v1.3.0 h1:D+Hsdos1NARPbzZ2aInUHZL+dApIzo8E0ErJVsWcku8=
github.com/oschwald/geoip2-golang v1.3.0/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.1 h1:kPc5+ieL5CC/Zn0IaXJPxDFlUxKTQEU8QBTtmfQDAIo=
github.com/oschwald/maxminddb-golang v1.3.1/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY= </s> remove github.com/oschwald/geoip2-golang v1.2.1
github.com/oschwald/maxminddb-golang v1.3.0 // indirect
github.com/sirupsen/logrus v1.4.1
</s> add github.com/oschwald/geoip2-golang v1.3.0
github.com/oschwald/maxminddb-golang v1.3.1 // indirect
github.com/sirupsen/logrus v1.4.2 </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | go.sum |
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | <mask> golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
<mask> golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
<mask> golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> Chore: update dependencies & fix typo </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect </s> remove github.com/oschwald/geoip2-golang v1.2.1
github.com/oschwald/maxminddb-golang v1.3.0 // indirect
github.com/sirupsen/logrus v1.4.1
</s> add github.com/oschwald/geoip2-golang v1.3.0
github.com/oschwald/maxminddb-golang v1.3.1 // indirect
github.com/sirupsen/logrus v1.4.2 </s> remove github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
</s> add github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= </s> remove github.com/oschwald/geoip2-golang v1.2.1 h1:3iz+jmeJc6fuCyWeKgtXSXu7+zvkxJbHFXkMT5FVebU=
github.com/oschwald/geoip2-golang v1.2.1/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.0 h1:oTh8IBSj10S5JNlUDg5WjJ1QdBMdeaZIkPEVfESSWgE=
github.com/oschwald/maxminddb-golang v1.3.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
</s> add github.com/oschwald/geoip2-golang v1.3.0 h1:D+Hsdos1NARPbzZ2aInUHZL+dApIzo8E0ErJVsWcku8=
github.com/oschwald/geoip2-golang v1.3.0/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.1 h1:kPc5+ieL5CC/Zn0IaXJPxDFlUxKTQEU8QBTtmfQDAIo=
github.com/oschwald/maxminddb-golang v1.3.1/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | go.sum |
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/eapache/channels.v1 v1.1.0 h1:5bGAyKKvyCTWjSj7mhefG6Lc68VyN4MH1v8/7OoeeB4=
</s> Chore: update dependencies & fix typo </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> remove golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
</s> add golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect </s> remove github.com/oschwald/geoip2-golang v1.2.1
github.com/oschwald/maxminddb-golang v1.3.0 // indirect
github.com/sirupsen/logrus v1.4.1
</s> add github.com/oschwald/geoip2-golang v1.3.0
github.com/oschwald/maxminddb-golang v1.3.1 // indirect
github.com/sirupsen/logrus v1.4.2 </s> remove github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
</s> add github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= </s> remove github.com/oschwald/geoip2-golang v1.2.1 h1:3iz+jmeJc6fuCyWeKgtXSXu7+zvkxJbHFXkMT5FVebU=
github.com/oschwald/geoip2-golang v1.2.1/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.0 h1:oTh8IBSj10S5JNlUDg5WjJ1QdBMdeaZIkPEVfESSWgE=
github.com/oschwald/maxminddb-golang v1.3.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
</s> add github.com/oschwald/geoip2-golang v1.3.0 h1:D+Hsdos1NARPbzZ2aInUHZL+dApIzo8E0ErJVsWcku8=
github.com/oschwald/geoip2-golang v1.3.0/go.mod h1:0LTTzix/Ao1uMvOhAV4iLU0Lz7eCrP94qZWBTDKf0iE=
github.com/oschwald/maxminddb-golang v1.3.1 h1:kPc5+ieL5CC/Zn0IaXJPxDFlUxKTQEU8QBTtmfQDAIo=
github.com/oschwald/maxminddb-golang v1.3.1/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34338e7107c1868124f8aab2446f6b71c9b0640f | go.sum |
"strings" | <mask> "bufio"
<mask> "io"
<mask> "net"
<mask> "net/http"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/inbound"
</s> Fix: don't keepalive when connection is close (#65)
fixed #60 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34c86559740a1e7b54fb6bd87ae593e0cc30e416 | tunnel/connection.go |
keepalive := true | <mask> func (t *Tunnel) handleHTTP(request *adapters.HTTPAdapter, proxy C.ProxyAdapter) {
<mask> conn := newTrafficTrack(proxy.Conn(), t.traffic)
<mask> req := request.R
<mask> host := req.Host
<mask>
<mask> for {
<mask> if strings.ToLower(req.Header.Get("Connection")) == "close" {
<mask> keepalive = false
<mask> }
</s> Fix: don't keepalive when connection is close (#65)
fixed #60 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34c86559740a1e7b54fb6bd87ae593e0cc30e416 | tunnel/connection.go |
if strings.ToLower(req.Header.Get("Connection")) == "close" {
keepalive = false
}
| <mask>
<mask> for {
<mask> req.Header.Set("Connection", "close")
<mask> req.RequestURI = ""
<mask> adapters.RemoveHopByHopHeaders(req.Header)
<mask> err := req.Write(conn)
</s> Fix: don't keepalive when connection is close (#65)
fixed #60 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34c86559740a1e7b54fb6bd87ae593e0cc30e416 | tunnel/connection.go |
if !keepalive {
break
}
| <mask> }
<mask>
<mask> req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
<mask> if err != nil {
<mask> break
<mask> }
<mask>
<mask> // Sometimes firefox just open a socket to process multiple domains in HTTP
</s> Fix: don't keepalive when connection is close (#65)
fixed #60 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34c86559740a1e7b54fb6bd87ae593e0cc30e416 | tunnel/connection.go |
log.Warnln("[UDP] dial %s to %s error: %s", proxy.Name(), metadata.String(), err.Error()) | <mask> }
<mask>
<mask> rawPc, err := proxy.DialUDP(metadata)
<mask> if err != nil {
<mask> log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error())
<mask> return
<mask> }
<mask> pc := newUDPTracker(rawPc, DefaultManager, metadata, rule)
<mask>
<mask> switch true {
</s> Chore: more detailed error when dial failed </s> remove log.Warnln("Parse metadata failed: %v", err)
</s> add log.Warnln("[Metadata] parse failed: %s", err.Error()) </s> remove log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("dial %s to %s error: %s", proxy.Name(), metadata.String(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34febc45798c9d977f9c052b4c604d98995a8324 | tunnel/tunnel.go |
log.Warnln("[Metadata] parse failed: %s", err.Error()) | <mask> }
<mask>
<mask> proxy, rule, err := resolveMetadata(metadata)
<mask> if err != nil {
<mask> log.Warnln("Parse metadata failed: %v", err)
<mask> return
<mask> }
<mask>
<mask> remoteConn, err := proxy.Dial(metadata)
<mask> if err != nil {
</s> Chore: more detailed error when dial failed </s> remove log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("[UDP] dial %s to %s error: %s", proxy.Name(), metadata.String(), err.Error()) </s> remove log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("dial %s to %s error: %s", proxy.Name(), metadata.String(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34febc45798c9d977f9c052b4c604d98995a8324 | tunnel/tunnel.go |
log.Warnln("dial %s to %s error: %s", proxy.Name(), metadata.String(), err.Error()) | <mask> }
<mask>
<mask> remoteConn, err := proxy.Dial(metadata)
<mask> if err != nil {
<mask> log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
<mask> return
<mask> }
<mask> remoteConn = newTCPTracker(remoteConn, DefaultManager, metadata, rule)
<mask> defer remoteConn.Close()
<mask>
</s> Chore: more detailed error when dial failed </s> remove log.Warnln("Parse metadata failed: %v", err)
</s> add log.Warnln("[Metadata] parse failed: %s", err.Error()) </s> remove log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("[UDP] dial %s to %s error: %s", proxy.Name(), metadata.String(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/34febc45798c9d977f9c052b4c604d98995a8324 | tunnel/tunnel.go |
"bufio"
"bytes"
"io" | <mask>
<mask> import (
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
</s> Fix: firefox one socket to process multiple domains </s> remove tun.Add(adapters.NewHttp(hostName, peeked, conn))
</s> add tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) </s> remove method, hostName := httpHostHeader(br)
</s> add method, hostName := adapters.ParserHTTPHostHeader(br) </s> remove func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
</s> add func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | adapters/local/http.go |
"net/http"
"strings" | <mask> "io"
<mask> "net"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
</s> Fix: firefox one socket to process multiple domains </s> remove tun.Add(adapters.NewHttp(hostName, peeked, conn))
</s> add tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) </s> remove method, hostName := httpHostHeader(br)
</s> add method, hostName := adapters.ParserHTTPHostHeader(br) </s> remove func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
</s> add func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | adapters/local/http.go |
host string
isHTTP bool | <mask> type PeekedConn struct {
<mask> net.Conn
<mask> Peeked []byte
<mask> }
<mask>
<mask> func (c *PeekedConn) Read(p []byte) (n int, err error) {
<mask> if len(c.Peeked) > 0 {
<mask> n = copy(p, c.Peeked)
</s> Fix: firefox one socket to process multiple domains </s> remove tun.Add(adapters.NewHttp(hostName, peeked, conn))
</s> add tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) </s> remove func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
</s> add func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { </s> remove method, hostName := httpHostHeader(br)
</s> add method, hostName := adapters.ParserHTTPHostHeader(br) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | adapters/local/http.go |
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
| <mask> }
<mask> return n, nil
<mask> }
<mask> return c.Conn.Read(p)
<mask> }
<mask>
<mask> type HttpAdapter struct {
<mask> addr *C.Addr
<mask> conn *PeekedConn
</s> Fix: firefox one socket to process multiple domains </s> remove func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
</s> add func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { </s> remove method, hostName := httpHostHeader(br)
</s> add method, hostName := adapters.ParserHTTPHostHeader(br) </s> remove tun.Add(adapters.NewHttp(hostName, peeked, conn))
</s> add tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | adapters/local/http.go |
func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { | <mask> func (h *HttpAdapter) Conn() net.Conn {
<mask> return h.conn
<mask> }
<mask>
<mask> func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
<mask> return &HttpAdapter{
<mask> addr: parseHttpAddr(host),
<mask> conn: &PeekedConn{
<mask> Peeked: peeked,
<mask> Conn: conn,
</s> Fix: firefox one socket to process multiple domains </s> remove method, hostName := httpHostHeader(br)
</s> add method, hostName := adapters.ParserHTTPHostHeader(br) </s> remove tun.Add(adapters.NewHttp(hostName, peeked, conn))
</s> add tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | adapters/local/http.go |
host: host,
isHTTP: isHTTP, | <mask> conn: &PeekedConn{
<mask> Peeked: peeked,
<mask> Conn: conn,
<mask> },
<mask> }
<mask> }
<mask>
<mask> // ParserHTTPHostHeader returns the HTTP Host header from br without
<mask> // consuming any of its bytes. It returns "" if it can't find one.
</s> Fix: firefox one socket to process multiple domains </s> remove func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
</s> add func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { </s> remove method, hostName := httpHostHeader(br)
</s> add method, hostName := adapters.ParserHTTPHostHeader(br) </s> remove tun.Add(adapters.NewHttp(hostName, peeked, conn))
</s> add tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | adapters/local/http.go |
method, hostName := adapters.ParserHTTPHostHeader(br) | <mask> }
<mask>
<mask> func handleConn(conn net.Conn) {
<mask> br := bufio.NewReader(conn)
<mask> method, hostName := httpHostHeader(br)
<mask> if hostName == "" {
<mask> return
<mask> }
<mask>
<mask> if !strings.Contains(hostName, ":") {
</s> Fix: firefox one socket to process multiple domains </s> remove func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
</s> add func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { </s> remove tun.Add(adapters.NewHttp(hostName, peeked, conn))
</s> add tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | proxy/http/server.go |
tun.Add(adapters.NewHttp(hostName, peeked, method != http.MethodConnect, conn)) | <mask> } else if n := br.Buffered(); n > 0 {
<mask> peeked, _ = br.Peek(br.Buffered())
<mask> }
<mask>
<mask> tun.Add(adapters.NewHttp(hostName, peeked, conn))
<mask> }
</s> Fix: firefox one socket to process multiple domains </s> remove method, hostName := httpHostHeader(br)
</s> add method, hostName := adapters.ParserHTTPHostHeader(br) </s> remove func NewHttp(host string, peeked []byte, conn net.Conn) *HttpAdapter {
</s> add func NewHttp(host string, peeked []byte, isHTTP bool, conn net.Conn) *HttpAdapter { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/35e572406b51b3e5c5263286e2444d79f38f6850 | proxy/http/server.go |
// GetWithExpire element in Cache with Expire Time
func (c *cache) GetWithExpire(key interface{}) (item interface{}, expired time.Time) {
item, exist := c.mapping.Load(key)
if !exist {
return
}
elm := item.(*element)
// expired
if time.Since(elm.Expired) > 0 {
c.mapping.Delete(key)
return
}
return elm.Payload, elm.Expired
}
| <mask> }
<mask>
<mask> func (c *cache) cleanup() {
<mask> c.mapping.Range(func(k, v interface{}) bool {
<mask> key := k.(string)
<mask> elm := v.(*element)
<mask> if time.Since(elm.Expired) > 0 {
<mask> c.mapping.Delete(key)
</s> Fix: DNS server returns the correct TTL </s> remove return cache.(*D.Msg).Copy(), nil
</s> add msg = cache.(*D.Msg).Copy()
if len(msg.Answer) > 0 {
ttl := uint32(expireTime.Sub(time.Now()).Seconds())
for _, answer := range msg.Answer {
answer.Header().Ttl = ttl
}
}
return </s> remove cache := r.cache.Get(q.String())
</s> add cache, expireTime := r.cache.GetWithExpire(q.String()) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/36b5d1f18f28f2d01022ead8b90d04cc6b31cf79 | common/cache/cache.go |
cache, expireTime := r.cache.GetWithExpire(q.String()) | <mask> return nil, errors.New("should have one question at least")
<mask> }
<mask>
<mask> q := m.Question[0]
<mask> cache := r.cache.Get(q.String())
<mask> if cache != nil {
<mask> return cache.(*D.Msg).Copy(), nil
<mask> }
<mask> defer func() {
<mask> if msg != nil {
</s> Fix: DNS server returns the correct TTL </s> remove return cache.(*D.Msg).Copy(), nil
</s> add msg = cache.(*D.Msg).Copy()
if len(msg.Answer) > 0 {
ttl := uint32(expireTime.Sub(time.Now()).Seconds())
for _, answer := range msg.Answer {
answer.Header().Ttl = ttl
}
}
return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/36b5d1f18f28f2d01022ead8b90d04cc6b31cf79 | dns/client.go |
msg = cache.(*D.Msg).Copy()
if len(msg.Answer) > 0 {
ttl := uint32(expireTime.Sub(time.Now()).Seconds())
for _, answer := range msg.Answer {
answer.Header().Ttl = ttl
}
}
return | <mask>
<mask> q := m.Question[0]
<mask> cache := r.cache.Get(q.String())
<mask> if cache != nil {
<mask> return cache.(*D.Msg).Copy(), nil
<mask> }
<mask> defer func() {
<mask> if msg != nil {
<mask> putMsgToCache(r.cache, q.String(), msg)
<mask> if r.mapping {
</s> Fix: DNS server returns the correct TTL </s> remove cache := r.cache.Get(q.String())
</s> add cache, expireTime := r.cache.GetWithExpire(q.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/36b5d1f18f28f2d01022ead8b90d04cc6b31cf79 | dns/client.go |
SOCKS4
SOCKS5 | <mask> UDP
<mask>
<mask> HTTP Type = iota
<mask> HTTPCONNECT
<mask> SOCKS
<mask> REDIR
<mask> TPROXY
<mask> )
<mask>
<mask> type NetWork int
</s> Chore: split SOCKS version inbound metadata type (#1513) </s> remove case in <- inbound.NewPacket(target, packet, C.SOCKS):
</s> add case in <- inbound.NewPacket(target, packet, C.SOCKS5): </s> remove in <- inbound.NewSocket(target, conn, C.SOCKS)
</s> add in <- inbound.NewSocket(target, conn, C.SOCKS5) </s> remove in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
</s> add in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS4) </s> remove case SOCKS:
</s> add case SOCKS4:
return "Socks4"
case SOCKS5: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/37059969740315cd342967fe1bb29b07592a75e4 | constant/metadata.go |
case SOCKS4:
return "Socks4"
case SOCKS5: | <mask> case HTTP:
<mask> return "HTTP"
<mask> case HTTPCONNECT:
<mask> return "HTTP Connect"
<mask> case SOCKS:
<mask> return "Socks5"
<mask> case REDIR:
<mask> return "Redir"
<mask> case TPROXY:
<mask> return "TProxy"
</s> Chore: split SOCKS version inbound metadata type (#1513) </s> remove case in <- inbound.NewPacket(target, packet, C.SOCKS):
</s> add case in <- inbound.NewPacket(target, packet, C.SOCKS5): </s> remove in <- inbound.NewSocket(target, conn, C.SOCKS)
</s> add in <- inbound.NewSocket(target, conn, C.SOCKS5) </s> remove in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
</s> add in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS4) </s> remove SOCKS
</s> add SOCKS4
SOCKS5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/37059969740315cd342967fe1bb29b07592a75e4 | constant/metadata.go |
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS4) | <mask> }
<mask> if c, ok := conn.(*net.TCPConn); ok {
<mask> c.SetKeepAlive(true)
<mask> }
<mask> in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
<mask> }
<mask>
<mask> func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) {
<mask> target, command, err := socks5.ServerHandshake(conn, authStore.Authenticator())
<mask> if err != nil {
</s> Chore: split SOCKS version inbound metadata type (#1513) </s> remove case in <- inbound.NewPacket(target, packet, C.SOCKS):
</s> add case in <- inbound.NewPacket(target, packet, C.SOCKS5): </s> remove in <- inbound.NewSocket(target, conn, C.SOCKS)
</s> add in <- inbound.NewSocket(target, conn, C.SOCKS5) </s> remove case SOCKS:
</s> add case SOCKS4:
return "Socks4"
case SOCKS5: </s> remove SOCKS
</s> add SOCKS4
SOCKS5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/37059969740315cd342967fe1bb29b07592a75e4 | listener/socks/tcp.go |
in <- inbound.NewSocket(target, conn, C.SOCKS5) | <mask> defer conn.Close()
<mask> io.Copy(ioutil.Discard, conn)
<mask> return
<mask> }
<mask> in <- inbound.NewSocket(target, conn, C.SOCKS)
<mask> }
</s> Chore: split SOCKS version inbound metadata type (#1513) </s> remove in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
</s> add in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS4) </s> remove case in <- inbound.NewPacket(target, packet, C.SOCKS):
</s> add case in <- inbound.NewPacket(target, packet, C.SOCKS5): </s> remove case SOCKS:
</s> add case SOCKS4:
return "Socks4"
case SOCKS5: </s> remove SOCKS
</s> add SOCKS4
SOCKS5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/37059969740315cd342967fe1bb29b07592a75e4 | listener/socks/tcp.go |
case in <- inbound.NewPacket(target, packet, C.SOCKS5): | <mask> payload: payload,
<mask> bufRef: buf,
<mask> }
<mask> select {
<mask> case in <- inbound.NewPacket(target, packet, C.SOCKS):
<mask> default:
<mask> }
<mask> }
</s> Chore: split SOCKS version inbound metadata type (#1513) </s> remove in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
</s> add in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS4) </s> remove in <- inbound.NewSocket(target, conn, C.SOCKS)
</s> add in <- inbound.NewSocket(target, conn, C.SOCKS5) </s> remove case SOCKS:
</s> add case SOCKS4:
return "Socks4"
case SOCKS5: </s> remove SOCKS
</s> add SOCKS4
SOCKS5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/37059969740315cd342967fe1bb29b07592a75e4 | listener/socks/udp.go |
if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { | <mask> return c.reportCh
<mask> }
<mask>
<mask> func (c *Config) readConfig() (*RawConfig, error) {
<mask> if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
<mask> return nil, err
<mask> }
<mask> data, err := ioutil.ReadFile(C.ConfigPath)
<mask> if err != nil {
<mask> return nil, err
</s> Chore: refactoring code of config path </s> remove data, err := ioutil.ReadFile(C.ConfigPath)
</s> add data, err := ioutil.ReadFile(C.Path.Config()) </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/config.go |
data, err := ioutil.ReadFile(C.Path.Config()) | <mask> func (c *Config) readConfig() (*RawConfig, error) {
<mask> if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
<mask> return nil, err
<mask> }
<mask> data, err := ioutil.ReadFile(C.ConfigPath)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> // config with some default value
<mask> rawConfig := &RawConfig{
</s> Chore: refactoring code of config path </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/config.go |
if len(data) == 0 {
return nil, fmt.Errorf("Configuration file %s is empty", C.Path.Config())
}
| <mask> return nil, err
<mask> }
<mask> // config with some default value
<mask> rawConfig := &RawConfig{
<mask> AllowLan: false,
<mask> Mode: Rule.String(),
</s> Chore: refactoring code of config path </s> remove data, err := ioutil.ReadFile(C.ConfigPath)
</s> add data, err := ioutil.ReadFile(C.Path.Config()) </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) </s> remove
func init() {
currentUser, err := user.Current()
if err != nil {
dir := os.Getenv("HOME")
if dir == "" {
log.Fatalf("Can't get current user: %s", err.Error())
}
HomeDir = dir
} else {
HomeDir = currentUser.HomeDir
}
dirPath := path.Join(HomeDir, ".config", Name)
if _, err := os.Stat(dirPath); os.IsNotExist(err) {
if err := os.MkdirAll(dirPath, 0777); err != nil {
log.Fatalf("Can't create config directory %s: %s", dirPath, err.Error())
}
}
ConfigPath = path.Join(dirPath, "config.yml")
MMDBPath = path.Join(dirPath, "Country.mmdb")
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/config.go |
// initial homedir
if _, err := os.Stat(C.Path.HomeDir()); os.IsNotExist(err) {
if err := os.MkdirAll(C.Path.HomeDir(), 0777); err != nil {
log.Fatalf("Can't create config directory %s: %s", C.Path.HomeDir(), err.Error())
}
}
| <mask>
<mask> // Init prepare necessary files
<mask> func Init() {
<mask> // initial config.ini
<mask> if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) {
<mask> log.Info("Can't find config, create a empty file")
<mask> os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
</s> Chore: refactoring code of config path </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove os.OpenFile(C.ConfigPath, os.O_CREATE|os.O_WRONLY, 0644)
</s> add os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644) </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/initial.go |
if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { | <mask>
<mask> // Init prepare necessary files
<mask> func Init() {
<mask> // initial config.ini
<mask> if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
<mask> log.Info("Can't find config, create a empty file")
<mask> os.OpenFile(C.ConfigPath, os.O_CREATE|os.O_WRONLY, 0644)
<mask> }
<mask>
<mask> // initial mmdb
</s> Chore: refactoring code of config path </s> remove os.OpenFile(C.ConfigPath, os.O_CREATE|os.O_WRONLY, 0644)
</s> add os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644) </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) </s> remove data, err := ioutil.ReadFile(C.ConfigPath)
</s> add data, err := ioutil.ReadFile(C.Path.Config()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/initial.go |
os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644) | <mask> func Init() {
<mask> // initial config.ini
<mask> if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
<mask> log.Info("Can't find config, create a empty file")
<mask> os.OpenFile(C.ConfigPath, os.O_CREATE|os.O_WRONLY, 0644)
<mask> }
<mask>
<mask> // initial mmdb
<mask> if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
<mask> log.Info("Can't find MMDB, start download")
</s> Chore: refactoring code of config path </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/initial.go |
if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { | <mask> os.OpenFile(C.ConfigPath, os.O_CREATE|os.O_WRONLY, 0644)
<mask> }
<mask>
<mask> // initial mmdb
<mask> if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
<mask> log.Info("Can't find MMDB, start download")
<mask> err := downloadMMDB(C.MMDBPath)
<mask> if err != nil {
<mask> log.Fatalf("Can't download MMDB: %s", err.Error())
<mask> }
</s> Chore: refactoring code of config path </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) </s> remove os.OpenFile(C.ConfigPath, os.O_CREATE|os.O_WRONLY, 0644)
</s> add os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644) </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/initial.go |
err := downloadMMDB(C.Path.MMDB()) | <mask>
<mask> // initial mmdb
<mask> if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
<mask> log.Info("Can't find MMDB, start download")
<mask> err := downloadMMDB(C.MMDBPath)
<mask> if err != nil {
<mask> log.Fatalf("Can't download MMDB: %s", err.Error())
<mask> }
<mask> }
<mask> }
</s> Chore: refactoring code of config path </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { </s> remove os.OpenFile(C.ConfigPath, os.O_CREATE|os.O_WRONLY, 0644)
</s> add os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644) </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove
func init() {
currentUser, err := user.Current()
if err != nil {
dir := os.Getenv("HOME")
if dir == "" {
log.Fatalf("Can't get current user: %s", err.Error())
}
HomeDir = dir
} else {
HomeDir = currentUser.HomeDir
}
dirPath := path.Join(HomeDir, ".config", Name)
if _, err := os.Stat(dirPath); os.IsNotExist(err) {
if err := os.MkdirAll(dirPath, 0777); err != nil {
log.Fatalf("Can't create config directory %s: %s", dirPath, err.Error())
}
}
ConfigPath = path.Join(dirPath, "config.yml")
MMDBPath = path.Join(dirPath, "Country.mmdb")
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | config/initial.go |
<mask> package constant
<mask>
<mask> import (
<mask> "os"
<mask> "os/user"
<mask> "path"
<mask>
<mask> log "github.com/sirupsen/logrus"
<mask> )
<mask>
<mask> const (
<mask> Name = "clash"
<mask> )
<mask>
<mask> var (
<mask> HomeDir string
<mask> ConfigPath string
<mask> MMDBPath string
<mask> )
<mask>
<mask> type General struct {
<mask> Mode *string `json:"mode,omitempty"`
<mask> AllowLan *bool `json:"allow-lan,omitempty"`
<mask> Port *int `json:"port,omitempty"`
<mask> SocksPort *int `json:"socks-port,omitempty"`
</s> Chore: refactoring code of config path </s> remove
func init() {
currentUser, err := user.Current()
if err != nil {
dir := os.Getenv("HOME")
if dir == "" {
log.Fatalf("Can't get current user: %s", err.Error())
}
HomeDir = dir
} else {
HomeDir = currentUser.HomeDir
}
dirPath := path.Join(HomeDir, ".config", Name)
if _, err := os.Stat(dirPath); os.IsNotExist(err) {
if err := os.MkdirAll(dirPath, 0777); err != nil {
log.Fatalf("Can't create config directory %s: %s", dirPath, err.Error())
}
}
ConfigPath = path.Join(dirPath, "config.yml")
MMDBPath = path.Join(dirPath, "Country.mmdb")
}
</s> add </s> remove mmdb, err = geoip2.Open(C.MMDBPath)
</s> add mmdb, err = geoip2.Open(C.Path.MMDB()) </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { | [
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | constant/config.go | |
<mask> SocksPort *int `json:"socks-port,omitempty"`
<mask> RedirPort *int `json:"redir-port,omitempty"`
<mask> LogLevel *string `json:"log-level,omitempty"`
<mask> }
<mask>
<mask> func init() {
<mask> currentUser, err := user.Current()
<mask> if err != nil {
<mask> dir := os.Getenv("HOME")
<mask> if dir == "" {
<mask> log.Fatalf("Can't get current user: %s", err.Error())
<mask> }
<mask> HomeDir = dir
<mask> } else {
<mask> HomeDir = currentUser.HomeDir
<mask> }
<mask>
<mask> dirPath := path.Join(HomeDir, ".config", Name)
<mask> if _, err := os.Stat(dirPath); os.IsNotExist(err) {
<mask> if err := os.MkdirAll(dirPath, 0777); err != nil {
<mask> log.Fatalf("Can't create config directory %s: %s", dirPath, err.Error())
<mask> }
<mask> }
<mask>
<mask> ConfigPath = path.Join(dirPath, "config.yml")
<mask> MMDBPath = path.Join(dirPath, "Country.mmdb")
<mask> }
</s> Chore: refactoring code of config path </s> remove mmdb, err = geoip2.Open(C.MMDBPath)
</s> add mmdb, err = geoip2.Open(C.Path.MMDB()) </s> remove import (
"os"
"os/user"
"path"
log "github.com/sirupsen/logrus"
)
const (
Name = "clash"
)
var (
HomeDir string
ConfigPath string
MMDBPath string
)
</s> add </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | constant/config.go | |
mmdb, err = geoip2.Open(C.Path.MMDB()) | <mask>
<mask> func NewGEOIP(country string, adapter string) *GEOIP {
<mask> once.Do(func() {
<mask> var err error
<mask> mmdb, err = geoip2.Open(C.MMDBPath)
<mask> if err != nil {
<mask> log.Fatalf("Can't load mmdb: %s", err.Error())
<mask> }
<mask> })
<mask> return &GEOIP{
</s> Chore: refactoring code of config path </s> remove
func init() {
currentUser, err := user.Current()
if err != nil {
dir := os.Getenv("HOME")
if dir == "" {
log.Fatalf("Can't get current user: %s", err.Error())
}
HomeDir = dir
} else {
HomeDir = currentUser.HomeDir
}
dirPath := path.Join(HomeDir, ".config", Name)
if _, err := os.Stat(dirPath); os.IsNotExist(err) {
if err := os.MkdirAll(dirPath, 0777); err != nil {
log.Fatalf("Can't create config directory %s: %s", dirPath, err.Error())
}
}
ConfigPath = path.Join(dirPath, "config.yml")
MMDBPath = path.Join(dirPath, "Country.mmdb")
}
</s> add </s> remove if _, err := os.Stat(C.ConfigPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { </s> remove data, err := ioutil.ReadFile(C.ConfigPath)
</s> add data, err := ioutil.ReadFile(C.Path.Config()) </s> remove err := downloadMMDB(C.MMDBPath)
</s> add err := downloadMMDB(C.Path.MMDB()) </s> remove if _, err := os.Stat(C.MMDBPath); os.IsNotExist(err) {
</s> add if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/381f76450760df3d2e5d7220ff05cf0ab7bb27b1 | rules/geoip.go |
"fmt" | <mask>
<mask> import (
<mask> "context"
<mask> "errors"
<mask> "math/rand"
<mask> "net"
<mask> "strings"
<mask> "time"
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := resolver.ResolveIP(metadata.Host)
</s> add ips, err := resolver.LookupIP(context.Background(), metadata.Host) </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
LookupIP(ctx context.Context, host string) ([]net.IP, error)
LookupIPv4(ctx context.Context, host string) ([]net.IP, error)
LookupIPv6(ctx context.Context, host string) ([]net.IP, error) | <mask> ErrIPv6Disabled = errors.New("ipv6 disabled")
<mask> )
<mask>
<mask> type Resolver interface {
<mask> ResolveIP(host string) (ip net.IP, err error)
<mask> ResolveIPv4(host string) (ip net.IP, err error)
<mask> ResolveIPv6(host string) (ip net.IP, err error)
<mask> }
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) </s> remove ip, err := r.resolveIP(host, D.TypeAAAA)
</s> add ip, err := r.lookupIP(ctx, host, D.TypeAAAA) </s> remove // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ch := make(chan net.IP, 1)
</s> add // LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
// LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { | <mask> ResolveIPv4(host string) (ip net.IP, err error)
<mask> ResolveIPv6(host string) (ip net.IP, err error)
<mask> }
<mask>
<mask> // ResolveIPv4 with a host, return ipv4
<mask> func ResolveIPv4(host string) (net.IP, error) {
<mask> if node := DefaultHosts.Search(host); node != nil {
<mask> if ip := node.Data.(net.IP).To4(); ip != nil {
<mask> return ip, nil
<mask> }
<mask> }
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) </s> remove // ResolveIPWithResolver same as ResolveIP, but with a resolver
func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
</s> add // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return []net.IP{ip}, nil | <mask> // ResolveIPv4 with a host, return ipv4
<mask> func ResolveIPv4(host string) (net.IP, error) {
<mask> if node := DefaultHosts.Search(host); node != nil {
<mask> if ip := node.Data.(net.IP).To4(); ip != nil {
<mask> return ip, nil
<mask> }
<mask> }
<mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove return node.Data.(net.IP), nil
</s> add return []net.IP{node.Data.(net.IP)}, nil </s> remove // ResolveIPWithResolver same as ResolveIP, but with a resolver
func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
</s> add // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return []net.IP{ip}, nil | <mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
<mask> if !strings.Contains(host, ":") {
<mask> return ip, nil
<mask> }
<mask> return nil, ErrIPVersion
<mask> }
<mask>
<mask> if DefaultResolver != nil {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return DefaultResolver.LookupIPv4(ctx, host) | <mask> return nil, ErrIPVersion
<mask> }
<mask>
<mask> if DefaultResolver != nil {
<mask> return DefaultResolver.ResolveIPv4(host)
<mask> }
<mask>
<mask> ctx, cancel := context.WithTimeout(context.Background(), DefaultDNSTimeout)
<mask> defer cancel()
<mask> ipAddrs, err := net.DefaultResolver.LookupIP(ctx, "ip4", host)
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return DefaultResolver.ResolveIPv6(host)
</s> add return DefaultResolver.LookupIPv6(ctx, host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove ipAddr, err := net.ResolveIPAddr("ip", host)
</s> add ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) </s> remove // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ch := make(chan net.IP, 1)
</s> add // LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return ipAddrs, nil | <mask> } else if len(ipAddrs) == 0 {
<mask> return nil, ErrIPNotFound
<mask> }
<mask>
<mask> return ipAddrs[rand.Intn(len(ipAddrs))], nil
<mask> }
<mask>
<mask> // ResolveIPv6 with a host, return ipv6
<mask> func ResolveIPv6(host string) (net.IP, error) {
<mask> if DisableIPv6 {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil </s> remove // ResolveIPWithResolver same as ResolveIP, but with a resolver
func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
</s> add // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { </s> remove return ipAddr.IP, nil
</s> add return ips, nil
}
// ResolveIP with a host, return ip
func LookupIP(ctx context.Context, host string) ([]net.IP, error) {
return LookupIPWithResolver(ctx, host, DefaultResolver) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
// ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { | <mask>
<mask> return ipAddrs[rand.Intn(len(ipAddrs))], nil
<mask> }
<mask>
<mask> // ResolveIPv6 with a host, return ipv6
<mask> func ResolveIPv6(host string) (net.IP, error) {
<mask> if DisableIPv6 {
<mask> return nil, ErrIPv6Disabled
<mask> }
<mask>
<mask> if node := DefaultHosts.Search(host); node != nil {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil </s> remove // ResolveIPWithResolver same as ResolveIP, but with a resolver
func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
</s> add // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return []net.IP{ip}, nil | <mask> }
<mask>
<mask> if node := DefaultHosts.Search(host); node != nil {
<mask> if ip := node.Data.(net.IP).To16(); ip != nil {
<mask> return ip, nil
<mask> }
<mask> }
<mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return []net.IP{ip}, nil | <mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
<mask> if strings.Contains(host, ":") {
<mask> return ip, nil
<mask> }
<mask> return nil, ErrIPVersion
<mask> }
<mask>
<mask> if DefaultResolver != nil {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return DefaultResolver.LookupIPv6(ctx, host) | <mask> return nil, ErrIPVersion
<mask> }
<mask>
<mask> if DefaultResolver != nil {
<mask> return DefaultResolver.ResolveIPv6(host)
<mask> }
<mask>
<mask> ctx, cancel := context.WithTimeout(context.Background(), DefaultDNSTimeout)
<mask> defer cancel()
<mask> ipAddrs, err := net.DefaultResolver.LookupIP(ctx, "ip6", host)
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return DefaultResolver.ResolveIPv4(host)
</s> add return DefaultResolver.LookupIPv4(ctx, host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove ipAddr, err := net.ResolveIPAddr("ip", host)
</s> add ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) </s> remove // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ch := make(chan net.IP, 1)
</s> add // LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return ipAddrs, nil | <mask> } else if len(ipAddrs) == 0 {
<mask> return nil, ErrIPNotFound
<mask> }
<mask>
<mask> return ipAddrs[rand.Intn(len(ipAddrs))], nil
<mask> }
<mask>
<mask> // ResolveIPWithResolver same as ResolveIP, but with a resolver
<mask> func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
<mask> if node := DefaultHosts.Search(host); node != nil {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return node.Data.(net.IP), nil
</s> add return []net.IP{node.Data.(net.IP)}, nil </s> remove // ResolveIPWithResolver same as ResolveIP, but with a resolver
func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
</s> add // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
// ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { | <mask>
<mask> return ipAddrs[rand.Intn(len(ipAddrs))], nil
<mask> }
<mask>
<mask> // ResolveIPWithResolver same as ResolveIP, but with a resolver
<mask> func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
<mask> if node := DefaultHosts.Search(host); node != nil {
<mask> return node.Data.(net.IP), nil
<mask> }
<mask>
<mask> if r != nil {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return node.Data.(net.IP), nil
</s> add return []net.IP{node.Data.(net.IP)}, nil </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return []net.IP{node.Data.(net.IP)}, nil | <mask>
<mask> // ResolveIPWithResolver same as ResolveIP, but with a resolver
<mask> func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
<mask> if node := DefaultHosts.Search(host); node != nil {
<mask> return node.Data.(net.IP), nil
<mask> }
<mask>
<mask> if r != nil {
<mask> if DisableIPv6 {
<mask> return r.ResolveIPv4(host)
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil </s> remove // ResolveIPWithResolver same as ResolveIP, but with a resolver
func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
</s> add // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove return r.ResolveIP(host)
</s> add return r.LookupIP(ctx, host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return r.LookupIPv4(ctx, host) | <mask> }
<mask>
<mask> if r != nil {
<mask> if DisableIPv6 {
<mask> return r.ResolveIPv4(host)
<mask> }
<mask> return r.ResolveIP(host)
<mask> } else if DisableIPv6 {
<mask> return ResolveIPv4(host)
<mask> }
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return r.ResolveIP(host)
</s> add return r.LookupIP(ctx, host) </s> remove return ResolveIPv4(host)
</s> add return LookupIPv4(ctx, host) </s> remove return node.Data.(net.IP), nil
</s> add return []net.IP{node.Data.(net.IP)}, nil </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return r.LookupIP(ctx, host) | <mask> if r != nil {
<mask> if DisableIPv6 {
<mask> return r.ResolveIPv4(host)
<mask> }
<mask> return r.ResolveIP(host)
<mask> } else if DisableIPv6 {
<mask> return ResolveIPv4(host)
<mask> }
<mask>
<mask> ip := net.ParseIP(host)
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return r.ResolveIPv4(host)
</s> add return r.LookupIPv4(ctx, host) </s> remove return ResolveIPv4(host)
</s> add return LookupIPv4(ctx, host) </s> remove return node.Data.(net.IP), nil
</s> add return []net.IP{node.Data.(net.IP)}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return LookupIPv4(ctx, host) | <mask> return r.ResolveIPv4(host)
<mask> }
<mask> return r.ResolveIP(host)
<mask> } else if DisableIPv6 {
<mask> return ResolveIPv4(host)
<mask> }
<mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
<mask> return ip, nil
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return r.ResolveIP(host)
</s> add return r.LookupIP(ctx, host) </s> remove return r.ResolveIPv4(host)
</s> add return r.LookupIPv4(ctx, host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return []net.IP{ip}, nil | <mask> }
<mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
<mask> return ip, nil
<mask> }
<mask>
<mask> ipAddr, err := net.ResolveIPAddr("ip", host)
<mask> if err != nil {
<mask> return nil, err
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ipAddr, err := net.ResolveIPAddr("ip", host)
</s> add ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove ip, err := resolver.ResolveIPWithResolver(host, r)
</s> add ips, err := resolver.LookupIPWithResolver(ctx, host, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) | <mask> if ip != nil {
<mask> return ip, nil
<mask> }
<mask>
<mask> ipAddr, err := net.ResolveIPAddr("ip", host)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return ipAddr.IP, nil
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove ip, err := resolver.ResolveIPWithResolver(host, r)
</s> add ips, err := resolver.LookupIPWithResolver(ctx, host, r) </s> remove return ipAddr.IP, nil
</s> add return ips, nil
}
// ResolveIP with a host, return ip
func LookupIP(ctx context.Context, host string) ([]net.IP, error) {
return LookupIPWithResolver(ctx, host, DefaultResolver) </s> remove return ResolveIPWithResolver(host, DefaultResolver)
</s> add ips, err := LookupIP(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
} else if len(ips) == 0 {
return nil, ErrIPNotFound | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return ips, nil
<mask> }
<mask>
<mask> // ResolveIP with a host, return ip
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ipAddr.IP, nil
</s> add return ips, nil
}
// ResolveIP with a host, return ip
func LookupIP(ctx context.Context, host string) ([]net.IP, error) {
return LookupIPWithResolver(ctx, host, DefaultResolver) </s> remove return ResolveIPWithResolver(host, DefaultResolver)
</s> add ips, err := LookupIP(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove // ResolveIPWithResolver same as ResolveIP, but with a resolver
func ResolveIPWithResolver(host string, r Resolver) (net.IP, error) {
</s> add // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
ips, err := LookupIPv6(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPWithResolver same as ResolveIP, but with a resolver
func LookupIPWithResolver(ctx context.Context, host string, r Resolver) ([]net.IP, error) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
return ips, nil
}
// ResolveIP with a host, return ip
func LookupIP(ctx context.Context, host string) ([]net.IP, error) {
return LookupIPWithResolver(ctx, host, DefaultResolver) | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return ipAddr.IP, nil
<mask> }
<mask>
<mask> // ResolveIP with a host, return ip
<mask> func ResolveIP(host string) (net.IP, error) {
<mask> return ResolveIPWithResolver(host, DefaultResolver)
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ResolveIPWithResolver(host, DefaultResolver)
</s> add ips, err := LookupIP(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
ips, err := LookupIP(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil | <mask> }
<mask>
<mask> // ResolveIP with a host, return ip
<mask> func ResolveIP(host string) (net.IP, error) {
<mask> return ResolveIPWithResolver(host, DefaultResolver)
<mask> }
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ipAddr.IP, nil
</s> add return ips, nil
}
// ResolveIP with a host, return ip
func LookupIP(ctx context.Context, host string) ([]net.IP, error) {
return LookupIPWithResolver(ctx, host, DefaultResolver) </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | component/resolver/resolver.go |
"math/rand" | <mask> import (
<mask> "context"
<mask> "crypto/tls"
<mask> "fmt"
<mask> "net"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask>
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := resolver.ResolveIP(metadata.Host)
</s> add ips, err := resolver.LookupIP(context.Background(), metadata.Host) </s> remove return ipAddrs[rand.Intn(len(ipAddrs))], nil
</s> add return ipAddrs, nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/client.go |
ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { | <mask> if ip = net.ParseIP(c.host); ip == nil {
<mask> return nil, fmt.Errorf("dns %s not a valid ip", c.host)
<mask> }
<mask> } else {
<mask> if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
<mask> return nil, fmt.Errorf("use default dns resolve failed: %w", err)
<mask> }
<mask> }
<mask>
<mask> network := "udp"
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := resolver.ResolveIP(metadata.Host)
</s> add ips, err := resolver.LookupIP(context.Background(), metadata.Host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/client.go |
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, c.host) | <mask> } else {
<mask> ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("use default dns resolve failed: %w", err)
<mask> }
<mask> ip = ips[rand.Intn(len(ips))]
<mask> }
<mask>
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { </s> remove ip, err := resolver.ResolveIP(metadata.Host)
</s> add ips, err := resolver.LookupIP(context.Background(), metadata.Host) </s> remove ip, err := resolver.ResolveIPWithResolver(host, r)
</s> add ips, err := resolver.LookupIPWithResolver(ctx, host, r) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/client.go |
ip = ips[rand.Intn(len(ips))] | <mask> return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, c.host)
<mask> }
<mask> }
<mask>
<mask> network := "udp"
<mask> if strings.HasPrefix(c.Client.Net, "tcp") {
<mask> network = "tcp"
<mask> }
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { </s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/client.go |
"fmt" | <mask> "context"
<mask> "crypto/tls"
<mask> "io"
<mask> "math/rand"
<mask> "net"
<mask> "net/http"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ipLength := len(ips)
if ipLength == 0 {
</s> add if len(ips) == 0 { </s> remove return DefaultResolver.ResolveIPv6(host)
</s> add return DefaultResolver.LookupIPv6(ctx, host) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/doh.go |
"math/rand" | <mask> "context"
<mask> "crypto/tls"
<mask> "fmt"
<mask> "io"
<mask> "net"
<mask> "net/http"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/resolver"
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ipLength := len(ips)
if ipLength == 0 {
</s> add if len(ips) == 0 { </s> remove return DefaultResolver.ResolveIPv6(host)
</s> add return DefaultResolver.LookupIPv6(ctx, host) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/doh.go |
ips, err := resolver.LookupIPWithResolver(ctx, host, r) | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> ip, err := resolver.ResolveIPWithResolver(host, r)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> options := []dialer.Option{}
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove ipAddr, err := net.ResolveIPAddr("ip", host)
</s> add ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/doh.go |
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host) | <mask> ips, err := resolver.LookupIPWithResolver(ctx, host, r)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> ip := ips[rand.Intn(len(ips))]
<mask>
<mask> options := []dialer.Option{}
<mask> if iface != "" {
<mask> options = append(options, dialer.WithInterface(iface))
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := resolver.ResolveIPWithResolver(host, r)
</s> add ips, err := resolver.LookupIPWithResolver(ctx, host, r) </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { </s> remove ipAddr, err := net.ResolveIPAddr("ip", host)
</s> add ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/doh.go |
ip := ips[rand.Intn(len(ips))] | <mask> return nil, err
<mask> } else if len(ips) == 0 {
<mask> return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
<mask> }
<mask>
<mask> options := []dialer.Option{}
<mask> if iface != "" {
<mask> options = append(options, dialer.WithInterface(iface))
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := resolver.ResolveIPWithResolver(host, r)
</s> add ips, err := resolver.LookupIPWithResolver(ctx, host, r) </s> remove return ResolveIPWithResolver(host, DefaultResolver)
</s> add ips, err := LookupIP(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/doh.go |
// LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
| <mask> lruCache *cache.LruCache
<mask> policy *trie.DomainTrie
<mask> }
<mask>
<mask> // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
<mask> func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
<mask> ch := make(chan net.IP, 1)
<mask> go func() {
<mask> defer close(ch)
<mask> ip, err := r.resolveIP(host, D.TypeAAAA)
<mask> if err != nil {
<mask> return
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := r.resolveIP(host, D.TypeAAAA)
</s> add ip, err := r.lookupIP(ctx, host, D.TypeAAAA) </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) </s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
ip, err := r.lookupIP(ctx, host, D.TypeAAAA) | <mask> func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
<mask> ch := make(chan net.IP, 1)
<mask> go func() {
<mask> defer close(ch)
<mask> ip, err := r.resolveIP(host, D.TypeAAAA)
<mask> if err != nil {
<mask> return
<mask> }
<mask> ch <- ip
<mask> }()
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ch := make(chan net.IP, 1)
</s> add // LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
</s> remove ip, err = r.resolveIP(host, D.TypeA)
</s> add ip, err = r.lookupIP(ctx, host, D.TypeA) </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) </s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
ip, err = r.lookupIP(ctx, host, D.TypeA) | <mask> }
<mask> ch <- ip
<mask> }()
<mask>
<mask> ip, err = r.resolveIP(host, D.TypeA)
<mask> if err == nil {
<mask> return
<mask> }
<mask>
<mask> ip, open := <-ch
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := r.resolveIP(host, D.TypeAAAA)
</s> add ip, err := r.lookupIP(ctx, host, D.TypeAAAA) </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
// ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ips, err := r.LookupIP(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv4 request with TypeA
func (r *Resolver) LookupIPv4(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeA)
}
| <mask> return ip, nil
<mask> }
<mask>
<mask> // ResolveIPv4 request with TypeA
<mask> func (r *Resolver) ResolveIPv4(host string) (ip net.IP, err error) {
<mask> ips, err := r.lookupIP(context.Background(), host, D.TypeA)
<mask> if err != nil {
<mask> return nil, err
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) </s> remove // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ch := make(chan net.IP, 1)
</s> add // LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
</s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { </s> remove // ResolveIPv6 with a host, return ipv6
func ResolveIPv6(host string) (net.IP, error) {
</s> add // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
ips, err := LookupIPv4(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 with a host, return ipv6 list
func LookupIPv6(ctx context.Context, host string) ([]net.IP, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) | <mask> }
<mask>
<mask> // ResolveIPv4 request with TypeA
<mask> func (r *Resolver) ResolveIPv4(host string) (ip net.IP, err error) {
<mask> return r.resolveIP(host, D.TypeA)
<mask> }
<mask>
<mask> // ResolveIPv6 request with TypeAAAA
<mask> func (r *Resolver) ResolveIPv6(host string) (ip net.IP, err error) {
<mask> return r.resolveIP(host, D.TypeAAAA)
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ch := make(chan net.IP, 1)
</s> add // LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
</s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove ip, err := r.resolveIP(host, D.TypeAAAA)
</s> add ip, err := r.lookupIP(ctx, host, D.TypeAAAA) </s> remove // ResolveIPv4 with a host, return ipv4
func ResolveIPv4(host string) (net.IP, error) {
</s> add // LookupIPv4 with a host, return ipv4 list
func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil | <mask> }
<mask>
<mask> // ResolveIPv6 request with TypeAAAA
<mask> func (r *Resolver) ResolveIPv6(host string) (ip net.IP, err error) {
<mask> return r.resolveIP(host, D.TypeAAAA)
<mask> }
<mask>
<mask> func (r *Resolver) shouldIPFallback(ip net.IP) bool {
<mask> for _, filter := range r.fallbackIPFilters {
<mask> if filter.Match(ip) {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) </s> remove // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
ch := make(chan net.IP, 1)
</s> add // LookupIP request with TypeA and TypeAAAA, priority return TypeA
func (r *Resolver) LookupIP(ctx context.Context, host string) (ip []net.IP, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
ch := make(chan []net.IP, 1)
</s> remove ip, err := r.resolveIP(host, D.TypeAAAA)
</s> add ip, err := r.lookupIP(ctx, host, D.TypeAAAA) </s> remove func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) {
ip = net.ParseIP(host)
</s> add func (r *Resolver) lookupIP(ctx context.Context, host string, dnsType uint16) ([]net.IP, error) {
ip := net.ParseIP(host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
func (r *Resolver) lookupIP(ctx context.Context, host string, dnsType uint16) ([]net.IP, error) {
ip := net.ParseIP(host) | <mask> msg, err = res.Msg, res.Error
<mask> return
<mask> }
<mask>
<mask> func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) {
<mask> ip = net.ParseIP(host)
<mask> if ip != nil {
<mask> isIPv4 := ip.To4() != nil
<mask> if dnsType == D.TypeAAAA && !isIPv4 {
<mask> return ip, nil
<mask> } else if dnsType == D.TypeA && isIPv4 {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove isIPv4 := ip.To4() != nil
</s> add ip4 := ip.To4()
isIPv4 := ip4 != nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip4}, nil </s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
ip4 := ip.To4()
isIPv4 := ip4 != nil | <mask>
<mask> func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) {
<mask> ip = net.ParseIP(host)
<mask> if ip != nil {
<mask> isIPv4 := ip.To4() != nil
<mask> if dnsType == D.TypeAAAA && !isIPv4 {
<mask> return ip, nil
<mask> } else if dnsType == D.TypeA && isIPv4 {
<mask> return ip, nil
<mask> } else {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) {
ip = net.ParseIP(host)
</s> add func (r *Resolver) lookupIP(ctx context.Context, host string, dnsType uint16) ([]net.IP, error) {
ip := net.ParseIP(host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip4}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
return []net.IP{ip}, nil | <mask> ip = net.ParseIP(host)
<mask> if ip != nil {
<mask> isIPv4 := ip.To4() != nil
<mask> if dnsType == D.TypeAAAA && !isIPv4 {
<mask> return ip, nil
<mask> } else if dnsType == D.TypeA && isIPv4 {
<mask> return ip, nil
<mask> } else {
<mask> return nil, resolver.ErrIPVersion
<mask> }
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip4}, nil </s> remove isIPv4 := ip.To4() != nil
</s> add ip4 := ip.To4()
isIPv4 := ip4 != nil </s> remove func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) {
ip = net.ParseIP(host)
</s> add func (r *Resolver) lookupIP(ctx context.Context, host string, dnsType uint16) ([]net.IP, error) {
ip := net.ParseIP(host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
return []net.IP{ip4}, nil | <mask> isIPv4 := ip.To4() != nil
<mask> if dnsType == D.TypeAAAA && !isIPv4 {
<mask> return ip, nil
<mask> } else if dnsType == D.TypeA && isIPv4 {
<mask> return ip, nil
<mask> } else {
<mask> return nil, resolver.ErrIPVersion
<mask> }
<mask> }
<mask>
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove isIPv4 := ip.To4() != nil
</s> add ip4 := ip.To4()
isIPv4 := ip4 != nil </s> remove func (r *Resolver) resolveIP(host string, dnsType uint16) (ip net.IP, err error) {
ip = net.ParseIP(host)
</s> add func (r *Resolver) lookupIP(ctx context.Context, host string, dnsType uint16) ([]net.IP, error) {
ip := net.ParseIP(host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
if len(ips) == 0 { | <mask> return nil, err
<mask> }
<mask>
<mask> ips := msgToIP(msg)
<mask> ipLength := len(ips)
<mask> if ipLength == 0 {
<mask> return nil, resolver.ErrIPNotFound
<mask> }
<mask>
<mask> ip = ips[rand.Intn(ipLength)]
<mask> return
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove
ip = ips[rand.Intn(ipLength)]
return
</s> add return ips, nil </s> remove return ResolveIPWithResolver(host, DefaultResolver)
</s> add ips, err := LookupIP(context.Background(), host)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
return ips, nil | <mask> ipLength := len(ips)
<mask> if ipLength == 0 {
<mask> return nil, resolver.ErrIPNotFound
<mask> }
<mask>
<mask> ip = ips[rand.Intn(ipLength)]
<mask> return
<mask> }
<mask>
<mask> func (r *Resolver) msgToDomain(msg *D.Msg) string {
<mask> if len(msg.Question) > 0 {
<mask> return strings.TrimRight(msg.Question[0].Name, ".")
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ipLength := len(ips)
if ipLength == 0 {
</s> add if len(ips) == 0 { </s> remove return r.resolveIP(host, D.TypeAAAA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeAAAA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil </s> remove return r.resolveIP(host, D.TypeA)
</s> add ips, err := r.lookupIP(context.Background(), host, D.TypeA)
if err != nil {
return nil, err
} else if len(ips) == 0 {
return nil, fmt.Errorf("%w: %s", resolver.ErrIPNotFound, host)
}
return ips[rand.Intn(len(ips))], nil
}
// LookupIPv6 request with TypeAAAA
func (r *Resolver) LookupIPv6(ctx context.Context, host string) ([]net.IP, error) {
return r.lookupIP(ctx, host, D.TypeAAAA) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | dns/resolver.go |
ips, err := resolver.LookupIP(context.Background(), metadata.Host) | <mask> }
<mask>
<mask> // local resolve UDP dns
<mask> if !metadata.Resolved() {
<mask> ip, err := resolver.ResolveIP(metadata.Host)
<mask> if err != nil {
<mask> return
<mask> }
<mask> metadata.DstIP = ip
<mask> }
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove metadata.DstIP = ip
</s> add metadata.DstIP = ips[0] </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { </s> remove return ip, nil
</s> add return []net.IP{ip}, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | tunnel/tunnel.go |
} else if len(ips) == 0 {
return | <mask> if err != nil {
<mask> return
<mask> }
<mask> metadata.DstIP = ips[0]
<mask> }
<mask>
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove metadata.DstIP = ip
</s> add metadata.DstIP = ips[0] </s> remove ip, err := resolver.ResolveIP(metadata.Host)
</s> add ips, err := resolver.LookupIP(context.Background(), metadata.Host) </s> remove if ip, err = resolver.ResolveIPWithResolver(c.host, c.r); err != nil {
</s> add ips, err := resolver.LookupIPWithResolver(ctx, c.host, c.r)
if err != nil { </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove ipAddr, err := net.ResolveIPAddr("ip", host)
</s> add ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | tunnel/tunnel.go |
metadata.DstIP = ips[0] | <mask> ip, err := resolver.ResolveIP(metadata.Host)
<mask> if err != nil {
<mask> return
<mask> }
<mask> metadata.DstIP = ip
<mask> }
<mask>
<mask> key := packet.LocalAddr().String()
<mask>
<mask> handle := func() bool {
</s> Feature: sync missing resolver logic from premium, but still net.IP on opensource </s> remove ip, err := resolver.ResolveIP(metadata.Host)
</s> add ips, err := resolver.LookupIP(context.Background(), metadata.Host) </s> remove return ip, nil
</s> add return []net.IP{ip}, nil </s> remove ip, err := r.resolveIP(host, D.TypeAAAA)
</s> add ip, err := r.lookupIP(ctx, host, D.TypeAAAA) </s> remove ipAddr, err := net.ResolveIPAddr("ip", host)
</s> add ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3946d771e52fb72dfc91543dda8c785597622a9b | tunnel/tunnel.go |
const Version = 5
| <mask> // Command is request commands as defined in RFC 1928 section 4.
<mask> type Command = uint8
<mask>
<mask> // SOCKS request commands as defined in RFC 1928 section 4.
<mask> const (
<mask> CmdConnect Command = 1
<mask> CmdBind Command = 2
</s> Feature: add Mixed(http+socks5) proxy listening (#685) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3a27cfc4a13050a06c254b08acbc010eda045920 | component/socks5/socks5.go |
MixedPort int `json:"mixed-port"` | <mask> SocksPort int `json:"socks-port"`
<mask> RedirPort int `json:"redir-port"`
<mask> Authentication []string `json:"authentication"`
<mask> AllowLan bool `json:"allow-lan"`
<mask> BindAddress string `json:"bind-address"`
<mask> Mode T.TunnelMode `json:"mode"`
<mask> LogLevel log.LogLevel `json:"log-level"`
<mask> ExternalController string `json:"-"`
</s> Feature: add Mixed(http+socks5) proxy listening (#685) </s> remove func handleSocks(conn net.Conn) {
</s> add func HandleSocks(conn net.Conn) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3a27cfc4a13050a06c254b08acbc010eda045920 | config/config.go |
MixedPort int `yaml:"mixed-port"` | <mask> SocksPort int `yaml:"socks-port"`
<mask> RedirPort int `yaml:"redir-port"`
<mask> Authentication []string `yaml:"authentication"`
<mask> AllowLan bool `yaml:"allow-lan"`
<mask> BindAddress string `yaml:"bind-address"`
<mask> Mode T.TunnelMode `yaml:"mode"`
</s> Feature: add Mixed(http+socks5) proxy listening (#685) </s> remove func handleSocks(conn net.Conn) {
</s> add func HandleSocks(conn net.Conn) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/3a27cfc4a13050a06c254b08acbc010eda045920 | config/config.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.