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 |
|---|---|---|---|---|
log.Debugln("[DNS] response msg empty: %#v", msg) | <mask> ttl = msg.Ns[0].Header().Ttl
<mask> case len(msg.Extra) != 0:
<mask> ttl = msg.Extra[0].Header().Ttl
<mask> default:
<mask> log.Debugln("[DNS] response msg error: %#v", msg)
<mask> return
<mask> }
<mask>
<mask> c.SetWithExpire(key, msg.Copy(), time.Now().Add(time.Second*time.Duration(ttl)))
<mask> }
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove func (dp *directPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return 0, err
}
metadata.DstIP = ip
}
return dp.WriteTo(p, metadata.UDPAddr())
}
</s> add </s> remove if _, err := pc.WriteWithMetadata(packet.Data(), metadata); err != nil {
return
</s> add // local resolve UDP dns
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return err
}
metadata.DstIP = ip </s> remove func newPacketConn(pc PacketConn, a C.ProxyAdapter) C.PacketConn {
</s> add func newPacketConn(pc net.PacketConn, a C.ProxyAdapter) C.PacketConn { </s> remove func (spc *ssPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return spc.PacketConn.WriteTo(packet[3:], spc.rAddr)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | dns/util.go |
return q.Qclass == D.ClassINET && (q.Qtype == D.TypeA || q.Qtype == D.TypeAAAA) | <mask> }
<mask> }
<mask>
<mask> func isIPRequest(q D.Question) bool {
<mask> if q.Qclass == D.ClassINET && (q.Qtype == D.TypeA || q.Qtype == D.TypeAAAA) {
<mask> return true
<mask> }
<mask> return false
<mask> }
<mask>
<mask> func transform(servers []NameServer, resolver *Resolver) []dnsClient {
<mask> ret := []dnsClient{}
<mask> for _, s := range servers {
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove func (spc *ssPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return spc.PacketConn.WriteTo(packet[3:], spc.rAddr)
}
</s> add </s> remove func (uc *socksPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return uc.PacketConn.WriteTo(packet, uc.rAddr)
}
</s> add </s> remove func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
</s> add func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error { </s> remove if _, err := pc.WriteWithMetadata(packet.Data(), metadata); err != nil {
return
</s> add // local resolve UDP dns
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return err
}
metadata.DstIP = ip | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | dns/util.go |
"errors" | <mask> package tunnel
<mask>
<mask> import (
<mask> "bufio"
<mask> "io"
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove "github.com/Dreamacro/clash/component/resolver"
</s> add </s> remove func (ut *udpTracker) WriteWithMetadata(p []byte, metadata *C.Metadata) (int, error) {
n, err := ut.PacketConn.WriteWithMetadata(p, metadata)
upload := int64(n)
ut.manager.Upload() <- upload
ut.UploadTotal += upload
return n, err
}
</s> add </s> remove return newPacketConn(&trojanPacketConn{pc, c}, t), err
</s> add return newPacketConn(pc, t), err </s> remove PacketConn
</s> add net.PacketConn | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | tunnel/connection.go |
"github.com/Dreamacro/clash/component/resolver" | <mask> "strings"
<mask> "time"
<mask>
<mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> )
<mask>
<mask> func handleHTTP(request *adapters.HTTPAdapter, outbound net.Conn) {
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove "github.com/Dreamacro/clash/component/resolver"
</s> add </s> remove func newPacketConn(pc PacketConn, a C.ProxyAdapter) C.PacketConn {
</s> add func newPacketConn(pc net.PacketConn, a C.ProxyAdapter) C.PacketConn { </s> remove func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
</s> add func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error { </s> remove func (uc *vmessPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
return uc.Conn.Write(p)
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | tunnel/connection.go |
func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error { | <mask> }
<mask> }
<mask> }
<mask>
<mask> func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
<mask> defer packet.Drop()
<mask>
<mask> if _, err := pc.WriteWithMetadata(packet.Data(), metadata); err != nil {
<mask> return
<mask> }
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove if _, err := pc.WriteWithMetadata(packet.Data(), metadata); err != nil {
return
</s> add // local resolve UDP dns
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return err
}
metadata.DstIP = ip </s> remove func (spc *ssPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return spc.PacketConn.WriteTo(packet[3:], spc.rAddr)
}
</s> add </s> remove func (uc *socksPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return uc.PacketConn.WriteTo(packet, uc.rAddr)
}
</s> add </s> remove func (dp *directPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return 0, err
}
metadata.DstIP = ip
}
return dp.WriteTo(p, metadata.UDPAddr())
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | tunnel/connection.go |
// local resolve UDP dns
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return err
}
metadata.DstIP = ip | <mask>
<mask> func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
<mask> defer packet.Drop()
<mask>
<mask> if _, err := pc.WriteWithMetadata(packet.Data(), metadata); err != nil {
<mask> return
<mask> }
<mask> }
<mask>
<mask> func handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, fAddr net.Addr) {
<mask> buf := pool.Get(pool.RelayBufferSize)
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
</s> add func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error { </s> remove func (spc *ssPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return spc.PacketConn.WriteTo(packet[3:], spc.rAddr)
}
</s> add </s> remove func (uc *socksPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return uc.PacketConn.WriteTo(packet, uc.rAddr)
}
</s> add </s> remove func (dp *directPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return 0, err
}
metadata.DstIP = ip
}
return dp.WriteTo(p, metadata.UDPAddr())
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | tunnel/connection.go |
addr := metadata.UDPAddr()
if addr == nil {
return errors.New("udp addr invalid")
}
_, err := pc.WriteTo(packet.Data(), addr)
return err | <mask> metadata.DstIP = ip
<mask> }
<mask> }
<mask>
<mask> func handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, fAddr net.Addr) {
<mask> buf := pool.Get(pool.RelayBufferSize)
<mask> defer pool.Put(buf)
<mask> defer natTable.Delete(key)
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove if _, err := pc.WriteWithMetadata(packet.Data(), metadata); err != nil {
return
</s> add // local resolve UDP dns
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return err
}
metadata.DstIP = ip </s> remove func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
</s> add func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error { </s> remove func (dp *directPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return 0, err
}
metadata.DstIP = ip
}
return dp.WriteTo(p, metadata.UDPAddr())
}
</s> add </s> remove func newPacketConn(pc PacketConn, a C.ProxyAdapter) C.PacketConn {
</s> add func newPacketConn(pc net.PacketConn, a C.ProxyAdapter) C.PacketConn { </s> remove func (uc *vmessPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
return uc.Conn.Write(p)
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | tunnel/connection.go |
<mask> ut.UploadTotal += upload
<mask> return n, err
<mask> }
<mask>
<mask> func (ut *udpTracker) WriteWithMetadata(p []byte, metadata *C.Metadata) (int, error) {
<mask> n, err := ut.PacketConn.WriteWithMetadata(p, metadata)
<mask> upload := int64(n)
<mask> ut.manager.Upload() <- upload
<mask> ut.UploadTotal += upload
<mask> return n, err
<mask> }
<mask>
<mask> func (ut *udpTracker) Close() error {
<mask> ut.manager.Leave(ut)
<mask> return ut.PacketConn.Close()
<mask> }
<mask>
</s> Change: local resolve DNS in UDP request due to TURN failed </s> remove func (uc *vmessPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
return uc.Conn.Write(p)
}
</s> add </s> remove func (spc *ssPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return spc.PacketConn.WriteTo(packet[3:], spc.rAddr)
}
</s> add </s> remove func (uc *socksPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(socks5.ParseAddr(metadata.RemoteAddress()), p)
if err != nil {
return
}
return uc.PacketConn.WriteTo(packet, uc.rAddr)
}
</s> add </s> remove func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
</s> add func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error { </s> remove func (dp *directPacketConn) WriteWithMetadata(p []byte, metadata *C.Metadata) (n int, err error) {
if !metadata.Resolved() {
ip, err := resolver.ResolveIP(metadata.Host)
if err != nil {
return 0, err
}
metadata.DstIP = ip
}
return dp.WriteTo(p, metadata.UDPAddr())
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/59bda1d5473ad6e5109372ba0594d38c782481e3 | tunnel/tracker.go | |
HTTP2Opts HTTP2Options `proxy:"h2-opts,omitempty"` | <mask> UDP bool `proxy:"udp,omitempty"`
<mask> Network string `proxy:"network,omitempty"`
<mask> HTTPOpts HTTPOptions `proxy:"http-opts,omitempty"`
<mask> WSPath string `proxy:"ws-path,omitempty"`
<mask> WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> ServerName string `proxy:"servername,omitempty"`
</s> Feature: support VMess HTTP/2 transport (#903) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5bd189f2d0473a652edbac906fbdf5f12523790a | adapters/outbound/vmess.go |
type HTTP2Options struct {
Host []string `proxy:"host,omitempty"`
Path string `proxy:"path,omitempty"`
}
| <mask> Headers map[string][]string `proxy:"headers,omitempty"`
<mask> }
<mask>
<mask> func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
<mask> var err error
<mask> switch v.option.Network {
<mask> case "ws":
<mask> host, port, _ := net.SplitHostPort(v.addr)
<mask> wsOpts := &vmess.WebsocketConfig{
</s> Feature: support VMess HTTP/2 transport (#903) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5bd189f2d0473a652edbac906fbdf5f12523790a | adapters/outbound/vmess.go |
if option.Network == "h2" && !option.TLS {
return nil, fmt.Errorf("TLS must be true with h2 network")
} | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return &Vmess{
<mask> Base: &Base{
<mask> name: option.Name,
</s> Feature: support VMess HTTP/2 transport (#903) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5bd189f2d0473a652edbac906fbdf5f12523790a | adapters/outbound/vmess.go |
NextProtos []string | <mask> type TLSConfig struct {
<mask> Host string
<mask> SkipCertVerify bool
<mask> SessionCache tls.ClientSessionCache
<mask> }
<mask>
<mask> func StreamTLSConn(conn net.Conn, cfg *TLSConfig) (net.Conn, error) {
<mask> tlsConfig := &tls.Config{
<mask> ServerName: cfg.Host,
</s> Feature: support VMess HTTP/2 transport (#903) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5bd189f2d0473a652edbac906fbdf5f12523790a | component/vmess/tls.go |
NextProtos: cfg.NextProtos, | <mask> tlsConfig := &tls.Config{
<mask> ServerName: cfg.Host,
<mask> InsecureSkipVerify: cfg.SkipCertVerify,
<mask> ClientSessionCache: cfg.SessionCache,
<mask> }
<mask>
<mask> tlsConn := tls.Client(conn, tlsConfig)
<mask> err := tlsConn.Handshake()
<mask> return tlsConn, err
<mask> }
</s> Feature: support VMess HTTP/2 transport (#903) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5bd189f2d0473a652edbac906fbdf5f12523790a | component/vmess/tls.go |
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= | <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/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=
</s> Feature: support VMess HTTP/2 transport (#903) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5bd189f2d0473a652edbac906fbdf5f12523790a | go.sum |
once sync.Once
errOnce sync.Once
result interface{}
err error | <mask> cancel func()
<mask>
<mask> wg sync.WaitGroup
<mask>
<mask> once sync.Once
<mask> result interface{}
<mask> }
<mask>
<mask> func newPicker(ctx context.Context, cancel func()) *Picker {
<mask> return &Picker{
<mask> ctx: ctx,
</s> Chore: picker support get first error </s> remove return nil, errors.New("All DNS requests failed")
</s> add err := errors.New("All DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c03613858be0a494ddb42a511a065c890c7ac86 | common/picker/picker.go |
// Error return the first error (if all success return nil)
func (p *Picker) Error() error {
return p.err
}
| <mask> }
<mask> return p.result
<mask> }
<mask>
<mask> // Go calls the given function in a new goroutine.
<mask> // The first call to return a nil error cancels the group; its result will be returned by Wait.
<mask> func (p *Picker) Go(f func() (interface{}, error)) {
<mask> p.wg.Add(1)
<mask>
</s> Chore: picker support get first error </s> remove once sync.Once
result interface{}
</s> add once sync.Once
errOnce sync.Once
result interface{}
err error </s> remove return nil, errors.New("All DNS requests failed")
</s> add err := errors.New("All DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c03613858be0a494ddb42a511a065c890c7ac86 | common/picker/picker.go |
} else {
p.errOnce.Do(func() {
p.err = err
}) | <mask> if p.cancel != nil {
<mask> p.cancel()
<mask> }
<mask> })
<mask> }
<mask> }()
<mask> }
</s> Chore: picker support get first error </s> remove return nil, errors.New("All DNS requests failed")
</s> add err := errors.New("All DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err </s> remove once sync.Once
result interface{}
</s> add once sync.Once
errOnce sync.Once
result interface{}
err error | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c03613858be0a494ddb42a511a065c890c7ac86 | common/picker/picker.go |
assert.NotNil(t, picker.Error()) | <mask> picker.Go(sleepAndSend(ctx, 20, 1))
<mask>
<mask> number := picker.Wait()
<mask> assert.Nil(t, number)
<mask> }
</s> Chore: picker support get first error </s> remove return nil, errors.New("All DNS requests failed")
</s> add err := errors.New("All DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err </s> remove once sync.Once
result interface{}
</s> add once sync.Once
errOnce sync.Once
result interface{}
err error | [
"keep",
"keep",
"keep",
"add",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c03613858be0a494ddb42a511a065c890c7ac86 | common/picker/picker_test.go |
"fmt" | <mask> "crypto/tls"
<mask> "errors"
<mask> "math/rand"
<mask> "net"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
</s> Chore: picker support get first error </s> remove return nil, errors.New("All DNS requests failed")
</s> add err := errors.New("All DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err </s> remove once sync.Once
result interface{}
</s> add once sync.Once
errOnce sync.Once
result interface{}
err error | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c03613858be0a494ddb42a511a065c890c7ac86 | dns/resolver.go |
err := errors.New("All DNS requests failed")
if fErr := fast.Error(); fErr != nil {
err = fmt.Errorf("%w, first error: %s", err, fErr.Error())
}
return nil, err | <mask> }
<mask>
<mask> elm := fast.Wait()
<mask> if elm == nil {
<mask> return nil, errors.New("All DNS requests failed")
<mask> }
<mask>
<mask> msg = elm.(*D.Msg)
<mask> return
<mask> }
</s> Chore: picker support get first error </s> remove once sync.Once
result interface{}
</s> add once sync.Once
errOnce sync.Once
result interface{}
err error | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c03613858be0a494ddb42a511a065c890c7ac86 | dns/resolver.go |
adapters "github.com/Dreamacro/clash/adapters/inbound" | <mask> "bufio"
<mask> "net"
<mask> "net/http"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> var (
</s> Fix: crash when directly request proxy server </s> remove if !metadata.Valid() {
log.Warnln("[Metadata] not valid: %#v", metadata)
return
}
</s> add </s> remove if err != nil {
</s> add if err != nil || !request.URL.IsAbs() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c8bb24121f90377c1af91021c7d54bcd3719a0a | proxy/http/server.go |
if err != nil || !request.URL.IsAbs() { | <mask>
<mask> func handleConn(conn net.Conn) {
<mask> br := bufio.NewReader(conn)
<mask> request, err := http.ReadRequest(br)
<mask> if err != nil {
<mask> conn.Close()
<mask> return
<mask> }
<mask>
<mask> if request.Method == http.MethodConnect {
</s> Fix: crash when directly request proxy server </s> remove if !metadata.Valid() {
log.Warnln("[Metadata] not valid: %#v", metadata)
return
}
</s> add </s> remove "github.com/Dreamacro/clash/adapters/inbound"
</s> add adapters "github.com/Dreamacro/clash/adapters/inbound" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c8bb24121f90377c1af91021c7d54bcd3719a0a | proxy/http/server.go |
if !metadata.Valid() {
log.Warnln("[Metadata] not valid: %#v", metadata)
return
}
| <mask> func (t *Tunnel) handleConn(localConn C.ServerAdapter) {
<mask> defer localConn.Close()
<mask> metadata := localConn.Metadata()
<mask>
<mask> if t.needLookupIP(metadata) {
<mask> host, exist := t.resolver.IPToHost(*metadata.IP)
<mask> if exist {
<mask> metadata.Host = host
<mask> metadata.AddrType = C.AtypDomainName
<mask> }
</s> Fix: crash when directly request proxy server </s> remove if err != nil {
</s> add if err != nil || !request.URL.IsAbs() { </s> remove if !metadata.Valid() {
log.Warnln("[Metadata] not valid: %#v", metadata)
return
}
</s> add </s> remove "github.com/Dreamacro/clash/adapters/inbound"
</s> add adapters "github.com/Dreamacro/clash/adapters/inbound" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c8bb24121f90377c1af91021c7d54bcd3719a0a | tunnel/tunnel.go |
<mask> return
<mask> }
<mask> }
<mask>
<mask> if !metadata.Valid() {
<mask> log.Warnln("[Metadata] not valid: %#v", metadata)
<mask> return
<mask> }
<mask>
<mask> remoConn, err := proxy.Generator(metadata)
<mask> if err != nil {
<mask> log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SourceIP.String(), metadata.String(), err.Error())
<mask> return
<mask> }
</s> Fix: crash when directly request proxy server </s> remove if err != nil {
</s> add if err != nil || !request.URL.IsAbs() { </s> remove "github.com/Dreamacro/clash/adapters/inbound"
</s> add adapters "github.com/Dreamacro/clash/adapters/inbound" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5c8bb24121f90377c1af91021c7d54bcd3719a0a | tunnel/tunnel.go | |
"github.com/Dreamacro/clash/common/simple-obfs" | <mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/riobard/go-shadowsocks2/core"
<mask> "github.com/riobard/go-shadowsocks2/socks"
<mask> )
<mask>
</s> Feature: add shadowsocks simple-obfs support </s> remove ss, err := adapters.NewShadowSocks(key.Name(), ssURL)
</s> add option := parseOptions(5, proxy...)
ss, err := adapters.NewShadowSocks(key.Name(), ssURL, option) </s> remove server: server,
name: name,
cipher: ciph,
</s> add server: server,
name: name,
cipher: ciph,
obfs: obfs,
obfsHost: obfsHost, </s> remove func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
</s> add func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5d34cba6815cdc6df98097d0c96e2bb63f985eb0 | adapters/remote/shadowsocks.go |
server string
name string
obfs string
obfsHost string
cipher core.Cipher | <mask> return ss.conn
<mask> }
<mask>
<mask> type ShadowSocks struct {
<mask> server string
<mask> name string
<mask> cipher core.Cipher
<mask> }
<mask>
<mask> func (ss *ShadowSocks) Name() string {
<mask> return ss.name
<mask> }
</s> Feature: add shadowsocks simple-obfs support </s> remove server: server,
name: name,
cipher: ciph,
</s> add server: server,
name: name,
cipher: ciph,
obfs: obfs,
obfsHost: obfsHost, </s> remove func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
</s> add func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) { </s> remove ss, err := adapters.NewShadowSocks(key.Name(), ssURL)
</s> add option := parseOptions(5, proxy...)
ss, err := adapters.NewShadowSocks(key.Name(), ssURL, option) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5d34cba6815cdc6df98097d0c96e2bb63f985eb0 | adapters/remote/shadowsocks.go |
switch ss.obfs {
case "tls":
c = obfs.NewTLSObfs(c, ss.obfsHost)
case "http":
_, port, _ := net.SplitHostPort(ss.server)
c = obfs.NewHTTPObfs(c, ss.obfsHost, port)
} | <mask> }
<mask> tcpKeepAlive(c)
<mask> c = ss.cipher.StreamConn(c)
<mask> _, err = c.Write(serializesSocksAddr(addr))
<mask> return &ShadowsocksAdapter{conn: c}, err
<mask> }
<mask>
<mask> func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) {
</s> Feature: add shadowsocks simple-obfs support </s> remove func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
</s> add func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) { </s> remove ss, err := adapters.NewShadowSocks(key.Name(), ssURL)
</s> add option := parseOptions(5, proxy...)
ss, err := adapters.NewShadowSocks(key.Name(), ssURL, option) </s> remove server: server,
name: name,
cipher: ciph,
</s> add server: server,
name: name,
cipher: ciph,
obfs: obfs,
obfsHost: obfsHost, </s> remove server string
name string
cipher core.Cipher
</s> add server string
name string
obfs string
obfsHost string
cipher core.Cipher | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5d34cba6815cdc6df98097d0c96e2bb63f985eb0 | adapters/remote/shadowsocks.go |
func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) { | <mask> _, err = c.Write(serializesSocksAddr(addr))
<mask> return &ShadowsocksAdapter{conn: c}, err
<mask> }
<mask>
<mask> func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
<mask> var key []byte
<mask> server, cipher, password, _ := parseURL(ssURL)
<mask> ciph, err := core.PickCipher(cipher, key, password)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
</s> Feature: add shadowsocks simple-obfs support </s> remove server: server,
name: name,
cipher: ciph,
</s> add server: server,
name: name,
cipher: ciph,
obfs: obfs,
obfsHost: obfsHost, </s> remove ss, err := adapters.NewShadowSocks(key.Name(), ssURL)
</s> add option := parseOptions(5, proxy...)
ss, err := adapters.NewShadowSocks(key.Name(), ssURL, option) </s> remove server string
name string
cipher core.Cipher
</s> add server string
name string
obfs string
obfsHost string
cipher core.Cipher | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5d34cba6815cdc6df98097d0c96e2bb63f985eb0 | adapters/remote/shadowsocks.go |
obfs := ""
obfsHost := "bing.com"
if value, ok := option["obfs"]; ok {
obfs = value
}
if value, ok := option["obfs-host"]; ok {
obfsHost = value
}
| <mask> return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
<mask> }
<mask> return &ShadowSocks{
<mask> server: server,
<mask> name: name,
<mask> cipher: ciph,
<mask> obfs: obfs,
</s> Feature: add shadowsocks simple-obfs support </s> remove server: server,
name: name,
cipher: ciph,
</s> add server: server,
name: name,
cipher: ciph,
obfs: obfs,
obfsHost: obfsHost, </s> remove func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
</s> add func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) { </s> remove ss, err := adapters.NewShadowSocks(key.Name(), ssURL)
</s> add option := parseOptions(5, proxy...)
ss, err := adapters.NewShadowSocks(key.Name(), ssURL, option) </s> remove server string
name string
cipher core.Cipher
</s> add server string
name string
obfs string
obfsHost string
cipher core.Cipher | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5d34cba6815cdc6df98097d0c96e2bb63f985eb0 | adapters/remote/shadowsocks.go |
server: server,
name: name,
cipher: ciph,
obfs: obfs,
obfsHost: obfsHost, | <mask> if err != nil {
<mask> return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
<mask> }
<mask> return &ShadowSocks{
<mask> server: server,
<mask> name: name,
<mask> cipher: ciph,
<mask> }, nil
<mask> }
<mask>
<mask> func parseURL(s string) (addr, cipher, password string, err error) {
<mask> u, err := url.Parse(s)
</s> Feature: add shadowsocks simple-obfs support </s> remove func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
</s> add func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) { </s> remove ss, err := adapters.NewShadowSocks(key.Name(), ssURL)
</s> add option := parseOptions(5, proxy...)
ss, err := adapters.NewShadowSocks(key.Name(), ssURL, option) </s> remove server string
name string
cipher core.Cipher
</s> add server string
name string
obfs string
obfsHost string
cipher core.Cipher | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5d34cba6815cdc6df98097d0c96e2bb63f985eb0 | adapters/remote/shadowsocks.go |
option := parseOptions(5, proxy...)
ss, err := adapters.NewShadowSocks(key.Name(), ssURL, option) | <mask> if len(proxy) < 5 {
<mask> continue
<mask> }
<mask> ssURL := fmt.Sprintf("ss://%s:%s@%s:%s", proxy[3], proxy[4], proxy[1], proxy[2])
<mask> ss, err := adapters.NewShadowSocks(key.Name(), ssURL)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> proxies[key.Name()] = ss
<mask> // socks5, server, port
</s> Feature: add shadowsocks simple-obfs support </s> remove func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
</s> add func NewShadowSocks(name string, ssURL string, option map[string]string) (*ShadowSocks, error) { </s> remove server: server,
name: name,
cipher: ciph,
</s> add server: server,
name: name,
cipher: ciph,
obfs: obfs,
obfsHost: obfsHost, </s> remove server string
name string
cipher core.Cipher
</s> add server string
name string
obfs string
obfsHost string
cipher core.Cipher | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5d34cba6815cdc6df98097d0c96e2bb63f985eb0 | config/config.go |
keepAlive: | <mask> func HandleConn(conn net.Conn, cache *cache.Cache) {
<mask> br := bufio.NewReader(conn)
<mask> request, err := http.ReadRequest(br)
<mask> if err != nil || request.URL.Host == "" {
<mask> conn.Close()
<mask> return
<mask> }
</s> Fix: handle keep alive on http connect proxy </s> remove conn.Close()
</s> add if keepAlive {
goto keepAlive
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5dfe7f8561da277f5dafa3b7e086700b7d824fec | proxy/http/server.go |
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive" | <mask> return
<mask> }
<mask>
<mask> authenticator := authStore.Authenticator()
<mask> if authenticator != nil {
<mask> if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
<mask> conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
<mask> if keepAlive {
<mask> goto keepAlive
</s> Fix: handle keep alive on http connect proxy </s> remove conn.Close()
</s> add if keepAlive {
goto keepAlive
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5dfe7f8561da277f5dafa3b7e086700b7d824fec | proxy/http/server.go |
if keepAlive {
goto keepAlive
} | <mask> authenticator := authStore.Authenticator()
<mask> if authenticator != nil {
<mask> if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
<mask> conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
<mask> conn.Close()
<mask> return
<mask> } else if !canActivate(authStrings[1], authenticator, cache) {
<mask> conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
<mask> log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
<mask> conn.Close()
</s> Fix: handle keep alive on http connect proxy | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5dfe7f8561da277f5dafa3b7e086700b7d824fec | proxy/http/server.go |
if keepAlive {
goto keepAlive
} | <mask> conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
<mask> log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
<mask> conn.Close()
<mask> return
<mask> }
<mask> }
<mask>
</s> Fix: handle keep alive on http connect proxy </s> remove conn.Close()
</s> add if keepAlive {
goto keepAlive
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5dfe7f8561da277f5dafa3b7e086700b7d824fec | proxy/http/server.go |
conn.Close() | <mask> if request.Method == http.MethodConnect {
<mask> _, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
<mask> if err != nil {
<mask> return
<mask> }
<mask> tunnel.Add(adapters.NewHTTPS(request, conn))
<mask> return
</s> Fix: handle keep alive on http connect proxy </s> remove conn.Close()
</s> add if keepAlive {
goto keepAlive
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/5dfe7f8561da277f5dafa3b7e086700b7d824fec | proxy/http/server.go |
// SetLogLevel change log level of clash
func (c *Config) SetLogLevel(level C.LogLevel) {
c.general.LogLevel = level
c.event <- &Event{Type: "log-level", Payload: level}
}
| <mask> }
<mask>
<mask> // General return clash general config
<mask> func (c *Config) General() General {
<mask> return *c.general
<mask> }
<mask>
<mask> // UpdateRules is a function for hot reload rules
</s> Fixed: global mode and update log level </s> remove var proxyErr, modeErr error
</s> add var proxyErr, modeErr, logLevelErr error </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | config/config.go |
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies) | <mask> }
<mask> }
<mask>
<mask> // init proxy
<mask> proxies["DIRECT"] = adapters.NewDirect()
<mask> proxies["REJECT"] = adapters.NewReject()
<mask>
<mask> c.proxies = proxies
<mask> c.event <- &Event{Type: "proxies", Payload: proxies}
<mask> return nil
</s> Fixed: global mode and update log level </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] </s> remove var proxyErr, modeErr error
</s> add var proxyErr, modeErr, logLevelErr error | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | config/config.go |
LogLevel *string `json:"log-level,omitempty"` | <mask> AllowLan *bool `json:"allow-lan,omitempty"`
<mask> Port *int `json:"port,omitempty"`
<mask> SocksPort *int `json:"socks-port,omitempty"`
<mask> }
<mask>
<mask> func init() {
<mask> currentUser, err := user.Current()
<mask> if err != nil {
</s> Fixed: global mode and update log level </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] </s> remove "proxy": proxyErr,
"mode": modeErr,
</s> add "proxy": proxyErr,
"mode": modeErr,
"log-level": logLevelErr, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | constant/config.go |
var proxyErr, modeErr, logLevelErr error | <mask> return
<mask> }
<mask>
<mask> // update errors
<mask> var proxyErr, modeErr error
<mask>
<mask> // update proxy
<mask> listener := proxy.Instance()
<mask> proxyErr = listener.Update(&config.Base{
<mask> AllowLan: general.AllowLan,
</s> Fixed: global mode and update log level </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] </s> remove "proxy": proxyErr,
"mode": modeErr,
</s> add "proxy": proxyErr,
"mode": modeErr,
"log-level": logLevelErr, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | hub/configs.go |
// update log-level
if general.LogLevel != nil {
level, ok := C.LogLevelMapping[*general.LogLevel]
if !ok {
logLevelErr = fmt.Errorf("Log Level error")
} else {
cfg.SetLogLevel(level)
}
}
| <mask> cfg.SetMode(mode)
<mask> }
<mask> }
<mask>
<mask> hasError, errors := formatErrors(map[string]error{
<mask> "proxy": proxyErr,
<mask> "mode": modeErr,
<mask> "log-level": logLevelErr,
<mask> })
</s> Fixed: global mode and update log level </s> remove "proxy": proxyErr,
"mode": modeErr,
</s> add "proxy": proxyErr,
"mode": modeErr,
"log-level": logLevelErr, </s> remove var proxyErr, modeErr error
</s> add var proxyErr, modeErr, logLevelErr error </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | hub/configs.go |
"proxy": proxyErr,
"mode": modeErr,
"log-level": logLevelErr, | <mask> }
<mask> }
<mask>
<mask> hasError, errors := formatErrors(map[string]error{
<mask> "proxy": proxyErr,
<mask> "mode": modeErr,
<mask> })
<mask>
<mask> if hasError {
<mask> w.WriteHeader(http.StatusBadRequest)
<mask> render.JSON(w, r, errors)
</s> Fixed: global mode and update log level </s> remove var proxyErr, modeErr error
</s> add var proxyErr, modeErr, logLevelErr error </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | hub/configs.go |
<mask> "sync"
<mask> "time"
<mask>
<mask> LocalAdapter "github.com/Dreamacro/clash/adapters/local"
<mask> RemoteAdapter "github.com/Dreamacro/clash/adapters/remote"
<mask> cfg "github.com/Dreamacro/clash/config"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/observable"
<mask>
<mask> "gopkg.in/eapache/channels.v1"
</s> Fixed: global mode and update log level </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] </s> remove mode cfg.Mode
selector *RemoteAdapter.Selector
</s> add mode cfg.Mode </s> remove "proxy": proxyErr,
"mode": modeErr,
</s> add "proxy": proxyErr,
"mode": modeErr,
"log-level": logLevelErr, </s> remove var proxyErr, modeErr error
</s> add var proxyErr, modeErr, logLevelErr error | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | tunnel/tunnel.go | |
mode cfg.Mode | <mask> configLock *sync.RWMutex
<mask> traffic *C.Traffic
<mask>
<mask> // Outbound Rule
<mask> mode cfg.Mode
<mask> selector *RemoteAdapter.Selector
<mask>
<mask> // Log
<mask> logCh chan interface{}
<mask> observable *observable.Observable
<mask> logLevel C.LogLevel
</s> Fixed: global mode and update log level </s> remove proxy = t.selector
</s> add proxy = t.proxies["GLOBAL"] </s> remove var proxyErr, modeErr error
</s> add var proxyErr, modeErr, logLevelErr error | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | tunnel/tunnel.go |
proxy = t.proxies["GLOBAL"] | <mask> switch t.mode {
<mask> case cfg.Direct:
<mask> proxy = t.proxies["DIRECT"]
<mask> case cfg.Global:
<mask> proxy = t.selector
<mask> // Rule
<mask> default:
<mask> proxy = t.match(addr)
<mask> }
<mask> remoConn, err := proxy.Generator(addr)
</s> Fixed: global mode and update log level </s> remove var proxyErr, modeErr error
</s> add var proxyErr, modeErr, logLevelErr error | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/63c967b2b3edee45199afeea2b2b0813b0388c43 | tunnel/tunnel.go |
github.com/gofrs/uuid v3.3.0+incompatible | <mask> github.com/eapache/queue v1.1.0 // indirect
<mask> github.com/go-chi/chi v4.1.1+incompatible
<mask> github.com/go-chi/cors v1.1.1
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v3.2.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/miekg/dns v1.1.29
<mask> github.com/oschwald/geoip2-golang v1.4.0
<mask> github.com/sirupsen/logrus v1.5.0
<mask> github.com/stretchr/testify v1.5.1
</s> Chore: update dependencies and README.md </s> remove github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
</s> add 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= </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f </s> remove github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.mod |
github.com/sirupsen/logrus v1.6.0 | <mask> github.com/gofrs/uuid v3.2.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/miekg/dns v1.1.29
<mask> github.com/oschwald/geoip2-golang v1.4.0
<mask> github.com/sirupsen/logrus v1.5.0
<mask> github.com/stretchr/testify v1.5.1
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
<mask> golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
<mask> gopkg.in/eapache/channels.v1 v1.1.0
</s> Chore: update dependencies and README.md </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f </s> remove github.com/gofrs/uuid v3.2.0+incompatible
</s> add github.com/gofrs/uuid v3.3.0+incompatible </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
</s> add 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= </s> remove github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.mod |
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f | <mask> github.com/miekg/dns v1.1.29
<mask> github.com/oschwald/geoip2-golang v1.4.0
<mask> github.com/sirupsen/logrus v1.5.0
<mask> github.com/stretchr/testify v1.5.1
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
<mask> golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
<mask> gopkg.in/eapache/channels.v1 v1.1.0
<mask> gopkg.in/yaml.v2 v2.2.8
<mask> )
</s> Chore: update dependencies and README.md </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 </s> remove gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
</s> add </s> remove github.com/gofrs/uuid v3.2.0+incompatible
</s> add github.com/gofrs/uuid v3.3.0+incompatible </s> remove golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
</s> add </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
</s> add 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= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.mod |
github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | <mask> github.com/go-chi/cors v1.1.1 h1:eHuqxsIw89iXcWnWUN8R72JMibABJTN/4IOYI5WERvw=
<mask> github.com/go-chi/cors v1.1.1/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I=
<mask> github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
<mask> github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
<mask> github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
<mask> github.com/gofrs/uuid v3.2.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.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
<mask> github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
<mask> github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
</s> Chore: update dependencies and README.md </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
</s> add 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= </s> remove github.com/gofrs/uuid v3.2.0+incompatible
</s> add github.com/gofrs/uuid v3.3.0+incompatible </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f </s> remove golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum |
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= | <mask> github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
<mask> github.com/gofrs/uuid v3.2.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.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
<mask> github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
<mask> github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
<mask> github.com/miekg/dns v1.1.29/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=
</s> Chore: update dependencies and README.md </s> remove github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove github.com/gofrs/uuid v3.2.0+incompatible
</s> add github.com/gofrs/uuid v3.3.0+incompatible </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 </s> remove github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
</s> add github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum |
github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= | <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.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
<mask> github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
<mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
<mask> github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
</s> Chore: update dependencies and README.md </s> remove github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
</s> add </s> remove github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
</s> add </s> remove github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
</s> add 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= </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum |
<mask> github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
<mask> github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
<mask> github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
<mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
<mask> github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
<mask> github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
<mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
</s> Chore: update dependencies and README.md </s> remove github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
</s> add github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= </s> remove github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
</s> add </s> remove golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
</s> add </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
<mask> github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
<mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
<mask> github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
<mask> github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
<mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
<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=
</s> Chore: update dependencies and README.md </s> remove github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
</s> add </s> remove github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
</s> add github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= </s> remove golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
</s> add </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
<mask> github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
<mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
<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 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
<mask> golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/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 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> remove golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
</s> add </s> remove github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
</s> add </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/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 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
<mask> golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/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 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
<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 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
</s> add </s> remove golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
</s> add </s> remove golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
</s> add </s> remove github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
</s> add </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum |
<mask> golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
<mask> golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/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 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
<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 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
<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-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> remove golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
</s> add </s> remove golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
</s> add </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
<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 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
<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 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
<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-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
<mask> golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= </s> remove golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
</s> add </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= </s> remove golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
</s> add </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= | <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 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
<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-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
<mask> golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/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 h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
</s> add </s> remove golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
</s> add </s> remove golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
</s> add </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
</s> add </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum |
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/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 h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
</s> add </s> remove golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
</s> add </s> remove golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
</s> add </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= </s> remove golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
<mask> golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/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 h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
</s> add </s> remove golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
</s> add </s> remove golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
</s> add </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= </s> remove golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
<mask> golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
</s> add </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
</s> add </s> remove golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
</s> add </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= </s> remove gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
<mask> golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
<mask> golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<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=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
</s> add </s> remove golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
</s> add </s> remove golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
</s> add </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= </s> remove gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/eapache/channels.v1 v1.1.0 h1:5bGAyKKvyCTWjSj7mhefG6Lc68VyN4MH1v8/7OoeeB4=
<mask> gopkg.in/eapache/channels.v1 v1.1.0/go.mod h1:BHIBujSvu9yMTrTYbTCjDD43gUhtmaOtTWDe7sTv1js=
<mask> gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
<mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
<mask> gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
</s> Chore: update dependencies and README.md </s> remove golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd
</s> add golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f </s> remove github.com/sirupsen/logrus v1.5.0
</s> add github.com/sirupsen/logrus v1.6.0 </s> remove github.com/gofrs/uuid v3.2.0+incompatible
</s> add github.com/gofrs/uuid v3.3.0+incompatible </s> remove golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
</s> add </s> remove golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
</s> add golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/646bd4eeb4bbea6628987be55a167c45e718f77a | go.sum | |
DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSearch | <mask>
<mask> // export for android
<mask> var (
<mask> DefaultSocketResolver SocketResolver = resolveSocketByNetlink
<mask> DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSeach
<mask> )
<mask>
<mask> type Process struct {
<mask> adapter string
<mask> process string
</s> Improve: check uid on process search & fix typo (#824) </s> remove if !isPid(f.Name()) {
</s> add if !f.IsDir() || !isPid(f.Name()) {
continue
}
if f.Sys().(*syscall.Stat_t).Uid != uint32(uid) { </s> remove func resolveProcessNameByProcSeach(inode, _ int) (string, error) {
</s> add func resolveProcessNameByProcSearch(inode, uid int) (string, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6521acf8f163052c94da9638575aa17b299390b1 | rules/process_linux.go |
func resolveProcessNameByProcSearch(inode, uid int) (string, error) { | <mask>
<mask> return
<mask> }
<mask>
<mask> func resolveProcessNameByProcSeach(inode, _ int) (string, error) {
<mask> files, err := ioutil.ReadDir(pathProc)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
</s> Improve: check uid on process search & fix typo (#824) </s> remove if !isPid(f.Name()) {
</s> add if !f.IsDir() || !isPid(f.Name()) {
continue
}
if f.Sys().(*syscall.Stat_t).Uid != uint32(uid) { </s> remove DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSeach
</s> add DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6521acf8f163052c94da9638575aa17b299390b1 | rules/process_linux.go |
if !f.IsDir() || !isPid(f.Name()) {
continue
}
if f.Sys().(*syscall.Stat_t).Uid != uint32(uid) { | <mask> buffer := make([]byte, syscall.PathMax)
<mask> socket := []byte(fmt.Sprintf("socket:[%d]", inode))
<mask>
<mask> for _, f := range files {
<mask> if !isPid(f.Name()) {
<mask> continue
<mask> }
<mask>
<mask> processPath := path.Join(pathProc, f.Name())
<mask> fdPath := path.Join(processPath, "fd")
</s> Improve: check uid on process search & fix typo (#824) </s> remove func resolveProcessNameByProcSeach(inode, _ int) (string, error) {
</s> add func resolveProcessNameByProcSearch(inode, uid int) (string, error) { </s> remove DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSeach
</s> add DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSearch | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6521acf8f163052c94da9638575aa17b299390b1 | rules/process_linux.go |
wildcard = "*"
dotWildcard = ""
domainStep = "." | <mask> "strings"
<mask> )
<mask>
<mask> const (
<mask> wildcard = "*"
<mask> domainStep = "."
<mask> )
<mask>
<mask> var (
<mask> // ErrInvalidDomain means insert domain is invalid
<mask> ErrInvalidDomain = errors.New("invalid domain")
</s> Feature: domain trie support dot dot wildcard </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove child = n.getChild(wildcard)
</s> add if n.hasChild(part) {
n = n.getChild(part) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
func validAndSplitDomain(domain string) ([]string, bool) {
if domain != "" && domain[len(domain)-1] == '.' {
return nil, false
}
parts := strings.Split(domain, domainStep)
if len(parts) == 1 {
return nil, false
}
for _, part := range parts[1:] {
if part == "" {
return nil, false
}
}
return parts, true | <mask> type Trie struct {
<mask> root *Node
<mask> }
<mask>
<mask> func isValidDomain(domain string) bool {
<mask> return domain != "" && domain[0] != '.' && domain[len(domain)-1] != '.'
<mask> }
<mask>
<mask> // Insert adds a node to the trie.
<mask> // Support
<mask> // 1. www.example.com
</s> Feature: domain trie support dot dot wildcard </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid || parts[0] == "" { </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid { </s> remove parts := strings.Split(domain, domainStep)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
// 4. .example.com | <mask> // Support
<mask> // 1. www.example.com
<mask> // 2. *.example.com
<mask> // 3. subdomain.*.example.com
<mask> func (t *Trie) Insert(domain string, data interface{}) error {
<mask> parts, valid := validAndSplitDomain(domain)
<mask> if !valid {
<mask> return ErrInvalidDomain
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid { </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid || parts[0] == "" { </s> remove func isValidDomain(domain string) bool {
return domain != "" && domain[0] != '.' && domain[len(domain)-1] != '.'
</s> add func validAndSplitDomain(domain string) ([]string, bool) {
if domain != "" && domain[len(domain)-1] == '.' {
return nil, false
}
parts := strings.Split(domain, domainStep)
if len(parts) == 1 {
return nil, false
}
for _, part := range parts[1:] {
if part == "" {
return nil, false
}
}
return parts, true </s> remove parts := strings.Split(domain, domainStep)
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
parts, valid := validAndSplitDomain(domain)
if !valid { | <mask> // 1. www.example.com
<mask> // 2. *.example.com
<mask> // 3. subdomain.*.example.com
<mask> func (t *Trie) Insert(domain string, data interface{}) error {
<mask> if !isValidDomain(domain) {
<mask> return ErrInvalidDomain
<mask> }
<mask>
<mask> parts := strings.Split(domain, domainStep)
<mask> node := t.root
</s> Feature: domain trie support dot dot wildcard </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid || parts[0] == "" { </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove parts := strings.Split(domain, domainStep)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
<mask> if !isValidDomain(domain) {
<mask> return ErrInvalidDomain
<mask> }
<mask>
<mask> parts := strings.Split(domain, domainStep)
<mask> node := t.root
<mask> // reverse storage domain part to save space
<mask> for i := len(parts) - 1; i >= 0; i-- {
<mask> part := parts[i]
<mask> if !node.hasChild(part) {
</s> Feature: domain trie support dot dot wildcard </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid { </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid || parts[0] == "" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go | |
// 2. dot wildcard domain | <mask> // 1. static part
<mask> // 2. wildcard domain
<mask> func (t *Trie) Search(domain string) *Node {
<mask> parts, valid := validAndSplitDomain(domain)
<mask> if !valid || parts[0] == "" {
<mask> return nil
</s> Feature: domain trie support dot dot wildcard </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid || parts[0] == "" { </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid { </s> remove func isValidDomain(domain string) bool {
return domain != "" && domain[0] != '.' && domain[len(domain)-1] != '.'
</s> add func validAndSplitDomain(domain string) ([]string, bool) {
if domain != "" && domain[len(domain)-1] == '.' {
return nil, false
}
parts := strings.Split(domain, domainStep)
if len(parts) == 1 {
return nil, false
}
for _, part := range parts[1:] {
if part == "" {
return nil, false
}
}
return parts, true </s> remove parts := strings.Split(domain, domainStep)
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
parts, valid := validAndSplitDomain(domain)
if !valid || parts[0] == "" { | <mask> // Priority as:
<mask> // 1. static part
<mask> // 2. wildcard domain
<mask> func (t *Trie) Search(domain string) *Node {
<mask> if !isValidDomain(domain) {
<mask> return nil
<mask> }
<mask> parts := strings.Split(domain, domainStep)
<mask>
<mask> n := t.root
</s> Feature: domain trie support dot dot wildcard </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid { </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove func isValidDomain(domain string) bool {
return domain != "" && domain[0] != '.' && domain[len(domain)-1] != '.'
</s> add func validAndSplitDomain(domain string) ([]string, bool) {
if domain != "" && domain[len(domain)-1] == '.' {
return nil, false
}
parts := strings.Split(domain, domainStep)
if len(parts) == 1 {
return nil, false
}
for _, part := range parts[1:] {
if part == "" {
return nil, false
}
}
return parts, true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
<mask> func (t *Trie) Search(domain string) *Node {
<mask> if !isValidDomain(domain) {
<mask> return nil
<mask> }
<mask> parts := strings.Split(domain, domainStep)
<mask>
<mask> n := t.root
<mask> for i := len(parts) - 1; i >= 0; i-- {
<mask> part := parts[i]
<mask>
</s> Feature: domain trie support dot dot wildcard </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid || parts[0] == "" { </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go | |
var dotWildcardNode *Node | <mask> }
<mask>
<mask> n := t.root
<mask> for i := len(parts) - 1; i >= 0; i-- {
<mask> part := parts[i]
<mask>
<mask> if node := n.getChild(dotWildcard); node != nil {
<mask> dotWildcardNode = node
</s> Feature: domain trie support dot dot wildcard </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) </s> remove if !isValidDomain(domain) {
</s> add parts, valid := validAndSplitDomain(domain)
if !valid { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} | <mask> n := t.root
<mask> for i := len(parts) - 1; i >= 0; i-- {
<mask> part := parts[i]
<mask>
<mask> var child *Node
<mask> if !n.hasChild(part) {
<mask> if !n.hasChild(wildcard) {
<mask> return nil
<mask> }
<mask>
<mask> child = n.getChild(wildcard)
<mask> } else {
<mask> child = n.getChild(part)
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove child = n.getChild(wildcard)
</s> add if n.hasChild(part) {
n = n.getChild(part) </s> remove parts := strings.Split(domain, domainStep)
</s> add </s> remove child = n.getChild(part)
</s> add n = n.getChild(wildcard)
}
if n == nil {
break </s> remove parts := strings.Split(domain, domainStep)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
if n.hasChild(part) {
n = n.getChild(part) | <mask> if !n.hasChild(wildcard) {
<mask> return nil
<mask> }
<mask>
<mask> child = n.getChild(wildcard)
<mask> } else {
<mask> child = n.getChild(part)
<mask> }
<mask>
<mask> n = child
</s> Feature: domain trie support dot dot wildcard </s> remove child = n.getChild(part)
</s> add n = n.getChild(wildcard)
}
if n == nil {
break </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove n = child
</s> add if n == nil {
if dotWildcardNode != nil {
return dotWildcardNode
}
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
n = n.getChild(wildcard)
}
if n == nil {
break | <mask> }
<mask>
<mask> child = n.getChild(wildcard)
<mask> } else {
<mask> child = n.getChild(part)
<mask> }
<mask>
<mask> n = child
<mask> }
<mask>
</s> Feature: domain trie support dot dot wildcard </s> remove child = n.getChild(wildcard)
</s> add if n.hasChild(part) {
n = n.getChild(part) </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove n = child
</s> add if n == nil {
if dotWildcardNode != nil {
return dotWildcardNode
}
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
} | <mask> if n == nil {
<mask> break
<mask> }
<mask>
<mask> if n == nil {
<mask> if dotWildcardNode != nil {
<mask> return dotWildcardNode
<mask> }
<mask> return nil
</s> Feature: domain trie support dot dot wildcard </s> remove n = child
</s> add if n == nil {
if dotWildcardNode != nil {
return dotWildcardNode
}
return nil </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove child = n.getChild(part)
</s> add n = n.getChild(wildcard)
}
if n == nil {
break </s> remove child = n.getChild(wildcard)
</s> add if n.hasChild(part) {
n = n.getChild(part) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
if n == nil {
if dotWildcardNode != nil {
return dotWildcardNode
}
return nil | <mask> } else {
<mask> child = n.getChild(part)
<mask> }
<mask>
<mask> n = child
<mask> }
<mask>
<mask> if n.Data == nil {
<mask> return nil
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove child = n.getChild(wildcard)
</s> add if n.hasChild(part) {
n = n.getChild(part) </s> remove child = n.getChild(part)
</s> add n = n.getChild(wildcard)
}
if n == nil {
break </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/tire.go |
"github.com/stretchr/testify/assert" | <mask>
<mask> import (
<mask> "net"
<mask> "testing"
<mask> )
<mask>
<mask> var localIP = net.IP{127, 0, 0, 1}
<mask>
</s> Feature: domain trie support dot dot wildcard </s> remove wildcard = "*"
domainStep = "."
</s> add wildcard = "*"
dotWildcard = ""
domainStep = "." </s> remove var child *Node
if !n.hasChild(part) {
if !n.hasChild(wildcard) {
return nil
}
</s> add if node := n.getChild(dotWildcard); node != nil {
dotWildcardNode = node
} </s> remove child = n.getChild(wildcard)
</s> add if n.hasChild(part) {
n = n.getChild(part) </s> remove child = n.getChild(part)
</s> add n = n.getChild(wildcard)
}
if n == nil {
break | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) | <mask> tree.Insert(domain, localIP)
<mask> }
<mask>
<mask> node := tree.Search("example.com")
<mask> if node == nil {
<mask> t.Error("should not recv nil")
<mask> }
<mask>
<mask> if !node.Data.(net.IP).Equal(localIP) {
<mask> t.Error("should equal 127.0.0.1")
<mask> }
<mask>
<mask> if tree.Insert("", localIP) == nil {
<mask> t.Error("should return error")
<mask> }
<mask> }
<mask>
<mask> func TestTrie_Wildcard(t *testing.T) {
<mask> tree := New()
<mask> domains := []string{
</s> Feature: domain trie support dot dot wildcard </s> remove if tree.Search("sub.foo.example.com") == nil {
t.Error("should not recv nil")
</s> add func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", </s> remove if tree.Search("example.com") != nil {
t.Error("should recv nil")
}
</s> add assertFn("test.dev", 0)
assertFn("foo.bar.dev", 0)
assertFn("example.dev", 1)
assertFn("foo.example.dev", 2)
assertFn("test.example.dev", 3) </s> remove if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil {
t.Error("should recv err")
}
if tree.Search("dev") != nil {
t.Error("should recv nil")
}
if tree.Search(".dev") != nil {
t.Error("should recv nil")
}
</s> add assert.NotNil(t, tree.Insert(".", localIP))
assert.NotNil(t, tree.Insert("..dev", localIP))
assert.Nil(t, tree.Search("dev")) </s> remove if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
</s> add for idx, domain := range domains {
tree.Insert(domain, idx) </s> remove if tree.Search("sub.example.com") == nil {
t.Error("should not recv nil")
}
</s> add assert.NotNil(t, tree.Search("sub.example.com"))
assert.NotNil(t, tree.Search("sub.foo.example.com"))
assert.NotNil(t, tree.Search("test.org"))
assert.NotNil(t, tree.Search("test.example.net"))
assert.Nil(t, tree.Search("foo.sub.example.com"))
assert.Nil(t, tree.Search("foo.example.dev"))
assert.Nil(t, tree.Search("example.com"))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
".org",
".example.net", | <mask> domains := []string{
<mask> "*.example.com",
<mask> "sub.*.example.com",
<mask> "*.dev",
<mask> }
<mask>
<mask> for _, domain := range domains {
<mask> tree.Insert(domain, localIP)
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove if tree.Search("sub.example.com") == nil {
t.Error("should not recv nil")
}
</s> add assert.NotNil(t, tree.Search("sub.example.com"))
assert.NotNil(t, tree.Search("sub.foo.example.com"))
assert.NotNil(t, tree.Search("test.org"))
assert.NotNil(t, tree.Search("test.example.net"))
assert.Nil(t, tree.Search("foo.sub.example.com"))
assert.Nil(t, tree.Search("foo.example.dev"))
assert.Nil(t, tree.Search("example.com"))
} </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) </s> remove if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
</s> add for idx, domain := range domains {
tree.Insert(domain, idx) </s> remove if tree.Search("sub.foo.example.com") == nil {
t.Error("should not recv nil")
</s> add func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", </s> remove func isValidDomain(domain string) bool {
return domain != "" && domain[0] != '.' && domain[len(domain)-1] != '.'
</s> add func validAndSplitDomain(domain string) ([]string, bool) {
if domain != "" && domain[len(domain)-1] == '.' {
return nil, false
}
parts := strings.Split(domain, domainStep)
if len(parts) == 1 {
return nil, false
}
for _, part := range parts[1:] {
if part == "" {
return nil, false
}
}
return parts, true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
assert.NotNil(t, tree.Search("sub.example.com"))
assert.NotNil(t, tree.Search("sub.foo.example.com"))
assert.NotNil(t, tree.Search("test.org"))
assert.NotNil(t, tree.Search("test.example.net"))
assert.Nil(t, tree.Search("foo.sub.example.com"))
assert.Nil(t, tree.Search("foo.example.dev"))
assert.Nil(t, tree.Search("example.com"))
} | <mask> for _, domain := range domains {
<mask> tree.Insert(domain, localIP)
<mask> }
<mask>
<mask> if tree.Search("sub.example.com") == nil {
<mask> t.Error("should not recv nil")
<mask> }
<mask>
<mask> if tree.Search("sub.foo.example.com") == nil {
<mask> t.Error("should not recv nil")
<mask> }
<mask>
</s> Feature: domain trie support dot dot wildcard </s> remove if tree.Search("sub.foo.example.com") == nil {
t.Error("should not recv nil")
</s> add func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", </s> remove if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
</s> add for idx, domain := range domains {
tree.Insert(domain, idx) </s> remove if tree.Search("foo.sub.example.com") != nil {
t.Error("should recv nil")
</s> add assertFn := func(domain string, data int) {
node := tree.Search(domain)
assert.NotNil(t, node)
assert.Equal(t, data, node.Data) </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) </s> remove if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil {
t.Error("should recv err")
}
if tree.Search("dev") != nil {
t.Error("should recv nil")
}
if tree.Search(".dev") != nil {
t.Error("should recv nil")
}
</s> add assert.NotNil(t, tree.Insert(".", localIP))
assert.NotNil(t, tree.Insert("..dev", localIP))
assert.Nil(t, tree.Search("dev")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", | <mask> if tree.Search("sub.example.com") == nil {
<mask> t.Error("should not recv nil")
<mask> }
<mask>
<mask> if tree.Search("sub.foo.example.com") == nil {
<mask> t.Error("should not recv nil")
<mask> }
<mask>
<mask> if tree.Search("foo.sub.example.com") != nil {
<mask> t.Error("should recv nil")
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove if tree.Search("foo.sub.example.com") != nil {
t.Error("should recv nil")
</s> add assertFn := func(domain string, data int) {
node := tree.Search(domain)
assert.NotNil(t, node)
assert.Equal(t, data, node.Data) </s> remove if tree.Search("sub.example.com") == nil {
t.Error("should not recv nil")
}
</s> add assert.NotNil(t, tree.Search("sub.example.com"))
assert.NotNil(t, tree.Search("sub.foo.example.com"))
assert.NotNil(t, tree.Search("test.org"))
assert.NotNil(t, tree.Search("test.example.net"))
assert.Nil(t, tree.Search("foo.sub.example.com"))
assert.Nil(t, tree.Search("foo.example.dev"))
assert.Nil(t, tree.Search("example.com"))
} </s> remove if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
</s> add for idx, domain := range domains {
tree.Insert(domain, idx) </s> remove if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil {
t.Error("should recv err")
}
if tree.Search("dev") != nil {
t.Error("should recv nil")
}
if tree.Search(".dev") != nil {
t.Error("should recv nil")
}
</s> add assert.NotNil(t, tree.Insert(".", localIP))
assert.NotNil(t, tree.Insert("..dev", localIP))
assert.Nil(t, tree.Search("dev")) </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
assertFn := func(domain string, data int) {
node := tree.Search(domain)
assert.NotNil(t, node)
assert.Equal(t, data, node.Data) | <mask> if tree.Search("sub.foo.example.com") == nil {
<mask> t.Error("should not recv nil")
<mask> }
<mask>
<mask> if tree.Search("foo.sub.example.com") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask>
<mask> if tree.Search("foo.example.dev") != nil {
<mask> t.Error("should recv nil")
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove if tree.Search("sub.foo.example.com") == nil {
t.Error("should not recv nil")
</s> add func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", </s> remove if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
</s> add for idx, domain := range domains {
tree.Insert(domain, idx) </s> remove if tree.Search("sub.example.com") == nil {
t.Error("should not recv nil")
}
</s> add assert.NotNil(t, tree.Search("sub.example.com"))
assert.NotNil(t, tree.Search("sub.foo.example.com"))
assert.NotNil(t, tree.Search("test.org"))
assert.NotNil(t, tree.Search("test.example.net"))
assert.Nil(t, tree.Search("foo.sub.example.com"))
assert.Nil(t, tree.Search("foo.example.dev"))
assert.Nil(t, tree.Search("example.com"))
} </s> remove if tree.Search("example.com") != nil {
t.Error("should recv nil")
}
</s> add assertFn("test.dev", 0)
assertFn("foo.bar.dev", 0)
assertFn("example.dev", 1)
assertFn("foo.example.dev", 2)
assertFn("test.example.dev", 3) </s> remove if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil {
t.Error("should recv err")
}
if tree.Search("dev") != nil {
t.Error("should recv nil")
}
if tree.Search(".dev") != nil {
t.Error("should recv nil")
}
</s> add assert.NotNil(t, tree.Insert(".", localIP))
assert.NotNil(t, tree.Insert("..dev", localIP))
assert.Nil(t, tree.Search("dev")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
for idx, domain := range domains {
tree.Insert(domain, idx) | <mask> if tree.Search("foo.sub.example.com") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask>
<mask> if tree.Search("foo.example.dev") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask>
<mask> if tree.Search("example.com") != nil {
<mask> t.Error("should recv nil")
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove if tree.Search("foo.sub.example.com") != nil {
t.Error("should recv nil")
</s> add assertFn := func(domain string, data int) {
node := tree.Search(domain)
assert.NotNil(t, node)
assert.Equal(t, data, node.Data) </s> remove if tree.Search("example.com") != nil {
t.Error("should recv nil")
}
</s> add assertFn("test.dev", 0)
assertFn("foo.bar.dev", 0)
assertFn("example.dev", 1)
assertFn("foo.example.dev", 2)
assertFn("test.example.dev", 3) </s> remove if tree.Search("sub.foo.example.com") == nil {
t.Error("should not recv nil")
</s> add func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", </s> remove if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil {
t.Error("should recv err")
}
if tree.Search("dev") != nil {
t.Error("should recv nil")
}
if tree.Search(".dev") != nil {
t.Error("should recv nil")
}
</s> add assert.NotNil(t, tree.Insert(".", localIP))
assert.NotNil(t, tree.Insert("..dev", localIP))
assert.Nil(t, tree.Search("dev")) </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
assertFn("test.dev", 0)
assertFn("foo.bar.dev", 0)
assertFn("example.dev", 1)
assertFn("foo.example.dev", 2)
assertFn("test.example.dev", 3) | <mask> if tree.Search("foo.example.dev") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask>
<mask> if tree.Search("example.com") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask> }
<mask>
<mask> func TestTrie_Boundary(t *testing.T) {
<mask> tree := New()
<mask> tree.Insert("*.dev", localIP)
</s> Feature: domain trie support dot dot wildcard </s> remove if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil {
t.Error("should recv err")
}
if tree.Search("dev") != nil {
t.Error("should recv nil")
}
if tree.Search(".dev") != nil {
t.Error("should recv nil")
}
</s> add assert.NotNil(t, tree.Insert(".", localIP))
assert.NotNil(t, tree.Insert("..dev", localIP))
assert.Nil(t, tree.Search("dev")) </s> remove if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
</s> add for idx, domain := range domains {
tree.Insert(domain, idx) </s> remove if tree.Search("sub.foo.example.com") == nil {
t.Error("should not recv nil")
</s> add func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) </s> remove if tree.Search("foo.sub.example.com") != nil {
t.Error("should recv nil")
</s> add assertFn := func(domain string, data int) {
node := tree.Search(domain)
assert.NotNil(t, node)
assert.Equal(t, data, node.Data) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
assert.NotNil(t, tree.Insert(".", localIP))
assert.NotNil(t, tree.Insert("..dev", localIP))
assert.Nil(t, tree.Search("dev")) | <mask> func TestTrie_Boundary(t *testing.T) {
<mask> tree := New()
<mask> tree.Insert("*.dev", localIP)
<mask>
<mask> if err := tree.Insert(".", localIP); err == nil {
<mask> t.Error("should recv err")
<mask> }
<mask>
<mask> if err := tree.Insert(".com", localIP); err == nil {
<mask> t.Error("should recv err")
<mask> }
<mask>
<mask> if tree.Search("dev") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask>
<mask> if tree.Search(".dev") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask> }
</s> Feature: domain trie support dot dot wildcard </s> remove if tree.Search("example.com") != nil {
t.Error("should recv nil")
}
</s> add assertFn("test.dev", 0)
assertFn("foo.bar.dev", 0)
assertFn("example.dev", 1)
assertFn("foo.example.dev", 2)
assertFn("test.example.dev", 3) </s> remove if tree.Search("sub.foo.example.com") == nil {
t.Error("should not recv nil")
</s> add func TestTrie_Priority(t *testing.T) {
tree := New()
domains := []string{
".dev",
"example.dev",
"*.example.dev",
"test.example.dev", </s> remove if node == nil {
t.Error("should not recv nil")
}
if !node.Data.(net.IP).Equal(localIP) {
t.Error("should equal 127.0.0.1")
}
if tree.Insert("", localIP) == nil {
t.Error("should return error")
}
</s> add assert.NotNil(t, node)
assert.True(t, node.Data.(net.IP).Equal(localIP))
assert.NotNil(t, tree.Insert("", localIP)) </s> remove if tree.Search("foo.example.dev") != nil {
t.Error("should recv nil")
</s> add for idx, domain := range domains {
tree.Insert(domain, idx) </s> remove if tree.Search("foo.sub.example.com") != nil {
t.Error("should recv nil")
</s> add assertFn := func(domain string, data int) {
node := tree.Search(domain)
assert.NotNil(t, node)
assert.Equal(t, data, node.Data) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/65dab4e34f5cd1a09e4d6b8523f16c6f872880e3 | component/domain-trie/trie_test.go |
ImageShadowsocks = "mritd/shadowsocks:latest"
ImageShadowsocksRust = "ghcr.io/shadowsocks/ssserver-rust:latest"
ImageVmess = "v2fly/v2fly-core:latest"
ImageTrojan = "trojangfw/trojan:latest"
ImageSnell = "icpz/snell-server:latest"
ImageXray = "teddysun/xray:latest" | <mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> const (
<mask> ImageShadowsocks = "mritd/shadowsocks:latest"
<mask> ImageVmess = "v2fly/v2fly-core:latest"
<mask> ImageTrojan = "trojangfw/trojan:latest"
<mask> ImageSnell = "icpz/snell-server:latest"
<mask> ImageXray = "teddysun/xray:latest"
<mask> )
<mask>
<mask> var (
<mask> waitTime = time.Second
<mask> localIP = net.ParseIP("127.0.0.1")
</s> Test: use shadowsocks-rust for ss benchmark </s> remove Image: ImageShadowsocks,
Env: []string{"SS_MODULE=ss-server", "SS_CONFIG=-s 0.0.0.0 -u -v -p 10002 -m aes-256-gcm -k FzcLbKs2dY9mhL"},
</s> add Image: ImageShadowsocksRust,
Entrypoint: []string{"ssserver"},
Cmd: []string{"-s", "0.0.0.0:10002", "-m", "aes-256-gcm", "-k", "FzcLbKs2dY9mhL", "-U"}, </s> remove Image: ImageShadowsocks,
Env: []string{"SS_MODULE=ss-server", "SS_CONFIG=-s 0.0.0.0 -u -v -p 10002 -m chacha20-ietf-poly1305 -k FzcLbKs2dY9mhL"},
</s> add Image: ImageShadowsocksRust,
Entrypoint: []string{"ssserver"},
Cmd: []string{"-s", "0.0.0.0:10002", "-m", "chacha20-ietf-poly1305", "-k", "FzcLbKs2dY9mhL", "-U"}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/661c417fceae6fd5f6c9f21a32bbacd6ff528c46 | test/clash_test.go |
Image: ImageShadowsocksRust,
Entrypoint: []string{"ssserver"},
Cmd: []string{"-s", "0.0.0.0:10002", "-m", "chacha20-ietf-poly1305", "-k", "FzcLbKs2dY9mhL", "-U"}, | <mask> )
<mask>
<mask> func TestClash_Shadowsocks(t *testing.T) {
<mask> cfg := &container.Config{
<mask> Image: ImageShadowsocks,
<mask> Env: []string{"SS_MODULE=ss-server", "SS_CONFIG=-s 0.0.0.0 -u -v -p 10002 -m chacha20-ietf-poly1305 -k FzcLbKs2dY9mhL"},
<mask> ExposedPorts: defaultExposedPorts,
<mask> }
<mask> hostCfg := &container.HostConfig{
<mask> PortBindings: defaultPortBindings,
<mask> }
</s> Test: use shadowsocks-rust for ss benchmark </s> remove ImageShadowsocks = "mritd/shadowsocks:latest"
ImageVmess = "v2fly/v2fly-core:latest"
ImageTrojan = "trojangfw/trojan:latest"
ImageSnell = "icpz/snell-server:latest"
ImageXray = "teddysun/xray:latest"
</s> add ImageShadowsocks = "mritd/shadowsocks:latest"
ImageShadowsocksRust = "ghcr.io/shadowsocks/ssserver-rust:latest"
ImageVmess = "v2fly/v2fly-core:latest"
ImageTrojan = "trojangfw/trojan:latest"
ImageSnell = "icpz/snell-server:latest"
ImageXray = "teddysun/xray:latest" </s> remove Image: ImageShadowsocks,
Env: []string{"SS_MODULE=ss-server", "SS_CONFIG=-s 0.0.0.0 -u -v -p 10002 -m aes-256-gcm -k FzcLbKs2dY9mhL"},
</s> add Image: ImageShadowsocksRust,
Entrypoint: []string{"ssserver"},
Cmd: []string{"-s", "0.0.0.0:10002", "-m", "aes-256-gcm", "-k", "FzcLbKs2dY9mhL", "-U"}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/661c417fceae6fd5f6c9f21a32bbacd6ff528c46 | test/ss_test.go |
Image: ImageShadowsocksRust,
Entrypoint: []string{"ssserver"},
Cmd: []string{"-s", "0.0.0.0:10002", "-m", "aes-256-gcm", "-k", "FzcLbKs2dY9mhL", "-U"}, | <mask> }
<mask>
<mask> func Benchmark_Shadowsocks(b *testing.B) {
<mask> cfg := &container.Config{
<mask> Image: ImageShadowsocks,
<mask> Env: []string{"SS_MODULE=ss-server", "SS_CONFIG=-s 0.0.0.0 -u -v -p 10002 -m aes-256-gcm -k FzcLbKs2dY9mhL"},
<mask> ExposedPorts: defaultExposedPorts,
<mask> }
<mask> hostCfg := &container.HostConfig{
<mask> PortBindings: defaultPortBindings,
<mask> }
</s> Test: use shadowsocks-rust for ss benchmark </s> remove ImageShadowsocks = "mritd/shadowsocks:latest"
ImageVmess = "v2fly/v2fly-core:latest"
ImageTrojan = "trojangfw/trojan:latest"
ImageSnell = "icpz/snell-server:latest"
ImageXray = "teddysun/xray:latest"
</s> add ImageShadowsocks = "mritd/shadowsocks:latest"
ImageShadowsocksRust = "ghcr.io/shadowsocks/ssserver-rust:latest"
ImageVmess = "v2fly/v2fly-core:latest"
ImageTrojan = "trojangfw/trojan:latest"
ImageSnell = "icpz/snell-server:latest"
ImageXray = "teddysun/xray:latest" </s> remove Image: ImageShadowsocks,
Env: []string{"SS_MODULE=ss-server", "SS_CONFIG=-s 0.0.0.0 -u -v -p 10002 -m chacha20-ietf-poly1305 -k FzcLbKs2dY9mhL"},
</s> add Image: ImageShadowsocksRust,
Entrypoint: []string{"ssserver"},
Cmd: []string{"-s", "0.0.0.0:10002", "-m", "chacha20-ietf-poly1305", "-k", "FzcLbKs2dY9mhL", "-U"}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/661c417fceae6fd5f6c9f21a32bbacd6ff528c46 | test/ss_test.go |
case "http":
httpOption := &adapters.HttpOption{}
err = decoder.Decode(mapping, httpOption)
if err != nil {
break
}
proxy = adapters.NewHttp(*httpOption) | <mask> if err != nil {
<mask> break
<mask> }
<mask> proxy = adapters.NewSocks5(*socksOption)
<mask> case "vmess":
<mask> vmessOption := &adapters.VmessOption{}
<mask> err = decoder.Decode(mapping, vmessOption)
<mask> if err != nil {
<mask> break
<mask> }
</s> Feature: add http/https [connect] proxy (#52) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6636db242bad3563406048807b4670f9fabf72a7 | config/config.go |
Http | <mask> Selector
<mask> Shadowsocks
<mask> Socks5
<mask> URLTest
<mask> Vmess
<mask> )
<mask>
</s> Feature: add http/https [connect] proxy (#52) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6636db242bad3563406048807b4670f9fabf72a7 | constant/adapters.go |
case Http:
return "Http" | <mask> case Socks5:
<mask> return "Socks5"
<mask> case URLTest:
<mask> return "URLTest"
<mask> case Vmess:
<mask> return "Vmess"
<mask> default:
</s> Feature: add http/https [connect] proxy (#52) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6636db242bad3563406048807b4670f9fabf72a7 | constant/adapters.go |
return newPacketConn(&vmessUDPConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil | <mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> if err != nil {
<mask> return nil, fmt.Errorf("new vmess client error: %v", err)
<mask> }
<mask> return newPacketConn(&vmessUDPConn{Conn: c}, v), nil
<mask> }
<mask>
<mask> func NewVmess(option VmessOption) (*Vmess, error) {
<mask> security := strings.ToLower(option.Cipher)
<mask> client, err := vmess.NewClient(vmess.Config{
</s> Fix: vmessUDPConn should return a correctly address </s> remove return n, uc.RemoteAddr(), err
</s> add return n, uc.rAddr, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6641bf7c073d118821312f3b3a25699716b59525 | adapters/outbound/vmess.go |
rAddr net.Addr | <mask>
<mask> type vmessUDPConn struct {
<mask> net.Conn
<mask> }
<mask>
<mask> func (uc *vmessUDPConn) WriteTo(b []byte, addr net.Addr) (int, error) {
<mask> return uc.Conn.Write(b)
<mask> }
</s> Fix: vmessUDPConn should return a correctly address </s> remove return n, uc.RemoteAddr(), err
</s> add return n, uc.rAddr, err </s> remove return newPacketConn(&vmessUDPConn{Conn: c}, v), nil
</s> add return newPacketConn(&vmessUDPConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6641bf7c073d118821312f3b3a25699716b59525 | adapters/outbound/vmess.go |
return n, uc.rAddr, err | <mask> }
<mask>
<mask> func (uc *vmessUDPConn) ReadFrom(b []byte) (int, net.Addr, error) {
<mask> n, err := uc.Conn.Read(b)
<mask> return n, uc.RemoteAddr(), err
<mask> }
</s> Fix: vmessUDPConn should return a correctly address </s> remove return newPacketConn(&vmessUDPConn{Conn: c}, v), nil
</s> add return newPacketConn(&vmessUDPConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/6641bf7c073d118821312f3b3a25699716b59525 | adapters/outbound/vmess.go |
"path/filepath" | <mask> "encoding/binary"
<mask> "fmt"
<mask> "net"
<mask> "os"
<mask> "path"
<mask> "strings"
<mask> "syscall"
<mask> "unicode"
<mask> "unsafe"
<mask>
</s> Refactor: linux process resolving (#2305) </s> remove "github.com/Dreamacro/clash/common/pool"
</s> add "github.com/mdlayher/netlink"
"golang.org/x/sys/unix" </s> remove if _, err := syscall.Write(socket, req); err != nil {
return 0, 0, fmt.Errorf("write request: %w", err)
</s> add if v4 := ip.To4(); v4 != nil {
copy(request.Src[:], v4)
} else {
copy(request.Src[:], ip) </s> remove buf := make([]byte, sizeOfSocketDiagRequest)
nativeEndian.PutUint32(buf[0:4], sizeOfSocketDiagRequest)
nativeEndian.PutUint16(buf[4:6], socketDiagByFamily)
nativeEndian.PutUint16(buf[6:8], syscall.NLM_F_REQUEST|syscall.NLM_F_DUMP)
nativeEndian.PutUint32(buf[8:12], 0)
nativeEndian.PutUint32(buf[12:16], 0)
buf[16] = family
buf[17] = protocol
buf[18] = 0
buf[19] = 0
nativeEndian.PutUint32(buf[20:24], 0xFFFFFFFF)
binary.BigEndian.PutUint16(buf[24:26], sourcePort)
binary.BigEndian.PutUint16(buf[26:28], 0)
copy(buf[28:44], s)
copy(buf[44:60], net.IPv6zero)
nativeEndian.PutUint32(buf[60:64], 0)
nativeEndian.PutUint64(buf[64:72], 0xFFFFFFFFFFFFFFFF)
</s> add for _, msg := range messages {
if len(msg.Data) < inetDiagResponseSize {
continue
} </s> remove inode, uid := unpackSocketDiagResponse(&messages[0])
if inode < 0 || uid < 0 {
return 0, 0, fmt.Errorf("invalid inode(%d) or uid(%d)", inode, uid)
}
return inode, uid, nil
}
func packSocketDiagRequest(family, protocol byte, source net.IP, sourcePort uint16) []byte {
s := make([]byte, 16)
if v4 := source.To4(); v4 != nil {
copy(s, v4)
} else {
copy(s, source)
</s> add messages, err := conn.Execute(message)
if err != nil {
return 0, 0, err </s> remove
message := messages[0]
if message.Header.Type&syscall.NLMSG_ERROR != 0 {
return 0, 0, fmt.Errorf("netlink message: NLMSG_ERROR")
</s> add defer conn.Close()
message := netlink.Message{
Header: netlink.Header{
Type: SOCK_DIAG_BY_FAMILY,
Flags: netlink.Request | netlink.Dump,
},
Data: (*(*[inetDiagRequestSize]byte)(unsafe.Pointer(request)))[:], | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6995e9818177d65e9da7964168fc489ad0ed549d | component/process/process_linux.go |
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix" | <mask> "syscall"
<mask> "unicode"
<mask> "unsafe"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> )
<mask>
<mask> // from https://github.com/vishvananda/netlink/blob/bca67dfc8220b44ef582c9da4e9172bf1c9ec973/nl/nl_linux.go#L52-L62
<mask> var nativeEndian = func() binary.ByteOrder {
<mask> var x uint32 = 0x01020304
</s> Refactor: linux process resolving (#2305) </s> remove // from https://github.com/vishvananda/netlink/blob/bca67dfc8220b44ef582c9da4e9172bf1c9ec973/nl/nl_linux.go#L52-L62
var nativeEndian = func() binary.ByteOrder {
var x uint32 = 0x01020304
if *(*byte)(unsafe.Pointer(&x)) == 0x01 {
return binary.BigEndian
}
return binary.LittleEndian
}()
</s> add </s> remove "path"
</s> add "path/filepath" </s> remove func resolveSocketByNetlink(network string, ip net.IP, srcPort int) (int32, int32, error) {
var family byte
var protocol byte
switch network {
case TCP:
protocol = syscall.IPPROTO_TCP
case UDP:
protocol = syscall.IPPROTO_UDP
default:
return 0, 0, ErrInvalidNetwork
</s> add func resolveSocketByNetlink(network string, ip net.IP, srcPort int) (uint32, uint32, error) {
request := &inetDiagRequest{
States: 0xffffffff,
Cookie: [2]uint32{0xffffffff, 0xffffffff}, </s> remove sizeOfSocketDiagRequest = syscall.SizeofNlMsghdr + 8 + 48
socketDiagByFamily = 20
pathProc = "/proc"
</s> add SOCK_DIAG_BY_FAMILY = 20
inetDiagRequestSize = int(unsafe.Sizeof(inetDiagRequest{}))
inetDiagResponseSize = int(unsafe.Sizeof(inetDiagResponse{})) </s> remove family = syscall.AF_INET
</s> add request.Family = unix.AF_INET | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/6995e9818177d65e9da7964168fc489ad0ed549d | component/process/process_linux.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.