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 |
|---|---|---|---|---|
func parseHosts(cfg *RawConfig) (*trie.DomainTrie, error) { | <mask>
<mask> return rules, nil
<mask> }
<mask>
<mask> func parseHosts(cfg *RawConfig) (*trie.Trie, error) {
<mask> tree := trie.New()
<mask> if len(cfg.Hosts) != 0 {
<mask> for domain, ipStr := range cfg.Hosts {
<mask> ip := net.ParseIP(ipStr)
<mask> if ip == nil {
</s> Feature: domain trie support wildcard alias </s> remove var host *trie.Trie
</s> add var host *trie.DomainTrie </s> remove func New(ipnet *net.IPNet, size int, host *trie.Trie) (*Pool, error) {
</s> add func New(ipnet *net.IPNet, size int, host *trie.DomainTrie) (*Pool, error) { </s> remove func updateHosts(tree *trie.Trie) {
</s> add func updateHosts(tree *trie.DomainTrie) { </s> remove host *trie.Trie
</s> add host *trie.DomainTrie </s> remove "github.com/Dreamacro/clash/config"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d0c6c6e661e2fc6740bffc9a0ad3a0a2196d0a3 | config/config.go |
var host *trie.DomainTrie | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> var host *trie.Trie
<mask> // fake ip skip host filter
<mask> if len(cfg.FakeIPFilter) != 0 {
<mask> host = trie.New()
<mask> for _, domain := range cfg.FakeIPFilter {
<mask> host.Insert(domain, true)
</s> Feature: domain trie support wildcard alias </s> remove func parseHosts(cfg *RawConfig) (*trie.Trie, error) {
</s> add func parseHosts(cfg *RawConfig) (*trie.DomainTrie, error) { </s> remove host *trie.Trie
</s> add host *trie.DomainTrie </s> remove func New(ipnet *net.IPNet, size int, host *trie.Trie) (*Pool, error) {
</s> add func New(ipnet *net.IPNet, size int, host *trie.DomainTrie) (*Pool, error) { </s> remove func updateHosts(tree *trie.Trie) {
</s> add func updateHosts(tree *trie.DomainTrie) { </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add "github.com/Dreamacro/clash/component/trie" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d0c6c6e661e2fc6740bffc9a0ad3a0a2196d0a3 | config/config.go |
<mask>
<mask> "github.com/Dreamacro/clash/adapters/provider"
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> trie "github.com/Dreamacro/clash/component/domain-trie"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/config"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/dns"
<mask> "github.com/Dreamacro/clash/log"
</s> Feature: domain trie support wildcard alias </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add "github.com/Dreamacro/clash/component/trie" </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add "github.com/Dreamacro/clash/component/trie" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d0c6c6e661e2fc6740bffc9a0ad3a0a2196d0a3 | hub/executor/executor.go | |
"github.com/Dreamacro/clash/component/trie" | <mask> "github.com/Dreamacro/clash/adapters/provider"
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/config"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/dns"
<mask> "github.com/Dreamacro/clash/log"
<mask> P "github.com/Dreamacro/clash/proxy"
</s> Feature: domain trie support wildcard alias </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add </s> remove "github.com/Dreamacro/clash/config"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d0c6c6e661e2fc6740bffc9a0ad3a0a2196d0a3 | hub/executor/executor.go |
func updateHosts(tree *trie.DomainTrie) { | <mask> log.Infoln("DNS server listening at: %s", c.Listen)
<mask> }
<mask> }
<mask>
<mask> func updateHosts(tree *trie.Trie) {
<mask> resolver.DefaultHosts = tree
<mask> }
<mask>
<mask> func updateProxies(proxies map[string]C.Proxy, providers map[string]provider.ProxyProvider) {
<mask> tunnel.UpdateProxies(proxies, providers)
</s> Feature: domain trie support wildcard alias </s> remove func parseHosts(cfg *RawConfig) (*trie.Trie, error) {
</s> add func parseHosts(cfg *RawConfig) (*trie.DomainTrie, error) { </s> remove func New(ipnet *net.IPNet, size int, host *trie.Trie) (*Pool, error) {
</s> add func New(ipnet *net.IPNet, size int, host *trie.DomainTrie) (*Pool, error) { </s> remove var host *trie.Trie
</s> add var host *trie.DomainTrie </s> remove host *trie.Trie
</s> add host *trie.DomainTrie </s> remove "github.com/Dreamacro/clash/config"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d0c6c6e661e2fc6740bffc9a0ad3a0a2196d0a3 | hub/executor/executor.go |
"github.com/Dreamacro/clash/config" | <mask>
<mask> import (
<mask> "github.com/Dreamacro/clash/hub/executor"
<mask> "github.com/Dreamacro/clash/hub/route"
<mask> )
<mask>
</s> Feature: domain trie support wildcard alias </s> remove "github.com/Dreamacro/clash/config"
</s> add </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add "github.com/Dreamacro/clash/component/trie" </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add "github.com/Dreamacro/clash/component/trie" </s> remove func updateHosts(tree *trie.Trie) {
</s> add func updateHosts(tree *trie.DomainTrie) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d0c6c6e661e2fc6740bffc9a0ad3a0a2196d0a3 | hub/hub.go |
<mask>
<mask> import (
<mask> "github.com/Dreamacro/clash/hub/executor"
<mask> "github.com/Dreamacro/clash/hub/route"
<mask> "github.com/Dreamacro/clash/config"
<mask> )
<mask>
<mask> type Option func(*config.Config)
<mask>
<mask> func WithExternalUI(externalUI string) Option {
</s> Feature: domain trie support wildcard alias </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add "github.com/Dreamacro/clash/component/trie" </s> remove trie "github.com/Dreamacro/clash/component/domain-trie"
</s> add "github.com/Dreamacro/clash/component/trie" </s> remove host *trie.Trie
</s> add host *trie.DomainTrie </s> remove Hosts *trie.Trie
</s> add Hosts *trie.DomainTrie | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d0c6c6e661e2fc6740bffc9a0ad3a0a2196d0a3 | hub/hub.go | |
defer client.CloseIdleConnections()
| <mask> CheckRedirect: func(req *http.Request, via []*http.Request) error {
<mask> return http.ErrUseLastResponse
<mask> },
<mask> }
<mask> resp, err := client.Do(req)
<mask> if err != nil {
<mask> return
<mask> }
<mask> resp.Body.Close()
<mask> t = uint16(time.Since(start) / time.Millisecond)
</s> Fix: limit concurrency number of provider health check </s> remove wg.Add(1)
go func(p C.Proxy) {
p.URLTest(ctx, hc.url)
wg.Done()
}(proxy)
</s> add p := proxy
b.Go(p.Name(), func() (interface{}, error) {
return p.URLTest(ctx, hc.url)
}) </s> remove wg := &sync.WaitGroup{}
</s> add defer cancel() </s> remove
wg.Wait()
cancel()
</s> add b.Wait() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d37220566c2c312658b903a7baff64ca0878d0a | adapter/adapter.go |
<mask> package provider
<mask>
<mask> import (
<mask> "context"
<mask> "sync"
<mask> "time"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "go.uber.org/atomic"
</s> Fix: limit concurrency number of provider health check </s> remove
wg.Wait()
cancel()
</s> add b.Wait() </s> remove wg.Add(1)
go func(p C.Proxy) {
p.URLTest(ctx, hc.url)
wg.Done()
}(proxy)
</s> add p := proxy
b.Go(p.Name(), func() (interface{}, error) {
return p.URLTest(ctx, hc.url)
}) </s> remove wg := &sync.WaitGroup{}
</s> add defer cancel() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d37220566c2c312658b903a7baff64ca0878d0a | adapter/provider/healthcheck.go | |
"github.com/Dreamacro/clash/common/batch" | <mask> import (
<mask> "context"
<mask> "time"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "go.uber.org/atomic"
<mask> )
<mask>
</s> Fix: limit concurrency number of provider health check </s> remove "sync"
</s> add </s> remove
wg.Wait()
cancel()
</s> add b.Wait() </s> remove wg.Add(1)
go func(p C.Proxy) {
p.URLTest(ctx, hc.url)
wg.Done()
}(proxy)
</s> add p := proxy
b.Go(p.Name(), func() (interface{}, error) {
return p.URLTest(ctx, hc.url)
}) </s> remove wg := &sync.WaitGroup{}
</s> add defer cancel() | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d37220566c2c312658b903a7baff64ca0878d0a | adapter/provider/healthcheck.go |
defer cancel() | <mask> }
<mask>
<mask> func (hc *HealthCheck) check() {
<mask> ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
<mask> wg := &sync.WaitGroup{}
<mask>
<mask> for _, proxy := range hc.proxies {
<mask> wg.Add(1)
<mask>
<mask> go func(p C.Proxy) {
</s> Fix: limit concurrency number of provider health check </s> remove wg.Add(1)
go func(p C.Proxy) {
p.URLTest(ctx, hc.url)
wg.Done()
}(proxy)
</s> add p := proxy
b.Go(p.Name(), func() (interface{}, error) {
return p.URLTest(ctx, hc.url)
}) </s> remove
wg.Wait()
cancel()
</s> add b.Wait() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d37220566c2c312658b903a7baff64ca0878d0a | adapter/provider/healthcheck.go |
b, ctx := batch.WithContext(ctx, batch.WithConcurrencyNum(10)) | <mask> ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
<mask> defer cancel()
<mask>
<mask> for _, proxy := range hc.proxies {
<mask> p := proxy
<mask> b.Go(p.Name(), func() (interface{}, error) {
<mask> return p.URLTest(ctx, hc.url)
<mask> })
<mask> }
</s> Fix: limit concurrency number of provider health check </s> remove wg.Add(1)
go func(p C.Proxy) {
p.URLTest(ctx, hc.url)
wg.Done()
}(proxy)
</s> add p := proxy
b.Go(p.Name(), func() (interface{}, error) {
return p.URLTest(ctx, hc.url)
}) </s> remove wg := &sync.WaitGroup{}
</s> add defer cancel() </s> remove
wg.Wait()
cancel()
</s> add b.Wait() | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d37220566c2c312658b903a7baff64ca0878d0a | adapter/provider/healthcheck.go |
p := proxy
b.Go(p.Name(), func() (interface{}, error) {
return p.URLTest(ctx, hc.url)
}) | <mask> ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
<mask> wg := &sync.WaitGroup{}
<mask>
<mask> for _, proxy := range hc.proxies {
<mask> wg.Add(1)
<mask>
<mask> go func(p C.Proxy) {
<mask> p.URLTest(ctx, hc.url)
<mask> wg.Done()
<mask> }(proxy)
<mask> }
<mask>
<mask> wg.Wait()
<mask> cancel()
<mask> }
</s> Fix: limit concurrency number of provider health check </s> remove wg := &sync.WaitGroup{}
</s> add defer cancel() </s> remove
wg.Wait()
cancel()
</s> add b.Wait() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d37220566c2c312658b903a7baff64ca0878d0a | adapter/provider/healthcheck.go |
b.Wait() | <mask> p.URLTest(ctx, hc.url)
<mask> wg.Done()
<mask> }(proxy)
<mask> }
<mask>
<mask> wg.Wait()
<mask> cancel()
<mask> }
<mask>
<mask> func (hc *HealthCheck) close() {
<mask> hc.done <- struct{}{}
<mask> }
</s> Fix: limit concurrency number of provider health check </s> remove wg.Add(1)
go func(p C.Proxy) {
p.URLTest(ctx, hc.url)
wg.Done()
}(proxy)
</s> add p := proxy
b.Go(p.Name(), func() (interface{}, error) {
return p.URLTest(ctx, hc.url)
}) </s> remove wg := &sync.WaitGroup{}
</s> add defer cancel() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8d37220566c2c312658b903a7baff64ca0878d0a | adapter/provider/healthcheck.go |
<mask> package adapters
<mask>
<mask> import (
<mask> "bufio"
<mask> "bytes"
<mask> "io"
<mask> "net"
<mask> "strings"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
</s> Improve: HTTP proxy server handler </s> remove "strings"
</s> add </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add | [
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/http.go | |
"net/http" | <mask>
<mask> import (
<mask> "net"
<mask> "strings"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
</s> Improve: HTTP proxy server handler </s> remove "bufio"
"bytes"
"io"
</s> add </s> remove "strings"
</s> add </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/http.go |
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // PeekedConn handle http connection and buffed HTTP data
<mask> type PeekedConn struct {
<mask> net.Conn
<mask> Peeked []byte
<mask> host string
<mask> isHTTP bool
<mask> }
<mask>
<mask> func (c *PeekedConn) Read(p []byte) (n int, err error) {
<mask> if len(c.Peeked) > 0 {
<mask> n = copy(p, c.Peeked)
<mask> c.Peeked = c.Peeked[n:]
<mask> if len(c.Peeked) == 0 {
<mask> c.Peeked = nil
<mask> }
<mask> return n, nil
<mask> }
<mask>
<mask> // Sometimes firefox just open a socket to process multiple domains in HTTP
<mask> // The temporary solution is to return io.EOF when encountering different HOST
<mask> if c.isHTTP {
<mask> br := bufio.NewReader(bytes.NewReader(p))
<mask> _, hostName := ParserHTTPHostHeader(br)
<mask> if hostName != "" {
<mask> if !strings.Contains(hostName, ":") {
<mask> hostName += ":80"
<mask> }
<mask>
<mask> if hostName != c.host {
<mask> return 0, io.EOF
<mask> }
<mask> }
<mask> }
<mask>
<mask> return c.Conn.Read(p)
<mask> }
<mask>
<mask> // HTTPAdapter is a adapter for HTTP connection
<mask> type HTTPAdapter struct {
<mask> addr *C.Addr
<mask> conn *PeekedConn
<mask> }
</s> Improve: HTTP proxy server handler </s> remove conn *PeekedConn
</s> add conn net.Conn
R *http.Request </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { </s> remove method, hostName := adapters.ParserHTTPHostHeader(br)
if hostName == "" {
</s> add request, err := http.ReadRequest(br)
if err != nil {
conn.Close() </s> remove addr: parseHTTPAddr(host),
conn: &PeekedConn{
Peeked: peeked,
Conn: conn,
host: host,
isHTTP: isHTTP,
},
</s> add addr: parseHTTPAddr(request),
R: request,
conn: conn,
}
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/http.go | |
conn net.Conn
R *http.Request | <mask>
<mask> // HTTPAdapter is a adapter for HTTP connection
<mask> type HTTPAdapter struct {
<mask> addr *C.Addr
<mask> conn *PeekedConn
<mask> }
<mask>
<mask> // Close HTTP connection
<mask> func (h *HTTPAdapter) Close() {
<mask> h.conn.Close()
</s> Improve: HTTP proxy server handler </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove func NewHTTP(host string, peeked []byte, isHTTP bool, conn net.Conn) *HTTPAdapter {
</s> add func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter { </s> remove addr: parseHTTPAddr(host),
conn: &PeekedConn{
Peeked: peeked,
Conn: conn,
host: host,
isHTTP: isHTTP,
},
</s> add addr: parseHTTPAddr(request),
R: request,
conn: conn,
}
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h)) </s> remove // Before we unwrap src and/or dst, copy any buffered data.
if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
if _, err := conn.Write(wc.Peeked); err != nil {
return
</s> add for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/http.go |
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter { | <mask> return h.conn
<mask> }
<mask>
<mask> // NewHTTP is HTTPAdapter generator
<mask> func NewHTTP(host string, peeked []byte, isHTTP bool, conn net.Conn) *HTTPAdapter {
<mask> return &HTTPAdapter{
<mask> addr: parseHTTPAddr(host),
<mask> conn: &PeekedConn{
<mask> Peeked: peeked,
<mask> Conn: conn,
</s> Improve: HTTP proxy server handler </s> remove addr: parseHTTPAddr(host),
conn: &PeekedConn{
Peeked: peeked,
Conn: conn,
host: host,
isHTTP: isHTTP,
},
</s> add addr: parseHTTPAddr(request),
R: request,
conn: conn,
}
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h)) </s> remove conn *PeekedConn
</s> add conn net.Conn
R *http.Request </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
</s> add tun.Add(adapters.NewHTTP(request, conn)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/http.go |
addr: parseHTTPAddr(request),
R: request,
conn: conn,
}
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h)) | <mask>
<mask> // NewHTTP is HTTPAdapter generator
<mask> func NewHTTP(host string, peeked []byte, isHTTP bool, conn net.Conn) *HTTPAdapter {
<mask> return &HTTPAdapter{
<mask> addr: parseHTTPAddr(host),
<mask> conn: &PeekedConn{
<mask> Peeked: peeked,
<mask> Conn: conn,
<mask> host: host,
<mask> isHTTP: isHTTP,
<mask> },
<mask> }
<mask> }
</s> Improve: HTTP proxy server handler </s> remove func NewHTTP(host string, peeked []byte, isHTTP bool, conn net.Conn) *HTTPAdapter {
</s> add func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter { </s> remove conn *PeekedConn
</s> add conn net.Conn
R *http.Request </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
</s> add tun.Add(adapters.NewHTTP(request, conn)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/http.go |
func parseHTTPAddr(request *http.Request) *C.Addr {
host := request.URL.Hostname()
port := request.URL.Port()
if port == "" {
port = "80"
} | <mask> Port: port,
<mask> }
<mask> }
<mask>
<mask> func parseHTTPAddr(target string) *C.Addr {
<mask> host, port, _ := net.SplitHostPort(target)
<mask> ipAddr, err := net.ResolveIPAddr("ip", host)
<mask> var resolveIP *net.IP
<mask> if err == nil {
<mask> resolveIP = &ipAddr.IP
<mask> }
</s> Improve: HTTP proxy server handler </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return </s> remove method, hostName := adapters.ParserHTTPHostHeader(br)
if hostName == "" {
</s> add request, err := http.ReadRequest(br)
if err != nil {
conn.Close() </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
</s> add tun.Add(adapters.NewHTTP(request, conn)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/util.go |
println(string(b)) | <mask> return
<mask> }
<mask> if bytes.Index(b, crlfcrlf) != -1 || bytes.Index(b, lflf) != -1 {
<mask> req, err := http.ReadRequest(bufio.NewReader(bytes.NewReader(b)))
<mask> if err != nil {
<mask> return
<mask> }
</s> Improve: HTTP proxy server handler </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return </s> remove method, hostName := adapters.ParserHTTPHostHeader(br)
if hostName == "" {
</s> add request, err := http.ReadRequest(br)
if err != nil {
conn.Close() </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/util.go |
println(req.Host) | <mask> return
<mask> }
<mask> return req.Method, req.Host
<mask> }
<mask> }
<mask> if err != nil {
</s> Improve: HTTP proxy server handler </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | adapters/local/util.go |
<mask> import (
<mask> "bufio"
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/local"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask>
</s> Improve: HTTP proxy server handler </s> remove "bufio"
"bytes"
"io"
</s> add </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | proxy/http/server.go | |
request, err := http.ReadRequest(br)
if err != nil {
conn.Close() | <mask> }
<mask>
<mask> func handleConn(conn net.Conn) {
<mask> br := bufio.NewReader(conn)
<mask> method, hostName := adapters.ParserHTTPHostHeader(br)
<mask> if hostName == "" {
<mask> return
<mask> }
<mask>
<mask> if !strings.Contains(hostName, ":") {
<mask> hostName += ":80"
</s> Improve: HTTP proxy server handler </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove func parseHTTPAddr(target string) *C.Addr {
host, port, _ := net.SplitHostPort(target)
</s> add func parseHTTPAddr(request *http.Request) *C.Addr {
host := request.URL.Hostname()
port := request.URL.Port()
if port == "" {
port = "80"
} </s> remove addr: parseHTTPAddr(host),
conn: &PeekedConn{
Peeked: peeked,
Conn: conn,
host: host,
isHTTP: isHTTP,
},
</s> add addr: parseHTTPAddr(request),
R: request,
conn: conn,
}
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | proxy/http/server.go |
if request.Method == http.MethodConnect { | <mask> if hostName == "" {
<mask> return
<mask> }
<mask>
<mask> if !strings.Contains(hostName, ":") {
<mask> hostName += ":80"
<mask> }
<mask>
<mask> var peeked []byte
<mask> if method == http.MethodConnect {
<mask> _, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
<mask> if err != nil {
<mask> return
<mask> }
<mask> } else if n := br.Buffered(); n > 0 {
</s> Improve: HTTP proxy server handler </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return </s> remove method, hostName := adapters.ParserHTTPHostHeader(br)
if hostName == "" {
</s> add request, err := http.ReadRequest(br)
if err != nil {
conn.Close() </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add </s> remove tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
</s> add tun.Add(adapters.NewHTTP(request, conn)) </s> remove func parseHTTPAddr(target string) *C.Addr {
host, port, _ := net.SplitHostPort(target)
</s> add func parseHTTPAddr(request *http.Request) *C.Addr {
host := request.URL.Hostname()
port := request.URL.Port()
if port == "" {
port = "80"
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | proxy/http/server.go |
tun.Add(adapters.NewHTTPS(request, conn))
return | <mask> _, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
<mask> if err != nil {
<mask> return
<mask> }
<mask> } else if n := br.Buffered(); n > 0 {
<mask> peeked, _ = br.Peek(br.Buffered())
<mask> }
<mask>
<mask> tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
<mask> }
</s> Improve: HTTP proxy server handler </s> remove tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
</s> add tun.Add(adapters.NewHTTP(request, conn)) </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove // Before we unwrap src and/or dst, copy any buffered data.
if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
if _, err := conn.Write(wc.Peeked); err != nil {
return
</s> add for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break </s> remove func parseHTTPAddr(target string) *C.Addr {
host, port, _ := net.SplitHostPort(target)
</s> add func parseHTTPAddr(request *http.Request) *C.Addr {
host := request.URL.Hostname()
port := request.URL.Port()
if port == "" {
port = "80"
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | proxy/http/server.go |
tun.Add(adapters.NewHTTP(request, conn)) | <mask> } else if n := br.Buffered(); n > 0 {
<mask> peeked, _ = br.Peek(br.Buffered())
<mask> }
<mask>
<mask> tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
<mask> }
</s> Improve: HTTP proxy server handler </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add </s> remove func parseHTTPAddr(target string) *C.Addr {
host, port, _ := net.SplitHostPort(target)
</s> add func parseHTTPAddr(request *http.Request) *C.Addr {
host := request.URL.Hostname()
port := request.URL.Port()
if port == "" {
port = "80"
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | proxy/http/server.go |
tun.Add(adapters.NewSocket(target, conn)) | <mask> conn.Close()
<mask> return
<mask> }
<mask> conn.(*net.TCPConn).SetKeepAlive(true)
<mask> tun.Add(adapters.NewSocks(target, conn))
<mask> }
</s> Improve: HTTP proxy server handler </s> remove tun.Add(adapters.NewSocks(target, conn))
</s> add tun.Add(adapters.NewSocket(target, conn)) </s> remove tun.Add(adapters.NewHTTP(hostName, peeked, method != http.MethodConnect, conn))
</s> add tun.Add(adapters.NewHTTP(request, conn)) </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return </s> remove method, hostName := adapters.ParserHTTPHostHeader(br)
if hostName == "" {
</s> add request, err := http.ReadRequest(br)
if err != nil {
conn.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | proxy/redir/tcp.go |
tun.Add(adapters.NewSocket(target, conn)) | <mask> conn.Close()
<mask> return
<mask> }
<mask> conn.(*net.TCPConn).SetKeepAlive(true)
<mask> tun.Add(adapters.NewSocks(target, conn))
<mask> }
</s> Improve: HTTP proxy server handler | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | proxy/socks/tcp.go |
"bufio" | <mask> package tunnel
<mask>
<mask> import (
<mask> "io"
<mask> "net/http"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/local"
</s> Improve: HTTP proxy server handler </s> remove "bufio"
"bytes"
"io"
</s> add </s> remove "strings"
</s> add </s> remove method, hostName := adapters.ParserHTTPHostHeader(br)
if hostName == "" {
</s> add request, err := http.ReadRequest(br)
if err != nil {
conn.Close() | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/connection.go |
"net/http" | <mask>
<mask> import (
<mask> "bufio"
<mask> "io"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/local"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
</s> Improve: HTTP proxy server handler </s> remove "bufio"
"bytes"
"io"
</s> add </s> remove "strings"
</s> add </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/connection.go |
req := request.R
host := req.Host | <mask> func (t *Tunnel) handleHTTP(request *adapters.HTTPAdapter, proxy C.ProxyAdapter) {
<mask> conn := newTrafficTrack(proxy.Conn(), t.traffic)
<mask>
<mask> for {
<mask> req.Header.Set("Connection", "close")
<mask> req.RequestURI = ""
</s> Improve: HTTP proxy server handler </s> remove // Before we unwrap src and/or dst, copy any buffered data.
if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
if _, err := conn.Write(wc.Peeked); err != nil {
return
</s> add for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break </s> remove func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapter) {
</s> add func (t *Tunnel) handleSOCKS(request *adapters.SocketAdapter, proxy C.ProxyAdapter) { </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove case *LocalAdapter.SocksAdapter:
</s> add case *LocalAdapter.SocketAdapter: </s> remove func parseHTTPAddr(target string) *C.Addr {
host, port, _ := net.SplitHostPort(target)
</s> add func parseHTTPAddr(request *http.Request) *C.Addr {
host := request.URL.Hostname()
port := request.URL.Port()
if port == "" {
port = "80"
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/connection.go |
for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break | <mask>
<mask> func (t *Tunnel) handleHTTP(request *adapters.HTTPAdapter, proxy C.ProxyAdapter) {
<mask> conn := newTrafficTrack(proxy.Conn(), t.traffic)
<mask>
<mask> // Before we unwrap src and/or dst, copy any buffered data.
<mask> if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
<mask> if _, err := conn.Write(wc.Peeked); err != nil {
<mask> return
<mask> }
<mask> wc.Peeked = nil
<mask> }
<mask>
<mask> go io.Copy(request.Conn(), conn)
</s> Improve: HTTP proxy server handler </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapter) {
</s> add func (t *Tunnel) handleSOCKS(request *adapters.SocketAdapter, proxy C.ProxyAdapter) { </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/connection.go |
br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) | <mask> if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
<mask> if _, err := conn.Write(wc.Peeked); err != nil {
<mask> return
<mask> }
<mask> wc.Peeked = nil
<mask> }
<mask>
<mask> go io.Copy(request.Conn(), conn)
<mask> io.Copy(conn, request.Conn())
<mask> }
<mask>
</s> Improve: HTTP proxy server handler </s> remove // Before we unwrap src and/or dst, copy any buffered data.
if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
if _, err := conn.Write(wc.Peeked); err != nil {
return
</s> add for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break </s> remove func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapter) {
</s> add func (t *Tunnel) handleSOCKS(request *adapters.SocketAdapter, proxy C.ProxyAdapter) { </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove } else if n := br.Buffered(); n > 0 {
peeked, _ = br.Peek(br.Buffered())
</s> add tun.Add(adapters.NewHTTPS(request, conn))
return </s> remove if !strings.Contains(hostName, ":") {
hostName += ":80"
}
var peeked []byte
if method == http.MethodConnect {
</s> add if request.Method == http.MethodConnect { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/connection.go |
req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} | <mask> }
<mask> wc.Peeked = nil
<mask> }
<mask>
<mask> go io.Copy(request.Conn(), conn)
<mask> io.Copy(conn, request.Conn())
<mask> }
<mask>
<mask> func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapter) {
<mask> conn := newTrafficTrack(proxy.Conn(), t.traffic)
<mask> go io.Copy(request.Conn(), conn)
</s> Improve: HTTP proxy server handler </s> remove func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapter) {
</s> add func (t *Tunnel) handleSOCKS(request *adapters.SocketAdapter, proxy C.ProxyAdapter) { </s> remove // Before we unwrap src and/or dst, copy any buffered data.
if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
if _, err := conn.Write(wc.Peeked); err != nil {
return
</s> add for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove case *LocalAdapter.SocksAdapter:
</s> add case *LocalAdapter.SocketAdapter: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/connection.go |
func (t *Tunnel) handleSOCKS(request *adapters.SocketAdapter, proxy C.ProxyAdapter) { | <mask> go io.Copy(request.Conn(), conn)
<mask> io.Copy(conn, request.Conn())
<mask> }
<mask>
<mask> func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapter) {
<mask> conn := newTrafficTrack(proxy.Conn(), t.traffic)
<mask> go io.Copy(request.Conn(), conn)
<mask> io.Copy(conn, request.Conn())
<mask> }
</s> Improve: HTTP proxy server handler </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove // Before we unwrap src and/or dst, copy any buffered data.
if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
if _, err := conn.Write(wc.Peeked); err != nil {
return
</s> add for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break </s> remove wc.Peeked = nil
}
</s> add br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
if err != nil {
break
}
adapters.RemoveHopByHopHeaders(resp.Header)
if resp.ContentLength >= 0 {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
resp.Write(request.Conn()) </s> remove case *LocalAdapter.SocksAdapter:
</s> add case *LocalAdapter.SocketAdapter: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/connection.go |
case *LocalAdapter.SocketAdapter: | <mask>
<mask> switch adapter := localConn.(type) {
<mask> case *LocalAdapter.HTTPAdapter:
<mask> t.handleHTTP(adapter, remoConn)
<mask> case *LocalAdapter.SocksAdapter:
<mask> t.handleSOCKS(adapter, remoConn)
<mask> }
<mask> }
<mask>
<mask> func (t *Tunnel) match(addr *C.Addr) C.Proxy {
</s> Improve: HTTP proxy server handler </s> remove func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapter) {
</s> add func (t *Tunnel) handleSOCKS(request *adapters.SocketAdapter, proxy C.ProxyAdapter) { </s> remove // Before we unwrap src and/or dst, copy any buffered data.
if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
if _, err := conn.Write(wc.Peeked); err != nil {
return
</s> add for {
req.Header.Set("Connection", "close")
req.RequestURI = ""
adapters.RemoveHopByHopHeaders(req.Header)
err := req.Write(conn)
if err != nil {
break </s> remove go io.Copy(request.Conn(), conn)
io.Copy(conn, request.Conn())
</s> add req, err = http.ReadRequest(bufio.NewReader(request.Conn()))
if err != nil {
break
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
} </s> remove // PeekedConn handle http connection and buffed HTTP data
type PeekedConn struct {
net.Conn
Peeked []byte
host string
isHTTP bool
}
func (c *PeekedConn) Read(p []byte) (n int, err error) {
if len(c.Peeked) > 0 {
n = copy(p, c.Peeked)
c.Peeked = c.Peeked[n:]
if len(c.Peeked) == 0 {
c.Peeked = nil
}
return n, nil
}
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is to return io.EOF when encountering different HOST
if c.isHTTP {
br := bufio.NewReader(bytes.NewReader(p))
_, hostName := ParserHTTPHostHeader(br)
if hostName != "" {
if !strings.Contains(hostName, ":") {
hostName += ":80"
}
if hostName != c.host {
return 0, io.EOF
}
}
}
return c.Conn.Read(p)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ec025b56a91a3aebf6d79df8bcd5c7123900f90 | tunnel/tunnel.go |
func Dialer() (*net.Dialer, error) { | <mask>
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> )
<mask>
<mask> func Dialer() *net.Dialer {
<mask> dialer := &net.Dialer{}
<mask> if DialerHook != nil {
<mask> DialerHook(dialer)
<mask> }
<mask>
</s> Chore: dialer hook should return a error </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove return dialer
</s> add return dialer, nil </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove func ListenConfig() *net.ListenConfig {
</s> add func ListenConfig() (*net.ListenConfig, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
if err := DialerHook(dialer); err != nil {
return nil, err
} | <mask>
<mask> func Dialer() *net.Dialer {
<mask> dialer := &net.Dialer{}
<mask> if DialerHook != nil {
<mask> DialerHook(dialer)
<mask> }
<mask>
<mask> return dialer
<mask> }
<mask>
</s> Chore: dialer hook should return a error </s> remove func Dialer() *net.Dialer {
</s> add func Dialer() (*net.Dialer, error) { </s> remove return dialer
</s> add return dialer, nil </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove func ListenConfig() *net.ListenConfig {
</s> add func ListenConfig() (*net.ListenConfig, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
return dialer, nil | <mask> if DialerHook != nil {
<mask> DialerHook(dialer)
<mask> }
<mask>
<mask> return dialer
<mask> }
<mask>
<mask> func ListenConfig() *net.ListenConfig {
<mask> cfg := &net.ListenConfig{}
<mask> if ListenConfigHook != nil {
</s> Chore: dialer hook should return a error </s> remove func ListenConfig() *net.ListenConfig {
</s> add func ListenConfig() (*net.ListenConfig, error) { </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove func Dialer() *net.Dialer {
</s> add func Dialer() (*net.Dialer, error) { </s> remove return cfg
</s> add return cfg, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
func ListenConfig() (*net.ListenConfig, error) { | <mask>
<mask> return dialer
<mask> }
<mask>
<mask> func ListenConfig() *net.ListenConfig {
<mask> cfg := &net.ListenConfig{}
<mask> if ListenConfigHook != nil {
<mask> ListenConfigHook(cfg)
<mask> }
<mask>
</s> Chore: dialer hook should return a error </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} </s> remove return dialer
</s> add return dialer, nil </s> remove return cfg
</s> add return cfg, nil </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
if err := ListenConfigHook(cfg); err != nil {
return nil, err
} | <mask>
<mask> func ListenConfig() *net.ListenConfig {
<mask> cfg := &net.ListenConfig{}
<mask> if ListenConfigHook != nil {
<mask> ListenConfigHook(cfg)
<mask> }
<mask>
<mask> return cfg
<mask> }
<mask>
</s> Chore: dialer hook should return a error </s> remove func ListenConfig() *net.ListenConfig {
</s> add func ListenConfig() (*net.ListenConfig, error) { </s> remove return dialer
</s> add return dialer, nil </s> remove return cfg
</s> add return cfg, nil </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
return cfg, nil | <mask> if ListenConfigHook != nil {
<mask> ListenConfigHook(cfg)
<mask> }
<mask>
<mask> return cfg
<mask> }
<mask>
<mask> func Dial(network, address string) (net.Conn, error) {
<mask> return DialContext(context.Background(), network, address)
<mask> }
</s> Chore: dialer hook should return a error </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} </s> remove func ListenConfig() *net.ListenConfig {
</s> add func ListenConfig() (*net.ListenConfig, error) { </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove return dialer
</s> add return dialer, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
dialer, err := Dialer()
if err != nil {
return nil, err
} | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> dialer := Dialer()
<mask>
<mask> var ip net.IP
<mask> switch network {
<mask> case "tcp4", "udp4":
<mask> ip, err = resolver.ResolveIPv4(host)
</s> Chore: dialer hook should return a error </s> remove return
</s> add return err </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove d := dialer.Dialer()
</s> add d, err := dialer.Dialer()
if err != nil {
return nil, err
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
if err := DialHook(dialer, network, ip); err != nil {
return nil, err
} | <mask> return nil, err
<mask> }
<mask>
<mask> if DialHook != nil {
<mask> DialHook(dialer, network, ip)
<mask> }
<mask> return dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), port))
<mask> case "tcp", "udp":
<mask> return dualStackDailContext(ctx, network, address)
<mask> default:
</s> Chore: dialer hook should return a error </s> remove DialHook(dialer, network, ip)
</s> add if result.error = DialHook(dialer, network, ip); result.error != nil {
return
} </s> remove return cfg
</s> add return cfg, nil </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove dialer.DialHook(d, network, ip)
</s> add if err := dialer.DialHook(d, network, ip); err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
lc, err := ListenConfig()
if err != nil {
return nil, err
} | <mask> }
<mask> }
<mask>
<mask> func ListenPacket(network, address string) (net.PacketConn, error) {
<mask> lc := ListenConfig()
<mask>
<mask> if ListenPacketHook != nil && address == "" {
<mask> ip := ListenPacketHook()
<mask> if ip != nil {
<mask> address = net.JoinHostPort(ip.String(), "0")
</s> Chore: dialer hook should return a error </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove return cfg
</s> add return cfg, nil </s> remove func ListenConfig() *net.ListenConfig {
</s> add func ListenConfig() (*net.ListenConfig, error) { </s> remove return dialer
</s> add return dialer, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
ip, err := ListenPacketHook()
if err != nil {
return nil, err | <mask> func ListenPacket(network, address string) (net.PacketConn, error) {
<mask> lc := ListenConfig()
<mask>
<mask> if ListenPacketHook != nil && address == "" {
<mask> ip := ListenPacketHook()
<mask> if ip != nil {
<mask> address = net.JoinHostPort(ip.String(), "0")
<mask> }
<mask> }
<mask> return lc.ListenPacket(context.Background(), network, address)
<mask> }
<mask>
</s> Chore: dialer hook should return a error </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} </s> remove return cfg
</s> add return cfg, nil </s> remove DialHook(dialer, network, ip)
</s> add if err := DialHook(dialer, network, ip); err != nil {
return nil, err
} </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
address = net.JoinHostPort(ip.String(), "0") | <mask> ip, err := ListenPacketHook()
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask> return lc.ListenPacket(context.Background(), network, address)
<mask> }
<mask>
<mask> func dualStackDailContext(ctx context.Context, network, address string) (net.Conn, error) {
<mask> host, port, err := net.SplitHostPort(address)
</s> Chore: dialer hook should return a error </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove return cfg
</s> add return cfg, nil </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} </s> remove DialHook(dialer, network, ip)
</s> add if err := DialHook(dialer, network, ip); err != nil {
return nil, err
} </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
<mask> results := make(chan dialResult)
<mask> var primary, fallback dialResult
<mask>
<mask> startRacer := func(ctx context.Context, network, host string, ipv6 bool) {
<mask> dialer := Dialer()
<mask> result := dialResult{ipv6: ipv6, done: true}
<mask> defer func() {
<mask> select {
<mask> case results <- result:
<mask> case <-returned:
</s> Chore: dialer hook should return a error </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove func Dialer() *net.Dialer {
</s> add func Dialer() (*net.Dialer, error) { </s> remove return func() net.IP {
</s> add return func() (net.IP, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go | |
dialer, err := Dialer()
if err != nil {
result.error = err
return
}
| <mask> }
<mask> }
<mask> }()
<mask>
<mask> var ip net.IP
<mask> if ipv6 {
<mask> ip, result.error = resolver.ResolveIPv6(host)
<mask> } else {
</s> Chore: dialer hook should return a error </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove DialHook(dialer, network, ip)
</s> add if result.error = DialHook(dialer, network, ip); result.error != nil {
return
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
if result.error = DialHook(dialer, network, ip); result.error != nil {
return
} | <mask> }
<mask> result.resolved = true
<mask>
<mask> if DialHook != nil {
<mask> DialHook(dialer, network, ip)
<mask> }
<mask> result.Conn, result.error = dialer.DialContext(ctx, network, net.JoinHostPort(ip.String(), port))
<mask> }
<mask>
<mask> go startRacer(ctx, network+"4", host, false)
</s> Chore: dialer hook should return a error </s> remove DialHook(dialer, network, ip)
</s> add if err := DialHook(dialer, network, ip); err != nil {
return nil, err
} </s> remove dialer.DialHook(d, network, ip)
</s> add if err := dialer.DialHook(d, network, ip); err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/dialer.go |
type DialerHookFunc = func(dialer *net.Dialer) error
type DialHookFunc = func(dialer *net.Dialer, network string, ip net.IP) error
type ListenConfigHookFunc = func(*net.ListenConfig) error
type ListenPacketHookFunc = func() (net.IP, error) | <mask>
<mask> "github.com/Dreamacro/clash/common/singledo"
<mask> )
<mask>
<mask> type DialerHookFunc = func(dialer *net.Dialer)
<mask> type DialHookFunc = func(dialer *net.Dialer, network string, ip net.IP)
<mask> type ListenConfigHookFunc = func(*net.ListenConfig)
<mask> type ListenPacketHookFunc = func() net.IP
<mask>
<mask> var (
<mask> DialerHook DialerHookFunc
<mask> DialHook DialHookFunc
<mask> ListenConfigHook ListenConfigHookFunc
</s> Chore: dialer hook should return a error </s> remove return func(dialer *net.Dialer, network string, ip net.IP) {
</s> add return func(dialer *net.Dialer, network string, ip net.IP) error { </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove return func() net.IP {
</s> add return func() (net.IP, error) { </s> remove dialer := Dialer()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
return func() (net.IP, error) { | <mask>
<mask> func ListenPacketWithInterface(name string) ListenPacketHookFunc {
<mask> single := singledo.NewSingle(5 * time.Second)
<mask>
<mask> return func() net.IP {
<mask> elm, err, _ := single.Do(func() (interface{}, error) {
<mask> iface, err := net.InterfaceByName(name)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Chore: dialer hook should return a error </s> remove return func(dialer *net.Dialer, network string, ip net.IP) {
</s> add return func(dialer *net.Dialer, network string, ip net.IP) error { </s> remove return nil
</s> add return nil, ErrAddrNotFound </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
return nil, err | <mask> return addrs, nil
<mask> })
<mask>
<mask> if err != nil {
<mask> return nil
<mask> }
<mask>
<mask> addrs := elm.([]net.Addr)
<mask>
<mask> for _, elm := range addrs {
</s> Chore: dialer hook should return a error </s> remove return
</s> add return err </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove return dialer
</s> add return dialer, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
return addr.IP, nil | <mask> if !ok || addr.IP.To4() == nil {
<mask> continue
<mask> }
<mask>
<mask> return addr.IP
<mask> }
<mask>
<mask> return nil
<mask> }
<mask> }
</s> Chore: dialer hook should return a error </s> remove return nil
</s> add return nil, ErrAddrNotFound </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
return nil, ErrAddrNotFound | <mask>
<mask> return addr.IP
<mask> }
<mask>
<mask> return nil
<mask> }
<mask> }
<mask>
<mask> func DialerWithInterface(name string) DialHookFunc {
<mask> single := singledo.NewSingle(5 * time.Second)
</s> Chore: dialer hook should return a error </s> remove return func(dialer *net.Dialer, network string, ip net.IP) {
</s> add return func(dialer *net.Dialer, network string, ip net.IP) error { </s> remove return func() net.IP {
</s> add return func() (net.IP, error) { </s> remove return addr.IP
</s> add return addr.IP, nil </s> remove return cfg
</s> add return cfg, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
return func(dialer *net.Dialer, network string, ip net.IP) error { | <mask>
<mask> func DialerWithInterface(name string) DialHookFunc {
<mask> single := singledo.NewSingle(5 * time.Second)
<mask>
<mask> return func(dialer *net.Dialer, network string, ip net.IP) {
<mask> elm, err, _ := single.Do(func() (interface{}, error) {
<mask> iface, err := net.InterfaceByName(name)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Chore: dialer hook should return a error </s> remove return func() net.IP {
</s> add return func() (net.IP, error) { </s> remove return nil
</s> add return nil, ErrAddrNotFound </s> remove type DialerHookFunc = func(dialer *net.Dialer)
type DialHookFunc = func(dialer *net.Dialer, network string, ip net.IP)
type ListenConfigHookFunc = func(*net.ListenConfig)
type ListenPacketHookFunc = func() net.IP
</s> add type DialerHookFunc = func(dialer *net.Dialer) error
type DialHookFunc = func(dialer *net.Dialer, network string, ip net.IP) error
type ListenConfigHookFunc = func(*net.ListenConfig) error
type ListenPacketHookFunc = func() (net.IP, error) </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
return err | <mask> return addrs, nil
<mask> })
<mask>
<mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> addrs := elm.([]net.Addr)
<mask>
<mask> switch network {
</s> Chore: dialer hook should return a error </s> remove return nil
</s> add return nil, err </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove d := dialer.Dialer()
</s> add d, err := dialer.Dialer()
if err != nil {
return nil, err
}
</s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
} else {
return err | <mask> if addr, err := lookupTCPAddr(ip, addrs); err == nil {
<mask> dialer.LocalAddr = addr
<mask> }
<mask> case "udp", "udp4", "udp6":
<mask> if addr, err := lookupUDPAddr(ip, addrs); err == nil {
<mask> dialer.LocalAddr = addr
<mask> } else {
</s> Chore: dialer hook should return a error </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
} else {
return err | <mask> if addr, err := lookupUDPAddr(ip, addrs); err == nil {
<mask> dialer.LocalAddr = addr
<mask> }
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Chore: dialer hook should return a error </s> remove lc := ListenConfig()
</s> add lc, err := ListenConfig()
if err != nil {
return nil, err
} </s> remove ip := ListenPacketHook()
if ip != nil {
address = net.JoinHostPort(ip.String(), "0")
</s> add ip, err := ListenPacketHook()
if err != nil {
return nil, err </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
return nil | <mask> } else {
<mask> return err
<mask> }
<mask> }
<mask> }
<mask> }
</s> Chore: dialer hook should return a error </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} </s> remove ListenConfigHook(cfg)
</s> add if err := ListenConfigHook(cfg); err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | component/dialer/hook.go |
d, err := dialer.Dialer()
if err != nil {
return nil, err
}
| <mask> return nil, fmt.Errorf("use default dns resolve failed: %w", err)
<mask> }
<mask> }
<mask>
<mask> d := dialer.Dialer()
<mask> if dialer.DialHook != nil {
<mask> network := "udp"
<mask> if strings.HasPrefix(c.Client.Net, "tcp") {
<mask> network = "tcp"
<mask> }
</s> Chore: dialer hook should return a error </s> remove dialer.DialHook(d, network, ip)
</s> add if err := dialer.DialHook(d, network, ip); err != nil {
return nil, err
} </s> remove return
</s> add return err </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove return func(dialer *net.Dialer, network string, ip net.IP) {
</s> add return func(dialer *net.Dialer, network string, ip net.IP) error { </s> remove DialerHook(dialer)
</s> add if err := DialerHook(dialer); err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | dns/client.go |
if err := dialer.DialHook(d, network, ip); err != nil {
return nil, err
} | <mask> network := "udp"
<mask> if strings.HasPrefix(c.Client.Net, "tcp") {
<mask> network = "tcp"
<mask> }
<mask> dialer.DialHook(d, network, ip)
<mask> }
<mask>
<mask> c.Client.Dialer = d
<mask>
<mask> // miekg/dns ExchangeContext doesn't respond to context cancel.
</s> Chore: dialer hook should return a error </s> remove d := dialer.Dialer()
</s> add d, err := dialer.Dialer()
if err != nil {
return nil, err
}
</s> remove DialHook(dialer, network, ip)
</s> add if result.error = DialHook(dialer, network, ip); result.error != nil {
return
} </s> remove DialHook(dialer, network, ip)
</s> add if err := DialHook(dialer, network, ip); err != nil {
return nil, err
} </s> remove dialer := Dialer()
</s> add dialer, err := Dialer()
if err != nil {
return nil, err
} </s> remove return
</s> add return err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8eddcd77bfa2cb8a03027ba5bc0dc6cc062f2608 | dns/client.go |
github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d | <mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a
<mask> github.com/docker/docker v20.10.8+incompatible
<mask> github.com/docker/go-connections v0.4.0
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/stretchr/testify v1.7.0
<mask> golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
</s> Test: use local clash pkg </s> remove github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a h1:Y+EWU18ZaK9ZxcZGv2O3nUzGk3XYLZe2r5i8FMku7wA=
github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a/go.mod h1:eN07P85tFwbnkHnEQPYlFsyTc8spXBNa4fOFUea6F58=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ef5cdb8be15e1a5f1c084ea81f83cf166772509 | test/go.mod |
replace github.com/Dreamacro/clash => ../
| <mask> )
<mask>
<mask> require (
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7 // indirect
<mask> github.com/Microsoft/go-winio v0.5.0 // indirect
<mask> github.com/containerd/containerd v1.5.5 // indirect
</s> Test: use local clash pkg </s> remove github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a h1:Y+EWU18ZaK9ZxcZGv2O3nUzGk3XYLZe2r5i8FMku7wA=
github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a/go.mod h1:eN07P85tFwbnkHnEQPYlFsyTc8spXBNa4fOFUea6F58=
</s> add </s> remove github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a
</s> add github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ef5cdb8be15e1a5f1c084ea81f83cf166772509 | test/go.mod |
<mask> github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
<mask> github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
<mask> github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a h1:Y+EWU18ZaK9ZxcZGv2O3nUzGk3XYLZe2r5i8FMku7wA=
<mask> github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a/go.mod h1:eN07P85tFwbnkHnEQPYlFsyTc8spXBNa4fOFUea6F58=
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7 h1:8CtbE1HoPPMfrQZGXmlluq6dO2lL31W6WRRE8fabc4Q=
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7/go.mod h1:8p5G4cAj5ZlXwUR+Ww63gfSikr8kvw8uw3TDwLAJpUc=
<mask> github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
<mask> github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
<mask> github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
</s> Test: use local clash pkg </s> remove github.com/Dreamacro/clash v1.6.6-0.20210821162529-0267b2efad9a
</s> add github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8ef5cdb8be15e1a5f1c084ea81f83cf166772509 | test/go.sum | |
"path/filepath" | <mask> "bytes"
<mask> "crypto/md5"
<mask> "io/ioutil"
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/log"
<mask> )
</s> Improve: safe write provider file </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f32e6a60fff79b9a5ecdda00c891ce7f4260a21 | adapters/provider/fetcher.go |
dirMode os.FileMode = 0755 | <mask> var (
<mask> fileMode os.FileMode = 0666
<mask> )
<mask>
<mask> type parser = func([]byte) (interface{}, error)
<mask>
<mask> type fetcher struct {
</s> Improve: safe write provider file </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f32e6a60fff79b9a5ecdda00c891ce7f4260a21 | adapters/provider/fetcher.go |
if err := safeWrite(f.vehicle.Path(), buf); err != nil { | <mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> f.hash = md5.Sum(buf)
<mask>
</s> Improve: safe write provider file </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f32e6a60fff79b9a5ecdda00c891ce7f4260a21 | adapters/provider/fetcher.go |
if err := safeWrite(f.vehicle.Path(), buf); err != nil { | <mask> if err != nil {
<mask> return nil, false, err
<mask> }
<mask>
<mask> if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
<mask> return nil, false, err
<mask> }
<mask>
<mask> f.updatedAt = &now
<mask> f.hash = hash
</s> Improve: safe write provider file </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f32e6a60fff79b9a5ecdda00c891ce7f4260a21 | adapters/provider/fetcher.go |
func safeWrite(path string, buf []byte) error {
dir := filepath.Dir(path)
if _, err := os.Stat(dir); os.IsNotExist(err) {
if err := os.MkdirAll(dir, dirMode); err != nil {
return err
}
}
return ioutil.WriteFile(path, buf, fileMode)
}
| <mask> }
<mask>
<mask> func newFetcher(name string, interval time.Duration, vehicle Vehicle, parser parser, onUpdate func(interface{})) *fetcher {
<mask> var ticker *time.Ticker
<mask> if interval != 0 {
<mask> ticker = time.NewTicker(interval)
<mask> }
<mask>
</s> Improve: safe write provider file </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { </s> remove if err := ioutil.WriteFile(f.vehicle.Path(), buf, fileMode); err != nil {
</s> add if err := safeWrite(f.vehicle.Path(), buf); err != nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f32e6a60fff79b9a5ecdda00c891ce7f4260a21 | adapters/provider/fetcher.go |
UDP bool `proxy:"udp,omitempty"` | <mask> Name string `proxy:"name"`
<mask> Server string `proxy:"server"`
<mask> Port int `proxy:"port"`
<mask> Psk string `proxy:"psk"`
<mask> Version int `proxy:"version,omitempty"`
<mask> ObfsOpts map[string]interface{} `proxy:"obfs-opts,omitempty"`
<mask> }
<mask>
</s> Feature: support snell v3 (#1884) </s> remove if version == Version2 {
</s> add if version != Version1 { </s> remove if option.Version != snell.Version1 && option.Version != snell.Version2 {
</s> add switch option.Version {
case snell.Version1, snell.Version2:
if option.UDP {
return nil, fmt.Errorf("snell version %d not support UDP", option.Version)
}
case snell.Version3:
default: </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | adapter/outbound/snell.go |
switch option.Version {
case snell.Version1, snell.Version2:
if option.UDP {
return nil, fmt.Errorf("snell version %d not support UDP", option.Version)
}
case snell.Version3:
default: | <mask> // backward compatible
<mask> if option.Version == 0 {
<mask> option.Version = snell.DefaultSnellVersion
<mask> }
<mask> if option.Version != snell.Version1 && option.Version != snell.Version2 {
<mask> return nil, fmt.Errorf("snell version error: %d", option.Version)
<mask> }
<mask>
<mask> s := &Snell{
<mask> Base: &Base{
</s> Feature: support snell v3 (#1884) </s> remove if version == Version2 {
</s> add if version != Version1 { </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | adapter/outbound/snell.go |
udp: option.UDP, | <mask> name: option.Name,
<mask> addr: addr,
<mask> tp: C.Snell,
<mask> iface: option.Interface,
<mask> },
<mask> psk: psk,
<mask> obfsOption: obfsOption,
<mask> version: option.Version,
<mask> }
</s> Feature: support snell v3 (#1884) </s> remove if version == Version2 {
</s> add if version != Version1 { </s> remove if option.Version != snell.Version1 && option.Version != snell.Version2 {
</s> add switch option.Version {
case snell.Version1, snell.Version2:
if option.UDP {
return nil, fmt.Errorf("snell version %d not support UDP", option.Version)
}
case snell.Version3:
default: </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | adapter/outbound/snell.go |
ImageSnell = "ghcr.io/icpz/snell-server:latest" | <mask> ImageShadowsocksRust = "ghcr.io/shadowsocks/ssserver-rust:latest"
<mask> ImageVmess = "v2fly/v2fly-core:latest"
<mask> ImageTrojan = "trojangfw/trojan:latest"
<mask> ImageTrojanGo = "p4gefau1t/trojan-go:latest"
<mask> ImageSnell = "icpz/snell-server:latest"
<mask> ImageXray = "teddysun/xray:latest"
<mask> )
<mask>
<mask> var (
<mask> waitTime = time.Second
</s> Feature: support snell v3 (#1884) </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 </s> remove if version == Version2 {
</s> add if version != Version1 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | test/clash_test.go |
"sync" | <mask> "io"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/transport/socks5"
<mask>
<mask> "github.com/Dreamacro/go-shadowsocks2/shadowaead"
</s> Feature: support snell v3 (#1884) </s> remove if version == Version2 {
</s> add if version != Version1 { </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | transport/snell/snell.go |
"github.com/Dreamacro/clash/transport/socks5" | <mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask>
<mask> "github.com/Dreamacro/go-shadowsocks2/shadowaead"
<mask> )
<mask>
<mask> const (
<mask> Version1 = 1
</s> Feature: support snell v3 (#1884) </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 </s> remove ImageSnell = "icpz/snell-server:latest"
</s> add ImageSnell = "ghcr.io/icpz/snell-server:latest" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | transport/snell/snell.go |
Version3 = 3 | <mask> Version1 = 1
<mask> Version2 = 2
<mask> DefaultSnellVersion = Version1
<mask>
<mask> // max packet length
<mask> maxLength = 0x3FFF
<mask> )
</s> Feature: support snell v3 (#1884) </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 </s> remove ImageSnell = "icpz/snell-server:latest"
</s> add ImageSnell = "ghcr.io/icpz/snell-server:latest" </s> remove if version == Version2 {
</s> add if version != Version1 { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | transport/snell/snell.go |
// max packet length
maxLength = 0x3FFF | <mask> Version1 = 1
<mask> Version2 = 2
<mask> Version3 = 3
<mask> DefaultSnellVersion = Version1
<mask> )
<mask>
<mask> const (
<mask> CommandPing byte = 0
<mask> CommandConnect byte = 1
<mask> CommandConnectV2 byte = 5
</s> Feature: support snell v3 (#1884) </s> remove CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
</s> add CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 </s> remove ImageSnell = "icpz/snell-server:latest"
</s> add ImageSnell = "ghcr.io/icpz/snell-server:latest" </s> remove if version == Version2 {
</s> add if version != Version1 { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | transport/snell/snell.go |
CommandPing byte = 0
CommandConnect byte = 1
CommandConnectV2 byte = 5
CommandUDP byte = 6
CommondUDPForward byte = 1 | <mask> DefaultSnellVersion = Version1
<mask> )
<mask>
<mask> const (
<mask> CommandPing byte = 0
<mask> CommandConnect byte = 1
<mask> CommandConnectV2 byte = 5
<mask>
<mask> CommandTunnel byte = 0
<mask> CommandPong byte = 1
<mask> CommandError byte = 2
<mask>
</s> Feature: support snell v3 (#1884) </s> remove ImageSnell = "icpz/snell-server:latest"
</s> add ImageSnell = "ghcr.io/icpz/snell-server:latest" </s> remove if version == Version2 {
</s> add if version != Version1 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | transport/snell/snell.go |
func WriteUDPHeader(conn net.Conn, version int) error {
if version < Version3 {
return errors.New("unsupport UDP version")
}
// version, command, clientID length
_, err := conn.Write([]byte{Version, CommandUDP, 0x00})
return err
}
| <mask>
<mask> return nil
<mask> }
<mask>
<mask> // HalfClose works only on version2
<mask> func HalfClose(conn net.Conn) error {
<mask> if _, err := conn.Write(endSignal); err != nil {
<mask> return err
<mask> }
</s> Feature: support snell v3 (#1884) </s> remove if option.Version != snell.Version1 && option.Version != snell.Version2 {
</s> add switch option.Version {
case snell.Version1, snell.Version2:
if option.UDP {
return nil, fmt.Errorf("snell version %d not support UDP", option.Version)
}
case snell.Version3:
default: </s> remove if version == Version2 {
</s> add if version != Version1 { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | transport/snell/snell.go |
if version != Version1 { | <mask> }
<mask>
<mask> func StreamConn(conn net.Conn, psk []byte, version int) *Snell {
<mask> var cipher shadowaead.Cipher
<mask> if version == Version2 {
<mask> cipher = NewAES128GCM(psk)
<mask> } else {
<mask> cipher = NewChacha20Poly1305(psk)
<mask> }
<mask> return &Snell{Conn: shadowaead.NewConn(conn, cipher)}
</s> Feature: support snell v3 (#1884) </s> remove if option.Version != snell.Version1 && option.Version != snell.Version2 {
</s> add switch option.Version {
case snell.Version1, snell.Version2:
if option.UDP {
return nil, fmt.Errorf("snell version %d not support UDP", option.Version)
}
case snell.Version3:
default: </s> remove ImageSnell = "icpz/snell-server:latest"
</s> add ImageSnell = "ghcr.io/icpz/snell-server:latest" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8f3385bbb607afbe7f0d1df58444c385b4d63a4f | transport/snell/snell.go |
adapters "github.com/Dreamacro/clash/adapters/outbound" | <mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/outbound"
<mask> "github.com/Dreamacro/clash/common/observable"
<mask> "github.com/Dreamacro/clash/common/structure"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> R "github.com/Dreamacro/clash/rules"
<mask>
</s> Feature: add authorization for API </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) </s> remove AllowedHeaders: []string{"Content-Type"},
</s> add AllowedHeaders: []string{"Content-Type", "Authorization"}, </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | config/config.go |
Secret string `yaml:"secret"` | <mask> LogLevel string `yaml:"log-level"`
<mask> ExternalController string `yaml:"external-controller"`
<mask>
<mask> Proxy []map[string]interface{} `yaml:"Proxy"`
<mask> ProxyGroup []map[string]interface{} `yaml:"Proxy Group"`
<mask> Rule []string `yaml:"Rule"`
<mask> }
<mask>
</s> Feature: add authorization for API </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) </s> remove AllowedHeaders: []string{"Content-Type"},
</s> add AllowedHeaders: []string{"Content-Type", "Authorization"}, </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | config/config.go |
c.event <- &Event{Type: "secret", Payload: cfg.Secret} | <mask> if restAddr := cfg.ExternalController; restAddr != "" {
<mask> c.event <- &Event{Type: "external-controller", Payload: restAddr}
<mask> }
<mask>
<mask> c.UpdateGeneral(*c.general)
<mask> return nil
<mask> }
<mask>
</s> Feature: add authorization for API </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | config/config.go |
"strings" | <mask>
<mask> import (
<mask> "encoding/json"
<mask> "net/http"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> C "github.com/Dreamacro/clash/constant"
</s> Feature: add authorization for API </s> remove "github.com/Dreamacro/clash/adapters/outbound"
</s> add adapters "github.com/Dreamacro/clash/adapters/outbound" </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) </s> remove AllowedHeaders: []string{"Content-Type"},
</s> add AllowedHeaders: []string{"Content-Type", "Authorization"}, </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | hub/server.go |
var secret = ""
| <mask> "github.com/go-chi/render"
<mask> log "github.com/sirupsen/logrus"
<mask> )
<mask>
<mask> type Traffic struct {
<mask> Up int64 `json:"up"`
<mask> Down int64 `json:"down"`
<mask> }
<mask>
<mask> func newHub(signal chan struct{}) {
</s> Feature: add authorization for API </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) </s> remove AllowedHeaders: []string{"Content-Type"},
</s> add AllowedHeaders: []string{"Content-Type", "Authorization"}, </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | hub/server.go |
count := 0 | <mask> var addr string
<mask> ch := config.Instance().Subscribe()
<mask> signal <- struct{}{}
<mask> for {
<mask> elm := <-ch
<mask> event := elm.(*config.Event)
<mask> switch event.Type {
</s> Feature: add authorization for API </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | hub/server.go |
switch event.Type {
case "external-controller": | <mask> signal <- struct{}{}
<mask> for {
<mask> elm := <-ch
<mask> event := elm.(*config.Event)
<mask> if event.Type == "external-controller" {
<mask> addr = event.Payload.(string)
<mask> break
<mask> }
<mask> }
<mask>
</s> Feature: add authorization for API </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | hub/server.go |
count++
case "secret":
secret = event.Payload.(string)
count++
}
if count == 2 { | <mask> switch event.Type {
<mask> case "external-controller":
<mask> addr = event.Payload.(string)
<mask> break
<mask> }
<mask> }
<mask>
<mask> r := chi.NewRouter()
</s> Feature: add authorization for API </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) </s> remove AllowedHeaders: []string{"Content-Type"},
</s> add AllowedHeaders: []string{"Content-Type", "Authorization"}, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | hub/server.go |
AllowedHeaders: []string{"Content-Type", "Authorization"}, | <mask>
<mask> cors := cors.New(cors.Options{
<mask> AllowedOrigins: []string{"*"},
<mask> AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
<mask> AllowedHeaders: []string{"Content-Type"},
<mask> MaxAge: 300,
<mask> })
<mask>
<mask> r.Use(cors.Handler)
<mask>
</s> Feature: add authorization for API </s> remove r.Use(cors.Handler)
</s> add r.Use(cors.Handler, authentication) </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | hub/server.go |
r.Use(cors.Handler, authentication) | <mask> AllowedHeaders: []string{"Content-Type"},
<mask> MaxAge: 300,
<mask> })
<mask>
<mask> r.Use(cors.Handler)
<mask>
<mask> r.With(jsonContentType).Get("/traffic", traffic)
<mask> r.With(jsonContentType).Get("/logs", getLogs)
<mask> r.Mount("/configs", configRouter())
<mask> r.Mount("/proxies", proxyRouter())
</s> Feature: add authorization for API </s> remove AllowedHeaders: []string{"Content-Type"},
</s> add AllowedHeaders: []string{"Content-Type", "Authorization"}, </s> remove if event.Type == "external-controller" {
</s> add switch event.Type {
case "external-controller": | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/8fff0968bfaadcf04adbe7c978d67eb24ccb42a3 | hub/server.go |
last := p.history.Last()
if last == nil { | <mask> if !p.alive {
<mask> return max
<mask> }
<mask>
<mask> head := p.history.First()
<mask> if head == nil {
<mask> return max
<mask> }
<mask> history := head.(C.DelayHistory)
<mask> if history.Delay == 0 {
<mask> return max
</s> Fix: use correctly last record </s> remove history := head.(C.DelayHistory)
</s> add history := last.(C.DelayHistory) </s> remove // First returns the head of items without deleting.
func (q *Queue) First() interface{} {
</s> add // Last returns the last of item.
func (q *Queue) Last() interface{} { </s> remove return head
</s> add return last </s> remove head := q.items[0]
</s> add last := q.items[len(q.items)-1] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/904c354ee4c45a25849e7b821f0ae2ff83cf76a0 | adapters/outbound/base.go |
history := last.(C.DelayHistory) | <mask> head := p.history.First()
<mask> if head == nil {
<mask> return max
<mask> }
<mask> history := head.(C.DelayHistory)
<mask> if history.Delay == 0 {
<mask> return max
<mask> }
<mask> return history.Delay
<mask> }
</s> Fix: use correctly last record </s> remove head := p.history.First()
if head == nil {
</s> add last := p.history.Last()
if last == nil { </s> remove // First returns the head of items without deleting.
func (q *Queue) First() interface{} {
</s> add // Last returns the last of item.
func (q *Queue) Last() interface{} { </s> remove head := q.items[0]
</s> add last := q.items[len(q.items)-1] </s> remove return head
</s> add return last | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/904c354ee4c45a25849e7b821f0ae2ff83cf76a0 | adapters/outbound/base.go |
// Last returns the last of item.
func (q *Queue) Last() interface{} { | <mask> q.lock.Unlock()
<mask> return head
<mask> }
<mask>
<mask> // First returns the head of items without deleting.
<mask> func (q *Queue) First() interface{} {
<mask> if len(q.items) == 0 {
<mask> return nil
<mask> }
<mask>
<mask> q.lock.RLock()
</s> Fix: use correctly last record </s> remove return head
</s> add return last </s> remove head := p.history.First()
if head == nil {
</s> add last := p.history.Last()
if last == nil { </s> remove history := head.(C.DelayHistory)
</s> add history := last.(C.DelayHistory) </s> remove head := q.items[0]
</s> add last := q.items[len(q.items)-1] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/904c354ee4c45a25849e7b821f0ae2ff83cf76a0 | common/queue/queue.go |
last := q.items[len(q.items)-1] | <mask> return nil
<mask> }
<mask>
<mask> q.lock.RLock()
<mask> head := q.items[0]
<mask> q.lock.RUnlock()
<mask> return head
<mask> }
<mask>
<mask> // Copy get the copy of queue.
</s> Fix: use correctly last record </s> remove return head
</s> add return last </s> remove // First returns the head of items without deleting.
func (q *Queue) First() interface{} {
</s> add // Last returns the last of item.
func (q *Queue) Last() interface{} { </s> remove history := head.(C.DelayHistory)
</s> add history := last.(C.DelayHistory) </s> remove head := p.history.First()
if head == nil {
</s> add last := p.history.Last()
if last == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/904c354ee4c45a25849e7b821f0ae2ff83cf76a0 | common/queue/queue.go |
return last | <mask>
<mask> q.lock.RLock()
<mask> head := q.items[0]
<mask> q.lock.RUnlock()
<mask> return head
<mask> }
<mask>
<mask> // Copy get the copy of queue.
<mask> func (q *Queue) Copy() []interface{} {
<mask> items := []interface{}{}
</s> Fix: use correctly last record </s> remove head := q.items[0]
</s> add last := q.items[len(q.items)-1] </s> remove // First returns the head of items without deleting.
func (q *Queue) First() interface{} {
</s> add // Last returns the last of item.
func (q *Queue) Last() interface{} { </s> remove history := head.(C.DelayHistory)
</s> add history := last.(C.DelayHistory) </s> remove head := p.history.First()
if head == nil {
</s> add last := p.history.Last()
if last == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/904c354ee4c45a25849e7b821f0ae2ff83cf76a0 | common/queue/queue.go |
var ErrUDPRemoteAddrMismatch = errors.New("udp packet dropped due to mismatched remote address")
| <mask> "golang.org/x/net/http2"
<mask> )
<mask>
<mask> type Vmess struct {
<mask> *Base
<mask> client *vmess.Client
<mask> option *VmessOption
</s> Fix: drop UDP packet which mismatched destination for VMess (#2410)
Co-authored-by: SUN Sizhe <sunsizhe@cmi.chinamobile.com> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/90b40a8e5a81a6bf0d07985d6f037c7ed66721a9 | adapter/outbound/vmess.go |
// WriteTo implments C.PacketConn.WriteTo
// Since VMess doesn't support full cone NAT by design, we verify if addr matches uc.rAddr, and drop the packet if not. | <mask> net.Conn
<mask> rAddr net.Addr
<mask> }
<mask>
<mask> func (uc *vmessPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
<mask> allowedAddr := uc.rAddr.(*net.UDPAddr)
<mask> destAddr := addr.(*net.UDPAddr)
<mask> if !(allowedAddr.IP.Equal(destAddr.IP) && allowedAddr.Port == destAddr.Port) {
</s> Fix: drop UDP packet which mismatched destination for VMess (#2410)
Co-authored-by: SUN Sizhe <sunsizhe@cmi.chinamobile.com> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/90b40a8e5a81a6bf0d07985d6f037c7ed66721a9 | adapter/outbound/vmess.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.