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 newConn(c, ss), err | <mask> }
<mask> }
<mask> c = ss.cipher.StreamConn(c)
<mask> _, err = c.Write(serializesSocksAddr(metadata))
<mask> return c, err
<mask> }
<mask>
<mask> func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> pc, err := net.ListenPacket("udp", "")
<mask> if err != nil {
</s> Feature: trace adapters when dialing (#170) </s> remove func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, nil
</s> add return newConn(c, d), nil </s> remove func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, nil
</s> add return newConn(c, ss), nil </s> remove func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
</s> add func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/shadowsocks.go |
func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | <mask> _, err = c.Write(serializesSocksAddr(metadata))
<mask> return c, err
<mask> }
<mask>
<mask> func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> pc, err := net.ListenPacket("udp", "")
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
</s> Feature: trace adapters when dialing (#170) </s> remove return c, err
</s> add return newConn(c, ss), err </s> remove func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, nil
</s> add return newConn(c, d), nil </s> remove return c, nil
</s> add return newConn(c, ss), nil </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/shadowsocks.go |
return newPacketConn(&ssUDPConn{PacketConn: pc, rAddr: targetAddr}, ss), addr, nil | <mask> return nil, nil, err
<mask> }
<mask>
<mask> pc = ss.cipher.PacketConn(pc)
<mask> return &ssUDPConn{PacketConn: pc, rAddr: targetAddr}, addr, nil
<mask> }
<mask>
<mask> func (ss *ShadowSocks) MarshalJSON() ([]byte, error) {
<mask> return json.Marshal(map[string]string{
<mask> "type": ss.Type().String(),
</s> Feature: trace adapters when dialing (#170) </s> remove func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return &socksUDPConn{PacketConn: pc, rAddr: targetAddr}, addr, nil
</s> add return newPacketConn(&socksUDPConn{PacketConn: pc, rAddr: targetAddr}, ss), addr, nil </s> remove return pc, addr, nil
</s> add return newPacketConn(pc, d), addr, nil </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return c, err
</s> add return newConn(c, ss), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/shadowsocks.go |
func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> UDP bool `proxy:"udp,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
<mask>
<mask> if err == nil && ss.tls {
<mask> cc := tls.Client(c, ss.tlsConfig)
<mask> err = cc.Handshake()
</s> Feature: trace adapters when dialing (#170) </s> remove func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
</s> add func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return c, nil
</s> add return newConn(c, ss), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/socks5.go |
return newConn(c, ss), nil | <mask> }
<mask> if _, err := socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdConnect, user); err != nil {
<mask> return nil, err
<mask> }
<mask> return c, nil
<mask> }
<mask>
<mask> func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
<mask> c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
<mask> if err != nil {
</s> Feature: trace adapters when dialing (#170) </s> remove func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
</s> add func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { </s> remove func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return c, err
</s> add return newConn(c, ss), err </s> remove return c, err
</s> add return newConn(c, v), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/socks5.go |
func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { | <mask> }
<mask> return c, nil
<mask> }
<mask>
<mask> func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
<mask> c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
<mask> if err != nil {
<mask> err = fmt.Errorf("%s connect error", ss.addr)
<mask> return
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove return c, nil
</s> add return newConn(c, ss), nil </s> remove return c, err
</s> add return newConn(c, v), err </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/socks5.go |
return newPacketConn(&socksUDPConn{PacketConn: pc, rAddr: targetAddr}, ss), addr, nil | <mask> // ASSOCIATE request arrived on terminates. RFC1928
<mask> pc.Close()
<mask> }()
<mask>
<mask> return &socksUDPConn{PacketConn: pc, rAddr: targetAddr}, addr, nil
<mask> }
<mask>
<mask> func NewSocks5(option Socks5Option) *Socks5 {
<mask> var tlsConfig *tls.Config
<mask> if option.TLS {
</s> Feature: trace adapters when dialing (#170) </s> remove return &ssUDPConn{PacketConn: pc, rAddr: targetAddr}, addr, nil
</s> add return newPacketConn(&ssUDPConn{PacketConn: pc, rAddr: targetAddr}, ss), addr, nil </s> remove return pc, addr, nil
</s> add return newPacketConn(pc, d), addr, nil </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove return proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
if err == nil {
pc.AppendToChains(f)
}
return pc, addr, err </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/socks5.go |
func (u *URLTest) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> func (u *URLTest) Now() string {
<mask> return u.fast.Name()
<mask> }
<mask>
<mask> func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> a, err := u.fast.Dial(metadata)
<mask> if err != nil {
<mask> u.fallback()
<mask> }
<mask> return a, err
</s> Feature: trace adapters when dialing (#170) </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err </s> remove func (p *Proxy) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/urltest.go |
} else {
a.AppendToChains(u) | <mask> a, err := u.fast.Dial(metadata)
<mask> if err != nil {
<mask> u.fallback()
<mask> }
<mask> return a, err
<mask> }
<mask>
<mask> func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
</s> Feature: trace adapters when dialing (#170) </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/urltest.go |
func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err | <mask> }
<mask> return a, err
<mask> }
<mask>
<mask> func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> return u.fast.DialUDP(metadata)
<mask> }
<mask>
<mask> func (u *URLTest) SupportUDP() bool {
<mask> return u.fast.SupportUDP()
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err </s> remove func (b *Base) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (b *Base) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/urltest.go |
func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := dialTimeout("tcp", v.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
</s> Feature: trace adapters when dialing (#170) </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, err
</s> add return newConn(c, v), err </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
</s> add func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/vmess.go |
return newConn(c, v), err | <mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> return c, err
<mask> }
<mask>
<mask> func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> c, err := dialTimeout("tcp", v.server, tcpTimeout)
<mask> if err != nil {
</s> Feature: trace adapters when dialing (#170) </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
</s> add func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return c, nil
</s> add return newConn(c, ss), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/vmess.go |
func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | <mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> return c, err
<mask> }
<mask>
<mask> func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> c, err := dialTimeout("tcp", v.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
</s> Feature: trace adapters when dialing (#170) </s> remove return c, err
</s> add return newConn(c, v), err </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
</s> add func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return c, nil
</s> add return newConn(c, ss), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/vmess.go |
return newPacketConn(&fakeUDPConn{Conn: c}, v), c.RemoteAddr(), nil | <mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> if err != nil {
<mask> return nil, nil, fmt.Errorf("new vmess client error: %v", err)
<mask> }
<mask> return &fakeUDPConn{Conn: c}, c.RemoteAddr(), nil
<mask> }
<mask>
<mask> func NewVmess(option VmessOption) (*Vmess, error) {
<mask> security := strings.ToLower(option.Cipher)
<mask> client, err := vmess.NewClient(vmess.Config{
</s> Feature: trace adapters when dialing (#170) </s> remove return c, err
</s> add return newConn(c, v), err </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, nil
</s> add return newConn(c, ss), nil </s> remove return c, nil
</s> add return newConn(c, d), nil </s> remove func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/vmess.go |
"fmt" | <mask>
<mask> import (
<mask> "context"
<mask> "net"
<mask> "time"
<mask> )
<mask>
<mask> // Adapter Type
<mask> const (
</s> Feature: trace adapters when dialing (#170) </s> remove proxy, err = t.match(metadata)
</s> add proxy, rule, err = t.match(metadata) </s> remove return &socksUDPConn{PacketConn: pc, rAddr: targetAddr}, addr, nil
</s> add return newPacketConn(&socksUDPConn{PacketConn: pc, rAddr: targetAddr}, ss), addr, nil </s> remove return c, err
</s> add return newConn(c, ss), err </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | constant/adapters.go |
Dial(metadata *Metadata) (Conn, error)
DialUDP(metadata *Metadata) (PacketConn, net.Addr, error) | <mask>
<mask> type ProxyAdapter interface {
<mask> Name() string
<mask> Type() AdapterType
<mask> Dial(metadata *Metadata) (net.Conn, error)
<mask> DialUDP(metadata *Metadata) (net.PacketConn, net.Addr, error)
<mask> SupportUDP() bool
<mask> Destroy()
<mask> MarshalJSON() ([]byte, error)
<mask> }
<mask>
</s> Feature: trace adapters when dialing (#170) </s> remove func (b *Base) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (b *Base) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err </s> remove func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err </s> remove func (d *Direct) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | constant/adapters.go |
var rule C.Rule | <mask>
<mask> var proxy C.Proxy
<mask> switch t.mode {
<mask> case Direct:
<mask> proxy = t.proxies["DIRECT"]
<mask> case Global:
<mask> proxy = t.proxies["GLOBAL"]
<mask> // Rule
</s> Feature: trace adapters when dialing (#170) </s> remove proxy, err = t.match(metadata)
</s> add proxy, rule, err = t.match(metadata) </s> remove t.handleUDPConn(localConn, metadata, proxy)
</s> add t.handleUDPConn(localConn, metadata, proxy, rule) </s> remove t.handleTCPConn(localConn, metadata, proxy)
</s> add t.handleTCPConn(localConn, metadata, proxy, rule) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
proxy, rule, err = t.match(metadata) | <mask> proxy = t.proxies["GLOBAL"]
<mask> // Rule
<mask> default:
<mask> var err error
<mask> proxy, err = t.match(metadata)
<mask> if err != nil {
<mask> return
<mask> }
<mask> }
<mask>
</s> Feature: trace adapters when dialing (#170) </s> remove return c, nil
</s> add return newConn(c, h), nil </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
t.handleTCPConn(localConn, metadata, proxy, rule) | <mask> }
<mask>
<mask> switch metadata.NetWork {
<mask> case C.TCP:
<mask> t.handleTCPConn(localConn, metadata, proxy)
<mask> case C.UDP:
<mask> t.handleUDPConn(localConn, metadata, proxy)
<mask> }
<mask> }
<mask>
</s> Feature: trace adapters when dialing (#170) </s> remove t.handleUDPConn(localConn, metadata, proxy)
</s> add t.handleUDPConn(localConn, metadata, proxy, rule) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove
log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter())
return adapter, nil
</s> add return adapter, rule, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
t.handleUDPConn(localConn, metadata, proxy, rule) | <mask> switch metadata.NetWork {
<mask> case C.TCP:
<mask> t.handleTCPConn(localConn, metadata, proxy)
<mask> case C.UDP:
<mask> t.handleUDPConn(localConn, metadata, proxy)
<mask> }
<mask> }
<mask>
<mask> func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
<mask> pc, addr := natTable.Get(localConn.RemoteAddr())
</s> Feature: trace adapters when dialing (#170) </s> remove t.handleTCPConn(localConn, metadata, proxy)
</s> add t.handleTCPConn(localConn, metadata, proxy, rule) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { | <mask> t.handleUDPConn(localConn, metadata, proxy)
<mask> }
<mask> }
<mask>
<mask> func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
<mask> pc, addr := natTable.Get(localConn.RemoteAddr())
<mask> if pc == nil {
<mask> var err error
<mask> pc, addr, err = proxy.DialUDP(metadata)
<mask> if err != nil {
</s> Feature: trace adapters when dialing (#170) </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove t.handleUDPConn(localConn, metadata, proxy)
</s> add t.handleUDPConn(localConn, metadata, proxy, rule) </s> remove func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc | <mask>
<mask> func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
<mask> pc, addr := natTable.Get(localConn.RemoteAddr())
<mask> if pc == nil {
<mask> var err error
<mask> pc, addr, err = proxy.DialUDP(metadata)
<mask> if err != nil {
<mask> log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
<mask> return
<mask> }
<mask>
</s> Feature: trace adapters when dialing (#170) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove t.handleUDPConn(localConn, metadata, proxy)
</s> add t.handleUDPConn(localConn, metadata, proxy, rule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) | <mask> if pc == nil {
<mask> var err error
<mask> pc, addr, err = proxy.DialUDP(metadata)
<mask> if err != nil {
<mask> log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
<mask> return
<mask> }
<mask>
<mask> natTable.Set(localConn.RemoteAddr(), pc, addr)
<mask> go t.handleUDPToLocal(localConn, pc)
</s> Feature: trace adapters when dialing (#170) </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
if rule != nil {
log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawpc.Chains().String())
} else {
log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
}
| <mask> log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error())
<mask> return
<mask> }
<mask>
<mask> natTable.Set(localConn.RemoteAddr(), pc, addr)
<mask> go t.handleUDPToLocal(localConn, pc)
<mask> }
<mask>
<mask> t.handleUDPToRemote(localConn, pc, addr)
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
return t.proxies["DIRECT"], nil
</s> add return t.proxies["DIRECT"], nil, nil </s> remove
log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter())
return adapter, nil
</s> add return adapter, rule, nil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { | <mask>
<mask> t.handleUDPToRemote(localConn, pc, addr)
<mask> }
<mask>
<mask> func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
<mask> remoConn, err := proxy.Dial(metadata)
<mask> if err != nil {
<mask> log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
<mask> return
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) | <mask>
<mask> func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
<mask> remoConn, err := proxy.Dial(metadata)
<mask> if err != nil {
<mask> log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
<mask> return
<mask> }
<mask> defer remoConn.Close()
<mask>
<mask> switch adapter := localConn.(type) {
</s> Feature: trace adapters when dialing (#170) </s> remove func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
if rule != nil {
log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), remoConn.Chains().String())
} else {
log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
}
| <mask> defer remoConn.Close()
<mask>
<mask> switch adapter := localConn.(type) {
<mask> case *InboundAdapter.HTTPAdapter:
<mask> t.handleHTTP(adapter, remoConn)
<mask> case *InboundAdapter.SocketAdapter:
<mask> t.handleSocket(adapter, remoConn)
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove t.handleTCPConn(localConn, metadata, proxy)
</s> add t.handleTCPConn(localConn, metadata, proxy, rule) </s> remove t.handleUDPConn(localConn, metadata, proxy)
</s> add t.handleUDPConn(localConn, metadata, proxy, rule) </s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
defer func() {
if err == nil {
c.AppendToChains(lb)
}
}()
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
func (t *Tunnel) match(metadata *C.Metadata) (C.Proxy, C.Rule, error) { | <mask> func (t *Tunnel) shouldResolveIP(rule C.Rule, metadata *C.Metadata) bool {
<mask> return (rule.RuleType() == C.GEOIP || rule.RuleType() == C.IPCIDR) && metadata.Host != "" && metadata.DstIP == nil
<mask> }
<mask>
<mask> func (t *Tunnel) match(metadata *C.Metadata) (C.Proxy, error) {
<mask> t.configMux.RLock()
<mask> defer t.configMux.RUnlock()
<mask>
<mask> var resolved bool
<mask> for _, rule := range t.rules {
</s> Feature: trace adapters when dialing (#170) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
return nil, nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error()) | <mask> if !resolved && t.shouldResolveIP(rule, metadata) {
<mask> ip, err := t.resolveIP(metadata.Host)
<mask> if err != nil {
<mask> if !t.ignoreResolveFail {
<mask> return nil, fmt.Errorf("[DNS] resolve %s error: %s", metadata.Host, err.Error())
<mask> }
<mask> log.Debugln("[DNS] resolve %s error: %s", metadata.Host, err.Error())
<mask> } else {
<mask> log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
<mask> metadata.DstIP = &ip
</s> Feature: trace adapters when dialing (#170) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
return adapter, rule, nil | <mask> if metadata.NetWork == C.UDP && !adapter.SupportUDP() {
<mask> log.Debugln("%v UDP is not supported", adapter.Name())
<mask> continue
<mask> }
<mask>
<mask> log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter())
<mask> return adapter, nil
<mask> }
<mask> }
<mask> log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
<mask> return t.proxies["DIRECT"], nil
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
return t.proxies["DIRECT"], nil
</s> add return t.proxies["DIRECT"], nil, nil </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
return t.proxies["DIRECT"], nil, nil | <mask> log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter())
<mask> return adapter, nil
<mask> }
<mask> }
<mask> log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
<mask> return t.proxies["DIRECT"], nil
<mask> }
<mask>
<mask> func newTunnel() *Tunnel {
<mask> return &Tunnel{
<mask> queue: channels.NewInfiniteChannel(),
</s> Feature: trace adapters when dialing (#170) </s> remove
log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter())
return adapter, nil
</s> add return adapter, rule, nil </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) </s> remove log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SrcIP.String(), metadata.String(), err.Error())
</s> add log.Warnln("%s --> %v match %s using %s error: %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rule.Adapter(), err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | tunnel/tunnel.go |
// WithStale decide whether Stale return is enabled.
// If this feature is enabled, element will not get Evicted according to `WithAge`.
func WithStale(stale bool) Option {
return func(l *LruCache) {
l.staleReturn = stale
}
}
| <mask> }
<mask> }
<mask>
<mask> // LruCache is a thread-safe, in-memory lru-cache that evicts the
<mask> // least recently used entries from memory when (if set) the entries are
<mask> // older than maxAge (in seconds). Use the New constructor to create one.
<mask> type LruCache struct {
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
staleReturn bool | <mask> cache map[interface{}]*list.Element
<mask> lru *list.List // Front is least-recent
<mask> updateAgeOnGet bool
<mask> onEvict EvictCallback
<mask> }
<mask>
<mask> // NewLRUCache creates an LruCache
<mask> func NewLRUCache(options ...Option) *LruCache {
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove return value, true
</s> add return entry.value, time.Unix(entry.expires, 0), true </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
entry := c.get(key)
if entry == nil { | <mask>
<mask> // Get returns the interface{} representation of a cached response and a bool
<mask> // set to true if the key was found.
<mask> func (c *LruCache) Get(key interface{}) (interface{}, bool) {
<mask> c.mu.Lock()
<mask> defer c.mu.Unlock()
<mask>
<mask> le, ok := c.cache[key]
<mask> if !ok {
<mask> return nil, false
<mask> }
<mask>
<mask> if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
<mask> c.deleteElement(le)
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove c.mu.Lock()
defer c.mu.Unlock()
</s> add </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
value := entry.value | <mask> if entry == nil {
<mask> return nil, false
<mask> }
<mask>
<mask> return value, true
<mask> }
<mask>
<mask> // GetWithExpire returns the interface{} representation of a cached response,
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove value := entry.value
</s> add </s> remove cache := r.cache.Get(ip.String())
</s> add cache, _ := r.lruCache.Get(ip.String()) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
return value, true
} | <mask> if !ok {
<mask> return nil, false
<mask> }
<mask>
<mask> if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
<mask> c.deleteElement(le)
<mask> c.maybeDeleteOldest()
<mask>
<mask> return nil, false
<mask> }
<mask>
<mask> c.lru.MoveToBack(le)
<mask> entry := le.Value.(*entry)
<mask> if c.maxAge > 0 && c.updateAgeOnGet {
<mask> entry.expires = time.Now().Unix() + c.maxAge
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove if c.maxAge > 0 {
</s> add if !c.staleReturn && c.maxAge > 0 { </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove value := entry.value
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
// GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false | <mask>
<mask> return nil, false
<mask> }
<mask>
<mask> c.lru.MoveToBack(le)
<mask> entry := le.Value.(*entry)
<mask> if c.maxAge > 0 && c.updateAgeOnGet {
<mask> entry.expires = time.Now().Unix() + c.maxAge
<mask> }
<mask> value := entry.value
<mask>
<mask> return value, true
<mask> }
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove value := entry.value
</s> add </s> remove return value, true
</s> add return entry.value, time.Unix(entry.expires, 0), true </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
<mask> entry := le.Value.(*entry)
<mask> if c.maxAge > 0 && c.updateAgeOnGet {
<mask> entry.expires = time.Now().Unix() + c.maxAge
<mask> }
<mask> value := entry.value
<mask>
<mask> return value, true
<mask> }
<mask>
<mask> // Exist returns if key exist in cache but not put item to the head of linked list
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove return value, true
</s> add return entry.value, time.Unix(entry.expires, 0), true </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go | |
return entry.value, time.Unix(entry.expires, 0), true | <mask> entry.expires = time.Now().Unix() + c.maxAge
<mask> }
<mask> value := entry.value
<mask>
<mask> return value, true
<mask> }
<mask>
<mask> // Exist returns if key exist in cache but not put item to the head of linked list
<mask> func (c *LruCache) Exist(key interface{}) bool {
<mask> c.mu.Lock()
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove value := entry.value
</s> add </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove c.mu.Lock()
defer c.mu.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
<mask> }
<mask>
<mask> // Set stores the interface{} representation of a response for a given key.
<mask> func (c *LruCache) Set(key interface{}, value interface{}) {
<mask> c.mu.Lock()
<mask> defer c.mu.Unlock()
<mask>
<mask> expires := int64(0)
<mask> if c.maxAge > 0 {
<mask> expires = time.Now().Unix() + c.maxAge
<mask> }
<mask>
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove if c.maxAge > 0 {
</s> add if !c.staleReturn && c.maxAge > 0 { </s> remove return value, true
</s> add return entry.value, time.Unix(entry.expires, 0), true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go | |
c.SetWithExpire(key, value, time.Unix(expires, 0))
}
// SetWithExpire stores the interface{} representation of a response for a given key and given exires.
// The expires time will round to second.
func (c *LruCache) SetWithExpire(key interface{}, value interface{}, expires time.Time) {
c.mu.Lock()
defer c.mu.Unlock() | <mask> expires = time.Now().Unix() + c.maxAge
<mask> }
<mask>
<mask> if le, ok := c.cache[key]; ok {
<mask> c.lru.MoveToBack(le)
<mask> e := le.Value.(*entry)
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove e.expires = expires
</s> add e.expires = expires.Unix() </s> remove e := &entry{key: key, value: value, expires: expires}
</s> add e := &entry{key: key, value: value, expires: expires.Unix()} </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove c.mu.Lock()
defer c.mu.Unlock()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
e.expires = expires.Unix() | <mask> if le, ok := c.cache[key]; ok {
<mask> c.lru.MoveToBack(le)
<mask> e := le.Value.(*entry)
<mask> e.value = value
<mask> e.expires = expires
<mask> } else {
<mask> e := &entry{key: key, value: value, expires: expires}
<mask> c.cache[key] = c.lru.PushBack(e)
<mask>
<mask> if c.maxSize > 0 {
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove e := &entry{key: key, value: value, expires: expires}
</s> add e := &entry{key: key, value: value, expires: expires.Unix()} </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove c.mu.Lock()
defer c.mu.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
e := &entry{key: key, value: value, expires: expires.Unix()} | <mask> e := le.Value.(*entry)
<mask> e.value = value
<mask> e.expires = expires
<mask> } else {
<mask> e := &entry{key: key, value: value, expires: expires}
<mask> c.cache[key] = c.lru.PushBack(e)
<mask>
<mask> if c.maxSize > 0 {
<mask> if len := c.lru.Len(); len > c.maxSize {
<mask> c.deleteElement(c.lru.Front())
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove e.expires = expires
</s> add e.expires = expires.Unix() </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove c.mu.Lock()
defer c.mu.Unlock()
</s> add </s> remove value := entry.value
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
if !c.staleReturn && c.maxAge > 0 { | <mask> c.mu.Unlock()
<mask> }
<mask>
<mask> func (c *LruCache) maybeDeleteOldest() {
<mask> if c.maxAge > 0 {
<mask> now := time.Now().Unix()
<mask> for le := c.lru.Front(); le != nil && le.Value.(*entry).expires <= now; le = c.lru.Front() {
<mask> c.deleteElement(le)
<mask> }
<mask> }
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { </s> remove c.mu.Lock()
defer c.mu.Unlock()
</s> add </s> remove cache, expireTime := r.cache.GetWithExpire(q.String())
if cache != nil {
</s> add cache, expireTime, hit := r.lruCache.GetWithExpire(q.String())
if hit {
now := time.Now() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | common/cache/lrucache.go |
lruCache *cache.LruCache | <mask> main []dnsClient
<mask> fallback []dnsClient
<mask> fallbackFilters []fallbackFilter
<mask> group singleflight.Group
<mask> cache *cache.Cache
<mask> }
<mask>
<mask> // ResolveIP request with TypeA and TypeAAAA, priority return TypeA
<mask> func (r *Resolver) ResolveIP(host string) (ip net.IP, err error) {
<mask> ch := make(chan net.IP, 1)
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove cache := r.cache.Get(ip.String())
</s> add cache, _ := r.lruCache.Get(ip.String()) </s> remove c.lru.MoveToBack(le)
entry := le.Value.(*entry)
if c.maxAge > 0 && c.updateAgeOnGet {
entry.expires = time.Now().Unix() + c.maxAge
</s> add // GetWithExpire returns the interface{} representation of a cached response,
// a time.Time Give expected expires,
// and a bool set to true if the key was found.
// This method will NOT check the maxAge of element and will NOT update the expires.
func (c *LruCache) GetWithExpire(key interface{}) (interface{}, time.Time, bool) {
entry := c.get(key)
if entry == nil {
return nil, time.Time{}, false </s> remove putMsgToCache(r.cache, ip.String(), msg)
</s> add putMsgToCache(r.lruCache, ip.String(), msg) </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
cache, expireTime, hit := r.lruCache.GetWithExpire(q.String())
if hit {
now := time.Now() | <mask> return nil, errors.New("should have one question at least")
<mask> }
<mask>
<mask> q := m.Question[0]
<mask> cache, expireTime := r.cache.GetWithExpire(q.String())
<mask> if cache != nil {
<mask> msg = cache.(*D.Msg).Copy()
<mask> setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
<mask> return
<mask> }
<mask> defer func() {
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} </s> remove cache := r.cache.Get(ip.String())
</s> add cache, _ := r.lruCache.Get(ip.String()) </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} | <mask> q := m.Question[0]
<mask> cache, expireTime := r.cache.GetWithExpire(q.String())
<mask> if cache != nil {
<mask> msg = cache.(*D.Msg).Copy()
<mask> setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
<mask> return
<mask> }
<mask> defer func() {
<mask> if msg == nil {
<mask> return
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove cache, expireTime := r.cache.GetWithExpire(q.String())
if cache != nil {
</s> add cache, expireTime, hit := r.lruCache.GetWithExpire(q.String())
if hit {
now := time.Now() </s> remove cache := r.cache.Get(ip.String())
</s> add cache, _ := r.lruCache.Get(ip.String()) </s> remove putMsgToCache(r.cache, q.String(), msg)
</s> add putMsgToCache(r.lruCache, q.String(), msg) </s> remove c.mu.Lock()
defer c.mu.Unlock()
le, ok := c.cache[key]
if !ok {
</s> add entry := c.get(key)
if entry == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
return r.exchangeWithoutCache(m)
}
// ExchangeWithoutCache a batch of dns request, and it do NOT GET from cache
func (r *Resolver) exchangeWithoutCache(m *D.Msg) (msg *D.Msg, err error) {
q := m.Question[0]
| <mask> setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
<mask> }
<mask> return
<mask> }
<mask> defer func() {
<mask> if msg == nil {
<mask> return
<mask> }
<mask>
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} </s> remove cache, expireTime := r.cache.GetWithExpire(q.String())
if cache != nil {
</s> add cache, expireTime, hit := r.lruCache.GetWithExpire(q.String())
if hit {
now := time.Now() </s> remove putMsgToCache(r.cache, q.String(), msg)
</s> add putMsgToCache(r.lruCache, q.String(), msg) </s> remove cache := r.cache.Get(ip.String())
</s> add cache, _ := r.lruCache.Get(ip.String()) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
putMsgToCache(r.lruCache, q.String(), msg) | <mask> if msg == nil {
<mask> return
<mask> }
<mask>
<mask> putMsgToCache(r.cache, q.String(), msg)
<mask> if r.mapping {
<mask> ips := r.msgToIP(msg)
<mask> for _, ip := range ips {
<mask> putMsgToCache(r.cache, ip.String(), msg)
<mask> }
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove putMsgToCache(r.cache, ip.String(), msg)
</s> add putMsgToCache(r.lruCache, ip.String(), msg) </s> remove c.Put(key, msg.Copy(), ttl)
</s> add c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl))) </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} </s> remove cache := r.cache.Get(ip.String())
</s> add cache, _ := r.lruCache.Get(ip.String()) </s> remove cache, expireTime := r.cache.GetWithExpire(q.String())
if cache != nil {
</s> add cache, expireTime, hit := r.lruCache.GetWithExpire(q.String())
if hit {
now := time.Now() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
putMsgToCache(r.lruCache, ip.String(), msg) | <mask> putMsgToCache(r.cache, q.String(), msg)
<mask> if r.mapping {
<mask> ips := r.msgToIP(msg)
<mask> for _, ip := range ips {
<mask> putMsgToCache(r.cache, ip.String(), msg)
<mask> }
<mask> }
<mask> }()
<mask>
<mask> ret, err, shared := r.group.Do(q.String(), func() (interface{}, error) {
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove putMsgToCache(r.cache, q.String(), msg)
</s> add putMsgToCache(r.lruCache, q.String(), msg) </s> remove c.Put(key, msg.Copy(), ttl)
</s> add c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl))) </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} </s> remove cache, expireTime := r.cache.GetWithExpire(q.String())
if cache != nil {
</s> add cache, expireTime, hit := r.lruCache.GetWithExpire(q.String())
if hit {
now := time.Now() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
cache, _ := r.lruCache.Get(ip.String()) | <mask> if r.fakeip {
<mask> return r.pool.LookBack(ip)
<mask> }
<mask>
<mask> cache := r.cache.Get(ip.String())
<mask> if cache == nil {
<mask> return "", false
<mask> }
<mask> fqdn := cache.(*D.Msg).Question[0].Name
<mask> return strings.TrimRight(fqdn, "."), true
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} </s> remove if c.maxAge > 0 && le.Value.(*entry).expires <= time.Now().Unix() {
c.deleteElement(le)
c.maybeDeleteOldest()
return nil, false
}
</s> add return value, true
} </s> remove cache, expireTime := r.cache.GetWithExpire(q.String())
if cache != nil {
</s> add cache, expireTime, hit := r.lruCache.GetWithExpire(q.String())
if hit {
now := time.Now() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
main: transform(config.Default, nil),
lruCache: cache.NewLRUCache(cache.WithSize(4096), cache.WithStale(true)), | <mask> }
<mask>
<mask> func New(config Config) *Resolver {
<mask> defaultResolver := &Resolver{
<mask> main: transform(config.Default, nil),
<mask> cache: cache.New(time.Second * 60),
<mask> }
<mask>
<mask> r := &Resolver{
<mask> ipv6: config.IPv6,
<mask> main: transform(config.Main, defaultResolver),
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
cache: cache.New(time.Second * 60),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool,
</s> add ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
lruCache: cache.NewLRUCache(cache.WithSize(4096), cache.WithStale(true)),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool, </s> remove if c.maxAge > 0 {
</s> add if !c.staleReturn && c.maxAge > 0 { </s> remove func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
var ttl time.Duration
</s> add func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
var ttl uint32 </s> remove cache := r.cache.Get(ip.String())
</s> add cache, _ := r.lruCache.Get(ip.String()) </s> remove putMsgToCache(r.cache, ip.String(), msg)
</s> add putMsgToCache(r.lruCache, ip.String(), msg) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
lruCache: cache.NewLRUCache(cache.WithSize(4096), cache.WithStale(true)),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool, | <mask> cache: cache.New(time.Second * 60),
<mask> }
<mask>
<mask> r := &Resolver{
<mask> ipv6: config.IPv6,
<mask> main: transform(config.Main, defaultResolver),
<mask> cache: cache.New(time.Second * 60),
<mask> mapping: config.EnhancedMode == MAPPING,
<mask> fakeip: config.EnhancedMode == FAKEIP,
<mask> pool: config.Pool,
<mask> }
<mask>
<mask> if len(config.Fallback) != 0 {
<mask> r.fallback = transform(config.Fallback, defaultResolver)
<mask> }
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove main: transform(config.Default, nil),
cache: cache.New(time.Second * 60),
</s> add main: transform(config.Default, nil),
lruCache: cache.NewLRUCache(cache.WithSize(4096), cache.WithStale(true)), </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} </s> remove func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
var ttl time.Duration
</s> add func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
var ttl uint32 </s> remove ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
</s> add ttl = msg.Extra[0].Header().Ttl </s> remove if c.maxAge > 0 {
</s> add if !c.staleReturn && c.maxAge > 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/resolver.go |
func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
var ttl uint32 | <mask> return "unknown"
<mask> }
<mask> }
<mask>
<mask> func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
<mask> var ttl time.Duration
<mask> switch {
<mask> case len(msg.Answer) != 0:
<mask> ttl = time.Duration(msg.Answer[0].Header().Ttl) * time.Second
<mask> case len(msg.Ns) != 0:
<mask> ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove ttl = time.Duration(msg.Answer[0].Header().Ttl) * time.Second
</s> add ttl = msg.Answer[0].Header().Ttl </s> remove ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
</s> add ttl = msg.Ns[0].Header().Ttl </s> remove ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
</s> add ttl = msg.Extra[0].Header().Ttl </s> remove c.Put(key, msg.Copy(), ttl)
</s> add c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl))) </s> remove setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
</s> add if expireTime.Before(now) {
setMsgTTL(msg, uint32(1)) // Continue fetch
go r.exchangeWithoutCache(m)
} else {
setMsgTTL(msg, uint32(expireTime.Sub(time.Now()).Seconds()))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/util.go |
ttl = msg.Answer[0].Header().Ttl | <mask> func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
<mask> var ttl time.Duration
<mask> switch {
<mask> case len(msg.Answer) != 0:
<mask> ttl = time.Duration(msg.Answer[0].Header().Ttl) * time.Second
<mask> case len(msg.Ns) != 0:
<mask> ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
<mask> case len(msg.Extra) != 0:
<mask> ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
<mask> default:
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
var ttl time.Duration
</s> add func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
var ttl uint32 </s> remove ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
</s> add ttl = msg.Ns[0].Header().Ttl </s> remove ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
</s> add ttl = msg.Extra[0].Header().Ttl </s> remove c.Put(key, msg.Copy(), ttl)
</s> add c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl))) </s> remove ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
cache: cache.New(time.Second * 60),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool,
</s> add ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
lruCache: cache.NewLRUCache(cache.WithSize(4096), cache.WithStale(true)),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/util.go |
ttl = msg.Ns[0].Header().Ttl | <mask> switch {
<mask> case len(msg.Answer) != 0:
<mask> ttl = time.Duration(msg.Answer[0].Header().Ttl) * time.Second
<mask> case len(msg.Ns) != 0:
<mask> ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
<mask> case len(msg.Extra) != 0:
<mask> ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
<mask> default:
<mask> log.Debugln("[DNS] response msg error: %#v", msg)
<mask> return
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
</s> add ttl = msg.Extra[0].Header().Ttl </s> remove ttl = time.Duration(msg.Answer[0].Header().Ttl) * time.Second
</s> add ttl = msg.Answer[0].Header().Ttl </s> remove func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
var ttl time.Duration
</s> add func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
var ttl uint32 </s> remove c.Put(key, msg.Copy(), ttl)
</s> add c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl))) </s> remove ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
cache: cache.New(time.Second * 60),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool,
</s> add ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
lruCache: cache.NewLRUCache(cache.WithSize(4096), cache.WithStale(true)),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/util.go |
ttl = msg.Extra[0].Header().Ttl | <mask> ttl = time.Duration(msg.Answer[0].Header().Ttl) * time.Second
<mask> case len(msg.Ns) != 0:
<mask> ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
<mask> case len(msg.Extra) != 0:
<mask> ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
<mask> default:
<mask> log.Debugln("[DNS] response msg error: %#v", msg)
<mask> return
<mask> }
<mask>
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
</s> add ttl = msg.Ns[0].Header().Ttl </s> remove ttl = time.Duration(msg.Answer[0].Header().Ttl) * time.Second
</s> add ttl = msg.Answer[0].Header().Ttl </s> remove func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
var ttl time.Duration
</s> add func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
var ttl uint32 </s> remove c.Put(key, msg.Copy(), ttl)
</s> add c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl))) </s> remove ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
cache: cache.New(time.Second * 60),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool,
</s> add ipv6: config.IPv6,
main: transform(config.Main, defaultResolver),
lruCache: cache.NewLRUCache(cache.WithSize(4096), cache.WithStale(true)),
mapping: config.EnhancedMode == MAPPING,
fakeip: config.EnhancedMode == FAKEIP,
pool: config.Pool, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/util.go |
c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl))) | <mask> log.Debugln("[DNS] response msg error: %#v", msg)
<mask> return
<mask> }
<mask>
<mask> c.Put(key, msg.Copy(), ttl)
<mask> }
<mask>
<mask> func setMsgTTL(msg *D.Msg, ttl uint32) {
<mask> for _, answer := range msg.Answer {
<mask> answer.Header().Ttl = ttl
</s> Feature: implemented a strategy similar to optimistic DNS (#647) </s> remove ttl = time.Duration(msg.Extra[0].Header().Ttl) * time.Second
</s> add ttl = msg.Extra[0].Header().Ttl </s> remove ttl = time.Duration(msg.Ns[0].Header().Ttl) * time.Second
</s> add ttl = msg.Ns[0].Header().Ttl </s> remove putMsgToCache(r.cache, q.String(), msg)
</s> add putMsgToCache(r.lruCache, q.String(), msg) </s> remove putMsgToCache(r.cache, ip.String(), msg)
</s> add putMsgToCache(r.lruCache, ip.String(), msg) </s> remove func putMsgToCache(c *cache.Cache, key string, msg *D.Msg) {
var ttl time.Duration
</s> add func putMsgToCache(c *cache.LruCache, key string, msg *D.Msg) {
var ttl uint32 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b979ff0bc2a93c89aa8b0a73b42d5ab642e539ca | dns/util.go |
r *Resolver
port string
host string
iface string | <mask> )
<mask>
<mask> type client struct {
<mask> *D.Client
<mask> r *Resolver
<mask> port string
<mask> host string
<mask> }
<mask>
<mask> func (c *client) Exchange(m *D.Msg) (*D.Msg, error) {
<mask> return c.ExchangeContext(context.Background(), m)
<mask> }
</s> Fix: dhcp client should request special interface </s> remove Net string
Addr string
</s> add Net string
Addr string
Interface string </s> remove conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
</s> add options := []dialer.Option{}
if c.iface != "" {
options = append(options, dialer.WithInterface(c.iface))
}
conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...) </s> remove for _, d := range dns {
nameserver = append(nameserver, NameServer{Addr: net.JoinHostPort(d.String(), "53")})
</s> add for _, item := range dns {
nameserver = append(nameserver, NameServer{
Addr: net.JoinHostPort(item.String(), "53"),
Interface: d.ifaceName,
}) </s> remove port: port,
host: host,
r: resolver,
</s> add port: port,
host: host,
iface: s.Interface,
r: resolver, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b9d470cf79d145736fc87f73e3b7f58119e684a0 | dns/client.go |
options := []dialer.Option{}
if c.iface != "" {
options = append(options, dialer.WithInterface(c.iface))
}
conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...) | <mask> if strings.HasPrefix(c.Client.Net, "tcp") {
<mask> network = "tcp"
<mask> }
<mask>
<mask> conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> defer conn.Close()
<mask>
</s> Fix: dhcp client should request special interface </s> remove for _, d := range dns {
nameserver = append(nameserver, NameServer{Addr: net.JoinHostPort(d.String(), "53")})
</s> add for _, item := range dns {
nameserver = append(nameserver, NameServer{
Addr: net.JoinHostPort(item.String(), "53"),
Interface: d.ifaceName,
}) </s> remove Net string
Addr string
</s> add Net string
Addr string
Interface string </s> remove r *Resolver
port string
host string
</s> add r *Resolver
port string
host string
iface string </s> remove port: port,
host: host,
r: resolver,
</s> add port: port,
host: host,
iface: s.Interface,
r: resolver, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b9d470cf79d145736fc87f73e3b7f58119e684a0 | dns/client.go |
for _, item := range dns {
nameserver = append(nameserver, NameServer{
Addr: net.JoinHostPort(item.String(), "53"),
Interface: d.ifaceName,
}) | <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 _, d := range dns {
<mask> nameserver = append(nameserver, NameServer{Addr: net.JoinHostPort(d.String(), "53")})
<mask> }
<mask>
<mask> res = NewResolver(Config{
<mask> Main: nameserver,
<mask> })
</s> Fix: dhcp client should request special interface </s> remove conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
</s> add options := []dialer.Option{}
if c.iface != "" {
options = append(options, dialer.WithInterface(c.iface))
}
conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...) </s> remove r *Resolver
port string
host string
</s> add r *Resolver
port string
host string
iface string </s> remove Net string
Addr string
</s> add Net string
Addr string
Interface string </s> remove port: port,
host: host,
r: resolver,
</s> add port: port,
host: host,
iface: s.Interface,
r: resolver, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b9d470cf79d145736fc87f73e3b7f58119e684a0 | dns/dhcp.go |
Net string
Addr string
Interface string | <mask> return ch
<mask> }
<mask>
<mask> type NameServer struct {
<mask> Net string
<mask> Addr string
<mask> }
<mask>
<mask> type FallbackFilter struct {
<mask> GeoIP bool
<mask> GeoIPCode string
</s> Fix: dhcp client should request special interface </s> remove r *Resolver
port string
host string
</s> add r *Resolver
port string
host string
iface string </s> remove conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
</s> add options := []dialer.Option{}
if c.iface != "" {
options = append(options, dialer.WithInterface(c.iface))
}
conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...) </s> remove for _, d := range dns {
nameserver = append(nameserver, NameServer{Addr: net.JoinHostPort(d.String(), "53")})
</s> add for _, item := range dns {
nameserver = append(nameserver, NameServer{
Addr: net.JoinHostPort(item.String(), "53"),
Interface: d.ifaceName,
}) </s> remove port: port,
host: host,
r: resolver,
</s> add port: port,
host: host,
iface: s.Interface,
r: resolver, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b9d470cf79d145736fc87f73e3b7f58119e684a0 | dns/resolver.go |
port: port,
host: host,
iface: s.Interface,
r: resolver, | <mask> },
<mask> UDPSize: 4096,
<mask> Timeout: 5 * time.Second,
<mask> },
<mask> port: port,
<mask> host: host,
<mask> r: resolver,
<mask> })
<mask> }
<mask> return ret
<mask> }
<mask>
</s> Fix: dhcp client should request special interface </s> remove Net string
Addr string
</s> add Net string
Addr string
Interface string </s> remove conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port))
</s> add options := []dialer.Option{}
if c.iface != "" {
options = append(options, dialer.WithInterface(c.iface))
}
conn, err := dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), c.port), options...) </s> remove r *Resolver
port string
host string
</s> add r *Resolver
port string
host string
iface string </s> remove for _, d := range dns {
nameserver = append(nameserver, NameServer{Addr: net.JoinHostPort(d.String(), "53")})
</s> add for _, item := range dns {
nameserver = append(nameserver, NameServer{
Addr: net.JoinHostPort(item.String(), "53"),
Interface: d.ifaceName,
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b9d470cf79d145736fc87f73e3b7f58119e684a0 | dns/util.go |
type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
} | <mask> "net"
<mask> "syscall"
<mask> )
<mask>
<mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
<mask> iface, err := net.InterfaceByName(ifaceName)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> dialer.Control = func(network, address string, c syscall.RawConn) error {
<mask> return c.Control(func(fd uintptr) {
<mask> switch network {
<mask> case "tcp4", "udp4":
</s> Fix: should not bind interface on local address </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
}
</s> remove dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
switch network {
case "tcp4", "udp4":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
case "tcp6", "udp6":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
}
})
}
</s> add lc.Control = bindControl(iface.Index) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_darwin.go |
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> dialer.Control = func(network, address string, c syscall.RawConn) error {
<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, iface.Index)
<mask> case "tcp6", "udp6":
</s> Fix: should not bind interface on local address </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx) </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
switch network {
case "tcp4", "udp4":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
case "tcp6", "udp6":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
}
})
}
</s> add lc.Control = bindControl(iface.Index) </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx) </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return err
}
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
} </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_darwin.go | |
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx) | <mask> dialer.Control = func(network, address string, c syscall.RawConn) error {
<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, iface.Index)
<mask> case "tcp6", "udp6":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
<mask> }
<mask> })
<mask> }
</s> Fix: should not bind interface on local address </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx) </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
switch network {
case "tcp4", "udp4":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
case "tcp6", "udp6":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
}
})
}
</s> add lc.Control = bindControl(iface.Index) </s> remove dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return err
}
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
} </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_darwin.go |
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx) | <mask> switch network {
<mask> case "tcp4", "udp4":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
<mask> case "tcp6", "udp6":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
<mask> }
<mask> })
<mask> }
<mask>
<mask> return nil
</s> Fix: should not bind interface on local address </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx) </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
switch network {
case "tcp4", "udp4":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
case "tcp6", "udp6":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
}
})
}
</s> add lc.Control = bindControl(iface.Index) </s> remove dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return err
}
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_darwin.go |
}
func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return err
}
dialer.Control = bindControl(iface.Index) | <mask> }
<mask> })
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Fix: should not bind interface on local address </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
syscall.BindToDevice(int(fd), ifaceName)
})
}
</s> add lc.Control = bindControl(ifaceName) </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
switch network {
case "tcp4", "udp4":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
case "tcp6", "udp6":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
}
})
}
</s> add lc.Control = bindControl(iface.Index) </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx) </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
}
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_darwin.go |
lc.Control = bindControl(iface.Index) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> lc.Control = func(network, address string, c syscall.RawConn) error {
<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, iface.Index)
<mask> case "tcp6", "udp6":
<mask> syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
<mask> }
<mask> })
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Fix: should not bind interface on local address </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx) </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx) </s> remove dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
syscall.BindToDevice(int(fd), ifaceName)
})
}
</s> add lc.Control = bindControl(ifaceName) </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return err
}
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_darwin.go |
type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
}
| <mask> "net"
<mask> "syscall"
<mask> )
<mask>
<mask> func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
<mask> dialer.Control = func(network, address string, c syscall.RawConn) error {
<mask> return c.Control(func(fd uintptr) {
<mask> syscall.BindToDevice(int(fd), ifaceName)
<mask> })
<mask> }
<mask>
</s> Fix: should not bind interface on local address </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return err
}
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
} </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
syscall.BindToDevice(int(fd), ifaceName)
})
}
</s> add lc.Control = bindControl(ifaceName) </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, ifaceIdx) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_linux.go |
}
func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = bindControl(ifaceName) | <mask> syscall.BindToDevice(int(fd), ifaceName)
<mask> })
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Fix: should not bind interface on local address </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
syscall.BindToDevice(int(fd), ifaceName)
})
}
</s> add lc.Control = bindControl(ifaceName) </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
}
</s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
switch network {
case "tcp4", "udp4":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
case "tcp6", "udp6":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
}
})
}
</s> add lc.Control = bindControl(iface.Index) </s> remove syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
</s> add syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, ifaceIdx) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_linux.go |
lc.Control = bindControl(ifaceName) | <mask> return nil
<mask> }
<mask>
<mask> func bindIfaceToListenConfig(lc *net.ListenConfig, ifaceName string) error {
<mask> lc.Control = func(network, address string, c syscall.RawConn) error {
<mask> return c.Control(func(fd uintptr) {
<mask> syscall.BindToDevice(int(fd), ifaceName)
<mask> })
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Fix: should not bind interface on local address </s> remove lc.Control = func(network, address string, c syscall.RawConn) error {
return c.Control(func(fd uintptr) {
switch network {
case "tcp4", "udp4":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IP, syscall.IP_BOUND_IF, iface.Index)
case "tcp6", "udp6":
syscall.SetsockoptInt(int(fd), syscall.IPPROTO_IPV6, syscall.IPV6_BOUND_IF, iface.Index)
}
})
}
</s> add lc.Control = bindControl(iface.Index) </s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
dialer.Control = func(network, address string, c syscall.RawConn) error {
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceName string) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
}
</s> remove func bindIfaceToDialer(dialer *net.Dialer, ifaceName string) error {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
return err
}
</s> add type controlFn = func(network, address string, c syscall.RawConn) error
func bindControl(ifaceIdx int) controlFn {
return func(network, address string, c syscall.RawConn) error {
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
ip := net.ParseIP(ipStr)
if ip != nil && !ip.IsGlobalUnicast() {
return nil
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ba060bd0eee01c5a537311591aca7dea5c7f1fca | component/dialer/bind_linux.go |
VERSION=$(shell git describe --tags --long --dirty || echo "unkown version")
BUILDTIME=$(shell date -u)
GOBUILD=CGO_ENABLED=0 go build -ldflags '-X "github.com/Dreamacro/clash/constant.Version=$(VERSION)" \
-X "github.com/Dreamacro/clash/constant.BuildTime=$(BUILDTIME)" \
-w -s' | <mask> NAME=clash
<mask> BINDIR=bin
<mask> GOBUILD=CGO_ENABLED=0 go build -ldflags '-w -s'
<mask>
<mask> PLATFORM_LIST = \
<mask> darwin-amd64 \
<mask> linux-386 \
<mask> linux-amd64 \
</s> Feature: add version command (#148) | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | Makefile |
tar -czf $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).tar.gz -C $(BINDIR) $(NAME)-$(basename $@) | <mask> zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
<mask>
<mask> $(gz_releases): %.gz : %
<mask> chmod +x $(BINDIR)/$(NAME)-$(basename $@)
<mask> gzip -f $(BINDIR)/$(NAME)-$(basename $@)
<mask>
<mask> $(zip_releases): %.zip : %
<mask> zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
<mask>
<mask> all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST)
</s> Feature: add version command (#148) </s> remove zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
</s> add zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | Makefile |
zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe | <mask> chmod +x $(BINDIR)/$(NAME)-$(basename $@)
<mask> gzip -f $(BINDIR)/$(NAME)-$(basename $@)
<mask>
<mask> $(zip_releases): %.zip : %
<mask> zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
<mask>
<mask> all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST)
<mask>
<mask> releases: $(gz_releases) $(zip_releases)
<mask> clean:
</s> Feature: add version command (#148) </s> remove gzip -f $(BINDIR)/$(NAME)-$(basename $@)
</s> add tar -czf $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).tar.gz -C $(BINDIR) $(NAME)-$(basename $@) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | Makefile |
"fmt" | <mask> package main
<mask>
<mask> import (
<mask> "flag"
<mask> "os"
<mask> "os/signal"
<mask> "path/filepath"
<mask> "runtime"
</s> Feature: add version command (#148) </s> remove zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
</s> add zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | main.go |
"runtime" | <mask> "os/signal"
<mask> "path/filepath"
<mask> "syscall"
<mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/hub"
</s> Feature: add version command (#148) </s> remove zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
</s> add zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | main.go |
version bool | <mask>
<mask> var (
<mask> homedir string
<mask> )
<mask>
<mask> func init() {
<mask> flag.StringVar(&homedir, "d", "", "set configuration directory")
</s> Feature: add version command (#148) </s> remove zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
</s> add zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | main.go |
flag.BoolVar(&version, "v", false, "show current version of clash") | <mask>
<mask> func init() {
<mask> flag.StringVar(&homedir, "d", "", "set configuration directory")
<mask> flag.Parse()
<mask> }
<mask>
<mask> func main() {
<mask> if version {
</s> Feature: add version command (#148) </s> remove zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
</s> add zip -m -j $(BINDIR)/$(NAME)-$(basename $@)-$(VERSION).zip $(BINDIR)/$(NAME)-$(basename $@).exe | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | main.go |
if version {
fmt.Printf("Clash %s %s %s %s\n", C.Version, runtime.GOOS, runtime.GOARCH, C.BuildTime)
return
}
| <mask>
<mask> func main() {
<mask> // enable tls 1.3 and remove when go 1.13
<mask> os.Setenv("GODEBUG", os.Getenv("GODEBUG")+",tls13=1")
<mask>
<mask> if homedir != "" {
<mask> if !filepath.IsAbs(homedir) {
</s> Feature: add version command (#148) </s> remove GOBUILD=CGO_ENABLED=0 go build -ldflags '-w -s'
</s> add VERSION=$(shell git describe --tags --long --dirty || echo "unkown version")
BUILDTIME=$(shell date -u)
GOBUILD=CGO_ENABLED=0 go build -ldflags '-X "github.com/Dreamacro/clash/constant.Version=$(VERSION)" \
-X "github.com/Dreamacro/clash/constant.BuildTime=$(BUILDTIME)" \
-w -s' | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bb267e4a1f7bd37d3b79de385dceaa75f71070f0 | main.go |
switch q.Qtype {
case D.TypeAAAA, D.TypeSVCB, D.TypeHTTPS:
return handleMsgWithEmptyAnswer(r), nil
} | <mask> if fakePool.LookupHost(host) {
<mask> return next(r)
<mask> }
<mask>
<mask> if q.Qtype == D.TypeAAAA {
<mask> msg := &D.Msg{}
<mask> msg.Answer = []D.RR{}
<mask>
<mask> msg.SetRcode(r, D.RcodeSuccess)
<mask> msg.Authoritative = true
<mask> msg.RecursionAvailable = true
<mask>
<mask> return msg, nil
<mask> } else if q.Qtype != D.TypeA {
<mask> return next(r)
<mask> }
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove return msg, nil
} else if q.Qtype != D.TypeA {
</s> add if q.Qtype != D.TypeA { </s> remove msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
return msg, nil
</s> add return handleMsgWithEmptyAnswer(r), nil </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | dns/middleware.go |
if q.Qtype != D.TypeA { | <mask> msg.SetRcode(r, D.RcodeSuccess)
<mask> msg.Authoritative = true
<mask> msg.RecursionAvailable = true
<mask>
<mask> return msg, nil
<mask> } else if q.Qtype != D.TypeA {
<mask> return next(r)
<mask> }
<mask>
<mask> rr := &D.A{}
<mask> rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeA, Class: D.ClassINET, Ttl: dnsDefaultTTL}
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove if q.Qtype == D.TypeAAAA {
msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
</s> add switch q.Qtype {
case D.TypeAAAA, D.TypeSVCB, D.TypeHTTPS:
return handleMsgWithEmptyAnswer(r), nil
} </s> remove msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
return msg, nil
</s> add return handleMsgWithEmptyAnswer(r), nil </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | dns/middleware.go |
return handleMsgWithEmptyAnswer(r), nil | <mask> q := r.Question[0]
<mask>
<mask> // return a empty AAAA msg when ipv6 disabled
<mask> if !resolver.ipv6 && q.Qtype == D.TypeAAAA {
<mask> msg := &D.Msg{}
<mask> msg.Answer = []D.RR{}
<mask>
<mask> msg.SetRcode(r, D.RcodeSuccess)
<mask> msg.Authoritative = true
<mask> msg.RecursionAvailable = true
<mask>
<mask> return msg, nil
<mask> }
<mask>
<mask> msg, err := resolver.Exchange(r)
<mask> if err != nil {
<mask> log.Debugln("[DNS Server] Exchange %s failed: %v", q.String(), err)
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove if q.Qtype == D.TypeAAAA {
msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
</s> add switch q.Qtype {
case D.TypeAAAA, D.TypeSVCB, D.TypeHTTPS:
return handleMsgWithEmptyAnswer(r), nil
} </s> remove return msg, nil
} else if q.Qtype != D.TypeA {
</s> add if q.Qtype != D.TypeA { </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | dns/middleware.go |
func handleMsgWithEmptyAnswer(r *D.Msg) *D.Msg {
msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
return msg
} | <mask> })
<mask> }
<mask> return ret
<mask> }
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove if q.Qtype == D.TypeAAAA {
msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
</s> add switch q.Qtype {
case D.TypeAAAA, D.TypeSVCB, D.TypeHTTPS:
return handleMsgWithEmptyAnswer(r), nil
} </s> remove return msg, nil
} else if q.Qtype != D.TypeA {
</s> add if q.Qtype != D.TypeA { </s> remove msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
return msg, nil
</s> add return handleMsgWithEmptyAnswer(r), nil </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | dns/util.go |
github.com/miekg/dns v1.1.32 | <mask> github.com/go-chi/cors v1.1.1
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v3.3.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/miekg/dns v1.1.31
<mask> github.com/oschwald/geoip2-golang v1.4.0
<mask> github.com/sirupsen/logrus v1.6.0
<mask> github.com/stretchr/testify v1.6.1
<mask> golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove github.com/sirupsen/logrus v1.6.0
</s> add github.com/sirupsen/logrus v1.7.0 </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.32 h1:MDaYYzWOYscpvDOEgPMT1c1mebCZmIdxZI/J161OdJU=
github.com/miekg/dns v1.1.32/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= </s> remove github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
</s> add github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.mod |
github.com/sirupsen/logrus v1.7.0 | <mask> github.com/gofrs/uuid v3.3.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/miekg/dns v1.1.31
<mask> github.com/oschwald/geoip2-golang v1.4.0
<mask> github.com/sirupsen/logrus v1.6.0
<mask> github.com/stretchr/testify v1.6.1
<mask> golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
<mask> golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.32 </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.32 h1:MDaYYzWOYscpvDOEgPMT1c1mebCZmIdxZI/J161OdJU=
github.com/miekg/dns v1.1.32/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= </s> remove github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
</s> add github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.mod |
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 | <mask> github.com/miekg/dns v1.1.31
<mask> github.com/oschwald/geoip2-golang v1.4.0
<mask> github.com/sirupsen/logrus v1.6.0
<mask> github.com/stretchr/testify v1.6.1
<mask> golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
<mask> golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
<mask> gopkg.in/eapache/channels.v1 v1.1.0
<mask> gopkg.in/yaml.v2 v2.3.0
<mask> )
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove github.com/sirupsen/logrus v1.6.0
</s> add github.com/sirupsen/logrus v1.7.0 </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.32 </s> remove github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
</s> add github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.32 h1:MDaYYzWOYscpvDOEgPMT1c1mebCZmIdxZI/J161OdJU=
github.com/miekg/dns v1.1.32/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.mod |
github.com/miekg/dns v1.1.32 h1:MDaYYzWOYscpvDOEgPMT1c1mebCZmIdxZI/J161OdJU=
github.com/miekg/dns v1.1.32/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= | <mask> github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
<mask> github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
<mask> github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
<mask> github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
<mask> github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
<mask> github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
<mask> github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
<mask> github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
<mask> github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug=
<mask> github.com/oschwald/geoip2-golang v1.4.0/go.mod h1:8QwxJvRImBH+Zl6Aa6MaIcs5YdlZSTKtzmPGzQqi9ng=
<mask> github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls=
<mask> github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
</s> add github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.32 </s> remove github.com/sirupsen/logrus v1.6.0
</s> add github.com/sirupsen/logrus v1.7.0 </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= | <mask> github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls=
<mask> github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
<mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
<mask> github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
<mask> github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
<mask> github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/miekg/dns v1.1.31 h1:sJFOl9BgwbYAWOGEwr61FU28pqsBNdpRBnhGXtO06Oo=
github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
</s> add github.com/miekg/dns v1.1.32 h1:MDaYYzWOYscpvDOEgPMT1c1mebCZmIdxZI/J161OdJU=
github.com/miekg/dns v1.1.32/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= </s> remove github.com/sirupsen/logrus v1.6.0
</s> add github.com/sirupsen/logrus v1.7.0 </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.32 </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
<mask> golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 </s> remove github.com/sirupsen/logrus v1.6.0
</s> add github.com/sirupsen/logrus v1.7.0 </s> remove github.com/miekg/dns v1.1.31
</s> add github.com/miekg/dns v1.1.32 </s> remove golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo=
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | <mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo=
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 </s> remove github.com/sirupsen/logrus v1.6.0
</s> add github.com/sirupsen/logrus v1.7.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo=
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | <mask> golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
<mask> golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
<mask> golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo=
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum | |
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
<mask> golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo=
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> remove golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
<mask> golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo=
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> remove golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY=
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | <mask> golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/eapache/channels.v1 v1.1.0 h1:5bGAyKKvyCTWjSj7mhefG6Lc68VyN4MH1v8/7OoeeB4=
<mask> gopkg.in/eapache/channels.v1 v1.1.0/go.mod h1:BHIBujSvu9yMTrTYbTCjDD43gUhtmaOtTWDe7sTv1js=
</s> Chore: return empty record in SVCB/HTTPSSVC on fake-ip mode </s> remove golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
</s> add golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo=
golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bc52f8e4fda00b097009825369a8ea29325b6a3c | go.sum |
"crypto/tls" | <mask> import (
<mask> "bytes"
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "net"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
</s> Improve: add tls, sni options to socks5 outbound adapter | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcba14e05e979f2d6140d6daaaf3d9bd705249ee | adapters/outbound/socks5.go |
tls bool
sni bool | <mask> addr string
<mask> name string
<mask> }
<mask>
<mask> type Socks5Option struct {
<mask> Name string `proxy:"name"`
<mask> Server string `proxy:"server"`
</s> Improve: add tls, sni options to socks5 outbound adapter | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcba14e05e979f2d6140d6daaaf3d9bd705249ee | adapters/outbound/socks5.go |
TLS bool `proxy:"tls"`
SNI bool `proxy:"sni"` | <mask> Server string `proxy:"server"`
<mask> Port int `proxy:"port"`
<mask> }
<mask>
<mask> func (ss *Socks5) Name() string {
<mask> return ss.name
<mask> }
<mask>
</s> Improve: add tls, sni options to socks5 outbound adapter | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcba14e05e979f2d6140d6daaaf3d9bd705249ee | adapters/outbound/socks5.go |
if err == nil && ss.tls {
tlsConfig := tls.Config{
InsecureSkipVerify: ss.sni,
MaxVersion: tls.VersionTLS12,
}
c = tls.Client(c, &tlsConfig)
}
| <mask> func (ss *Socks5) Generator(metadata *C.Metadata) (adapter C.ProxyAdapter, err error) {
<mask> c, err := net.DialTimeout("tcp", ss.addr, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", ss.addr)
<mask> }
<mask> tcpKeepAlive(c)
<mask> if err := ss.shakeHand(metadata, c); err != nil {
</s> Improve: add tls, sni options to socks5 outbound adapter | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcba14e05e979f2d6140d6daaaf3d9bd705249ee | adapters/outbound/socks5.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.