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 |
|---|---|---|---|---|
return !strings.EqualFold(record.Country.IsoCode, gf.code) && !ip.IsPrivate() | <mask> }
<mask>
<mask> func (gf *geoipFilter) Match(ip net.IP) bool {
<mask> record, _ := mmdb.Instance().Country(ip)
<mask> return record.Country.IsoCode != gf.code && !ip.IsPrivate()
<mask> }
<mask>
<mask> type ipnetFilter struct {
<mask> ipnet *net.IPNet
<mask> }
</s> Chore: make geoip match case-insensitive (#1574) </s> remove return record.Country.IsoCode == g.country
</s> add return strings.EqualFold(record.Country.IsoCode, g.country) </s> remove if g.country == "LAN" {
</s> add if strings.EqualFold(g.country, "LAN") { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a20b9a3960658fb2844e5c52200705f1fc5cb90e | dns/filters.go |
"strings"
| <mask>
<mask> import (
<mask> "github.com/Dreamacro/clash/component/mmdb"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
</s> Chore: make geoip match case-insensitive (#1574) </s> remove return record.Country.IsoCode == g.country
</s> add return strings.EqualFold(record.Country.IsoCode, g.country) </s> remove if g.country == "LAN" {
</s> add if strings.EqualFold(g.country, "LAN") { </s> remove return record.Country.IsoCode != gf.code && !ip.IsPrivate()
</s> add return !strings.EqualFold(record.Country.IsoCode, gf.code) && !ip.IsPrivate() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a20b9a3960658fb2844e5c52200705f1fc5cb90e | rule/geoip.go |
if strings.EqualFold(g.country, "LAN") { | <mask> if ip == nil {
<mask> return false
<mask> }
<mask>
<mask> if g.country == "LAN" {
<mask> return ip.IsPrivate()
<mask> }
<mask> record, _ := mmdb.Instance().Country(ip)
<mask> return record.Country.IsoCode == g.country
<mask> }
</s> Chore: make geoip match case-insensitive (#1574) </s> remove return record.Country.IsoCode == g.country
</s> add return strings.EqualFold(record.Country.IsoCode, g.country) </s> remove return record.Country.IsoCode != gf.code && !ip.IsPrivate()
</s> add return !strings.EqualFold(record.Country.IsoCode, gf.code) && !ip.IsPrivate() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a20b9a3960658fb2844e5c52200705f1fc5cb90e | rule/geoip.go |
return strings.EqualFold(record.Country.IsoCode, g.country) | <mask> if g.country == "LAN" {
<mask> return ip.IsPrivate()
<mask> }
<mask> record, _ := mmdb.Instance().Country(ip)
<mask> return record.Country.IsoCode == g.country
<mask> }
<mask>
<mask> func (g *GEOIP) Adapter() string {
<mask> return g.adapter
<mask> }
</s> Chore: make geoip match case-insensitive (#1574) </s> remove if g.country == "LAN" {
</s> add if strings.EqualFold(g.country, "LAN") { </s> remove return record.Country.IsoCode != gf.code && !ip.IsPrivate()
</s> add return !strings.EqualFold(record.Country.IsoCode, gf.code) && !ip.IsPrivate() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a20b9a3960658fb2844e5c52200705f1fc5cb90e | rule/geoip.go |
"github.com/miekg/dns" | <mask>
<mask> "github.com/Dreamacro/clash/component/trie"
<mask> )
<mask>
<mask> var (
<mask> // DefaultResolver aim to resolve ip
</s> Feature: add dns query json api </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | component/resolver/resolver.go |
ExchangeContext(ctx context.Context, m *dns.Msg) (msg *dns.Msg, err error) | <mask> ResolveIPv4(host string) (ip net.IP, err error)
<mask> ResolveIPv6(host string) (ip net.IP, err error)
<mask> }
<mask>
<mask> // LookupIPv4 with a host, return ipv4 list
<mask> func LookupIPv4(ctx context.Context, host string) ([]net.IP, error) {
</s> Feature: add dns query json api </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} </s> remove general := &configSchema{}
if err := render.DecodeJSON(r.Body, general); err != nil {
</s> add general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { </s> remove type updateConfigRequest struct {
Path string `json:"path"`
Payload string `json:"payload"`
}
</s> add </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | component/resolver/resolver.go |
<mask> r.Patch("/", patchConfigs)
<mask> return r
<mask> }
<mask>
<mask> type configSchema struct {
<mask> Port *int `json:"port"`
<mask> SocksPort *int `json:"socks-port"`
<mask> RedirPort *int `json:"redir-port"`
<mask> TProxyPort *int `json:"tproxy-port"`
<mask> MixedPort *int `json:"mixed-port"`
<mask> AllowLan *bool `json:"allow-lan"`
<mask> BindAddress *string `json:"bind-address"`
<mask> Mode *tunnel.TunnelMode `json:"mode"`
<mask> LogLevel *log.LogLevel `json:"log-level"`
<mask> IPv6 *bool `json:"ipv6"`
<mask> }
<mask>
<mask> func getConfigs(w http.ResponseWriter, r *http.Request) {
<mask> general := executor.GetGeneral()
<mask> render.JSON(w, r, general)
<mask> }
<mask>
</s> Feature: add dns query json api </s> remove general := &configSchema{}
if err := render.DecodeJSON(r.Body, general); err != nil {
</s> add general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add </s> remove type updateConfigRequest struct {
Path string `json:"path"`
Payload string `json:"payload"`
}
</s> add </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | hub/route/configs.go | |
general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { | <mask> return def
<mask> }
<mask>
<mask> func patchConfigs(w http.ResponseWriter, r *http.Request) {
<mask> general := &configSchema{}
<mask> if err := render.DecodeJSON(r.Body, general); err != nil {
<mask> render.Status(r, http.StatusBadRequest)
<mask> render.JSON(w, r, ErrBadRequest)
<mask> return
<mask> }
<mask>
</s> Feature: add dns query json api </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add </s> remove type updateConfigRequest struct {
Path string `json:"path"`
Payload string `json:"payload"`
}
</s> add </s> remove type configSchema struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | hub/route/configs.go |
<mask>
<mask> render.NoContent(w, r)
<mask> }
<mask>
<mask> type updateConfigRequest struct {
<mask> Path string `json:"path"`
<mask> Payload string `json:"payload"`
<mask> }
<mask>
<mask> func updateConfigs(w http.ResponseWriter, r *http.Request) {
<mask> req := updateConfigRequest{}
<mask> if err := render.DecodeJSON(r.Body, &req); err != nil {
<mask> render.Status(r, http.StatusBadRequest)
<mask> render.JSON(w, r, ErrBadRequest)
</s> Feature: add dns query json api </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove general := &configSchema{}
if err := render.DecodeJSON(r.Body, general); err != nil {
</s> add general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { </s> remove type configSchema struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | hub/route/configs.go | |
req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} | <mask> Payload string `json:"payload"`
<mask> }
<mask>
<mask> func updateConfigs(w http.ResponseWriter, r *http.Request) {
<mask> req := updateConfigRequest{}
<mask> if err := render.DecodeJSON(r.Body, &req); err != nil {
<mask> render.Status(r, http.StatusBadRequest)
<mask> render.JSON(w, r, ErrBadRequest)
<mask> return
<mask> }
</s> Feature: add dns query json api </s> remove type updateConfigRequest struct {
Path string `json:"path"`
Payload string `json:"payload"`
}
</s> add </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add </s> remove general := &configSchema{}
if err := render.DecodeJSON(r.Body, general); err != nil {
</s> add general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { </s> remove type configSchema struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | hub/route/configs.go |
<mask> proxy := r.Context().Value(CtxKeyProxy).(C.Proxy)
<mask> render.JSON(w, r, proxy)
<mask> }
<mask>
<mask> type UpdateProxyRequest struct {
<mask> Name string `json:"name"`
<mask> }
<mask>
<mask> func updateProxy(w http.ResponseWriter, r *http.Request) {
<mask> req := UpdateProxyRequest{}
<mask> if err := render.DecodeJSON(r.Body, &req); err != nil {
<mask> render.Status(r, http.StatusBadRequest)
<mask> render.JSON(w, r, ErrBadRequest)
</s> Feature: add dns query json api </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove type updateConfigRequest struct {
Path string `json:"path"`
Payload string `json:"payload"`
}
</s> add </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} </s> remove general := &configSchema{}
if err := render.DecodeJSON(r.Body, general); err != nil {
</s> add general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { </s> remove type configSchema struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | hub/route/proxies.go | |
req := struct {
Name string `json:"name"`
}{} | <mask> Name string `json:"name"`
<mask> }
<mask>
<mask> func updateProxy(w http.ResponseWriter, r *http.Request) {
<mask> req := UpdateProxyRequest{}
<mask> if err := render.DecodeJSON(r.Body, &req); err != nil {
<mask> render.Status(r, http.StatusBadRequest)
<mask> render.JSON(w, r, ErrBadRequest)
<mask> return
<mask> }
</s> Feature: add dns query json api </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} </s> remove type updateConfigRequest struct {
Path string `json:"path"`
Payload string `json:"payload"`
}
</s> add </s> remove general := &configSchema{}
if err := render.DecodeJSON(r.Body, general); err != nil {
</s> add general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { </s> remove type configSchema struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | hub/route/proxies.go |
r.Mount("/dns", dnsRouter()) | <mask> r.Mount("/proxies", proxyRouter())
<mask> r.Mount("/rules", ruleRouter())
<mask> r.Mount("/connections", connectionRouter())
<mask> r.Mount("/providers/proxies", proxyProviderRouter())
<mask> })
<mask>
<mask> if uiPath != "" {
<mask> r.Group(func(r chi.Router) {
<mask> fs := http.StripPrefix("/ui", http.FileServer(http.Dir(uiPath)))
<mask> r.Get("/ui", http.RedirectHandler("/ui/", http.StatusTemporaryRedirect).ServeHTTP)
</s> Feature: add dns query json api </s> remove req := UpdateProxyRequest{}
</s> add req := struct {
Name string `json:"name"`
}{} </s> remove type UpdateProxyRequest struct {
Name string `json:"name"`
}
</s> add </s> remove req := updateConfigRequest{}
</s> add req := struct {
Path string `json:"path"`
Payload string `json:"payload"`
}{} </s> remove general := &configSchema{}
if err := render.DecodeJSON(r.Body, general); err != nil {
</s> add general := struct {
Port *int `json:"port"`
SocksPort *int `json:"socks-port"`
RedirPort *int `json:"redir-port"`
TProxyPort *int `json:"tproxy-port"`
MixedPort *int `json:"mixed-port"`
AllowLan *bool `json:"allow-lan"`
BindAddress *string `json:"bind-address"`
Mode *tunnel.TunnelMode `json:"mode"`
LogLevel *log.LogLevel `json:"log-level"`
IPv6 *bool `json:"ipv6"`
}{}
if err := render.DecodeJSON(r.Body, &general); err != nil { </s> remove type updateConfigRequest struct {
Path string `json:"path"`
Payload string `json:"payload"`
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a26b670420c14247bb99c0205a48c51622781d22 | hub/route/server.go |
clients []dnsClient | <mask> dnsInvalidate time.Time
<mask>
<mask> ifaceAddr *net.IPNet
<mask> done chan struct{}
<mask> resolver *Resolver
<mask> err error
<mask> }
<mask>
<mask> func (d *dhcpClient) Exchange(m *D.Msg) (msg *D.Msg, err error) {
<mask> ctx, cancel := context.WithTimeout(context.Background(), resolver.DefaultDNSTimeout)
</s> Chore: reduce dhcp dns client cost </s> remove res, err := d.resolve(ctx)
</s> add clients, err := d.resolve(ctx) </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove var res *Resolver
</s> add var res []dnsClient </s> remove func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
</s> add func (d *dhcpClient) resolve(ctx context.Context) ([]dnsClient, error) { </s> remove return res.ExchangeContext(ctx, m)
</s> add return batchExchange(ctx, clients, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
clients, err := d.resolve(ctx) | <mask> return d.ExchangeContext(ctx, m)
<mask> }
<mask>
<mask> func (d *dhcpClient) ExchangeContext(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) {
<mask> res, err := d.resolve(ctx)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return res.ExchangeContext(ctx, m)
</s> Chore: reduce dhcp dns client cost </s> remove return res.ExchangeContext(ctx, m)
</s> add return batchExchange(ctx, clients, m) </s> remove func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
</s> add func (d *dhcpClient) resolve(ctx context.Context) ([]dnsClient, error) { </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) </s> remove resolver *Resolver
</s> add clients []dnsClient | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
return batchExchange(ctx, clients, m) | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return res.ExchangeContext(ctx, m)
<mask> }
<mask>
<mask> func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
<mask> d.lock.Lock()
<mask>
</s> Chore: reduce dhcp dns client cost </s> remove func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
</s> add func (d *dhcpClient) resolve(ctx context.Context) ([]dnsClient, error) { </s> remove res, err := d.resolve(ctx)
</s> add clients, err := d.resolve(ctx) </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) </s> remove resolver *Resolver
</s> add clients []dnsClient | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
func (d *dhcpClient) resolve(ctx context.Context) ([]dnsClient, error) { | <mask>
<mask> return res.ExchangeContext(ctx, m)
<mask> }
<mask>
<mask> func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
<mask> d.lock.Lock()
<mask>
<mask> invalidated, err := d.invalidate()
<mask> if err != nil {
<mask> d.err = err
</s> Chore: reduce dhcp dns client cost </s> remove return res.ExchangeContext(ctx, m)
</s> add return batchExchange(ctx, clients, m) </s> remove res, err := d.resolve(ctx)
</s> add clients, err := d.resolve(ctx) </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) </s> remove resolver *Resolver
</s> add clients []dnsClient | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
var res []dnsClient | <mask> go func() {
<mask> ctx, cancel := context.WithTimeout(context.Background(), DHCPTimeout)
<mask> defer cancel()
<mask>
<mask> var res *Resolver
<mask> dns, err := dhcp.ResolveDNSFromDHCP(ctx, d.ifaceName)
<mask> if err == nil {
<mask> nameserver := make([]NameServer, 0, len(dns))
<mask> for _, item := range dns {
<mask> nameserver = append(nameserver, NameServer{
</s> Chore: reduce dhcp dns client cost </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove resolver *Resolver
</s> add clients []dnsClient </s> remove res, err, done := d.resolver, d.err, d.done
</s> add res, err, done := d.clients, d.err, d.done </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
// dns never empty if err is nil | <mask> var res []dnsClient
<mask> dns, err := dhcp.ResolveDNSFromDHCP(ctx, d.ifaceName)
<mask> if err == nil {
<mask> nameserver := make([]NameServer, 0, len(dns))
<mask> for _, item := range dns {
<mask> nameserver = append(nameserver, NameServer{
</s> Chore: reduce dhcp dns client cost </s> remove var res *Resolver
</s> add var res []dnsClient </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove res, err, done := d.resolver, d.err, d.done
</s> add res, err, done := d.clients, d.err, d.done </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) </s> remove res, err := d.resolve(ctx)
</s> add clients, err := d.resolve(ctx) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
res = transform(nameserver, nil) | <mask> Interface: d.ifaceName,
<mask> })
<mask> }
<mask>
<mask> res = NewResolver(Config{
<mask> Main: nameserver,
<mask> })
<mask> }
<mask>
<mask> d.lock.Lock()
<mask> defer d.lock.Unlock()
<mask>
</s> Chore: reduce dhcp dns client cost </s> remove d.resolver = res
</s> add d.clients = res </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove res, err, done := d.resolver, d.err, d.done
</s> add res, err, done := d.clients, d.err, d.done </s> remove return res.ExchangeContext(ctx, m)
</s> add return batchExchange(ctx, clients, m) </s> remove var res *Resolver
</s> add var res []dnsClient | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
d.clients = res | <mask>
<mask> close(done)
<mask>
<mask> d.done = nil
<mask> d.resolver = res
<mask> d.err = err
<mask> }()
<mask> }
<mask>
<mask> d.lock.Unlock()
</s> Chore: reduce dhcp dns client cost </s> remove res, err, done := d.resolver, d.err, d.done
</s> add res, err, done := d.clients, d.err, d.done </s> remove res = NewResolver(Config{
Main: nameserver,
})
</s> add res = transform(nameserver, nil) </s> remove func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
</s> add func (d *dhcpClient) resolve(ctx context.Context) ([]dnsClient, error) { </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
res, err, done := d.clients, d.err, d.done | <mask>
<mask> for {
<mask> d.lock.Lock()
<mask>
<mask> res, err, done := d.resolver, d.err, d.done
<mask>
<mask> d.lock.Unlock()
<mask>
<mask> // initializing
<mask> if res == nil && err == nil {
</s> Chore: reduce dhcp dns client cost </s> remove d.resolver = res
</s> add d.clients = res </s> remove var res *Resolver
</s> add var res []dnsClient </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/dhcp.go |
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/common/picker"
<mask> "github.com/Dreamacro/clash/component/fakeip"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/component/trie"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
</s> Chore: reduce dhcp dns client cost </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/resolver.go | |
ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() | <mask> return
<mask> }
<mask>
<mask> func (r *Resolver) batchExchange(ctx context.Context, clients []dnsClient, m *D.Msg) (msg *D.Msg, err error) {
<mask> fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
<mask> for _, client := range clients {
<mask> r := client
<mask> fast.Go(func() (any, error) {
<mask> m, err := r.ExchangeContext(ctx, m)
<mask> if err != nil {
<mask> return nil, err
<mask> } else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
<mask> return nil, errors.New("server failure")
<mask> }
<mask> return m, nil
<mask> })
<mask> }
<mask>
<mask> elm := fast.Wait()
<mask> if elm == nil {
<mask> err := errors.New("all DNS requests failed")
<mask> if fErr := fast.Error(); fErr != nil {
<mask> err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
<mask> }
<mask> return nil, err
<mask> }
<mask>
<mask> msg = elm.(*D.Msg)
<mask> return
<mask> }
<mask>
</s> Chore: reduce dhcp dns client cost </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) </s> remove res, err := d.resolve(ctx)
</s> add clients, err := d.resolve(ctx) </s> remove return res.ExchangeContext(ctx, m)
</s> add return batchExchange(ctx, clients, m) </s> remove func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
</s> add func (d *dhcpClient) resolve(ctx context.Context) ([]dnsClient, error) { </s> remove resolver *Resolver
</s> add clients []dnsClient | [
"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/a3281712e2b953b900233ec8753c37b5356d8055 | dns/resolver.go |
return batchExchange(ctx, clients, m) | <mask> elm := fast.Wait()
<mask> if elm == nil {
<mask> err := errors.New("all DNS requests failed")
<mask> if fErr := fast.Error(); fErr != nil {
<mask> err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
<mask> }
<mask> return nil, err
<mask> }
<mask>
<mask> msg = elm.(*D.Msg)
<mask> return
</s> Chore: reduce dhcp dns client cost </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove res, err := d.resolve(ctx)
</s> add clients, err := d.resolve(ctx) </s> remove return res.ExchangeContext(ctx, m)
</s> add return batchExchange(ctx, clients, m) </s> remove func (d *dhcpClient) resolve(ctx context.Context) (*Resolver, error) {
</s> add func (d *dhcpClient) resolve(ctx context.Context) ([]dnsClient, error) { </s> remove res, err, done := d.resolver, d.err, d.done
</s> add res, err, done := d.clients, d.err, d.done | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/resolver.go |
"context" | <mask> package dns
<mask>
<mask> import (
<mask> "crypto/tls"
<mask> "errors"
<mask> "fmt"
<mask> "net"
<mask> "time"
</s> Chore: reduce dhcp dns client cost </s> remove "github.com/Dreamacro/clash/common/picker"
</s> add </s> remove var res *Resolver
</s> add var res []dnsClient | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/util.go |
"errors"
"fmt" | <mask> "context"
<mask> "crypto/tls"
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/common/picker"
</s> Chore: reduce dhcp dns client cost </s> remove "github.com/Dreamacro/clash/common/picker"
</s> add </s> remove err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
</s> add return batchExchange(ctx, clients, m) </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/util.go |
"github.com/Dreamacro/clash/common/picker" | <mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/log"
<mask>
<mask> D "github.com/miekg/dns"
<mask> )
<mask>
<mask> func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
</s> Chore: reduce dhcp dns client cost </s> remove "github.com/Dreamacro/clash/common/picker"
</s> add </s> remove res, err := d.resolve(ctx)
</s> add clients, err := d.resolve(ctx) </s> remove fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout)
for _, client := range clients {
r := client
fast.Go(func() (any, error) {
m, err := r.ExchangeContext(ctx, m)
if err != nil {
return nil, err
} else if m.Rcode == D.RcodeServerFailure || m.Rcode == D.RcodeRefused {
return nil, errors.New("server failure")
}
return m, nil
})
}
elm := fast.Wait()
if elm == nil {
err := errors.New("all DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err
}
</s> add ctx, cancel := context.WithTimeout(ctx, resolver.DefaultDNSTimeout)
defer cancel() </s> remove resolver *Resolver
</s> add clients []dnsClient | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a3281712e2b953b900233ec8753c37b5356d8055 | dns/util.go |
"sync" | <mask> "errors"
<mask> "io"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> )
<mask>
<mask> type aeadWriter struct {
<mask> io.Writer
</s> Fix: vmess aead writer concurrent write (#1350) </s> remove defer pool.Put(buf)
</s> add defer func() {
w.writeLock.Unlock()
pool.Put(buf)
}() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a40274e2a2acfa39781391d3cda0c95fb981857b | component/vmess/aead.go |
writeLock sync.Mutex | <mask> cipher.AEAD
<mask> nonce [32]byte
<mask> count uint16
<mask> iv []byte
<mask> }
<mask>
<mask> func newAEADWriter(w io.Writer, aead cipher.AEAD, iv []byte) *aeadWriter {
<mask> return &aeadWriter{Writer: w, AEAD: aead, iv: iv}
<mask> }
</s> Fix: vmess aead writer concurrent write (#1350) </s> remove defer pool.Put(buf)
</s> add defer func() {
w.writeLock.Unlock()
pool.Put(buf)
}() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a40274e2a2acfa39781391d3cda0c95fb981857b | component/vmess/aead.go |
w.writeLock.Lock() | <mask>
<mask> func (w *aeadWriter) Write(b []byte) (n int, err error) {
<mask> buf := pool.Get(pool.RelayBufferSize)
<mask> defer func() {
<mask> w.writeLock.Unlock()
<mask> pool.Put(buf)
<mask> }()
</s> Fix: vmess aead writer concurrent write (#1350) </s> remove defer pool.Put(buf)
</s> add defer func() {
w.writeLock.Unlock()
pool.Put(buf)
}() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a40274e2a2acfa39781391d3cda0c95fb981857b | component/vmess/aead.go |
defer func() {
w.writeLock.Unlock()
pool.Put(buf)
}() | <mask> }
<mask>
<mask> func (w *aeadWriter) Write(b []byte) (n int, err error) {
<mask> buf := pool.Get(pool.RelayBufferSize)
<mask> defer pool.Put(buf)
<mask> length := len(b)
<mask> for {
<mask> if length == 0 {
<mask> break
<mask> }
</s> Fix: vmess aead writer concurrent write (#1350) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a40274e2a2acfa39781391d3cda0c95fb981857b | component/vmess/aead.go |
log.Errorln("Start SOCKS server error: %s", err.Error()) | <mask> log.Errorln("Start HTTP server error: %s", err.Error())
<mask> }
<mask>
<mask> if err := P.ReCreateSocks(general.SocksPort, tcpIn, udpIn); err != nil {
<mask> log.Errorln("Start SOCKS5 server error: %s", err.Error())
<mask> }
<mask>
<mask> if err := P.ReCreateRedir(general.RedirPort, tcpIn, udpIn); err != nil {
<mask> log.Errorln("Start Redir server error: %s", err.Error())
<mask> }
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove log.Errorln("Start Mixed(http and socks5) server error: %s", err.Error())
</s> add log.Errorln("Start Mixed(http and socks) server error: %s", err.Error()) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
</s> add log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove log.Infoln("SOCKS5 proxy listening at: %s", socksListener.Address())
</s> add log.Infoln("SOCKS proxy listening at: %s", socksListener.Address()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | hub/executor/executor.go |
log.Errorln("Start Mixed(http and socks) server error: %s", err.Error()) | <mask> log.Errorln("Start TProxy server error: %s", err.Error())
<mask> }
<mask>
<mask> if err := P.ReCreateMixed(general.MixedPort, tcpIn, udpIn); err != nil {
<mask> log.Errorln("Start Mixed(http and socks5) server error: %s", err.Error())
<mask> }
<mask> }
<mask>
<mask> func updateUsers(users []auth.AuthUser) {
<mask> authenticator := auth.NewAuthenticator(users)
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove log.Errorln("Start SOCKS5 server error: %s", err.Error())
</s> add log.Errorln("Start SOCKS server error: %s", err.Error()) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
</s> add log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove log.Infoln("SOCKS5 proxy listening at: %s", socksListener.Address())
</s> add log.Infoln("SOCKS proxy listening at: %s", socksListener.Address()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | hub/executor/executor.go |
log.Infoln("SOCKS proxy listening at: %s", socksListener.Address()) | <mask>
<mask> socksListener = tcpListener
<mask> socksUDPListener = udpListener
<mask>
<mask> log.Infoln("SOCKS5 proxy listening at: %s", socksListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> redirMux.Lock()
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
</s> add log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove log.Errorln("Start Mixed(http and socks5) server error: %s", err.Error())
</s> add log.Errorln("Start Mixed(http and socks) server error: %s", err.Error()) </s> remove log.Errorln("Start SOCKS5 server error: %s", err.Error())
</s> add log.Errorln("Start SOCKS server error: %s", err.Error()) </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/listener.go |
log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) | <mask> mixedListener.Close()
<mask> return err
<mask> }
<mask>
<mask> log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> // GetPorts return the ports of proxy servers
<mask> func GetPorts() *Ports {
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove log.Infoln("SOCKS5 proxy listening at: %s", socksListener.Address())
</s> add log.Infoln("SOCKS proxy listening at: %s", socksListener.Address()) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove go HandleSocks(c, in)
</s> add go handleSocks(c, in) </s> remove
http.HandleConn(bufConn, in, cache)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/listener.go |
"github.com/Dreamacro/clash/transport/socks4" | <mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/listener/http"
<mask> "github.com/Dreamacro/clash/listener/socks"
<mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> type Listener struct {
<mask> listener net.Listener
<mask> address string
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove
http.HandleConn(bufConn, in, cache)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/mixed/mixed.go |
switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) | <mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> if head[0] == socks5.Version {
<mask> socks.HandleSocks(bufConn, in)
<mask> return
<mask> }
<mask>
<mask> http.HandleConn(bufConn, in, cache)
<mask> }
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove
http.HandleConn(bufConn, in, cache)
</s> add </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove go HandleSocks(c, in)
</s> add go handleSocks(c, in) </s> remove log.Errorln("Start SOCKS5 server error: %s", err.Error())
</s> add log.Errorln("Start SOCKS server error: %s", err.Error()) </s> remove log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
</s> add log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/mixed/mixed.go |
<mask> if head[0] == socks5.Version {
<mask> socks.HandleSocks(bufConn, in)
<mask> return
<mask> }
<mask>
<mask> http.HandleConn(bufConn, in, cache)
<mask> }
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove go HandleSocks(c, in)
</s> add go handleSocks(c, in) </s> remove log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
</s> add log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) </s> remove log.Errorln("Start Mixed(http and socks5) server error: %s", err.Error())
</s> add log.Errorln("Start Mixed(http and socks) server error: %s", err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/mixed/mixed.go | |
N "github.com/Dreamacro/clash/common/net" | <mask> "io/ioutil"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> authStore "github.com/Dreamacro/clash/listener/auth"
<mask> "github.com/Dreamacro/clash/transport/socks4"
<mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove go HandleSocks(c, in)
</s> add go handleSocks(c, in) </s> remove
http.HandleConn(bufConn, in, cache)
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/socks/tcp.go |
"github.com/Dreamacro/clash/transport/socks4" | <mask> C "github.com/Dreamacro/clash/constant"
<mask> authStore "github.com/Dreamacro/clash/listener/auth"
<mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> type Listener struct {
<mask> listener net.Listener
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove
http.HandleConn(bufConn, in, cache)
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/socks/tcp.go |
go handleSocks(c, in) | <mask> break
<mask> }
<mask> continue
<mask> }
<mask> go HandleSocks(c, in)
<mask> }
<mask> }()
<mask>
<mask> return sl, nil
<mask> }
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove
http.HandleConn(bufConn, in, cache)
</s> add </s> remove func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
</s> add func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { </s> remove log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
</s> add log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) </s> remove log.Errorln("Start SOCKS5 server error: %s", err.Error())
</s> add log.Errorln("Start SOCKS server error: %s", err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/socks/tcp.go |
func handleSocks(conn net.Conn, in chan<- C.ConnContext) {
bufConn := N.NewBufferedConn(conn)
head, err := bufConn.Peek(1)
if err != nil {
conn.Close()
return
}
switch head[0] {
case socks4.Version:
HandleSocks4(bufConn, in)
case socks5.Version:
HandleSocks5(bufConn, in)
default:
conn.Close()
}
}
func HandleSocks4(conn net.Conn, in chan<- C.ConnContext) {
addr, _, err := socks4.ServerHandshake(conn, authStore.Authenticator())
if err != nil {
conn.Close()
return
}
if c, ok := conn.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
in <- inbound.NewSocket(socks5.ParseAddr(addr), conn, C.SOCKS)
}
func HandleSocks5(conn net.Conn, in chan<- C.ConnContext) { | <mask> func (l *Listener) Address() string {
<mask> return l.address
<mask> }
<mask>
<mask> func HandleSocks(conn net.Conn, in chan<- C.ConnContext) {
<mask> target, command, err := socks5.ServerHandshake(conn, authStore.Authenticator())
<mask> if err != nil {
<mask> conn.Close()
<mask> return
<mask> }
</s> Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) </s> remove log.Errorln("Start Mixed(http and socks5) server error: %s", err.Error())
</s> add log.Errorln("Start Mixed(http and socks) server error: %s", err.Error()) </s> remove log.Infoln("SOCKS5 proxy listening at: %s", socksListener.Address())
</s> add log.Infoln("SOCKS proxy listening at: %s", socksListener.Address()) </s> remove if head[0] == socks5.Version {
socks.HandleSocks(bufConn, in)
return
</s> add switch head[0] {
case socks4.Version:
socks.HandleSocks4(bufConn, in)
case socks5.Version:
socks.HandleSocks5(bufConn, in)
default:
http.HandleConn(bufConn, in, cache) </s> remove log.Errorln("Start SOCKS5 server error: %s", err.Error())
</s> add log.Errorln("Start SOCKS server error: %s", err.Error()) </s> remove log.Infoln("Mixed(http+socks5) proxy listening at: %s", mixedListener.Address())
</s> add log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a461c2306ab97d7814b196d057e91ed9dce71284 | listener/socks/tcp.go |
pc, err := dialer.ListenPacket(context.Background(), "udp", "") | <mask> }
<mask>
<mask> // DialUDP implements C.ProxyAdapter
<mask> func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> pc, err := dialer.ListenPacket("udp", "")
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> return newPacketConn(&directPacketConn{pc}, d), nil
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </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 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) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | adapter/outbound/direct.go |
pc, err := dialer.ListenPacket(context.Background(), "udp", "") | <mask> }
<mask>
<mask> // DialUDP implements C.ProxyAdapter
<mask> func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> pc, err := dialer.ListenPacket("udp", "")
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> addr, err := resolveUDPAddr("udp", ss.addr)
</s> Feature: add dhcp type dns client (#1509) </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </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 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",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | adapter/outbound/shadowsocks.go |
pc, err := dialer.ListenPacket(context.Background(), "udp", "") | <mask> }
<mask>
<mask> // DialUDP implements C.ProxyAdapter
<mask> func (ssr *ShadowSocksR) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> pc, err := dialer.ListenPacket("udp", "")
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> addr, err := resolveUDPAddr("udp", ssr.addr)
</s> Feature: add dhcp type dns client (#1509) </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </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 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",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | adapter/outbound/shadowsocksr.go |
pc, err := dialer.ListenPacket(context.Background(), "udp", "") | <mask> err = fmt.Errorf("client hanshake error: %w", err)
<mask> return
<mask> }
<mask>
<mask> pc, err := dialer.ListenPacket("udp", "")
<mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> go func() {
</s> Feature: add dhcp type dns client (#1509) </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </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 go r.exchangeWithoutCache(m)
</s> add go r.exchangeWithoutCache(ctx, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | adapter/outbound/socks5.go |
"net" | <mask> "context"
<mask> "io/ioutil"
<mask> "net/http"
<mask> "net/url"
<mask> "time"
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove return dualStackDialContext(ctx, network, address)
</s> add return dualStackDialContext(ctx, network, address, options) </s> remove return nil
</s> add return address, nil </s> remove import "net"
</s> add import (
"net"
"strconv"
"strings" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | adapter/provider/vehicle.go |
DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
return dialer.DialContext(ctx, network, address)
}, | <mask> MaxIdleConns: 100,
<mask> IdleConnTimeout: 90 * time.Second,
<mask> TLSHandshakeTimeout: 10 * time.Second,
<mask> ExpectContinueTimeout: 1 * time.Second,
<mask> DialContext: dialer.DialContext,
<mask> }
<mask>
<mask> client := http.Client{Transport: transport}
<mask> resp, err := client.Do(req)
<mask> if err != nil {
</s> Feature: add dhcp type dns client (#1509) </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 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) asyncExchange(client []dnsClient, msg *D.Msg) <-chan *result {
</s> add func (r *Resolver) asyncExchange(ctx context.Context, client []dnsClient, msg *D.Msg) <-chan *result { </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 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 | adapter/provider/vehicle.go |
"golang.org/x/sys/unix"
"github.com/Dreamacro/clash/component/iface" | <mask> import (
<mask> "net"
<mask> "syscall"
<mask> )
<mask>
<mask> type controlFn = func(network, address string, c syscall.RawConn) error
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceName string, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceIdx int, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove import "net"
</s> add import (
"net"
"strconv"
"strings" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
func bindControl(ifaceIdx int, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
| <mask> )
<mask>
<mask> type controlFn = func(network, address string, c syscall.RawConn) error
<mask>
<mask> func bindControl(ifaceIdx int) controlFn {
<mask> return func(network, address string, c syscall.RawConn) error {
<mask> ipStr, _, err := net.SplitHostPort(address)
<mask> if err == nil {
<mask> ip := net.ParseIP(ipStr)
<mask> if ip != nil && !ip.IsGlobalUnicast() {
<mask> return nil
</s> Feature: add dhcp type dns client (#1509) </s> remove func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceName string, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
return | <mask> ipStr, _, err := net.SplitHostPort(address)
<mask> if err == nil {
<mask> ip := net.ParseIP(ipStr)
<mask> if ip != nil && !ip.IsGlobalUnicast() {
<mask> return nil
<mask> }
<mask> }
<mask>
<mask> return c.Control(func(fd uintptr) {
<mask> switch network {
</s> Feature: add dhcp type dns client (#1509) </s> remove return nil
</s> add return </s> remove func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceIdx int, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceName string, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</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 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, unix.IP_BOUND_IF, ifaceIdx) | <mask>
<mask> return c.Control(func(fd uintptr) {
<mask> switch network {
<mask> case "tcp4", "udp4":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx)
<mask> case "tcp6", "udp6":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx)
<mask> }
<mask> })
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx)
</s> add unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_BOUND_IF, ifaceIdx) </s> remove dialer, err := Dialer()
if err != nil {
return nil, err
}
</s> add </s> remove return nil
</s> add return </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 syscall.BindToDevice(int(fd), ifaceName)
</s> add unix.BindToDevice(int(fd), ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
unix.SetsockoptInt(int(fd), unix.IPPROTO_IPV6, unix.IPV6_BOUND_IF, ifaceIdx) | <mask> switch network {
<mask> case "tcp4", "udp4":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx)
<mask> case "tcp6", "udp6":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx)
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx)
</s> add unix.SetsockoptInt(int(fd), unix.IPPROTO_IP, unix.IP_BOUND_IF, ifaceIdx) </s> remove dialer, err := Dialer()
if err != nil {
return nil, err
}
</s> add </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 {
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 </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, _ string, _ net.IP) error {
ifaceObj, err := iface.ResolveInterface(ifaceName) | <mask> })
<mask> }
<mask> }
<mask>
<mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
<mask> iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
<mask> return net.InterfaceByName(ifaceName)
<mask> })
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> Feature: add dhcp type dns client (#1509) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
return net.InterfaceByName(ifaceName)
})
</s> add func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName) </s> remove dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> add dialer.Control = bindControl(ifaceObj.Index, dialer.Control) </s> remove return err
</s> add return "", err </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) </s> remove syscall.BindToDevice(int(fd), ifaceName)
</s> add unix.BindToDevice(int(fd), ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
dialer.Control = bindControl(ifaceObj.Index, dialer.Control) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> dialer.Control = bindControl(iface.(*net.Interface).Index)
<mask> return nil
<mask> }
<mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
<mask> iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
</s> Feature: add dhcp type dns client (#1509) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
return net.InterfaceByName(ifaceName)
})
</s> add func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName) </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) </s> remove return err
</s> add return "", err </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) </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 | component/dialer/bind_darwin.go |
func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName) | <mask> dialer.Control = bindControl(iface.(*net.Interface).Index)
<mask> return nil
<mask> }
<mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
<mask> iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
<mask> return net.InterfaceByName(ifaceName)
<mask> })
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> lc.Control = bindControl(iface.(*net.Interface).Index)
</s> Feature: add dhcp type dns client (#1509) </s> remove dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> add dialer.Control = bindControl(ifaceObj.Index, dialer.Control) </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) </s> remove return err
</s> add return "", err </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) </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",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
return "", err | <mask> iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
<mask> return net.InterfaceByName(ifaceName)
<mask> })
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> lc.Control = bindControl(iface.(*net.Interface).Index)
<mask> return nil
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
return net.InterfaceByName(ifaceName)
})
</s> add func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName) </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) </s> remove dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> add dialer.Control = bindControl(ifaceObj.Index, dialer.Control) </s> remove lc.Control = bindControl(iface.(*net.Interface).Index)
return nil
</s> add lc.Control = bindControl(ifaceObj.Index, lc.Control)
return address, nil </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 | component/dialer/bind_darwin.go |
lc.Control = bindControl(ifaceObj.Index, lc.Control)
return address, nil | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> lc.Control = bindControl(iface.(*net.Interface).Index)
<mask> return nil
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove return err
</s> add return "", err </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
return net.InterfaceByName(ifaceName)
})
</s> add func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName) </s> remove dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> add dialer.Control = bindControl(ifaceObj.Index, dialer.Control) </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) </s> remove return nil
</s> add return address, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_darwin.go |
"golang.org/x/sys/unix" | <mask> "net"
<mask> "syscall"
<mask> )
<mask>
<mask> type controlFn = func(network, address string, c syscall.RawConn) error
<mask>
<mask> func bindControl(ifaceName string, chain controlFn) controlFn {
<mask> return func(network, address string, c syscall.RawConn) (err error) {
</s> Feature: add dhcp type dns client (#1509) </s> remove func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceName string, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceIdx int, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</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) </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) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_linux.go |
func bindControl(ifaceName string, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
| <mask> )
<mask>
<mask> type controlFn = func(network, address string, c syscall.RawConn) error
<mask>
<mask> func bindControl(ifaceName string) controlFn {
<mask> return func(network, address string, c syscall.RawConn) error {
<mask> ipStr, _, err := net.SplitHostPort(address)
<mask> if err == nil {
<mask> ip := net.ParseIP(ipStr)
<mask> if ip != nil && !ip.IsGlobalUnicast() {
<mask> return nil
</s> Feature: add dhcp type dns client (#1509) </s> remove func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceIdx int, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_linux.go |
return | <mask> ipStr, _, err := net.SplitHostPort(address)
<mask> if err == nil {
<mask> ip := net.ParseIP(ipStr)
<mask> if ip != nil && !ip.IsGlobalUnicast() {
<mask> return nil
<mask> }
<mask> }
<mask>
<mask> return c.Control(func(fd uintptr) {
<mask> syscall.BindToDevice(int(fd), ifaceName)
</s> Feature: add dhcp type dns client (#1509) </s> remove return nil
</s> add return </s> remove func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceName string, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceIdx int, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove syscall.BindToDevice(int(fd), ifaceName)
</s> add unix.BindToDevice(int(fd), ifaceName) </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" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_linux.go |
unix.BindToDevice(int(fd), ifaceName) | <mask> }
<mask> }
<mask>
<mask> return c.Control(func(fd uintptr) {
<mask> syscall.BindToDevice(int(fd), ifaceName)
<mask> })
<mask> }
<mask> }
<mask>
<mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
</s> Feature: add dhcp type dns client (#1509) </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) </s> remove return nil
</s> add return </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) </s> remove import "net"
</s> add import (
"net"
"strconv"
"strings" </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 | component/dialer/bind_linux.go |
func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, _ string, _ net.IP) error {
dialer.Control = bindControl(ifaceName, dialer.Control) | <mask> })
<mask> }
<mask> }
<mask>
<mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
<mask> dialer.Control = bindControl(ifaceName)
<mask>
<mask> return nil
<mask> }
<mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
</s> Feature: add dhcp type dns client (#1509) </s> remove return nil
</s> add return address, nil </s> remove syscall.BindToDevice(int(fd), ifaceName)
</s> add unix.BindToDevice(int(fd), ifaceName) </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) </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) </s> remove dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> add dialer.Control = bindControl(ifaceObj.Index, dialer.Control) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_linux.go |
func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
lc.Control = bindControl(ifaceName, lc.Control) | <mask>
<mask> return nil
<mask> }
<mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
<mask> lc.Control = bindControl(ifaceName)
<mask>
<mask> return nil
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove return nil
</s> add return address, nil </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) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
return net.InterfaceByName(ifaceName)
})
</s> add func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName) </s> remove dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> add dialer.Control = bindControl(ifaceObj.Index, dialer.Control) </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",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_linux.go |
return address, nil | <mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
<mask> lc.Control = bindControl(ifaceName)
<mask>
<mask> return nil
<mask> }
</s> Feature: add dhcp type dns client (#1509) </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) </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) </s> remove func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
iface, err, _ := ifaceSingle.Do(func() (interface{}, error) {
return net.InterfaceByName(ifaceName)
})
</s> add func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
ifaceObj, err := iface.ResolveInterface(ifaceName) </s> remove dialer.Control = bindControl(iface.(*net.Interface).Index)
</s> add dialer.Control = bindControl(ifaceObj.Index, dialer.Control) </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"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_linux.go |
import (
"net"
"strconv"
"strings" | <mask> // +build !linux,!darwin
<mask>
<mask> package dialer
<mask>
<mask> import "net"
<mask>
<mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
<mask> return errPlatformNotSupport
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </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) </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 </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) </s> remove syscall.BindToDevice(int(fd), ifaceName)
</s> add unix.BindToDevice(int(fd), ifaceName) </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 | component/dialer/bind_others.go |
"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 | <mask> package dialer
<mask>
<mask> import "net"
<mask>
<mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
<mask> return errPlatformNotSupport
<mask> }
<mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
<mask> return errPlatformNotSupport
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove import "net"
</s> add import (
"net"
"strconv"
"strings" </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) </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 syscall.BindToDevice(int(fd), ifaceName)
</s> add unix.BindToDevice(int(fd), ifaceName) </s> remove return nil
</s> add return address, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_others.go |
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 | <mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
<mask> return errPlatformNotSupport
<mask> }
<mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
<mask> return errPlatformNotSupport
<mask> }
</s> Feature: add dhcp type dns client (#1509) </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) </s> remove import "net"
</s> add import (
"net"
"strconv"
"strings" </s> remove syscall.BindToDevice(int(fd), ifaceName)
</s> add unix.BindToDevice(int(fd), ifaceName) </s> remove return nil
</s> add return address, nil </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",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/bind_others.go |
func DialContext(ctx context.Context, network, address string, options ...Option) (net.Conn, error) { | <mask>
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> )
<mask>
<mask> func Dialer() (*net.Dialer, error) {
<mask> dialer := &net.Dialer{}
<mask> if DialerHook != nil {
<mask> if err := DialerHook(dialer); err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> return dialer, nil
<mask> }
<mask>
<mask> func Dial(network, address string) (net.Conn, error) {
<mask> return DialContext(context.Background(), network, address)
<mask> }
<mask>
<mask> func DialContext(ctx context.Context, network, address string) (net.Conn, error) {
<mask> switch network {
<mask> case "tcp4", "tcp6", "udp4", "udp6":
<mask> host, port, err := net.SplitHostPort(address)
<mask> if err != nil {
<mask> return nil, err
</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 return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) </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 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 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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> dialer, err := Dialer()
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> var ip net.IP
<mask> switch network {
<mask> case "tcp4", "udp4":
<mask> ip, err = resolver.ResolveIPv4(host)
<mask> default:
</s> Feature: add dhcp type dns client (#1509) </s> remove dialer, err := Dialer()
if err != nil {
result.error = err
return
}
</s> add </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 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 </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go | |
return dialContext(ctx, network, ip, port, options) | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if DialHook != nil {
<mask> if err := DialHook(dialer, network, ip); err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask> return dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), port))
<mask> case "tcp", "udp":
<mask> return dualStackDialContext(ctx, network, address)
<mask> default:
<mask> return nil, errors.New("network invalid")
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove return dualStackDialContext(ctx, network, address)
</s> add return dualStackDialContext(ctx, network, address, options) </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 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 return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
return dualStackDialContext(ctx, network, address, options) | <mask> }
<mask> }
<mask> return dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), port))
<mask> case "tcp", "udp":
<mask> return dualStackDialContext(ctx, network, address)
<mask> default:
<mask> return nil, errors.New("network invalid")
<mask> }
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </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 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 return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) </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) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
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) | <mask> return nil, errors.New("network invalid")
<mask> }
<mask> }
<mask>
<mask> func ListenPacket(network, address string) (net.PacketConn, error) {
<mask> cfg := &net.ListenConfig{}
<mask> if ListenPacketHook != nil {
<mask> var err error
<mask> address, err = ListenPacketHook(cfg, address)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </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 return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) </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 return dualStackDialContext(ctx, network, address)
</s> add return dualStackDialContext(ctx, network, address, options) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
address = addr
}
if cfg.addrReuse {
addrReuseToListenConfig(lc) | <mask> addr, err := bindIfaceToListenConfig(cfg.interfaceName, lc, network, address)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> return lc.ListenPacket(ctx, network, address)
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) </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 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 return dualStackDialContext(ctx, network, address)
</s> add return dualStackDialContext(ctx, network, address, options) </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) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
return lc.ListenPacket(ctx, network, address) | <mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> return cfg.ListenPacket(context.Background(), network, address)
<mask> }
<mask>
<mask> func dualStackDialContext(ctx context.Context, network, address string) (net.Conn, error) {
<mask> host, port, err := net.SplitHostPort(address)
<mask> if err != nil {
</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 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 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 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) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
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) { | <mask>
<mask> return cfg.ListenPacket(context.Background(), network, address)
<mask> }
<mask>
<mask> func dualStackDialContext(ctx context.Context, network, address string) (net.Conn, error) {
<mask> host, port, err := net.SplitHostPort(address)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) </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 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 DialContext: dialer.DialContext,
</s> add DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
return dialer.DialContext(ctx, network, address)
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
<mask> }
<mask> }
<mask> }()
<mask>
<mask> dialer, err := Dialer()
<mask> if err != nil {
<mask> result.error = err
<mask> return
<mask> }
<mask>
<mask> var ip net.IP
<mask> if ipv6 {
<mask> ip, result.error = resolver.ResolveIPv6(host)
<mask> } else {
<mask> ip, result.error = resolver.ResolveIPv4(host)
</s> Feature: add dhcp type dns client (#1509) </s> remove dialer, err := Dialer()
if err != nil {
return nil, err
}
</s> add </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 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 </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 dialer.DialHook = nil
dialer.ListenPacketHook = nil
</s> add dialer.DefaultOptions = nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go | |
result.Conn, result.error = dialContext(ctx, network, ip, port, options) | <mask> return
<mask> }
<mask> result.resolved = true
<mask>
<mask> if DialHook != nil {
<mask> if result.error = DialHook(dialer, network, ip); result.error != nil {
<mask> return
<mask> }
<mask> }
<mask> result.Conn, result.error = dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), port))
<mask> }
<mask>
<mask> go startRacer(ctx, network+"4", host, false)
<mask> go startRacer(ctx, network+"6", host, true)
<mask>
</s> Feature: add dhcp type dns client (#1509) </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 dialer, err := Dialer()
if err != nil {
result.error = err
return
}
</s> add </s> remove return dualStackDialContext(ctx, network, address)
</s> add return dualStackDialContext(ctx, network, address, options) </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 return cfg.ListenPacket(context.Background(), network, address)
</s> add return lc.ListenPacket(ctx, network, address) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | component/dialer/dialer.go |
case "dhcp":
addr = u.Host
dnsNetType = "dhcp" // UDP from DHCP | <mask> clearURL := url.URL{Scheme: "https", Host: u.Host, Path: u.Path}
<mask> addr = clearURL.String()
<mask> dnsNetType = "https" // DNS over HTTPS
<mask> default:
<mask> return nil, fmt.Errorf("DNS NameServer[%d] unsupport scheme: %s", idx, u.Scheme)
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove dialer, err := Dialer()
if err != nil {
return nil, err
}
</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 </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 return dualStackDialContext(ctx, network, address)
</s> add return dualStackDialContext(ctx, network, address, options) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | config/config.go |
"crypto/tls" | <mask> package dns
<mask>
<mask> import (
<mask> "context"
<mask> "fmt"
<mask> "net"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
</s> Feature: add dhcp type dns client (#1509) </s> remove import "net"
</s> add import (
"net"
"strconv"
"strings" </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",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/client.go |
network := "udp"
if strings.HasPrefix(c.Client.Net, "tcp") {
network = "tcp" | <mask> return nil, fmt.Errorf("use default dns resolve failed: %w", err)
<mask> }
<mask> }
<mask>
<mask> d, err := dialer.Dialer()
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if ip != nil && ip.IsGlobalUnicast() && dialer.DialHook != nil {
<mask> network := "udp"
<mask> if strings.HasPrefix(c.Client.Net, "tcp") {
</s> Feature: add dhcp type dns client (#1509) </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 return nil
</s> add return </s> remove return nil
</s> add return </s> remove dialer, err := Dialer()
if err != nil {
return nil, err
}
</s> add </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/client.go |
conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
if err != nil {
return nil, err | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if ip != nil && ip.IsGlobalUnicast() && dialer.DialHook != nil {
<mask> network := "udp"
<mask> if strings.HasPrefix(c.Client.Net, "tcp") {
<mask> network = "tcp"
<mask> }
<mask> if err := dialer.DialHook(d, network, ip); err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> c.Client.Dialer = d
<mask>
<mask> // miekg/dns ExchangeContext doesn't respond to context cancel.
</s> Feature: add dhcp type dns client (#1509) </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
c.Client.Dialer = d
</s> add defer conn.Close() </s> remove return nil
</s> add return </s> remove dialer, err := Dialer()
if err != nil {
return nil, err
}
</s> add </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/client.go |
defer conn.Close() | <mask> if err := dialer.DialHook(d, network, ip); err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> c.Client.Dialer = d
<mask>
<mask> // miekg/dns ExchangeContext doesn't respond to context cancel.
<mask> // this is a workaround
<mask> type result struct {
<mask> msg *D.Msg
</s> Feature: add dhcp type dns client (#1509) </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 fallbackMsg := r.asyncExchange(r.fallback, m)
</s> add fallbackMsg := r.asyncExchange(ctx, r.fallback, m) </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 go r.exchangeWithoutCache(m)
</s> add go r.exchangeWithoutCache(ctx, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/client.go |
if strings.HasSuffix(c.Client.Net, "tls") {
conn = tls.Client(conn, c.Client.TLSConfig)
}
msg, _, err = c.Client.ExchangeWithConn(m, &D.Conn{
Conn: conn,
UDPSize: c.Client.UDPSize,
TsigSecret: c.Client.TsigSecret,
TsigProvider: c.Client.TsigProvider,
})
| <mask> err error
<mask> }
<mask> ch := make(chan result, 1)
<mask> go func() {
<mask> msg, _, err := c.Client.Exchange(m, net.JoinHostPort(ip.String(), c.port))
<mask> ch <- result{msg, err}
<mask> }()
<mask>
<mask> select {
<mask> case <-ctx.Done():
</s> Feature: add dhcp type dns client (#1509) </s> remove res, err := r.batchExchange(client, msg)
</s> add res, err := r.batchExchange(ctx, client, msg) </s> remove func (r *Resolver) asyncExchange(client []dnsClient, msg *D.Msg) <-chan *result {
</s> add func (r *Resolver) asyncExchange(ctx context.Context, client []dnsClient, msg *D.Msg) <-chan *result { </s> remove pc, err := dialer.ListenPacket("udp", "")
</s> add pc, err := dialer.ListenPacket(context.Background(), "udp", "") </s> remove func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceIdx int, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
</s> remove func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
</s> add func bindControl(ifaceName string, chain controlFn) controlFn {
return func(network, address string, c syscall.RawConn) (err error) {
defer func() {
if err == nil && chain != nil {
err = chain(network, address, c)
}
}()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/client.go |
return r.ExchangeContext(context.Background(), m)
}
// ExchangeContext a batch of dns request with context.Context, and it use cache
func (r *Resolver) ExchangeContext(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { | <mask>
<mask> // Exchange a batch of dns request, and it use cache
<mask> func (r *Resolver) Exchange(m *D.Msg) (msg *D.Msg, err error) {
<mask> if len(m.Question) == 0 {
<mask> return nil, errors.New("should have one question at least")
<mask> }
<mask>
<mask> q := m.Question[0]
</s> Feature: add dhcp type dns client (#1509) </s> remove return r.exchangeWithoutCache(m)
</s> add return r.exchangeWithoutCache(ctx, m) </s> remove func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) exchangeWithoutCache(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </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) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
go r.exchangeWithoutCache(ctx, m) | <mask> now := time.Now()
<mask> msg = cache.(*D.Msg).Copy()
<mask> if expireTime.Before(now) {
<mask> setMsgTTL(msg, uint32(1)) // Continue fetch
<mask> go r.exchangeWithoutCache(m)
<mask> } else {
<mask> setMsgTTL(msg, uint32(time.Until(expireTime).Seconds()))
<mask> }
<mask> return
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove return r.exchangeWithoutCache(m)
</s> add return r.exchangeWithoutCache(ctx, m) </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 </s> remove dialer.DialHook = nil
dialer.ListenPacketHook = nil
</s> add dialer.DefaultOptions = nil </s> remove
c.Client.Dialer = d
</s> add defer conn.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
return r.exchangeWithoutCache(ctx, m) | <mask> setMsgTTL(msg, uint32(time.Until(expireTime).Seconds()))
<mask> }
<mask> return
<mask> }
<mask> return r.exchangeWithoutCache(m)
<mask> }
<mask>
<mask> // ExchangeWithoutCache a batch of dns request, and it do NOT GET from cache
<mask> func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
<mask> q := m.Question[0]
</s> Feature: add dhcp type dns client (#1509) </s> remove func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) exchangeWithoutCache(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove go r.exchangeWithoutCache(m)
</s> add go r.exchangeWithoutCache(ctx, m) </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) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
func (r *Resolver) exchangeWithoutCache(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { | <mask> return r.exchangeWithoutCache(m)
<mask> }
<mask>
<mask> // ExchangeWithoutCache a batch of dns request, and it do NOT GET from cache
<mask> func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
<mask> q := m.Question[0]
<mask>
<mask> ret, err, shared := r.group.Do(q.String(), func() (result interface{}, err error) {
<mask> defer func() {
<mask> if err != nil {
</s> Feature: add dhcp type dns client (#1509) </s> remove return r.exchangeWithoutCache(m)
</s> add return r.exchangeWithoutCache(ctx, m) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </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 res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
return r.ipExchange(ctx, m) | <mask> }()
<mask>
<mask> isIPReq := isIPRequest(q)
<mask> if isIPReq {
<mask> return r.ipExchange(m)
<mask> }
<mask>
<mask> if matched := r.matchPolicy(m); len(matched) != 0 {
<mask> return r.batchExchange(matched, m)
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove return r.batchExchange(matched, m)
</s> add return r.batchExchange(ctx, matched, m) </s> remove return r.batchExchange(r.main, m)
</s> add return r.batchExchange(ctx, r.main, m) </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove fallbackMsg := r.asyncExchange(r.fallback, m)
</s> add fallbackMsg := r.asyncExchange(ctx, r.fallback, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
return r.batchExchange(ctx, matched, m) | <mask> return r.ipExchange(m)
<mask> }
<mask>
<mask> if matched := r.matchPolicy(m); len(matched) != 0 {
<mask> return r.batchExchange(matched, m)
<mask> }
<mask> return r.batchExchange(r.main, m)
<mask> })
<mask>
<mask> if err == nil {
</s> Feature: add dhcp type dns client (#1509) </s> remove return r.batchExchange(r.main, m)
</s> add return r.batchExchange(ctx, r.main, m) </s> remove return r.ipExchange(m)
</s> add return r.ipExchange(ctx, m) </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove fallbackMsg := r.asyncExchange(r.fallback, m)
</s> add fallbackMsg := r.asyncExchange(ctx, r.fallback, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
return r.batchExchange(ctx, r.main, m) | <mask>
<mask> if matched := r.matchPolicy(m); len(matched) != 0 {
<mask> return r.batchExchange(matched, m)
<mask> }
<mask> return r.batchExchange(r.main, m)
<mask> })
<mask>
<mask> if err == nil {
<mask> msg = ret.(*D.Msg)
<mask> if shared {
</s> Feature: add dhcp type dns client (#1509) </s> remove return r.batchExchange(matched, m)
</s> add return r.batchExchange(ctx, matched, m) </s> remove return r.ipExchange(m)
</s> add return r.ipExchange(ctx, m) </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove fallbackMsg := r.asyncExchange(r.fallback, m)
</s> add fallbackMsg := r.asyncExchange(ctx, r.fallback, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
func (r *Resolver) batchExchange(ctx context.Context, clients []dnsClient, m *D.Msg) (msg *D.Msg, err error) {
fast, ctx := picker.WithTimeout(ctx, resolver.DefaultDNSTimeout) | <mask>
<mask> return
<mask> }
<mask>
<mask> func (r *Resolver) batchExchange(clients []dnsClient, m *D.Msg) (msg *D.Msg, err error) {
<mask> fast, ctx := picker.WithTimeout(context.Background(), resolver.DefaultDNSTimeout)
<mask> for _, client := range clients {
<mask> r := client
<mask> fast.Go(func() (interface{}, error) {
<mask> m, err := r.ExchangeContext(ctx, m)
<mask> if err != nil {
</s> Feature: add dhcp type dns client (#1509) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) exchangeWithoutCache(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove func (r *Resolver) asyncExchange(client []dnsClient, msg *D.Msg) <-chan *result {
</s> add func (r *Resolver) asyncExchange(ctx context.Context, client []dnsClient, msg *D.Msg) <-chan *result { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { | <mask>
<mask> return false
<mask> }
<mask>
<mask> func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
<mask>
<mask> if matched := r.matchPolicy(m); len(matched) != 0 {
<mask> res := <-r.asyncExchange(matched, m)
<mask> return res.Msg, res.Error
<mask> }
</s> Feature: add dhcp type dns client (#1509) </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove return r.ipExchange(m)
</s> add return r.ipExchange(ctx, m) </s> remove return r.batchExchange(matched, m)
</s> add return r.batchExchange(ctx, matched, m) </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) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
res := <-r.asyncExchange(ctx, matched, m) | <mask>
<mask> func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
<mask>
<mask> if matched := r.matchPolicy(m); len(matched) != 0 {
<mask> res := <-r.asyncExchange(matched, m)
<mask> return res.Msg, res.Error
<mask> }
<mask>
<mask> onlyFallback := r.shouldOnlyQueryFallback(m)
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove res := <-r.asyncExchange(r.fallback, m)
</s> add res := <-r.asyncExchange(ctx, r.fallback, m) </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 return r.ipExchange(m)
</s> add return r.ipExchange(ctx, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
res := <-r.asyncExchange(ctx, r.fallback, m) | <mask>
<mask> onlyFallback := r.shouldOnlyQueryFallback(m)
<mask>
<mask> if onlyFallback {
<mask> res := <-r.asyncExchange(r.fallback, m)
<mask> return res.Msg, res.Error
<mask> }
<mask>
<mask> msgCh := r.asyncExchange(r.main, m)
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove msgCh := r.asyncExchange(r.main, m)
</s> add msgCh := r.asyncExchange(ctx, r.main, m) </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove fallbackMsg := r.asyncExchange(r.fallback, m)
</s> add fallbackMsg := r.asyncExchange(ctx, r.fallback, m) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove return r.ipExchange(m)
</s> add return r.ipExchange(ctx, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
msgCh := r.asyncExchange(ctx, r.main, m) | <mask> res := <-r.asyncExchange(r.fallback, m)
<mask> return res.Msg, res.Error
<mask> }
<mask>
<mask> msgCh := r.asyncExchange(r.main, m)
<mask>
<mask> if r.fallback == nil { // directly return if no fallback servers are available
<mask> res := <-msgCh
<mask> msg, err = res.Msg, res.Error
<mask> return
</s> Feature: add dhcp type dns client (#1509) </s> remove res := <-r.asyncExchange(r.fallback, m)
</s> add res := <-r.asyncExchange(ctx, r.fallback, m) </s> remove fallbackMsg := r.asyncExchange(r.fallback, m)
</s> add fallbackMsg := r.asyncExchange(ctx, r.fallback, m) </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove return r.batchExchange(matched, m)
</s> add return r.batchExchange(ctx, matched, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
fallbackMsg := r.asyncExchange(ctx, r.fallback, m) | <mask> msg, err = res.Msg, res.Error
<mask> return
<mask> }
<mask>
<mask> fallbackMsg := r.asyncExchange(r.fallback, m)
<mask> res := <-msgCh
<mask> if res.Error == nil {
<mask> if ips := msgToIP(res.Msg); len(ips) != 0 {
<mask> if !r.shouldIPFallback(ips[0]) {
<mask> msg = res.Msg // no need to wait for fallback result
</s> Feature: add dhcp type dns client (#1509) </s> remove msgCh := r.asyncExchange(r.main, m)
</s> add msgCh := r.asyncExchange(ctx, r.main, m) </s> remove res := <-r.asyncExchange(r.fallback, m)
</s> add res := <-r.asyncExchange(ctx, r.fallback, m) </s> remove res := <-r.asyncExchange(matched, m)
</s> add res := <-r.asyncExchange(ctx, matched, m) </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove return r.batchExchange(r.main, m)
</s> add return r.batchExchange(ctx, r.main, m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
func (r *Resolver) asyncExchange(ctx context.Context, client []dnsClient, msg *D.Msg) <-chan *result { | <mask>
<mask> return ""
<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)
<mask> ch <- &result{Msg: res, Error: err}
<mask> }()
</s> Feature: add dhcp type dns client (#1509) </s> remove res, err := r.batchExchange(client, msg)
</s> add res, err := r.batchExchange(ctx, client, msg) </s> remove msg, _, err := c.Client.Exchange(m, net.JoinHostPort(ip.String(), c.port))
</s> add if strings.HasSuffix(c.Client.Net, "tls") {
conn = tls.Client(conn, c.Client.TLSConfig)
}
msg, _, err = c.Client.ExchangeWithConn(m, &D.Conn{
Conn: conn,
UDPSize: c.Client.UDPSize,
TsigSecret: c.Client.TsigSecret,
TsigProvider: c.Client.TsigProvider,
})
</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 (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) exchangeWithoutCache(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
res, err := r.batchExchange(ctx, client, msg) | <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)
<mask> ch <- &result{Msg: res, Error: err}
<mask> }()
<mask> return ch
<mask> }
<mask>
</s> Feature: add dhcp type dns client (#1509) </s> remove func (r *Resolver) asyncExchange(client []dnsClient, msg *D.Msg) <-chan *result {
</s> add func (r *Resolver) asyncExchange(ctx context.Context, client []dnsClient, msg *D.Msg) <-chan *result { </s> remove msg, _, err := c.Client.Exchange(m, net.JoinHostPort(ip.String(), c.port))
</s> add if strings.HasSuffix(c.Client.Net, "tls") {
conn = tls.Client(conn, c.Client.TLSConfig)
}
msg, _, err = c.Client.ExchangeWithConn(m, &D.Conn{
Conn: conn,
UDPSize: c.Client.UDPSize,
TsigSecret: c.Client.TsigSecret,
TsigProvider: c.Client.TsigProvider,
})
</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 (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) exchangeWithoutCache(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { </s> remove func (r *Resolver) ipExchange(m *D.Msg) (msg *D.Msg, err error) {
</s> add func (r *Resolver) ipExchange(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/a5b950a779871ae7045653a242bc7b3906011cdd | dns/resolver.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.