docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata) | <mask> Name string `proxy:"name"`
<mask> Proxies []string `proxy:"proxies"`
<mask> }
<mask>
<mask> func (s *Selector) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> return s.selected.Generator(metadata)
<mask> }
<mask>
<mask> func (s *Selector) MarshalJSON() ([]byte, error) {
<mask> var all []string
<mask> for k := range s.proxies {
</s> Style: rename `Generator` with `Dial` </s> remove return lb.proxies[0].Generator(metadata)
</s> add return lb.proxies[0].Dial(metadata) </s> remove return f.proxies[0].RawProxy.Generator(metadata)
</s> add return f.proxies[0].RawProxy.Dial(metadata) </s> remove func (f *Fallback) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove func (r *Reject) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (r *Reject) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/selector.go |
func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask> TLS bool `obfs:"tls,omitempty"`
<mask> SkipCertVerify bool `obfs:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (ss *ShadowSocks) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := net.DialTimeout("tcp", ss.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
<mask> }
<mask> tcpKeepAlive(c)
</s> Style: rename `Generator` with `Dial` </s> remove func (v *Vmess) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (h *Http) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove remoConn, err := proxy.Generator(metadata)
</s> add remoConn, err := proxy.Dial(metadata) </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/shadowsocks.go |
func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask> TLS bool `proxy:"tls,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := net.DialTimeout("tcp", ss.addr, tcpTimeout)
<mask>
<mask> if err == nil && ss.tls {
<mask> cc := tls.Client(c, ss.tlsConfig)
<mask> err = cc.Handshake()
</s> Style: rename `Generator` with `Dial` </s> remove func (h *Http) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *ShadowSocks) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (v *Vmess) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/socks5.go |
func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) | <mask> func (u *URLTest) Now() string {
<mask> return u.fast.Name()
<mask> }
<mask>
<mask> func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> a, err := u.fast.Generator(metadata)
<mask> if err != nil {
<mask> go u.speedTest()
<mask> }
<mask> return a, err
<mask> }
</s> Style: rename `Generator` with `Dial` </s> remove func (v *Vmess) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *ShadowSocks) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (s *Selector) Generator(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Generator(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata) </s> remove func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/urltest.go |
instance, err := proxy.Dial(&addr) | <mask> return
<mask> }
<mask>
<mask> start := time.Now()
<mask> instance, err := proxy.Generator(&addr)
<mask> if err != nil {
<mask> return
<mask> }
<mask> defer instance.Close()
<mask> transport := &http.Transport{
</s> Style: rename `Generator` with `Dial` </s> remove remoConn, err := proxy.Generator(metadata)
</s> add remoConn, err := proxy.Dial(metadata) </s> remove if proxy, err := lb.proxies[idx].Generator(metadata); err == nil {
</s> add if proxy, err := lb.proxies[idx].Dial(metadata); err == nil { </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove adapter, err := proxy.RawProxy.Generator(metadata)
</s> add adapter, err := proxy.RawProxy.Dial(metadata) </s> remove func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/util.go |
func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) { | <mask> WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (v *Vmess) Generator(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := net.DialTimeout("tcp", v.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
</s> Style: rename `Generator` with `Dial` </s> remove func (ss *ShadowSocks) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *Socks5) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (h *Http) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove func (lb *LoadBalance) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | adapters/outbound/vmess.go |
Dial(metadata *Metadata) (net.Conn, error) | <mask>
<mask> type Proxy interface {
<mask> Name() string
<mask> Type() AdapterType
<mask> Generator(metadata *Metadata) (net.Conn, error)
<mask> MarshalJSON() ([]byte, error)
<mask> }
<mask>
<mask> // AdapterType is enum of adapter type
<mask> type AdapterType int
</s> Style: rename `Generator` with `Dial` </s> remove func (r *Reject) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (r *Reject) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (d *Direct) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (d *Direct) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (s *Selector) Generator(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Generator(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata) </s> remove return lb.proxies[0].Generator(metadata)
</s> add return lb.proxies[0].Dial(metadata) </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | constant/adapters.go |
remoConn, err := proxy.Dial(metadata) | <mask> return
<mask> }
<mask> }
<mask>
<mask> remoConn, err := proxy.Generator(metadata)
<mask> if err != nil {
<mask> log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SourceIP.String(), metadata.String(), err.Error())
<mask> return
<mask> }
<mask> defer remoConn.Close()
</s> Style: rename `Generator` with `Dial` </s> remove func (ss *ShadowSocks) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove instance, err := proxy.Generator(&addr)
</s> add instance, err := proxy.Dial(&addr) </s> remove func (v *Vmess) Generator(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) { </s> remove func (u *URLTest) Generator(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Generator(metadata)
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
a, err := u.fast.Dial(metadata) </s> remove if proxy, err := lb.proxies[idx].Generator(metadata); err == nil {
</s> add if proxy, err := lb.proxies[idx].Dial(metadata); err == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7683271fe6bd8dea6b6d449d52aff255079817d8 | tunnel/tunnel.go |
bin/* | <mask> *.exe~
<mask> *.dll
<mask> *.so
<mask> *.dylib
<mask>
<mask> # Test binary, build with `go test -c`
<mask> *.test
<mask>
<mask> # Output of the go coverage tool, specifically when used with LiteIDE
</s> Chore: add more platform release (#83) </s> remove linux:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> add WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used </s> remove all: linux macos freebsd win64
</s> add PLATFORM_LIST = \
darwin-amd64 \
linux-386 \
linux-amd64 \
linux-armv5 \
linux-armv6 \
linux-armv7 \
linux-armv8 \
linux-mips-softfloat \
linux-mips-hardfloat \
linux-mipsle \
linux-mips64 \
linux-mips64le \
freebsd-386 \
freebsd-amd64 </s> remove releases: linux macos freebsd win64
chmod +x $(BINDIR)/$(NAME)-*
gzip $(BINDIR)/$(NAME)-linux
gzip $(BINDIR)/$(NAME)-macos
gzip $(BINDIR)/$(NAME)-freebsd
zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
</s> add windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) </s> remove win64:
</s> add windows-386: | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | .gitignore |
PLATFORM_LIST = \
darwin-amd64 \
linux-386 \
linux-amd64 \
linux-armv5 \
linux-armv6 \
linux-armv7 \
linux-armv8 \
linux-mips-softfloat \
linux-mips-hardfloat \
linux-mipsle \
linux-mips64 \
linux-mips64le \
freebsd-386 \
freebsd-amd64 | <mask> NAME=clash
<mask> BINDIR=bin
<mask> GOBUILD=CGO_ENABLED=0 go build -ldflags '-w -s'
<mask>
<mask> all: linux macos freebsd win64
<mask>
<mask> linux:
<mask> GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> macos:
</s> Chore: add more platform release (#83) </s> remove linux:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> add WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used </s> remove macos:
</s> add darwin-amd64: </s> remove freebsd:
</s> add linux-386:
GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-amd64:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv5:
GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv6:
GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv7:
GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv8:
GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-softfloat:
GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-hardfloat:
GOARCH=mips GOMIPS=hardfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mipsle:
GOARCH=mipsle GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64:
GOARCH=mips64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64le:
GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-386:
GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-amd64: </s> remove win64:
</s> add windows-386: </s> remove releases: linux macos freebsd win64
chmod +x $(BINDIR)/$(NAME)-*
gzip $(BINDIR)/$(NAME)-linux
gzip $(BINDIR)/$(NAME)-macos
gzip $(BINDIR)/$(NAME)-freebsd
zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
</s> add windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | Makefile |
WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used | <mask> GOBUILD=CGO_ENABLED=0 go build -ldflags '-w -s'
<mask>
<mask> all: linux macos freebsd win64
<mask>
<mask> linux:
<mask> GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> macos:
<mask> GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> freebsd:
</s> Chore: add more platform release (#83) </s> remove all: linux macos freebsd win64
</s> add PLATFORM_LIST = \
darwin-amd64 \
linux-386 \
linux-amd64 \
linux-armv5 \
linux-armv6 \
linux-armv7 \
linux-armv8 \
linux-mips-softfloat \
linux-mips-hardfloat \
linux-mipsle \
linux-mips64 \
linux-mips64le \
freebsd-386 \
freebsd-amd64 </s> remove macos:
</s> add darwin-amd64: </s> remove freebsd:
</s> add linux-386:
GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-amd64:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv5:
GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv6:
GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv7:
GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv8:
GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-softfloat:
GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-hardfloat:
GOARCH=mips GOMIPS=hardfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mipsle:
GOARCH=mipsle GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64:
GOARCH=mips64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64le:
GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-386:
GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-amd64: </s> remove win64:
</s> add windows-386: </s> remove releases: linux macos freebsd win64
chmod +x $(BINDIR)/$(NAME)-*
gzip $(BINDIR)/$(NAME)-linux
gzip $(BINDIR)/$(NAME)-macos
gzip $(BINDIR)/$(NAME)-freebsd
zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
</s> add windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | Makefile |
darwin-amd64: | <mask>
<mask> linux:
<mask> GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> macos:
<mask> GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> freebsd:
<mask> GOARCH=amd64 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
</s> Chore: add more platform release (#83) </s> remove freebsd:
</s> add linux-386:
GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-amd64:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv5:
GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv6:
GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv7:
GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv8:
GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-softfloat:
GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-hardfloat:
GOARCH=mips GOMIPS=hardfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mipsle:
GOARCH=mipsle GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64:
GOARCH=mips64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64le:
GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-386:
GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-amd64: </s> remove linux:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> add WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used </s> remove win64:
</s> add windows-386: </s> remove all: linux macos freebsd win64
</s> add PLATFORM_LIST = \
darwin-amd64 \
linux-386 \
linux-amd64 \
linux-armv5 \
linux-armv6 \
linux-armv7 \
linux-armv8 \
linux-mips-softfloat \
linux-mips-hardfloat \
linux-mipsle \
linux-mips64 \
linux-mips64le \
freebsd-386 \
freebsd-amd64 </s> remove releases: linux macos freebsd win64
chmod +x $(BINDIR)/$(NAME)-*
gzip $(BINDIR)/$(NAME)-linux
gzip $(BINDIR)/$(NAME)-macos
gzip $(BINDIR)/$(NAME)-freebsd
zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
</s> add windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | Makefile |
linux-386:
GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-amd64:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv5:
GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv6:
GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv7:
GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv8:
GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-softfloat:
GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-hardfloat:
GOARCH=mips GOMIPS=hardfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mipsle:
GOARCH=mipsle GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64:
GOARCH=mips64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64le:
GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-386:
GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-amd64: | <mask>
<mask> macos:
<mask> GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> freebsd:
<mask> GOARCH=amd64 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> win64:
<mask> GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
<mask>
</s> Chore: add more platform release (#83) </s> remove macos:
</s> add darwin-amd64: </s> remove win64:
</s> add windows-386: </s> remove linux:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> add WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used </s> remove releases: linux macos freebsd win64
chmod +x $(BINDIR)/$(NAME)-*
gzip $(BINDIR)/$(NAME)-linux
gzip $(BINDIR)/$(NAME)-macos
gzip $(BINDIR)/$(NAME)-freebsd
zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
</s> add windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) </s> remove all: linux macos freebsd win64
</s> add PLATFORM_LIST = \
darwin-amd64 \
linux-386 \
linux-amd64 \
linux-armv5 \
linux-armv6 \
linux-armv7 \
linux-armv8 \
linux-mips-softfloat \
linux-mips-hardfloat \
linux-mipsle \
linux-mips64 \
linux-mips64le \
freebsd-386 \
freebsd-amd64 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | Makefile |
windows-386: | <mask>
<mask> freebsd:
<mask> GOARCH=amd64 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
<mask>
<mask> win64:
<mask> GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
<mask>
<mask> releases: linux macos freebsd win64
<mask> chmod +x $(BINDIR)/$(NAME)-*
<mask> gzip $(BINDIR)/$(NAME)-linux
</s> Chore: add more platform release (#83) </s> remove releases: linux macos freebsd win64
chmod +x $(BINDIR)/$(NAME)-*
gzip $(BINDIR)/$(NAME)-linux
gzip $(BINDIR)/$(NAME)-macos
gzip $(BINDIR)/$(NAME)-freebsd
zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
</s> add windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) </s> remove freebsd:
</s> add linux-386:
GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-amd64:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv5:
GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv6:
GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv7:
GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv8:
GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-softfloat:
GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-hardfloat:
GOARCH=mips GOMIPS=hardfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mipsle:
GOARCH=mipsle GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64:
GOARCH=mips64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64le:
GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-386:
GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-amd64: </s> remove macos:
</s> add darwin-amd64: </s> remove linux:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> add WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used </s> remove all: linux macos freebsd win64
</s> add PLATFORM_LIST = \
darwin-amd64 \
linux-386 \
linux-amd64 \
linux-armv5 \
linux-armv6 \
linux-armv7 \
linux-armv8 \
linux-mips-softfloat \
linux-mips-hardfloat \
linux-mipsle \
linux-mips64 \
linux-mips64le \
freebsd-386 \
freebsd-amd64 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | Makefile |
windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) | <mask>
<mask> win64:
<mask> GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
<mask>
<mask> releases: linux macos freebsd win64
<mask> chmod +x $(BINDIR)/$(NAME)-*
<mask> gzip $(BINDIR)/$(NAME)-linux
<mask> gzip $(BINDIR)/$(NAME)-macos
<mask> gzip $(BINDIR)/$(NAME)-freebsd
<mask> zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
<mask>
<mask> clean:
<mask> rm $(BINDIR)/*
</s> Chore: add more platform release (#83) </s> remove win64:
</s> add windows-386: </s> remove freebsd:
</s> add linux-386:
GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-amd64:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv5:
GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv6:
GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv7:
GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv8:
GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-softfloat:
GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-hardfloat:
GOARCH=mips GOMIPS=hardfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mipsle:
GOARCH=mipsle GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64:
GOARCH=mips64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64le:
GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-386:
GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-amd64: </s> remove macos:
</s> add darwin-amd64: </s> remove linux:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> add WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | Makefile |
releases: $(gz_releases) $(zip_releases) | <mask> zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
<mask>
<mask> all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST)
<mask>
<mask> clean:
<mask> rm $(BINDIR)/*
</s> Chore: add more platform release (#83) </s> remove releases: linux macos freebsd win64
chmod +x $(BINDIR)/$(NAME)-*
gzip $(BINDIR)/$(NAME)-linux
gzip $(BINDIR)/$(NAME)-macos
gzip $(BINDIR)/$(NAME)-freebsd
zip -m -j $(BINDIR)/$(NAME)-win64.zip $(BINDIR)/$(NAME)-win64.exe
</s> add windows-amd64:
GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))
$(gz_releases): %.gz : %
chmod +x $(BINDIR)/$(NAME)-$(basename $@)
gzip -f $(BINDIR)/$(NAME)-$(basename $@)
$(zip_releases): %.zip : %
zip -m -j $(BINDIR)/$(NAME)-$(basename $@).zip $(BINDIR)/$(NAME)-$(basename $@).exe
all-arch: $(PLATFORM_LIST) $(WINDOWS_ARCH_LIST) </s> remove win64:
</s> add windows-386: </s> remove freebsd:
</s> add linux-386:
GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-amd64:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv5:
GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv6:
GOARCH=arm GOOS=linux GOARM=6 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv7:
GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-armv8:
GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-softfloat:
GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips-hardfloat:
GOARCH=mips GOMIPS=hardfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mipsle:
GOARCH=mipsle GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64:
GOARCH=mips64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
linux-mips64le:
GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-386:
GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
freebsd-amd64: </s> remove macos:
</s> add darwin-amd64: </s> remove linux:
GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
</s> add WINDOWS_ARCH_LIST = \
windows-386 \
windows-amd64
all: linux-amd64 darwin-amd64 windows-amd64 # Most used | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7768c5b933e080b787e7a83ba900c63a9f764538 | Makefile |
"fmt" | <mask> "encoding/binary"
<mask> "errors"
<mask> "io"
<mask> "net"
<mask> "sync"
<mask>
</s> Fix: handle snell server reported error message properly (#848) </s> remove return 0, errors.New(string(msg))
</s> add return 0, fmt.Errorf("server reported code: %d, message: %s", errcode, string(msg)) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/77d6f9ae6f12a14f5e69146a2ff10b7e80bc476a | component/snell/snell.go |
// 1 byte error code | <mask>
<mask> // CommandError
<mask> if _, err := io.ReadFull(s.Conn, s.buffer[:]); err != nil {
<mask> return 0, err
<mask> }
<mask> errcode := int(s.buffer[0])
<mask>
<mask> // 1 byte error message length
</s> Fix: handle snell server reported error message properly (#848) </s> remove return 0, errors.New(string(msg))
</s> add return 0, fmt.Errorf("server reported code: %d, message: %s", errcode, string(msg)) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/77d6f9ae6f12a14f5e69146a2ff10b7e80bc476a | component/snell/snell.go |
errcode := int(s.buffer[0]) | <mask> // 1 byte error code
<mask> if _, err := io.ReadFull(s.Conn, s.buffer[:]); err != nil {
<mask> return 0, err
<mask> }
<mask>
<mask> // 1 byte error message length
<mask> if _, err := io.ReadFull(s.Conn, s.buffer[:]); err != nil {
<mask> return 0, err
<mask> }
</s> Fix: handle snell server reported error message properly (#848) </s> remove return 0, errors.New(string(msg))
</s> add return 0, fmt.Errorf("server reported code: %d, message: %s", errcode, string(msg)) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/77d6f9ae6f12a14f5e69146a2ff10b7e80bc476a | component/snell/snell.go |
// 1 byte error message length
if _, err := io.ReadFull(s.Conn, s.buffer[:]); err != nil {
return 0, err
} | <mask> }
<mask> errcode := int(s.buffer[0])
<mask>
<mask> length := int(s.buffer[0])
<mask> msg := make([]byte, length)
<mask>
<mask> if _, err := io.ReadFull(s.Conn, msg); err != nil {
<mask> return 0, err
<mask> }
</s> Fix: handle snell server reported error message properly (#848) </s> remove return 0, errors.New(string(msg))
</s> add return 0, fmt.Errorf("server reported code: %d, message: %s", errcode, string(msg)) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/77d6f9ae6f12a14f5e69146a2ff10b7e80bc476a | component/snell/snell.go |
return 0, fmt.Errorf("server reported code: %d, message: %s", errcode, string(msg)) | <mask> if _, err := io.ReadFull(s.Conn, msg); err != nil {
<mask> return 0, err
<mask> }
<mask>
<mask> return 0, errors.New(string(msg))
<mask> }
<mask>
<mask> func WriteHeader(conn net.Conn, host string, port uint) error {
<mask> buf := bufferPool.Get().(*bytes.Buffer)
<mask> buf.Reset()
</s> Fix: handle snell server reported error message properly (#848) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/77d6f9ae6f12a14f5e69146a2ff10b7e80bc476a | component/snell/snell.go |
ShouldResolveIP() bool | <mask> RuleType() RuleType
<mask> Match(metadata *Metadata) bool
<mask> Adapter() string
<mask> Payload() string
<mask> NoResolveIP() bool
<mask> }
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (f *Match) NoResolveIP() bool {
return true
</s> add func (f *Match) ShouldResolveIP() bool {
return false </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false </s> remove func (dk *DomainKeyword) NoResolveIP() bool {
return true
</s> add func (dk *DomainKeyword) ShouldResolveIP() bool {
return false </s> remove func (d *Domain) NoResolveIP() bool {
return true
</s> add func (d *Domain) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | constant/rule.go |
func (d *Domain) ShouldResolveIP() bool {
return false | <mask> func (d *Domain) Payload() string {
<mask> return d.domain
<mask> }
<mask>
<mask> func (d *Domain) NoResolveIP() bool {
<mask> return true
<mask> }
<mask>
<mask> func NewDomain(domain string, adapter string) *Domain {
<mask> return &Domain{
<mask> domain: strings.ToLower(domain),
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false </s> remove func (dk *DomainKeyword) NoResolveIP() bool {
return true
</s> add func (dk *DomainKeyword) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (f *Match) NoResolveIP() bool {
return true
</s> add func (f *Match) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/domain.go |
func (dk *DomainKeyword) ShouldResolveIP() bool {
return false | <mask> func (dk *DomainKeyword) Payload() string {
<mask> return dk.keyword
<mask> }
<mask>
<mask> func (dk *DomainKeyword) NoResolveIP() bool {
<mask> return true
<mask> }
<mask>
<mask> func NewDomainKeyword(keyword string, adapter string) *DomainKeyword {
<mask> return &DomainKeyword{
<mask> keyword: strings.ToLower(keyword),
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false </s> remove func (d *Domain) NoResolveIP() bool {
return true
</s> add func (d *Domain) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (f *Match) NoResolveIP() bool {
return true
</s> add func (f *Match) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/domain_keyword.go |
func (ds *DomainSuffix) ShouldResolveIP() bool {
return false | <mask> func (ds *DomainSuffix) Payload() string {
<mask> return ds.suffix
<mask> }
<mask>
<mask> func (ds *DomainSuffix) NoResolveIP() bool {
<mask> return true
<mask> }
<mask>
<mask> func NewDomainSuffix(suffix string, adapter string) *DomainSuffix {
<mask> return &DomainSuffix{
<mask> suffix: strings.ToLower(suffix),
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (dk *DomainKeyword) NoResolveIP() bool {
return true
</s> add func (dk *DomainKeyword) ShouldResolveIP() bool {
return false </s> remove func (d *Domain) NoResolveIP() bool {
return true
</s> add func (d *Domain) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (f *Match) NoResolveIP() bool {
return true
</s> add func (f *Match) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/domain_suffix.go |
func (f *Match) ShouldResolveIP() bool {
return false | <mask> func (f *Match) Payload() string {
<mask> return ""
<mask> }
<mask>
<mask> func (f *Match) NoResolveIP() bool {
<mask> return true
<mask> }
<mask>
<mask> func NewMatch(adapter string) *Match {
<mask> return &Match{
<mask> adapter: adapter,
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false </s> remove func (dk *DomainKeyword) NoResolveIP() bool {
return true
</s> add func (dk *DomainKeyword) ShouldResolveIP() bool {
return false </s> remove func (d *Domain) NoResolveIP() bool {
return true
</s> add func (d *Domain) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/final.go |
func (g *GEOIP) ShouldResolveIP() bool {
return !g.noResolveIP | <mask> func (g *GEOIP) Payload() string {
<mask> return g.country
<mask> }
<mask>
<mask> func (g *GEOIP) NoResolveIP() bool {
<mask> return g.noResolveIP
<mask> }
<mask>
<mask> func NewGEOIP(country string, adapter string, noResolveIP bool) *GEOIP {
<mask> geoip := &GEOIP{
<mask> country: country,
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (p *Port) NoResolveIP() bool {
return true
</s> add func (p *Port) ShouldResolveIP() bool {
return false </s> remove func (i *IPCIDR) NoResolveIP() bool {
return i.noResolveIP
</s> add func (i *IPCIDR) ShouldResolveIP() bool {
return !i.noResolveIP </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false </s> remove func (dk *DomainKeyword) NoResolveIP() bool {
return true
</s> add func (dk *DomainKeyword) ShouldResolveIP() bool {
return false </s> remove func (d *Domain) NoResolveIP() bool {
return true
</s> add func (d *Domain) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/geoip.go |
func (i *IPCIDR) ShouldResolveIP() bool {
return !i.noResolveIP | <mask> func (i *IPCIDR) Payload() string {
<mask> return i.ipnet.String()
<mask> }
<mask>
<mask> func (i *IPCIDR) NoResolveIP() bool {
<mask> return i.noResolveIP
<mask> }
<mask>
<mask> func NewIPCIDR(s string, adapter string, opts ...IPCIDROption) (*IPCIDR, error) {
<mask> _, ipnet, err := net.ParseCIDR(s)
<mask> if err != nil {
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (p *Port) NoResolveIP() bool {
return true
</s> add func (p *Port) ShouldResolveIP() bool {
return false </s> remove func (g *GEOIP) NoResolveIP() bool {
return g.noResolveIP
</s> add func (g *GEOIP) ShouldResolveIP() bool {
return !g.noResolveIP </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/ipcidr.go |
func (p *Port) ShouldResolveIP() bool {
return false | <mask> func (p *Port) Payload() string {
<mask> return p.port
<mask> }
<mask>
<mask> func (p *Port) NoResolveIP() bool {
<mask> return true
<mask> }
<mask>
<mask> func NewPort(port string, adapter string, isSource bool) (*Port, error) {
<mask> _, err := strconv.Atoi(port)
<mask> if err != nil {
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (i *IPCIDR) NoResolveIP() bool {
return i.noResolveIP
</s> add func (i *IPCIDR) ShouldResolveIP() bool {
return !i.noResolveIP </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (g *GEOIP) NoResolveIP() bool {
return g.noResolveIP
</s> add func (g *GEOIP) ShouldResolveIP() bool {
return !g.noResolveIP </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/port.go |
func (p *Process) ShouldResolveIP() bool {
return false | <mask> func (p *Process) Payload() string {
<mask> return p.process
<mask> }
<mask>
<mask> func (p *Process) NoResolveIP() bool {
<mask> return true
<mask> }
<mask>
<mask> func NewProcess(process string, adapter string) (*Process, error) {
<mask> return &Process{
<mask> adapter: adapter,
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Port) NoResolveIP() bool {
return true
</s> add func (p *Port) ShouldResolveIP() bool {
return false </s> remove func (f *Match) NoResolveIP() bool {
return true
</s> add func (f *Match) ShouldResolveIP() bool {
return false </s> remove func (ds *DomainSuffix) NoResolveIP() bool {
return true
</s> add func (ds *DomainSuffix) ShouldResolveIP() bool {
return false </s> remove func (dk *DomainKeyword) NoResolveIP() bool {
return true
</s> add func (dk *DomainKeyword) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/process_darwin.go |
func (p *Process) ShouldResolveIP() bool {
return false | <mask> func (p *Process) Payload() string {
<mask> return p.process
<mask> }
<mask>
<mask> func (p *Process) NoResolveIP() bool {
<mask> return true
<mask> }
<mask>
<mask> func NewProcess(process string, adapter string) (*Process, error) {
<mask> return &Process{
<mask> adapter: adapter,
</s> Chore: rename NoResolveIP to ShouldResolveIP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | rules/process_linux.go |
return !rule.ShouldResolveIP() && metadata.Host != "" && metadata.DstIP == nil | <mask> }
<mask> }
<mask>
<mask> func shouldResolveIP(rule C.Rule, metadata *C.Metadata) bool {
<mask> return !rule.NoResolveIP() && metadata.Host != "" && metadata.DstIP == nil
<mask> }
<mask>
<mask> func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
<mask> configMux.RLock()
<mask> defer configMux.RUnlock()
</s> Chore: rename NoResolveIP to ShouldResolveIP </s> remove func (p *Port) NoResolveIP() bool {
return true
</s> add func (p *Port) ShouldResolveIP() bool {
return false </s> remove func (i *IPCIDR) NoResolveIP() bool {
return i.noResolveIP
</s> add func (i *IPCIDR) ShouldResolveIP() bool {
return !i.noResolveIP </s> remove func (f *Match) NoResolveIP() bool {
return true
</s> add func (f *Match) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false </s> remove func (p *Process) NoResolveIP() bool {
return true
</s> add func (p *Process) ShouldResolveIP() bool {
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/78c30341581ae6a4e0408a2682dbd96a44b50795 | tunnel/tunnel.go |
if !ok || value == nil { | <mask> omitempty = str[1] == "omitempty"
<mask> }
<mask>
<mask> value, ok := src[key]
<mask> if !ok {
<mask> if omitempty {
<mask> continue
<mask> }
<mask> return fmt.Errorf("key %s missing", key)
<mask> }
</s> Fix: crash when key value is nil </s> remove "'%s' expected type'%s', got unconvertible type '%s'",
</s> add "'%s' expected type '%s', got unconvertible type '%s'", </s> remove "'%s' expected type'%s', got unconvertible type '%s'",
</s> add "'%s' expected type '%s', got unconvertible type '%s'", </s> remove return fmt.Errorf("key %s missing", key)
</s> add return fmt.Errorf("key '%s' missing", key) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/791d72e05b2c4fd9c094c022a3b0ab0667c9bbdf | common/structure/structure.go |
return fmt.Errorf("key '%s' missing", key) | <mask> if !ok {
<mask> if omitempty {
<mask> continue
<mask> }
<mask> return fmt.Errorf("key %s missing", key)
<mask> }
<mask>
<mask> err := d.decode(key, value, v.Field(idx))
<mask> if err != nil {
<mask> return err
</s> Fix: crash when key value is nil </s> remove "'%s' expected type'%s', got unconvertible type '%s'",
</s> add "'%s' expected type '%s', got unconvertible type '%s'", </s> remove "'%s' expected type'%s', got unconvertible type '%s'",
</s> add "'%s' expected type '%s', got unconvertible type '%s'", </s> remove if !ok {
</s> add if !ok || value == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/791d72e05b2c4fd9c094c022a3b0ab0667c9bbdf | common/structure/structure.go |
"'%s' expected type '%s', got unconvertible type '%s'", | <mask> case kind == reflect.Int && d.option.WeaklyTypedInput:
<mask> val.SetString(strconv.FormatInt(dataVal.Int(), 10))
<mask> default:
<mask> err = fmt.Errorf(
<mask> "'%s' expected type'%s', got unconvertible type '%s'",
<mask> name, val.Type(), dataVal.Type(),
<mask> )
<mask> }
<mask> return err
<mask> }
</s> Fix: crash when key value is nil </s> remove "'%s' expected type'%s', got unconvertible type '%s'",
</s> add "'%s' expected type '%s', got unconvertible type '%s'", </s> remove return fmt.Errorf("key %s missing", key)
</s> add return fmt.Errorf("key '%s' missing", key) </s> remove if !ok {
</s> add if !ok || value == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/791d72e05b2c4fd9c094c022a3b0ab0667c9bbdf | common/structure/structure.go |
"'%s' expected type '%s', got unconvertible type '%s'", | <mask> case kind == reflect.Int && d.option.WeaklyTypedInput:
<mask> val.SetBool(dataVal.Int() != 0)
<mask> default:
<mask> err = fmt.Errorf(
<mask> "'%s' expected type'%s', got unconvertible type '%s'",
<mask> name, val.Type(), dataVal.Type(),
<mask> )
<mask> }
<mask> return err
<mask> }
</s> Fix: crash when key value is nil </s> remove "'%s' expected type'%s', got unconvertible type '%s'",
</s> add "'%s' expected type '%s', got unconvertible type '%s'", </s> remove return fmt.Errorf("key %s missing", key)
</s> add return fmt.Errorf("key '%s' missing", key) </s> remove if !ok {
</s> add if !ok || value == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/791d72e05b2c4fd9c094c022a3b0ab0667c9bbdf | common/structure/structure.go |
AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE"}, | <mask> r := chi.NewRouter()
<mask>
<mask> cors := cors.New(cors.Options{
<mask> AllowedOrigins: []string{"*"},
<mask> AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},
<mask> AllowedHeaders: []string{"Content-Type", "Authorization"},
<mask> MaxAge: 300,
<mask> })
<mask>
<mask> r.Group(func(r chi.Router) {
</s> Fix: authentication with stream api </s> remove r.With(jsonContentType).Get("/traffic", traffic)
r.With(jsonContentType).Get("/logs", getLogs)
</s> add r.Mount("/", root) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7b5e1f759cf91694379e1c23e619ecd750abf442 | hub/route/server.go |
root := chi.NewRouter().With(jsonContentType)
root.Get("/traffic", traffic)
root.Get("/logs", getLogs)
r.Get("/", hello) | <mask> })
<mask>
<mask> r.Group(func(r chi.Router) {
<mask> r.Use(cors.Handler, authentication)
<mask>
<mask> r.Mount("/", root)
<mask> r.Mount("/configs", configRouter())
<mask> r.Mount("/proxies", proxyRouter())
</s> Fix: authentication with stream api </s> remove r.With(jsonContentType).Get("/traffic", traffic)
r.With(jsonContentType).Get("/logs", getLogs)
</s> add r.Mount("/", root) </s> remove AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},
</s> add AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE"}, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7b5e1f759cf91694379e1c23e619ecd750abf442 | hub/route/server.go |
r.Mount("/", root) | <mask>
<mask> r.Group(func(r chi.Router) {
<mask> r.Use(cors.Handler, authentication)
<mask>
<mask> r.With(jsonContentType).Get("/traffic", traffic)
<mask> r.With(jsonContentType).Get("/logs", getLogs)
<mask> r.Mount("/configs", configRouter())
<mask> r.Mount("/proxies", proxyRouter())
<mask> r.Mount("/rules", ruleRouter())
<mask> })
<mask>
</s> Fix: authentication with stream api </s> remove AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},
</s> add AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE"}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7b5e1f759cf91694379e1c23e619ecd750abf442 | hub/route/server.go |
func hello(w http.ResponseWriter, r *http.Request) {
render.JSON(w, r, render.M{"hello": "clash"})
}
| <mask> return http.HandlerFunc(fn)
<mask> }
<mask>
<mask> func traffic(w http.ResponseWriter, r *http.Request) {
<mask> render.Status(r, http.StatusOK)
<mask>
<mask> tick := time.NewTicker(time.Second)
</s> Fix: authentication with stream api </s> remove AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},
</s> add AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE"}, </s> remove r.With(jsonContentType).Get("/traffic", traffic)
r.With(jsonContentType).Get("/logs", getLogs)
</s> add r.Mount("/", root) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7b5e1f759cf91694379e1c23e619ecd750abf442 | hub/route/server.go |
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) | <mask> return p.alive
<mask> }
<mask>
<mask> func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> conn, err := p.ProxyAdapter.Dial(metadata)
<mask> if err != nil {
<mask> p.alive = false
<mask> }
<mask> return conn, err
<mask> }
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) </s> remove func dialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
</s> add func dialContext(ctx context.Context, network, address string) (net.Conn, error) { </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove c, err := dialTimeout("tcp", address, tcpTimeout)
</s> add c, err := dialContext(ctx, "tcp", address) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/base.go |
instance, err := p.DialContext(ctx, &addr) | <mask> return
<mask> }
<mask>
<mask> start := time.Now()
<mask> instance, err := p.Dial(&addr)
<mask> if err != nil {
<mask> return
<mask> }
<mask> defer instance.Close()
<mask>
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := dialTimeout("tcp", address, tcpTimeout)
</s> add c, err := dialContext(ctx, "tcp", address) </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/base.go |
"context" | <mask> package adapters
<mask>
<mask> import (
<mask> "net"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/direct.go |
func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { | <mask> type Direct struct {
<mask> *Base
<mask> }
<mask>
<mask> func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> address := net.JoinHostPort(metadata.Host, metadata.DstPort)
<mask> if metadata.DstIP != nil {
<mask> address = net.JoinHostPort(metadata.DstIP.String(), metadata.DstPort)
<mask> }
<mask>
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := dialTimeout("tcp", address, tcpTimeout)
</s> add c, err := dialContext(ctx, "tcp", address) </s> remove func (r *Reject) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove func dialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
</s> add func dialContext(ctx context.Context, network, address string) (net.Conn, error) { </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/direct.go |
c, err := dialContext(ctx, "tcp", address) | <mask> if metadata.DstIP != nil {
<mask> address = net.JoinHostPort(metadata.DstIP.String(), metadata.DstPort)
<mask> }
<mask>
<mask> c, err := dialTimeout("tcp", address, tcpTimeout)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> tcpKeepAlive(c)
<mask> return newConn(c, d), nil
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove func dialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
</s> add func dialContext(ctx context.Context, network, address string) (net.Conn, error) { </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/direct.go |
func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { | <mask> proxy := f.findAliveProxy()
<mask> return proxy.Name()
<mask> }
<mask>
<mask> func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> proxy := f.findAliveProxy()
<mask> c, err := proxy.Dial(metadata)
<mask> if err == nil {
<mask> c.AppendToChains(f)
<mask> }
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove c, err = proxy.Dial(metadata)
</s> add c, err = proxy.DialContext(ctx, metadata) </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) </s> remove func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", h.addr, tcpTimeout)
</s> add func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", h.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/fallback.go |
c, err := proxy.DialContext(ctx, metadata) | <mask> }
<mask>
<mask> func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> proxy := f.findAliveProxy()
<mask> c, err := proxy.Dial(metadata)
<mask> if err == nil {
<mask> c.AppendToChains(f)
<mask> }
<mask> return c, err
<mask> }
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) </s> remove c, err = proxy.Dial(metadata)
</s> add c, err = proxy.DialContext(ctx, metadata) </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) </s> remove c, err = u.fast.Dial(metadata)
</s> add c, err = u.fast.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/fallback.go |
"context" | <mask>
<mask> import (
<mask> "bufio"
<mask> "bytes"
<mask> "crypto/tls"
<mask> "encoding/base64"
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "net"
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/http.go |
func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", h.addr) | <mask> TLS bool `proxy:"tls,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialTimeout("tcp", h.addr, tcpTimeout)
<mask> if err == nil && h.tls {
<mask> cc := tls.Client(c, h.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
<mask> }
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.server, tcpTimeout)
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.server) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/http.go |
func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { | <mask>
<mask> return int32(b)
<mask> }
<mask>
<mask> func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
<mask> defer func() {
<mask> if err == nil {
<mask> c.AppendToChains(lb)
<mask> }
<mask> }()
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err = lb.proxies[0].Dial(metadata)
</s> add c, err = lb.proxies[0].DialContext(ctx, metadata) </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { </s> remove c, err = u.fast.Dial(metadata)
</s> add c, err = u.fast.DialContext(ctx, metadata) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/loadbalance.go |
c, err = proxy.DialContext(ctx, metadata) | <mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
<mask> idx := jumpHash(key, buckets)
<mask> proxy := lb.proxies[idx]
<mask> if proxy.Alive() {
<mask> c, err = proxy.Dial(metadata)
<mask> return
<mask> }
<mask> }
<mask> c, err = lb.proxies[0].Dial(metadata)
<mask> return
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err = u.fast.Dial(metadata)
</s> add c, err = u.fast.DialContext(ctx, metadata) </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove c, err = lb.proxies[0].Dial(metadata)
</s> add c, err = lb.proxies[0].DialContext(ctx, metadata) </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/loadbalance.go |
c, err = lb.proxies[0].DialContext(ctx, metadata) | <mask> c, err = proxy.Dial(metadata)
<mask> return
<mask> }
<mask> }
<mask> c, err = lb.proxies[0].Dial(metadata)
<mask> return
<mask> }
<mask>
<mask> func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (pc C.PacketConn, addr net.Addr, err error) {
<mask> defer func() {
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err = proxy.Dial(metadata)
</s> add c, err = proxy.DialContext(ctx, metadata) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/loadbalance.go |
"context" | <mask>
<mask> import (
<mask> "io"
<mask> "net"
<mask> "time"
<mask>
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/reject.go |
func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { | <mask> type Reject struct {
<mask> *Base
<mask> }
<mask>
<mask> func (r *Reject) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> return newConn(&NopConn{}, r), nil
<mask> }
<mask>
<mask> func NewReject() *Reject {
<mask> return &Reject{
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) </s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/reject.go |
"context" | <mask>
<mask> import (
<mask> "encoding/json"
<mask> "errors"
<mask> "net"
<mask>
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/selector.go |
func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) | <mask> Name string `proxy:"name"`
<mask> Proxies []string `proxy:"proxies"`
<mask> }
<mask>
<mask> func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := s.selected.Dial(metadata)
<mask> if err == nil {
<mask> c.AppendToChains(s)
<mask> }
<mask> return c, err
<mask> }
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (s *Snell) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", s.server, tcpTimeout)
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", s.server) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/selector.go |
"context" | <mask> package adapters
<mask>
<mask> import (
<mask> "crypto/tls"
<mask> "encoding/json"
<mask> "fmt"
<mask> "net"
<mask> "strconv"
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/shadowsocks.go |
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.server) | <mask> SkipCertVerify bool `obfs:"skip-cert-verify,omitempty"`
<mask> Mux bool `obfs:"mux,omitempty"`
<mask> }
<mask>
<mask> func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialTimeout("tcp", ss.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
<mask> }
<mask> tcpKeepAlive(c)
<mask> switch ss.obfsMode {
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (s *Snell) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", s.server, tcpTimeout)
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", s.server) </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/shadowsocks.go |
"context" | <mask> package adapters
<mask>
<mask> import (
<mask> "fmt"
<mask> "net"
<mask> "strconv"
<mask>
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/snell.go |
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", s.server) | <mask> Psk string `proxy:"psk"`
<mask> ObfsOpts map[string]interface{} `proxy:"obfs-opts,omitempty"`
<mask> }
<mask>
<mask> func (s *Snell) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialTimeout("tcp", s.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %s", s.server, err.Error())
<mask> }
<mask> tcpKeepAlive(c)
<mask> switch s.obfsOption.Mode {
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.server, tcpTimeout)
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.server) </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) </s> remove c, err := dialTimeout("tcp", address, tcpTimeout)
</s> add c, err := dialContext(ctx, "tcp", address) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/snell.go |
"context" | <mask> package adapters
<mask>
<mask> import (
<mask> "crypto/tls"
<mask> "fmt"
<mask> "io"
<mask> "io/ioutil"
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/socks5.go |
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.addr) | <mask> UDP bool `proxy:"udp,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
<mask>
<mask> if err == nil && ss.tls {
<mask> cc := tls.Client(c, ss.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", h.addr, tcpTimeout)
</s> add func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", h.addr) </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.server, tcpTimeout)
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.server) </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/socks5.go |
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) | <mask> return newConn(c, ss), nil
<mask> }
<mask>
<mask> func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) {
<mask> c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
<mask> if err != nil {
<mask> err = fmt.Errorf("%s connect error", ss.addr)
<mask> return
<mask> }
<mask>
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.server, tcpTimeout)
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.server) </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err = lb.proxies[0].Dial(metadata)
</s> add c, err = lb.proxies[0].DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/socks5.go |
func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { | <mask> func (u *URLTest) Now() string {
<mask> return u.fast.Name()
<mask> }
<mask>
<mask> func (u *URLTest) Dial(metadata *C.Metadata) (c C.Conn, err error) {
<mask> for i := 0; i < 3; i++ {
<mask> c, err = u.fast.Dial(metadata)
<mask> if err == nil {
<mask> c.AppendToChains(u)
<mask> return
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err = u.fast.Dial(metadata)
</s> add c, err = u.fast.DialContext(ctx, metadata) </s> remove c, err = proxy.Dial(metadata)
</s> add c, err = proxy.DialContext(ctx, metadata) </s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/urltest.go |
c, err = u.fast.DialContext(ctx, metadata) | <mask> }
<mask>
<mask> func (u *URLTest) Dial(metadata *C.Metadata) (c C.Conn, err error) {
<mask> for i := 0; i < 3; i++ {
<mask> c, err = u.fast.Dial(metadata)
<mask> if err == nil {
<mask> c.AppendToChains(u)
<mask> return
<mask> }
<mask> u.fallback()
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { </s> remove c, err = proxy.Dial(metadata)
</s> add c, err = proxy.DialContext(ctx, metadata) </s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
</s> add func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) { </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
</s> add func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.DialContext(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/urltest.go |
func dialContext(ctx context.Context, network, address string) (net.Conn, error) { | <mask> }
<mask> return bytes.Join(buf, nil)
<mask> }
<mask>
<mask> func dialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
<mask> host, port, err := net.SplitHostPort(address)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := dialTimeout("tcp", address, tcpTimeout)
</s> add c, err := dialContext(ctx, "tcp", address) </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err := proxy.Dial(metadata)
</s> add c, err := proxy.DialContext(ctx, metadata) </s> remove instance, err := p.Dial(&addr)
</s> add instance, err := p.DialContext(ctx, &addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/util.go |
<mask> return nil, err
<mask> }
<mask>
<mask> dialer := net.Dialer{}
<mask> ctx, cancel := context.WithTimeout(context.Background(), timeout)
<mask> defer cancel()
<mask>
<mask> returned := make(chan struct{})
<mask> defer close(returned)
<mask>
<mask> type dialResult struct {
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove conn, err := p.ProxyAdapter.Dial(metadata)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
return p.DialContext(ctx, metadata)
}
func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
conn, err := p.ProxyAdapter.DialContext(ctx, metadata) </s> remove instance, err := p.Dial(&addr)
</s> add instance, err := p.DialContext(ctx, &addr) </s> remove c, err := dialTimeout("tcp", address, tcpTimeout)
</s> add c, err := dialContext(ctx, "tcp", address) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/util.go | |
"context" | <mask>
<mask> import (
<mask> "fmt"
<mask> "net"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/component/vmess"
</s> Fix: dial tcp with context to avoid margin of error | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/vmess.go |
func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) | <mask> WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialTimeout("tcp", v.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.server, tcpTimeout)
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.server) </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove func (s *Snell) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", s.server, tcpTimeout)
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", s.server) </s> remove func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", h.addr, tcpTimeout)
</s> add func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", h.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/vmess.go |
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", v.server) | <mask> return newConn(c, v), err
<mask> }
<mask>
<mask> func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
<mask> c, err := dialTimeout("tcp", v.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
</s> Fix: dial tcp with context to avoid margin of error </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", v.server, tcpTimeout)
</s> add func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", v.server) </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove c, err := dialTimeout("tcp", address, tcpTimeout)
</s> add c, err := dialContext(ctx, "tcp", address) </s> remove func (s *Snell) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", s.server, tcpTimeout)
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", s.server) </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := dialTimeout("tcp", ss.server, tcpTimeout)
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialContext(ctx, "tcp", ss.server) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | adapters/outbound/vmess.go |
DialContext(ctx context.Context, metadata *Metadata) (Conn, error) | <mask>
<mask> type ProxyAdapter interface {
<mask> Name() string
<mask> Type() AdapterType
<mask> Dial(metadata *Metadata) (Conn, error)
<mask> DialUDP(metadata *Metadata) (PacketConn, net.Addr, error)
<mask> SupportUDP() bool
<mask> Destroy()
<mask> MarshalJSON() ([]byte, error)
<mask> }
</s> Fix: dial tcp with context to avoid margin of error </s> remove c, err = lb.proxies[0].Dial(metadata)
</s> add c, err = lb.proxies[0].DialContext(ctx, metadata) </s> remove func (r *Reject) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove c, err := dialTimeout("tcp", ss.addr, tcpTimeout)
</s> add ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialContext(ctx, "tcp", ss.addr) </s> remove func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | constant/adapters.go |
Dial(metadata *Metadata) (Conn, error) | <mask> ProxyAdapter
<mask> Alive() bool
<mask> DelayHistory() []DelayHistory
<mask> LastDelay() uint16
<mask> URLTest(ctx context.Context, url string) (uint16, error)
<mask> }
<mask>
<mask> // AdapterType is enum of adapter type
<mask> type AdapterType int
</s> Fix: dial tcp with context to avoid margin of error </s> remove Dial(metadata *Metadata) (Conn, error)
</s> add DialContext(ctx context.Context, metadata *Metadata) (Conn, error) </s> remove func (r *Reject) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) {
</s> add func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) { </s> remove ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
</s> add </s> remove func dialTimeout(network, address string, timeout time.Duration) (net.Conn, error) {
</s> add func dialContext(ctx context.Context, network, address string) (net.Conn, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c4a359a2b611175542004fb46c81a1489e75dc6 | constant/adapters.go |
<mask> Cipher string `proxy:"cipher"`
<mask> UDP bool `proxy:"udp,omitempty"`
<mask> Plugin string `proxy:"plugin,omitempty"`
<mask> PluginOpts map[string]interface{} `proxy:"plugin-opts,omitempty"`
<mask>
<mask> // deprecated when bump to 1.0
<mask> Obfs string `proxy:"obfs,omitempty"`
<mask> ObfsHost string `proxy:"obfs-host,omitempty"`
<mask> }
<mask>
<mask> type simpleObfsOption struct {
<mask> Mode string `obfs:"mode"`
<mask> Host string `obfs:"host,omitempty"`
</s> Chore: remove forward compatibility code </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove fallthrough
// deprecated when bump to 1.0
case "FINAL":
</s> add </s> remove // deprecated when bump to 1.0
case "SOURCE-IP-CIDR":
fallthrough
</s> add </s> remove
// remove after 1.0
RuleOld: []string{},
ProxyOld: []map[string]interface{}{},
ProxyGroupOld: []map[string]interface{}{},
</s> add </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | adapters/outbound/shadowsocks.go | |
<mask> var v2rayOption *v2rayObfs.Option
<mask> var obfsOption *simpleObfsOption
<mask> obfsMode := ""
<mask>
<mask> // forward compatibility before 1.0
<mask> if option.Obfs != "" {
<mask> obfsMode = option.Obfs
<mask> obfsOption = &simpleObfsOption{
<mask> Host: "bing.com",
<mask> }
<mask> if option.ObfsHost != "" {
<mask> obfsOption.Host = option.ObfsHost
<mask> }
<mask> }
<mask>
<mask> decoder := structure.NewDecoder(structure.Option{TagName: "obfs", WeaklyTypedInput: true})
<mask> if option.Plugin == "obfs" {
<mask> opts := simpleObfsOption{Host: "bing.com"}
<mask> if err := decoder.Decode(option.PluginOpts, &opts); err != nil {
<mask> return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err)
</s> Chore: remove forward compatibility code </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove if cfg.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(cfg.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(cfg.Interface)
</s> add if general.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(general.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface) </s> remove data, err := readRawConfig(path)
</s> add data, err := ioutil.ReadFile(path) </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove if len(proxiesConfig) == 0 {
proxiesConfig = cfg.ProxyOld
}
if len(groupsConfig) == 0 {
groupsConfig = cfg.ProxyGroupOld
}
if len(providersConfig) == 0 {
providersConfig = cfg.ProxyProviderOld
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | adapters/outbound/shadowsocks.go | |
<mask> Experimental Experimental `yaml:"experimental"`
<mask> Proxy []map[string]interface{} `yaml:"proxies"`
<mask> ProxyGroup []map[string]interface{} `yaml:"proxy-groups"`
<mask> Rule []string `yaml:"rules"`
<mask>
<mask> // remove after 1.0
<mask> ProxyProviderOld map[string]map[string]interface{} `yaml:"proxy-provider"`
<mask> ProxyOld []map[string]interface{} `yaml:"Proxy"`
<mask> ProxyGroupOld []map[string]interface{} `yaml:"Proxy Group"`
<mask> RuleOld []string `yaml:"Rule"`
<mask> }
<mask>
<mask> // Parse config
<mask> func Parse(buf []byte) (*Config, error) {
<mask> rawCfg, err := UnmarshalRawConfig(buf)
</s> Chore: remove forward compatibility code </s> remove
// remove after 1.0
RuleOld: []string{},
ProxyOld: []map[string]interface{}{},
ProxyGroupOld: []map[string]interface{}{},
</s> add </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove data, err := readRawConfig(path)
</s> add data, err := ioutil.ReadFile(path) </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | config/config.go | |
<mask> "114.114.114.114",
<mask> "8.8.8.8",
<mask> },
<mask> },
<mask>
<mask> // remove after 1.0
<mask> RuleOld: []string{},
<mask> ProxyOld: []map[string]interface{}{},
<mask> ProxyGroupOld: []map[string]interface{}{},
<mask> }
<mask>
<mask> if err := yaml.Unmarshal(buf, &rawCfg); err != nil {
<mask> return nil, err
<mask> }
</s> Chore: remove forward compatibility code </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove data, err := readRawConfig(path)
</s> add data, err := ioutil.ReadFile(path) </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove
// remove after 1.0
ProxyProviderOld map[string]map[string]interface{} `yaml:"proxy-provider"`
ProxyOld []map[string]interface{} `yaml:"Proxy"`
ProxyGroupOld []map[string]interface{} `yaml:"Proxy Group"`
RuleOld []string `yaml:"Rule"`
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | config/config.go | |
<mask> proxiesConfig := cfg.Proxy
<mask> groupsConfig := cfg.ProxyGroup
<mask> providersConfig := cfg.ProxyProvider
<mask>
<mask> if len(proxiesConfig) == 0 {
<mask> proxiesConfig = cfg.ProxyOld
<mask> }
<mask>
<mask> if len(groupsConfig) == 0 {
<mask> groupsConfig = cfg.ProxyGroupOld
<mask> }
<mask>
<mask> if len(providersConfig) == 0 {
<mask> providersConfig = cfg.ProxyProviderOld
<mask> }
<mask>
<mask> proxies["DIRECT"] = outbound.NewProxy(outbound.NewDirect())
<mask> proxies["REJECT"] = outbound.NewProxy(outbound.NewReject())
<mask> proxyList = append(proxyList, "DIRECT", "REJECT")
<mask>
<mask> // parse proxy
</s> Chore: remove forward compatibility code </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove data, err := readRawConfig(path)
</s> add data, err := ioutil.ReadFile(path) </s> remove if cfg.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(cfg.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(cfg.Interface)
</s> add if general.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(general.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | config/config.go | |
<mask> rules := []C.Rule{}
<mask>
<mask> rulesConfig := cfg.Rule
<mask>
<mask> // remove after 1.0
<mask> if len(rulesConfig) == 0 {
<mask> rulesConfig = cfg.RuleOld
<mask> }
<mask>
<mask> // parse rules
<mask> for idx, line := range rulesConfig {
<mask> rule := trimArr(strings.Split(line, ","))
<mask> var (
<mask> payload string
</s> Chore: remove forward compatibility code </s> remove if len(proxiesConfig) == 0 {
proxiesConfig = cfg.ProxyOld
}
if len(groupsConfig) == 0 {
groupsConfig = cfg.ProxyGroupOld
}
if len(providersConfig) == 0 {
providersConfig = cfg.ProxyProviderOld
}
</s> add </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add </s> remove
// remove after 1.0
RuleOld: []string{},
ProxyOld: []map[string]interface{}{},
ProxyGroupOld: []map[string]interface{}{},
</s> add </s> remove data, err := readRawConfig(path)
</s> add data, err := ioutil.ReadFile(path) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | config/config.go | |
<mask> import (
<mask> "fmt"
<mask> "io/ioutil"
<mask> "os"
<mask> "path/filepath"
<mask> "sync"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/provider"
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> "github.com/Dreamacro/clash/component/dialer"
</s> Chore: remove forward compatibility code </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove fallthrough
// deprecated when bump to 1.0
case "FINAL":
</s> add </s> remove // deprecated when bump to 1.0
case "SOURCE-IP-CIDR":
fallthrough
</s> add </s> remove if cfg.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(cfg.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(cfg.Interface)
</s> add if general.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(general.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | hub/executor/executor.go | |
<mask> var (
<mask> mux sync.Mutex
<mask> )
<mask>
<mask> // forward compatibility before 1.0
<mask> func readRawConfig(path string) ([]byte, error) {
<mask> data, err := ioutil.ReadFile(path)
<mask> if err == nil && len(data) != 0 {
<mask> return data, nil
<mask> }
<mask>
<mask> if filepath.Ext(path) != ".yaml" {
<mask> return nil, err
<mask> }
<mask>
<mask> path = path[:len(path)-5] + ".yml"
<mask> if _, fallbackErr := os.Stat(path); fallbackErr == nil {
<mask> return ioutil.ReadFile(path)
<mask> }
<mask>
<mask> return data, err
<mask> }
<mask>
<mask> func readConfig(path string) ([]byte, error) {
<mask> if _, err := os.Stat(path); os.IsNotExist(err) {
<mask> return nil, err
<mask> }
<mask> data, err := readRawConfig(path)
</s> Chore: remove forward compatibility code </s> remove data, err := readRawConfig(path)
</s> add data, err := ioutil.ReadFile(path) </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add </s> remove
// remove after 1.0
RuleOld: []string{},
ProxyOld: []map[string]interface{}{},
ProxyGroupOld: []map[string]interface{}{},
</s> add </s> remove if len(proxiesConfig) == 0 {
proxiesConfig = cfg.ProxyOld
}
if len(groupsConfig) == 0 {
groupsConfig = cfg.ProxyGroupOld
}
if len(providersConfig) == 0 {
providersConfig = cfg.ProxyProviderOld
}
</s> add </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
... | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | hub/executor/executor.go | |
data, err := ioutil.ReadFile(path) | <mask> func readConfig(path string) ([]byte, error) {
<mask> if _, err := os.Stat(path); os.IsNotExist(err) {
<mask> return nil, err
<mask> }
<mask> data, err := readRawConfig(path)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if len(data) == 0 {
</s> Chore: remove forward compatibility code </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove
// remove after 1.0
RuleOld: []string{},
ProxyOld: []map[string]interface{}{},
ProxyGroupOld: []map[string]interface{}{},
</s> add </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add </s> remove if len(proxiesConfig) == 0 {
proxiesConfig = cfg.ProxyOld
}
if len(groupsConfig) == 0 {
groupsConfig = cfg.ProxyGroupOld
}
if len(providersConfig) == 0 {
providersConfig = cfg.ProxyProviderOld
}
</s> add </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | hub/executor/executor.go |
if general.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(general.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface) | <mask> log.SetLevel(general.LogLevel)
<mask> tunnel.SetMode(general.Mode)
<mask> resolver.DisableIPv6 = !general.IPv6
<mask>
<mask> if cfg.Interface != "" {
<mask> dialer.DialHook = dialer.DialerWithInterface(cfg.Interface)
<mask> dialer.ListenPacketHook = dialer.ListenPacketWithInterface(cfg.Interface)
<mask> } else {
<mask> dialer.DialHook = nil
<mask> dialer.ListenPacketHook = nil
<mask> }
<mask>
</s> Chore: remove forward compatibility code </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add </s> remove if len(proxiesConfig) == 0 {
proxiesConfig = cfg.ProxyOld
}
if len(groupsConfig) == 0 {
groupsConfig = cfg.ProxyGroupOld
}
if len(providersConfig) == 0 {
providersConfig = cfg.ProxyProviderOld
}
</s> add </s> remove // forward compatibility before 1.0
func readRawConfig(path string) ([]byte, error) {
data, err := ioutil.ReadFile(path)
if err == nil && len(data) != 0 {
return data, nil
}
if filepath.Ext(path) != ".yaml" {
return nil, err
}
path = path[:len(path)-5] + ".yml"
if _, fallbackErr := os.Stat(path); fallbackErr == nil {
return ioutil.ReadFile(path)
}
return data, err
}
</s> add </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove fallthrough
// deprecated when bump to 1.0
case "FINAL":
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | hub/executor/executor.go |
<mask> parsed = NewGEOIP(payload, target, noResolve)
<mask> case "IP-CIDR", "IP-CIDR6":
<mask> noResolve := HasNoResolve(params)
<mask> parsed, parseErr = NewIPCIDR(payload, target, WithIPCIDRNoResolve(noResolve))
<mask> // deprecated when bump to 1.0
<mask> case "SOURCE-IP-CIDR":
<mask> fallthrough
<mask> case "SRC-IP-CIDR":
<mask> parsed, parseErr = NewIPCIDR(payload, target, WithIPCIDRSourceIP(true), WithIPCIDRNoResolve(true))
<mask> case "SRC-PORT":
<mask> parsed, parseErr = NewPort(payload, target, true)
<mask> case "DST-PORT":
</s> Chore: remove forward compatibility code </s> remove fallthrough
// deprecated when bump to 1.0
case "FINAL":
</s> add </s> remove
// deprecated when bump to 1.0
Obfs string `proxy:"obfs,omitempty"`
ObfsHost string `proxy:"obfs-host,omitempty"`
</s> add </s> remove if len(proxiesConfig) == 0 {
proxiesConfig = cfg.ProxyOld
}
if len(groupsConfig) == 0 {
groupsConfig = cfg.ProxyGroupOld
}
if len(providersConfig) == 0 {
providersConfig = cfg.ProxyProviderOld
}
</s> add </s> remove // forward compatibility before 1.0
if option.Obfs != "" {
obfsMode = option.Obfs
obfsOption = &simpleObfsOption{
Host: "bing.com",
}
if option.ObfsHost != "" {
obfsOption.Host = option.ObfsHost
}
}
</s> add </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | rules/parser.go | |
<mask> parsed, parseErr = NewPort(payload, target, true)
<mask> case "DST-PORT":
<mask> parsed, parseErr = NewPort(payload, target, false)
<mask> case "MATCH":
<mask> fallthrough
<mask> // deprecated when bump to 1.0
<mask> case "FINAL":
<mask> parsed = NewMatch(target)
<mask> default:
<mask> parseErr = fmt.Errorf("unsupported rule type %s", tp)
<mask> }
<mask>
</s> Chore: remove forward compatibility code </s> remove // deprecated when bump to 1.0
case "SOURCE-IP-CIDR":
fallthrough
</s> add </s> remove
// deprecated when bump to 1.0
Obfs string `proxy:"obfs,omitempty"`
ObfsHost string `proxy:"obfs-host,omitempty"`
</s> add </s> remove // remove after 1.0
if len(rulesConfig) == 0 {
rulesConfig = cfg.RuleOld
}
</s> add </s> remove if len(proxiesConfig) == 0 {
proxiesConfig = cfg.ProxyOld
}
if len(groupsConfig) == 0 {
groupsConfig = cfg.ProxyGroupOld
}
if len(providersConfig) == 0 {
providersConfig = cfg.ProxyProviderOld
}
</s> add </s> remove if cfg.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(cfg.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(cfg.Interface)
</s> add if general.Interface != "" {
dialer.DialHook = dialer.DialerWithInterface(general.Interface)
dialer.ListenPacketHook = dialer.ListenPacketWithInterface(general.Interface) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7c62fe41b40e6b20c8c88e0e5b5ee96ac0c46dd9 | rules/parser.go | |
msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
w.WriteMsg(msg) | <mask> return func(w D.ResponseWriter, r *D.Msg) {
<mask> q := r.Question[0]
<mask>
<mask> if q.Qtype == D.TypeAAAA {
<mask> D.HandleFailed(w, r)
<mask> return
<mask> } else if q.Qtype != D.TypeA {
<mask> next(w, r)
<mask> return
<mask> }
</s> Fix: dns return empty success for AAAA & recursion in fake ip mode (#663) </s> remove msg.SetRcode(r, msg.Rcode)
</s> add msg.SetRcode(r, D.RcodeSuccess) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7d51ab5846b1b298bbc5de99d4bd9a158d4b9015 | dns/middleware.go |
msg.SetRcode(r, D.RcodeSuccess) | <mask> msg := r.Copy()
<mask> msg.Answer = []D.RR{rr}
<mask>
<mask> setMsgTTL(msg, 1)
<mask> msg.SetRcode(r, msg.Rcode)
<mask> msg.Authoritative = true
<mask> w.WriteMsg(msg)
<mask> return
<mask> }
<mask> }
</s> Fix: dns return empty success for AAAA & recursion in fake ip mode (#663) </s> remove D.HandleFailed(w, r)
</s> add msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
w.WriteMsg(msg) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7d51ab5846b1b298bbc5de99d4bd9a158d4b9015 | dns/middleware.go |
msg.RecursionAvailable = true
| <mask> msg.SetRcode(r, D.RcodeSuccess)
<mask> msg.Authoritative = true
<mask> w.WriteMsg(msg)
<mask> return
<mask> }
<mask> }
<mask> }
<mask>
</s> Fix: dns return empty success for AAAA & recursion in fake ip mode (#663) </s> remove D.HandleFailed(w, r)
</s> add msg := &D.Msg{}
msg.Answer = []D.RR{}
msg.SetRcode(r, D.RcodeSuccess)
msg.Authoritative = true
msg.RecursionAvailable = true
w.WriteMsg(msg) </s> remove msg.SetRcode(r, msg.Rcode)
</s> add msg.SetRcode(r, D.RcodeSuccess) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/7d51ab5846b1b298bbc5de99d4bd9a158d4b9015 | dns/middleware.go |
func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { | <mask> }
<mask> return c, nil
<mask> }
<mask>
<mask> func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", h.addr)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
// gun transport, TODO: Optimize mux dial code
</s> add func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
// gun transport | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/http.go |
defer safeConnClose(c, err)
| <mask> tcpKeepAlive(c)
<mask>
<mask> c, err = h.StreamConn(c, metadata)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove
if err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata)); err != nil {
c.Close()
return nil, err
</s> add } else {
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err = dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/http.go |
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { | <mask> _, err := c.Write(serializesSocksAddr(metadata))
<mask> return c, err
<mask> }
<mask>
<mask> func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", ss.addr)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
// gun transport, TODO: Optimize mux dial code
</s> add func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
// gun transport | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/shadowsocks.go |
defer safeConnClose(c, err)
| <mask> tcpKeepAlive(c)
<mask>
<mask> c, err = ss.StreamConn(c, metadata)
<mask> return NewConn(c, ss), err
<mask> }
<mask>
<mask> func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (_ C.PacketConn, err error) { </s> remove func (t *Trojan) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
// gun transport, TODO: Optimize mux dial code
</s> add func (t *Trojan) DialUDP(metadata *C.Metadata) (_ C.PacketConn, err error) {
var c net.Conn
// grpc transport </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/shadowsocks.go |
pc.Close() | <mask> }
<mask>
<mask> addr, err := resolveUDPAddr("udp", ss.addr)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> pc = ss.cipher.PacketConn(pc)
<mask> return newPacketConn(&ssPacketConn{PacketConn: pc, rAddr: addr}, ss), nil
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove
if err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata)); err != nil {
c.Close()
return nil, err
</s> add } else {
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err = dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialer.DialContext(ctx, "tcp", v.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
}
tcpKeepAlive(c)
c, err = v.StreamConn(c, metadata)
</s> add </s> remove return nil, err
</s> add return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error()) </s> remove return newPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
</s> add c, err = v.StreamConn(c, metadata) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/shadowsocks.go |
func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { | <mask> _, err = c.Write(serializesSocksAddr(metadata))
<mask> return c, err
<mask> }
<mask>
<mask> func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", ssr.addr)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", ssr.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
// gun transport, TODO: Optimize mux dial code
</s> add func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
// gun transport | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/shadowsocksr.go |
defer safeConnClose(c, err)
| <mask> tcpKeepAlive(c)
<mask>
<mask> c, err = ssr.StreamConn(c, metadata)
<mask> return NewConn(c, ssr), err
<mask> }
<mask>
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port), s.version)
</s> add if err = snell.WriteHeader(c, metadata.String(), uint(port), s.version); err != nil {
c.Close()
return nil, err
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/shadowsocksr.go |
pc.Close() | <mask>
<mask> addr, err := resolveUDPAddr("udp", ssr.addr)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> pc = ssr.cipher.PacketConn(pc)
<mask> pc = ssr.protocol.PacketConn(pc)
<mask> return newPacketConn(&ssPacketConn{PacketConn: pc, rAddr: addr}, ssr), nil
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove
if err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata)); err != nil {
c.Close()
return nil, err
</s> add } else {
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err = dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove
pc := t.instance.PacketConn(c)
return newPacketConn(pc, t), err
</s> add tcpKeepAlive(c) </s> remove ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
}
tcpKeepAlive(c)
</s> add defer safeConnClose(c, err)
</s> remove ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialer.DialContext(ctx, "tcp", v.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
}
tcpKeepAlive(c)
c, err = v.StreamConn(c, metadata)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/shadowsocksr.go |
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { | <mask> err := snell.WriteHeader(c, metadata.String(), uint(port), s.version)
<mask> return c, err
<mask> }
<mask>
<mask> func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> if s.version == snell.Version2 {
<mask> c, err := s.pool.Get()
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port), s.version)
</s> add if err = snell.WriteHeader(c, metadata.String(), uint(port), s.version); err != nil {
c.Close()
return nil, err
} </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/snell.go |
if err = snell.WriteHeader(c, metadata.String(), uint(port), s.version); err != nil {
c.Close()
return nil, err
} | <mask> return nil, err
<mask> }
<mask>
<mask> port, _ := strconv.Atoi(metadata.DstPort)
<mask> err = snell.WriteHeader(c, metadata.String(), uint(port), s.version)
<mask> return NewConn(c, s), err
<mask> }
<mask>
<mask> c, err := dialer.DialContext(ctx, "tcp", s.addr)
<mask> if err != nil {
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove
if err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata)); err != nil {
c.Close()
return nil, err
</s> add } else {
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err = dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return newPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
</s> add c, err = v.StreamConn(c, metadata) </s> remove
pc := t.instance.PacketConn(c)
return newPacketConn(pc, t), err
</s> add tcpKeepAlive(c) </s> remove ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
}
tcpKeepAlive(c)
</s> add defer safeConnClose(c, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/snell.go |
defer safeConnClose(c, err)
| <mask> return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask>
<mask> c, err = s.StreamConn(c, metadata)
<mask> return NewConn(c, s), err
<mask> }
<mask>
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port), s.version)
</s> add if err = snell.WriteHeader(c, metadata.String(), uint(port), s.version); err != nil {
c.Close()
return nil, err
} </s> remove ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err := dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
}
tcpKeepAlive(c)
</s> add defer safeConnClose(c, err)
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/snell.go |
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { | <mask> }
<mask> return c, nil
<mask> }
<mask>
<mask> func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", ss.addr)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> add func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) { </s> remove func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
// gun transport, TODO: Optimize mux dial code
</s> add func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
// gun transport | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/socks5.go |
defer safeConnClose(c, err)
| <mask> }
<mask> tcpKeepAlive(c)
<mask>
<mask> c, err = ss.StreamConn(c, metadata)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Chore: Clarify the definition of StreamConn and DialContext </s> remove
if err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata)); err != nil {
c.Close()
return nil, err
</s> add } else {
ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
defer cancel()
c, err = dialer.DialContext(ctx, "tcp", t.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/807d53c1e797a62079fe6efeaa421d47ea236aea | adapters/outbound/socks5.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.