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 |
|---|---|---|---|---|
t.configMux.RLock()
defer t.configMux.RUnlock() | <mask> return (rule.RuleType() == C.GEOIP || rule.RuleType() == C.IPCIDR) && metadata.Host != "" && metadata.IP == nil
<mask> }
<mask>
<mask> func (t *Tunnel) match(metadata *C.Metadata) (C.Proxy, error) {
<mask> t.configLock.RLock()
<mask> defer t.configLock.RUnlock()
<mask>
<mask> for _, rule := range t.rules {
<mask> if t.shouldResolveIP(rule, metadata) {
<mask> ip, err := t.resolveIP(metadata.Host)
<mask> if err != nil {
</s> Feature: add experimental config for resolving ip fail behavior </s> remove if t.shouldResolveIP(rule, metadata) {
</s> add if !resolved && t.shouldResolveIP(rule, metadata) { </s> remove return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
</s> add if !t.ignoreResolveFail {
return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
}
log.Debugln("[DNS] resolve %s error: %s", metadata.Host, err.Error())
} else {
log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip </s> remove log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip
</s> add resolved = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cec220677455a0851b2d16be6f298664b2556c85 | tunnel/tunnel.go |
var resolved bool | <mask> t.configMux.RLock()
<mask> defer t.configMux.RUnlock()
<mask>
<mask> for _, rule := range t.rules {
<mask> if !resolved && t.shouldResolveIP(rule, metadata) {
<mask> ip, err := t.resolveIP(metadata.Host)
<mask> if err != nil {
<mask> if !t.ignoreResolveFail {
</s> Feature: add experimental config for resolving ip fail behavior </s> remove t.configLock.RLock()
defer t.configLock.RUnlock()
</s> add t.configMux.RLock()
defer t.configMux.RUnlock() </s> remove if t.shouldResolveIP(rule, metadata) {
</s> add if !resolved && t.shouldResolveIP(rule, metadata) { </s> remove return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
</s> add if !t.ignoreResolveFail {
return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
}
log.Debugln("[DNS] resolve %s error: %s", metadata.Host, err.Error())
} else {
log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip </s> remove log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip
</s> add resolved = true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cec220677455a0851b2d16be6f298664b2556c85 | tunnel/tunnel.go |
if !resolved && t.shouldResolveIP(rule, metadata) { | <mask> t.configLock.RLock()
<mask> defer t.configLock.RUnlock()
<mask>
<mask> for _, rule := range t.rules {
<mask> if t.shouldResolveIP(rule, metadata) {
<mask> ip, err := t.resolveIP(metadata.Host)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
<mask> }
<mask> log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
</s> Feature: add experimental config for resolving ip fail behavior </s> remove return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
</s> add if !t.ignoreResolveFail {
return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
}
log.Debugln("[DNS] resolve %s error: %s", metadata.Host, err.Error())
} else {
log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip </s> remove log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip
</s> add resolved = true </s> remove t.configLock.RLock()
defer t.configLock.RUnlock()
</s> add t.configMux.RLock()
defer t.configMux.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cec220677455a0851b2d16be6f298664b2556c85 | tunnel/tunnel.go |
if !t.ignoreResolveFail {
return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
}
log.Debugln("[DNS] resolve %s error: %s", metadata.Host, err.Error())
} else {
log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip | <mask> for _, rule := range t.rules {
<mask> if t.shouldResolveIP(rule, metadata) {
<mask> ip, err := t.resolveIP(metadata.Host)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
<mask> }
<mask> log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
<mask> metadata.IP = &ip
<mask> }
<mask>
</s> Feature: add experimental config for resolving ip fail behavior </s> remove if t.shouldResolveIP(rule, metadata) {
</s> add if !resolved && t.shouldResolveIP(rule, metadata) { </s> remove log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip
</s> add resolved = true </s> remove t.configLock.RLock()
defer t.configLock.RUnlock()
</s> add t.configMux.RLock()
defer t.configMux.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cec220677455a0851b2d16be6f298664b2556c85 | tunnel/tunnel.go |
resolved = true | <mask> ip, err := t.resolveIP(metadata.Host)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
<mask> }
<mask> log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
<mask> metadata.IP = &ip
<mask> }
<mask>
<mask> if rule.IsMatch(metadata) {
<mask> adapter, ok := t.proxies[rule.Adapter()]
<mask> if !ok {
</s> Feature: add experimental config for resolving ip fail behavior </s> remove return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
</s> add if !t.ignoreResolveFail {
return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
}
log.Debugln("[DNS] resolve %s error: %s", metadata.Host, err.Error())
} else {
log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip </s> remove if t.shouldResolveIP(rule, metadata) {
</s> add if !resolved && t.shouldResolveIP(rule, metadata) { </s> remove t.configLock.RLock()
defer t.configLock.RUnlock()
</s> add t.configMux.RLock()
defer t.configMux.RUnlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cec220677455a0851b2d16be6f298664b2556c85 | tunnel/tunnel.go |
queue: channels.NewInfiniteChannel(),
proxies: make(map[string]C.Proxy),
configMux: &sync.RWMutex{},
traffic: C.NewTraffic(time.Second),
mode: Rule, | <mask> }
<mask>
<mask> func newTunnel() *Tunnel {
<mask> return &Tunnel{
<mask> queue: channels.NewInfiniteChannel(),
<mask> proxies: make(map[string]C.Proxy),
<mask> configLock: &sync.RWMutex{},
<mask> traffic: C.NewTraffic(time.Second),
<mask> mode: Rule,
<mask> }
<mask> }
<mask>
<mask> // Instance return singleton instance of Tunnel
<mask> func Instance() *Tunnel {
</s> Feature: add experimental config for resolving ip fail behavior </s> remove t.configLock.Lock()
</s> add t.configMux.Lock() </s> remove t.configLock.Lock()
</s> add t.configMux.Lock() </s> remove t.configLock.Unlock()
</s> add t.configMux.Unlock()
}
// UpdateExperimental handle update experimental config
func (t *Tunnel) UpdateExperimental(ignoreResolveFail bool) {
t.configMux.Lock()
t.ignoreResolveFail = ignoreResolveFail
t.configMux.Unlock() </s> remove return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
</s> add if !t.ignoreResolveFail {
return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
}
log.Debugln("[DNS] resolve %s error: %s", metadata.Host, err.Error())
} else {
log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
metadata.IP = &ip </s> remove t.configLock.Unlock()
</s> add t.configMux.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cec220677455a0851b2d16be6f298664b2556c85 | tunnel/tunnel.go |
"fmt" | <mask> package http
<mask>
<mask> import (
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
</s> Fix: http proxy should response correct http version (#1651) </s> remove resp = responseWith(200)
resp.Status = "Connection established"
resp.ContentLength = -1
if resp.Write(conn) != nil {
</s> add // Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { </s> remove Proto: "HTTP/1.1",
ProtoMajor: 1,
ProtoMinor: 1,
</s> add Proto: request.Proto,
ProtoMajor: request.ProtoMajor,
ProtoMinor: request.ProtoMinor, </s> remove func responseWith(statusCode int) *http.Response {
</s> add func responseWith(request *http.Request, statusCode int) *http.Response { </s> remove return responseWith(http.StatusForbidden)
</s> add return responseWith(request, http.StatusForbidden) </s> remove resp := responseWith(http.StatusProxyAuthRequired)
</s> add resp := responseWith(request, http.StatusProxyAuthRequired) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
// Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { | <mask> }
<mask>
<mask> if trusted {
<mask> if request.Method == http.MethodConnect {
<mask> resp = responseWith(200)
<mask> resp.Status = "Connection established"
<mask> resp.ContentLength = -1
<mask>
<mask> if resp.Write(conn) != nil {
<mask> break // close connection
<mask> }
<mask>
<mask> in <- inbound.NewHTTPS(request, conn)
<mask>
</s> Fix: http proxy should response correct http version (#1651) </s> remove resp = responseWith(http.StatusBadRequest)
</s> add resp = responseWith(request, http.StatusBadRequest) </s> remove resp = responseWith(http.StatusBadGateway)
</s> add resp = responseWith(request, http.StatusBadGateway) </s> remove resp := responseWith(http.StatusProxyAuthRequired)
</s> add resp := responseWith(request, http.StatusProxyAuthRequired) </s> remove return responseWith(http.StatusForbidden)
</s> add return responseWith(request, http.StatusForbidden) </s> remove func responseWith(statusCode int) *http.Response {
</s> add func responseWith(request *http.Request, statusCode int) *http.Response { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
resp = responseWith(request, http.StatusBadRequest) | <mask> removeHopByHopHeaders(request.Header)
<mask> removeExtraHTTPHostPort(request)
<mask>
<mask> if request.URL.Scheme == "" || request.URL.Host == "" {
<mask> resp = responseWith(http.StatusBadRequest)
<mask> } else {
<mask> resp, err = client.Do(request)
<mask> if err != nil {
<mask> resp = responseWith(http.StatusBadGateway)
<mask> }
</s> Fix: http proxy should response correct http version (#1651) </s> remove resp = responseWith(http.StatusBadGateway)
</s> add resp = responseWith(request, http.StatusBadGateway) </s> remove resp = responseWith(200)
resp.Status = "Connection established"
resp.ContentLength = -1
if resp.Write(conn) != nil {
</s> add // Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { </s> remove resp := responseWith(http.StatusProxyAuthRequired)
</s> add resp := responseWith(request, http.StatusProxyAuthRequired) </s> remove return responseWith(http.StatusForbidden)
</s> add return responseWith(request, http.StatusForbidden) </s> remove func responseWith(statusCode int) *http.Response {
</s> add func responseWith(request *http.Request, statusCode int) *http.Response { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
resp = responseWith(request, http.StatusBadGateway) | <mask> resp = responseWith(http.StatusBadRequest)
<mask> } else {
<mask> resp, err = client.Do(request)
<mask> if err != nil {
<mask> resp = responseWith(http.StatusBadGateway)
<mask> }
<mask> }
<mask>
<mask> removeHopByHopHeaders(resp.Header)
<mask> }
</s> Fix: http proxy should response correct http version (#1651) </s> remove resp = responseWith(http.StatusBadRequest)
</s> add resp = responseWith(request, http.StatusBadRequest) </s> remove resp = responseWith(200)
resp.Status = "Connection established"
resp.ContentLength = -1
if resp.Write(conn) != nil {
</s> add // Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { </s> remove return responseWith(http.StatusForbidden)
</s> add return responseWith(request, http.StatusForbidden) </s> remove resp := responseWith(http.StatusProxyAuthRequired)
</s> add resp := responseWith(request, http.StatusProxyAuthRequired) </s> remove func responseWith(statusCode int) *http.Response {
</s> add func responseWith(request *http.Request, statusCode int) *http.Response { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
resp := responseWith(request, http.StatusProxyAuthRequired) | <mask> authenticator := authStore.Authenticator()
<mask> if authenticator != nil {
<mask> credential := parseBasicProxyAuthorization(request)
<mask> if credential == "" {
<mask> resp := responseWith(http.StatusProxyAuthRequired)
<mask> resp.Header.Set("Proxy-Authenticate", "Basic")
<mask> return resp
<mask> }
<mask>
<mask> var authed interface{}
</s> Fix: http proxy should response correct http version (#1651) </s> remove resp = responseWith(http.StatusBadRequest)
</s> add resp = responseWith(request, http.StatusBadRequest) </s> remove resp = responseWith(200)
resp.Status = "Connection established"
resp.ContentLength = -1
if resp.Write(conn) != nil {
</s> add // Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { </s> remove resp = responseWith(http.StatusBadGateway)
</s> add resp = responseWith(request, http.StatusBadGateway) </s> remove return responseWith(http.StatusForbidden)
</s> add return responseWith(request, http.StatusForbidden) </s> remove func responseWith(statusCode int) *http.Response {
</s> add func responseWith(request *http.Request, statusCode int) *http.Response { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
return responseWith(request, http.StatusForbidden) | <mask> }
<mask> if !authed.(bool) {
<mask> log.Infoln("Auth failed from %s", request.RemoteAddr)
<mask>
<mask> return responseWith(http.StatusForbidden)
<mask> }
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Fix: http proxy should response correct http version (#1651) </s> remove resp = responseWith(http.StatusBadGateway)
</s> add resp = responseWith(request, http.StatusBadGateway) </s> remove resp = responseWith(http.StatusBadRequest)
</s> add resp = responseWith(request, http.StatusBadRequest) </s> remove resp = responseWith(200)
resp.Status = "Connection established"
resp.ContentLength = -1
if resp.Write(conn) != nil {
</s> add // Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { </s> remove resp := responseWith(http.StatusProxyAuthRequired)
</s> add resp := responseWith(request, http.StatusProxyAuthRequired) </s> remove Proto: "HTTP/1.1",
ProtoMajor: 1,
ProtoMinor: 1,
</s> add Proto: request.Proto,
ProtoMajor: request.ProtoMajor,
ProtoMinor: request.ProtoMinor, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
func responseWith(request *http.Request, statusCode int) *http.Response { | <mask>
<mask> return nil
<mask> }
<mask>
<mask> func responseWith(statusCode int) *http.Response {
<mask> return &http.Response{
<mask> StatusCode: statusCode,
<mask> Status: http.StatusText(statusCode),
<mask> Proto: "HTTP/1.1",
<mask> ProtoMajor: 1,
</s> Fix: http proxy should response correct http version (#1651) </s> remove Proto: "HTTP/1.1",
ProtoMajor: 1,
ProtoMinor: 1,
</s> add Proto: request.Proto,
ProtoMajor: request.ProtoMajor,
ProtoMinor: request.ProtoMinor, </s> remove resp = responseWith(http.StatusBadGateway)
</s> add resp = responseWith(request, http.StatusBadGateway) </s> remove return responseWith(http.StatusForbidden)
</s> add return responseWith(request, http.StatusForbidden) </s> remove resp = responseWith(http.StatusBadRequest)
</s> add resp = responseWith(request, http.StatusBadRequest) </s> remove resp = responseWith(200)
resp.Status = "Connection established"
resp.ContentLength = -1
if resp.Write(conn) != nil {
</s> add // Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
Proto: request.Proto,
ProtoMajor: request.ProtoMajor,
ProtoMinor: request.ProtoMinor, | <mask> func responseWith(statusCode int) *http.Response {
<mask> return &http.Response{
<mask> StatusCode: statusCode,
<mask> Status: http.StatusText(statusCode),
<mask> Proto: "HTTP/1.1",
<mask> ProtoMajor: 1,
<mask> ProtoMinor: 1,
<mask> Header: http.Header{},
<mask> }
<mask> }
</s> Fix: http proxy should response correct http version (#1651) </s> remove func responseWith(statusCode int) *http.Response {
</s> add func responseWith(request *http.Request, statusCode int) *http.Response { </s> remove resp = responseWith(http.StatusBadGateway)
</s> add resp = responseWith(request, http.StatusBadGateway) </s> remove return responseWith(http.StatusForbidden)
</s> add return responseWith(request, http.StatusForbidden) </s> remove resp = responseWith(http.StatusBadRequest)
</s> add resp = responseWith(request, http.StatusBadRequest) </s> remove resp = responseWith(200)
resp.Status = "Connection established"
resp.ContentLength = -1
if resp.Write(conn) != nil {
</s> add // Manual writing to support CONNECT for http 1.0 (workaround for uplay client)
if _, err = fmt.Fprintf(conn, "HTTP/%d.%d %03d %s\r\n\r\n", request.ProtoMajor, request.ProtoMinor, http.StatusOK, "Connection established"); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ced9749104e47d717a849a4ae18fd9c6ed0a0658 | listener/http/proxy.go |
domainLength := uint16(b[1])
_, err = io.ReadFull(r, b[2:2+domainLength+2])
return b[:1+1+domainLength+2], err | <mask> _, err = io.ReadFull(r, b[1:2]) // read 2nd byte for domain length
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> _, err = io.ReadFull(r, b[2:2+b[1]+2])
<mask> return b[:1+1+b[1]+2], err
<mask> case AtypIPv4:
<mask> _, err = io.ReadFull(r, b[1:1+net.IPv4len+2])
<mask> return b[:1+net.IPv4len+2], err
<mask> case AtypIPv6:
<mask> _, err = io.ReadFull(r, b[1:1+net.IPv6len+2])
</s> Chore: fix socks reader overflow & update dependencies </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 </s> remove github.com/go-chi/chi v4.0.1+incompatible
</s> add github.com/go-chi/chi v4.0.2+incompatible </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0=
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | component/socks5/socks5.go |
github.com/Dreamacro/go-shadowsocks2 v0.1.3 | <mask> module github.com/Dreamacro/clash
<mask>
<mask> require (
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
<mask> github.com/eapache/queue v1.1.0 // indirect
<mask> github.com/go-chi/chi v4.0.1+incompatible
<mask> github.com/go-chi/cors v1.0.0
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v3.2.0+incompatible
</s> Chore: fix socks reader overflow & update dependencies </s> remove github.com/go-chi/chi v4.0.1+incompatible
</s> add github.com/go-chi/chi v4.0.2+incompatible </s> remove github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
</s> add github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f h1:nlImrmI6I2AVjJ2AvE3w3f7fi8rhLQAhZO1Gs31+/nE=
github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f/go.mod h1:giIuN+TuUudTxHc1jjTOyyQYiJ3VXp1pWOHdJbSCAPo=
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 h1:1ffY/q4e3o+MnztYgIq1iZiX1BWoWQ6D3AIO1kkb8bc=
github.com/Dreamacro/go-shadowsocks2 v0.1.3/go.mod h1:0x17IhQ+mlY6q/ffKRpzaE7u4aHMxxnitTRSrV5G6TU= </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.mod |
github.com/go-chi/chi v4.0.2+incompatible | <mask>
<mask> require (
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
<mask> github.com/eapache/queue v1.1.0 // indirect
<mask> github.com/go-chi/chi v4.0.1+incompatible
<mask> github.com/go-chi/cors v1.0.0
<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.4
</s> Chore: fix socks reader overflow & update dependencies </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
</s> add github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f h1:nlImrmI6I2AVjJ2AvE3w3f7fi8rhLQAhZO1Gs31+/nE=
github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f/go.mod h1:giIuN+TuUudTxHc1jjTOyyQYiJ3VXp1pWOHdJbSCAPo=
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 h1:1ffY/q4e3o+MnztYgIq1iZiX1BWoWQ6D3AIO1kkb8bc=
github.com/Dreamacro/go-shadowsocks2 v0.1.3/go.mod h1:0x17IhQ+mlY6q/ffKRpzaE7u4aHMxxnitTRSrV5G6TU= </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.mod |
github.com/miekg/dns v1.1.9 | <mask> github.com/go-chi/cors v1.0.0
<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.4
<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.3.0
<mask> golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> Chore: fix socks reader overflow & update dependencies </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 </s> remove github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E=
github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> remove github.com/go-chi/chi v4.0.1+incompatible
</s> add github.com/go-chi/chi v4.0.2+incompatible </s> remove github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
</s> add github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.mod |
github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 | <mask> github.com/gorilla/websocket v1.4.0
<mask> github.com/miekg/dns v1.1.4
<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.3.0
<mask> golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849
<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: fix socks reader overflow & update dependencies </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0=
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= </s> remove github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E=
github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> remove golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= </s> remove github.com/go-chi/chi v4.0.1+incompatible
</s> add github.com/go-chi/chi v4.0.2+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.mod |
github.com/Dreamacro/go-shadowsocks2 v0.1.3 h1:1ffY/q4e3o+MnztYgIq1iZiX1BWoWQ6D3AIO1kkb8bc=
github.com/Dreamacro/go-shadowsocks2 v0.1.3/go.mod h1:0x17IhQ+mlY6q/ffKRpzaE7u4aHMxxnitTRSrV5G6TU= | <mask> github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f h1:nlImrmI6I2AVjJ2AvE3w3f7fi8rhLQAhZO1Gs31+/nE=
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f/go.mod h1:giIuN+TuUudTxHc1jjTOyyQYiJ3VXp1pWOHdJbSCAPo=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
<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=
</s> Chore: fix socks reader overflow & update dependencies </s> remove github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
</s> add github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 </s> remove github.com/go-chi/chi v4.0.1+incompatible
</s> add github.com/go-chi/chi v4.0.2+incompatible </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 </s> remove golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0=
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.sum |
github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= | <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=
<mask> github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
<mask> github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
<mask> github.com/go-chi/cors v1.0.0 h1:e6x8k7uWbUwYs+aXDoiUzeQFT6l0cygBYyNhD7/1Tg0=
<mask> github.com/go-chi/cors v1.0.0/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I=
<mask> github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
<mask> github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
<mask> github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
</s> Chore: fix socks reader overflow & update dependencies </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f h1:nlImrmI6I2AVjJ2AvE3w3f7fi8rhLQAhZO1Gs31+/nE=
github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f/go.mod h1:giIuN+TuUudTxHc1jjTOyyQYiJ3VXp1pWOHdJbSCAPo=
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 h1:1ffY/q4e3o+MnztYgIq1iZiX1BWoWQ6D3AIO1kkb8bc=
github.com/Dreamacro/go-shadowsocks2 v0.1.3/go.mod h1:0x17IhQ+mlY6q/ffKRpzaE7u4aHMxxnitTRSrV5G6TU= </s> remove github.com/go-chi/chi v4.0.1+incompatible
</s> add github.com/go-chi/chi v4.0.2+incompatible </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E=
github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.sum |
github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E=
github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= | <mask> github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
<mask> github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
<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.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
<mask> github.com/miekg/dns v1.1.4/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=
</s> Chore: fix socks reader overflow & update dependencies </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
</s> add github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 </s> remove github.com/go-chi/chi v4.0.1+incompatible
</s> add github.com/go-chi/chi v4.0.2+incompatible </s> remove github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
</s> add github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.sum |
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= | <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.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
<mask> github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
<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-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
</s> Chore: fix socks reader overflow & update dependencies </s> remove golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= </s> remove github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E=
github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 </s> remove github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
</s> add github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.sum |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | <mask> github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
<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-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
<mask> golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
<mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<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-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0=
<mask> golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> Chore: fix socks reader overflow & update dependencies </s> remove golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0=
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> add golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= </s> remove github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
</s> add github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
</s> add github.com/miekg/dns v1.1.9 h1:OIdC9wT96RzuZMf2PfKRhFgsStHUUBZLM/lo1LqiM9E=
github.com/miekg/dns v1.1.9/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.sum |
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | <mask> golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<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-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0=
<mask> golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<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=
<mask> gopkg.in/eapache/channels.v1 v1.1.0/go.mod h1:BHIBujSvu9yMTrTYbTCjDD43gUhtmaOtTWDe7sTv1js=
<mask> gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
</s> Chore: fix socks reader overflow & update dependencies </s> remove golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> add golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= </s> remove github.com/sirupsen/logrus v1.3.0
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
golang.org/x/net v0.0.0-20181108082009-03003ca0c849
</s> add github.com/sirupsen/logrus v1.4.1
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 </s> remove github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
</s> add github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= </s> remove github.com/miekg/dns v1.1.4
</s> add github.com/miekg/dns v1.1.9 </s> remove github.com/Dreamacro/go-shadowsocks2 v0.1.3-0.20190406142755-9128a199439f
</s> add github.com/Dreamacro/go-shadowsocks2 v0.1.3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/cff4841f3ec2135e124c81dd76f4a4cc436d2dee | go.sum |
selected string | <mask>
<mask> type Selector struct {
<mask> *outbound.Base
<mask> single *singledo.Single
<mask> selected C.Proxy
<mask> providers []provider.ProxyProvider
<mask> }
<mask>
<mask> func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := s.selected.DialContext(ctx, metadata)
</s> Fix: select group can use provider real-time </s> remove c, err := s.selected.DialContext(ctx, metadata)
</s> add c, err := s.selectedProxy().DialContext(ctx, metadata) </s> remove pc, err := s.selected.DialUDP(metadata)
</s> add pc, err := s.selectedProxy().DialUDP(metadata) </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { </s> remove return elm.([]C.Proxy)
</s> add return elm.(C.Proxy) </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
c, err := s.selectedProxy().DialContext(ctx, metadata) | <mask> providers []provider.ProxyProvider
<mask> }
<mask>
<mask> func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := s.selected.DialContext(ctx, metadata)
<mask> if err == nil {
<mask> c.AppendToChains(s)
<mask> }
<mask> return c, err
<mask> }
</s> Fix: select group can use provider real-time </s> remove selected C.Proxy
</s> add selected string </s> remove pc, err := s.selected.DialUDP(metadata)
</s> add pc, err := s.selectedProxy().DialUDP(metadata) </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
pc, err := s.selectedProxy().DialUDP(metadata) | <mask> return c, err
<mask> }
<mask>
<mask> func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> pc, err := s.selected.DialUDP(metadata)
<mask> if err == nil {
<mask> pc.AppendToChains(s)
<mask> }
<mask> return pc, err
<mask> }
</s> Fix: select group can use provider real-time </s> remove c, err := s.selected.DialContext(ctx, metadata)
</s> add c, err := s.selectedProxy().DialContext(ctx, metadata) </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() </s> remove selected C.Proxy
</s> add selected string </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
return s.selectedProxy().SupportUDP() | <mask> return pc, err
<mask> }
<mask>
<mask> func (s *Selector) SupportUDP() bool {
<mask> return s.selected.SupportUDP()
<mask> }
<mask>
<mask> func (s *Selector) MarshalJSON() ([]byte, error) {
<mask> var all []string
<mask> for _, proxy := range s.proxies() {
</s> Fix: select group can use provider real-time </s> remove for _, proxy := range s.proxies() {
</s> add for _, proxy := range getProvidersProxies(s.providers) { </s> remove pc, err := s.selected.DialUDP(metadata)
</s> add pc, err := s.selectedProxy().DialUDP(metadata) </s> remove return s.selected.Name()
</s> add return s.selectedProxy().Name() </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { </s> remove c, err := s.selected.DialContext(ctx, metadata)
</s> add c, err := s.selectedProxy().DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
for _, proxy := range getProvidersProxies(s.providers) { | <mask> }
<mask>
<mask> func (s *Selector) MarshalJSON() ([]byte, error) {
<mask> var all []string
<mask> for _, proxy := range s.proxies() {
<mask> all = append(all, proxy.Name())
<mask> }
<mask>
<mask> return json.Marshal(map[string]interface{}{
<mask> "type": s.Type().String(),
</s> Fix: select group can use provider real-time </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() </s> remove s.selected = proxy
</s> add s.selected = name </s> remove for _, proxy := range s.proxies() {
</s> add for _, proxy := range getProvidersProxies(s.providers) { </s> remove return s.selected.Name()
</s> add return s.selectedProxy().Name() </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
return s.selectedProxy().Name() | <mask> })
<mask> }
<mask>
<mask> func (s *Selector) Now() string {
<mask> return s.selected.Name()
<mask> }
<mask>
<mask> func (s *Selector) Set(name string) error {
<mask> for _, proxy := range s.proxies() {
<mask> if proxy.Name() == name {
</s> Fix: select group can use provider real-time </s> remove for _, proxy := range s.proxies() {
</s> add for _, proxy := range getProvidersProxies(s.providers) { </s> remove s.selected = proxy
</s> add s.selected = name </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
for _, proxy := range getProvidersProxies(s.providers) { | <mask> return s.selected.Name()
<mask> }
<mask>
<mask> func (s *Selector) Set(name string) error {
<mask> for _, proxy := range s.proxies() {
<mask> if proxy.Name() == name {
<mask> s.selected = proxy
<mask> return nil
<mask> }
<mask> }
</s> Fix: select group can use provider real-time </s> remove s.selected = proxy
</s> add s.selected = name </s> remove return s.selected.Name()
</s> add return s.selectedProxy().Name() </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove for _, proxy := range s.proxies() {
</s> add for _, proxy := range getProvidersProxies(s.providers) { </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
s.selected = name | <mask>
<mask> func (s *Selector) Set(name string) error {
<mask> for _, proxy := range s.proxies() {
<mask> if proxy.Name() == name {
<mask> s.selected = proxy
<mask> return nil
<mask> }
<mask> }
<mask>
<mask> return errors.New("Proxy does not exist")
</s> Fix: select group can use provider real-time </s> remove for _, proxy := range s.proxies() {
</s> add for _, proxy := range getProvidersProxies(s.providers) { </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { </s> remove return s.selected.Name()
</s> add return s.selectedProxy().Name() </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove for _, proxy := range s.proxies() {
</s> add for _, proxy := range getProvidersProxies(s.providers) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
func (s *Selector) selectedProxy() C.Proxy { | <mask>
<mask> return errors.New("Proxy does not exist")
<mask> }
<mask>
<mask> func (s *Selector) proxies() []C.Proxy {
<mask> elm, _, _ := s.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(s.providers), nil
<mask> })
<mask>
<mask> return elm.([]C.Proxy)
</s> Fix: select group can use provider real-time </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove return elm.([]C.Proxy)
</s> add return elm.(C.Proxy) </s> remove s.selected = proxy
</s> add s.selected = name </s> remove return s.selected.Name()
</s> add return s.selectedProxy().Name() </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil | <mask> }
<mask>
<mask> func (s *Selector) proxies() []C.Proxy {
<mask> elm, _, _ := s.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(s.providers), nil
<mask> })
<mask>
<mask> return elm.([]C.Proxy)
<mask> }
<mask>
</s> Fix: select group can use provider real-time </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { </s> remove return elm.([]C.Proxy)
</s> add return elm.(C.Proxy) </s> remove return s.selected.Name()
</s> add return s.selectedProxy().Name() </s> remove return s.selected.SupportUDP()
</s> add return s.selectedProxy().SupportUDP() </s> remove for _, proxy := range s.proxies() {
</s> add for _, proxy := range getProvidersProxies(s.providers) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
return elm.(C.Proxy) | <mask> elm, _, _ := s.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(s.providers), nil
<mask> })
<mask>
<mask> return elm.([]C.Proxy)
<mask> }
<mask>
<mask> func NewSelector(name string, providers []provider.ProxyProvider) *Selector {
<mask> selected := providers[0].Proxies()[0]
<mask> return &Selector{
</s> Fix: select group can use provider real-time </s> remove selected := providers[0].Proxies()[0]
</s> add selected := providers[0].Proxies()[0].Name() </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove return s.selected.Name()
</s> add return s.selectedProxy().Name() </s> remove selected C.Proxy
</s> add selected string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
selected := providers[0].Proxies()[0].Name() | <mask> return elm.([]C.Proxy)
<mask> }
<mask>
<mask> func NewSelector(name string, providers []provider.ProxyProvider) *Selector {
<mask> selected := providers[0].Proxies()[0]
<mask> return &Selector{
<mask> Base: outbound.NewBase(name, "", C.Selector, false),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> providers: providers,
<mask> selected: selected,
</s> Fix: select group can use provider real-time </s> remove return elm.([]C.Proxy)
</s> add return elm.(C.Proxy) </s> remove selected C.Proxy
</s> add selected string </s> remove return getProvidersProxies(s.providers), nil
</s> add proxies := getProvidersProxies(s.providers)
for _, proxy := range proxies {
if proxy.Name() == s.selected {
return proxy, nil
}
}
return proxies[0], nil </s> remove func (s *Selector) proxies() []C.Proxy {
</s> add func (s *Selector) selectedProxy() C.Proxy { </s> remove c, err := s.selected.DialContext(ctx, metadata)
</s> add c, err := s.selectedProxy().DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d1fd57c432f05418b83cc48958c983fccd78db33 | adapters/outboundgroup/selector.go |
Network string `proxy:"network,omitempty"`
WSPath string `proxy:"ws-path,omitempty"` | <mask> Cipher string `proxy:"cipher"`
<mask> TLS bool `proxy:"tls,omitempty"`
<mask> }
<mask>
<mask> func (ss *Vmess) Name() string {
<mask> return ss.name
</s> Feature: vmess add websocket support </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
</s> add user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
websocket bool
websocketPath string </s> remove func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
</s> add func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | adapters/outbound/vmess.go |
c, err = ss.client.New(c, parseVmessAddr(metadata)) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", ss.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c = ss.client.New(c, parseVmessAddr(metadata))
<mask> return &VmessAdapter{conn: c}, err
<mask> }
<mask>
<mask> func NewVmess(option VmessOption) (*Vmess, error) {
<mask> security := strings.ToLower(option.Cipher)
</s> Feature: vmess add websocket support </s> remove UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
</s> add UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
Host: fmt.Sprintf("%s:%d", option.Server, option.Port),
NetWork: option.Network,
WebSocketPath: option.WSPath, </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil </s> remove func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
</s> add func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | adapters/outbound/vmess.go |
UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
Host: fmt.Sprintf("%s:%d", option.Server, option.Port),
NetWork: option.Network,
WebSocketPath: option.WSPath, | <mask>
<mask> func NewVmess(option VmessOption) (*Vmess, error) {
<mask> security := strings.ToLower(option.Cipher)
<mask> client, err := vmess.NewClient(vmess.Config{
<mask> UUID: option.UUID,
<mask> AlterID: uint16(option.AlterID),
<mask> Security: security,
<mask> TLS: option.TLS,
<mask> })
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> Feature: vmess add websocket support </s> remove c = ss.client.New(c, parseVmessAddr(metadata))
</s> add c, err = ss.client.New(c, parseVmessAddr(metadata)) </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil </s> remove user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
</s> add user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: config.Host,
websocket: config.NetWork == "ws",
websocketPath: config.WebSocketPath, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | adapters/outbound/vmess.go |
"net/url" | <mask> "fmt"
<mask> "math/rand"
<mask> "net"
<mask> "runtime"
<mask> "time"
<mask>
<mask> "github.com/gofrs/uuid"
</s> Feature: vmess add websocket support </s> remove user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
</s> add user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: config.Host,
websocket: config.NetWork == "ws",
websocketPath: config.WebSocketPath, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
"time" | <mask> "net"
<mask> "net/url"
<mask> "runtime"
<mask>
<mask> "github.com/gofrs/uuid"
<mask> "github.com/gorilla/websocket"
<mask> )
<mask>
<mask> // Version of vmess
</s> Feature: vmess add websocket support </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
</s> add user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
websocket bool
websocketPath string </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
"github.com/gorilla/websocket" | <mask>
<mask> "github.com/gofrs/uuid"
<mask> )
<mask>
<mask> // Version of vmess
<mask> const Version byte = 1
<mask>
<mask> // Request Options
</s> Feature: vmess add websocket support </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
</s> add user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
websocket bool
websocketPath string </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
websocket bool
websocketPath string | <mask> }
<mask>
<mask> // Client is vmess connection generator
<mask> type Client struct {
<mask> user []*ID
<mask> uuid *uuid.UUID
<mask> security Security
<mask> tls bool
<mask> }
<mask>
<mask> // Config of vmess
<mask> type Config struct {
<mask> UUID string
</s> Feature: vmess add websocket support </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string | <mask> }
<mask>
<mask> // Config of vmess
<mask> type Config struct {
<mask> UUID string
<mask> AlterID uint16
<mask> Security string
<mask> TLS bool
<mask> }
<mask>
<mask> // New return a Conn with net.Conn and DstAddr
<mask> func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
<mask> r := rand.Intn(len(c.user))
</s> Feature: vmess add websocket support </s> remove func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
</s> add func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
</s> add user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
websocket bool
websocketPath string </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) { | <mask> TLS bool
<mask> }
<mask>
<mask> // New return a Conn with net.Conn and DstAddr
<mask> func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
<mask> r := rand.Intn(len(c.user))
<mask> if c.tls {
<mask> conn = tls.Client(conn, tlsConfig)
<mask> }
<mask> return newConn(conn, c.user[r], dst, c.security)
</s> Feature: vmess add websocket support </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil </s> remove c = ss.client.New(c, parseVmessAddr(metadata))
</s> add c, err = ss.client.New(c, parseVmessAddr(metadata)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { | <mask>
<mask> // New return a Conn with net.Conn and DstAddr
<mask> func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
<mask> r := rand.Intn(len(c.user))
<mask> if c.tls {
<mask> conn = tls.Client(conn, tlsConfig)
<mask> }
<mask> return newConn(conn, c.user[r], dst, c.security)
<mask> }
<mask>
</s> Feature: vmess add websocket support </s> remove func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
</s> add func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil </s> remove c = ss.client.New(c, parseVmessAddr(metadata))
</s> add c, err = ss.client.New(c, parseVmessAddr(metadata)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
return newConn(conn, c.user[r], dst, c.security), nil | <mask> r := rand.Intn(len(c.user))
<mask> if c.tls {
<mask> conn = tls.Client(conn, tlsConfig)
<mask> }
<mask> return newConn(conn, c.user[r], dst, c.security)
<mask> }
<mask>
<mask> // NewClient return Client instance
<mask> func NewClient(config Config) (*Client, error) {
<mask> uid, err := uuid.FromString(config.UUID)
</s> Feature: vmess add websocket support </s> remove func (c *Client) New(conn net.Conn, dst *DstAddr) net.Conn {
</s> add func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove c = ss.client.New(c, parseVmessAddr(metadata))
</s> add c, err = ss.client.New(c, parseVmessAddr(metadata)) </s> remove UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
</s> add UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
Host: fmt.Sprintf("%s:%d", option.Server, option.Port),
NetWork: option.Network,
WebSocketPath: option.WSPath, </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
| <mask> }
<mask> default:
<mask> return nil, fmt.Errorf("Unknown security type: %s", config.Security)
<mask> }
<mask> return &Client{
<mask> user: newAlterIDs(newID(&uid), config.AlterID),
<mask> uuid: &uid,
<mask> security: security,
<mask> tls: config.TLS,
<mask> host: config.Host,
</s> Feature: vmess add websocket support </s> remove user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
</s> add user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: config.Host,
websocket: config.NetWork == "ws",
websocketPath: config.WebSocketPath, </s> remove UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
</s> add UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
Host: fmt.Sprintf("%s:%d", option.Server, option.Port),
NetWork: option.Network,
WebSocketPath: option.WSPath, </s> remove c = ss.client.New(c, parseVmessAddr(metadata))
</s> add c, err = ss.client.New(c, parseVmessAddr(metadata)) </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: config.Host,
websocket: config.NetWork == "ws",
websocketPath: config.WebSocketPath, | <mask> default:
<mask> return nil, fmt.Errorf("Unknown security type: %s", config.Security)
<mask> }
<mask> return &Client{
<mask> user: newAlterIDs(newID(&uid), config.AlterID),
<mask> uuid: &uid,
<mask> security: security,
<mask> tls: config.TLS,
<mask> }, nil
<mask> }
</s> Feature: vmess add websocket support </s> remove UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
</s> add UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
Host: fmt.Sprintf("%s:%d", option.Server, option.Port),
NetWork: option.Network,
WebSocketPath: option.WSPath, </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { </s> remove c = ss.client.New(c, parseVmessAddr(metadata))
</s> add c, err = ss.client.New(c, parseVmessAddr(metadata)) </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | component/vmess/vmess.go |
github.com/gorilla/websocket v1.4.0 | <mask> github.com/go-chi/cors v1.0.0
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v3.1.0+incompatible
<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.1.0
<mask> golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941
</s> Feature: vmess add websocket support </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
</s> add user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
websocket bool
websocketPath string </s> remove UUID string
AlterID uint16
Security string
TLS bool
</s> add UUID string
AlterID uint16
Security string
TLS bool
Host string
NetWork string
WebSocketPath string | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | go.mod |
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= | <mask> github.com/gofrs/uuid v3.1.0+incompatible h1:q2rtkjaKT4YEr6E1kamy0Ha4RtepWlQBedyHx0uzKwA=
<mask> github.com/gofrs/uuid v3.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
<mask> github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs=
<mask> github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
<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=
</s> Feature: vmess add websocket support </s> remove user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
</s> add user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: config.Host,
websocket: config.NetWork == "ws",
websocketPath: config.WebSocketPath, </s> remove return newConn(conn, c.user[r], dst, c.security)
</s> add return newConn(conn, c.user[r], dst, c.security), nil </s> remove if c.tls {
</s> add if c.websocket {
dialer := &websocket.Dialer{
NetDial: func(network, addr string) (net.Conn, error) {
return conn, nil
},
ReadBufferSize: 4 * 1024,
WriteBufferSize: 4 * 1024,
HandshakeTimeout: time.Second * 8,
}
scheme := "ws"
if c.tls {
scheme = "wss"
}
host, port, err := net.SplitHostPort(c.host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.host
}
uri := url.URL{
Scheme: scheme,
Host: host,
Path: c.websocketPath,
}
wsConn, resp, err := dialer.Dial(uri.String(), nil)
if err != nil {
var reason string
if resp != nil {
reason = resp.Status
}
println(uri.String(), err.Error())
return nil, fmt.Errorf("Dial %s error: %s", host, reason)
}
conn = newWebsocketConn(wsConn, conn.RemoteAddr())
} else if c.tls { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d2174149c11aecaf43000e843417ceeee76301d0 | go.sum |
"os/user" | <mask>
<mask> import (
<mask> "os"
<mask> P "path"
<mask> )
<mask>
<mask> const Name = "clash"
</s> Fix: reuse Current.HomeDir until go 1.13 release </s> remove homedir, _ = os.Getwd()
</s> add dir := os.Getenv("HOME")
if dir == "" {
dir, _ = os.Getwd()
}
homedir = dir
} else {
homedir = currentUser.HomeDir </s> remove homedir, err := os.UserHomeDir()
</s> add currentUser, err := user.Current()
var homedir string | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3b280a7e5d83be92ecb5e07b586dd974994373e | constant/path.go |
currentUser, err := user.Current()
var homedir string | <mask> homedir string
<mask> }
<mask>
<mask> func init() {
<mask> homedir, err := os.UserHomeDir()
<mask> if err != nil {
<mask> homedir, _ = os.Getwd()
<mask> }
<mask>
<mask> homedir = P.Join(homedir, ".config", Name)
</s> Fix: reuse Current.HomeDir until go 1.13 release </s> remove homedir, _ = os.Getwd()
</s> add dir := os.Getenv("HOME")
if dir == "" {
dir, _ = os.Getwd()
}
homedir = dir
} else {
homedir = currentUser.HomeDir | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3b280a7e5d83be92ecb5e07b586dd974994373e | constant/path.go |
dir := os.Getenv("HOME")
if dir == "" {
dir, _ = os.Getwd()
}
homedir = dir
} else {
homedir = currentUser.HomeDir | <mask>
<mask> func init() {
<mask> homedir, err := os.UserHomeDir()
<mask> if err != nil {
<mask> homedir, _ = os.Getwd()
<mask> }
<mask>
<mask> homedir = P.Join(homedir, ".config", Name)
<mask> Path = &path{homedir: homedir}
<mask> }
</s> Fix: reuse Current.HomeDir until go 1.13 release </s> remove homedir, err := os.UserHomeDir()
</s> add currentUser, err := user.Current()
var homedir string | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3b280a7e5d83be92ecb5e07b586dd974994373e | constant/path.go |
ipnet *net.IPNet | <mask> gateway uint32
<mask> offset uint32
<mask> mux sync.Mutex
<mask> host *trie.DomainTrie
<mask> cache *cache.LruCache
<mask> }
<mask>
<mask> // Lookup return a fake ip with host
</s> Fix: missing fake-ip record should return error </s> remove if resolver.IsFakeIP(metadata.DstIP) {
</s> add if resolver.IsExistFakeIP(metadata.DstIP) { </s> remove func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
</s> add func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | component/fakeip/pool.go |
// IPNet return raw ipnet
func (p *Pool) IPNet() *net.IPNet {
return p.ipnet
}
| <mask> }
<mask>
<mask> // PatchFrom clone cache from old pool
<mask> func (p *Pool) PatchFrom(o *Pool) {
<mask> o.cache.CloneTo(p.cache)
<mask> }
</s> Fix: missing fake-ip record should return error </s> remove func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
</s> add func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { </s> remove if resolver.IsFakeIP(metadata.DstIP) {
</s> add if resolver.IsExistFakeIP(metadata.DstIP) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | component/fakeip/pool.go |
ipnet: ipnet, | <mask> min: min,
<mask> max: max,
<mask> gateway: min - 1,
<mask> host: host,
<mask> cache: cache.NewLRUCache(cache.WithSize(size * 2)),
<mask> }, nil
<mask> }
</s> Fix: missing fake-ip record should return error </s> remove if resolver.IsFakeIP(metadata.DstIP) {
</s> add if resolver.IsExistFakeIP(metadata.DstIP) { </s> remove func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
</s> add func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | component/fakeip/pool.go |
IsExistFakeIP(net.IP) bool | <mask> FakeIPEnabled() bool
<mask> MappingEnabled() bool
<mask> IsFakeIP(net.IP) bool
<mask> FindHostByIP(net.IP) (string, bool)
<mask> }
<mask>
<mask> func FakeIPEnabled() bool {
<mask> if mapper := DefaultHostMapper; mapper != nil {
</s> Fix: missing fake-ip record should return error </s> remove func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
</s> add func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { </s> remove if resolver.IsFakeIP(metadata.DstIP) {
</s> add if resolver.IsExistFakeIP(metadata.DstIP) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | component/resolver/enhancer.go |
func IsExistFakeIP(ip net.IP) bool {
if mapper := DefaultHostMapper; mapper != nil {
return mapper.IsExistFakeIP(ip)
}
return false
}
| <mask>
<mask> return false
<mask> }
<mask>
<mask> func FindHostByIP(ip net.IP) (string, bool) {
<mask> if mapper := DefaultHostMapper; mapper != nil {
<mask> return mapper.FindHostByIP(ip)
<mask> }
</s> Fix: missing fake-ip record should return error </s> remove func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
</s> add func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { </s> remove if resolver.IsFakeIP(metadata.DstIP) {
</s> add if resolver.IsExistFakeIP(metadata.DstIP) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | component/resolver/enhancer.go |
func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { | <mask> func (h *ResolverEnhancer) MappingEnabled() bool {
<mask> return h.mode == FAKEIP || h.mode == MAPPING
<mask> }
<mask>
<mask> func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
<mask> if !h.FakeIPEnabled() {
<mask> return false
<mask> }
<mask>
<mask> if pool := h.fakePool; pool != nil {
</s> Fix: missing fake-ip record should return error </s> remove if resolver.IsFakeIP(metadata.DstIP) {
</s> add if resolver.IsExistFakeIP(metadata.DstIP) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | dns/enhancer.go |
func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
if !h.FakeIPEnabled() {
return false
}
if pool := h.fakePool; pool != nil {
return pool.IPNet().Contains(ip) && !pool.Gateway().Equal(ip)
}
return false
}
| <mask> }
<mask>
<mask> func (h *ResolverEnhancer) FindHostByIP(ip net.IP) (string, bool) {
<mask> if pool := h.fakePool; pool != nil {
<mask> if host, existed := pool.LookBack(ip); existed {
<mask> return host, true
</s> Fix: missing fake-ip record should return error </s> remove func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
</s> add func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { </s> remove if resolver.IsFakeIP(metadata.DstIP) {
</s> add if resolver.IsExistFakeIP(metadata.DstIP) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | dns/enhancer.go |
if resolver.IsExistFakeIP(metadata.DstIP) { | <mask> }
<mask>
<mask> // make a fAddr if requset ip is fakeip
<mask> var fAddr net.Addr
<mask> if resolver.IsFakeIP(metadata.DstIP) {
<mask> fAddr = metadata.UDPAddr()
<mask> }
<mask>
<mask> if err := preHandleMetadata(metadata); err != nil {
<mask> log.Debugln("[Metadata PreHandle] error: %s", err)
</s> Fix: missing fake-ip record should return error </s> remove func (h *ResolverEnhancer) IsFakeIP(ip net.IP) bool {
</s> add func (h *ResolverEnhancer) IsExistFakeIP(ip net.IP) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3bb4c65a894bbd641ba5c9f0ce87f4281c4aa60 | tunnel/tunnel.go |
if resp.StatusCode == http.StatusOK { | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> if resp.StatusCode == 200 {
<mask> return nil
<mask> }
<mask>
<mask> if resp.StatusCode == 407 {
<mask> return errors.New("HTTP need auth")
</s> Fix: throw error when CONNECT return 5xx </s> remove if resp.StatusCode == 407 {
</s> add if resp.StatusCode == http.StatusProxyAuthRequired { </s> remove if resp.StatusCode == 405 {
</s> add if resp.StatusCode == http.StatusMethodNotAllowed { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3c50cf89fb74f02e91211226009a2cd924a72ec | adapters/outbound/http.go |
if resp.StatusCode == http.StatusProxyAuthRequired { | <mask> if resp.StatusCode == 200 {
<mask> return nil
<mask> }
<mask>
<mask> if resp.StatusCode == 407 {
<mask> return errors.New("HTTP need auth")
<mask> }
<mask>
<mask> if resp.StatusCode == 405 {
<mask> return errors.New("CONNECT method not allowed by proxy")
</s> Fix: throw error when CONNECT return 5xx </s> remove if resp.StatusCode == 200 {
</s> add if resp.StatusCode == http.StatusOK { </s> remove if resp.StatusCode == 405 {
</s> add if resp.StatusCode == http.StatusMethodNotAllowed { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3c50cf89fb74f02e91211226009a2cd924a72ec | adapters/outbound/http.go |
if resp.StatusCode == http.StatusMethodNotAllowed { | <mask> if resp.StatusCode == 407 {
<mask> return errors.New("HTTP need auth")
<mask> }
<mask>
<mask> if resp.StatusCode == 405 {
<mask> return errors.New("CONNECT method not allowed by proxy")
<mask> }
<mask> return fmt.Errorf("can not connect remote err code: %d", resp.StatusCode)
<mask> }
<mask>
</s> Fix: throw error when CONNECT return 5xx </s> remove if resp.StatusCode == 200 {
</s> add if resp.StatusCode == http.StatusOK { </s> remove if resp.StatusCode == 407 {
</s> add if resp.StatusCode == http.StatusProxyAuthRequired { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3c50cf89fb74f02e91211226009a2cd924a72ec | adapters/outbound/http.go |
if resp.StatusCode >= http.StatusInternalServerError {
return errors.New(resp.Status)
} | <mask>
<mask> if resp.StatusCode == http.StatusMethodNotAllowed {
<mask> return errors.New("CONNECT method not allowed by proxy")
<mask> }
<mask> return fmt.Errorf("can not connect remote err code: %d", resp.StatusCode)
<mask> }
<mask>
<mask> func NewHttp(option HttpOption) *Http {
<mask> var tlsConfig *tls.Config
<mask> if option.TLS {
</s> Fix: throw error when CONNECT return 5xx </s> remove if resp.StatusCode == 200 {
</s> add if resp.StatusCode == http.StatusOK { </s> remove if resp.StatusCode == 407 {
</s> add if resp.StatusCode == http.StatusProxyAuthRequired { </s> remove if resp.StatusCode == 405 {
</s> add if resp.StatusCode == http.StatusMethodNotAllowed { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d3c50cf89fb74f02e91211226009a2cd924a72ec | adapters/outbound/http.go |
linux-arm64 \ | <mask> linux-amd64-v3 \
<mask> linux-armv5 \
<mask> linux-armv6 \
<mask> linux-armv7 \
<mask> linux-armv8 \
<mask> linux-mips-softfloat \
<mask> linux-mips-hardfloat \
<mask> linux-mipsle-softfloat \
<mask> linux-mipsle-hardfloat \
<mask> linux-mips64 \
</s> Chore: rename linux-armv8 to linux-arm64, windows-arm32v7 to windows-armv7 </s> remove windows-arm32v7:
</s> add windows-armv7: </s> remove linux-armv8:
</s> add linux-arm64: </s> remove windows-arm32v7
</s> add windows-armv7 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d4113944820150b4ec7c672cf1e2ebaa79f70f9b | Makefile |
windows-armv7 | <mask> windows-386 \
<mask> windows-amd64 \
<mask> windows-amd64-v3 \
<mask> windows-arm64 \
<mask> windows-arm32v7
<mask>
<mask> all: linux-amd64 darwin-amd64 windows-amd64 # Most used
<mask>
<mask> darwin-amd64:
<mask> GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> Chore: rename linux-armv8 to linux-arm64, windows-arm32v7 to windows-armv7 </s> remove linux-armv8:
</s> add linux-arm64: </s> remove windows-arm32v7:
</s> add windows-armv7: </s> remove linux-armv8 \
</s> add linux-arm64 \ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d4113944820150b4ec7c672cf1e2ebaa79f70f9b | Makefile |
linux-arm64: | <mask>
<mask> linux-armv7:
<mask> GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> linux-armv8:
<mask> GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> linux-mips-softfloat:
<mask> GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
</s> Chore: rename linux-armv8 to linux-arm64, windows-arm32v7 to windows-armv7 </s> remove windows-arm32v7:
</s> add windows-armv7: </s> remove windows-arm32v7
</s> add windows-armv7 </s> remove linux-armv8 \
</s> add linux-arm64 \ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d4113944820150b4ec7c672cf1e2ebaa79f70f9b | Makefile |
windows-armv7: | <mask>
<mask> windows-arm64:
<mask> GOARCH=arm64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
<mask>
<mask> windows-arm32v7:
<mask> GOARCH=arm GOOS=windows GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
<mask>
<mask> gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
<mask> zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
<mask>
</s> Chore: rename linux-armv8 to linux-arm64, windows-arm32v7 to windows-armv7 </s> remove linux-armv8:
</s> add linux-arm64: </s> remove windows-arm32v7
</s> add windows-armv7 </s> remove linux-armv8 \
</s> add linux-arm64 \ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d4113944820150b4ec7c672cf1e2ebaa79f70f9b | Makefile |
"github.com/Dreamacro/clash/component/resolver" | <mask> import (
<mask> "net/http"
<mask> "path/filepath"
<mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> "github.com/Dreamacro/clash/hub/executor"
<mask> "github.com/Dreamacro/clash/log"
<mask> P "github.com/Dreamacro/clash/proxy"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask>
</s> Chore: API support patch ipv6 config (#1217) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d48cfecf60b928425bfe2c179b3e83d7c747129e | hub/route/configs.go |
IPv6 *bool `json:"ipv6"` | <mask> Mode *tunnel.TunnelMode `json:"mode"`
<mask> LogLevel *log.LogLevel `json:"log-level"`
<mask> }
<mask>
<mask> func getConfigs(w http.ResponseWriter, r *http.Request) {
<mask> general := executor.GetGeneral()
<mask> render.JSON(w, r, general)
</s> Chore: API support patch ipv6 config (#1217) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d48cfecf60b928425bfe2c179b3e83d7c747129e | hub/route/configs.go |
if general.IPv6 != nil {
resolver.DisableIPv6 = !*general.IPv6
}
| <mask> if general.LogLevel != nil {
<mask> log.SetLevel(*general.LogLevel)
<mask> }
<mask>
<mask> render.NoContent(w, r)
<mask> }
<mask>
<mask> type updateConfigRequest struct {
<mask> Path string `json:"path"`
</s> Chore: API support patch ipv6 config (#1217) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d48cfecf60b928425bfe2c179b3e83d7c747129e | hub/route/configs.go |
SNI string `proxy:"sni,omitempty"` | <mask> UserName string `proxy:"username,omitempty"`
<mask> Password string `proxy:"password,omitempty"`
<mask> TLS bool `proxy:"tls,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
</s> Feature: http support custom sni </s> remove ServerName: option.Server,
</s> add ServerName: sni, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d65b51c62b27f0358ee437f6e9f6b39852155ea2 | adapters/outbound/http.go |
sni := option.Server
if option.SNI != "" {
sni = option.SNI
} | <mask> var tlsConfig *tls.Config
<mask> if option.TLS {
<mask> tlsConfig = &tls.Config{
<mask> InsecureSkipVerify: option.SkipCertVerify,
<mask> ClientSessionCache: getClientSessionCache(),
<mask> ServerName: sni,
<mask> }
</s> Feature: http support custom sni </s> remove ServerName: option.Server,
</s> add ServerName: sni, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d65b51c62b27f0358ee437f6e9f6b39852155ea2 | adapters/outbound/http.go |
ServerName: sni, | <mask> if option.TLS {
<mask> tlsConfig = &tls.Config{
<mask> InsecureSkipVerify: option.SkipCertVerify,
<mask> ClientSessionCache: getClientSessionCache(),
<mask> ServerName: option.Server,
<mask> }
<mask> }
<mask>
<mask> return &Http{
<mask> Base: &Base{
</s> Feature: http support custom sni | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d65b51c62b27f0358ee437f6e9f6b39852155ea2 | adapters/outbound/http.go |
<mask>
<mask> import (
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/provider"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> const (
<mask> defaultGetProxiesDuration = time.Second * 5
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add "github.com/Dreamacro/clash/constant/provider" </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/common.go | |
"github.com/Dreamacro/clash/constant/provider" | <mask> import (
<mask> "time"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> const (
<mask> defaultGetProxiesDuration = time.Second * 5
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add "github.com/Dreamacro/clash/constant/provider" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/common.go |
<mask> "context"
<mask> "encoding/json"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/adapter/provider"
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Fallback struct {
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/fallback.go | |
"github.com/Dreamacro/clash/constant/provider" | <mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Fallback struct {
<mask> *outbound.Base
<mask> disableUDP bool
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove Providers map[string]provider.ProxyProvider
</s> add Providers map[string]providerTypes.ProxyProvider | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/fallback.go |
<mask> "fmt"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/adapter/provider"
<mask> "github.com/Dreamacro/clash/common/murmur3"
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/publicsuffix"
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/loadbalance.go | |
"github.com/Dreamacro/clash/constant/provider" | <mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> type strategyFn = func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/loadbalance.go |
types "github.com/Dreamacro/clash/constant/provider" | <mask> "github.com/Dreamacro/clash/common/structure"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> var (
<mask> errFormat = errors.New("format error")
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/parser.go |
func ParseProxyGroup(config map[string]interface{}, proxyMap map[string]C.Proxy, providersMap map[string]types.ProxyProvider) (C.ProxyAdapter, error) { | <mask> Lazy bool `group:"lazy,omitempty"`
<mask> DisableUDP bool `group:"disable-udp,omitempty"`
<mask> }
<mask>
<mask> func ParseProxyGroup(config map[string]interface{}, proxyMap map[string]C.Proxy, providersMap map[string]provider.ProxyProvider) (C.ProxyAdapter, error) {
<mask> decoder := structure.NewDecoder(structure.Option{TagName: "group", WeaklyTypedInput: true})
<mask>
<mask> groupOption := &GroupCommonOption{
<mask> Lazy: true,
<mask> }
</s> Chore: move provider interface to constant </s> remove func ParseProxyProvider(name string, mapping map[string]interface{}) (ProxyProvider, error) {
</s> add func ParseProxyProvider(name string, mapping map[string]interface{}) (types.ProxyProvider, error) { </s> remove func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]provider.ProxyProvider, err error) {
</s> add func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]providerTypes.ProxyProvider, err error) { </s> remove providersMap = make(map[string]provider.ProxyProvider)
</s> add providersMap = make(map[string]providerTypes.ProxyProvider) </s> remove Providers map[string]provider.ProxyProvider
</s> add Providers map[string]providerTypes.ProxyProvider | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/parser.go |
providers := []types.ProxyProvider{} | <mask> }
<mask>
<mask> groupName := groupOption.Name
<mask>
<mask> providers := []provider.ProxyProvider{}
<mask>
<mask> if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
<mask> return nil, errMissProxy
<mask> }
<mask>
</s> Chore: move provider interface to constant </s> remove if p.VehicleType() == provider.Compatible {
</s> add if p.VehicleType() == types.Compatible { </s> remove if f.vehicle.Type() != File && !isLocal {
</s> add if f.vehicle.Type() != types.File && !isLocal { </s> remove if f.vehicle.Type() != File {
</s> add if f.vehicle.Type() != types.File { </s> remove func newFetcher(name string, interval time.Duration, vehicle Vehicle, parser parser, onUpdate func(interface{})) *fetcher {
</s> add func newFetcher(name string, interval time.Duration, vehicle types.Vehicle, parser parser, onUpdate func(interface{})) *fetcher { </s> remove func getProviders(mapping map[string]provider.ProxyProvider, list []string) ([]provider.ProxyProvider, error) {
var ps []provider.ProxyProvider
</s> add func getProviders(mapping map[string]types.ProxyProvider, list []string) ([]types.ProxyProvider, error) {
var ps []types.ProxyProvider | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/parser.go |
func getProviders(mapping map[string]types.ProxyProvider, list []string) ([]types.ProxyProvider, error) {
var ps []types.ProxyProvider | <mask> }
<mask> return ps, nil
<mask> }
<mask>
<mask> func getProviders(mapping map[string]provider.ProxyProvider, list []string) ([]provider.ProxyProvider, error) {
<mask> var ps []provider.ProxyProvider
<mask> for _, name := range list {
<mask> p, ok := mapping[name]
<mask> if !ok {
<mask> return nil, fmt.Errorf("'%s' not found", name)
<mask> }
</s> Chore: move provider interface to constant </s> remove if p.VehicleType() == provider.Compatible {
</s> add if p.VehicleType() == types.Compatible { </s> remove if pd.VehicleType() != provider.Compatible {
</s> add if pd.VehicleType() != providerTypes.Compatible { </s> remove if f.vehicle.Type() != File {
</s> add if f.vehicle.Type() != types.File { </s> remove if f.vehicle.Type() != File && !isLocal {
</s> add if f.vehicle.Type() != types.File && !isLocal { </s> remove func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]provider.ProxyProvider, err error) {
</s> add func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]providerTypes.ProxyProvider, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/parser.go |
if p.VehicleType() == types.Compatible { | <mask> if !ok {
<mask> return nil, fmt.Errorf("'%s' not found", name)
<mask> }
<mask>
<mask> if p.VehicleType() == provider.Compatible {
<mask> return nil, fmt.Errorf("proxy group %s can't contains in `use`", name)
<mask> }
<mask> ps = append(ps, p)
<mask> }
<mask> return ps, nil
</s> Chore: move provider interface to constant </s> remove func getProviders(mapping map[string]provider.ProxyProvider, list []string) ([]provider.ProxyProvider, error) {
var ps []provider.ProxyProvider
</s> add func getProviders(mapping map[string]types.ProxyProvider, list []string) ([]types.ProxyProvider, error) {
var ps []types.ProxyProvider </s> remove if f.vehicle.Type() != File {
</s> add if f.vehicle.Type() != types.File { </s> remove providers := []provider.ProxyProvider{}
</s> add providers := []types.ProxyProvider{} </s> remove if f.vehicle.Type() != File && !isLocal {
</s> add if f.vehicle.Type() != types.File && !isLocal { </s> remove if pd.VehicleType() != provider.Compatible {
</s> add if pd.VehicleType() != providerTypes.Compatible { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/parser.go |
<mask> "errors"
<mask> "fmt"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/adapter/provider"
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/relay.go | |
"github.com/Dreamacro/clash/constant/provider" | <mask> "github.com/Dreamacro/clash/component/dialer"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Relay struct {
<mask> *outbound.Base
<mask> single *singledo.Single
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/relay.go |
<mask> "encoding/json"
<mask> "errors"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/adapter/provider"
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Selector struct {
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/selector.go | |
"github.com/Dreamacro/clash/constant/provider" | <mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Selector struct {
<mask> *outbound.Base
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/selector.go |
<mask> "encoding/json"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/adapter/provider"
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type urlTestOption func(*URLTest)
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/urltest.go | |
"github.com/Dreamacro/clash/constant/provider" | <mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type urlTestOption func(*URLTest)
<mask>
<mask> func urlTestWithTolerance(tolerance uint16) urlTestOption {
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/outboundgroup/urltest.go |
types "github.com/Dreamacro/clash/constant/provider" | <mask> "path/filepath"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var (
<mask> fileMode os.FileMode = 0666
</s> Chore: move provider interface to constant </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/provider"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/provider/fetcher.go |
vehicle types.Vehicle | <mask> type parser = func([]byte) (interface{}, error)
<mask>
<mask> type fetcher struct {
<mask> name string
<mask> vehicle Vehicle
<mask> updatedAt *time.Time
<mask> ticker *time.Ticker
<mask> done chan struct{}
<mask> hash [16]byte
<mask> parser parser
</s> Chore: move provider interface to constant </s> remove func newFetcher(name string, interval time.Duration, vehicle Vehicle, parser parser, onUpdate func(interface{})) *fetcher {
</s> add func newFetcher(name string, interval time.Duration, vehicle types.Vehicle, parser parser, onUpdate func(interface{})) *fetcher { </s> remove // Vehicle Type
const (
File VehicleType = iota
HTTP
Compatible
)
// VehicleType defined
type VehicleType int
func (v VehicleType) String() string {
switch v {
case File:
return "File"
case HTTP:
return "HTTP"
case Compatible:
return "Compatible"
default:
return "Unknown"
}
}
type Vehicle interface {
Read() ([]byte, error)
Path() string
Type() VehicleType
}
</s> add </s> remove var vehicle Vehicle
</s> add var vehicle types.Vehicle </s> remove func (f *fetcher) VehicleType() VehicleType {
</s> add func (f *fetcher) VehicleType() types.VehicleType { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/provider/fetcher.go |
func (f *fetcher) VehicleType() types.VehicleType { | <mask> func (f *fetcher) Name() string {
<mask> return f.name
<mask> }
<mask>
<mask> func (f *fetcher) VehicleType() VehicleType {
<mask> return f.vehicle.Type()
<mask> }
<mask>
<mask> func (f *fetcher) Initial() (interface{}, error) {
<mask> var (
</s> Chore: move provider interface to constant </s> remove func (f *FileVehicle) Type() VehicleType {
return File
</s> add func (f *FileVehicle) Type() types.VehicleType {
return types.File </s> remove // Vehicle Type
const (
File VehicleType = iota
HTTP
Compatible
)
// VehicleType defined
type VehicleType int
func (v VehicleType) String() string {
switch v {
case File:
return "File"
case HTTP:
return "HTTP"
case Compatible:
return "Compatible"
default:
return "Unknown"
}
}
type Vehicle interface {
Read() ([]byte, error)
Path() string
Type() VehicleType
}
</s> add </s> remove func (cp *compatibleProvider) VehicleType() VehicleType {
return Compatible
</s> add func (cp *compatibleProvider) VehicleType() types.VehicleType {
return types.Compatible </s> remove func (h *HTTPVehicle) Type() VehicleType {
return HTTP
</s> add func (h *HTTPVehicle) Type() types.VehicleType {
return types.HTTP </s> remove func (cp *compatibleProvider) Type() ProviderType {
return Proxy
</s> add func (cp *compatibleProvider) Type() types.ProviderType {
return types.Proxy | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/provider/fetcher.go |
if f.vehicle.Type() != types.File && !isLocal { | <mask>
<mask> isLocal = false
<mask> }
<mask>
<mask> if f.vehicle.Type() != File && !isLocal {
<mask> if err := safeWrite(f.vehicle.Path(), buf); err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask>
</s> Chore: move provider interface to constant </s> remove if f.vehicle.Type() != File {
</s> add if f.vehicle.Type() != types.File { </s> remove if pd.VehicleType() != provider.Compatible {
</s> add if pd.VehicleType() != providerTypes.Compatible { </s> remove providers := []provider.ProxyProvider{}
</s> add providers := []types.ProxyProvider{} </s> remove func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]provider.ProxyProvider, err error) {
</s> add func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]providerTypes.ProxyProvider, err error) { </s> remove if p.VehicleType() == provider.Compatible {
</s> add if p.VehicleType() == types.Compatible { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/provider/fetcher.go |
if f.vehicle.Type() != types.File { | <mask> if err != nil {
<mask> return nil, false, err
<mask> }
<mask>
<mask> if f.vehicle.Type() != File {
<mask> if err := safeWrite(f.vehicle.Path(), buf); err != nil {
<mask> return nil, false, err
<mask> }
<mask> }
<mask>
</s> Chore: move provider interface to constant </s> remove if f.vehicle.Type() != File && !isLocal {
</s> add if f.vehicle.Type() != types.File && !isLocal { </s> remove if pd.VehicleType() != provider.Compatible {
</s> add if pd.VehicleType() != providerTypes.Compatible { </s> remove if p.VehicleType() == provider.Compatible {
</s> add if p.VehicleType() == types.Compatible { </s> remove func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]provider.ProxyProvider, err error) {
</s> add func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[string]providerTypes.ProxyProvider, err error) { </s> remove providers := []provider.ProxyProvider{}
</s> add providers := []types.ProxyProvider{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/provider/fetcher.go |
func newFetcher(name string, interval time.Duration, vehicle types.Vehicle, parser parser, onUpdate func(interface{})) *fetcher { | <mask>
<mask> return ioutil.WriteFile(path, buf, fileMode)
<mask> }
<mask>
<mask> func newFetcher(name string, interval time.Duration, vehicle Vehicle, parser parser, onUpdate func(interface{})) *fetcher {
<mask> var ticker *time.Ticker
<mask> if interval != 0 {
<mask> ticker = time.NewTicker(interval)
<mask> }
<mask>
</s> Chore: move provider interface to constant </s> remove func NewProxySetProvider(name string, interval time.Duration, vehicle Vehicle, hc *HealthCheck) *ProxySetProvider {
</s> add func NewProxySetProvider(name string, interval time.Duration, vehicle types.Vehicle, hc *HealthCheck) *ProxySetProvider { </s> remove vehicle Vehicle
</s> add vehicle types.Vehicle </s> remove if f.vehicle.Type() != File {
</s> add if f.vehicle.Type() != types.File { </s> remove if f.vehicle.Type() != File && !isLocal {
</s> add if f.vehicle.Type() != types.File && !isLocal { </s> remove providers := []provider.ProxyProvider{}
</s> add providers := []types.ProxyProvider{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/d755383e394e8754cebd6f7cb2dbf205b9a3c686 | adapter/provider/fetcher.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.