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 |
|---|---|---|---|---|
buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | <mask> return 0, err
<mask> }
<mask> return length, nil
<mask> } else if c.handshakeStatus == 1 && len(b) == 0 {
<mask> buf := tools.BufPool.Get().(*bytes.Buffer)
<mask> defer tools.BufPool.Put(buf)
<mask> defer buf.Reset()
<mask>
<mask> buf.Write([]byte{0x14, 3, 3, 0, 1, 1, 0x16, 3, 3, 0, 0x20})
<mask> tools.AppendRandBytes(buf, 22)
<mask> buf.Write(c.hmacSHA1(buf.Bytes())[:10])
<mask> buf.ReadFrom(&c.sendBuf)
</s> Improve: use one bytes.Buffer pool </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove data := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(data)
defer data.Reset()
</s> add data := pool.GetBuffer()
defer pool.PutBuffer(data) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := bufferPool.Get().(*bytes.Buffer)
buf.Reset()
defer bufferPool.Put(buf)
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/obfs/tls1.2_ticket_auth.go |
<mask> package protocol
<mask>
<mask> import (
<mask> "bytes"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/transport/ssr/tools"
<mask> )
<mask>
</s> Improve: use one bytes.Buffer pool </s> remove "github.com/Dreamacro/clash/transport/ssr/tools"
</s> add "github.com/Dreamacro/clash/common/pool" </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "github.com/Dreamacro/clash/transport/ssr/tools"
</s> add </s> remove "bytes"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/protocol/packet.go | |
"github.com/Dreamacro/clash/common/pool" | <mask> import (
<mask> "bytes"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/transport/ssr/tools"
<mask> )
<mask>
<mask> type PacketConn struct {
<mask> net.PacketConn
<mask> Protocol
</s> Improve: use one bytes.Buffer pool </s> remove "github.com/Dreamacro/clash/transport/ssr/tools"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
endSignal = []byte{}
</s> add endSignal = []byte{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/protocol/packet.go |
buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | <mask> Protocol
<mask> }
<mask>
<mask> func (c *PacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
<mask> buf := tools.BufPool.Get().(*bytes.Buffer)
<mask> defer tools.BufPool.Put(buf)
<mask> defer buf.Reset()
<mask> err := c.EncodePacket(buf, b)
<mask> if err != nil {
<mask> return 0, err
<mask> }
<mask> _, err = c.PacketConn.WriteTo(buf.Bytes(), addr)
</s> Improve: use one bytes.Buffer pool </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := &bytes.Buffer{}
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := bufferPool.Get().(*bytes.Buffer)
defer bufferPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/protocol/packet.go |
<mask> "bytes"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/transport/ssr/tools"
<mask> )
<mask>
<mask> type Conn struct {
<mask> net.Conn
<mask> Protocol
</s> Improve: use one bytes.Buffer pool </s> remove "github.com/Dreamacro/clash/transport/ssr/tools"
</s> add "github.com/Dreamacro/clash/common/pool" </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
endSignal = []byte{}
</s> add endSignal = []byte{} </s> remove "bytes"
</s> add </s> remove "github.com/Dreamacro/clash/transport/ssr/tools"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/protocol/stream.go | |
buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | <mask> }
<mask>
<mask> func (c *Conn) Write(b []byte) (int, error) {
<mask> bLength := len(b)
<mask> buf := tools.BufPool.Get().(*bytes.Buffer)
<mask> defer tools.BufPool.Put(buf)
<mask> defer buf.Reset()
<mask> err := c.Encode(buf, b)
<mask> if err != nil {
<mask> return 0, err
<mask> }
<mask> _, err = c.Conn.Write(buf.Bytes())
</s> Improve: use one bytes.Buffer pool </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := &bytes.Buffer{}
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := bufferPool.Get().(*bytes.Buffer)
defer bufferPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/protocol/stream.go |
"crypto/rand"
"io" | <mask> package tools
<mask>
<mask> import (
<mask> "bytes"
<mask> "math/rand"
<mask> "sync"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> )
<mask>
<mask> var BufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
<mask>
<mask> func AppendRandBytes(b *bytes.Buffer, length int) {
</s> Improve: use one bytes.Buffer pool </s> remove var BufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove randBytes := pool.Get(length)
defer pool.Put(randBytes)
rand.Read(randBytes)
b.Write(randBytes)
</s> add b.ReadFrom(io.LimitReader(rand.Reader, int64(length))) </s> remove
bufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
endSignal = []byte{}
</s> add endSignal = []byte{} </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/tools/bufPool.go |
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> )
<mask>
<mask> var BufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
<mask>
<mask> func AppendRandBytes(b *bytes.Buffer, length int) {
<mask> randBytes := pool.Get(length)
<mask> defer pool.Put(randBytes)
<mask> rand.Read(randBytes)
<mask> b.Write(randBytes)
</s> Improve: use one bytes.Buffer pool </s> remove randBytes := pool.Get(length)
defer pool.Put(randBytes)
rand.Read(randBytes)
b.Write(randBytes)
</s> add b.ReadFrom(io.LimitReader(rand.Reader, int64(length))) </s> remove "math/rand"
"sync"
"github.com/Dreamacro/clash/common/pool"
</s> add "crypto/rand"
"io" </s> remove
bufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
endSignal = []byte{}
</s> add endSignal = []byte{} </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/tools/bufPool.go | |
b.ReadFrom(io.LimitReader(rand.Reader, int64(length))) | <mask>
<mask> var BufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
<mask>
<mask> func AppendRandBytes(b *bytes.Buffer, length int) {
<mask> randBytes := pool.Get(length)
<mask> defer pool.Put(randBytes)
<mask> rand.Read(randBytes)
<mask> b.Write(randBytes)
<mask> }
</s> Improve: use one bytes.Buffer pool </s> remove var BufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove "math/rand"
"sync"
"github.com/Dreamacro/clash/common/pool"
</s> add "crypto/rand"
"io" </s> remove
bufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
endSignal = []byte{}
</s> add endSignal = []byte{} </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/ssr/tools/bufPool.go |
<mask> package trojan
<mask>
<mask> import (
<mask> "bytes"
<mask> "crypto/sha256"
<mask> "crypto/tls"
<mask> "encoding/binary"
<mask> "encoding/hex"
<mask> "errors"
</s> Improve: use one bytes.Buffer pool </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "math/rand"
"sync"
"github.com/Dreamacro/clash/common/pool"
</s> add "crypto/rand"
"io" </s> remove "github.com/Dreamacro/clash/transport/ssr/tools"
</s> add "github.com/Dreamacro/clash/common/pool" | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/trojan/trojan.go | |
"github.com/Dreamacro/clash/common/pool" | <mask> "net"
<mask> "sync"
<mask>
<mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> const (
<mask> // max packet length
<mask> maxLength = 8192
</s> Improve: use one bytes.Buffer pool </s> remove "sync"
</s> add "github.com/Dreamacro/clash/common/pool" </s> remove "math/rand"
"sync"
"github.com/Dreamacro/clash/common/pool"
</s> add "crypto/rand"
"io" </s> remove "bytes"
</s> add </s> remove "github.com/Dreamacro/clash/transport/ssr/tools"
</s> add "github.com/Dreamacro/clash/common/pool" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/trojan/trojan.go |
<mask>
<mask> var (
<mask> defaultALPN = []string{"h2", "http/1.1"}
<mask> crlf = []byte{'\r', '\n'}
<mask>
<mask> bufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
<mask> )
<mask>
<mask> type Command = byte
<mask>
<mask> var (
</s> Improve: use one bytes.Buffer pool </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
endSignal = []byte{}
</s> add endSignal = []byte{} </s> remove "math/rand"
"sync"
"github.com/Dreamacro/clash/common/pool"
</s> add "crypto/rand"
"io" </s> remove var BufPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add </s> remove randBytes := pool.Get(length)
defer pool.Put(randBytes)
rand.Read(randBytes)
b.Write(randBytes)
</s> add b.ReadFrom(io.LimitReader(rand.Reader, int64(length))) </s> remove bufferPool = sync.Pool{New: func() interface{} { return &bytes.Buffer{} }}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/trojan/trojan.go | |
buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | <mask> return tlsConn, nil
<mask> }
<mask>
<mask> func (t *Trojan) WriteHeader(w io.Writer, command Command, socks5Addr []byte) error {
<mask> buf := bufPool.Get().(*bytes.Buffer)
<mask> defer bufPool.Put(buf)
<mask> defer buf.Reset()
<mask>
<mask> buf.Write(t.hexPassword)
<mask> buf.Write(crlf)
<mask>
<mask> buf.WriteByte(command)
</s> Improve: use one bytes.Buffer pool </s> remove buf := bufPool.Get().(*bytes.Buffer)
defer bufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := bufferPool.Get().(*bytes.Buffer)
buf.Reset()
defer bufferPool.Put(buf)
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/trojan/trojan.go |
buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | <mask> }
<mask> }
<mask>
<mask> func writePacket(w io.Writer, socks5Addr, payload []byte) (int, error) {
<mask> buf := bufPool.Get().(*bytes.Buffer)
<mask> defer bufPool.Put(buf)
<mask> defer buf.Reset()
<mask>
<mask> buf.Write(socks5Addr)
<mask> binary.Write(buf, binary.BigEndian, uint16(len(payload)))
<mask> buf.Write(crlf)
<mask> buf.Write(payload)
</s> Improve: use one bytes.Buffer pool </s> remove buf := bufPool.Get().(*bytes.Buffer)
defer bufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := tools.BufPool.Get().(*bytes.Buffer)
defer tools.BufPool.Put(buf)
defer buf.Reset()
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) </s> remove buf := &bytes.Buffer{}
</s> add buf := pool.GetBuffer()
defer pool.PutBuffer(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/70c8605cca3b9cba8598bad52d3bb6a36d77d032 | transport/trojan/trojan.go |
ServerName string `proxy:"servername,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> }
<mask>
<mask> type HTTPOptions struct {
<mask> Method string `proxy:"method,omitempty"`
<mask> Path []string `proxy:"path,omitempty"`
</s> Feature: support vmess tls custom servername </s> remove if host := c.Headers.Get("Host"); host != "" {
</s> add if c.ServerName != "" {
dialer.TLSClientConfig.ServerName = c.ServerName
} else if host := c.Headers.Get("Host"); host != "" { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/71d30e6654e347c44856b725b87d70af880050d4 | adapters/outbound/vmess.go |
wsOpts.ServerName = v.option.ServerName | <mask> wsOpts.SessionCache = getClientSessionCache()
<mask> wsOpts.SkipCertVerify = v.option.SkipCertVerify
<mask> }
<mask> c, err = vmess.StreamWebsocketConn(c, wsOpts)
<mask> case "http":
<mask> host, _, _ := net.SplitHostPort(v.addr)
<mask> httpOpts := &vmess.HTTPConfig{
</s> Feature: support vmess tls custom servername </s> remove if host := c.Headers.Get("Host"); host != "" {
</s> add if c.ServerName != "" {
dialer.TLSClientConfig.ServerName = c.ServerName
} else if host := c.Headers.Get("Host"); host != "" { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/71d30e6654e347c44856b725b87d70af880050d4 | adapters/outbound/vmess.go |
if v.option.ServerName != "" {
tlsOpts.Host = v.option.ServerName
}
| <mask> SessionCache: getClientSessionCache(),
<mask> }
<mask> c, err = vmess.StreamTLSConn(c, tlsOpts)
<mask> }
<mask> }
<mask>
</s> Feature: support vmess tls custom servername </s> remove if host := c.Headers.Get("Host"); host != "" {
</s> add if c.ServerName != "" {
dialer.TLSClientConfig.ServerName = c.ServerName
} else if host := c.Headers.Get("Host"); host != "" { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/71d30e6654e347c44856b725b87d70af880050d4 | adapters/outbound/vmess.go |
ServerName string | <mask> Path string
<mask> Headers http.Header
<mask> TLS bool
<mask> SkipCertVerify bool
<mask> SessionCache tls.ClientSessionCache
<mask> }
<mask>
<mask> // Read implements net.Conn.Read()
</s> Feature: support vmess tls custom servername </s> remove if host := c.Headers.Get("Host"); host != "" {
</s> add if c.ServerName != "" {
dialer.TLSClientConfig.ServerName = c.ServerName
} else if host := c.Headers.Get("Host"); host != "" { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/71d30e6654e347c44856b725b87d70af880050d4 | component/vmess/websocket.go |
if c.ServerName != "" {
dialer.TLSClientConfig.ServerName = c.ServerName
} else if host := c.Headers.Get("Host"); host != "" { | <mask> InsecureSkipVerify: c.SkipCertVerify,
<mask> ClientSessionCache: c.SessionCache,
<mask> }
<mask>
<mask> if host := c.Headers.Get("Host"); host != "" {
<mask> dialer.TLSClientConfig.ServerName = host
<mask> }
<mask> }
<mask>
<mask> uri := url.URL{
</s> Feature: support vmess tls custom servername | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/71d30e6654e347c44856b725b87d70af880050d4 | component/vmess/websocket.go |
func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) { | <mask> func (s *Server) setHandler(handler handler) {
<mask> s.handler = handler
<mask> }
<mask>
<mask> func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) error {
<mask> if addr == address && resolver != nil {
<mask> handler := newHandler(resolver, mapper)
<mask> server.setHandler(handler)
<mask> return nil
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
return | <mask> func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) error {
<mask> if addr == address && resolver != nil {
<mask> handler := newHandler(resolver, mapper)
<mask> server.setHandler(handler)
<mask> return nil
<mask> }
<mask>
<mask> if server.Server != nil {
<mask> server.Shutdown()
<mask> server = &Server{}
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) error {
</s> add func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) { </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
var err error
defer func() {
if err != nil {
log.Errorln("Start DNS server error: %s", err.Error())
}
}()
| <mask> }
<mask>
<mask> _, port, err := net.SplitHostPort(addr)
<mask> if port == "0" || port == "" || err != nil {
<mask> return
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
return | <mask> }
<mask>
<mask> _, port, err := net.SplitHostPort(addr)
<mask> if port == "0" || port == "" || err != nil {
<mask> return nil
<mask> }
<mask>
<mask> udpAddr, err := net.ResolveUDPAddr("udp", addr)
<mask> if err != nil {
<mask> return err
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
return | <mask> }
<mask>
<mask> udpAddr, err := net.ResolveUDPAddr("udp", addr)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> p, err := net.ListenUDP("udp", udpAddr)
<mask> if err != nil {
<mask> return err
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
return | <mask> }
<mask>
<mask> p, err := net.ListenUDP("udp", udpAddr)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> err = sockopt.UDPReuseaddr(p)
<mask> if err != nil {
<mask> log.Warnln("Failed to Reuse UDP Address: %s", err)
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
err = nil | <mask>
<mask> err = sockopt.UDPReuseaddr(p)
<mask> if err != nil {
<mask> log.Warnln("Failed to Reuse UDP Address: %s", err)
<mask> }
<mask>
<mask> address = addr
<mask> handler := newHandler(resolver, mapper)
<mask> server = &Server{handler: handler}
<mask> server.Server = &D.Server{Addr: addr, PacketConn: p, Handler: server}
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) error {
</s> add func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
log.Infoln("DNS server listening at: %s", p.LocalAddr().String()) | <mask>
<mask> go func() {
<mask> server.ActivateAndServe()
<mask> }()
<mask> return nil
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | dns/server.go |
dns.ReCreateServer(c.Listen, r, m) | <mask>
<mask> resolver.DefaultResolver = r
<mask> resolver.DefaultHostMapper = m
<mask>
<mask> if err := dns.ReCreateServer(c.Listen, r, m); err != nil {
<mask> log.Errorln("Start DNS server error: %s", err.Error())
<mask> return
<mask> }
<mask>
<mask> if c.Listen != "" {
<mask> log.Infoln("DNS server listening at: %s", c.Listen)
<mask> }
<mask> }
<mask>
<mask> func updateHosts(tree *trie.DomainTrie) {
<mask> resolver.DefaultHosts = tree
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) </s> remove if err := P.ReCreateHTTP(general.Port, tcpIn); err != nil {
log.Errorln("Start HTTP server error: %s", err.Error())
}
if err := P.ReCreateSocks(general.SocksPort, tcpIn, udpIn); err != nil {
log.Errorln("Start SOCKS server error: %s", err.Error())
}
if err := P.ReCreateRedir(general.RedirPort, tcpIn, udpIn); err != nil {
log.Errorln("Start Redir server error: %s", err.Error())
}
if err := P.ReCreateTProxy(general.TProxyPort, tcpIn, udpIn); err != nil {
log.Errorln("Start TProxy server error: %s", err.Error())
}
if err := P.ReCreateMixed(general.MixedPort, tcpIn, udpIn); err != nil {
log.Errorln("Start Mixed(http and socks) server error: %s", err.Error())
}
</s> add P.ReCreateHTTP(general.Port, tcpIn)
P.ReCreateSocks(general.SocksPort, tcpIn, udpIn)
P.ReCreateRedir(general.RedirPort, tcpIn, udpIn)
P.ReCreateTProxy(general.TProxyPort, tcpIn, udpIn)
P.ReCreateMixed(general.MixedPort, tcpIn, udpIn) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | hub/executor/executor.go |
P.ReCreateHTTP(general.Port, tcpIn)
P.ReCreateSocks(general.SocksPort, tcpIn, udpIn)
P.ReCreateRedir(general.RedirPort, tcpIn, udpIn)
P.ReCreateTProxy(general.TProxyPort, tcpIn, udpIn)
P.ReCreateMixed(general.MixedPort, tcpIn, udpIn) | <mask>
<mask> tcpIn := tunnel.TCPIn()
<mask> udpIn := tunnel.UDPIn()
<mask>
<mask> if err := P.ReCreateHTTP(general.Port, tcpIn); err != nil {
<mask> log.Errorln("Start HTTP server error: %s", err.Error())
<mask> }
<mask>
<mask> if err := P.ReCreateSocks(general.SocksPort, tcpIn, udpIn); err != nil {
<mask> log.Errorln("Start SOCKS server error: %s", err.Error())
<mask> }
<mask>
<mask> if err := P.ReCreateRedir(general.RedirPort, tcpIn, udpIn); err != nil {
<mask> log.Errorln("Start Redir server error: %s", err.Error())
<mask> }
<mask>
<mask> if err := P.ReCreateTProxy(general.TProxyPort, tcpIn, udpIn); err != nil {
<mask> log.Errorln("Start TProxy server error: %s", err.Error())
<mask> }
<mask>
<mask> if err := P.ReCreateMixed(general.MixedPort, tcpIn, udpIn); err != nil {
<mask> log.Errorln("Start Mixed(http and socks) server error: %s", err.Error())
<mask> }
<mask> }
<mask>
<mask> func updateUsers(users []auth.AuthUser) {
<mask> authenticator := auth.NewAuthenticator(users)
<mask> authStore.SetAuthenticator(authenticator)
</s> Chore: ReCreate* do side effect job (#1849) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
... | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | hub/executor/executor.go |
func ReCreateHTTP(port int, tcpIn chan<- C.ConnContext) { | <mask> func SetBindAddress(host string) {
<mask> bindAddress = host
<mask> }
<mask>
<mask> func ReCreateHTTP(port int, tcpIn chan<- C.ConnContext) error {
<mask> httpMux.Lock()
<mask> defer httpMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
var err error
defer func() {
if err != nil {
log.Errorln("Start HTTP server error: %s", err.Error())
}
}()
| <mask> httpMux.Lock()
<mask> defer httpMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if httpListener != nil {
<mask> if httpListener.RawAddress() == addr {
<mask> return
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove func ReCreateHTTP(port int, tcpIn chan<- C.ConnContext) error {
</s> add func ReCreateHTTP(port int, tcpIn chan<- C.ConnContext) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if httpListener != nil {
<mask> if httpListener.RawAddress() == addr {
<mask> return nil
<mask> }
<mask> httpListener.Close()
<mask> httpListener = nil
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> httpListener = nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> httpListener, err = http.New(addr, tcpIn)
<mask> if err != nil {
</s> Chore: ReCreate* do side effect job (#1849) </s> remove var err error
</s> add </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> httpListener, err = http.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove var err error
</s> add </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
return | <mask>
<mask> var err error
<mask> httpListener, err = http.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> log.Infoln("HTTP proxy listening at: %s", httpListener.Address())
<mask> return nil
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) </s> remove var err error
</s> add </s> remove return nil
</s> add return </s> remove return nil
</s> add </s> remove return err
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> return err
<mask> }
<mask>
<mask> log.Infoln("HTTP proxy listening at: %s", httpListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> socksMux.Lock()
<mask> defer socksMux.Unlock()
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { | <mask> log.Infoln("HTTP proxy listening at: %s", httpListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> socksMux.Lock()
<mask> defer socksMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
var err error
defer func() {
if err != nil {
log.Errorln("Start SOCKS server error: %s", err.Error())
}
}()
| <mask> defer socksMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> shouldTCPIgnore := false
<mask> shouldUDPIgnore := false
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> }
<mask> }
<mask>
<mask> if shouldTCPIgnore && shouldUDPIgnore {
<mask> return nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove var err error
</s> add </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> return nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> tcpListener, err := socks.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove var err error
</s> add </s> remove var err error
</s> add </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> }
<mask>
<mask> tcpListener, err := socks.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> udpListener, err := socks.NewUDP(addr, udpIn)
<mask> if err != nil {
<mask> tcpListener.Close()
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask>
<mask> udpListener, err := socks.NewUDP(addr, udpIn)
<mask> if err != nil {
<mask> tcpListener.Close()
<mask> return err
<mask> }
<mask>
<mask> socksListener = tcpListener
<mask> socksUDPListener = udpListener
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return nil
</s> add </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> socksListener = tcpListener
<mask> socksUDPListener = udpListener
<mask>
<mask> log.Infoln("SOCKS proxy listening at: %s", socksListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> redirMux.Lock()
<mask> defer redirMux.Unlock()
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { | <mask> log.Infoln("SOCKS proxy listening at: %s", socksListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> redirMux.Lock()
<mask> defer redirMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
var err error
defer func() {
if err != nil {
log.Errorln("Start Redir server error: %s", err.Error())
}
}()
| <mask> defer redirMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if redirListener != nil {
<mask> if redirListener.RawAddress() == addr {
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if redirListener != nil {
<mask> if redirListener.RawAddress() == addr {
<mask> return nil
<mask> }
<mask> redirListener.Close()
<mask> redirListener = nil
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> }
<mask>
<mask> if redirUDPListener != nil {
<mask> if redirUDPListener.RawAddress() == addr {
<mask> return nil
<mask> }
<mask> redirUDPListener.Close()
<mask> redirUDPListener = nil
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> redirUDPListener = nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> redirListener, err = redir.New(addr, tcpIn)
<mask> if err != nil {
</s> Chore: ReCreate* do side effect job (#1849) </s> remove var err error
</s> add </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> redirListener, err = redir.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove var err error
</s> add </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
return | <mask>
<mask> var err error
<mask> redirListener, err = redir.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> redirUDPListener, err = tproxy.NewUDP(addr, udpIn)
<mask> if err != nil {
<mask> log.Warnln("Failed to start Redir UDP Listener: %s", err)
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> log.Warnln("Failed to start Redir UDP Listener: %s", err)
<mask> }
<mask>
<mask> log.Infoln("Redirect proxy listening at: %s", redirListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> tproxyMux.Lock()
<mask> defer tproxyMux.Unlock()
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { | <mask> log.Infoln("Redirect proxy listening at: %s", redirListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> tproxyMux.Lock()
<mask> defer tproxyMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
var err error
defer func() {
if err != nil {
log.Errorln("Start TProxy server error: %s", err.Error())
}
}()
| <mask> tproxyMux.Lock()
<mask> defer tproxyMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if tproxyListener != nil {
<mask> if tproxyListener.RawAddress() == addr {
<mask> return
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if tproxyListener != nil {
<mask> if tproxyListener.RawAddress() == addr {
<mask> return nil
<mask> }
<mask> tproxyListener.Close()
<mask> tproxyListener = nil
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> }
<mask>
<mask> if tproxyUDPListener != nil {
<mask> if tproxyUDPListener.RawAddress() == addr {
<mask> return nil
<mask> }
<mask> tproxyUDPListener.Close()
<mask> tproxyUDPListener = nil
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> tproxyUDPListener = nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> tproxyListener, err = tproxy.New(addr, tcpIn)
<mask> if err != nil {
</s> Chore: ReCreate* do side effect job (#1849) </s> remove var err error
</s> add </s> remove return err
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> tproxyListener, err = tproxy.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove var err error
</s> add </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
return | <mask>
<mask> var err error
<mask> tproxyListener, err = tproxy.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> tproxyUDPListener, err = tproxy.NewUDP(addr, udpIn)
<mask> if err != nil {
<mask> log.Warnln("Failed to start TProxy UDP Listener: %s", err)
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> log.Warnln("Failed to start TProxy UDP Listener: %s", err)
<mask> }
<mask>
<mask> log.Infoln("TProxy server listening at: %s", tproxyListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> mixedMux.Lock()
<mask> defer mixedMux.Unlock()
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { | <mask> log.Infoln("TProxy server listening at: %s", tproxyListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
<mask> mixedMux.Lock()
<mask> defer mixedMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add </s> remove func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
var err error
defer func() {
if err != nil {
log.Errorln("Start Mixed(http+socks) server error: %s", err.Error())
}
}()
| <mask> defer mixedMux.Unlock()
<mask>
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> shouldTCPIgnore := false
<mask> shouldUDPIgnore := false
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) error {
</s> add func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { </s> remove return nil
</s> add return </s> remove return nil
</s> add return | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> }
<mask> }
<mask>
<mask> if shouldTCPIgnore && shouldUDPIgnore {
<mask> return nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask> return nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> mixedListener, err = mixed.New(addr, tcpIn)
<mask> if err != nil {
</s> Chore: ReCreate* do side effect job (#1849) </s> remove var err error
</s> add </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove var err error
</s> add </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> var err error
<mask> mixedListener, err = mixed.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove var err error
</s> add </s> remove var err error
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
return | <mask>
<mask> var err error
<mask> mixedListener, err = mixed.New(addr, tcpIn)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> mixedUDPLister, err = socks.NewUDP(addr, udpIn)
<mask> if err != nil {
<mask> mixedListener.Close()
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove var err error
</s> add </s> remove return nil
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
return | <mask>
<mask> mixedUDPLister, err = socks.NewUDP(addr, udpIn)
<mask> if err != nil {
<mask> mixedListener.Close()
<mask> return err
<mask> }
<mask>
<mask> log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address())
<mask> return nil
<mask> }
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return nil
</s> add </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go |
<mask> return err
<mask> }
<mask>
<mask> log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address())
<mask> return nil
<mask> }
<mask>
<mask> // GetPorts return the ports of proxy servers
<mask> func GetPorts() *Ports {
<mask> ports := &Ports{}
</s> Chore: ReCreate* do side effect job (#1849) </s> remove return err
</s> add return </s> remove return err
</s> add return </s> remove return nil
</s> add </s> remove return nil
</s> add </s> remove return nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7267c58913e3cbe6bd62a0c5bac968a147296448 | listener/listener.go | |
"time" | <mask>
<mask> import (
<mask> "io"
<mask> "net"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
</s> Fix: io copy REJECT error </s> remove func (rw *NopRW) Write(b []byte) (int, error) {
</s> add func (rw *NopConn) Write(b []byte) (int, error) { </s> remove func (rw *NopRW) Read(b []byte) (int, error) {
</s> add func (rw *NopConn) Read(b []byte) (int, error) { </s> remove type NopRW struct{}
</s> add type NopConn struct{} </s> remove return &RejectAdapter{}, nil
</s> add return &RejectAdapter{conn: &NopConn{}}, nil </s> remove return nil
</s> add return r.conn | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7347c28f752773643e4bb8c763288267fdde2326 | adapters/remote/reject.go |
conn net.Conn | <mask>
<mask> // RejectAdapter is a reject connected adapter
<mask> type RejectAdapter struct {
<mask> }
<mask>
<mask> // Close is used to close connection
<mask> func (r *RejectAdapter) Close() {}
</s> Fix: io copy REJECT error </s> remove return nil
</s> add return r.conn </s> remove type NopRW struct{}
</s> add type NopConn struct{} </s> remove return &RejectAdapter{}, nil
</s> add return &RejectAdapter{conn: &NopConn{}}, nil </s> remove func (rw *NopRW) Read(b []byte) (int, error) {
</s> add func (rw *NopConn) Read(b []byte) (int, error) { </s> remove func (rw *NopRW) Write(b []byte) (int, error) {
</s> add func (rw *NopConn) Write(b []byte) (int, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7347c28f752773643e4bb8c763288267fdde2326 | adapters/remote/reject.go |
return r.conn | <mask> func (r *RejectAdapter) Close() {}
<mask>
<mask> // Conn is used to http request
<mask> func (r *RejectAdapter) Conn() net.Conn {
<mask> return nil
<mask> }
<mask>
<mask> type Reject struct {
<mask> }
<mask>
</s> Fix: io copy REJECT error </s> remove return &RejectAdapter{}, nil
</s> add return &RejectAdapter{conn: &NopConn{}}, nil </s> remove type NopRW struct{}
</s> add type NopConn struct{} </s> remove func (rw *NopRW) Read(b []byte) (int, error) {
</s> add func (rw *NopConn) Read(b []byte) (int, error) { </s> remove func (rw *NopRW) Write(b []byte) (int, error) {
</s> add func (rw *NopConn) Write(b []byte) (int, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7347c28f752773643e4bb8c763288267fdde2326 | adapters/remote/reject.go |
return &RejectAdapter{conn: &NopConn{}}, nil | <mask> return C.Reject
<mask> }
<mask>
<mask> func (r *Reject) Generator(addr *C.Addr) (adapter C.ProxyAdapter, err error) {
<mask> return &RejectAdapter{}, nil
<mask> }
<mask>
<mask> func NewReject() *Reject {
<mask> return &Reject{}
<mask> }
</s> Fix: io copy REJECT error </s> remove type NopRW struct{}
</s> add type NopConn struct{} </s> remove func (rw *NopRW) Write(b []byte) (int, error) {
</s> add func (rw *NopConn) Write(b []byte) (int, error) { </s> remove return nil
</s> add return r.conn </s> remove func (rw *NopRW) Read(b []byte) (int, error) {
</s> add func (rw *NopConn) Read(b []byte) (int, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7347c28f752773643e4bb8c763288267fdde2326 | adapters/remote/reject.go |
type NopConn struct{} | <mask> func NewReject() *Reject {
<mask> return &Reject{}
<mask> }
<mask>
<mask> type NopRW struct{}
<mask>
<mask> func (rw *NopRW) Read(b []byte) (int, error) {
<mask> return len(b), nil
<mask> }
<mask>
</s> Fix: io copy REJECT error </s> remove func (rw *NopRW) Read(b []byte) (int, error) {
</s> add func (rw *NopConn) Read(b []byte) (int, error) { </s> remove return &RejectAdapter{}, nil
</s> add return &RejectAdapter{conn: &NopConn{}}, nil </s> remove func (rw *NopRW) Write(b []byte) (int, error) {
</s> add func (rw *NopConn) Write(b []byte) (int, error) { </s> remove return nil
</s> add return r.conn | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7347c28f752773643e4bb8c763288267fdde2326 | adapters/remote/reject.go |
func (rw *NopConn) Read(b []byte) (int, error) { | <mask> }
<mask>
<mask> type NopRW struct{}
<mask>
<mask> func (rw *NopRW) Read(b []byte) (int, error) {
<mask> return len(b), nil
<mask> }
<mask>
<mask> func (rw *NopRW) Write(b []byte) (int, error) {
<mask> return 0, io.EOF
</s> Fix: io copy REJECT error </s> remove func (rw *NopRW) Write(b []byte) (int, error) {
</s> add func (rw *NopConn) Write(b []byte) (int, error) { </s> remove type NopRW struct{}
</s> add type NopConn struct{} </s> remove return &RejectAdapter{}, nil
</s> add return &RejectAdapter{conn: &NopConn{}}, nil </s> remove return nil
</s> add return r.conn | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7347c28f752773643e4bb8c763288267fdde2326 | adapters/remote/reject.go |
func (rw *NopConn) Write(b []byte) (int, error) { | <mask> func (rw *NopRW) Read(b []byte) (int, error) {
<mask> return len(b), nil
<mask> }
<mask>
<mask> func (rw *NopRW) Write(b []byte) (int, error) {
<mask> return 0, io.EOF
<mask> }
</s> Fix: io copy REJECT error </s> remove func (rw *NopRW) Read(b []byte) (int, error) {
</s> add func (rw *NopConn) Read(b []byte) (int, error) { </s> remove type NopRW struct{}
</s> add type NopConn struct{} </s> remove return &RejectAdapter{}, nil
</s> add return &RejectAdapter{conn: &NopConn{}}, nil </s> remove return nil
</s> add return r.conn | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7347c28f752773643e4bb8c763288267fdde2326 | adapters/remote/reject.go |
[[constraint]]
name = "github.com/go-chi/cors"
version = "1.0.0"
| <mask> [[constraint]]
<mask> name = "github.com/go-chi/chi"
<mask> version = "3.3.2"
<mask>
<mask> [[constraint]]
<mask> name = "github.com/go-chi/render"
<mask> version = "1.0.1"
<mask>
<mask> [[constraint]]
</s> Add: cors for external controller </s> remove version = "1.37.0"
</s> add version = "1.38.1" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7357d2d0c22374ad1a2e6bc9da09460c98df5352 | Gopkg.toml |
version = "1.38.1" | <mask> version = "1.1.0"
<mask>
<mask> [[constraint]]
<mask> name = "gopkg.in/ini.v1"
<mask> version = "1.37.0"
<mask>
<mask> [prune]
<mask> go-tests = true
<mask> unused-packages = true
</s> Add: cors for external controller | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7357d2d0c22374ad1a2e6bc9da09460c98df5352 | Gopkg.toml |
"github.com/go-chi/cors" | <mask> T "github.com/Dreamacro/clash/tunnel"
<mask>
<mask> "github.com/go-chi/chi"
<mask> "github.com/go-chi/render"
<mask> log "github.com/sirupsen/logrus"
<mask> )
<mask>
<mask> type Traffic struct {
<mask> Up int64 `json:"up"`
</s> Add: cors for external controller </s> remove version = "1.37.0"
</s> add version = "1.38.1" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7357d2d0c22374ad1a2e6bc9da09460c98df5352 | hub/server.go |
cors := cors.New(cors.Options{
AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
AllowedHeaders: []string{"Content-Type"},
MaxAge: 300,
})
r.Use(cors.Handler)
| <mask> r := chi.NewRouter()
<mask>
<mask> r.Get("/traffic", traffic)
<mask> r.Get("/logs", getLogs)
<mask> r.Mount("/configs", configRouter())
<mask> r.Mount("/proxies", proxyRouter())
<mask> r.Mount("/rules", ruleRouter())
<mask>
</s> Add: cors for external controller </s> remove version = "1.37.0"
</s> add version = "1.38.1" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7357d2d0c22374ad1a2e6bc9da09460c98df5352 | hub/server.go |
func (b *Base) Unwrap(metadata *C.Metadata) C.Proxy {
return nil
}
| <mask> }
<mask>
<mask> func NewBase(name string, addr string, tp C.AdapterType, udp bool) *Base {
<mask> return &Base{name, addr, tp, udp}
<mask> }
<mask>
<mask> type conn struct {
<mask> net.Conn
</s> Feature: support proxy-group in relay (#597) </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outbound/base.go |
func (f *Fallback) Unwrap(metadata *C.Metadata) C.Proxy {
proxy := f.findAliveProxy()
return proxy
}
| <mask> }
<mask>
<mask> func (f *Fallback) proxies() []C.Proxy {
<mask> elm, _, _ := f.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(f.providers), nil
<mask> })
<mask>
</s> Feature: support proxy-group in relay (#597) </s> remove func (r *Relay) proxies() []C.Proxy {
</s> add func (r *Relay) rawProxies() []C.Proxy { </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/fallback.go |
proxy := lb.Unwrap(metadata)
c, err = proxy.DialContext(ctx, metadata) | <mask> c.AppendToChains(lb)
<mask> }
<mask> }()
<mask>
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> proxies := lb.proxies()
<mask> buckets := int32(len(proxies))
<mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
<mask> idx := jumpHash(key, buckets)
<mask> proxy := proxies[idx]
<mask> if proxy.Alive() {
<mask> c, err = proxy.DialContext(ctx, metadata)
<mask> return
<mask> }
<mask> }
<mask> c, err = proxies[0].DialContext(ctx, metadata)
<mask> return
<mask> }
<mask>
<mask> func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (pc C.PacketConn, err error) {
<mask> defer func() {
</s> Feature: support proxy-group in relay (#597) </s> remove return proxy.DialUDP(metadata)
</s> add return proxy </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/loadbalance.go |
proxy := lb.Unwrap(metadata)
return proxy.DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy { | <mask> }()
<mask>
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> proxies := lb.proxies()
<mask> buckets := int32(len(proxies))
<mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
</s> Feature: support proxy-group in relay (#597) </s> remove key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
c, err = proxy.DialContext(ctx, metadata)
return
}
}
c, err = proxies[0].DialContext(ctx, metadata)
</s> add proxy := lb.Unwrap(metadata)
c, err = proxy.DialContext(ctx, metadata) </s> remove return proxy.DialUDP(metadata)
</s> add return proxy </s> remove proxies := r.proxies()
</s> add proxies := r.proxies(metadata) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/loadbalance.go |
return proxy | <mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
<mask> idx := jumpHash(key, buckets)
<mask> proxy := proxies[idx]
<mask> if proxy.Alive() {
<mask> return proxy.DialUDP(metadata)
<mask> }
<mask> }
<mask>
<mask> return proxies[0].DialUDP(metadata)
<mask> }
</s> Feature: support proxy-group in relay (#597) </s> remove key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
c, err = proxy.DialContext(ctx, metadata)
return
}
}
c, err = proxies[0].DialContext(ctx, metadata)
</s> add proxy := lb.Unwrap(metadata)
c, err = proxy.DialContext(ctx, metadata) </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] </s> remove proxies := r.proxies()
</s> add proxies := r.proxies(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/loadbalance.go |
return proxies[0] | <mask> return proxy.DialUDP(metadata)
<mask> }
<mask> }
<mask>
<mask> return proxies[0].DialUDP(metadata)
<mask> }
<mask>
<mask> func (lb *LoadBalance) SupportUDP() bool {
<mask> return true
<mask> }
<mask>
<mask> func (lb *LoadBalance) proxies() []C.Proxy {
<mask> elm, _, _ := lb.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(lb.providers), nil
</s> Feature: support proxy-group in relay (#597) </s> remove func (r *Relay) proxies() []C.Proxy {
</s> add func (r *Relay) rawProxies() []C.Proxy { </s> remove key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
c, err = proxy.DialContext(ctx, metadata)
return
}
}
c, err = proxies[0].DialContext(ctx, metadata)
</s> add proxy := lb.Unwrap(metadata)
c, err = proxy.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/loadbalance.go |
proxies := r.proxies(metadata) | <mask> providers []provider.ProxyProvider
<mask> }
<mask>
<mask> func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> proxies := r.proxies()
<mask> if len(proxies) == 0 {
<mask> return nil, errors.New("Proxy does not exist")
<mask> }
<mask> first := proxies[0]
<mask> last := proxies[len(proxies)-1]
</s> Feature: support proxy-group in relay (#597) </s> remove for _, proxy := range r.proxies() {
</s> add for _, proxy := range r.rawProxies() { </s> remove func (r *Relay) proxies() []C.Proxy {
</s> add func (r *Relay) rawProxies() []C.Proxy { </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/relay.go |
for _, proxy := range r.rawProxies() { | <mask> }
<mask>
<mask> func (r *Relay) MarshalJSON() ([]byte, error) {
<mask> var all []string
<mask> for _, proxy := range r.proxies() {
<mask> all = append(all, proxy.Name())
<mask> }
<mask> return json.Marshal(map[string]interface{}{
<mask> "type": r.Type().String(),
<mask> "all": all,
</s> Feature: support proxy-group in relay (#597) </s> remove func (r *Relay) proxies() []C.Proxy {
</s> add func (r *Relay) rawProxies() []C.Proxy { </s> remove proxies := r.proxies()
</s> add proxies := r.proxies(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/relay.go |
func (r *Relay) rawProxies() []C.Proxy { | <mask> "all": all,
<mask> })
<mask> }
<mask>
<mask> func (r *Relay) proxies() []C.Proxy {
<mask> elm, _, _ := r.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(r.providers), nil
<mask> })
<mask>
<mask> return elm.([]C.Proxy)
</s> Feature: support proxy-group in relay (#597) </s> remove for _, proxy := range r.proxies() {
</s> add for _, proxy := range r.rawProxies() { </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/relay.go |
func (r *Relay) proxies(metadata *C.Metadata) []C.Proxy {
proxies := r.rawProxies()
for n, proxy := range proxies {
subproxy := proxy.Unwrap(metadata)
for subproxy != nil {
proxies[n] = subproxy
subproxy = subproxy.Unwrap(metadata)
}
}
return proxies
}
| <mask>
<mask> return elm.([]C.Proxy)
<mask> }
<mask>
<mask> func NewRelay(name string, providers []provider.ProxyProvider) *Relay {
<mask> return &Relay{
<mask> Base: outbound.NewBase(name, "", C.Relay, false),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> providers: providers,
</s> Feature: support proxy-group in relay (#597) </s> remove func (r *Relay) proxies() []C.Proxy {
</s> add func (r *Relay) rawProxies() []C.Proxy { </s> remove proxies := r.proxies()
</s> add proxies := r.proxies(metadata) </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/relay.go |
func (s *Selector) Unwrap(metadata *C.Metadata) C.Proxy {
return s.selectedProxy()
}
| <mask>
<mask> return errors.New("Proxy does not exist")
<mask> }
<mask>
<mask> func (s *Selector) selectedProxy() C.Proxy {
<mask> elm, _, _ := s.single.Do(func() (interface{}, error) {
<mask> proxies := getProvidersProxies(s.providers)
<mask> for _, proxy := range proxies {
</s> Feature: support proxy-group in relay (#597) </s> remove proxies := r.proxies()
</s> add proxies := r.proxies(metadata) </s> remove for _, proxy := range r.proxies() {
</s> add for _, proxy := range r.rawProxies() { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/selector.go |
func (u *URLTest) Unwrap(metadata *C.Metadata) C.Proxy {
return u.fast()
}
| <mask> return pc, err
<mask> }
<mask>
<mask> func (u *URLTest) proxies() []C.Proxy {
<mask> elm, _, _ := u.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(u.providers), nil
<mask> })
<mask>
<mask> return elm.([]C.Proxy)
</s> Feature: support proxy-group in relay (#597) </s> remove func (r *Relay) proxies() []C.Proxy {
</s> add func (r *Relay) rawProxies() []C.Proxy { </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] </s> remove key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
c, err = proxy.DialContext(ctx, metadata)
return
}
}
c, err = proxies[0].DialContext(ctx, metadata)
</s> add proxy := lb.Unwrap(metadata)
c, err = proxy.DialContext(ctx, metadata) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | adapters/outboundgroup/urltest.go |
// Unwrap extracts the proxy from a proxy-group. It returns nil when nothing to extract.
Unwrap(metadata *Metadata) Proxy | <mask> SupportUDP() bool
<mask> MarshalJSON() ([]byte, error)
<mask> Addr() string
<mask> }
<mask>
<mask> type DelayHistory struct {
<mask> Time time.Time `json:"time"`
<mask> Delay uint16 `json:"delay"`
</s> Feature: support proxy-group in relay (#597) </s> remove for _, proxy := range r.proxies() {
</s> add for _, proxy := range r.rawProxies() { </s> remove return proxies[0].DialUDP(metadata)
}
func (lb *LoadBalance) SupportUDP() bool {
return true
</s> add return proxies[0] | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/752f87a8dc3c34c4a603f486c7acfa41d90cbb54 | constant/adapters.go |
func (d *Direct) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask> type Direct struct {
<mask> *Base
<mask> }
<mask>
<mask> func (d *Direct) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> address := net.JoinHostPort(metadata.Host, metadata.Port)
<mask> if metadata.IP != nil {
<mask> address = net.JoinHostPort(metadata.IP.String(), metadata.Port)
<mask> }
<mask>
</s> Style: rename `Generator` with `Dial` </s> remove func (r *Reject) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (r *Reject) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove func (h *Http) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/direct.go |
func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask> }
<mask> return f.proxies[0].RawProxy.Name()
<mask> }
<mask>
<mask> func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> idx := 0
<mask> var proxy *proxy
<mask> for {
<mask> idx, proxy = f.findNextValidProxy(idx)
<mask> if proxy == nil {
</s> Style: rename `Generator` with `Dial` </s> remove adapter, err := proxy.RawProxy.Generator(metadata)
</s> add adapter, err := proxy.RawProxy.Dial(metadata) </s> remove return f.proxies[0].RawProxy.Generator(metadata)
</s> add return f.proxies[0].RawProxy.Dial(metadata) </s> remove return lb.proxies[0].Generator(metadata)
</s> add return lb.proxies[0].Dial(metadata) </s> remove func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (s *Selector) Generator(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Generator(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/fallback.go |
adapter, err := proxy.RawProxy.Dial(metadata) | <mask> idx, proxy = f.findNextValidProxy(idx)
<mask> if proxy == nil {
<mask> break
<mask> }
<mask> adapter, err := proxy.RawProxy.Generator(metadata)
<mask> if err != nil {
<mask> proxy.Valid = false
<mask> idx++
<mask> continue
<mask> }
</s> Style: rename `Generator` with `Dial` </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove return f.proxies[0].RawProxy.Generator(metadata)
</s> add return f.proxies[0].RawProxy.Dial(metadata) </s> remove if proxy, err := lb.proxies[idx].Generator(metadata); err == nil {
</s> add if proxy, err := lb.proxies[idx].Dial(metadata); err == nil { </s> remove func (h *Http) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/fallback.go |
return f.proxies[0].RawProxy.Dial(metadata) | <mask> continue
<mask> }
<mask> return adapter, err
<mask> }
<mask> return f.proxies[0].RawProxy.Generator(metadata)
<mask> }
<mask>
<mask> func (f *Fallback) MarshalJSON() ([]byte, error) {
<mask> var all []string
<mask> for _, proxy := range f.proxies {
</s> Style: rename `Generator` with `Dial` </s> remove return lb.proxies[0].Generator(metadata)
</s> add return lb.proxies[0].Dial(metadata) </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (s *Selector) Generator(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Generator(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata) </s> remove adapter, err := proxy.RawProxy.Generator(metadata)
</s> add adapter, err := proxy.RawProxy.Dial(metadata) </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/fallback.go |
func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask> TLS bool `proxy:"tls,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (h *Http) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := net.DialTimeout("tcp", h.addr, tcpTimeout)
<mask> if err == nil && h.tls {
<mask> cc := tls.Client(c, h.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
</s> Style: rename `Generator` with `Dial` </s> remove func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *ShadowSocks) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (v *Vmess) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove adapter, err := proxy.RawProxy.Generator(metadata)
</s> add adapter, err := proxy.RawProxy.Dial(metadata) </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/http.go |
func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask>
<mask> return int32(b)
<mask> }
<mask>
<mask> func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> buckets := int32(len(lb.proxies))
<mask> for i := 0; i < lb.maxRetry; i++ {
<mask> idx := jumpHash(key, buckets)
<mask> if proxy, err := lb.proxies[idx].Generator(metadata); err == nil {
</s> Style: rename `Generator` with `Dial` </s> remove if proxy, err := lb.proxies[idx].Generator(metadata); err == nil {
</s> add if proxy, err := lb.proxies[idx].Dial(metadata); err == nil { </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove return lb.proxies[0].Generator(metadata)
</s> add return lb.proxies[0].Dial(metadata) </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/loadbalance.go |
if proxy, err := lb.proxies[idx].Dial(metadata); err == nil { | <mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> buckets := int32(len(lb.proxies))
<mask> for i := 0; i < lb.maxRetry; i++ {
<mask> idx := jumpHash(key, buckets)
<mask> if proxy, err := lb.proxies[idx].Generator(metadata); err == nil {
<mask> return proxy, nil
<mask> }
<mask> key++
<mask> }
<mask>
</s> Style: rename `Generator` with `Dial` </s> remove func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove instance, err := proxy.Generator(&addr)
</s> add instance, err := proxy.Dial(&addr) </s> remove adapter, err := proxy.RawProxy.Generator(metadata)
</s> add adapter, err := proxy.RawProxy.Dial(metadata) </s> remove remoConn, err := proxy.Generator(metadata)
</s> add remoConn, err := proxy.Dial(metadata) </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/loadbalance.go |
return lb.proxies[0].Dial(metadata) | <mask> }
<mask> key++
<mask> }
<mask>
<mask> return lb.proxies[0].Generator(metadata)
<mask> }
<mask>
<mask> func (lb *LoadBalance) MarshalJSON() ([]byte, error) {
<mask> var all []string
<mask> for _, proxy := range lb.proxies {
</s> Style: rename `Generator` with `Dial` </s> remove return f.proxies[0].RawProxy.Generator(metadata)
</s> add return f.proxies[0].RawProxy.Dial(metadata) </s> remove func (s *Selector) Generator(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Generator(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata) </s> remove func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove if proxy, err := lb.proxies[idx].Generator(metadata); err == nil {
</s> add if proxy, err := lb.proxies[idx].Dial(metadata); err == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/loadbalance.go |
func (r *Reject) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask> type Reject struct {
<mask> *Base
<mask> }
<mask>
<mask> func (r *Reject) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> return &NopConn{}, nil
<mask> }
<mask>
<mask> func NewReject() *Reject {
<mask> return &Reject{
</s> Style: rename `Generator` with `Dial` </s> remove func (d *Direct) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (d *Direct) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (s *Selector) Generator(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Generator(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata) </s> remove func (v *Vmess) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/reject.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.