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 |
|---|---|---|---|---|
var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) | <mask> Addrs []*net.IPNet
<mask> HardwareAddr net.HardwareAddr
<mask> }
<mask>
<mask> var ErrIfaceNotFound = errors.New("interface not found")
<mask> var ErrAddrNotFound = errors.New("addr not found")
<mask>
<mask> var interfaces = singledo.NewSingle(time.Second * 20)
<mask>
<mask> func ResolveInterface(name string) (*Interface, error) {
<mask> value, err, _ := interfaces.Do(func() (interface{}, error) {
</s> Style: use gofumpt for fmt </s> remove var shardCount = atomic.NewInt32(0)
</s> add shardCount := atomic.NewInt32(0) </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | component/iface/iface.go |
var (
mmdb *geoip2.Reader
once sync.Once
) | <mask>
<mask> "github.com/oschwald/geoip2-golang"
<mask> )
<mask>
<mask> var mmdb *geoip2.Reader
<mask> var once sync.Once
<mask>
<mask> func LoadFromBytes(buffer []byte) {
<mask> once.Do(func() {
<mask> var err error
<mask> mmdb, err = geoip2.FromBytes(buffer)
</s> Style: use gofumpt for fmt </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove if err := os.MkdirAll(dir, 0777); err != nil {
</s> add if err := os.MkdirAll(dir, 0o777); err != nil { </s> remove fileMode os.FileMode = 0666
</s> add fileMode os.FileMode = 0o666 </s> remove var ErrIfaceNotFound = errors.New("interface not found")
var ErrAddrNotFound = errors.New("addr not found")
</s> add var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | component/mmdb/mmdb.go |
type (
SocketResolver func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
ProcessNameResolver func(inode, uid int) (name string, err error)
) | <mask>
<mask> return binary.LittleEndian
<mask> }()
<mask>
<mask> type SocketResolver func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
<mask> type ProcessNameResolver func(inode, uid int) (name string, err error)
<mask>
<mask> // export for android
<mask> var (
<mask> DefaultSocketResolver SocketResolver = resolveSocketByNetlink
<mask> DefaultProcessNameResolver ProcessNameResolver = resolveProcessNameByProcSearch
</s> Style: use gofumpt for fmt </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | component/process/process_linux.go |
fileMode os.FileMode = 0o666 | <mask> )
<mask>
<mask> var (
<mask> initOnce sync.Once
<mask> fileMode os.FileMode = 0666
<mask> defaultCache *CacheFile
<mask>
<mask> bucketSelected = []byte("selected")
<mask> )
<mask>
</s> Style: use gofumpt for fmt </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var mmdb *geoip2.Reader
var once sync.Once
</s> add var (
mmdb *geoip2.Reader
once sync.Once
) </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | component/profile/cachefile/cache.go |
// StoreSelected is a global switch for storing selected proxy to cache
var StoreSelected = atomic.NewBool(true) | <mask> import (
<mask> "go.uber.org/atomic"
<mask> )
<mask>
<mask> var (
<mask> // StoreSelected is a global switch for storing selected proxy to cache
<mask> StoreSelected = atomic.NewBool(true)
<mask> )
</s> Style: use gofumpt for fmt </s> remove var (
// EnhancedModeMapping is a mapping for EnhancedMode enum
EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
}
)
</s> add // EnhancedModeMapping is a mapping for EnhancedMode enum
var EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
} </s> remove var (
// ModeMapping is a mapping for Mode enum
ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
}
)
</s> add // ModeMapping is a mapping for Mode enum
var ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
} </s> remove var (
// LogLevelMapping is a mapping for LogLevel enum
LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
}
)
</s> add // LogLevelMapping is a mapping for LogLevel enum
var LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
} </s> remove var (
authenticator auth.Authenticator
)
</s> add var authenticator auth.Authenticator </s> remove var (
// ErrInvalidDomain means insert domain is invalid
ErrInvalidDomain = errors.New("invalid domain")
)
</s> add // ErrInvalidDomain means insert domain is invalid
var ErrInvalidDomain = errors.New("invalid domain") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | component/profile/profile.go |
// ErrInvalidDomain means insert domain is invalid
var ErrInvalidDomain = errors.New("invalid domain") | <mask> complexWildcard = "+"
<mask> domainStep = "."
<mask> )
<mask>
<mask> var (
<mask> // ErrInvalidDomain means insert domain is invalid
<mask> ErrInvalidDomain = errors.New("invalid domain")
<mask> )
<mask>
<mask> // DomainTrie contains the main logic for adding and searching nodes for domain segments.
<mask> // support wildcard domain (e.g *.google.com)
<mask> type DomainTrie struct {
<mask> root *Node
</s> Style: use gofumpt for fmt </s> remove var (
// StoreSelected is a global switch for storing selected proxy to cache
StoreSelected = atomic.NewBool(true)
)
</s> add // StoreSelected is a global switch for storing selected proxy to cache
var StoreSelected = atomic.NewBool(true) </s> remove var (
// ModeMapping is a mapping for Mode enum
ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
}
)
</s> add // ModeMapping is a mapping for Mode enum
var ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
} </s> remove var (
// EnhancedModeMapping is a mapping for EnhancedMode enum
EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
}
)
</s> add // EnhancedModeMapping is a mapping for EnhancedMode enum
var EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
} </s> remove var (
// LogLevelMapping is a mapping for LogLevel enum
LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
}
)
</s> add // LogLevelMapping is a mapping for LogLevel enum
var LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
} </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | component/trie/domain.go |
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o644) | <mask> return
<mask> }
<mask> defer resp.Body.Close()
<mask>
<mask> f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> defer f.Close()
<mask> _, err = io.Copy(f, resp.Body)
</s> Style: use gofumpt for fmt </s> remove f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0o644) </s> remove if err := os.MkdirAll(dir, 0777); err != nil {
</s> add if err := os.MkdirAll(dir, 0o777); err != nil { </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove type SocketResolver func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
type ProcessNameResolver func(inode, uid int) (name string, err error)
</s> add type (
SocketResolver func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
ProcessNameResolver func(inode, uid int) (name string, err error)
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | config/initial.go |
if err := os.MkdirAll(dir, 0o777); err != nil { | <mask> // Init prepare necessary files
<mask> func Init(dir string) error {
<mask> // initial homedir
<mask> if _, err := os.Stat(dir); os.IsNotExist(err) {
<mask> if err := os.MkdirAll(dir, 0777); err != nil {
<mask> return fmt.Errorf("can't create config directory %s: %s", dir, err.Error())
<mask> }
<mask> }
<mask>
<mask> // initial config.yaml
</s> Style: use gofumpt for fmt </s> remove f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0o644) </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o644) </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var mmdb *geoip2.Reader
var once sync.Once
</s> add var (
mmdb *geoip2.Reader
once sync.Once
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | config/initial.go |
f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0o644) | <mask>
<mask> // initial config.yaml
<mask> if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) {
<mask> log.Infoln("Can't find config, create a initial config file")
<mask> f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
<mask> if err != nil {
<mask> return fmt.Errorf("can't create file %s: %s", C.Path.Config(), err.Error())
<mask> }
<mask> f.Write([]byte(`mixed-port: 7890`))
<mask> f.Close()
</s> Style: use gofumpt for fmt </s> remove if err := os.MkdirAll(dir, 0777); err != nil {
</s> add if err := os.MkdirAll(dir, 0o777); err != nil { </s> remove f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o644) </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove var mmdb *geoip2.Reader
var once sync.Once
</s> add var (
mmdb *geoip2.Reader
once sync.Once
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | config/initial.go |
type (
handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error)
middleware func(next handler) handler
) | <mask>
<mask> D "github.com/miekg/dns"
<mask> )
<mask>
<mask> type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error)
<mask> type middleware func(next handler) handler
<mask>
<mask> func withHosts(hosts *trie.DomainTrie) middleware {
<mask> return func(next handler) handler {
<mask> return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) {
<mask> q := r.Question[0]
</s> Style: use gofumpt for fmt </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var shardCount = atomic.NewInt32(0)
</s> add shardCount := atomic.NewInt32(0) </s> remove var ErrIfaceNotFound = errors.New("interface not found")
var ErrAddrNotFound = errors.New("addr not found")
</s> add var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | dns/middleware.go |
// EnhancedModeMapping is a mapping for EnhancedMode enum
var EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
} | <mask>
<mask> D "github.com/miekg/dns"
<mask> )
<mask>
<mask> var (
<mask> // EnhancedModeMapping is a mapping for EnhancedMode enum
<mask> EnhancedModeMapping = map[string]EnhancedMode{
<mask> NORMAL.String(): NORMAL,
<mask> FAKEIP.String(): FAKEIP,
<mask> MAPPING.String(): MAPPING,
<mask> }
<mask> )
<mask>
<mask> const (
<mask> NORMAL EnhancedMode = iota
<mask> FAKEIP
<mask> MAPPING
</s> Style: use gofumpt for fmt </s> remove var (
// ModeMapping is a mapping for Mode enum
ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
}
)
</s> add // ModeMapping is a mapping for Mode enum
var ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
} </s> remove var (
// LogLevelMapping is a mapping for LogLevel enum
LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
}
)
</s> add // LogLevelMapping is a mapping for LogLevel enum
var LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
} </s> remove var (
// StoreSelected is a global switch for storing selected proxy to cache
StoreSelected = atomic.NewBool(true)
)
</s> add // StoreSelected is a global switch for storing selected proxy to cache
var StoreSelected = atomic.NewBool(true) </s> remove var (
// ErrInvalidDomain means insert domain is invalid
ErrInvalidDomain = errors.New("invalid domain")
)
</s> add // ErrInvalidDomain means insert domain is invalid
var ErrInvalidDomain = errors.New("invalid domain") </s> remove fileMode os.FileMode = 0666
</s> add fileMode os.FileMode = 0o666 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | dns/util.go |
var mux sync.Mutex | <mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> var (
<mask> mux sync.Mutex
<mask> )
<mask>
<mask> func readConfig(path string) ([]byte, error) {
<mask> if _, err := os.Stat(path); os.IsNotExist(err) {
<mask> return nil, err
<mask> }
</s> Style: use gofumpt for fmt </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove if err := os.MkdirAll(dir, 0777); err != nil {
</s> add if err := os.MkdirAll(dir, 0o777); err != nil { </s> remove f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0o644) </s> remove f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o644) </s> remove var mmdb *geoip2.Reader
var once sync.Once
</s> add var (
mmdb *geoip2.Reader
once sync.Once
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | hub/executor/executor.go |
var authenticator auth.Authenticator | <mask> import (
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> )
<mask>
<mask> var (
<mask> authenticator auth.Authenticator
<mask> )
<mask>
<mask> func Authenticator() auth.Authenticator {
<mask> return authenticator
<mask> }
<mask>
</s> Style: use gofumpt for fmt </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove var (
// StoreSelected is a global switch for storing selected proxy to cache
StoreSelected = atomic.NewBool(true)
)
</s> add // StoreSelected is a global switch for storing selected proxy to cache
var StoreSelected = atomic.NewBool(true) </s> remove var mmdb *geoip2.Reader
var once sync.Once
</s> add var (
mmdb *geoip2.Reader
once sync.Once
) </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | listener/auth/auth.go |
// LogLevelMapping is a mapping for LogLevel enum
var LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
} | <mask> "encoding/json"
<mask> "errors"
<mask> )
<mask>
<mask> var (
<mask> // LogLevelMapping is a mapping for LogLevel enum
<mask> LogLevelMapping = map[string]LogLevel{
<mask> ERROR.String(): ERROR,
<mask> WARNING.String(): WARNING,
<mask> INFO.String(): INFO,
<mask> DEBUG.String(): DEBUG,
<mask> SILENT.String(): SILENT,
<mask> }
<mask> )
<mask>
<mask> const (
<mask> DEBUG LogLevel = iota
<mask> INFO
<mask> WARNING
</s> Style: use gofumpt for fmt </s> remove var (
// EnhancedModeMapping is a mapping for EnhancedMode enum
EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
}
)
</s> add // EnhancedModeMapping is a mapping for EnhancedMode enum
var EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
} </s> remove var (
// ModeMapping is a mapping for Mode enum
ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
}
)
</s> add // ModeMapping is a mapping for Mode enum
var ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
} </s> remove var (
// StoreSelected is a global switch for storing selected proxy to cache
StoreSelected = atomic.NewBool(true)
)
</s> add // StoreSelected is a global switch for storing selected proxy to cache
var StoreSelected = atomic.NewBool(true) </s> remove var (
// ErrInvalidDomain means insert domain is invalid
ErrInvalidDomain = errors.New("invalid domain")
)
</s> add // ErrInvalidDomain means insert domain is invalid
var ErrInvalidDomain = errors.New("invalid domain") </s> remove fileMode os.FileMode = 0666
</s> add fileMode os.FileMode = 0o666 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | log/level.go |
var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} | <mask> ErrInvalidLength = errors.New("invalid length")
<mask> ErrSmallBuffer = errors.New("buffer too small")
<mask> )
<mask>
<mask> var (
<mask> defaultHeader = http.Header{
<mask> "content-type": []string{"application/grpc"},
<mask> "user-agent": []string{"grpc-go/1.36.0"},
<mask> }
<mask> )
<mask>
<mask> type DialFn = func(network, addr string) (net.Conn, error)
<mask>
<mask> type Conn struct {
<mask> response *http.Response
</s> Style: use gofumpt for fmt </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var (
// ErrInvalidDomain means insert domain is invalid
ErrInvalidDomain = errors.New("invalid domain")
)
</s> add // ErrInvalidDomain means insert domain is invalid
var ErrInvalidDomain = errors.New("invalid domain") </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove var ErrIfaceNotFound = errors.New("interface not found")
var ErrAddrNotFound = errors.New("addr not found")
</s> add var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | transport/gun/gun.go |
var endSignal = []byte{} | <mask>
<mask> Version byte = 1
<mask> )
<mask>
<mask> var (
<mask> endSignal = []byte{}
<mask> )
<mask>
<mask> type Snell struct {
<mask> net.Conn
<mask> buffer [1]byte
<mask> reply bool
</s> Style: use gofumpt for fmt </s> remove var (
errVehicleType = errors.New("unsupport vehicle type")
)
</s> add var errVehicleType = errors.New("unsupport vehicle type") </s> remove var (
DefaultOptions []Option
)
</s> add var DefaultOptions []Option </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | transport/snell/snell.go |
buf := &bytes.Buffer{} | <mask> return !ip.IsUnspecified() && subnet.Contains(ip)
<mask> }
<mask>
<mask> func readUntilNull(r io.Reader) ([]byte, error) {
<mask> var buf = &bytes.Buffer{}
<mask> var data [1]byte
<mask>
<mask> for {
<mask> if _, err := r.Read(data[:]); err != nil {
<mask> return nil, err
</s> Style: use gofumpt for fmt </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove if err := os.MkdirAll(dir, 0777); err != nil {
</s> add if err := os.MkdirAll(dir, 0o777); err != nil { </s> remove f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o644) </s> remove f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0o644) </s> remove var shardCount = atomic.NewInt32(0)
</s> add shardCount := atomic.NewInt32(0) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | transport/socks4/socks4.go |
type (
hmacMethod func(key, data []byte) []byte
hashDigestMethod func([]byte) []byte
) | <mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/transport/ssr/tools"
<mask> )
<mask>
<mask> type hmacMethod func(key, data []byte) []byte
<mask> type hashDigestMethod func([]byte) []byte
<mask>
<mask> func init() {
<mask> register("auth_aes128_sha1", newAuthAES128SHA1, 9)
<mask> }
<mask>
</s> Style: use gofumpt for fmt </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove var mmdb *geoip2.Reader
var once sync.Once
</s> add var (
mmdb *geoip2.Reader
once sync.Once
) </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error)
type middleware func(next handler) handler
</s> add type (
handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error)
middleware func(next handler) handler
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | transport/ssr/protocol/auth_aes128_sha1.go |
outputBuffer := &bytes.Buffer{} | <mask> payloadHeaderAEAD, _ := cipher.NewGCM(payloadHeaderAEADAESBlock)
<mask> payloadHeaderAEADEncrypted = payloadHeaderAEAD.Seal(nil, payloadHeaderAEADNonce, data, generatedAuthID[:])
<mask> }
<mask>
<mask> var outputBuffer = &bytes.Buffer{}
<mask>
<mask> outputBuffer.Write(generatedAuthID[:])
<mask> outputBuffer.Write(payloadHeaderLengthAEADEncrypted)
<mask> outputBuffer.Write(connectionNonce)
<mask> outputBuffer.Write(payloadHeaderAEADEncrypted)
</s> Style: use gofumpt for fmt </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var ErrIfaceNotFound = errors.New("interface not found")
var ErrAddrNotFound = errors.New("addr not found")
</s> add var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) </s> remove var count = atomic.NewInt32(0)
</s> add count := atomic.NewInt32(0) </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | transport/vmess/header.go |
// ModeMapping is a mapping for Mode enum
var ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
} | <mask> )
<mask>
<mask> type TunnelMode int
<mask>
<mask> var (
<mask> // ModeMapping is a mapping for Mode enum
<mask> ModeMapping = map[string]TunnelMode{
<mask> Global.String(): Global,
<mask> Rule.String(): Rule,
<mask> Direct.String(): Direct,
<mask> }
<mask> )
<mask>
<mask> const (
<mask> Global TunnelMode = iota
<mask> Rule
<mask> Direct
</s> Style: use gofumpt for fmt </s> remove var (
// EnhancedModeMapping is a mapping for EnhancedMode enum
EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
}
)
</s> add // EnhancedModeMapping is a mapping for EnhancedMode enum
var EnhancedModeMapping = map[string]EnhancedMode{
NORMAL.String(): NORMAL,
FAKEIP.String(): FAKEIP,
MAPPING.String(): MAPPING,
} </s> remove var (
// LogLevelMapping is a mapping for LogLevel enum
LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
}
)
</s> add // LogLevelMapping is a mapping for LogLevel enum
var LogLevelMapping = map[string]LogLevel{
ERROR.String(): ERROR,
WARNING.String(): WARNING,
INFO.String(): INFO,
DEBUG.String(): DEBUG,
SILENT.String(): SILENT,
} </s> remove var (
// StoreSelected is a global switch for storing selected proxy to cache
StoreSelected = atomic.NewBool(true)
)
</s> add // StoreSelected is a global switch for storing selected proxy to cache
var StoreSelected = atomic.NewBool(true) </s> remove var (
// ErrInvalidDomain means insert domain is invalid
ErrInvalidDomain = errors.New("invalid domain")
)
</s> add // ErrInvalidDomain means insert domain is invalid
var ErrInvalidDomain = errors.New("invalid domain") </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | tunnel/mode.go |
listener net.Listener
address string
closed bool
cache *cache.Cache | <mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> type Listener struct {
<mask> net.Listener
<mask> address string
<mask> closed bool
<mask> cache *cache.Cache
<mask> }
<mask>
<mask> func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
</s> Chore: Listener should not expose original net.Listener </s> remove net.Listener
address string
closed bool
cache *cache.Cache
</s> add listener net.Listener
address string
closed bool
cache *cache.Cache </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/http/server.go |
c, err := hl.listener.Accept() | <mask> }
<mask> hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
<mask> go func() {
<mask> for {
<mask> c, err := hl.Accept()
<mask> if err != nil {
<mask> if hl.closed {
<mask> break
<mask> }
<mask> continue
</s> Chore: Listener should not expose original net.Listener </s> remove c, err := ml.Accept()
</s> add c, err := ml.listener.Accept() </s> remove Listener: l,
</s> add listener: l, </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/http/server.go |
l.listener.Close() | <mask> }
<mask>
<mask> func (l *Listener) Close() {
<mask> l.closed = true
<mask> l.Listener.Close()
<mask> }
<mask>
<mask> func (l *Listener) Address() string {
<mask> return l.address
<mask> }
</s> Chore: Listener should not expose original net.Listener </s> remove l.Listener.Close()
</s> add l.listener.Close() </s> remove l.Listener.Close()
</s> add l.listener.Close() </s> remove l.Listener.Close()
</s> add l.listener.Close() </s> remove l.Listener.Close()
</s> add l.listener.Close() </s> remove return l.PacketConn.Close()
</s> add return l.packetConn.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/http/server.go |
listener net.Listener
address string
closed bool
cache *cache.Cache | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> type Listener struct {
<mask> net.Listener
<mask> address string
<mask> closed bool
<mask> cache *cache.Cache
<mask> }
<mask>
<mask> func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
</s> Chore: Listener should not expose original net.Listener </s> remove net.Listener
address string
closed bool
cache *cache.Cache
</s> add listener net.Listener
address string
closed bool
cache *cache.Cache </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/mixed/mixed.go |
c, err := ml.listener.Accept() | <mask>
<mask> ml := &Listener{l, addr, false, cache.New(30 * time.Second)}
<mask> go func() {
<mask> for {
<mask> c, err := ml.Accept()
<mask> if err != nil {
<mask> if ml.closed {
<mask> break
<mask> }
<mask> continue
</s> Chore: Listener should not expose original net.Listener </s> remove c, err := hl.Accept()
</s> add c, err := hl.listener.Accept() </s> remove Listener: l,
</s> add listener: l, </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/mixed/mixed.go |
l.listener.Close() | <mask> }
<mask>
<mask> func (l *Listener) Close() {
<mask> l.closed = true
<mask> l.Listener.Close()
<mask> }
<mask>
<mask> func (l *Listener) Address() string {
<mask> return l.address
<mask> }
</s> Chore: Listener should not expose original net.Listener | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/mixed/mixed.go |
listener net.Listener
address string
closed bool | <mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Listener struct {
<mask> net.Listener
<mask> address string
<mask> closed bool
<mask> }
<mask>
<mask> func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
</s> Chore: Listener should not expose original net.Listener </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
cache *cache.Cache
</s> add listener net.Listener
address string
closed bool
cache *cache.Cache </s> remove net.Listener
address string
closed bool
cache *cache.Cache
</s> add listener net.Listener
address string
closed bool
cache *cache.Cache </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/redir/tcp.go |
l.listener.Close() | <mask> }
<mask>
<mask> func (l *Listener) Close() {
<mask> l.closed = true
<mask> l.Listener.Close()
<mask> }
<mask>
<mask> func (l *Listener) Address() string {
<mask> return l.address
<mask> }
</s> Chore: Listener should not expose original net.Listener | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/redir/tcp.go |
listener net.Listener
address string
closed bool | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> type Listener struct {
<mask> net.Listener
<mask> address string
<mask> closed bool
<mask> }
<mask>
<mask> func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
</s> Chore: Listener should not expose original net.Listener </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
cache *cache.Cache
</s> add listener net.Listener
address string
closed bool
cache *cache.Cache </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
cache *cache.Cache
</s> add listener net.Listener
address string
closed bool
cache *cache.Cache </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/socks/tcp.go |
l.listener.Close() | <mask> }
<mask>
<mask> func (l *Listener) Close() {
<mask> l.closed = true
<mask> l.Listener.Close()
<mask> }
<mask>
<mask> func (l *Listener) Address() string {
<mask> return l.address
<mask> }
</s> Chore: Listener should not expose original net.Listener | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/socks/tcp.go |
packetConn net.PacketConn
address string
closed bool | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> type UDPListener struct {
<mask> net.PacketConn
<mask> address string
<mask> closed bool
<mask> }
<mask>
<mask> func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) {
<mask> l, err := net.ListenPacket("udp", addr)
<mask> if err != nil {
</s> Chore: Listener should not expose original net.Listener </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.Listener
address string
closed bool
cache *cache.Cache
</s> add listener net.Listener
address string
closed bool
cache *cache.Cache </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/socks/udp.go |
return l.packetConn.Close() | <mask> }
<mask>
<mask> func (l *UDPListener) Close() error {
<mask> l.closed = true
<mask> return l.PacketConn.Close()
<mask> }
<mask>
<mask> func (l *UDPListener) Address() string {
<mask> return l.address
<mask> }
</s> Chore: Listener should not expose original net.Listener </s> remove return l.PacketConn.Close()
</s> add return l.packetConn.Close() </s> remove l.Listener.Close()
</s> add l.listener.Close() </s> remove l.Listener.Close()
</s> add l.listener.Close() </s> remove l.Listener.Close()
</s> add l.listener.Close() </s> remove l.Listener.Close()
</s> add l.listener.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/socks/udp.go |
listener net.Listener
address string
closed bool | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> type Listener struct {
<mask> net.Listener
<mask> address string
<mask> closed bool
<mask> }
<mask>
<mask> func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
</s> Chore: Listener should not expose original net.Listener | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/tproxy/tproxy.go |
listener: l, | <mask> return nil, err
<mask> }
<mask>
<mask> rl := &Listener{
<mask> Listener: l,
<mask> address: addr,
<mask> }
<mask>
<mask> go func() {
<mask> for {
</s> Chore: Listener should not expose original net.Listener </s> remove c, err := hl.Accept()
</s> add c, err := hl.listener.Accept() </s> remove c, err := ml.Accept()
</s> add c, err := ml.listener.Accept() </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool </s> remove net.PacketConn
address string
closed bool
</s> add packetConn net.PacketConn
address string
closed bool </s> remove net.Listener
address string
closed bool
</s> add listener net.Listener
address string
closed bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/tproxy/tproxy.go |
l.listener.Close() | <mask> }
<mask>
<mask> func (l *Listener) Close() {
<mask> l.closed = true
<mask> l.Listener.Close()
<mask> }
<mask>
<mask> func (l *Listener) Address() string {
<mask> return l.address
<mask> }
</s> Chore: Listener should not expose original net.Listener | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/tproxy/tproxy.go |
packetConn net.PacketConn
address string
closed bool | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> type UDPListener struct {
<mask> net.PacketConn
<mask> address string
<mask> closed bool
<mask> }
<mask>
<mask> func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) {
<mask> l, err := net.ListenPacket("udp", addr)
<mask> if err != nil {
</s> Chore: Listener should not expose original net.Listener | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/tproxy/udp.go |
return l.packetConn.Close() | <mask> }
<mask>
<mask> func (l *UDPListener) Close() error {
<mask> l.closed = true
<mask> return l.PacketConn.Close()
<mask> }
<mask>
<mask> func (l *UDPListener) Address() string {
<mask> return l.address
<mask> }
</s> Chore: Listener should not expose original net.Listener | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f231a63e9322198deb8e4e65afd3572344f62d31 | listener/tproxy/udp.go |
"strconv"
"strings" | <mask> "encoding/binary"
<mask> "net"
<mask> "syscall"
<mask> "unsafe"
<mask>
<mask> "golang.org/x/sys/unix"
<mask> )
<mask>
</s> Fix: macOS Ventura process name match </s> remove
// from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
</s> add itemSize := structSize | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f29b54898f895e5df058116fbe9317bdf4caa151 | component/process/process_darwin.go |
var structSize = func() int {
value, _ := syscall.Sysctl("kern.osproductversion")
major, _, _ := strings.Cut(value, ".")
n, _ := strconv.ParseInt(major, 10, 64)
switch true {
case n >= 13:
return 408
default:
// from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
return 384
}
}()
| <mask> proccallnumpidinfo = 0x2
<mask> )
<mask>
<mask> func findProcessName(network string, ip net.IP, port int) (string, error) {
<mask> var spath string
<mask> switch network {
<mask> case TCP:
</s> Fix: macOS Ventura process name match </s> remove
// from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
</s> add itemSize := structSize | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f29b54898f895e5df058116fbe9317bdf4caa151 | component/process/process_darwin.go |
itemSize := structSize | <mask> return "", err
<mask> }
<mask>
<mask> buf := []byte(value)
<mask>
<mask> // from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
<mask> // size/offset are round up (aligned) to 8 bytes in darwin
<mask> // rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
<mask> // 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
<mask> itemSize := 384
<mask> if network == TCP {
<mask> // rup8(sizeof(xtcpcb_n))
<mask> itemSize += 208
<mask> }
<mask>
</s> Fix: macOS Ventura process name match | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f29b54898f895e5df058116fbe9317bdf4caa151 | component/process/process_darwin.go |
fastNotExist := true
| <mask> elm, _, _ := u.fastSingle.Do(func() (interface{}, error) {
<mask> proxies := u.proxies(touch)
<mask> fast := proxies[0]
<mask> min := fast.LastDelay()
<mask> for _, proxy := range proxies[1:] {
<mask> if u.fastNode != nil && proxy.Name() == u.fastNode.Name() {
<mask> fastNotExist = false
<mask> }
<mask>
<mask> if !proxy.Alive() {
</s> Fix: skip deleted node from url-test group (#1378)
Co-authored-by: fish <fish@youme.im> </s> remove if u.fastNode == nil || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance {
</s> add if u.fastNode == nil || fastNotExist || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f375f080dadfef175cb1d8bd8e19d626ca6b7b7d | adapters/outboundgroup/urltest.go |
if u.fastNode != nil && proxy.Name() == u.fastNode.Name() {
fastNotExist = false
}
| <mask> fastNotExist := true
<mask>
<mask> for _, proxy := range proxies[1:] {
<mask> if !proxy.Alive() {
<mask> continue
<mask> }
<mask>
</s> Fix: skip deleted node from url-test group (#1378)
Co-authored-by: fish <fish@youme.im> </s> remove if u.fastNode == nil || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance {
</s> add if u.fastNode == nil || fastNotExist || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f375f080dadfef175cb1d8bd8e19d626ca6b7b7d | adapters/outboundgroup/urltest.go |
if u.fastNode == nil || fastNotExist || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance { | <mask> }
<mask> }
<mask>
<mask> // tolerance
<mask> if u.fastNode == nil || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance {
<mask> u.fastNode = fast
<mask> }
<mask>
<mask> return u.fastNode, nil
<mask> })
</s> Fix: skip deleted node from url-test group (#1378)
Co-authored-by: fish <fish@youme.im> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f375f080dadfef175cb1d8bd8e19d626ca6b7b7d | adapters/outboundgroup/urltest.go |
"github.com/Dreamacro/clash/context" | <mask> "strings"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // NewHTTP recieve normal http request and return HTTPContext
<mask> func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
<mask> metadata := parseHTTPAddr(request)
<mask> metadata.Type = C.HTTP
</s> Refactor: make inbound request contextual </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/http.go |
// NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { | <mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // HTTPAdapter is a adapter for HTTP connection
<mask> type HTTPAdapter struct {
<mask> net.Conn
<mask> metadata *C.Metadata
<mask> R *http.Request
<mask> }
<mask>
<mask> // Metadata return destination metadata
<mask> func (h *HTTPAdapter) Metadata() *C.Metadata {
<mask> return h.metadata
<mask> }
<mask>
<mask> // NewHTTP is HTTPAdapter generator
<mask> func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
<mask> metadata := parseHTTPAddr(request)
<mask> metadata.Type = C.HTTP
<mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
</s> Refactor: make inbound request contextual </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove return &HTTPAdapter{
metadata: metadata,
R: request,
Conn: conn,
}
</s> add return context.NewHTTPContext(conn, request, metadata) </s> remove return &SocketAdapter{
metadata: metadata,
Conn: conn,
}
</s> add return context.NewConnContext(conn, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/http.go |
return context.NewHTTPContext(conn, request, metadata) | <mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
<mask> }
<mask> return &HTTPAdapter{
<mask> metadata: metadata,
<mask> R: request,
<mask> Conn: conn,
<mask> }
<mask> }
<mask>
<mask> // RemoveHopByHopHeaders remove hop-by-hop header
<mask> func RemoveHopByHopHeaders(header http.Header) {
<mask> // Strip hop-by-hop header based on RFC:
</s> Refactor: make inbound request contextual </s> remove return &SocketAdapter{
metadata: metadata,
Conn: conn,
}
</s> add return context.NewConnContext(conn, metadata) </s> remove return &SocketAdapter{
Conn: conn,
metadata: metadata,
}
</s> add return context.NewConnContext(conn, metadata) </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/http.go |
"github.com/Dreamacro/clash/context" | <mask> "net/http"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // NewHTTPS recieve CONNECT request and return ConnContext
<mask> func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext {
</s> Refactor: make inbound request contextual </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/https.go |
// NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { | <mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // NewHTTPS is HTTPAdapter generator
<mask> func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
<mask> metadata := parseHTTPAddr(request)
<mask> metadata.Type = C.HTTPCONNECT
<mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
</s> Refactor: make inbound request contextual </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { </s> remove return &SocketAdapter{
metadata: metadata,
Conn: conn,
}
</s> add return context.NewConnContext(conn, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/https.go |
return context.NewConnContext(conn, metadata) | <mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
<mask> }
<mask> return &SocketAdapter{
<mask> metadata: metadata,
<mask> Conn: conn,
<mask> }
<mask> }
</s> Refactor: make inbound request contextual </s> remove return &SocketAdapter{
Conn: conn,
metadata: metadata,
}
</s> add return context.NewConnContext(conn, metadata) </s> remove return &HTTPAdapter{
metadata: metadata,
R: request,
Conn: conn,
}
</s> add return context.NewHTTPContext(conn, request, metadata) </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/https.go |
"github.com/Dreamacro/clash/context" | <mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // NewSocket recieve TCP inbound and return ConnContext
<mask> func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext {
<mask> metadata := parseSocksAddr(target)
<mask> metadata.NetWork = C.TCP
</s> Refactor: make inbound request contextual </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/socket.go |
// NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { | <mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // SocketAdapter is a adapter for socks and redir connection
<mask> type SocketAdapter struct {
<mask> net.Conn
<mask> metadata *C.Metadata
<mask> }
<mask>
<mask> // Metadata return destination metadata
<mask> func (s *SocketAdapter) Metadata() *C.Metadata {
<mask> return s.metadata
<mask> }
<mask>
<mask> // NewSocket is SocketAdapter generator
<mask> func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
<mask> metadata := parseSocksAddr(target)
<mask> metadata.NetWork = C.TCP
<mask> metadata.Type = source
<mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
</s> Refactor: make inbound request contextual </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove return &HTTPAdapter{
metadata: metadata,
R: request,
Conn: conn,
}
</s> add return context.NewHTTPContext(conn, request, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/socket.go |
return context.NewConnContext(conn, metadata) | <mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
<mask> }
<mask>
<mask> return &SocketAdapter{
<mask> Conn: conn,
<mask> metadata: metadata,
<mask> }
<mask> }
</s> Refactor: make inbound request contextual </s> remove return &SocketAdapter{
metadata: metadata,
Conn: conn,
}
</s> add return context.NewConnContext(conn, metadata) </s> remove return &HTTPAdapter{
metadata: metadata,
R: request,
Conn: conn,
}
</s> add return context.NewHTTPContext(conn, request, metadata) </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove func (r *Resolver) msgToIP(msg *D.Msg) []net.IP {
ips := []net.IP{}
for _, answer := range msg.Answer {
switch ans := answer.(type) {
case *D.AAAA:
ips = append(ips, ans.AAAA)
case *D.A:
ips = append(ips, ans.A)
}
}
return ips
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | adapters/inbound/socket.go |
<mask> URLTest
<mask> LoadBalance
<mask> )
<mask>
<mask> type ServerAdapter interface {
<mask> net.Conn
<mask> Metadata() *Metadata
<mask> }
<mask>
<mask> type Connection interface {
<mask> Chains() Chain
<mask> AppendToChains(adapter ProxyAdapter)
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove type handler func(r *D.Msg) (*D.Msg, error)
</s> add type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | constant/adapters.go | |
func (c Chain) Last() string {
switch len(c) {
case 0:
return ""
default:
return c[0]
}
}
| <mask> return fmt.Sprintf("%s[%s]", c[len(c)-1], c[0])
<mask> }
<mask> }
<mask>
<mask> type Conn interface {
<mask> net.Conn
<mask> Connection
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove type ServerAdapter interface {
net.Conn
Metadata() *Metadata
}
</s> add </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove return proxy, rule, nil
</s> add return </s> remove // SocketAdapter is a adapter for socks and redir connection
type SocketAdapter struct {
net.Conn
metadata *C.Metadata
}
// Metadata return destination metadata
func (s *SocketAdapter) Metadata() *C.Metadata {
return s.metadata
}
// NewSocket is SocketAdapter generator
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *SocketAdapter {
</s> add // NewSocket recieve TCP inbound and return ConnContext
func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | constant/adapters.go |
"github.com/Dreamacro/clash/context" | <mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/fakeip"
<mask> "github.com/Dreamacro/clash/component/trie"
<mask> "github.com/Dreamacro/clash/log"
<mask>
<mask> D "github.com/miekg/dns"
<mask> )
</s> Refactor: make inbound request contextual </s> remove type handler func(r *D.Msg) (*D.Msg, error)
</s> add type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) </s> remove tcpQueue = make(chan C.ServerAdapter, 200)
</s> add tcpQueue = make(chan C.ConnContext, 200) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) | <mask>
<mask> D "github.com/miekg/dns"
<mask> )
<mask>
<mask> type handler func(r *D.Msg) (*D.Msg, error)
<mask> type middleware func(next handler) handler
<mask>
<mask> func withHosts(hosts *trie.DomainTrie) middleware {
<mask> return func(next handler) handler {
<mask> return func(r *D.Msg) (*D.Msg, error) {
</s> Refactor: make inbound request contextual </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) {
ctx.SetType(context.DNSTypeRaw) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | <mask> type middleware func(next handler) handler
<mask>
<mask> func withHosts(hosts *trie.DomainTrie) middleware {
<mask> return func(next handler) handler {
<mask> return func(r *D.Msg) (*D.Msg, error) {
<mask> q := r.Question[0]
<mask>
<mask> if !isIPRequest(q) {
<mask> return next(r)
<mask> }
</s> Refactor: make inbound request contextual </s> remove type handler func(r *D.Msg) (*D.Msg, error)
</s> add type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return next(ctx, r) | <mask> return func(r *D.Msg) (*D.Msg, error) {
<mask> q := r.Question[0]
<mask>
<mask> if !isIPRequest(q) {
<mask> return next(r)
<mask> }
<mask>
<mask> record := hosts.Search(strings.TrimRight(q.Name, "."))
<mask> if record == nil {
<mask> return next(r)
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return next(ctx, r) | <mask> }
<mask>
<mask> record := hosts.Search(strings.TrimRight(q.Name, "."))
<mask> if record == nil {
<mask> return next(r)
<mask> }
<mask>
<mask> ip := record.Data.(net.IP)
<mask> msg := r.Copy()
<mask>
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return next(ctx, r) | <mask> rr.AAAA = v6
<mask>
<mask> msg.Answer = []D.RR{rr}
<mask> } else {
<mask> return next(r)
<mask> }
<mask>
<mask> msg.SetRcode(r, D.RcodeSuccess)
<mask> msg.Authoritative = true
<mask> msg.RecursionAvailable = true
</s> Refactor: make inbound request contextual </s> remove err = resp.Write(request)
</s> add err = resp.Write(conn) </s> remove func (r *Resolver) msgToIP(msg *D.Msg) []net.IP {
ips := []net.IP{}
for _, answer := range msg.Answer {
switch ans := answer.(type) {
case *D.AAAA:
ips = append(ips, ans.AAAA)
case *D.A:
ips = append(ips, ans.A)
}
}
return ips
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
ctx.SetType(context.DNSTypeHost) | <mask> } else {
<mask> return next(ctx, r)
<mask> }
<mask>
<mask> msg.SetRcode(r, D.RcodeSuccess)
<mask> msg.Authoritative = true
<mask> msg.RecursionAvailable = true
<mask>
<mask> return msg, nil
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | <mask> }
<mask>
<mask> func withMapping(mapping *cache.LruCache) middleware {
<mask> return func(next handler) handler {
<mask> return func(r *D.Msg) (*D.Msg, error) {
<mask> q := r.Question[0]
<mask>
<mask> if !isIPRequest(q) {
<mask> return next(r)
<mask> }
</s> Refactor: make inbound request contextual </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove type handler func(r *D.Msg) (*D.Msg, error)
</s> add type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return next(ctx, r) | <mask> return func(r *D.Msg) (*D.Msg, error) {
<mask> q := r.Question[0]
<mask>
<mask> if !isIPRequest(q) {
<mask> return next(r)
<mask> }
<mask>
<mask> msg, err := next(r)
<mask> if err != nil {
<mask> return nil, err
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
msg, err := next(ctx, r) | <mask> if !isIPRequest(q) {
<mask> return next(r)
<mask> }
<mask>
<mask> msg, err := next(r)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> host := strings.TrimRight(q.Name, ".")
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return proxy, rule, nil
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | <mask> }
<mask>
<mask> func withFakeIP(fakePool *fakeip.Pool) middleware {
<mask> return func(next handler) handler {
<mask> return func(r *D.Msg) (*D.Msg, error) {
<mask> q := r.Question[0]
<mask>
<mask> host := strings.TrimRight(q.Name, ".")
<mask> if fakePool.LookupHost(host) {
<mask> return next(r)
</s> Refactor: make inbound request contextual </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove type handler func(r *D.Msg) (*D.Msg, error)
</s> add type handler func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return next(ctx, r) | <mask> q := r.Question[0]
<mask>
<mask> host := strings.TrimRight(q.Name, ".")
<mask> if fakePool.LookupHost(host) {
<mask> return next(r)
<mask> }
<mask>
<mask> switch q.Qtype {
<mask> case D.TypeAAAA, D.TypeSVCB, D.TypeHTTPS:
<mask> return handleMsgWithEmptyAnswer(r), nil
</s> Refactor: make inbound request contextual </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) {
ctx.SetType(context.DNSTypeRaw) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return next(ctx, r) | <mask> return handleMsgWithEmptyAnswer(r), nil
<mask> }
<mask>
<mask> if q.Qtype != D.TypeA {
<mask> return next(r)
<mask> }
<mask>
<mask> rr := &D.A{}
<mask> rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeA, Class: D.ClassINET, Ttl: dnsDefaultTTL}
<mask> ip := fakePool.Lookup(host)
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) {
ctx.SetType(context.DNSTypeRaw) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
ctx.SetType(context.DNSTypeFakeIP) | <mask> msg := r.Copy()
<mask> msg.Answer = []D.RR{rr}
<mask>
<mask> setMsgTTL(msg, 1)
<mask> msg.SetRcode(r, D.RcodeSuccess)
<mask> msg.Authoritative = true
<mask> msg.RecursionAvailable = true
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) </s> remove err = resp.Write(request)
</s> add err = resp.Write(conn) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) {
ctx.SetType(context.DNSTypeRaw) | <mask> }
<mask> }
<mask>
<mask> func withResolver(resolver *Resolver) handler {
<mask> return func(r *D.Msg) (*D.Msg, error) {
<mask> q := r.Question[0]
<mask>
<mask> // return a empty AAAA msg when ipv6 disabled
<mask> if !resolver.ipv6 && q.Qtype == D.TypeAAAA {
<mask> return handleMsgWithEmptyAnswer(r), nil
</s> Refactor: make inbound request contextual </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/middleware.go |
if ips := msgToIP(res.Msg); len(ips) != 0 { | <mask>
<mask> fallbackMsg := r.asyncExchange(r.fallback, m)
<mask> res := <-msgCh
<mask> if res.Error == nil {
<mask> if ips := r.msgToIP(res.Msg); len(ips) != 0 {
<mask> if !r.shouldIPFallback(ips[0]) {
<mask> msg = res.Msg // no need to wait for fallback result
<mask> err = res.Error
<mask> return msg, err
<mask> }
</s> Refactor: make inbound request contextual </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) </s> remove if len(r.Question) == 0 {
</s> add msg, err := handlerWithContext(s.handler, r)
if err != nil { </s> remove msg, err := s.handler(r)
if err != nil {
D.HandleFailed(w, r)
return
</s> add func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
if len(msg.Question) == 0 {
return nil, errors.New("at least one question is required") </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove func (r *Resolver) msgToIP(msg *D.Msg) []net.IP {
ips := []net.IP{}
for _, answer := range msg.Answer {
switch ans := answer.(type) {
case *D.AAAA:
ips = append(ips, ans.AAAA)
case *D.A:
ips = append(ips, ans.A)
}
}
return ips
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/resolver.go |
ips := msgToIP(msg) | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> ips := r.msgToIP(msg)
<mask> ipLength := len(ips)
<mask> if ipLength == 0 {
<mask> return nil, resolver.ErrIPNotFound
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove if ips := r.msgToIP(res.Msg); len(ips) != 0 {
</s> add if ips := msgToIP(res.Msg); len(ips) != 0 { </s> remove return proxy, rule, nil
</s> add return </s> remove msg, err := s.handler(r)
if err != nil {
D.HandleFailed(w, r)
return
</s> add func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
if len(msg.Question) == 0 {
return nil, errors.New("at least one question is required") </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/resolver.go |
<mask> ip = ips[rand.Intn(ipLength)]
<mask> return
<mask> }
<mask>
<mask> func (r *Resolver) msgToIP(msg *D.Msg) []net.IP {
<mask> ips := []net.IP{}
<mask>
<mask> for _, answer := range msg.Answer {
<mask> switch ans := answer.(type) {
<mask> case *D.AAAA:
<mask> ips = append(ips, ans.AAAA)
<mask> case *D.A:
<mask> ips = append(ips, ans.A)
<mask> }
<mask> }
<mask>
<mask> return ips
<mask> }
<mask>
<mask> func (r *Resolver) msgToDomain(msg *D.Msg) string {
<mask> if len(msg.Question) > 0 {
<mask> return strings.TrimRight(msg.Question[0].Name, ".")
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) </s> remove if ips := r.msgToIP(res.Msg); len(ips) != 0 {
</s> add if ips := msgToIP(res.Msg); len(ips) != 0 { </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) {
ctx.SetType(context.DNSTypeRaw) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/resolver.go | |
"errors" | <mask>
<mask> import (
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/common/sockopt"
<mask> "github.com/Dreamacro/clash/context"
<mask> "github.com/Dreamacro/clash/log"
</s> Refactor: make inbound request contextual </s> remove tcpQueue = make(chan C.ServerAdapter, 200)
</s> add tcpQueue = make(chan C.ConnContext, 200) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/server.go |
"github.com/Dreamacro/clash/context" | <mask>
<mask> "github.com/Dreamacro/clash/common/sockopt"
<mask> "github.com/Dreamacro/clash/log"
<mask>
<mask> D "github.com/miekg/dns"
<mask> )
<mask>
<mask> var (
</s> Refactor: make inbound request contextual </s> remove tcpQueue = make(chan C.ServerAdapter, 200)
</s> add tcpQueue = make(chan C.ConnContext, 200) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/server.go |
// ServeDNS implement D.Handler ServeDNS | <mask> *D.Server
<mask> handler handler
<mask> }
<mask>
<mask> func (s *Server) ServeDNS(w D.ResponseWriter, r *D.Msg) {
<mask> msg, err := handlerWithContext(s.handler, r)
<mask> if err != nil {
<mask> D.HandleFailed(w, r)
<mask> return
<mask> }
</s> Refactor: make inbound request contextual </s> remove if len(r.Question) == 0 {
</s> add msg, err := handlerWithContext(s.handler, r)
if err != nil { </s> remove w.WriteMsg(msg)
</s> add ctx := context.NewDNSContext(msg)
return handler(ctx, msg) </s> remove msg, err := s.handler(r)
if err != nil {
D.HandleFailed(w, r)
return
</s> add func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
if len(msg.Question) == 0 {
return nil, errors.New("at least one question is required") </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/server.go |
msg, err := handlerWithContext(s.handler, r)
if err != nil { | <mask> handler handler
<mask> }
<mask>
<mask> func (s *Server) ServeDNS(w D.ResponseWriter, r *D.Msg) {
<mask> if len(r.Question) == 0 {
<mask> D.HandleFailed(w, r)
<mask> return
<mask> }
<mask>
<mask> msg, err := s.handler(r)
</s> Refactor: make inbound request contextual </s> remove msg, err := s.handler(r)
if err != nil {
D.HandleFailed(w, r)
return
</s> add func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
if len(msg.Question) == 0 {
return nil, errors.New("at least one question is required") </s> remove w.WriteMsg(msg)
</s> add ctx := context.NewDNSContext(msg)
return handler(ctx, msg) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/server.go |
w.WriteMsg(msg)
} | <mask> D.HandleFailed(w, r)
<mask> return
<mask> }
<mask>
<mask> func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
<mask> if len(msg.Question) == 0 {
<mask> return nil, errors.New("at least one question is required")
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove msg, err := s.handler(r)
if err != nil {
D.HandleFailed(w, r)
return
</s> add func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
if len(msg.Question) == 0 {
return nil, errors.New("at least one question is required") </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) {
ctx.SetType(context.DNSTypeRaw) </s> remove if len(r.Question) == 0 {
</s> add msg, err := handlerWithContext(s.handler, r)
if err != nil { </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/server.go |
func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
if len(msg.Question) == 0 {
return nil, errors.New("at least one question is required") | <mask> D.HandleFailed(w, r)
<mask> return
<mask> }
<mask>
<mask> msg, err := s.handler(r)
<mask> if err != nil {
<mask> D.HandleFailed(w, r)
<mask> return
<mask> }
<mask>
<mask> w.WriteMsg(msg)
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove if len(r.Question) == 0 {
</s> add msg, err := handlerWithContext(s.handler, r)
if err != nil { </s> remove w.WriteMsg(msg)
</s> add ctx := context.NewDNSContext(msg)
return handler(ctx, msg) </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/server.go |
ctx := context.NewDNSContext(msg)
return handler(ctx, msg) | <mask> D.HandleFailed(w, r)
<mask> return
<mask> }
<mask>
<mask> w.WriteMsg(msg)
<mask> }
<mask>
<mask> func (s *Server) setHandler(handler handler) {
<mask> s.handler = handler
<mask> }
</s> Refactor: make inbound request contextual </s> remove if len(r.Question) == 0 {
</s> add msg, err := handlerWithContext(s.handler, r)
if err != nil { </s> remove msg, err := s.handler(r)
if err != nil {
D.HandleFailed(w, r)
return
</s> add func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
if len(msg.Question) == 0 {
return nil, errors.New("at least one question is required") </s> remove return func(r *D.Msg) (*D.Msg, error) {
</s> add return func(ctx *context.DNSContext, r *D.Msg) (*D.Msg, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/server.go |
func msgToIP(msg *D.Msg) []net.IP {
ips := []net.IP{}
for _, answer := range msg.Answer {
switch ans := answer.(type) {
case *D.AAAA:
ips = append(ips, ans.AAAA)
case *D.A:
ips = append(ips, ans.A)
}
}
return ips
} | <mask> msg.RecursionAvailable = true
<mask>
<mask> return msg
<mask> }
</s> Refactor: make inbound request contextual </s> remove return next(r)
</s> add return next(ctx, r) </s> remove return next(r)
</s> add return next(ctx, r) | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | dns/util.go |
"github.com/Dreamacro/clash/tunnel/statistic" | <mask> "net/http"
<mask> "strconv"
<mask> "time"
<mask>
<mask> T "github.com/Dreamacro/clash/tunnel"
<mask> "github.com/gorilla/websocket"
<mask>
<mask> "github.com/go-chi/chi"
<mask> "github.com/go-chi/render"
<mask> )
</s> Refactor: make inbound request contextual </s> remove T "github.com/Dreamacro/clash/tunnel"
</s> add "github.com/Dreamacro/clash/tunnel/statistic" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | hub/route/connections.go |
snapshot := statistic.DefaultManager.Snapshot() | <mask> }
<mask>
<mask> func getConnections(w http.ResponseWriter, r *http.Request) {
<mask> if !websocket.IsWebSocketUpgrade(r) {
<mask> snapshot := T.DefaultManager.Snapshot()
<mask> render.JSON(w, r, snapshot)
<mask> return
<mask> }
<mask>
<mask> conn, err := upgrader.Upgrade(w, r, nil)
</s> Refactor: make inbound request contextual </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove if len(r.Question) == 0 {
</s> add msg, err := handlerWithContext(s.handler, r)
if err != nil { </s> remove return &SocketAdapter{
metadata: metadata,
Conn: conn,
}
</s> add return context.NewConnContext(conn, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | hub/route/connections.go |
snapshot := statistic.DefaultManager.Snapshot() | <mask>
<mask> buf := &bytes.Buffer{}
<mask> sendSnapshot := func() error {
<mask> buf.Reset()
<mask> snapshot := T.DefaultManager.Snapshot()
<mask> if err := json.NewEncoder(buf).Encode(snapshot); err != nil {
<mask> return err
<mask> }
<mask>
<mask> return conn.WriteMessage(websocket.TextMessage, buf.Bytes())
</s> Refactor: make inbound request contextual </s> remove t := T.DefaultManager
</s> add t := statistic.DefaultManager </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove msg, err := next(r)
</s> add msg, err := next(ctx, r) </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | hub/route/connections.go |
snapshot := statistic.DefaultManager.Snapshot() | <mask> }
<mask>
<mask> func closeConnection(w http.ResponseWriter, r *http.Request) {
<mask> id := chi.URLParam(r, "id")
<mask> snapshot := T.DefaultManager.Snapshot()
<mask> for _, c := range snapshot.Connections {
<mask> if id == c.ID() {
<mask> c.Close()
<mask> break
<mask> }
</s> Refactor: make inbound request contextual </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove func (r *Resolver) msgToIP(msg *D.Msg) []net.IP {
ips := []net.IP{}
for _, answer := range msg.Answer {
switch ans := answer.(type) {
case *D.AAAA:
ips = append(ips, ans.AAAA)
case *D.A:
ips = append(ips, ans.A)
}
}
return ips
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | hub/route/connections.go |
snapshot := statistic.DefaultManager.Snapshot() | <mask> render.NoContent(w, r)
<mask> }
<mask>
<mask> func closeAllConnections(w http.ResponseWriter, r *http.Request) {
<mask> snapshot := T.DefaultManager.Snapshot()
<mask> for _, c := range snapshot.Connections {
<mask> c.Close()
<mask> }
<mask> render.NoContent(w, r)
<mask> }
</s> Refactor: make inbound request contextual </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove func (r *Resolver) msgToIP(msg *D.Msg) []net.IP {
ips := []net.IP{}
for _, answer := range msg.Answer {
switch ans := answer.(type) {
case *D.AAAA:
ips = append(ips, ans.AAAA)
case *D.A:
ips = append(ips, ans.A)
}
}
return ips
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | hub/route/connections.go |
"github.com/Dreamacro/clash/tunnel/statistic" | <mask> "time"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> T "github.com/Dreamacro/clash/tunnel"
<mask>
<mask> "github.com/go-chi/chi"
<mask> "github.com/go-chi/cors"
<mask> "github.com/go-chi/render"
<mask> "github.com/gorilla/websocket"
</s> Refactor: make inbound request contextual </s> remove T "github.com/Dreamacro/clash/tunnel"
</s> add "github.com/Dreamacro/clash/tunnel/statistic" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | hub/route/server.go |
t := statistic.DefaultManager | <mask> }
<mask>
<mask> tick := time.NewTicker(time.Second)
<mask> defer tick.Stop()
<mask> t := T.DefaultManager
<mask> buf := &bytes.Buffer{}
<mask> var err error
<mask> for range tick.C {
<mask> buf.Reset()
<mask> up, down := t.Now()
</s> Refactor: make inbound request contextual </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove metadata := localConn.Metadata()
</s> add metadata := ctx.Metadata() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | hub/route/server.go |
"github.com/Dreamacro/clash/context" | <mask> "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
<mask> req := ctx.Request()
</s> Refactor: make inbound request contextual </s> remove func handleHTTP(request *inbound.HTTPAdapter, outbound net.Conn) {
req := request.R
</s> add func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn() </s> remove inboundReader := bufio.NewReader(request)
</s> add inboundReader := bufio.NewReader(conn) </s> remove func handleSocket(request C.ServerAdapter, outbound net.Conn) {
relay(request, outbound)
</s> add func handleSocket(ctx C.ConnContext, outbound net.Conn) {
relay(ctx.Conn(), outbound) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/connection.go |
func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn() | <mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> func handleHTTP(request *inbound.HTTPAdapter, outbound net.Conn) {
<mask> req := request.R
<mask> host := req.Host
<mask>
<mask> inboundReader := bufio.NewReader(request)
<mask> outboundReader := bufio.NewReader(outbound)
<mask>
</s> Refactor: make inbound request contextual </s> remove inboundReader := bufio.NewReader(request)
</s> add inboundReader := bufio.NewReader(conn) </s> remove func handleSocket(request C.ServerAdapter, outbound net.Conn) {
relay(request, outbound)
</s> add func handleSocket(ctx C.ConnContext, outbound net.Conn) {
relay(ctx.Conn(), outbound) </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/connection.go |
inboundReader := bufio.NewReader(conn) | <mask> func handleHTTP(request *inbound.HTTPAdapter, outbound net.Conn) {
<mask> req := request.R
<mask> host := req.Host
<mask>
<mask> inboundReader := bufio.NewReader(request)
<mask> outboundReader := bufio.NewReader(outbound)
<mask>
<mask> for {
<mask> keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
<mask>
</s> Refactor: make inbound request contextual </s> remove func handleHTTP(request *inbound.HTTPAdapter, outbound net.Conn) {
req := request.R
</s> add func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn() </s> remove func handleSocket(request C.ServerAdapter, outbound net.Conn) {
relay(request, outbound)
</s> add func handleSocket(ctx C.ConnContext, outbound net.Conn) {
relay(ctx.Conn(), outbound) </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/connection.go |
err = resp.Write(conn) | <mask> }
<mask> inbound.RemoveHopByHopHeaders(resp.Header)
<mask>
<mask> if resp.StatusCode == http.StatusContinue {
<mask> err = resp.Write(request)
<mask> if err != nil {
<mask> break
<mask> }
<mask> goto handleResponse
<mask> }
</s> Refactor: make inbound request contextual </s> remove err = resp.Write(request)
</s> add err = resp.Write(conn) </s> remove return proxy, rule, nil
</s> add return </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) </s> remove _, err = io.CopyBuffer(request, resp.Body, buf)
</s> add _, err = io.CopyBuffer(conn, resp.Body, buf) </s> remove if len(r.Question) == 0 {
</s> add msg, err := handlerWithContext(s.handler, r)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/connection.go |
err = resp.Write(conn) | <mask> resp.Close = false
<mask> } else {
<mask> resp.Close = true
<mask> }
<mask> err = resp.Write(request)
<mask> if err != nil || resp.Close {
<mask> break
<mask> }
<mask>
<mask> // even if resp.Write write body to the connection, but some http request have to Copy to close it
</s> Refactor: make inbound request contextual </s> remove _, err = io.CopyBuffer(request, resp.Body, buf)
</s> add _, err = io.CopyBuffer(conn, resp.Body, buf) </s> remove err = resp.Write(request)
</s> add err = resp.Write(conn) </s> remove func Add(req C.ServerAdapter) {
tcpQueue <- req
</s> add func Add(ctx C.ConnContext) {
tcpQueue <- ctx </s> remove if ips := r.msgToIP(res.Msg); len(ips) != 0 {
</s> add if ips := msgToIP(res.Msg); len(ips) != 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/connection.go |
_, err = io.CopyBuffer(conn, resp.Body, buf) | <mask> }
<mask>
<mask> // even if resp.Write write body to the connection, but some http request have to Copy to close it
<mask> buf := pool.Get(pool.RelayBufferSize)
<mask> _, err = io.CopyBuffer(request, resp.Body, buf)
<mask> pool.Put(buf)
<mask> if err != nil && err != io.EOF {
<mask> break
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove err = resp.Write(request)
</s> add err = resp.Write(conn) </s> remove if ips := r.msgToIP(res.Msg); len(ips) != 0 {
</s> add if ips := msgToIP(res.Msg); len(ips) != 0 { </s> remove func Add(req C.ServerAdapter) {
tcpQueue <- req
</s> add func Add(ctx C.ConnContext) {
tcpQueue <- ctx </s> remove err = resp.Write(request)
</s> add err = resp.Write(conn) </s> remove snapshot := T.DefaultManager.Snapshot()
</s> add snapshot := statistic.DefaultManager.Snapshot() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/connection.go |
func handleSocket(ctx C.ConnContext, outbound net.Conn) {
relay(ctx.Conn(), outbound) | <mask> }
<mask> }
<mask> }
<mask>
<mask> func handleSocket(request C.ServerAdapter, outbound net.Conn) {
<mask> relay(request, outbound)
<mask> }
<mask>
<mask> // relay copies between left and right bidirectionally.
<mask> func relay(leftConn, rightConn net.Conn) {
<mask> ch := make(chan error)
</s> Refactor: make inbound request contextual </s> remove func handleHTTP(request *inbound.HTTPAdapter, outbound net.Conn) {
req := request.R
</s> add func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn() </s> remove // HTTPAdapter is a adapter for HTTP connection
type HTTPAdapter struct {
net.Conn
metadata *C.Metadata
R *http.Request
}
// Metadata return destination metadata
func (h *HTTPAdapter) Metadata() *C.Metadata {
return h.metadata
}
// NewHTTP is HTTPAdapter generator
func NewHTTP(request *http.Request, conn net.Conn) *HTTPAdapter {
</s> add // NewHTTP recieve normal http request and return HTTPContext
func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext { </s> remove // NewHTTPS is HTTPAdapter generator
func NewHTTPS(request *http.Request, conn net.Conn) *SocketAdapter {
</s> add // NewHTTPS recieve CONNECT request and return ConnContext
func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext { </s> remove inboundReader := bufio.NewReader(request)
</s> add inboundReader := bufio.NewReader(conn) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/connection.go |
"github.com/Dreamacro/clash/context" | <mask> "github.com/Dreamacro/clash/adapters/provider"
<mask> "github.com/Dreamacro/clash/component/nat"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/tunnel/statistic"
<mask> )
<mask>
<mask> var (
</s> Refactor: make inbound request contextual </s> remove T "github.com/Dreamacro/clash/tunnel"
</s> add "github.com/Dreamacro/clash/tunnel/statistic" </s> remove tcpQueue = make(chan C.ServerAdapter, 200)
</s> add tcpQueue = make(chan C.ConnContext, 200) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
"github.com/Dreamacro/clash/tunnel/statistic" | <mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var (
<mask> tcpQueue = make(chan C.ConnContext, 200)
<mask> udpQueue = make(chan *inbound.PacketAdapter, 200)
<mask> natTable = nat.New()
</s> Refactor: make inbound request contextual </s> remove tcpQueue = make(chan C.ServerAdapter, 200)
</s> add tcpQueue = make(chan C.ConnContext, 200) </s> remove func handleSocket(request C.ServerAdapter, outbound net.Conn) {
relay(request, outbound)
</s> add func handleSocket(ctx C.ConnContext, outbound net.Conn) {
relay(ctx.Conn(), outbound) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
tcpQueue = make(chan C.ConnContext, 200) | <mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var (
<mask> tcpQueue = make(chan C.ServerAdapter, 200)
<mask> udpQueue = make(chan *inbound.PacketAdapter, 200)
<mask> natTable = nat.New()
<mask> rules []C.Rule
<mask> proxies = make(map[string]C.Proxy)
<mask> providers map[string]provider.ProxyProvider
</s> Refactor: make inbound request contextual </s> remove func handleSocket(request C.ServerAdapter, outbound net.Conn) {
relay(request, outbound)
</s> add func handleSocket(ctx C.ConnContext, outbound net.Conn) {
relay(ctx.Conn(), outbound) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
func Add(ctx C.ConnContext) {
tcpQueue <- ctx | <mask> go process()
<mask> }
<mask>
<mask> // Add request to queue
<mask> func Add(req C.ServerAdapter) {
<mask> tcpQueue <- req
<mask> }
<mask>
<mask> // AddPacket add udp Packet to queue
<mask> func AddPacket(packet *inbound.PacketAdapter) {
<mask> select {
</s> Refactor: make inbound request contextual </s> remove err = resp.Write(request)
</s> add err = resp.Write(conn) </s> remove _, err = io.CopyBuffer(request, resp.Body, buf)
</s> add _, err = io.CopyBuffer(conn, resp.Body, buf) </s> remove if err != nil {
return nil, nil, err
}
</s> add </s> remove return proxy, rule, nil
</s> add return </s> remove func handleTCPConn(localConn C.ServerAdapter) {
defer localConn.Close()
</s> add func handleTCPConn(ctx C.ConnContext) {
defer ctx.Conn().Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
func resolveMetadata(ctx C.PlainContext, metadata *C.Metadata) (proxy C.Proxy, rule C.Rule, err error) { | <mask>
<mask> return nil
<mask> }
<mask>
<mask> func resolveMetadata(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
<mask> var proxy C.Proxy
<mask> var rule C.Rule
<mask> switch mode {
<mask> case Direct:
<mask> proxy = proxies["DIRECT"]
<mask> case Global:
<mask> proxy = proxies["GLOBAL"]
</s> Refactor: make inbound request contextual </s> remove var err error
</s> add </s> remove switch adapter := localConn.(type) {
case *inbound.HTTPAdapter:
handleHTTP(adapter, remoteConn)
case *inbound.SocketAdapter:
handleSocket(adapter, remoteConn)
</s> add switch c := ctx.(type) {
case *context.HTTPContext:
handleHTTP(c, remoteConn)
default:
handleSocket(ctx, remoteConn) </s> remove pc := newUDPTracker(rawPc, DefaultManager, metadata, rule)
</s> add ctx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule) </s> remove func (r *Resolver) msgToIP(msg *D.Msg) []net.IP {
ips := []net.IP{}
for _, answer := range msg.Answer {
switch ans := answer.(type) {
case *D.AAAA:
ips = append(ips, ans.AAAA)
case *D.A:
ips = append(ips, ans.A)
}
}
return ips
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
<mask> case Global:
<mask> proxy = proxies["GLOBAL"]
<mask> // Rule
<mask> default:
<mask> var err error
<mask> proxy, rule, err = match(metadata)
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask> }
</s> Refactor: make inbound request contextual </s> remove if err != nil {
return nil, nil, err
}
</s> add </s> remove return proxy, rule, nil
</s> add return </s> remove func resolveMetadata(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
var proxy C.Proxy
var rule C.Rule
</s> add func resolveMetadata(ctx C.PlainContext, metadata *C.Metadata) (proxy C.Proxy, rule C.Rule, err error) { </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.