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 |
|---|---|---|---|---|
allowedAddr := uc.rAddr.(*net.UDPAddr)
destAddr := addr.(*net.UDPAddr)
if !(allowedAddr.IP.Equal(destAddr.IP) && allowedAddr.Port == destAddr.Port) {
return 0, ErrUDPRemoteAddrMismatch
} | <mask>
<mask> // WriteTo implments C.PacketConn.WriteTo
<mask> // Since VMess doesn't support full cone NAT by design, we verify if addr matches uc.rAddr, and drop the packet if not.
<mask> func (uc *vmessPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
<mask> return uc.Conn.Write(b)
<mask> }
<mask>
<mask> func (uc *vmessPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
<mask> n, err := uc.Conn.Read(b)
</s> Fix: drop UDP packet which mismatched destination for VMess (#2410)
Co-authored-by: SUN Sizhe <sunsizhe@cmi.chinamobile.com> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/90b40a8e5a81a6bf0d07985d6f037c7ed66721a9 | adapter/outbound/vmess.go |
addr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
if err != nil {
return nil, nil, err
} | <mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
<mask> addr, _ := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
<mask> return pc, addr, nil
<mask> }
<mask>
<mask> func NewDirect() *Direct {
<mask> return &Direct{
</s> Fix: add missing error check </s> remove pc, addr, _ := proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
defer pc.Close()
if err != nil {
log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SourceIP.String(), metadata.String(), err.Error())
}
</s> remove addr, _ := net.ResolveUDPAddr("udp", ss.server)
remoteAddr, _ := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
</s> add addr, err := net.ResolveUDPAddr("udp", ss.server)
if err != nil {
return nil, nil, err
}
remoteAddr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
if err != nil {
return nil, nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/90e3dccacdca2e356c5393a0b723c5591d128c68 | adapters/outbound/direct.go |
addr, err := net.ResolveUDPAddr("udp", ss.server)
if err != nil {
return nil, nil, err
}
remoteAddr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
if err != nil {
return nil, nil, err
} | <mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
<mask> addr, _ := net.ResolveUDPAddr("udp", ss.server)
<mask> remoteAddr, _ := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
<mask>
<mask> pc = ss.cipher.PacketConn(pc)
<mask> return &ssUDPConn{PacketConn: pc, rAddr: remoteAddr}, addr, nil
<mask> }
<mask>
</s> Fix: add missing error check </s> remove pc, addr, _ := proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
defer pc.Close()
if err != nil {
log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SourceIP.String(), metadata.String(), err.Error())
}
</s> remove addr, _ := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
</s> add addr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
if err != nil {
return nil, nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/90e3dccacdca2e356c5393a0b723c5591d128c68 | adapters/outbound/shadowsocks.go |
pc, addr, err := proxy.DialUDP(metadata)
defer pc.Close()
if err != nil {
log.Warnln("Proxy[%s] connect [%s --> %s] error: %s", proxy.Name(), metadata.SourceIP.String(), metadata.String(), err.Error())
}
| <mask> }
<mask> }
<mask>
<mask> if metadata.NetWork == C.UDP {
<mask> pc, addr, _ := proxy.DialUDP(metadata)
<mask> t.handleUDPOverTCP(localConn, pc, addr)
<mask> return
<mask> }
<mask>
<mask> remoConn, err := proxy.Dial(metadata)
</s> Fix: add missing error check </s> remove addr, _ := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
</s> add addr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
if err != nil {
return nil, nil, err
} </s> remove addr, _ := net.ResolveUDPAddr("udp", ss.server)
remoteAddr, _ := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
</s> add addr, err := net.ResolveUDPAddr("udp", ss.server)
if err != nil {
return nil, nil, err
}
remoteAddr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.Port))
if err != nil {
return nil, nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/90e3dccacdca2e356c5393a0b723c5591d128c68 | tunnel/tunnel.go |
"flag" | <mask> package main
<mask>
<mask> import (
<mask> "os"
<mask> "os/signal"
<mask> "path/filepath"
<mask> "syscall"
<mask>
</s> Fix: resolve path in windows </s> remove "flag"
"path"
</s> add </s> remove C "github.com/Dreamacro/clash/constant"
</s> add </s> remove homedir = path.Join(currentDir, homedir)
</s> add homedir = filepath.Join(currentDir, homedir) </s> remove if (homedir != "") {
if !path.IsAbs(homedir) {
</s> add if homedir != "" {
if !filepath.IsAbs(homedir) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91e35f2f6a4a006e87682f91cf5e151b86c57fc0 | main.go |
"path/filepath" | <mask> import (
<mask> "flag"
<mask> "os"
<mask> "os/signal"
<mask> "syscall"
<mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/proxy"
</s> Fix: resolve path in windows </s> remove "flag"
"path"
</s> add </s> remove C "github.com/Dreamacro/clash/constant"
</s> add </s> remove homedir = path.Join(currentDir, homedir)
</s> add homedir = filepath.Join(currentDir, homedir) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91e35f2f6a4a006e87682f91cf5e151b86c57fc0 | main.go |
<mask> import (
<mask> "os"
<mask> "os/signal"
<mask> "syscall"
<mask> "flag"
<mask> "path"
<mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/proxy"
<mask> "github.com/Dreamacro/clash/tunnel"
</s> Fix: resolve path in windows </s> remove C "github.com/Dreamacro/clash/constant"
</s> add </s> remove homedir = path.Join(currentDir, homedir)
</s> add homedir = filepath.Join(currentDir, homedir) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91e35f2f6a4a006e87682f91cf5e151b86c57fc0 | main.go | |
C "github.com/Dreamacro/clash/constant" | <mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/proxy"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask>
</s> Fix: resolve path in windows </s> remove C "github.com/Dreamacro/clash/constant"
</s> add </s> remove "flag"
"path"
</s> add </s> remove homedir = path.Join(currentDir, homedir)
</s> add homedir = filepath.Join(currentDir, homedir) </s> remove if (homedir != "") {
if !path.IsAbs(homedir) {
</s> add if homedir != "" {
if !filepath.IsAbs(homedir) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91e35f2f6a4a006e87682f91cf5e151b86c57fc0 | main.go |
<mask> "github.com/Dreamacro/clash/config"
<mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/proxy"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> log "github.com/sirupsen/logrus"
<mask> )
<mask>
<mask> var (
</s> Fix: resolve path in windows </s> remove "flag"
"path"
</s> add </s> remove homedir = path.Join(currentDir, homedir)
</s> add homedir = filepath.Join(currentDir, homedir) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91e35f2f6a4a006e87682f91cf5e151b86c57fc0 | main.go | |
if homedir != "" {
if !filepath.IsAbs(homedir) { | <mask> tunnel.Instance().Run()
<mask> proxy.Instance().Run()
<mask> hub.Run()
<mask>
<mask> if (homedir != "") {
<mask> if !path.IsAbs(homedir) {
<mask> currentDir, _ := os.Getwd()
<mask> homedir = path.Join(currentDir, homedir)
<mask> }
<mask> C.SetHomeDir(homedir)
<mask> }
</s> Fix: resolve path in windows </s> remove homedir = path.Join(currentDir, homedir)
</s> add homedir = filepath.Join(currentDir, homedir) </s> remove C "github.com/Dreamacro/clash/constant"
</s> add </s> remove "flag"
"path"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91e35f2f6a4a006e87682f91cf5e151b86c57fc0 | main.go |
homedir = filepath.Join(currentDir, homedir) | <mask>
<mask> if (homedir != "") {
<mask> if !path.IsAbs(homedir) {
<mask> currentDir, _ := os.Getwd()
<mask> homedir = path.Join(currentDir, homedir)
<mask> }
<mask> C.SetHomeDir(homedir)
<mask> }
<mask>
<mask> config.Init()
</s> Fix: resolve path in windows </s> remove if (homedir != "") {
if !path.IsAbs(homedir) {
</s> add if homedir != "" {
if !filepath.IsAbs(homedir) { </s> remove C "github.com/Dreamacro/clash/constant"
</s> add </s> remove "flag"
"path"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91e35f2f6a4a006e87682f91cf5e151b86c57fc0 | main.go |
github.com/Dreamacro/clash v1.6.5
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.3 // indirect
github.com/docker/docker v20.10.7+incompatible | <mask>
<mask> go 1.16
<mask>
<mask> require (
<mask> github.com/Dreamacro/clash v1.6.1-0.20210516120541-06fdd3abe0ab
<mask> github.com/Microsoft/go-winio v0.4.16 // indirect
<mask> github.com/containerd/containerd v1.4.4 // indirect
<mask> github.com/docker/distribution v2.7.1+incompatible // indirect
<mask> github.com/docker/docker v20.10.6+incompatible
<mask> github.com/docker/go-connections v0.4.0
<mask> github.com/docker/go-units v0.4.0 // indirect
<mask> github.com/gogo/protobuf v1.3.2 // indirect
<mask> github.com/google/go-cmp v0.5.5 // indirect
<mask> github.com/gorilla/mux v1.8.0 // indirect
</s> Test: add basic protocol benchmark </s> remove github.com/docker/go-units v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
</s> add </s> remove github.com/miekg/dns v1.1.42
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
</s> add github.com/miekg/dns v1.1.43
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect </s> remove github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
</s> add </s> remove golang.org/x/net v0.0.0-20210510120150-4163338589ed
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/grpc v1.36.0 // indirect
gotest.tools/v3 v3.0.3 // indirect
</s> add golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
google.golang.org/grpc v1.39.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91ed0118f628dd378fb3c74a23f3e46f838012ae | test/go.mod |
<mask> github.com/containerd/containerd v1.4.4 // indirect
<mask> github.com/docker/distribution v2.7.1+incompatible // indirect
<mask> github.com/docker/docker v20.10.6+incompatible
<mask> github.com/docker/go-connections v0.4.0
<mask> github.com/docker/go-units v0.4.0 // indirect
<mask> github.com/gogo/protobuf v1.3.2 // indirect
<mask> github.com/google/go-cmp v0.5.5 // indirect
<mask> github.com/gorilla/mux v1.8.0 // indirect
<mask> github.com/miekg/dns v1.1.42
<mask> github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
<mask> github.com/morikuni/aec v1.0.0 // indirect
<mask> github.com/opencontainers/go-digest v1.0.0 // indirect
</s> Test: add basic protocol benchmark </s> remove github.com/Dreamacro/clash v1.6.1-0.20210516120541-06fdd3abe0ab
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/containerd/containerd v1.4.4 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.6+incompatible
</s> add github.com/Dreamacro/clash v1.6.5
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.3 // indirect
github.com/docker/docker v20.10.7+incompatible </s> remove github.com/miekg/dns v1.1.42
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
</s> add github.com/miekg/dns v1.1.43
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect </s> remove github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
</s> add </s> remove golang.org/x/net v0.0.0-20210510120150-4163338589ed
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/grpc v1.36.0 // indirect
gotest.tools/v3 v3.0.3 // indirect
</s> add golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
google.golang.org/grpc v1.39.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91ed0118f628dd378fb3c74a23f3e46f838012ae | test/go.mod | |
github.com/miekg/dns v1.1.43
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect | <mask> github.com/docker/go-units v0.4.0 // indirect
<mask> github.com/gogo/protobuf v1.3.2 // indirect
<mask> github.com/google/go-cmp v0.5.5 // indirect
<mask> github.com/gorilla/mux v1.8.0 // indirect
<mask> github.com/miekg/dns v1.1.42
<mask> github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
<mask> github.com/morikuni/aec v1.0.0 // indirect
<mask> github.com/opencontainers/go-digest v1.0.0 // indirect
<mask> github.com/opencontainers/image-spec v1.0.1 // indirect
<mask> github.com/stretchr/testify v1.7.0
<mask> golang.org/x/net v0.0.0-20210510120150-4163338589ed
</s> Test: add basic protocol benchmark </s> remove github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
</s> add </s> remove github.com/docker/go-units v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
</s> add </s> remove golang.org/x/net v0.0.0-20210510120150-4163338589ed
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/grpc v1.36.0 // indirect
gotest.tools/v3 v3.0.3 // indirect
</s> add golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
google.golang.org/grpc v1.39.0 // indirect </s> remove github.com/Dreamacro/clash v1.6.1-0.20210516120541-06fdd3abe0ab
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/containerd/containerd v1.4.4 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.6+incompatible
</s> add github.com/Dreamacro/clash v1.6.5
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.3 // indirect
github.com/docker/docker v20.10.7+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91ed0118f628dd378fb3c74a23f3e46f838012ae | test/go.mod |
<mask> github.com/gorilla/mux v1.8.0 // indirect
<mask> github.com/miekg/dns v1.1.42
<mask> github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
<mask> github.com/morikuni/aec v1.0.0 // indirect
<mask> github.com/opencontainers/go-digest v1.0.0 // indirect
<mask> github.com/opencontainers/image-spec v1.0.1 // indirect
<mask> github.com/stretchr/testify v1.7.0
<mask> golang.org/x/net v0.0.0-20210510120150-4163338589ed
<mask> golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
<mask> google.golang.org/grpc v1.36.0 // indirect
<mask> gotest.tools/v3 v3.0.3 // indirect
</s> Test: add basic protocol benchmark </s> remove golang.org/x/net v0.0.0-20210510120150-4163338589ed
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/grpc v1.36.0 // indirect
gotest.tools/v3 v3.0.3 // indirect
</s> add golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
google.golang.org/grpc v1.39.0 // indirect </s> remove github.com/miekg/dns v1.1.42
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
</s> add github.com/miekg/dns v1.1.43
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect </s> remove github.com/docker/go-units v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
</s> add </s> remove github.com/Dreamacro/clash v1.6.1-0.20210516120541-06fdd3abe0ab
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/containerd/containerd v1.4.4 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.6+incompatible
</s> add github.com/Dreamacro/clash v1.6.5
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.3 // indirect
github.com/docker/docker v20.10.7+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/91ed0118f628dd378fb3c74a23f3e46f838012ae | test/go.mod | |
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
google.golang.org/grpc v1.39.0 // indirect | <mask> github.com/morikuni/aec v1.0.0 // indirect
<mask> github.com/opencontainers/go-digest v1.0.0 // indirect
<mask> github.com/opencontainers/image-spec v1.0.1 // indirect
<mask> github.com/stretchr/testify v1.7.0
<mask> golang.org/x/net v0.0.0-20210510120150-4163338589ed
<mask> golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
<mask> google.golang.org/grpc v1.36.0 // indirect
<mask> gotest.tools/v3 v3.0.3 // indirect
<mask> )
</s> Test: add basic protocol benchmark </s> remove github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
</s> add </s> remove github.com/miekg/dns v1.1.42
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
</s> add github.com/miekg/dns v1.1.43
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect </s> remove github.com/docker/go-units v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
</s> add </s> remove github.com/Dreamacro/clash v1.6.1-0.20210516120541-06fdd3abe0ab
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/containerd/containerd v1.4.4 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.6+incompatible
</s> add github.com/Dreamacro/clash v1.6.5
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.3 // indirect
github.com/docker/docker v20.10.7+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/91ed0118f628dd378fb3c74a23f3e46f838012ae | test/go.mod |
"crypto/tls" | <mask>
<mask> import (
<mask> "bytes"
<mask> "context"
<mask> "io"
<mask> "net"
<mask> "net/http"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/resolver"
</s> Fix: ALPN should on DoH instead of DoT (#2232) </s> remove // alpn identifier, see https://tools.ietf.org/html/draft-hoffman-dprive-dns-tls-alpn-00#page-6
NextProtos: []string{"dns"},
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93400cf44def4d0ad7c7e8094877d8ce65cfa7d2 | dns/doh.go |
TLSClientConfig: &tls.Config{
// alpn identifier, see https://tools.ietf.org/html/draft-hoffman-dprive-dns-tls-alpn-00#page-6
NextProtos: []string{"dns"},
}, | <mask> }
<mask>
<mask> return dialer.DialContext(ctx, "tcp", net.JoinHostPort(ip.String(), port), options...)
<mask> },
<mask> },
<mask> }
<mask> }
</s> Fix: ALPN should on DoH instead of DoT (#2232) </s> remove // alpn identifier, see https://tools.ietf.org/html/draft-hoffman-dprive-dns-tls-alpn-00#page-6
NextProtos: []string{"dns"},
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93400cf44def4d0ad7c7e8094877d8ce65cfa7d2 | dns/doh.go |
<mask> ret = append(ret, &client{
<mask> Client: &D.Client{
<mask> Net: s.Net,
<mask> TLSConfig: &tls.Config{
<mask> // alpn identifier, see https://tools.ietf.org/html/draft-hoffman-dprive-dns-tls-alpn-00#page-6
<mask> NextProtos: []string{"dns"},
<mask> ServerName: host,
<mask> },
<mask> UDPSize: 4096,
<mask> Timeout: 5 * time.Second,
<mask> },
</s> Fix: ALPN should on DoH instead of DoT (#2232) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93400cf44def4d0ad7c7e8094877d8ce65cfa7d2 | dns/util.go | |
// EvictCallback is used to get a callback when a cache entry is evicted
type EvictCallback func(key interface{}, value interface{})
// WithEvict set the evict callback
func WithEvict(cb EvictCallback) Option {
return func(l *LruCache) {
l.onEvict = cb
}
}
| <mask> // Option is part of Functional Options Pattern
<mask> type Option func(*LruCache)
<mask>
<mask> // WithUpdateAgeOnGet update expires when Get element
<mask> func WithUpdateAgeOnGet() Option {
<mask> return func(l *LruCache) {
<mask> l.updateAgeOnGet = true
<mask> }
</s> Feature: lru cache add evict callback | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93e0dbdc785a8cd744d3ae88c9bb352c769ee719 | common/cache/lrucache.go |
onEvict EvictCallback | <mask> cache map[interface{}]*list.Element
<mask> lru *list.List // Front is least-recent
<mask> updateAgeOnGet bool
<mask> }
<mask>
<mask> // NewLRUCache creates an LruCache
<mask> func NewLRUCache(options ...Option) *LruCache {
</s> Feature: lru cache add evict callback | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93e0dbdc785a8cd744d3ae88c9bb352c769ee719 | common/cache/lrucache.go |
if c.onEvict != nil {
c.onEvict(e.key, e.value)
} | <mask> func (c *LruCache) deleteElement(le *list.Element) {
<mask> c.lru.Remove(le)
<mask> e := le.Value.(*entry)
<mask> delete(c.cache, e.key)
<mask> }
<mask>
<mask> type entry struct {
<mask> key interface{}
<mask> value interface{}
</s> Feature: lru cache add evict callback | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93e0dbdc785a8cd744d3ae88c9bb352c769ee719 | common/cache/lrucache.go |
n, _, e := uc.PacketConn.ReadFrom(b) | <mask> return uc.PacketConn.WriteTo(packet[3:], addr)
<mask> }
<mask>
<mask> func (uc *ssUDPConn) ReadFrom(b []byte) (int, net.Addr, error) {
<mask> n, a, e := uc.PacketConn.ReadFrom(b)
<mask> addr := socks5.SplitAddr(b[:n])
<mask> copy(b, b[len(addr):])
<mask> return n - len(addr), a, e
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove return n - len(addr), a, e
</s> add return n - len(addr), from, e </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) </s> remove return p.host.Search(host) != nil
</s> add return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | adapters/outbound/shadowsocks.go |
var from net.Addr
if e == nil {
// Get the source IP/Port of packet.
from = addr.UDPAddr()
} | <mask> n, _, e := uc.PacketConn.ReadFrom(b)
<mask> addr := socks5.SplitAddr(b[:n])
<mask> copy(b, b[len(addr):])
<mask> return n - len(addr), from, e
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove return n - len(addr), a, e
</s> add return n - len(addr), from, e </s> remove n, a, e := uc.PacketConn.ReadFrom(b)
</s> add n, _, e := uc.PacketConn.ReadFrom(b) </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove return p.host.Search(host) != nil
</s> add return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | adapters/outbound/shadowsocks.go |
return n - len(addr), from, e | <mask> func (uc *ssUDPConn) ReadFrom(b []byte) (int, net.Addr, error) {
<mask> n, a, e := uc.PacketConn.ReadFrom(b)
<mask> addr := socks5.SplitAddr(b[:n])
<mask> copy(b, b[len(addr):])
<mask> return n - len(addr), a, e
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove n, a, e := uc.PacketConn.ReadFrom(b)
</s> add n, _, e := uc.PacketConn.ReadFrom(b) </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload </s> remove return p.host.Search(host) != nil
</s> add return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | adapters/outbound/shadowsocks.go |
// LookupHost return if domain in host
func (p *Pool) LookupHost(domain string) bool { | <mask>
<mask> return "", false
<mask> }
<mask>
<mask> // LookupHost return if host in host
<mask> func (p *Pool) LookupHost(host string) bool {
<mask> if p.host == nil {
<mask> return false
<mask> }
<mask> return p.host.Search(host) != nil
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove return p.host.Search(host) != nil
</s> add return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) </s> remove return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.IsFakeIP()) && metadata.Host == "" && metadata.DstIP != nil
</s> add return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.FakeIPEnabled()) && metadata.Host == "" && metadata.DstIP != nil </s> remove func (r *Resolver) IsFakeIP() bool {
</s> add // FakeIPEnabled returns if fake-ip is enabled
func (r *Resolver) FakeIPEnabled() bool { </s> remove if dns.DefaultResolver.IsFakeIP() {
</s> add if dns.DefaultResolver.FakeIPEnabled() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | component/fakeip/pool.go |
return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) | <mask> func (p *Pool) LookupHost(host string) bool {
<mask> if p.host == nil {
<mask> return false
<mask> }
<mask> return p.host.Search(host) != nil
<mask> }
<mask>
<mask> // Gateway return gateway ip
<mask> func (p *Pool) Gateway() net.IP {
<mask> return uintToIP(p.gateway)
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove // LookupHost return if host in host
func (p *Pool) LookupHost(host string) bool {
</s> add // LookupHost return if domain in host
func (p *Pool) LookupHost(domain string) bool { </s> remove return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.IsFakeIP()) && metadata.Host == "" && metadata.DstIP != nil
</s> add return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.FakeIPEnabled()) && metadata.Host == "" && metadata.DstIP != nil </s> remove func (r *Resolver) IsFakeIP() bool {
</s> add // FakeIPEnabled returns if fake-ip is enabled
func (r *Resolver) FakeIPEnabled() bool { </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | component/fakeip/pool.go |
"encoding/binary" | <mask>
<mask> import (
<mask> "bytes"
<mask> "errors"
<mask> "io"
<mask> "net"
<mask> "strconv"
<mask>
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | component/socks5/socks5.go |
if resolver.FakeIPEnabled() { | <mask>
<mask> func newHandler(resolver *Resolver) handler {
<mask> middlewares := []middleware{}
<mask>
<mask> if resolver.IsFakeIP() {
<mask> middlewares = append(middlewares, withFakeIP(resolver.pool))
<mask> }
<mask>
<mask> return compose(middlewares, withResolver(resolver))
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove func (r *Resolver) IsFakeIP() bool {
</s> add // FakeIPEnabled returns if fake-ip is enabled
func (r *Resolver) FakeIPEnabled() bool { </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() </s> remove return p.host.Search(host) != nil
</s> add return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | dns/middleware.go |
// FakeIPEnabled returns if fake-ip is enabled
func (r *Resolver) FakeIPEnabled() bool { | <mask> func (r *Resolver) IsMapping() bool {
<mask> return r.mapping
<mask> }
<mask>
<mask> func (r *Resolver) IsFakeIP() bool {
<mask> return r.fakeip
<mask> }
<mask>
<mask> func (r *Resolver) batchExchange(clients []resolver, m *D.Msg) (msg *D.Msg, err error) {
<mask> fast, ctx := picker.WithTimeout(context.Background(), time.Second)
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove if resolver.IsFakeIP() {
</s> add if resolver.FakeIPEnabled() { </s> remove // LookupHost return if host in host
func (p *Pool) LookupHost(host string) bool {
</s> add // LookupHost return if domain in host
func (p *Pool) LookupHost(domain string) bool { </s> remove return p.host.Search(host) != nil
</s> add return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | dns/resolver.go |
// IsFakeIP determine if given ip is a fake-ip
func (r *Resolver) IsFakeIP(ip net.IP) bool {
if r.FakeIPEnabled() {
return r.pool.Exist(ip)
}
return false
}
| <mask> }
<mask>
<mask> func (r *Resolver) batchExchange(clients []resolver, m *D.Msg) (msg *D.Msg, err error) {
<mask> fast, ctx := picker.WithTimeout(context.Background(), time.Second)
<mask> for _, client := range clients {
<mask> r := client
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove func (r *Resolver) IsFakeIP() bool {
</s> add // FakeIPEnabled returns if fake-ip is enabled
func (r *Resolver) FakeIPEnabled() bool { </s> remove go func() {
queue := t.udpQueue.Out()
for elm := range queue {
conn := elm.(C.ServerAdapter)
t.handleUDPConn(conn)
}
}()
</s> add numUDPWorkers := 4
if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
}
for i := 0; i < numUDPWorkers; i++ {
go t.processUDP()
} </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | dns/resolver.go |
<mask> package socks
<mask>
<mask> import (
<mask> "bytes"
<mask> "net"
<mask>
<mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/socks5"
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove "bytes"
</s> add </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/udp.go | |
packet := &fakeConn{ | <mask> // Unresolved UDP packet, return buffer to the pool
<mask> pool.BufPool.Put(buf[:cap(buf)])
<mask> return
<mask> }
<mask> conn := &fakeConn{
<mask> PacketConn: pc,
<mask> remoteAddr: addr,
<mask> targetAddr: target,
<mask> buffer: bytes.NewBuffer(payload),
<mask> bufRef: buf,
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove buffer: bytes.NewBuffer(payload),
</s> add payload: payload, </s> remove tun.Add(adapters.NewSocket(target, conn, C.SOCKS, C.UDP))
</s> add tun.AddPacket(adapters.NewPacket(target, packet, C.SOCKS, C.UDP)) </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) </s> remove func (c *fakeConn) RemoteAddr() net.Addr {
</s> add // LocalAddr returns the source IP/Port of UDP Packet
func (c *fakeConn) LocalAddr() net.Addr { </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/udp.go |
payload: payload, | <mask> conn := &fakeConn{
<mask> PacketConn: pc,
<mask> remoteAddr: addr,
<mask> targetAddr: target,
<mask> buffer: bytes.NewBuffer(payload),
<mask> bufRef: buf,
<mask> }
<mask> tun.Add(adapters.NewSocket(target, conn, C.SOCKS, C.UDP))
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove tun.Add(adapters.NewSocket(target, conn, C.SOCKS, C.UDP))
</s> add tun.AddPacket(adapters.NewPacket(target, packet, C.SOCKS, C.UDP)) </s> remove conn := &fakeConn{
</s> add packet := &fakeConn{ </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove go func() {
queue := t.udpQueue.Out()
for elm := range queue {
conn := elm.(C.ServerAdapter)
t.handleUDPConn(conn)
}
}()
</s> add numUDPWorkers := 4
if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
}
for i := 0; i < numUDPWorkers; i++ {
go t.processUDP()
} </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/udp.go |
tun.AddPacket(adapters.NewPacket(target, packet, C.SOCKS, C.UDP)) | <mask> targetAddr: target,
<mask> buffer: bytes.NewBuffer(payload),
<mask> bufRef: buf,
<mask> }
<mask> tun.Add(adapters.NewSocket(target, conn, C.SOCKS, C.UDP))
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove buffer: bytes.NewBuffer(payload),
</s> add payload: payload, </s> remove conn := &fakeConn{
</s> add packet := &fakeConn{ </s> remove if dns.DefaultResolver.IsFakeIP() {
</s> add if dns.DefaultResolver.FakeIPEnabled() { </s> remove n, err = conn.Write(buf[:n])
</s> add n, err = packet.WriteBack(buf[:n], from) </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/udp.go |
<mask> package socks
<mask>
<mask> import (
<mask> "bytes"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> )
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove "bytes"
</s> add </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/utils.go | |
payload []byte | <mask> type fakeConn struct {
<mask> net.PacketConn
<mask> remoteAddr net.Addr
<mask> targetAddr socks5.Addr
<mask> buffer *bytes.Buffer
<mask> bufRef []byte
<mask> }
<mask>
<mask> func (c *fakeConn) Read(b []byte) (n int, err error) {
<mask> return c.buffer.Read(b)
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) </s> remove func (c *fakeConn) RemoteAddr() net.Addr {
</s> add // LocalAddr returns the source IP/Port of UDP Packet
func (c *fakeConn) LocalAddr() net.Addr { </s> remove n, a, e := uc.PacketConn.ReadFrom(b)
</s> add n, _, e := uc.PacketConn.ReadFrom(b) </s> remove return n - len(addr), a, e
</s> add return n - len(addr), from, e | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/utils.go |
func (c *fakeConn) Data() []byte {
return c.payload | <mask> buffer *bytes.Buffer
<mask> bufRef []byte
<mask> }
<mask>
<mask> func (c *fakeConn) Read(b []byte) (n int, err error) {
<mask> return c.buffer.Read(b)
<mask> }
<mask>
<mask> func (c *fakeConn) Write(b []byte) (n int, err error) {
<mask> packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
<mask> if err != nil {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove buffer *bytes.Buffer
</s> add payload []byte </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) </s> remove func (c *fakeConn) RemoteAddr() net.Addr {
</s> add // LocalAddr returns the source IP/Port of UDP Packet
func (c *fakeConn) LocalAddr() net.Addr { </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/utils.go |
// WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) | <mask> func (c *fakeConn) Read(b []byte) (n int, err error) {
<mask> return c.buffer.Read(b)
<mask> }
<mask>
<mask> func (c *fakeConn) Write(b []byte) (n int, err error) {
<mask> packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
<mask> if err != nil {
<mask> return
<mask> }
<mask> return c.PacketConn.WriteTo(packet, c.remoteAddr)
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload </s> remove buffer *bytes.Buffer
</s> add payload []byte </s> remove func (c *fakeConn) RemoteAddr() net.Addr {
</s> add // LocalAddr returns the source IP/Port of UDP Packet
func (c *fakeConn) LocalAddr() net.Addr { </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/utils.go |
// LocalAddr returns the source IP/Port of UDP Packet
func (c *fakeConn) LocalAddr() net.Addr { | <mask> }
<mask> return c.PacketConn.WriteTo(packet, c.remoteAddr)
<mask> }
<mask>
<mask> func (c *fakeConn) RemoteAddr() net.Addr {
<mask> return c.remoteAddr
<mask> }
<mask>
<mask> func (c *fakeConn) Close() error {
<mask> err := c.PacketConn.Close()
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload </s> remove buffer *bytes.Buffer
</s> add payload []byte </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | proxy/socks/utils.go |
C "github.com/Dreamacro/clash/constant"
| <mask> "time"
<mask>
<mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> )
<mask>
<mask> func (t *Tunnel) handleHTTP(request *adapters.HTTPAdapter, outbound net.Conn) {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() </s> remove switch req.Metadata().NetWork {
case C.TCP:
t.tcpQueue.In() <- req
case C.UDP:
t.udpQueue.In() <- req
}
</s> add t.tcpQueue.In() <- req
}
// AddPacket add udp Packet to queue
func (t *Tunnel) AddPacket(packet *inbound.PacketAdapter) {
t.udpQueue.In() <- packet | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/connection.go |
func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { | <mask> }
<mask> }
<mask> }
<mask>
<mask> func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
<mask> buf := pool.BufPool.Get().([]byte)
<mask> defer pool.BufPool.Put(buf[:cap(buf)])
<mask>
<mask> n, err := conn.Read(buf)
<mask> if err != nil {
<mask> return
<mask> }
<mask> if _, err = pc.WriteTo(buf[:n], addr); err != nil {
<mask> return
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) </s> remove func (t *Tunnel) handleUDPToLocal(conn net.Conn, pc net.PacketConn, key string, timeout time.Duration) {
</s> add func (t *Tunnel) handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, omitSrcAddr bool, timeout time.Duration) { </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) </s> remove n, err = conn.Write(buf[:n])
</s> add n, err = packet.WriteBack(buf[:n], from) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/connection.go |
DefaultManager.Upload() <- int64(len(packet.Data())) | <mask> n, err := conn.Read(buf)
<mask> if err != nil {
<mask> return
<mask> }
<mask> if _, err = pc.WriteTo(buf[:n], addr); err != nil {
<mask> return
<mask> }
<mask> DefaultManager.Upload() <- int64(n)
<mask> }
<mask>
<mask> func (t *Tunnel) handleUDPToLocal(conn net.Conn, pc net.PacketConn, key string, timeout time.Duration) {
<mask> buf := pool.BufPool.Get().([]byte)
<mask> defer pool.BufPool.Put(buf[:cap(buf)])
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove func (t *Tunnel) handleUDPToLocal(conn net.Conn, pc net.PacketConn, key string, timeout time.Duration) {
</s> add func (t *Tunnel) handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, omitSrcAddr bool, timeout time.Duration) { </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove n, err = conn.Write(buf[:n])
</s> add n, err = packet.WriteBack(buf[:n], from) </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/connection.go |
func (t *Tunnel) handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, omitSrcAddr bool, timeout time.Duration) { | <mask> }
<mask> DefaultManager.Upload() <- int64(n)
<mask> }
<mask>
<mask> func (t *Tunnel) handleUDPToLocal(conn net.Conn, pc net.PacketConn, key string, timeout time.Duration) {
<mask> buf := pool.BufPool.Get().([]byte)
<mask> defer pool.BufPool.Put(buf[:cap(buf)])
<mask> defer t.natTable.Delete(key)
<mask> defer pc.Close()
<mask>
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) </s> remove switch req.Metadata().NetWork {
case C.TCP:
t.tcpQueue.In() <- req
case C.UDP:
t.udpQueue.In() <- req
}
</s> add t.tcpQueue.In() <- req
}
// AddPacket add udp Packet to queue
func (t *Tunnel) AddPacket(packet *inbound.PacketAdapter) {
t.udpQueue.In() <- packet </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/connection.go |
n, from, err := pc.ReadFrom(buf) | <mask> defer pc.Close()
<mask>
<mask> for {
<mask> pc.SetReadDeadline(time.Now().Add(timeout))
<mask> n, _, err := pc.ReadFrom(buf)
<mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> n, err = conn.Write(buf[:n])
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove n, err = conn.Write(buf[:n])
</s> add n, err = packet.WriteBack(buf[:n], from) </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/connection.go |
if from != nil && omitSrcAddr {
from = nil
} | <mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> n, err = packet.WriteBack(buf[:n], from)
<mask> if err != nil {
<mask> return
<mask> }
<mask> DefaultManager.Download() <- int64(n)
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove n, err = conn.Write(buf[:n])
</s> add n, err = packet.WriteBack(buf[:n], from) </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/connection.go |
n, err = packet.WriteBack(buf[:n], from) | <mask> if err != nil {
<mask> return
<mask> }
<mask>
<mask> n, err = conn.Write(buf[:n])
<mask> if err != nil {
<mask> return
<mask> }
<mask> DefaultManager.Download() <- int64(n)
<mask> }
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
</s> add // WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/connection.go |
"runtime" | <mask> import (
<mask> "fmt"
<mask> "net"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/adapters/provider"
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
</s> add func (c *fakeConn) Data() []byte {
return c.payload | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
t.tcpQueue.In() <- req
}
// AddPacket add udp Packet to queue
func (t *Tunnel) AddPacket(packet *inbound.PacketAdapter) {
t.udpQueue.In() <- packet | <mask> }
<mask>
<mask> // Add request to queue
<mask> func (t *Tunnel) Add(req C.ServerAdapter) {
<mask> switch req.Metadata().NetWork {
<mask> case C.TCP:
<mask> t.tcpQueue.In() <- req
<mask> case C.UDP:
<mask> t.udpQueue.In() <- req
<mask> }
<mask> }
<mask>
<mask> // Rules return all rules
<mask> func (t *Tunnel) Rules() []C.Rule {
<mask> return t.rules
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) </s> remove func (t *Tunnel) handleUDPToLocal(conn net.Conn, pc net.PacketConn, key string, timeout time.Duration) {
</s> add func (t *Tunnel) handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, omitSrcAddr bool, timeout time.Duration) { </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
// processUDP starts a loop to handle udp packet
func (t *Tunnel) processUDP() {
queue := t.udpQueue.Out()
for elm := range queue {
conn := elm.(*inbound.PacketAdapter)
t.handleUDPConn(conn)
}
}
| <mask> }
<mask>
<mask> func (t *Tunnel) process() {
<mask> numUDPWorkers := 4
<mask> if runtime.NumCPU() > numUDPWorkers {
<mask> numUDPWorkers = runtime.NumCPU()
<mask> }
<mask> for i := 0; i < numUDPWorkers; i++ {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove go func() {
queue := t.udpQueue.Out()
for elm := range queue {
conn := elm.(C.ServerAdapter)
t.handleUDPConn(conn)
}
}()
</s> add numUDPWorkers := 4
if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
}
for i := 0; i < numUDPWorkers; i++ {
go t.processUDP()
} </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
numUDPWorkers := 4
if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
}
for i := 0; i < numUDPWorkers; i++ {
go t.processUDP()
} | <mask> t.mode = mode
<mask> }
<mask>
<mask> func (t *Tunnel) process() {
<mask> go func() {
<mask> queue := t.udpQueue.Out()
<mask> for elm := range queue {
<mask> conn := elm.(C.ServerAdapter)
<mask> t.handleUDPConn(conn)
<mask> }
<mask> }()
<mask>
<mask> queue := t.tcpQueue.Out()
<mask> for elm := range queue {
<mask> conn := elm.(C.ServerAdapter)
<mask> go t.handleTCPConn(conn)
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove switch req.Metadata().NetWork {
case C.TCP:
t.tcpQueue.In() <- req
case C.UDP:
t.udpQueue.In() <- req
}
</s> add t.tcpQueue.In() <- req
}
// AddPacket add udp Packet to queue
func (t *Tunnel) AddPacket(packet *inbound.PacketAdapter) {
t.udpQueue.In() <- packet </s> remove n, _, err := pc.ReadFrom(buf)
</s> add n, from, err := pc.ReadFrom(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.FakeIPEnabled()) && metadata.Host == "" && metadata.DstIP != nil | <mask> return dns.ResolveIP(host)
<mask> }
<mask>
<mask> func (t *Tunnel) needLookupIP(metadata *C.Metadata) bool {
<mask> return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.IsFakeIP()) && metadata.Host == "" && metadata.DstIP != nil
<mask> }
<mask>
<mask> func (t *Tunnel) resolveMetadata(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
<mask> // handle host equal IP string
<mask> if ip := net.ParseIP(metadata.Host); ip != nil {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove return p.host.Search(host) != nil
</s> add return p.host.Search(domain) != nil
}
// Exist returns if given ip exists in fake-ip pool
func (p *Pool) Exist(ip net.IP) bool {
p.mux.Lock()
defer p.mux.Unlock()
if ip = ip.To4(); ip == nil {
return false
}
n := ipToUint(ip.To4())
offset := n - p.min + 1
return p.cache.Exist(offset) </s> remove // LookupHost return if host in host
func (p *Pool) LookupHost(host string) bool {
</s> add // LookupHost return if domain in host
func (p *Pool) LookupHost(domain string) bool { </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
if dns.DefaultResolver.FakeIPEnabled() { | <mask> host, exist := dns.DefaultResolver.IPToHost(metadata.DstIP)
<mask> if exist {
<mask> metadata.Host = host
<mask> metadata.AddrType = C.AtypDomainName
<mask> if dns.DefaultResolver.IsFakeIP() {
<mask> metadata.DstIP = nil
<mask> }
<mask> }
<mask> }
<mask>
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.IsFakeIP()) && metadata.Host == "" && metadata.DstIP != nil
</s> add return dns.DefaultResolver != nil && (dns.DefaultResolver.IsMapping() || dns.DefaultResolver.FakeIPEnabled()) && metadata.Host == "" && metadata.DstIP != nil </s> remove if resolver.IsFakeIP() {
</s> add if resolver.FakeIPEnabled() { </s> remove n, err = conn.Write(buf[:n])
</s> add n, err = packet.WriteBack(buf[:n], from) </s> remove // LookupHost return if host in host
func (p *Pool) LookupHost(host string) bool {
</s> add // LookupHost return if domain in host
func (p *Pool) LookupHost(domain string) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() | <mask> }
<mask> return proxy, rule, nil
<mask> }
<mask>
<mask> func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
<mask> metadata := localConn.Metadata()
<mask> if !metadata.Valid() {
<mask> log.Warnln("[Metadata] not valid: %#v", metadata)
<mask> return
<mask> }
<mask>
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove src := localConn.RemoteAddr().String()
</s> add src := packet.LocalAddr().String() </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove switch req.Metadata().NetWork {
case C.TCP:
t.tcpQueue.In() <- req
case C.UDP:
t.udpQueue.In() <- req
}
</s> add t.tcpQueue.In() <- req
}
// AddPacket add udp Packet to queue
func (t *Tunnel) AddPacket(packet *inbound.PacketAdapter) {
t.udpQueue.In() <- packet </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
src := packet.LocalAddr().String() | <mask> log.Warnln("[Metadata] not valid: %#v", metadata)
<mask> return
<mask> }
<mask>
<mask> src := localConn.RemoteAddr().String()
<mask> dst := metadata.RemoteAddress()
<mask> key := src + "-" + dst
<mask>
<mask> pc, addr := t.natTable.Get(key)
<mask> if pc != nil {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() </s> remove go t.handleUDPToLocal(localConn, pc, key, udpTimeout)
</s> add // in fake-ip mode, Full-Cone NAT can never achieve, fallback to omitting src Addr
go t.handleUDPToLocal(packet.UDPPacket, pc, key, isFakeIP, udpTimeout) </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
t.handleUDPToRemote(packet, pc, addr) | <mask> key := src + "-" + dst
<mask>
<mask> pc, addr := t.natTable.Get(key)
<mask> if pc != nil {
<mask> t.handleUDPToRemote(localConn, pc, addr)
<mask> return
<mask> }
<mask>
<mask> lockKey := key + "-lock"
<mask> wg, loaded := t.natTable.GetOrCreateLock(lockKey)
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove src := localConn.RemoteAddr().String()
</s> add src := packet.LocalAddr().String() </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove go t.handleUDPToLocal(localConn, pc, key, udpTimeout)
</s> add // in fake-ip mode, Full-Cone NAT can never achieve, fallback to omitting src Addr
go t.handleUDPToLocal(packet.UDPPacket, pc, key, isFakeIP, udpTimeout) </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
isFakeIP := dns.DefaultResolver.IsFakeIP(metadata.DstIP)
| <mask> }
<mask>
<mask> lockKey := key + "-lock"
<mask> wg, loaded := t.natTable.GetOrCreateLock(lockKey)
<mask> go func() {
<mask> if !loaded {
<mask> wg.Add(1)
<mask> proxy, rule, err := t.resolveMetadata(metadata)
<mask> if err != nil {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove go func() {
queue := t.udpQueue.Out()
for elm := range queue {
conn := elm.(C.ServerAdapter)
t.handleUDPConn(conn)
}
}()
</s> add numUDPWorkers := 4
if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
}
for i := 0; i < numUDPWorkers; i++ {
go t.processUDP()
} </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() </s> remove src := localConn.RemoteAddr().String()
</s> add src := packet.LocalAddr().String() </s> remove if _, err = pc.WriteTo(buf[:n], addr); err != nil {
return
}
DefaultManager.Upload() <- int64(n)
</s> add DefaultManager.Upload() <- int64(len(packet.Data())) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
// in fake-ip mode, Full-Cone NAT can never achieve, fallback to omitting src Addr
go t.handleUDPToLocal(packet.UDPPacket, pc, key, isFakeIP, udpTimeout) | <mask>
<mask> t.natTable.Set(key, pc, addr)
<mask> t.natTable.Delete(lockKey)
<mask> wg.Done()
<mask> go t.handleUDPToLocal(localConn, pc, key, udpTimeout)
<mask> }
<mask>
<mask> wg.Wait()
<mask> pc, addr := t.natTable.Get(key)
<mask> if pc != nil {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove src := localConn.RemoteAddr().String()
</s> add src := packet.LocalAddr().String() </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove buffer: bytes.NewBuffer(payload),
</s> add payload: payload, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
t.handleUDPToRemote(packet, pc, addr) | <mask>
<mask> wg.Wait()
<mask> pc, addr := t.natTable.Get(key)
<mask> if pc != nil {
<mask> t.handleUDPToRemote(localConn, pc, addr)
<mask> }
<mask> }()
<mask> }
<mask>
<mask> func (t *Tunnel) handleTCPConn(localConn C.ServerAdapter) {
</s> Improve: UDP relay refactor (#441)
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com> </s> remove t.handleUDPToRemote(localConn, pc, addr)
</s> add t.handleUDPToRemote(packet, pc, addr) </s> remove go t.handleUDPToLocal(localConn, pc, key, udpTimeout)
</s> add // in fake-ip mode, Full-Cone NAT can never achieve, fallback to omitting src Addr
go t.handleUDPToLocal(packet.UDPPacket, pc, key, isFakeIP, udpTimeout) </s> remove src := localConn.RemoteAddr().String()
</s> add src := packet.LocalAddr().String() </s> remove func (t *Tunnel) handleUDPToRemote(conn net.Conn, pc net.PacketConn, addr net.Addr) {
buf := pool.BufPool.Get().([]byte)
defer pool.BufPool.Put(buf[:cap(buf)])
n, err := conn.Read(buf)
if err != nil {
</s> add func (t *Tunnel) handleUDPToRemote(packet C.UDPPacket, pc net.PacketConn, addr net.Addr) {
if _, err := pc.WriteTo(packet.Data(), addr); err != nil { </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter) {
metadata := localConn.Metadata()
</s> add func (t *Tunnel) handleUDPConn(packet *inbound.PacketAdapter) {
metadata := packet.Metadata() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/93ea037230893576279a098a3429d58db2a70473 | tunnel/tunnel.go |
func NewSelector(name string, proxies []C.Proxy) (*Selector, error) { | <mask> s.selected = proxy
<mask> return nil
<mask> }
<mask>
<mask> func NewSelector(name string, proxies map[string]C.Proxy) (*Selector, error) {
<mask> if len(proxies) == 0 {
<mask> return nil, errors.New("Provide at least one proxy")
<mask> }
<mask>
<mask> mapping := make(map[string]C.Proxy)
</s> Fix: selector no longer randomly selects </s> remove var init string
for k, v := range proxies {
mapping[k] = v
init = k
</s> add for _, proxy := range proxies {
mapping[proxy.Name()] = proxy </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range fallbackOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range urlTestOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | adapters/outbound/selector.go |
for _, proxy := range proxies {
mapping[proxy.Name()] = proxy | <mask> return nil, errors.New("Provide at least one proxy")
<mask> }
<mask>
<mask> mapping := make(map[string]C.Proxy)
<mask> var init string
<mask> for k, v := range proxies {
<mask> mapping[k] = v
<mask> init = k
<mask> }
<mask> s := &Selector{
<mask> name: name,
<mask> proxies: mapping,
<mask> selected: proxies[init],
</s> Fix: selector no longer randomly selects </s> remove selected: proxies[init],
</s> add selected: proxies[0], </s> remove func NewSelector(name string, proxies map[string]C.Proxy) (*Selector, error) {
</s> add func NewSelector(name string, proxies []C.Proxy) (*Selector, error) { </s> remove proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
</s> add var ps []C.Proxy
for _, v := range proxies {
ps = append(ps, v)
}
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps) </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | adapters/outbound/selector.go |
selected: proxies[0], | <mask> }
<mask> s := &Selector{
<mask> name: name,
<mask> proxies: mapping,
<mask> selected: proxies[init],
<mask> }
<mask> return s, nil
<mask> }
</s> Fix: selector no longer randomly selects </s> remove var init string
for k, v := range proxies {
mapping[k] = v
init = k
</s> add for _, proxy := range proxies {
mapping[proxy.Name()] = proxy </s> remove var ps []C.Proxy
for _, name := range fallbackOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range urlTestOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | adapters/outbound/selector.go |
ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | <mask> if err != nil {
<mask> break
<mask> }
<mask>
<mask> var ps []C.Proxy
<mask> for _, name := range urlTestOption.Proxies {
<mask> p, ok := proxies[name]
<mask> if !ok {
<mask> return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
<mask> }
<mask> ps = append(ps, p)
<mask> }
<mask> group, err = adapters.NewURLTest(*urlTestOption, ps)
<mask> case "select":
<mask> selectorOption := &adapters.SelectorOption{}
<mask> err = decoder.Decode(mapping, selectorOption)
</s> Fix: selector no longer randomly selects </s> remove var ps []C.Proxy
for _, name := range fallbackOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove group, err = adapters.NewSelector(selectorOption.Name, selectProxy)
</s> add group, err = adapters.NewSelector(selectorOption.Name, ps) </s> remove proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
</s> add var ps []C.Proxy
for _, v := range proxies {
ps = append(ps, v)
}
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | config/config.go |
ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | <mask> err = decoder.Decode(mapping, selectorOption)
<mask> if err != nil {
<mask> break
<mask> }
<mask> selectProxy := make(map[string]C.Proxy)
<mask> for _, name := range selectorOption.Proxies {
<mask> proxy, exist := proxies[name]
<mask> if !exist {
<mask> return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
<mask> }
<mask> selectProxy[name] = proxy
<mask> }
<mask> group, err = adapters.NewSelector(selectorOption.Name, selectProxy)
<mask> case "fallback":
<mask> fallbackOption := &adapters.FallbackOption{}
<mask> err = decoder.Decode(mapping, fallbackOption)
</s> Fix: selector no longer randomly selects </s> remove group, err = adapters.NewSelector(selectorOption.Name, selectProxy)
</s> add group, err = adapters.NewSelector(selectorOption.Name, ps) </s> remove var ps []C.Proxy
for _, name := range urlTestOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range fallbackOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var init string
for k, v := range proxies {
mapping[k] = v
init = k
</s> add for _, proxy := range proxies {
mapping[proxy.Name()] = proxy </s> remove proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
</s> add var ps []C.Proxy
for _, v := range proxies {
ps = append(ps, v)
}
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | config/config.go |
group, err = adapters.NewSelector(selectorOption.Name, ps) | <mask> return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
<mask> }
<mask> selectProxy[name] = proxy
<mask> }
<mask> group, err = adapters.NewSelector(selectorOption.Name, selectProxy)
<mask> case "fallback":
<mask> fallbackOption := &adapters.FallbackOption{}
<mask> err = decoder.Decode(mapping, fallbackOption)
<mask> if err != nil {
<mask> break
</s> Fix: selector no longer randomly selects </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range fallbackOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range urlTestOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var init string
for k, v := range proxies {
mapping[k] = v
init = k
</s> add for _, proxy := range proxies {
mapping[proxy.Name()] = proxy </s> remove proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
</s> add var ps []C.Proxy
for _, v := range proxies {
ps = append(ps, v)
}
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | config/config.go |
ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | <mask> err = decoder.Decode(mapping, fallbackOption)
<mask> if err != nil {
<mask> break
<mask> }
<mask> var ps []C.Proxy
<mask> for _, name := range fallbackOption.Proxies {
<mask> p, ok := proxies[name]
<mask> if !ok {
<mask> return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
<mask> }
<mask> ps = append(ps, p)
<mask> }
<mask> group, err = adapters.NewFallback(*fallbackOption, ps)
<mask> }
<mask> if err != nil {
<mask> return fmt.Errorf("Proxy %s: %s", groupName, err.Error())
</s> Fix: selector no longer randomly selects </s> remove var ps []C.Proxy
for _, name := range urlTestOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove group, err = adapters.NewSelector(selectorOption.Name, selectProxy)
</s> add group, err = adapters.NewSelector(selectorOption.Name, ps) </s> remove proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
</s> add var ps []C.Proxy
for _, v := range proxies {
ps = append(ps, v)
}
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | config/config.go |
var ps []C.Proxy
for _, v := range proxies {
ps = append(ps, v)
}
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps) | <mask> }
<mask> proxies[groupName] = group
<mask> }
<mask>
<mask> proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
<mask>
<mask> // close old goroutine
<mask> for _, proxy := range c.proxies {
<mask> switch raw := proxy.(type) {
<mask> case *adapters.URLTest:
</s> Fix: selector no longer randomly selects </s> remove var init string
for k, v := range proxies {
mapping[k] = v
init = k
</s> add for _, proxy := range proxies {
mapping[proxy.Name()] = proxy </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range urlTestOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range fallbackOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | config/config.go |
C "github.com/Dreamacro/clash/constant" | <mask> "fmt"
<mask> "strings"
<mask> )
<mask>
<mask> func trimArr(arr []string) (r []string) {
<mask> for _, e := range arr {
<mask> r = append(r, strings.Trim(e, " "))
<mask> }
</s> Fix: selector no longer randomly selects </s> remove proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", proxies)
</s> add var ps []C.Proxy
for _, v := range proxies {
ps = append(ps, v)
}
proxies["GLOBAL"], _ = adapters.NewSelector("GLOBAL", ps) </s> remove var init string
for k, v := range proxies {
mapping[k] = v
init = k
</s> add for _, proxy := range proxies {
mapping[proxy.Name()] = proxy </s> remove func NewSelector(name string, proxies map[string]C.Proxy) (*Selector, error) {
</s> add func NewSelector(name string, proxies []C.Proxy) (*Selector, error) { </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | config/utils.go |
func getProxies(mapping map[string]C.Proxy, list []string) ([]C.Proxy, error) {
var ps []C.Proxy
for _, name := range list {
p, ok := mapping[name]
if !ok {
return nil, fmt.Errorf("'%s' not found", name)
}
ps = append(ps, p)
}
return ps, nil
}
| <mask> }
<mask>
<mask> func or(pointers ...*int) *int {
<mask> for _, p := range pointers {
<mask> if p != nil {
<mask> return p
<mask> }
<mask> }
</s> Fix: selector no longer randomly selects </s> remove func NewSelector(name string, proxies map[string]C.Proxy) (*Selector, error) {
</s> add func NewSelector(name string, proxies []C.Proxy) (*Selector, error) { </s> remove var ps []C.Proxy
for _, name := range fallbackOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, fallbackOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove var ps []C.Proxy
for _, name := range urlTestOption.Proxies {
p, ok := proxies[name]
if !ok {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
ps = append(ps, p)
</s> add ps, err := getProxies(proxies, urlTestOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove selectProxy := make(map[string]C.Proxy)
for _, name := range selectorOption.Proxies {
proxy, exist := proxies[name]
if !exist {
return fmt.Errorf("ProxyGroup %s: proxy or proxy group '%s' not found", groupName, name)
}
selectProxy[name] = proxy
</s> add ps, err := getProxies(proxies, selectorOption.Proxies)
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94d1972782867966fc5c707e4c45c506533cca9b | config/utils.go |
s.single.Reset() | <mask> if proxy.Name() == name {
<mask> s.selected = name
<mask> return nil
<mask> }
<mask> }
<mask>
<mask> return errors.New("Proxy does not exist")
<mask> }
</s> Fix: make selector `react immediately` </s> remove const n = 10
</s> add const n = 5 </s> remove assert.Equal(t, 9, shardCount)
</s> add assert.Equal(t, 4, shardCount) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94e0e4b0008c49d074b0797aa12b49978391ffc6 | adapters/outboundgroup/selector.go |
func (s *Single) Reset() {
s.last = time.Time{}
}
| <mask> s.last = now
<mask> return call.val, call.err, false
<mask> }
<mask>
<mask> func NewSingle(wait time.Duration) *Single {
<mask> return &Single{wait: wait}
<mask> }
</s> Fix: make selector `react immediately` </s> remove const n = 10
</s> add const n = 5 </s> remove assert.Equal(t, 9, shardCount)
</s> add assert.Equal(t, 4, shardCount) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94e0e4b0008c49d074b0797aa12b49978391ffc6 | common/singledo/singledo.go |
const n = 5 | <mask> return nil, nil
<mask> }
<mask>
<mask> var wg sync.WaitGroup
<mask> const n = 10
<mask> wg.Add(n)
<mask> for i := 0; i < n; i++ {
<mask> go func() {
<mask> _, _, shard := single.Do(call)
<mask> if shard {
</s> Fix: make selector `react immediately` </s> remove assert.Equal(t, 9, shardCount)
</s> add assert.Equal(t, 4, shardCount) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94e0e4b0008c49d074b0797aa12b49978391ffc6 | common/singledo/singledo_test.go |
assert.Equal(t, 4, shardCount) | <mask> }
<mask>
<mask> wg.Wait()
<mask> assert.Equal(t, 1, foo)
<mask> assert.Equal(t, 9, shardCount)
<mask> }
<mask>
<mask> func TestTimer(t *testing.T) {
<mask> single := NewSingle(time.Millisecond * 30)
<mask> foo := 0
</s> Fix: make selector `react immediately` </s> remove const n = 10
</s> add const n = 5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/94e0e4b0008c49d074b0797aa12b49978391ffc6 | common/singledo/singledo_test.go |
func TestReset(t *testing.T) {
single := NewSingle(time.Millisecond * 30)
foo := 0
call := func() (interface{}, error) {
foo++
return nil, nil
}
single.Do(call)
single.Reset()
single.Do(call)
assert.Equal(t, 2, foo)
} | <mask>
<mask> assert.Equal(t, 1, foo)
<mask> assert.True(t, shard)
<mask> }
</s> Fix: make selector `react immediately` </s> remove assert.Equal(t, 9, shardCount)
</s> add assert.Equal(t, 4, shardCount) </s> remove const n = 10
</s> add const n = 5 | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/Dreamacro/clash/commit/94e0e4b0008c49d074b0797aa12b49978391ffc6 | common/singledo/singledo_test.go |
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error {
<mask> defer packet.Drop()
<mask>
<mask> addr := metadata.UDPAddr()
<mask> if addr == nil {
<mask> return errors.New("udp addr invalid")
<mask> }
<mask>
</s> Fix: should always drop packet when handle UDP packet (#2659) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95bbfe39457d1cc6c620d9f7718924ea6b39ef99 | tunnel/connection.go | |
packet.Drop() | <mask>
<mask> func handleUDPConn(packet *inbound.PacketAdapter) {
<mask> metadata := packet.Metadata()
<mask> if !metadata.Valid() {
<mask> log.Warnln("[Metadata] not valid: %#v", metadata)
<mask> return
<mask> }
<mask>
<mask> // make a fAddr if request ip is fakeip
</s> Fix: should always drop packet when handle UDP packet (#2659) </s> remove defer packet.Drop()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95bbfe39457d1cc6c620d9f7718924ea6b39ef99 | tunnel/tunnel.go |
packet.Drop() | <mask> fAddr = fAddr.Unmap()
<mask> }
<mask>
<mask> if err := preHandleMetadata(metadata); err != nil {
<mask> log.Debugln("[Metadata PreHandle] error: %s", err)
<mask> return
<mask> }
<mask>
<mask> // local resolve UDP dns
<mask> if !metadata.Resolved() {
</s> Fix: should always drop packet when handle UDP packet (#2659) </s> remove defer packet.Drop()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95bbfe39457d1cc6c620d9f7718924ea6b39ef99 | tunnel/tunnel.go |
packet.Drop() | <mask> ips, err := resolver.LookupIP(context.Background(), metadata.Host)
<mask> if err != nil {
<mask> return
<mask> } else if len(ips) == 0 {
<mask> packet.Drop()
<mask> return
</s> Fix: should always drop packet when handle UDP packet (#2659) </s> remove defer packet.Drop()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95bbfe39457d1cc6c620d9f7718924ea6b39ef99 | tunnel/tunnel.go |
packet.Drop() | <mask> if err != nil {
<mask> packet.Drop()
<mask> return
<mask> } else if len(ips) == 0 {
<mask> return
<mask> }
<mask> metadata.DstIP = ips[0]
<mask> }
<mask>
</s> Fix: should always drop packet when handle UDP packet (#2659) </s> remove defer packet.Drop()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95bbfe39457d1cc6c620d9f7718924ea6b39ef99 | tunnel/tunnel.go |
packet.Drop() | <mask> }
<mask>
<mask> if handle() {
<mask> return
<mask> }
<mask>
<mask> lockKey := key + "-lock"
</s> Fix: should always drop packet when handle UDP packet (#2659) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95bbfe39457d1cc6c620d9f7718924ea6b39ef99 | tunnel/tunnel.go |
defer packet.Drop()
| <mask> lockKey := key + "-lock"
<mask> cond, loaded := natTable.GetOrCreateLock(lockKey)
<mask>
<mask> go func() {
<mask> if loaded {
<mask> cond.L.Lock()
<mask> cond.Wait()
<mask> handle()
<mask> cond.L.Unlock()
</s> Fix: should always drop packet when handle UDP packet (#2659) </s> remove defer packet.Drop()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95bbfe39457d1cc6c620d9f7718924ea6b39ef99 | tunnel/tunnel.go |
"encoding/json" | <mask> "bytes"
<mask> "crypto/md5"
<mask> "errors"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net/url"
<mask> "os"
<mask> "sync"
</s> Feature: add basic api for proxy provider </s> remove "net/url"
</s> add </s> remove name := chi.URLParam(r, "name")
if newName, err := url.PathUnescape(name); err == nil {
name = newName
}
</s> add name := getEscapeParam(r, "name") </s> remove // When name is composed of a partial escape string, Golang does not unescape it
</s> add </s> remove CtxKeyProxyName = contextKey("proxy name")
CtxKeyProxy = contextKey("proxy")
</s> add CtxKeyProxyName = contextKey("proxy name")
CtxKeyProviderName = contextKey("provider name")
CtxKeyProxy = contextKey("proxy")
CtxKeyProvider = contextKey("provider") | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
HealthCheck() | <mask> Provider
<mask> Proxies() []C.Proxy
<mask> }
<mask>
<mask> type ProxySchema struct {
<mask> Proxies []map[string]interface{} `yaml:"proxies"`
<mask> }
</s> Feature: add basic api for proxy provider </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
updatedAt *time.Time | <mask> healthCheckOption *HealthCheckOption
<mask> ticker *time.Ticker
<mask>
<mask> // mux for avoiding creating new goroutines when pulling
<mask> mux sync.Mutex
<mask> }
</s> Feature: add basic api for proxy provider </s> remove name := chi.URLParam(r, "name")
if newName, err := url.PathUnescape(name); err == nil {
name = newName
}
</s> add name := getEscapeParam(r, "name") </s> remove // When name is composed of a partial escape string, Golang does not unescape it
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
func (pp *ProxySetProvider) MarshalJSON() ([]byte, error) {
return json.Marshal(map[string]interface{}{
"name": pp.Name(),
"type": pp.Type().String(),
"vehicleType": pp.VehicleType().String(),
"proxies": pp.Proxies(),
"updatedAt": pp.updatedAt,
})
}
| <mask> // mux for avoiding creating new goroutines when pulling
<mask> mux sync.Mutex
<mask> }
<mask>
<mask> func (pp *ProxySetProvider) Name() string {
<mask> return pp.name
<mask> }
<mask>
</s> Feature: add basic api for proxy provider </s> remove name := chi.URLParam(r, "name")
if newName, err := url.PathUnescape(name); err == nil {
name = newName
}
</s> add name := getEscapeParam(r, "name") | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
func (pp *ProxySetProvider) HealthCheck() {
pp.mux.Lock()
defer pp.mux.Unlock()
if pp.healthCheck != nil {
pp.healthCheck.check()
}
}
| <mask> return nil
<mask> }
<mask>
<mask> func (pp *ProxySetProvider) Destroy() error {
<mask> pp.mux.Lock()
<mask> defer pp.mux.Unlock()
<mask> if pp.healthCheck != nil {
</s> Feature: add basic api for proxy provider </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
now := time.Now()
pp.updatedAt = &now | <mask> }
<mask>
<mask> pp.hash = hash
<mask> pp.setProxies(proxies)
<mask>
<mask> return nil
<mask> }
<mask>
</s> Feature: add basic api for proxy provider </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
<mask> if pp.healthCheckOption != nil {
<mask> pp.mux.Lock()
<mask> if pp.healthCheck != nil {
<mask> pp.healthCheck.close()
<mask> pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
<mask> go pp.healthCheck.process()
<mask> }
<mask> pp.mux.Unlock()
<mask> }
<mask> }
<mask>
</s> Feature: add basic api for proxy provider | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go | |
pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process() | <mask> pp.mux.Lock()
<mask> if pp.healthCheck != nil {
<mask> pp.healthCheck.close()
<mask> }
<mask> pp.mux.Unlock()
<mask> }
<mask> }
<mask>
</s> Feature: add basic api for proxy provider </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
func (cp *CompatibleProvier) MarshalJSON() ([]byte, error) {
return json.Marshal(map[string]interface{}{
"name": cp.Name(),
"type": cp.Type().String(),
"vehicleType": cp.VehicleType().String(),
"proxies": cp.Proxies(),
})
}
| <mask> proxies []C.Proxy
<mask> }
<mask>
<mask> func (cp *CompatibleProvier) Name() string {
<mask> return cp.name
<mask> }
<mask>
<mask> func (cp *CompatibleProvier) Reload() error {
</s> Feature: add basic api for proxy provider </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
func (cp *CompatibleProvier) HealthCheck() {
if cp.healthCheck != nil {
cp.healthCheck.check()
}
}
| <mask> return nil
<mask> }
<mask>
<mask> func (cp *CompatibleProvier) Initial() error {
<mask> if cp.healthCheck != nil {
<mask> go cp.healthCheck.process()
<mask> }
<mask> return nil
</s> Feature: add basic api for proxy provider </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | adapters/provider/provider.go |
CtxKeyProxyName = contextKey("proxy name")
CtxKeyProviderName = contextKey("provider name")
CtxKeyProxy = contextKey("proxy")
CtxKeyProvider = contextKey("provider") | <mask> package route
<mask>
<mask> var (
<mask> CtxKeyProxyName = contextKey("proxy name")
<mask> CtxKeyProxy = contextKey("proxy")
<mask> )
<mask>
<mask> type contextKey string
<mask>
<mask> func (c contextKey) String() string {
</s> Feature: add basic api for proxy provider </s> remove "net/url"
</s> add </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | hub/route/ctxkeys.go |
<mask> import (
<mask> "context"
<mask> "fmt"
<mask> "net/http"
<mask> "net/url"
<mask> "strconv"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/outbound"
<mask> "github.com/Dreamacro/clash/adapters/outboundgroup"
</s> Feature: add basic api for proxy provider </s> remove CtxKeyProxyName = contextKey("proxy name")
CtxKeyProxy = contextKey("proxy")
</s> add CtxKeyProxyName = contextKey("proxy name")
CtxKeyProviderName = contextKey("provider name")
CtxKeyProxy = contextKey("proxy")
CtxKeyProvider = contextKey("provider") </s> remove name := chi.URLParam(r, "name")
if newName, err := url.PathUnescape(name); err == nil {
name = newName
}
</s> add name := getEscapeParam(r, "name") </s> remove // When name is composed of a partial escape string, Golang does not unescape it
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | hub/route/proxies.go | |
<mask> })
<mask> return r
<mask> }
<mask>
<mask> // When name is composed of a partial escape string, Golang does not unescape it
<mask> func parseProxyName(next http.Handler) http.Handler {
<mask> return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<mask> name := chi.URLParam(r, "name")
<mask> if newName, err := url.PathUnescape(name); err == nil {
<mask> name = newName
</s> Feature: add basic api for proxy provider </s> remove name := chi.URLParam(r, "name")
if newName, err := url.PathUnescape(name); err == nil {
name = newName
}
</s> add name := getEscapeParam(r, "name") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | hub/route/proxies.go | |
name := getEscapeParam(r, "name") | <mask>
<mask> // When name is composed of a partial escape string, Golang does not unescape it
<mask> func parseProxyName(next http.Handler) http.Handler {
<mask> return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<mask> name := chi.URLParam(r, "name")
<mask> if newName, err := url.PathUnescape(name); err == nil {
<mask> name = newName
<mask> }
<mask> ctx := context.WithValue(r.Context(), CtxKeyProxyName, name)
<mask> next.ServeHTTP(w, r.WithContext(ctx))
<mask> })
<mask> }
<mask>
</s> Feature: add basic api for proxy provider </s> remove // When name is composed of a partial escape string, Golang does not unescape it
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | hub/route/proxies.go |
r.Mount("/providers/proxies", proxyProviderRouter()) | <mask> r.Mount("/proxies", proxyRouter())
<mask> r.Mount("/rules", ruleRouter())
<mask> r.Mount("/connections", connectionRouter())
<mask> })
<mask>
<mask> if uiPath != "" {
<mask> r.Group(func(r chi.Router) {
<mask> fs := http.StripPrefix("/ui", http.FileServer(http.Dir(uiPath)))
</s> Feature: add basic api for proxy provider </s> remove name := chi.URLParam(r, "name")
if newName, err := url.PathUnescape(name); err == nil {
name = newName
}
</s> add name := getEscapeParam(r, "name") </s> remove // When name is composed of a partial escape string, Golang does not unescape it
</s> add </s> remove pp.healthCheck = newHealthCheck(proxies, pp.healthCheckOption.URL, pp.healthCheckOption.Interval)
go pp.healthCheck.process()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/95e9ae2d8d4d0bb474061dea5ce1c33528d4e210 | hub/route/server.go |
server string
cipher core.Cipher | <mask> return ss.conn
<mask> }
<mask>
<mask> type ShadowSocks struct {
<mask> server string
<mask> cipher string
<mask> password string
<mask> }
<mask>
<mask> func (ss *ShadowSocks) Generator(addr *C.Addr) (adapter C.ProxyAdapter, err error) {
<mask> var key []byte
<mask> ciph, _ := core.PickCipher(ss.cipher, key, ss.password)
</s> Fixed: throw error when shadowsocks cipher type wrong </s> remove var key []byte
ciph, _ := core.PickCipher(ss.cipher, key, ss.password)
</s> add </s> remove func NewShadowSocks(ssURL string) *ShadowSocks {
</s> add func NewShadowSocks(ssURL string) (*ShadowSocks, error) {
var key []byte </s> remove return &ShadowSocks{
server: server,
cipher: cipher,
password: password,
</s> add ciph, err := core.PickCipher(cipher, key, password)
if err != nil {
return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error()) </s> remove t.configLock.Lock()
defer t.configLock.Unlock()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/961250f99893c0439d791ef02bc3760efa1ea0b2 | adapters/shadowsocks.go |
<mask> password string
<mask> }
<mask>
<mask> func (ss *ShadowSocks) Generator(addr *C.Addr) (adapter C.ProxyAdapter, err error) {
<mask> var key []byte
<mask> ciph, _ := core.PickCipher(ss.cipher, key, ss.password)
<mask> c, err := net.Dial("tcp", ss.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", ss.server)
<mask> }
<mask> c.(*net.TCPConn).SetKeepAlive(true)
</s> Fixed: throw error when shadowsocks cipher type wrong </s> remove server string
cipher string
password string
</s> add server string
cipher core.Cipher </s> remove c = ciph.StreamConn(c)
</s> add c = ss.cipher.StreamConn(c) </s> remove return &ShadowSocks{
server: server,
cipher: cipher,
password: password,
</s> add ciph, err := core.PickCipher(cipher, key, password)
if err != nil {
return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error()) </s> remove func NewShadowSocks(ssURL string) *ShadowSocks {
</s> add func NewShadowSocks(ssURL string) (*ShadowSocks, error) {
var key []byte | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/961250f99893c0439d791ef02bc3760efa1ea0b2 | adapters/shadowsocks.go | |
c = ss.cipher.StreamConn(c) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", ss.server)
<mask> }
<mask> c.(*net.TCPConn).SetKeepAlive(true)
<mask> c = ciph.StreamConn(c)
<mask> _, err = c.Write(serializesSocksAddr(addr))
<mask> return &ShadowsocksAdapter{conn: c}, err
<mask> }
<mask>
<mask> func NewShadowSocks(ssURL string) *ShadowSocks {
</s> Fixed: throw error when shadowsocks cipher type wrong </s> remove func NewShadowSocks(ssURL string) *ShadowSocks {
</s> add func NewShadowSocks(ssURL string) (*ShadowSocks, error) {
var key []byte </s> remove var key []byte
ciph, _ := core.PickCipher(ss.cipher, key, ss.password)
</s> add </s> remove return &ShadowSocks{
server: server,
cipher: cipher,
password: password,
</s> add ciph, err := core.PickCipher(cipher, key, password)
if err != nil {
return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error()) </s> remove t.proxys[key.Name()] = adapters.NewShadowSocks(ssURL)
</s> add ss, err := adapters.NewShadowSocks(ssURL)
if err != nil {
return err
}
proxys[key.Name()] = ss | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/961250f99893c0439d791ef02bc3760efa1ea0b2 | adapters/shadowsocks.go |
func NewShadowSocks(ssURL string) (*ShadowSocks, error) {
var key []byte | <mask> _, err = c.Write(serializesSocksAddr(addr))
<mask> return &ShadowsocksAdapter{conn: c}, err
<mask> }
<mask>
<mask> func NewShadowSocks(ssURL string) *ShadowSocks {
<mask> server, cipher, password, _ := parseURL(ssURL)
<mask> return &ShadowSocks{
<mask> server: server,
<mask> cipher: cipher,
<mask> password: password,
</s> Fixed: throw error when shadowsocks cipher type wrong </s> remove return &ShadowSocks{
server: server,
cipher: cipher,
password: password,
</s> add ciph, err := core.PickCipher(cipher, key, password)
if err != nil {
return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error()) </s> remove c = ciph.StreamConn(c)
</s> add c = ss.cipher.StreamConn(c) </s> remove var key []byte
ciph, _ := core.PickCipher(ss.cipher, key, ss.password)
</s> add </s> remove server string
cipher string
password string
</s> add server string
cipher core.Cipher | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/961250f99893c0439d791ef02bc3760efa1ea0b2 | adapters/shadowsocks.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.