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 |
|---|---|---|---|---|
switch s.Net {
case "https": | <mask>
<mask> func transform(servers []NameServer, resolver *Resolver) []dnsClient {
<mask> ret := []dnsClient{}
<mask> for _, s := range servers {
<mask> if s.Net == "https" {
<mask> ret = append(ret, newDoHClient(s.Addr, resolver))
<mask> continue
<mask> }
<mask>
<mask> host, port, _ := net.SplitHostPort(s.Addr)
</s> Feature: add dhcp type dns client (#1509) </s> remove func dualStackDialContext(ctx context.Context, network, address string) (net.Conn, error) {
</s> add func dialContext(ctx context.Context, network string, destination net.IP, port string, options []Option) (net.Conn, error) {
opt := &config{}
if !opt.skipDefault {
for _, o := range DefaultOptions {
o(opt)
}
}
for _, o := range options {
o(opt)
}
dialer := &net.Dialer{}
if opt.interfaceName != "" {
if err := bindIfaceToDialer(opt.interfaceName, dialer, network, destination); err != nil {
return nil, err
}
}
return dialer.DialContext(ctx, network, net.JoinHostPort(destination.String(), port))
}
func dualStackDialContext(ctx context.Context, network, address string, options []Option) (net.Conn, error) { </s> remove func ListenPacket(network, address string) (net.PacketConn, error) {
cfg := &net.ListenConfig{}
if ListenPacketHook != nil {
var err error
address, err = ListenPacketHook(cfg, address)
</s> add func ListenPacket(ctx context.Context, network, address string, options ...Option) (net.PacketConn, error) {
cfg := &config{}
if !cfg.skipDefault {
for _, o := range DefaultOptions {
o(cfg)
}
}
for _, o := range options {
o(cfg)
}
lc := &net.ListenConfig{}
if cfg.interfaceName != "" {
addr, err := bindIfaceToListenConfig(cfg.interfaceName, lc, network, address) </s> remove func (r *Resolver) batchExchange(clients []dnsClient, m *D.Msg) (msg *D.Msg, err error) {
fast, ctx := picker.WithTimeout(context.Background(), resolver.DefaultDNSTimeout)
</s> add func (r *Resolver) batchExchange(ctx context.Context, clients []dnsClient, m *D.Msg) (msg *D.Msg, err error) {
fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
return errPlatformNotSupport
</s> add func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, network string, destination net.IP) error {
if !destination.IsGlobalUnicast() {
return nil
}
local := 0
if dialer.LocalAddr != nil {
_, port, err := net.SplitHostPort(dialer.LocalAddr.String())
if err == nil {
local, _ = strconv.Atoi(port)
}
}
addr, err := lookupLocalAddr(ifaceName, network, destination, local)
if err != nil {
return err
}
dialer.LocalAddr = addr
return nil
}
func bindIfaceToListenConfig(ifaceName string, _ *net.ListenConfig, network, address string) (string, error) {
_, port, err := net.SplitHostPort(address)
if err != nil {
port = "0"
}
local, _ := strconv.Atoi(port)
addr, err := lookupLocalAddr(ifaceName, network, nil, local)
if err != nil {
return "", err
}
return addr.String(), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/util.go |
case "dhcp":
ret = append(ret, newDHCPClient(s.Addr))
continue | <mask> case "https":
<mask> ret = append(ret, newDoHClient(s.Addr, resolver))
<mask> continue
<mask> }
<mask>
<mask> host, port, _ := net.SplitHostPort(s.Addr)
<mask> ret = append(ret, &client{
<mask> Client: &D.Client{
</s> Feature: add dhcp type dns client (#1509) </s> remove if s.Net == "https" {
</s> add switch s.Net {
case "https": </s> remove if DialHook != nil {
if result.error = DialHook(dialer, network, ip); result.error != nil {
return
}
}
result.Conn, result.error = dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), port))
</s> add result.Conn, result.error = dialContext(ctx, network, ip, port, options) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
return errPlatformNotSupport
</s> add func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, network string, destination net.IP) error {
if !destination.IsGlobalUnicast() {
return nil
}
local := 0
if dialer.LocalAddr != nil {
_, port, err := net.SplitHostPort(dialer.LocalAddr.String())
if err == nil {
local, _ = strconv.Atoi(port)
}
}
addr, err := lookupLocalAddr(ifaceName, network, destination, local)
if err != nil {
return err
}
dialer.LocalAddr = addr
return nil
}
func bindIfaceToListenConfig(ifaceName string, _ *net.ListenConfig, network, address string) (string, error) {
_, port, err := net.SplitHostPort(address)
if err != nil {
port = "0"
}
local, _ := strconv.Atoi(port)
addr, err := lookupLocalAddr(ifaceName, network, nil, local)
if err != nil {
return "", err
}
return addr.String(), nil </s> remove return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
return net.InterfaceByName(ifaceName)
})
</s> add func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, _ string, _ net.IP) error {
ifaceObj, err := iface.ResolveInterface(ifaceName) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/util.go |
github.com/go-chi/chi/v5 v5.0.4 | <mask> go 1.17
<mask>
<mask> require (
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7
<mask> github.com/go-chi/chi/v5 v5.0.3
<mask> github.com/go-chi/cors v1.2.0
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v4.0.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/miekg/dns v1.1.43
</s> Feature: add dhcp type dns client (#1509) </s> remove github.com/go-chi/chi/v5 v5.0.3 h1:khYQBdPivkYG1s1TAzDQG1f6eX4kD2TItYVZexL5rS4=
github.com/go-chi/chi/v5 v5.0.3/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.mod |
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac | <mask> github.com/go-chi/cors v1.2.0
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v4.0.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/oschwald/geoip2-golang v1.5.0
<mask> github.com/sirupsen/logrus v1.8.1
<mask> github.com/stretchr/testify v1.7.0
<mask> go.uber.org/atomic v1.9.0
</s> Feature: add dhcp type dns client (#1509) </s> remove github.com/go-chi/chi/v5 v5.0.3
</s> add github.com/go-chi/chi/v5 v5.0.4 </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove github.com/go-chi/chi/v5 v5.0.3 h1:khYQBdPivkYG1s1TAzDQG1f6eX4kD2TItYVZexL5rS4=
github.com/go-chi/chi/v5 v5.0.3/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.mod |
golang.org/x/net v0.0.0-20210825183410-e898025ed96a | <mask> github.com/sirupsen/logrus v1.8.1
<mask> github.com/stretchr/testify v1.7.0
<mask> go.uber.org/atomic v1.9.0
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
<mask> golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
<mask> golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> )
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.mod |
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | <mask> go.uber.org/atomic v1.9.0
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
<mask> golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
<mask> golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> )
<mask>
<mask> require (
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.mod |
github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect | <mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/oschwald/maxminddb-golang v1.8.0 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> golang.org/x/text v0.3.6 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
<mask> )
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e </s> remove
c.Client.Dialer = d
</s> add defer conn.Close() </s> remove import "net"
</s> add import (
"net"
"strconv"
"strings" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.mod |
github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= | <mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7/go.mod h1:8p5G4cAj5ZlXwUR+Ww63gfSikr8kvw8uw3TDwLAJpUc=
<mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
<mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/go-chi/chi/v5 v5.0.3 h1:khYQBdPivkYG1s1TAzDQG1f6eX4kD2TItYVZexL5rS4=
<mask> github.com/go-chi/chi/v5 v5.0.3/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
<mask> github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE=
<mask> github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
<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 v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
</s> Feature: add dhcp type dns client (#1509) </s> remove github.com/go-chi/chi/v5 v5.0.3
</s> add github.com/go-chi/chi/v5 v5.0.4 </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= | <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 v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
<mask> github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
<mask> github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
<mask> github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
</s> Feature: add dhcp type dns client (#1509) </s> remove github.com/go-chi/chi/v5 v5.0.3
</s> add github.com/go-chi/chi/v5 v5.0.4 </s> remove github.com/go-chi/chi/v5 v5.0.3 h1:khYQBdPivkYG1s1TAzDQG1f6eX4kD2TItYVZexL5rS4=
github.com/go-chi/chi/v5 v5.0.3/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove dialer, err := Dialer()
if err != nil {
result.error = err
return
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg= | <mask> github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
<mask> github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
<mask> github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
<mask> github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
<mask> github.com/oschwald/geoip2-golang v1.5.0 h1:igg2yQIrrcRccB1ytFXqBfOHCjXWIoMv85lVJ1ONZzw=
<mask> github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s=
<mask> github.com/oschwald/maxminddb-golang v1.8.0 h1:Uh/DSnGoxsyp/KYbY1AuP0tYEwfs0sCph9p/UMXK/Hk=
<mask> github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis=
</s> Feature: add dhcp type dns client (#1509) </s> remove github.com/go-chi/chi/v5 v5.0.3
</s> add github.com/go-chi/chi/v5 v5.0.4 </s> remove dialer, err := Dialer()
if err != nil {
result.error = err
return
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= | <mask> github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
<mask> github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
<mask> github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove func Dialer() (*net.Dialer, error) {
dialer := &net.Dialer{}
if DialerHook != nil {
if err := DialerHook(dialer); err != nil {
return nil, err
}
}
return dialer, nil
}
func Dial(network, address string) (net.Conn, error) {
return DialContext(context.Background(), network, address)
}
func DialContext(ctx context.Context, network, address string) (net.Conn, error) {
</s> add func DialContext(ctx context.Context, network, address string, options ...Option) (net.Conn, error) { </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = bindControl(ifaceName)
</s> add func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, _ string, _ net.IP) error {
dialer.Control = bindControl(ifaceName, dialer.Control) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
github.com/u-root/uio v0.0.0-20210528114334-82958018845c h1:BFvcl34IGnw8yvJi8hlqLFo9EshRInwWBs2M5fGWzQA=
github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= | <mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
<mask> github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
<mask> go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | <mask> go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
<mask> go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
<mask> golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | <mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
<mask> golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | <mask> golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
<mask> golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
<mask> golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
<mask> golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw=
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | <mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
<mask> golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | <mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<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/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
</s> Feature: add dhcp type dns client (#1509) </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c=
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> add golang.org/x/net v0.0.0-20210825183410-e898025ed96a </s> remove golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
</s> add golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | go.sum |
"github.com/Dreamacro/clash/component/iface" | <mask> "github.com/Dreamacro/clash/adapter"
<mask> "github.com/Dreamacro/clash/adapter/outboundgroup"
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/profile"
<mask> "github.com/Dreamacro/clash/component/profile/cachefile"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/component/trie"
<mask> "github.com/Dreamacro/clash/config"
</s> Feature: add dhcp type dns client (#1509) </s> remove func Dialer() (*net.Dialer, error) {
dialer := &net.Dialer{}
if DialerHook != nil {
if err := DialerHook(dialer); err != nil {
return nil, err
}
}
return dialer, nil
}
func Dial(network, address string) (net.Conn, error) {
return DialContext(context.Background(), network, address)
}
func DialContext(ctx context.Context, network, address string) (net.Conn, error) {
</s> add func DialContext(ctx context.Context, network, address string, options ...Option) (net.Conn, error) { </s> remove if DialHook != nil {
if err := DialHook(dialer, network, ip); err != nil {
return nil, err
}
}
return dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), port))
</s> add return dialContext(ctx, network, ip, port, options) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
lc.Control = bindControl(ifaceName)
</s> add func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
lc.Control = bindControl(ifaceName, lc.Control) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | hub/executor/executor.go |
dialer.DefaultOptions = []dialer.Option{dialer.WithInterface(general.Interface)} | <mask> tunnel.SetMode(general.Mode)
<mask> resolver.DisableIPv6 = !general.IPv6
<mask>
<mask> if general.Interface != "" {
<mask> dialer.DialHook = dialer.DialerWithInterface(general.Interface)
<mask> dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface)
<mask> } else {
<mask> dialer.DialHook = nil
<mask> dialer.ListenPacketHook = nil
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove dialer.DialHook = nil
dialer.ListenPacketHook = nil
</s> add dialer.DefaultOptions = nil </s> remove d, err := dialer.Dialer()
if err != nil {
return nil, err
</s> add network := "udp"
if strings.HasPrefix(c.Client.Net, "tcp") {
network = "tcp" </s> remove dialer, err := Dialer()
if err != nil {
result.error = err
return
}
</s> add </s> remove if ip != nil && ip.IsGlobalUnicast() && dialer.DialHook != nil {
network := "udp"
if strings.HasPrefix(c.Client.Net, "tcp") {
network = "tcp"
}
if err := dialer.DialHook(d, network, ip); err != nil {
return nil, err
}
</s> add conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
if err != nil {
return nil, err </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
return errPlatformNotSupport
</s> add "github.com/Dreamacro/clash/component/iface"
)
func lookupLocalAddr(ifaceName string, network string, destination net.IP, port int) (net.Addr, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName)
if err != nil {
return nil, err
}
var addr *net.IPNet
switch network {
case "udp4", "tcp4":
addr, err = ifaceObj.PickIPv4Addr(destination)
case "tcp6", "udp6":
addr, err = ifaceObj.PickIPv6Addr(destination)
default:
if destination != nil {
if destination.To4() != nil {
addr, err = ifaceObj.PickIPv4Addr(destination)
} else {
addr, err = ifaceObj.PickIPv6Addr(destination)
}
} else {
addr, err = ifaceObj.PickIPv4Addr(destination)
}
}
if err != nil {
return nil, err
}
if strings.HasPrefix(network, "tcp") {
return &net.TCPAddr{
IP: addr.IP,
Port: port,
}, nil
} else if strings.HasPrefix(network, "udp") {
return &net.UDPAddr{
IP: addr.IP,
Port: port,
}, nil
}
return nil, iface.ErrAddrNotFound | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | hub/executor/executor.go |
dialer.DefaultOptions = nil | <mask> if general.Interface != "" {
<mask> dialer.DialHook = dialer.DialerWithInterface(general.Interface)
<mask> dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface)
<mask> } else {
<mask> dialer.DialHook = nil
<mask> dialer.ListenPacketHook = nil
<mask> }
<mask>
<mask> if !force {
<mask> return
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove dialer.DialHook = dialer.DialerWithInterface(general.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface)
</s> add dialer.DefaultOptions = []dialer.Option{dialer.WithInterface(general.Interface)} </s> remove d, err := dialer.Dialer()
if err != nil {
return nil, err
</s> add network := "udp"
if strings.HasPrefix(c.Client.Net, "tcp") {
network = "tcp" </s> remove if ip != nil && ip.IsGlobalUnicast() && dialer.DialHook != nil {
network := "udp"
if strings.HasPrefix(c.Client.Net, "tcp") {
network = "tcp"
}
if err := dialer.DialHook(d, network, ip); err != nil {
return nil, err
}
</s> add conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
if err != nil {
return nil, err </s> remove dialer, err := Dialer()
if err != nil {
result.error = err
return
}
</s> add </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
return errPlatformNotSupport
</s> add "github.com/Dreamacro/clash/component/iface"
)
func lookupLocalAddr(ifaceName string, network string, destination net.IP, port int) (net.Addr, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName)
if err != nil {
return nil, err
}
var addr *net.IPNet
switch network {
case "udp4", "tcp4":
addr, err = ifaceObj.PickIPv4Addr(destination)
case "tcp6", "udp6":
addr, err = ifaceObj.PickIPv6Addr(destination)
default:
if destination != nil {
if destination.To4() != nil {
addr, err = ifaceObj.PickIPv4Addr(destination)
} else {
addr, err = ifaceObj.PickIPv6Addr(destination)
}
} else {
addr, err = ifaceObj.PickIPv4Addr(destination)
}
}
if err != nil {
return nil, err
}
if strings.HasPrefix(network, "tcp") {
return &net.TCPAddr{
IP: addr.IP,
Port: port,
}, nil
} else if strings.HasPrefix(network, "udp") {
return &net.UDPAddr{
IP: addr.IP,
Port: port,
}, nil
}
return nil, iface.ErrAddrNotFound | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | hub/executor/executor.go |
iface.FlushCache()
| <mask> }
<mask>
<mask> if !force {
<mask> return
<mask> }
<mask>
<mask> allowLan := general.AllowLan
</s> Feature: add dhcp type dns client (#1509) </s> remove dialer.DialHook = nil
dialer.ListenPacketHook = nil
</s> add dialer.DefaultOptions = nil </s> remove return r.ipExchange(m)
</s> add return r.ipExchange(ctx, m) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
return errPlatformNotSupport
</s> add func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, network string, destination net.IP) error {
if !destination.IsGlobalUnicast() {
return nil
}
local := 0
if dialer.LocalAddr != nil {
_, port, err := net.SplitHostPort(dialer.LocalAddr.String())
if err == nil {
local, _ = strconv.Atoi(port)
}
}
addr, err := lookupLocalAddr(ifaceName, network, destination, local)
if err != nil {
return err
}
dialer.LocalAddr = addr
return nil
}
func bindIfaceToListenConfig(ifaceName string, _ *net.ListenConfig, network, address string) (string, error) {
_, port, err := net.SplitHostPort(address)
if err != nil {
port = "0"
}
local, _ := strconv.Atoi(port)
addr, err := lookupLocalAddr(ifaceName, network, nil, local)
if err != nil {
return "", err
}
return addr.String(), nil </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | hub/executor/executor.go |
Domain []string `yaml:"domain"` | <mask> GeoIP bool `yaml:"geoip"`
<mask> IPCIDR []*net.IPNet `yaml:"ipcidr"`
<mask> }
<mask>
<mask> // Experimental config
<mask> type Experimental struct{}
</s> Feature: support domain in fallback filter (#964) </s> remove type fallbackFilter interface {
</s> add type fallbackIPFilter interface { </s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache </s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | config/config.go |
Domain []string `yaml:"domain"` | <mask> type RawFallbackFilter struct {
<mask> GeoIP bool `yaml:"geoip"`
<mask> IPCIDR []string `yaml:"ipcidr"`
<mask> }
<mask>
<mask> type RawConfig struct {
<mask> Port int `yaml:"port"`
<mask> SocksPort int `yaml:"socks-port"`
</s> Feature: support domain in fallback filter (#964) </s> remove type fallbackFilter interface {
</s> add type fallbackIPFilter interface { </s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | config/config.go |
dnsCfg.FallbackFilter.Domain = cfg.FallbackFilter.Domain | <mask> dnsCfg.FallbackFilter.IPCIDR = fallbackip
<mask> }
<mask>
<mask> if cfg.UseHosts {
<mask> dnsCfg.Hosts = hosts
<mask> }
<mask>
<mask> return dnsCfg, nil
</s> Feature: support domain in fallback filter (#964) </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result </s> remove if r.fallback == nil {
</s> add if r.fallback == nil { // directly return if no fallback servers are available </s> remove fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
</s> add fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})
}
r.fallbackIPFilters = fallbackIPFilters
if len(config.FallbackFilter.Domain) != 0 {
fallbackDomainFilters := []fallbackDomainFilter{NewDomainFilter(config.FallbackFilter.Domain)}
r.fallbackDomainFilters = fallbackDomainFilters </s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | config/config.go |
"github.com/Dreamacro/clash/component/trie" | <mask>
<mask> "github.com/Dreamacro/clash/component/mmdb"
<mask> )
<mask>
<mask> type fallbackIPFilter interface {
<mask> Match(net.IP) bool
</s> Feature: support domain in fallback filter (#964) </s> remove type fallbackFilter interface {
</s> add type fallbackIPFilter interface { </s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/filters.go |
type fallbackIPFilter interface { | <mask>
<mask> "github.com/Dreamacro/clash/component/mmdb"
<mask> )
<mask>
<mask> type fallbackFilter interface {
<mask> Match(net.IP) bool
<mask> }
<mask>
<mask> type geoipFilter struct{}
<mask>
</s> Feature: support domain in fallback filter (#964) </s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/filters.go |
"strings" | <mask> "fmt"
<mask> "math/rand"
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/common/picker"
</s> Feature: support domain in fallback filter (#964) </s> remove return r.fallbackExchange(m)
</s> add return r.ipExchange(m) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache | <mask> Error error
<mask> }
<mask>
<mask> type Resolver struct {
<mask> ipv6 bool
<mask> hosts *trie.DomainTrie
<mask> main []dnsClient
<mask> fallback []dnsClient
<mask> fallbackFilters []fallbackFilter
<mask> group singleflight.Group
<mask> lruCache *cache.LruCache
<mask> }
<mask>
<mask> // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
<mask> func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
<mask> ch := make(chan net.IP, 1)
</s> Feature: support domain in fallback filter (#964) </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { </s> remove if r.fallback == nil {
</s> add if r.fallback == nil { // directly return if no fallback servers are available </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { | <mask> func (r *Resolver) ResolveIPv6(host string) (ip net.IP, err error) {
<mask> return r.resolveIP(host, D.TypeAAAA)
<mask> }
<mask>
<mask> func (r *Resolver) shouldFallback(ip net.IP) bool {
<mask> for _, filter := range r.fallbackFilters {
<mask> if filter.Match(ip) {
<mask> return true
<mask> }
<mask> }
<mask> return false
</s> Feature: support domain in fallback filter (#964) </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache </s> remove if r.fallback == nil {
</s> add if r.fallback == nil { // directly return if no fallback servers are available </s> remove r.fallbackFilters = fallbackFilters
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
return r.ipExchange(m) | <mask> }()
<mask>
<mask> isIPReq := isIPRequest(q)
<mask> if isIPReq {
<mask> return r.fallbackExchange(m)
<mask> }
<mask>
<mask> return r.batchExchange(r.main, m)
<mask> })
<mask>
</s> Feature: support domain in fallback filter (#964) </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove if r.fallback == nil {
</s> add if r.fallback == nil { // directly return if no fallback servers are available </s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
| <mask> msg = elm.(*D.Msg)
<mask> return
<mask> }
<mask>
<mask> func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
<mask> msgCh := r.asyncExchange(r.main, m)
<mask> if r.fallback == nil {
<mask> res := <-msgCh
<mask> msg, err = res.Msg, res.Error
<mask> return
</s> Feature: support domain in fallback filter (#964) </s> remove if r.fallback == nil {
</s> add if r.fallback == nil { // directly return if no fallback servers are available </s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { </s> remove return r.fallbackExchange(m)
</s> add return r.ipExchange(m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
if r.fallback == nil { // directly return if no fallback servers are available | <mask> }
<mask>
<mask> func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
<mask> msgCh := r.asyncExchange(r.main, m)
<mask> if r.fallback == nil {
<mask> res := <-msgCh
<mask> msg, err = res.Msg, res.Error
<mask> return
<mask> }
<mask> fallbackMsg := r.asyncExchange(r.fallback, m)
</s> Feature: support domain in fallback filter (#964) </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { </s> remove return r.fallbackExchange(m)
</s> add return r.ipExchange(m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result | <mask> fallbackMsg := r.asyncExchange(r.fallback, m)
<mask> res := <-msgCh
<mask> if res.Error == nil {
<mask> if ips := r.msgToIP(res.Msg); len(ips) != 0 {
<mask> if !r.shouldFallback(ips[0]) {
<mask> msg = res.Msg
<mask> err = res.Error
<mask> return msg, err
<mask> }
<mask> }
<mask> }
</s> Feature: support domain in fallback filter (#964) </s> remove if r.fallback == nil {
</s> add if r.fallback == nil { // directly return if no fallback servers are available </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove fallbackFilters := []fallbackFilter{}
</s> add fallbackIPFilters := []fallbackIPFilter{} </s> remove fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
</s> add fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})
}
r.fallbackIPFilters = fallbackIPFilters
if len(config.FallbackFilter.Domain) != 0 {
fallbackDomainFilters := []fallbackDomainFilter{NewDomainFilter(config.FallbackFilter.Domain)}
r.fallbackDomainFilters = fallbackDomainFilters | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
func (r *Resolver) msgToDomain(msg *D.Msg) string {
if len(msg.Question) > 0 {
return strings.TrimRight(msg.Question[0].Name, ".")
}
return ""
}
| <mask>
<mask> return ips
<mask> }
<mask>
<mask> func (r *Resolver) asyncExchange(client []dnsClient, msg *D.Msg) <-chan *result {
<mask> ch := make(chan *result, 1)
<mask> go func() {
<mask> res, err := r.batchExchange(client, msg)
</s> Feature: support domain in fallback filter (#964) </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { </s> remove if r.fallback == nil {
</s> add if r.fallback == nil { // directly return if no fallback servers are available </s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
Domain []string | <mask> GeoIP bool
<mask> IPCIDR []*net.IPNet
<mask> }
<mask>
<mask> type Config struct {
<mask> Main, Fallback []NameServer
</s> Feature: support domain in fallback filter (#964) </s> remove type fallbackFilter interface {
</s> add type fallbackIPFilter interface { </s> remove ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackFilters []fallbackFilter
group singleflight.Group
lruCache *cache.LruCache
</s> add ipv6 bool
hosts *trie.DomainTrie
main []dnsClient
fallback []dnsClient
fallbackDomainFilters []fallbackDomainFilter
fallbackIPFilters []fallbackIPFilter
group singleflight.Group
lruCache *cache.LruCache | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
fallbackIPFilters := []fallbackIPFilter{} | <mask> if len(config.Fallback) != 0 {
<mask> r.fallback = transform(config.Fallback, defaultResolver)
<mask> }
<mask>
<mask> fallbackFilters := []fallbackFilter{}
<mask> if config.FallbackFilter.GeoIP {
<mask> fallbackFilters = append(fallbackFilters, &geoipFilter{})
<mask> }
<mask> for _, ipnet := range config.FallbackFilter.IPCIDR {
<mask> fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
</s> Feature: support domain in fallback filter (#964) </s> remove fallbackFilters = append(fallbackFilters, &geoipFilter{})
</s> add fallbackIPFilters = append(fallbackIPFilters, &geoipFilter{}) </s> remove fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
</s> add fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})
}
r.fallbackIPFilters = fallbackIPFilters
if len(config.FallbackFilter.Domain) != 0 {
fallbackDomainFilters := []fallbackDomainFilter{NewDomainFilter(config.FallbackFilter.Domain)}
r.fallbackDomainFilters = fallbackDomainFilters </s> remove r.fallbackFilters = fallbackFilters
</s> add </s> remove if !r.shouldFallback(ips[0]) {
msg = res.Msg
</s> add if !r.shouldIPFallback(ips[0]) {
msg = res.Msg // no need to wait for fallback result </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
fallbackIPFilters = append(fallbackIPFilters, &geoipFilter{}) | <mask> }
<mask>
<mask> fallbackFilters := []fallbackFilter{}
<mask> if config.FallbackFilter.GeoIP {
<mask> fallbackFilters = append(fallbackFilters, &geoipFilter{})
<mask> }
<mask> for _, ipnet := range config.FallbackFilter.IPCIDR {
<mask> fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
<mask> }
<mask> r.fallbackFilters = fallbackFilters
</s> Feature: support domain in fallback filter (#964) </s> remove fallbackFilters := []fallbackFilter{}
</s> add fallbackIPFilters := []fallbackIPFilter{} </s> remove fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
</s> add fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})
}
r.fallbackIPFilters = fallbackIPFilters
if len(config.FallbackFilter.Domain) != 0 {
fallbackDomainFilters := []fallbackDomainFilter{NewDomainFilter(config.FallbackFilter.Domain)}
r.fallbackDomainFilters = fallbackDomainFilters </s> remove r.fallbackFilters = fallbackFilters
</s> add </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})
}
r.fallbackIPFilters = fallbackIPFilters
if len(config.FallbackFilter.Domain) != 0 {
fallbackDomainFilters := []fallbackDomainFilter{NewDomainFilter(config.FallbackFilter.Domain)}
r.fallbackDomainFilters = fallbackDomainFilters | <mask> if config.FallbackFilter.GeoIP {
<mask> fallbackFilters = append(fallbackFilters, &geoipFilter{})
<mask> }
<mask> for _, ipnet := range config.FallbackFilter.IPCIDR {
<mask> fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
<mask> }
<mask> r.fallbackFilters = fallbackFilters
<mask>
<mask> return r
<mask> }
</s> Feature: support domain in fallback filter (#964) </s> remove fallbackFilters = append(fallbackFilters, &geoipFilter{})
</s> add fallbackIPFilters = append(fallbackIPFilters, &geoipFilter{}) </s> remove r.fallbackFilters = fallbackFilters
</s> add </s> remove fallbackFilters := []fallbackFilter{}
</s> add fallbackIPFilters := []fallbackIPFilter{} </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go |
<mask> }
<mask> for _, ipnet := range config.FallbackFilter.IPCIDR {
<mask> fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
<mask> }
<mask> r.fallbackFilters = fallbackFilters
<mask>
<mask> return r
<mask> }
</s> Feature: support domain in fallback filter (#964) </s> remove fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
</s> add fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})
}
r.fallbackIPFilters = fallbackIPFilters
if len(config.FallbackFilter.Domain) != 0 {
fallbackDomainFilters := []fallbackDomainFilter{NewDomainFilter(config.FallbackFilter.Domain)}
r.fallbackDomainFilters = fallbackDomainFilters </s> remove fallbackFilters = append(fallbackFilters, &geoipFilter{})
</s> add fallbackIPFilters = append(fallbackIPFilters, &geoipFilter{}) </s> remove fallbackFilters := []fallbackFilter{}
</s> add fallbackIPFilters := []fallbackIPFilter{} </s> remove func (r *Resolver) shouldFallback(ip net.IP) bool {
for _, filter := range r.fallbackFilters {
</s> add func (r *Resolver) shouldIPFallback(ip net.IP) bool {
for _, filter := range r.fallbackIPFilters { </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | dns/resolver.go | |
Domain: c.FallbackFilter.Domain, | <mask> Hosts: c.Hosts,
<mask> FallbackFilter: dns.FallbackFilter{
<mask> GeoIP: c.FallbackFilter.GeoIP,
<mask> IPCIDR: c.FallbackFilter.IPCIDR,
<mask> },
<mask> Default: c.DefaultNameserver,
<mask> }
<mask>
<mask> r := dns.NewResolver(cfg)
</s> Feature: support domain in fallback filter (#964) </s> remove r.fallbackFilters = fallbackFilters
</s> add </s> remove fallbackFilters = append(fallbackFilters, &ipnetFilter{ipnet: ipnet})
</s> add fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})
}
r.fallbackIPFilters = fallbackIPFilters
if len(config.FallbackFilter.Domain) != 0 {
fallbackDomainFilters := []fallbackDomainFilter{NewDomainFilter(config.FallbackFilter.Domain)}
r.fallbackDomainFilters = fallbackDomainFilters </s> remove fallbackFilters = append(fallbackFilters, &geoipFilter{})
</s> add fallbackIPFilters = append(fallbackIPFilters, &geoipFilter{}) </s> remove func (r *Resolver) fallbackExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) shouldOnlyQueryFallback(m *D.Msg) bool {
if r.fallback == nil || len(r.fallbackDomainFilters) == 0 {
return false
}
domain := r.msgToDomain(m)
if domain == "" {
return false
}
for _, df := range r.fallbackDomainFilters {
if df.Match(domain) {
return true
}
}
return false
}
func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
onlyFallback := r.shouldOnlyQueryFallback(m)
if onlyFallback {
res := <-r.asyncExchange(r.fallback, m)
return res.Msg, res.Error
}
</s> remove fallbackFilters := []fallbackFilter{}
</s> add fallbackIPFilters := []fallbackIPFilter{} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6444bb449d034fb2e5daeaee193f9baf5787b02 | hub/executor/executor.go |
"path/filepath" | <mask> "net"
<mask> "net/url"
<mask> "os"
<mask> "strings"
<mask>
<mask> adapters "github.com/Dreamacro/clash/adapters/outbound"
<mask> "github.com/Dreamacro/clash/common/structure"
</s> Feature: add custom ui support in API | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | config/config.go |
ExternalController string
ExternalUI string
Secret string | <mask> RedirPort int `json:"redir-port"`
<mask> AllowLan bool `json:"allow-lan"`
<mask> Mode T.Mode `json:"mode"`
<mask> LogLevel log.LogLevel `json:"log-level"`
<mask> ExternalController string `json:"external-controller,omitempty"`
<mask> Secret string `json:"secret,omitempty"`
<mask> }
<mask>
<mask> // DNS config
<mask> type DNS struct {
<mask> Enable bool `yaml:"enable"`
</s> Feature: add custom ui support in API | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | config/config.go |
ExternalUI string `yaml:"external-ui"` | <mask> LogLevel log.LogLevel `yaml:"log-level"`
<mask> ExternalController string `yaml:"external-controller"`
<mask> Secret string `yaml:"secret"`
<mask>
<mask> DNS rawDNS `yaml:"dns"`
<mask> Proxy []map[string]interface{} `yaml:"Proxy"`
</s> Feature: add custom ui support in API </s> remove ExternalController string `json:"external-controller,omitempty"`
Secret string `json:"secret,omitempty"`
</s> add ExternalController string
ExternalUI string
Secret string | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | config/config.go |
externalUI := cfg.ExternalUI | <mask> allowLan := cfg.AllowLan
<mask> externalController := cfg.ExternalController
<mask> secret := cfg.Secret
<mask> mode := cfg.Mode
<mask> logLevel := cfg.LogLevel
<mask>
<mask> if !filepath.IsAbs(externalUI) {
</s> Feature: add custom ui support in API | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | config/config.go |
if !filepath.IsAbs(externalUI) {
externalUI = filepath.Join(C.Path.HomeDir(), externalUI)
}
if _, err := os.Stat(externalUI); os.IsNotExist(err) {
return nil, fmt.Errorf("external-ui: %s not exist", externalUI)
}
| <mask> mode := cfg.Mode
<mask> logLevel := cfg.LogLevel
<mask>
<mask> general := &General{
<mask> Port: port,
<mask> SocksPort: socksPort,
<mask> RedirPort: redirPort,
<mask> AllowLan: allowLan,
<mask> Mode: mode,
</s> Feature: add custom ui support in API | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | config/config.go |
ExternalUI: externalUI, | <mask> Mode: mode,
<mask> LogLevel: logLevel,
<mask> ExternalController: externalController,
<mask> Secret: secret,
<mask> }
<mask> return general, nil
<mask> }
<mask>
</s> Feature: add custom ui support in API | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | config/config.go |
if cfg.General.ExternalUI != "" {
route.SetUIPath(cfg.General.ExternalUI)
}
| <mask> }
<mask>
<mask> if cfg.General.ExternalController != "" {
<mask> go route.Start(cfg.General.ExternalController, cfg.General.Secret)
<mask> }
<mask>
<mask> executor.ApplyConfig(cfg, true)
<mask> return nil
</s> Feature: add custom ui support in API | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | hub/hub.go |
uiPath = "" | <mask> var (
<mask> serverSecret = ""
<mask> serverAddr = ""
<mask> )
<mask>
<mask> type Traffic struct {
<mask> Up int64 `json:"up"`
<mask> Down int64 `json:"down"`
<mask> }
</s> Feature: add custom ui support in API </s> remove ExternalController string `json:"external-controller,omitempty"`
Secret string `json:"secret,omitempty"`
</s> add ExternalController string
ExternalUI string
Secret string | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | hub/route/server.go |
func SetUIPath(path string) {
uiPath = path
}
| <mask> }
<mask>
<mask> func Start(addr string, secret string) {
<mask> if serverAddr != "" {
<mask> return
<mask> }
</s> Feature: add custom ui support in API | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | hub/route/server.go |
if uiPath != "" {
fs := http.StripPrefix("/ui", http.FileServer(http.Dir(uiPath)))
r.Get("/ui", http.RedirectHandler("/ui/", 301).ServeHTTP)
r.Get("/ui/*", func(w http.ResponseWriter, r *http.Request) {
fs.ServeHTTP(w, r)
})
}
| <mask> r.Mount("/rules", ruleRouter())
<mask>
<mask> log.Infoln("RESTful API listening at: %s", addr)
<mask> err := http.ListenAndServe(addr, r)
<mask> if err != nil {
<mask> log.Errorln("External controller error: %s", err.Error())
</s> Feature: add custom ui support in API | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a6bbc67afb928d42fcf641ac436e997083fb5b37 | hub/route/server.go |
Headers http.Header | <mask> pass string
<mask> tlsConfig *tls.Config
<mask> }
<mask>
<mask> type HttpOption struct {
<mask> BasicOption
<mask> Name string `proxy:"name"`
</s> Feature: allow http outbound to set custom headers (#2647) </s> remove Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
</s> add Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
Headers map[string]string `proxy:"headers,omitempty"` </s> remove Host: addr,
Header: http.Header{
"Proxy-Connection": []string{"Keep-Alive"},
},
</s> add Host: addr,
Header: h.Headers.Clone(), | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a7252a1576e063c2b93b194098bfb7953852cc7b | adapter/outbound/http.go |
Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
Headers map[string]string `proxy:"headers,omitempty"` | <mask> }
<mask>
<mask> type HttpOption struct {
<mask> BasicOption
<mask> Name string `proxy:"name"`
<mask> Server string `proxy:"server"`
<mask> Port int `proxy:"port"`
<mask> UserName string `proxy:"username,omitempty"`
<mask> Password string `proxy:"password,omitempty"`
<mask> TLS bool `proxy:"tls,omitempty"`
<mask> SNI string `proxy:"sni,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> // StreamConn implements C.ProxyAdapter
<mask> func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
<mask> if h.tlsConfig != nil {
</s> Feature: allow http outbound to set custom headers (#2647) </s> remove Host: addr,
Header: http.Header{
"Proxy-Connection": []string{"Keep-Alive"},
},
</s> add Host: addr,
Header: h.Headers.Clone(), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a7252a1576e063c2b93b194098bfb7953852cc7b | adapter/outbound/http.go |
Host: addr,
Header: h.Headers.Clone(), | <mask> Method: http.MethodConnect,
<mask> URL: &url.URL{
<mask> Host: addr,
<mask> },
<mask> Host: addr,
<mask> Header: http.Header{
<mask> "Proxy-Connection": []string{"Keep-Alive"},
<mask> },
<mask> }
<mask>
<mask> if h.user != "" && h.pass != "" {
<mask> auth := h.user + ":" + h.pass
<mask> req.Header.Add("Proxy-Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(auth)))
</s> Feature: allow http outbound to set custom headers (#2647) </s> remove Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
</s> add Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
Headers map[string]string `proxy:"headers,omitempty"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a7252a1576e063c2b93b194098bfb7953852cc7b | adapter/outbound/http.go |
req.Header.Add("Proxy-Connection", "Keep-Alive")
| <mask> }
<mask>
<mask> if h.user != "" && h.pass != "" {
<mask> auth := h.user + ":" + h.pass
<mask> req.Header.Add("Proxy-Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(auth)))
<mask> }
<mask>
</s> Feature: allow http outbound to set custom headers (#2647) </s> remove Host: addr,
Header: http.Header{
"Proxy-Connection": []string{"Keep-Alive"},
},
</s> add Host: addr,
Header: h.Headers.Clone(), </s> remove Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
</s> add Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
Headers map[string]string `proxy:"headers,omitempty"` | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a7252a1576e063c2b93b194098bfb7953852cc7b | adapter/outbound/http.go |
headers := http.Header{}
for name, value := range option.Headers {
headers.Add(name, value)
}
| <mask> }
<mask>
<mask> return &Http{
<mask> Base: &Base{
<mask> name: option.Name,
<mask> addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> Feature: allow http outbound to set custom headers (#2647) </s> remove Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
</s> add Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
Headers map[string]string `proxy:"headers,omitempty"` </s> remove Host: addr,
Header: http.Header{
"Proxy-Connection": []string{"Keep-Alive"},
},
</s> add Host: addr,
Header: h.Headers.Clone(), | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a7252a1576e063c2b93b194098bfb7953852cc7b | adapter/outbound/http.go |
Headers: headers, | <mask> },
<mask> user: option.UserName,
<mask> pass: option.Password,
<mask> tlsConfig: tlsConfig,
<mask> }
<mask> }
</s> Feature: allow http outbound to set custom headers (#2647) </s> remove Host: addr,
Header: http.Header{
"Proxy-Connection": []string{"Keep-Alive"},
},
</s> add Host: addr,
Header: h.Headers.Clone(), </s> remove Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
</s> add Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UserName string `proxy:"username,omitempty"`
Password string `proxy:"password,omitempty"`
TLS bool `proxy:"tls,omitempty"`
SNI string `proxy:"sni,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
Headers map[string]string `proxy:"headers,omitempty"` | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a7252a1576e063c2b93b194098bfb7953852cc7b | adapter/outbound/http.go |
configLock *sync.RWMutex | <mask> observable *observable.Observable
<mask> logCh chan interface{}
<mask> }
<mask>
<mask> func (t *Tunnel) Add(req C.ServerAdapter) {
<mask> t.queue.In() <- req
<mask> }
<mask>
</s> Fixed: race condition in update config | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a74856dbf39a5f7e07f5b0a65ce36aed56f79e68 | tunnel/tunnel.go |
t.configLock.Lock()
defer t.configLock.Unlock()
| <mask> }
<mask>
<mask> func (t *Tunnel) UpdateConfig() (err error) {
<mask> cfg, err := C.GetConfig()
<mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> // clear proxys and rules
</s> Fixed: race condition in update config | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a74856dbf39a5f7e07f5b0a65ce36aed56f79e68 | tunnel/tunnel.go |
t.configLock.RLock()
defer t.configLock.RUnlock()
| <mask> }
<mask>
<mask> func (t *Tunnel) match(addr *C.Addr) C.Proxy {
<mask> for _, rule := range t.rules {
<mask> if rule.IsMatch(addr) {
<mask> a, ok := t.proxys[rule.Adapter()]
<mask> if !ok {
</s> Fixed: race condition in update config | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a74856dbf39a5f7e07f5b0a65ce36aed56f79e68 | tunnel/tunnel.go |
configLock: &sync.RWMutex{}, | <mask> observable: observable.NewObservable(logCh),
<mask> logCh: logCh,
<mask> }
<mask> go tunnel.process()
<mask> go tunnel.subscribeLogs()
<mask> return tunnel
<mask> }
<mask>
</s> Fixed: race condition in update config | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a74856dbf39a5f7e07f5b0a65ce36aed56f79e68 | tunnel/tunnel.go |
g.br = bufio.NewReader(response.Body) | <mask> if !g.close.Load() {
<mask> g.response = response
<mask> } else {
<mask> response.Body.Close()
<mask> }
<mask> }
<mask>
<mask> func (g *Conn) Read(b []byte) (n int, err error) {
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove return offset, nil
</s> add return n, nil </s> remove n, err = g.response.Body.Read(b[:size])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove if g.br != nil {
remain := g.br.Buffered()
if len(b) < remain {
remain = len(b)
}
n, err = g.br.Read(b[:remain])
if g.br.Buffered() == 0 {
g.br = nil
}
return
} else if g.remain > 0 {
</s> add if g.remain > 0 { </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
</s> add n, err = io.ReadFull(g.br, b[:size]) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
if g.remain > 0 { | <mask> if g.err != nil {
<mask> return 0, g.err
<mask> }
<mask>
<mask> if g.br != nil {
<mask> remain := g.br.Buffered()
<mask> if len(b) < remain {
<mask> remain = len(b)
<mask> }
<mask>
<mask> n, err = g.br.Read(b[:remain])
<mask> if g.br.Buffered() == 0 {
<mask> g.br = nil
<mask> }
<mask> return
<mask> } else if g.remain > 0 {
<mask> size := g.remain
<mask> if len(b) < size {
<mask> size = len(b)
<mask> }
<mask>
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove n, err = g.response.Body.Read(b[:size])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove remain := int(protobufPayloadLen) - offset
</s> add remain := int(protobufPayloadLen) - n </s> remove n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove return offset, nil
</s> add return n, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
n, err = io.ReadFull(g.br, b[:size]) | <mask> if len(b) < size {
<mask> size = len(b)
<mask> }
<mask>
<mask> n, err = g.response.Body.Read(b[:size])
<mask> g.remain -= n
<mask> return
<mask> } else if g.response == nil {
<mask> return 0, net.ErrClosed
<mask> }
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove if g.br != nil {
remain := g.br.Buffered()
if len(b) < remain {
remain = len(b)
}
n, err = g.br.Read(b[:remain])
if g.br.Buffered() == 0 {
g.br = nil
}
return
} else if g.remain > 0 {
</s> add if g.remain > 0 { </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove buf := make([]byte, 6)
_, err = io.ReadFull(g.response.Body, buf)
</s> add _, err = g.br.Discard(6) </s> remove remain := int(protobufPayloadLen) - offset
</s> add remain := int(protobufPayloadLen) - n | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
_, err = g.br.Discard(6) | <mask> return 0, net.ErrClosed
<mask> }
<mask>
<mask> // 0x00 grpclength(uint32) 0x0A uleb128 payload
<mask> buf := make([]byte, 6)
<mask> _, err = io.ReadFull(g.response.Body, buf)
<mask> if err != nil {
<mask> return 0, err
<mask> }
<mask>
<mask> br := bufio.NewReaderSize(g.response.Body, 16)
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove br := bufio.NewReaderSize(g.response.Body, 16)
protobufPayloadLen, err := binary.ReadUvarint(br)
</s> add protobufPayloadLen, err := binary.ReadUvarint(g.br) </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove n, err = g.response.Body.Read(b[:size])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove return offset, nil
</s> add return n, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
protobufPayloadLen, err := binary.ReadUvarint(g.br) | <mask> if err != nil {
<mask> return 0, err
<mask> }
<mask>
<mask> br := bufio.NewReaderSize(g.response.Body, 16)
<mask> protobufPayloadLen, err := binary.ReadUvarint(br)
<mask> if err != nil {
<mask> return 0, ErrInvalidLength
<mask> }
<mask>
<mask> bufferedSize := br.Buffered()
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove buf := make([]byte, 6)
_, err = io.ReadFull(g.response.Body, buf)
</s> add _, err = g.br.Discard(6) </s> remove n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove if g.br != nil {
remain := g.br.Buffered()
if len(b) < remain {
remain = len(b)
}
n, err = g.br.Read(b[:remain])
if g.br.Buffered() == 0 {
g.br = nil
}
return
} else if g.remain > 0 {
</s> add if g.remain > 0 { </s> remove remain := int(protobufPayloadLen) - offset
</s> add remain := int(protobufPayloadLen) - n | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) | <mask> if err != nil {
<mask> return 0, ErrInvalidLength
<mask> }
<mask>
<mask> bufferedSize := br.Buffered()
<mask> if len(b) < bufferedSize {
<mask> n, err = br.Read(b)
<mask> g.br = br
<mask> remain := int(protobufPayloadLen) - n - g.br.Buffered()
<mask> if remain < 0 {
<mask> return 0, ErrInvalidLength
<mask> }
<mask> g.remain = remain
<mask> return
<mask> }
<mask>
<mask> _, err = br.Read(b[:bufferedSize])
<mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> offset := int(protobufPayloadLen)
<mask> if len(b) < int(protobufPayloadLen) {
<mask> offset = len(b)
<mask> }
<mask>
<mask> if offset == bufferedSize {
<mask> return bufferedSize, nil
<mask> }
<mask>
<mask> n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
<mask> if err != nil {
<mask> return
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove if g.br != nil {
remain := g.br.Buffered()
if len(b) < remain {
remain = len(b)
}
n, err = g.br.Read(b[:remain])
if g.br.Buffered() == 0 {
g.br = nil
}
return
} else if g.remain > 0 {
</s> add if g.remain > 0 { </s> remove remain := int(protobufPayloadLen) - offset
</s> add remain := int(protobufPayloadLen) - n </s> remove br := bufio.NewReaderSize(g.response.Body, 16)
protobufPayloadLen, err := binary.ReadUvarint(br)
</s> add protobufPayloadLen, err := binary.ReadUvarint(g.br) </s> remove n, err = g.response.Body.Read(b[:size])
</s> add n, err = io.ReadFull(g.br, b[:size]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
n, err = io.ReadFull(g.br, b[:size]) | <mask> if offset == bufferedSize {
<mask> return bufferedSize, nil
<mask> }
<mask>
<mask> n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
<mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> remain := int(protobufPayloadLen) - offset
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove remain := int(protobufPayloadLen) - offset
</s> add remain := int(protobufPayloadLen) - n </s> remove br := bufio.NewReaderSize(g.response.Body, 16)
protobufPayloadLen, err := binary.ReadUvarint(br)
</s> add protobufPayloadLen, err := binary.ReadUvarint(g.br) </s> remove if g.br != nil {
remain := g.br.Buffered()
if len(b) < remain {
remain = len(b)
}
n, err = g.br.Read(b[:remain])
if g.br.Buffered() == 0 {
g.br = nil
}
return
} else if g.remain > 0 {
</s> add if g.remain > 0 { </s> remove buf := make([]byte, 6)
_, err = io.ReadFull(g.response.Body, buf)
</s> add _, err = g.br.Discard(6) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
remain := int(protobufPayloadLen) - n | <mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> remain := int(protobufPayloadLen) - offset
<mask> if remain > 0 {
<mask> g.remain = remain
<mask> }
<mask>
<mask> return offset, nil
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove n, err = io.ReadFull(g.response.Body, b[bufferedSize:offset])
</s> add n, err = io.ReadFull(g.br, b[:size]) </s> remove return offset, nil
</s> add return n, nil </s> remove if g.br != nil {
remain := g.br.Buffered()
if len(b) < remain {
remain = len(b)
}
n, err = g.br.Read(b[:remain])
if g.br.Buffered() == 0 {
g.br = nil
}
return
} else if g.remain > 0 {
</s> add if g.remain > 0 { </s> remove br := bufio.NewReaderSize(g.response.Body, 16)
protobufPayloadLen, err := binary.ReadUvarint(br)
</s> add protobufPayloadLen, err := binary.ReadUvarint(g.br) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
return n, nil | <mask> if remain > 0 {
<mask> g.remain = remain
<mask> }
<mask>
<mask> return offset, nil
<mask> }
<mask>
<mask> func (g *Conn) Write(b []byte) (n int, err error) {
<mask> protobufHeader := appendUleb128([]byte{0x0A}, uint64(len(b)))
<mask> grpcHeader := make([]byte, 5)
</s> Fix: use bufio.Reader on grpc to avoid panic </s> remove remain := int(protobufPayloadLen) - offset
</s> add remain := int(protobufPayloadLen) - n </s> remove if g.br != nil {
remain := g.br.Buffered()
if len(b) < remain {
remain = len(b)
}
n, err = g.br.Read(b[:remain])
if g.br.Buffered() == 0 {
g.br = nil
}
return
} else if g.remain > 0 {
</s> add if g.remain > 0 { </s> remove bufferedSize := br.Buffered()
if len(b) < bufferedSize {
n, err = br.Read(b)
g.br = br
remain := int(protobufPayloadLen) - n - g.br.Buffered()
if remain < 0 {
return 0, ErrInvalidLength
}
g.remain = remain
return
}
_, err = br.Read(b[:bufferedSize])
if err != nil {
return
}
offset := int(protobufPayloadLen)
if len(b) < int(protobufPayloadLen) {
offset = len(b)
}
if offset == bufferedSize {
return bufferedSize, nil
</s> add size := int(protobufPayloadLen)
if len(b) < size {
size = len(b) </s> remove buf := make([]byte, 6)
_, err = io.ReadFull(g.response.Body, buf)
</s> add _, err = g.br.Discard(6) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a9cbd9ec9846025d7f70118c8638527dff85654e | component/gun/gun.go |
go-version: 1.16 | <mask> steps:
<mask> - name: Setup Go
<mask> uses: actions/setup-go@v2
<mask> with:
<mask> go-version: 1.15.x
<mask>
<mask> - name: Check out code into the Go module directory
<mask> uses: actions/checkout@v2
<mask>
<mask> - name: Cache go module
</s> Feature: add darwin arm64 to Makefile (Apple Silicon) (#1234) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aa81193d5b94aabcad82507c8ab28ffaabfd2e93 | .github/workflows/go.yml |
darwin-arm64 \ | <mask> -w -s -buildid='
<mask>
<mask> PLATFORM_LIST = \
<mask> darwin-amd64 \
<mask> linux-386 \
<mask> linux-amd64 \
<mask> linux-armv5 \
<mask> linux-armv6 \
</s> Feature: add darwin arm64 to Makefile (Apple Silicon) (#1234) </s> remove go-version: 1.15.x
</s> add go-version: 1.16 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aa81193d5b94aabcad82507c8ab28ffaabfd2e93 | Makefile |
darwin-arm64:
GOARCH=arm64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
| <mask> GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> linux-386:
<mask> GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> linux-amd64:
<mask> GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
</s> Feature: add darwin arm64 to Makefile (Apple Silicon) (#1234) </s> remove go-version: 1.15.x
</s> add go-version: 1.16 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aa81193d5b94aabcad82507c8ab28ffaabfd2e93 | Makefile |
Host: u.Hostname(),
DstIP: nil,
DstPort: port, | <mask> }
<mask> }
<mask>
<mask> addr = C.Metadata{
<mask> AddrType: C.AtypDomainName,
<mask> Host: u.Hostname(),
<mask> DstIP: nil,
<mask> DstPort: port,
<mask> }
<mask> return
<mask> }
</s> Change: remove AddrType on Metadata (#2199) </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypIPv6,
Host: "",
DstIP: ip,
DstPort: port,
</s> add Host: "",
DstIP: ip,
DstPort: port, </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypIPv4,
Host: "",
DstIP: ip4,
DstPort: port,
</s> add Host: "",
DstIP: ip4,
DstPort: port, </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/adapter.go |
metadata := &C.Metadata{} | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> func parseSocksAddr(target socks5.Addr) *C.Metadata {
<mask> metadata := &C.Metadata{
<mask> AddrType: int(target[0]),
<mask> }
<mask>
<mask> switch target[0] {
<mask> case socks5.AtypDomainName:
<mask> // trim for FQDN
<mask> metadata.Host = strings.TrimRight(string(target[2:2+target[1]]), ".")
</s> Change: remove AddrType on Metadata (#2199) </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove switch metadata.AddrType {
</s> add switch addrType { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/inbound/util.go |
NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, | <mask> // trim FQDN (#737)
<mask> host = strings.TrimRight(host, ".")
<mask>
<mask> metadata := &C.Metadata{
<mask> NetWork: C.TCP,
<mask> AddrType: C.AtypDomainName,
<mask> Host: host,
<mask> DstIP: nil,
<mask> DstPort: port,
<mask> }
<mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
<mask> switch {
</s> Change: remove AddrType on Metadata (#2199) </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove metadata := &C.Metadata{
AddrType: int(target[0]),
}
</s> add metadata := &C.Metadata{} </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add </s> remove AddrType: C.AtypDomainName,
Host: u.Hostname(),
DstIP: nil,
DstPort: port,
</s> add Host: u.Hostname(),
DstIP: nil,
DstPort: port, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/inbound/util.go |
if ip := net.ParseIP(host); ip != nil { | <mask> DstIP: nil,
<mask> DstPort: port,
<mask> }
<mask>
<mask> ip := net.ParseIP(host)
<mask> if ip != nil {
<mask> switch {
<mask> case ip.To4() == nil:
<mask> metadata.AddrType = C.AtypIPv6
<mask> default:
<mask> metadata.AddrType = C.AtypIPv4
<mask> }
<mask> metadata.DstIP = ip
<mask> }
<mask>
<mask> return metadata
<mask> }
</s> Change: remove AddrType on Metadata (#2199) </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypDomainName,
Host: u.Hostname(),
DstIP: nil,
DstPort: port,
</s> add Host: u.Hostname(),
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypIPv4,
Host: "",
DstIP: ip4,
DstPort: port,
</s> add Host: "",
DstIP: ip4,
DstPort: port, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/inbound/util.go |
addrType := metadata.AddrType()
aType := uint8(addrType) | <mask> }
<mask>
<mask> func serializesSocksAddr(metadata *C.Metadata) []byte {
<mask> var buf [][]byte
<mask> aType := uint8(metadata.AddrType)
<mask> p, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
<mask> port := []byte{uint8(p >> 8), uint8(p & 0xff)}
<mask> switch metadata.AddrType {
<mask> case socks5.AtypDomainName:
<mask> len := uint8(len(metadata.Host))
</s> Change: remove AddrType on Metadata (#2199) </s> remove switch metadata.AddrType {
</s> add switch addrType { </s> remove switch metadata.AddrType {
case C.AtypIPv4:
</s> add switch metadata.AddrType() {
case socks5.AtypIPv4: </s> remove metadata := &C.Metadata{
AddrType: int(target[0]),
}
</s> add metadata := &C.Metadata{} </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outbound/util.go |
switch addrType { | <mask> var buf [][]byte
<mask> aType := uint8(metadata.AddrType)
<mask> p, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
<mask> port := []byte{uint8(p >> 8), uint8(p & 0xff)}
<mask> switch metadata.AddrType {
<mask> case socks5.AtypDomainName:
<mask> len := uint8(len(metadata.Host))
<mask> host := []byte(metadata.Host)
<mask> buf = [][]byte{{aType, len}, host, port}
<mask> case socks5.AtypIPv4:
</s> Change: remove AddrType on Metadata (#2199) </s> remove aType := uint8(metadata.AddrType)
</s> add addrType := metadata.AddrType()
aType := uint8(addrType) </s> remove switch metadata.AddrType {
case C.AtypIPv4:
</s> add switch metadata.AddrType() {
case socks5.AtypIPv4: </s> remove metadata := &C.Metadata{
AddrType: int(target[0]),
}
</s> add metadata := &C.Metadata{} </s> remove metadata.AddrType = C.AtypDomainName
</s> add </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outbound/util.go |
"github.com/Dreamacro/clash/transport/socks5" | <mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/transport/gun"
<mask> "github.com/Dreamacro/clash/transport/vmess"
<mask>
<mask> "golang.org/x/net/http2"
<mask> )
<mask>
<mask> type Vmess struct {
</s> Change: remove AddrType on Metadata (#2199) </s> remove AtypIPv4 = 1
AtypDomainName = 3
AtypIPv6 = 4
</s> add </s> remove metadata := &C.Metadata{
AddrType: int(target[0]),
}
</s> add metadata := &C.Metadata{} </s> remove metadata.AddrType = C.AtypDomainName
</s> add </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outbound/vmess.go |
switch metadata.AddrType() {
case socks5.AtypIPv4: | <mask>
<mask> func parseVmessAddr(metadata *C.Metadata) *vmess.DstAddr {
<mask> var addrType byte
<mask> var addr []byte
<mask> switch metadata.AddrType {
<mask> case C.AtypIPv4:
<mask> addrType = byte(vmess.AtypIPv4)
<mask> addr = make([]byte, net.IPv4len)
<mask> copy(addr[:], metadata.DstIP.To4())
<mask> case C.AtypIPv6:
<mask> addrType = byte(vmess.AtypIPv6)
</s> Change: remove AddrType on Metadata (#2199) </s> remove case C.AtypIPv6:
</s> add case socks5.AtypIPv6: </s> remove case C.AtypDomainName:
</s> add case socks5.AtypDomainName: </s> remove aType := uint8(metadata.AddrType)
</s> add addrType := metadata.AddrType()
aType := uint8(addrType) </s> remove switch metadata.AddrType {
</s> add switch addrType { </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outbound/vmess.go |
case socks5.AtypIPv6: | <mask> case C.AtypIPv4:
<mask> addrType = byte(vmess.AtypIPv4)
<mask> addr = make([]byte, net.IPv4len)
<mask> copy(addr[:], metadata.DstIP.To4())
<mask> case C.AtypIPv6:
<mask> addrType = byte(vmess.AtypIPv6)
<mask> addr = make([]byte, net.IPv6len)
<mask> copy(addr[:], metadata.DstIP.To16())
<mask> case C.AtypDomainName:
<mask> addrType = byte(vmess.AtypDomainName)
</s> Change: remove AddrType on Metadata (#2199) </s> remove case C.AtypDomainName:
</s> add case socks5.AtypDomainName: </s> remove switch metadata.AddrType {
case C.AtypIPv4:
</s> add switch metadata.AddrType() {
case socks5.AtypIPv4: </s> remove switch metadata.AddrType {
</s> add switch addrType { </s> remove AtypIPv4 = 1
AtypDomainName = 3
AtypIPv6 = 4
</s> add </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outbound/vmess.go |
case socks5.AtypDomainName: | <mask> case C.AtypIPv6:
<mask> addrType = byte(vmess.AtypIPv6)
<mask> addr = make([]byte, net.IPv6len)
<mask> copy(addr[:], metadata.DstIP.To16())
<mask> case C.AtypDomainName:
<mask> addrType = byte(vmess.AtypDomainName)
<mask> addr = make([]byte, len(metadata.Host)+1)
<mask> addr[0] = byte(len(metadata.Host))
<mask> copy(addr[1:], []byte(metadata.Host))
<mask> }
</s> Change: remove AddrType on Metadata (#2199) </s> remove case C.AtypIPv6:
</s> add case socks5.AtypIPv6: </s> remove switch metadata.AddrType {
case C.AtypIPv4:
</s> add switch metadata.AddrType() {
case socks5.AtypIPv4: </s> remove AtypIPv4 = 1
AtypDomainName = 3
AtypIPv6 = 4
</s> add </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove switch metadata.AddrType {
</s> add switch addrType { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outbound/vmess.go |
Host: host,
DstIP: nil,
DstPort: port, | <mask>
<mask> ip := net.ParseIP(host)
<mask> if ip == nil {
<mask> addr = &C.Metadata{
<mask> AddrType: C.AtypDomainName,
<mask> Host: host,
<mask> DstIP: nil,
<mask> DstPort: port,
<mask> }
<mask> return
<mask> } else if ip4 := ip.To4(); ip4 != nil {
<mask> addr = &C.Metadata{
<mask> AddrType: C.AtypIPv4,
</s> Change: remove AddrType on Metadata (#2199) </s> remove AddrType: C.AtypIPv4,
Host: "",
DstIP: ip4,
DstPort: port,
</s> add Host: "",
DstIP: ip4,
DstPort: port, </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove AddrType: C.AtypDomainName,
Host: u.Hostname(),
DstIP: nil,
DstPort: port,
</s> add Host: u.Hostname(),
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypIPv6,
Host: "",
DstIP: ip,
DstPort: port,
</s> add Host: "",
DstIP: ip,
DstPort: port, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outboundgroup/util.go |
Host: "",
DstIP: ip4,
DstPort: port, | <mask> }
<mask> return
<mask> } else if ip4 := ip.To4(); ip4 != nil {
<mask> addr = &C.Metadata{
<mask> AddrType: C.AtypIPv4,
<mask> Host: "",
<mask> DstIP: ip4,
<mask> DstPort: port,
<mask> }
<mask> return
<mask> }
<mask>
<mask> addr = &C.Metadata{
</s> Change: remove AddrType on Metadata (#2199) </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypIPv6,
Host: "",
DstIP: ip,
DstPort: port,
</s> add Host: "",
DstIP: ip,
DstPort: port, </s> remove AddrType: C.AtypDomainName,
Host: u.Hostname(),
DstIP: nil,
DstPort: port,
</s> add Host: u.Hostname(),
DstIP: nil,
DstPort: port, </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outboundgroup/util.go |
Host: "",
DstIP: ip,
DstPort: port, | <mask> return
<mask> }
<mask>
<mask> addr = &C.Metadata{
<mask> AddrType: C.AtypIPv6,
<mask> Host: "",
<mask> DstIP: ip,
<mask> DstPort: port,
<mask> }
<mask> return
<mask> }
<mask>
<mask> func tcpKeepAlive(c net.Conn) {
</s> Change: remove AddrType on Metadata (#2199) </s> remove AddrType: C.AtypIPv4,
Host: "",
DstIP: ip4,
DstPort: port,
</s> add Host: "",
DstIP: ip4,
DstPort: port, </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypDomainName,
Host: u.Hostname(),
DstIP: nil,
DstPort: port,
</s> add Host: u.Hostname(),
DstIP: nil,
DstPort: port, </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | adapter/outboundgroup/util.go |
"github.com/Dreamacro/clash/transport/socks5" | <mask> import (
<mask> "encoding/json"
<mask> "net"
<mask> "strconv"
<mask> )
<mask>
<mask> // Socks addr type
<mask> const (
</s> Change: remove AddrType on Metadata (#2199) </s> remove AtypIPv4 = 1
AtypDomainName = 3
AtypIPv6 = 4
</s> add </s> remove metadata := &C.Metadata{
AddrType: int(target[0]),
}
</s> add metadata := &C.Metadata{} </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | constant/metadata.go |
<mask> )
<mask>
<mask> // Socks addr type
<mask> const (
<mask> AtypIPv4 = 1
<mask> AtypDomainName = 3
<mask> AtypIPv6 = 4
<mask>
<mask> TCP NetWork = iota
<mask> UDP
<mask>
<mask> HTTP Type = iota
<mask> HTTPCONNECT
</s> Change: remove AddrType on Metadata (#2199) </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add </s> remove case C.AtypDomainName:
</s> add case socks5.AtypDomainName: </s> remove case C.AtypIPv6:
</s> add case socks5.AtypIPv6: </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | constant/metadata.go | |
<mask> SrcIP net.IP `json:"sourceIP"`
<mask> DstIP net.IP `json:"destinationIP"`
<mask> SrcPort string `json:"sourcePort"`
<mask> DstPort string `json:"destinationPort"`
<mask> AddrType int `json:"-"`
<mask> Host string `json:"host"`
<mask> DNSMode DNSMode `json:"dnsMode"`
<mask> ProcessPath string `json:"processPath"`
<mask> }
<mask>
</s> Change: remove AddrType on Metadata (#2199) </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
domain := metadata.Host
return strings.Contains(domain, dk.keyword)
</s> add return strings.Contains(metadata.Host, dk.keyword) </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | constant/metadata.go | |
func (m *Metadata) AddrType() int {
switch true {
case m.Host != "" || m.DstIP == nil:
return socks5.AtypDomainName
case m.DstIP.To4() != nil:
return socks5.AtypIPv4
default:
return socks5.AtypIPv6
}
}
| <mask> }
<mask>
<mask> func (m *Metadata) Resolved() bool {
<mask> return m.DstIP != nil
<mask> }
<mask>
<mask> // Pure is used to solve unexpected behavior
</s> Change: remove AddrType on Metadata (#2199) </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
domain := metadata.Host
return strings.Contains(domain, dk.keyword)
</s> add return strings.Contains(metadata.Host, dk.keyword) </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | constant/metadata.go |
<mask> func (m *Metadata) Pure() *Metadata {
<mask> if m.DNSMode == DNSMapping && m.DstIP != nil {
<mask> copy := *m
<mask> copy.Host = ""
<mask> if copy.DstIP.To4() != nil {
<mask> copy.AddrType = AtypIPv4
<mask> } else {
<mask> copy.AddrType = AtypIPv6
<mask> }
<mask> return ©
<mask> }
<mask>
<mask> return m
<mask> }
</s> Change: remove AddrType on Metadata (#2199) </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove metadata.AddrType = C.AtypDomainName
</s> add </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | constant/metadata.go | |
<mask> return C.Domain
<mask> }
<mask>
<mask> func (d *Domain) Match(metadata *C.Metadata) bool {
<mask> if metadata.AddrType != C.AtypDomainName {
<mask> return false
<mask> }
<mask> return metadata.Host == d.domain
<mask> }
<mask>
<mask> func (d *Domain) Adapter() string {
<mask> return d.adapter
</s> Change: remove AddrType on Metadata (#2199) </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
domain := metadata.Host
return strings.Contains(domain, dk.keyword)
</s> add return strings.Contains(metadata.Host, dk.keyword) </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | rule/domain.go | |
return strings.Contains(metadata.Host, dk.keyword) | <mask> return C.DomainKeyword
<mask> }
<mask>
<mask> func (dk *DomainKeyword) Match(metadata *C.Metadata) bool {
<mask> if metadata.AddrType != C.AtypDomainName {
<mask> return false
<mask> }
<mask> domain := metadata.Host
<mask> return strings.Contains(domain, dk.keyword)
<mask> }
<mask>
<mask> func (dk *DomainKeyword) Adapter() string {
<mask> return dk.adapter
<mask> }
</s> Change: remove AddrType on Metadata (#2199) </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | rule/domain_keyword.go |
<mask> return C.DomainSuffix
<mask> }
<mask>
<mask> func (ds *DomainSuffix) Match(metadata *C.Metadata) bool {
<mask> if metadata.AddrType != C.AtypDomainName {
<mask> return false
<mask> }
<mask> domain := metadata.Host
<mask> return strings.HasSuffix(domain, "."+ds.suffix) || domain == ds.suffix
<mask> }
<mask>
<mask> func (ds *DomainSuffix) Adapter() string {
</s> Change: remove AddrType on Metadata (#2199) </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
domain := metadata.Host
return strings.Contains(domain, dk.keyword)
</s> add return strings.Contains(metadata.Host, dk.keyword) </s> remove if metadata.AddrType != C.AtypDomainName {
return false
}
</s> add </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | rule/domain_suffix.go | |
<mask> // handle IP string on host
<mask> if ip := net.ParseIP(metadata.Host); ip != nil {
<mask> metadata.DstIP = ip
<mask> metadata.Host = ""
<mask> if ip.To4() != nil {
<mask> metadata.AddrType = C.AtypIPv4
<mask> } else {
<mask> metadata.AddrType = C.AtypIPv6
<mask> }
<mask> }
<mask>
<mask> // preprocess enhanced-mode metadata
<mask> if needLookupIP(metadata) {
<mask> host, exist := resolver.FindHostByIP(metadata.DstIP)
</s> Change: remove AddrType on Metadata (#2199) </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove metadata.AddrType = C.AtypDomainName
</s> add </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | tunnel/tunnel.go | |
<mask> if needLookupIP(metadata) {
<mask> host, exist := resolver.FindHostByIP(metadata.DstIP)
<mask> if exist {
<mask> metadata.Host = host
<mask> metadata.AddrType = C.AtypDomainName
<mask> metadata.DNSMode = C.DNSMapping
<mask> if resolver.FakeIPEnabled() {
<mask> metadata.DstIP = nil
<mask> metadata.DNSMode = C.DNSFakeIP
<mask> } else if node := resolver.DefaultHosts.Search(host); node != nil {
</s> Change: remove AddrType on Metadata (#2199) </s> remove if ip.To4() != nil {
metadata.AddrType = C.AtypIPv4
} else {
metadata.AddrType = C.AtypIPv6
}
</s> add </s> remove ip := net.ParseIP(host)
if ip != nil {
switch {
case ip.To4() == nil:
metadata.AddrType = C.AtypIPv6
default:
metadata.AddrType = C.AtypIPv4
}
</s> add if ip := net.ParseIP(host); ip != nil { </s> remove AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add Host: host,
DstIP: nil,
DstPort: port, </s> remove if copy.DstIP.To4() != nil {
copy.AddrType = AtypIPv4
} else {
copy.AddrType = AtypIPv6
}
</s> add </s> remove NetWork: C.TCP,
AddrType: C.AtypDomainName,
Host: host,
DstIP: nil,
DstPort: port,
</s> add NetWork: C.TCP,
Host: host,
DstIP: nil,
DstPort: port, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/aaf08dadffbb4e9e6404e6d61c1b9ab94479d6fa | tunnel/tunnel.go | |
"net"
"net/http"
"time" | <mask> package adapters
<mask>
<mask> import (
<mask> "encoding/json"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
</s> Improve: `Dial` would reset proxy alive status </s> remove adapters "github.com/Dreamacro/clash/adapters/outbound"
</s> add </s> remove "net/http"
</s> add </s> remove type proxy struct {
RawProxy C.Proxy
Valid bool
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/acf55a7f641cb6f522546397dcc15f4fba9359f1 | adapters/outbound/base.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.