docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
func (l *httpListener) Address() string {
return l.address | <mask> l.Close()
<mask> closed <- struct{}{}
<mask> }()
<mask>
<mask> return done, closed, nil
<mask> }
<mask>
<mask> func handleConn(conn net.Conn) {
<mask> br := bufio.NewReader(conn)
<mask> request, err := http.ReadRequest(br)
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return hl, nil
}
func (l *httpListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove return done, closed, nil
</s> add func (l *sockListener) Address() string {
return l.address </s> remove return done, closed, nil
</s> add func (l *redirListener) Address() string {
return l.address </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return rl, nil
}
func (l *redirListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return sl, nil
}
func (l *sockListener) Close() {
l.closed = true
l.Listener.Close()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/http/server.go |
socksListener listener
httpListener listener
redirListener listener | <mask>
<mask> var (
<mask> allowLan = false
<mask>
<mask> socksListener *listener
<mask> httpListener *listener
<mask> redirListener *listener
<mask> )
<mask>
<mask> type listener struct {
<mask> Address string
<mask> Done chan<- struct{}
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove type listener struct {
Address string
Done chan<- struct{}
Closed <-chan struct{}
</s> add type listener interface {
Close()
Address() string </s> remove func NewHttpProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type httpListener struct {
net.Listener
address string
closed bool
}
func NewHttpProxy(addr string) (*httpListener, error) { </s> remove func NewRedirProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type redirListener struct {
net.Listener
address string
closed bool
}
func NewRedirProxy(addr string) (*redirListener, error) { </s> remove func NewSocksProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type sockListener struct {
net.Listener
address string
closed bool
}
func NewSocksProxy(addr string) (*sockListener, error) { </s> remove done, closed, err := socks.NewSocksProxy(addr)
</s> add var err error
socksListener, err = socks.NewSocksProxy(addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
type listener interface {
Close()
Address() string | <mask> httpListener *listener
<mask> redirListener *listener
<mask> )
<mask>
<mask> type listener struct {
<mask> Address string
<mask> Done chan<- struct{}
<mask> Closed <-chan struct{}
<mask> }
<mask>
<mask> type Ports struct {
<mask> Port int `json:"port"`
<mask> SocksPort int `json:"socks-port"`
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove socksListener *listener
httpListener *listener
redirListener *listener
</s> add socksListener listener
httpListener listener
redirListener listener </s> remove func NewHttpProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type httpListener struct {
net.Listener
address string
closed bool
}
func NewHttpProxy(addr string) (*httpListener, error) { </s> remove func NewRedirProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type redirListener struct {
net.Listener
address string
closed bool
}
func NewRedirProxy(addr string) (*redirListener, error) { </s> remove func NewSocksProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type sockListener struct {
net.Listener
address string
closed bool
}
func NewSocksProxy(addr string) (*sockListener, error) { </s> remove httpListener.Done <- struct{}{}
<-httpListener.Closed
</s> add httpListener.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
if httpListener.Address() == addr { | <mask> func ReCreateHTTP(port int) error {
<mask> addr := genAddr(port, allowLan)
<mask>
<mask> if httpListener != nil {
<mask> if httpListener.Address == addr {
<mask> return nil
<mask> }
<mask> httpListener.Done <- struct{}{}
<mask> <-httpListener.Closed
<mask> httpListener = nil
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove httpListener.Done <- struct{}{}
<-httpListener.Closed
</s> add httpListener.Close() </s> remove if redirListener.Address == addr {
</s> add if redirListener.Address() == addr { </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
httpListener.Close() | <mask> if httpListener != nil {
<mask> if httpListener.Address == addr {
<mask> return nil
<mask> }
<mask> httpListener.Done <- struct{}{}
<mask> <-httpListener.Closed
<mask> httpListener = nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove if httpListener.Address == addr {
</s> add if httpListener.Address() == addr { </s> remove socksListener.Done <- struct{}{}
<-socksListener.Closed
</s> add socksListener.Close() </s> remove redirListener.Done <- struct{}{}
<-redirListener.Closed
</s> add redirListener.Close() </s> remove if redirListener.Address == addr {
</s> add if redirListener.Address() == addr { </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
var err error
httpListener, err = http.NewHttpProxy(addr) | <mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> done, closed, err := http.NewHttpProxy(addr)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> httpListener = &listener{
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove done, closed, err := socks.NewSocksProxy(addr)
</s> add var err error
socksListener, err = socks.NewSocksProxy(addr) </s> remove done, closed, err := redir.NewRedirProxy(addr)
</s> add var err error
redirListener, err = redir.NewRedirProxy(addr) </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove redirListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> httpListener = &listener{
<mask> Address: addr,
<mask> Done: done,
<mask> Closed: closed,
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateSocks(port int) error {
<mask> addr := genAddr(port, allowLan)
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove redirListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { </s> remove if httpListener.Address == addr {
</s> add if httpListener.Address() == addr { </s> remove if redirListener.Address == addr {
</s> add if redirListener.Address() == addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go | |
if socksListener.Address() == addr { | <mask> func ReCreateSocks(port int) error {
<mask> addr := genAddr(port, allowLan)
<mask>
<mask> if socksListener != nil {
<mask> if socksListener.Address == addr {
<mask> return nil
<mask> }
<mask> socksListener.Done <- struct{}{}
<mask> <-socksListener.Closed
<mask> socksListener = nil
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove socksListener.Done <- struct{}{}
<-socksListener.Closed
</s> add socksListener.Close() </s> remove if redirListener.Address == addr {
</s> add if redirListener.Address() == addr { </s> remove if httpListener.Address == addr {
</s> add if httpListener.Address() == addr { </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
socksListener.Close() | <mask> if socksListener != nil {
<mask> if socksListener.Address == addr {
<mask> return nil
<mask> }
<mask> socksListener.Done <- struct{}{}
<mask> <-socksListener.Closed
<mask> socksListener = nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { </s> remove httpListener.Done <- struct{}{}
<-httpListener.Closed
</s> add httpListener.Close() </s> remove redirListener.Done <- struct{}{}
<-redirListener.Closed
</s> add redirListener.Close() </s> remove if redirListener.Address == addr {
</s> add if redirListener.Address() == addr { </s> remove if httpListener.Address == addr {
</s> add if httpListener.Address() == addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
var err error
socksListener, err = socks.NewSocksProxy(addr) | <mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> done, closed, err := socks.NewSocksProxy(addr)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> socksListener = &listener{
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove done, closed, err := redir.NewRedirProxy(addr)
</s> add var err error
redirListener, err = redir.NewRedirProxy(addr) </s> remove done, closed, err := http.NewHttpProxy(addr)
</s> add var err error
httpListener, err = http.NewHttpProxy(addr) </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove redirListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> socksListener = &listener{
<mask> Address: addr,
<mask> Done: done,
<mask> Closed: closed,
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> func ReCreateRedir(port int) error {
<mask> addr := genAddr(port, allowLan)
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove redirListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove if redirListener.Address == addr {
</s> add if redirListener.Address() == addr { </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { </s> remove done, closed, err := socks.NewSocksProxy(addr)
</s> add var err error
socksListener, err = socks.NewSocksProxy(addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go | |
if redirListener.Address() == addr { | <mask> func ReCreateRedir(port int) error {
<mask> addr := genAddr(port, allowLan)
<mask>
<mask> if redirListener != nil {
<mask> if redirListener.Address == addr {
<mask> return nil
<mask> }
<mask> redirListener.Done <- struct{}{}
<mask> <-redirListener.Closed
<mask> redirListener = nil
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove redirListener.Done <- struct{}{}
<-redirListener.Closed
</s> add redirListener.Close() </s> remove if httpListener.Address == addr {
</s> add if httpListener.Address() == addr { </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
redirListener.Close() | <mask> if redirListener != nil {
<mask> if redirListener.Address == addr {
<mask> return nil
<mask> }
<mask> redirListener.Done <- struct{}{}
<mask> <-redirListener.Closed
<mask> redirListener = nil
<mask> }
<mask>
<mask> if portIsZero(addr) {
<mask> return nil
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove if redirListener.Address == addr {
</s> add if redirListener.Address() == addr { </s> remove httpListener.Done <- struct{}{}
<-httpListener.Closed
</s> add httpListener.Close() </s> remove socksListener.Done <- struct{}{}
<-socksListener.Closed
</s> add socksListener.Close() </s> remove if httpListener.Address == addr {
</s> add if httpListener.Address() == addr { </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
var err error
redirListener, err = redir.NewRedirProxy(addr) | <mask> if portIsZero(addr) {
<mask> return nil
<mask> }
<mask>
<mask> done, closed, err := redir.NewRedirProxy(addr)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> redirListener = &listener{
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove done, closed, err := http.NewHttpProxy(addr)
</s> add var err error
httpListener, err = http.NewHttpProxy(addr) </s> remove done, closed, err := socks.NewSocksProxy(addr)
</s> add var err error
socksListener, err = socks.NewSocksProxy(addr) </s> remove redirListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> redirListener = &listener{
<mask> Address: addr,
<mask> Done: done,
<mask> Closed: closed,
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // GetPorts return the ports of proxy servers
<mask> func GetPorts() *Ports {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove httpListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove socksListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove done, closed, err := redir.NewRedirProxy(addr)
</s> add var err error
redirListener, err = redir.NewRedirProxy(addr) </s> remove done, closed, err := http.NewHttpProxy(addr)
</s> add var err error
httpListener, err = http.NewHttpProxy(addr) </s> remove done, closed, err := socks.NewSocksProxy(addr)
</s> add var err error
socksListener, err = socks.NewSocksProxy(addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go | |
_, portStr, _ := net.SplitHostPort(httpListener.Address()) | <mask> func GetPorts() *Ports {
<mask> ports := &Ports{}
<mask>
<mask> if httpListener != nil {
<mask> _, portStr, _ := net.SplitHostPort(httpListener.Address)
<mask> port, _ := strconv.Atoi(portStr)
<mask> ports.Port = port
<mask> }
<mask>
<mask> if socksListener != nil {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove _, portStr, _ := net.SplitHostPort(socksListener.Address)
</s> add _, portStr, _ := net.SplitHostPort(socksListener.Address()) </s> remove _, portStr, _ := net.SplitHostPort(redirListener.Address)
</s> add _, portStr, _ := net.SplitHostPort(redirListener.Address()) </s> remove redirListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { </s> remove if httpListener.Address == addr {
</s> add if httpListener.Address() == addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
_, portStr, _ := net.SplitHostPort(socksListener.Address()) | <mask> ports.Port = port
<mask> }
<mask>
<mask> if socksListener != nil {
<mask> _, portStr, _ := net.SplitHostPort(socksListener.Address)
<mask> port, _ := strconv.Atoi(portStr)
<mask> ports.SocksPort = port
<mask> }
<mask>
<mask> if redirListener != nil {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove _, portStr, _ := net.SplitHostPort(redirListener.Address)
</s> add _, portStr, _ := net.SplitHostPort(redirListener.Address()) </s> remove _, portStr, _ := net.SplitHostPort(httpListener.Address)
</s> add _, portStr, _ := net.SplitHostPort(httpListener.Address()) </s> remove socksListener.Done <- struct{}{}
<-socksListener.Closed
</s> add socksListener.Close() </s> remove done, closed, err := socks.NewSocksProxy(addr)
</s> add var err error
socksListener, err = socks.NewSocksProxy(addr) </s> remove if socksListener.Address == addr {
</s> add if socksListener.Address() == addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
_, portStr, _ := net.SplitHostPort(redirListener.Address()) | <mask> ports.SocksPort = port
<mask> }
<mask>
<mask> if redirListener != nil {
<mask> _, portStr, _ := net.SplitHostPort(redirListener.Address)
<mask> port, _ := strconv.Atoi(portStr)
<mask> ports.RedirPort = port
<mask> }
<mask>
<mask> return ports
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove _, portStr, _ := net.SplitHostPort(socksListener.Address)
</s> add _, portStr, _ := net.SplitHostPort(socksListener.Address()) </s> remove _, portStr, _ := net.SplitHostPort(httpListener.Address)
</s> add _, portStr, _ := net.SplitHostPort(httpListener.Address()) </s> remove redirListener = &listener{
Address: addr,
Done: done,
Closed: closed,
}
</s> add </s> remove done, closed, err := redir.NewRedirProxy(addr)
</s> add var err error
redirListener, err = redir.NewRedirProxy(addr) </s> remove redirListener.Done <- struct{}{}
<-redirListener.Closed
</s> add redirListener.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/listener.go |
type redirListener struct {
net.Listener
address string
closed bool
}
func NewRedirProxy(addr string) (*redirListener, error) { | <mask> var (
<mask> tun = tunnel.Instance()
<mask> )
<mask>
<mask> func NewRedirProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove func NewHttpProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type httpListener struct {
net.Listener
address string
closed bool
}
func NewHttpProxy(addr string) (*httpListener, error) { </s> remove func NewSocksProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type sockListener struct {
net.Listener
address string
closed bool
}
func NewSocksProxy(addr string) (*sockListener, error) { </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/redir/tcp.go |
return nil, err | <mask>
<mask> func NewRedirProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
<mask> done := make(chan struct{})
<mask> closed := make(chan struct{})
<mask>
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err </s> remove func NewRedirProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type redirListener struct {
net.Listener
address string
closed bool
}
func NewRedirProxy(addr string) (*redirListener, error) { </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add hl := &httpListener{l, addr, false} </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add rl := &redirListener{l, addr, false} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/redir/tcp.go |
rl := &redirListener{l, addr, false} | <mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
<mask> done := make(chan struct{})
<mask> closed := make(chan struct{})
<mask>
<mask> go func() {
<mask> log.Infof("Redir proxy listening at: %s", addr)
<mask> for {
<mask> c, err := l.Accept()
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add hl := &httpListener{l, addr, false} </s> remove done := make(chan struct{})
closed := make(chan struct{})
</s> add sl := &sockListener{l, addr, false} </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/redir/tcp.go |
if rl.closed { | <mask> log.Infof("Redir proxy listening at: %s", addr)
<mask> for {
<mask> c, err := l.Accept()
<mask> if err != nil {
<mask> if _, open := <-done; !open {
<mask> break
<mask> }
<mask> continue
<mask> }
<mask> go handleRedir(c)
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove if _, open := <-done; !open {
</s> add if sl.closed { </s> remove if _, open := <-done; !open {
</s> add if hl.closed { </s> remove c, err := l.Accept()
</s> add c, err := hl.Accept() </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add rl := &redirListener{l, addr, false} </s> remove done := make(chan struct{})
closed := make(chan struct{})
</s> add sl := &sockListener{l, addr, false} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/redir/tcp.go |
return rl, nil
}
func (l *redirListener) Close() {
l.closed = true
l.Listener.Close()
} | <mask> go handleRedir(c)
<mask> }
<mask> }()
<mask>
<mask> go func() {
<mask> <-done
<mask> l.Close()
<mask> closed <- struct{}{}
<mask> }()
<mask>
<mask> return done, closed, nil
<mask> }
<mask>
<mask> func handleRedir(conn net.Conn) {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return sl, nil
}
func (l *sockListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return hl, nil
}
func (l *httpListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove return done, closed, nil
</s> add func (l *redirListener) Address() string {
return l.address </s> remove return done, closed, nil
</s> add func (l *sockListener) Address() string {
return l.address </s> remove return done, closed, nil
</s> add func (l *httpListener) Address() string {
return l.address | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/redir/tcp.go |
func (l *redirListener) Address() string {
return l.address | <mask> l.Close()
<mask> closed <- struct{}{}
<mask> }()
<mask>
<mask> return done, closed, nil
<mask> }
<mask>
<mask> func handleRedir(conn net.Conn) {
<mask> target, err := parserPacket(conn)
<mask> if err != nil {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove return done, closed, nil
</s> add func (l *sockListener) Address() string {
return l.address </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return rl, nil
}
func (l *redirListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove return done, closed, nil
</s> add func (l *httpListener) Address() string {
return l.address </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return hl, nil
}
func (l *httpListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return sl, nil
}
func (l *sockListener) Close() {
l.closed = true
l.Listener.Close()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/redir/tcp.go |
type sockListener struct {
net.Listener
address string
closed bool
}
func NewSocksProxy(addr string) (*sockListener, error) { | <mask> var (
<mask> tun = tunnel.Instance()
<mask> )
<mask>
<mask> func NewSocksProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove func NewHttpProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type httpListener struct {
net.Listener
address string
closed bool
}
func NewHttpProxy(addr string) (*httpListener, error) { </s> remove func NewRedirProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type redirListener struct {
net.Listener
address string
closed bool
}
func NewRedirProxy(addr string) (*redirListener, error) { </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/socks/tcp.go |
return nil, err | <mask>
<mask> func NewSocksProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
<mask> done := make(chan struct{})
<mask> closed := make(chan struct{})
<mask>
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err </s> remove func NewSocksProxy(addr string) (chan<- struct{}, <-chan struct{}, error) {
</s> add type sockListener struct {
net.Listener
address string
closed bool
}
func NewSocksProxy(addr string) (*sockListener, error) { </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add hl := &httpListener{l, addr, false} </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add rl := &redirListener{l, addr, false} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/socks/tcp.go |
sl := &sockListener{l, addr, false} | <mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
<mask> done := make(chan struct{})
<mask> closed := make(chan struct{})
<mask>
<mask> go func() {
<mask> log.Infof("SOCKS proxy listening at: %s", addr)
<mask> for {
<mask> c, err := l.Accept()
<mask> if err != nil {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add hl := &httpListener{l, addr, false} </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add rl := &redirListener{l, addr, false} </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err </s> remove return nil, nil, err
</s> add return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/socks/tcp.go |
if sl.closed { | <mask> log.Infof("SOCKS proxy listening at: %s", addr)
<mask> for {
<mask> c, err := l.Accept()
<mask> if err != nil {
<mask> if _, open := <-done; !open {
<mask> break
<mask> }
<mask> continue
<mask> }
<mask> go handleSocks(c)
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove if _, open := <-done; !open {
</s> add if hl.closed { </s> remove if _, open := <-done; !open {
</s> add if rl.closed { </s> remove c, err := l.Accept()
</s> add c, err := hl.Accept() </s> remove done := make(chan struct{})
closed := make(chan struct{})
</s> add sl := &sockListener{l, addr, false} </s> remove
done := make(chan struct{})
closed := make(chan struct{})
</s> add hl := &httpListener{l, addr, false} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/socks/tcp.go |
return sl, nil
}
func (l *sockListener) Close() {
l.closed = true
l.Listener.Close()
} | <mask> go handleSocks(c)
<mask> }
<mask> }()
<mask>
<mask> go func() {
<mask> <-done
<mask> l.Close()
<mask> closed <- struct{}{}
<mask> }()
<mask>
<mask> return done, closed, nil
<mask> }
<mask>
<mask> func handleSocks(conn net.Conn) {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return rl, nil
}
func (l *redirListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return hl, nil
}
func (l *httpListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove return done, closed, nil
</s> add func (l *sockListener) Address() string {
return l.address </s> remove return done, closed, nil
</s> add func (l *redirListener) Address() string {
return l.address </s> remove return done, closed, nil
</s> add func (l *httpListener) Address() string {
return l.address | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/socks/tcp.go |
func (l *sockListener) Address() string {
return l.address | <mask> l.Close()
<mask> closed <- struct{}{}
<mask> }()
<mask>
<mask> return done, closed, nil
<mask> }
<mask>
<mask> func handleSocks(conn net.Conn) {
<mask> target, err := socks.Handshake(conn)
<mask> if err != nil {
</s> Fix: goroutine leak while closing proxy (#43)
* Fix: goroutine leak while closing proxy
* Chore: improve proxy architecture
* Fix: stack overflow </s> remove return done, closed, nil
</s> add func (l *redirListener) Address() string {
return l.address </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return sl, nil
}
func (l *sockListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove return done, closed, nil
</s> add func (l *httpListener) Address() string {
return l.address </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return hl, nil
}
func (l *httpListener) Close() {
l.closed = true
l.Listener.Close()
} </s> remove go func() {
<-done
l.Close()
closed <- struct{}{}
}()
</s> add return rl, nil
}
func (l *redirListener) Close() {
l.closed = true
l.Listener.Close()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/970643b14443a3eab1a62c2a1016be6a4bb502cd | proxy/socks/tcp.go |
inboundReeder := bufio.NewReader(request)
outboundReeder := bufio.NewReader(conn)
| <mask> host := req.Host
<mask>
<mask> for {
<mask> keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
<mask>
<mask> req.Header.Set("Connection", "close")
<mask> req.RequestURI = ""
<mask> adapters.RemoveHopByHopHeaders(req.Header)
</s> Fix: HTTP status code `100 Continue` support" (#288)
* Fix: HTTP Status Code `100 Continue` support
* Style: code style adjustment </s> remove br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
</s> add handleResponse:
resp, err := http.ReadResponse(outboundReeder, req) </s> remove req, err = http.ReadRequest(bufio.NewReader(request))
</s> add if resp.StatusCode == http.StatusContinue {
goto handleResponse
}
req, err = http.ReadRequest(inboundReeder) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/981501013194772dd77168ebd014a20aaf1a7734 | tunnel/connection.go |
handleResponse:
resp, err := http.ReadResponse(outboundReeder, req) | <mask> err := req.Write(conn)
<mask> if err != nil {
<mask> break
<mask> }
<mask> br := bufio.NewReader(conn)
<mask> resp, err := http.ReadResponse(br, req)
<mask> if err != nil {
<mask> break
<mask> }
<mask> adapters.RemoveHopByHopHeaders(resp.Header)
<mask> if resp.ContentLength >= 0 {
</s> Fix: HTTP status code `100 Continue` support" (#288)
* Fix: HTTP Status Code `100 Continue` support
* Style: code style adjustment </s> remove req, err = http.ReadRequest(bufio.NewReader(request))
</s> add if resp.StatusCode == http.StatusContinue {
goto handleResponse
}
req, err = http.ReadRequest(inboundReeder) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/981501013194772dd77168ebd014a20aaf1a7734 | tunnel/connection.go |
if resp.StatusCode == http.StatusContinue {
goto handleResponse
}
req, err = http.ReadRequest(inboundReeder) | <mask> if !keepAlive {
<mask> break
<mask> }
<mask>
<mask> req, err = http.ReadRequest(bufio.NewReader(request))
<mask> if err != nil {
<mask> break
<mask> }
<mask>
<mask> // Sometimes firefox just open a socket to process multiple domains in HTTP
</s> Fix: HTTP status code `100 Continue` support" (#288)
* Fix: HTTP Status Code `100 Continue` support
* Style: code style adjustment </s> remove br := bufio.NewReader(conn)
resp, err := http.ReadResponse(br, req)
</s> add handleResponse:
resp, err := http.ReadResponse(outboundReeder, req) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/981501013194772dd77168ebd014a20aaf1a7734 | tunnel/connection.go |
"github.com/Dreamacro/clash/log" | <mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/common/sockopt"
<mask>
<mask> D "github.com/miekg/dns"
<mask> )
<mask>
<mask> var (
</s> Fix: cannot listen socks5 port on wsl (#748) </s> remove return nil, err
</s> add log.Warnln("Failed to Reuse UDP Address: %s", err) </s> remove return err
</s> add log.Warnln("Failed to Reuse UDP Address: %s", err) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/99b34e8d8b8f53caf90fe66a595aedf451ca6f67 | dns/server.go |
log.Warnln("Failed to Reuse UDP Address: %s", err) | <mask> }
<mask>
<mask> err = sockopt.UDPReuseaddr(p)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> address = addr
<mask> handler := newHandler(resolver)
<mask> server = &Server{handler: handler}
</s> Fix: cannot listen socks5 port on wsl (#748) </s> remove return nil, err
</s> add log.Warnln("Failed to Reuse UDP Address: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/99b34e8d8b8f53caf90fe66a595aedf451ca6f67 | dns/server.go |
"github.com/Dreamacro/clash/log" | <mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/common/sockopt"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> type SockUDPListener struct {
<mask> net.PacketConn
<mask> address string
</s> Fix: cannot listen socks5 port on wsl (#748) </s> remove return nil, err
</s> add log.Warnln("Failed to Reuse UDP Address: %s", err) </s> remove return err
</s> add log.Warnln("Failed to Reuse UDP Address: %s", err) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/99b34e8d8b8f53caf90fe66a595aedf451ca6f67 | proxy/socks/udp.go |
log.Warnln("Failed to Reuse UDP Address: %s", err) | <mask> }
<mask>
<mask> err = sockopt.UDPReuseaddr(l.(*net.UDPConn))
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> sl := &SockUDPListener{l, addr, false}
<mask> go func() {
<mask> for {
</s> Fix: cannot listen socks5 port on wsl (#748) </s> remove return err
</s> add log.Warnln("Failed to Reuse UDP Address: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/99b34e8d8b8f53caf90fe66a595aedf451ca6f67 | proxy/socks/udp.go |
"errors"
"fmt" | <mask> "context"
<mask> "encoding/json"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/outbound"
<mask> "github.com/Dreamacro/clash/adapters/provider"
<mask> "github.com/Dreamacro/clash/common/murmur3"
<mask> "github.com/Dreamacro/clash/common/singledo"
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove group = NewLoadBalance(groupName, providers)
</s> add strategy := parseStrategy(config)
return NewLoadBalance(groupName, providers, strategy) </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
type strategyFn = func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy
| <mask> )
<mask>
<mask> type LoadBalance struct {
<mask> *outbound.Base
<mask> single *singledo.Single
<mask> providers []provider.ProxyProvider
<mask> strategyFn strategyFn
<mask> }
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove single *singledo.Single
maxRetry int
providers []provider.ProxyProvider
</s> add single *singledo.Single
providers []provider.ProxyProvider
strategyFn strategyFn
}
var errStrategy = errors.New("unsupported strategy")
func parseStrategy(config map[string]interface{}) string {
if elm, ok := config["strategy"]; ok {
if strategy, ok := elm.(string); ok {
return strategy
}
}
return "consistent-hashing" </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
single *singledo.Single
providers []provider.ProxyProvider
strategyFn strategyFn
}
var errStrategy = errors.New("unsupported strategy")
func parseStrategy(config map[string]interface{}) string {
if elm, ok := config["strategy"]; ok {
if strategy, ok := elm.(string); ok {
return strategy
}
}
return "consistent-hashing" | <mask> )
<mask>
<mask> type LoadBalance struct {
<mask> *outbound.Base
<mask> single *singledo.Single
<mask> maxRetry int
<mask> providers []provider.ProxyProvider
<mask> }
<mask>
<mask> func getKey(metadata *C.Metadata) string {
<mask> if metadata.Host != "" {
<mask> // ip host
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) </s> remove func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
</s> add func strategyRoundRobin() strategyFn {
idx := 0
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
length := len(proxies)
for i := 0; i < length; i++ {
idx = (idx + 1) % length
proxy := proxies[idx]
if proxy.Alive() {
return proxy
} </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
func strategyRoundRobin() strategyFn {
idx := 0
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
length := len(proxies)
for i := 0; i < length; i++ {
idx = (idx + 1) % length
proxy := proxies[idx]
if proxy.Alive() {
return proxy
} | <mask> func (lb *LoadBalance) SupportUDP() bool {
<mask> return true
<mask> }
<mask>
<mask> func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> proxies := lb.proxies()
<mask> buckets := int32(len(proxies))
<mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
<mask> idx := jumpHash(key, buckets)
<mask> proxy := proxies[idx]
<mask> if proxy.Alive() {
<mask> return proxy
<mask> }
<mask> }
<mask>
<mask> return proxies[0]
<mask> }
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) </s> remove single *singledo.Single
maxRetry int
providers []provider.ProxyProvider
</s> add single *singledo.Single
providers []provider.ProxyProvider
strategyFn strategyFn
}
var errStrategy = errors.New("unsupported strategy")
func parseStrategy(config map[string]interface{}) string {
if elm, ok := config["strategy"]; ok {
if strategy, ok := elm.(string); ok {
return strategy
}
}
return "consistent-hashing" </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
return proxies[0] | <mask> return proxy
<mask> }
<mask> }
<mask> }
<mask> }
<mask>
<mask> func strategyConsistentHashing() strategyFn {
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) </s> remove func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
</s> add func strategyRoundRobin() strategyFn {
idx := 0
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
length := len(proxies)
for i := 0; i < length; i++ {
idx = (idx + 1) % length
proxy := proxies[idx]
if proxy.Alive() {
return proxy
} </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) </s> remove single *singledo.Single
maxRetry int
providers []provider.ProxyProvider
</s> add single *singledo.Single
providers []provider.ProxyProvider
strategyFn strategyFn
}
var errStrategy = errors.New("unsupported strategy")
func parseStrategy(config map[string]interface{}) string {
if elm, ok := config["strategy"]; ok {
if strategy, ok := elm.(string); ok {
return strategy
}
}
return "consistent-hashing" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
} | <mask> return proxies[0]
<mask> }
<mask>
<mask> func strategyConsistentHashing() strategyFn {
<mask> maxRetry := 5
<mask> return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) </s> remove func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
</s> add func strategyRoundRobin() strategyFn {
idx := 0
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
length := len(proxies)
for i := 0; i < length; i++ {
idx = (idx + 1) % length
proxy := proxies[idx]
if proxy.Alive() {
return proxy
} </s> remove single *singledo.Single
maxRetry int
providers []provider.ProxyProvider
</s> add single *singledo.Single
providers []provider.ProxyProvider
strategyFn strategyFn
}
var errStrategy = errors.New("unsupported strategy")
func parseStrategy(config map[string]interface{}) string {
if elm, ok := config["strategy"]; ok {
if strategy, ok := elm.(string); ok {
return strategy
}
}
return "consistent-hashing" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) | <mask> return proxy
<mask> }
<mask> }
<mask>
<mask> return proxies[0]
<mask> }
<mask>
<mask> func (lb *LoadBalance) proxies() []C.Proxy {
<mask> elm, _, _ := lb.single.Do(func() (interface{}, error) {
<mask> return getProvidersProxies(lb.providers), nil
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
</s> add func strategyRoundRobin() strategyFn {
idx := 0
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
length := len(proxies)
for i := 0; i < length; i++ {
idx = (idx + 1) % length
proxy := proxies[idx]
if proxy.Alive() {
return proxy
} </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) </s> remove single *singledo.Single
maxRetry int
providers []provider.ProxyProvider
</s> add single *singledo.Single
providers []provider.ProxyProvider
strategyFn strategyFn
}
var errStrategy = errors.New("unsupported strategy")
func parseStrategy(config map[string]interface{}) string {
if elm, ok := config["strategy"]; ok {
if strategy, ok := elm.(string); ok {
return strategy
}
}
return "consistent-hashing" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) | <mask> "all": all,
<mask> })
<mask> }
<mask>
<mask> func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
<mask> return &LoadBalance{
<mask> Base: outbound.NewBase(name, "", C.LoadBalance, false),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> maxRetry: 3,
<mask> providers: providers,
<mask> }
<mask> }
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove single *singledo.Single
maxRetry int
providers []provider.ProxyProvider
</s> add single *singledo.Single
providers []provider.ProxyProvider
strategyFn strategyFn
}
var errStrategy = errors.New("unsupported strategy")
func parseStrategy(config map[string]interface{}) string {
if elm, ok := config["strategy"]; ok {
if strategy, ok := elm.(string); ok {
return strategy
}
}
return "consistent-hashing" </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
providers: providers,
strategyFn: strategyFn,
}, nil | <mask> default:
<mask> return nil, fmt.Errorf("%w: %s", errStrategy, strategy)
<mask> }
<mask> }
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) </s> remove group = NewLoadBalance(groupName, providers)
</s> add strategy := parseStrategy(config)
return NewLoadBalance(groupName, providers, strategy) </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) | [
"keep",
"keep",
"add",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/loadbalance.go |
strategy := parseStrategy(config)
return NewLoadBalance(groupName, providers, strategy) | <mask> group = NewSelector(groupName, providers)
<mask> case "fallback":
<mask> group = NewFallback(groupName, providers)
<mask> case "load-balance":
<mask> group = NewLoadBalance(groupName, providers)
<mask> case "relay":
<mask> group = NewRelay(groupName, providers)
<mask> default:
<mask> return nil, fmt.Errorf("%w: %s", errType, groupOption.Type)
<mask> }
</s> Feature: support round-robin strategy for load-balance group (#1044) </s> remove func NewLoadBalance(name string, providers []provider.ProxyProvider) *LoadBalance {
return &LoadBalance{
Base: outbound.NewBase(name, "", C.LoadBalance, false),
single: singledo.NewSingle(defaultGetProxiesDuration),
maxRetry: 3,
providers: providers,
</s> add func NewLoadBalance(name string, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
var strategyFn strategyFn
switch strategy {
case "consistent-hashing":
strategyFn = strategyConsistentHashing()
case "round-robin":
strategyFn = strategyRoundRobin()
default:
return nil, fmt.Errorf("%w: %s", errStrategy, strategy) </s> remove func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
proxies := lb.proxies()
buckets := int32(len(proxies))
for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
</s> add func strategyRoundRobin() strategyFn {
idx := 0
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
length := len(proxies)
for i := 0; i < length; i++ {
idx = (idx + 1) % length
proxy := proxies[idx]
if proxy.Alive() {
return proxy
} </s> remove return proxies[0]
</s> add func strategyConsistentHashing() strategyFn {
maxRetry := 5
return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
buckets := int32(len(proxies))
for i := 0; i < maxRetry; i, key = i+1, key+1 {
idx := jumpHash(key, buckets)
proxy := proxies[idx]
if proxy.Alive() {
return proxy
}
}
return proxies[0]
}
}
func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
proxies := lb.proxies()
return lb.strategyFn(proxies, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9a62b1081d79cb00562ce25ebe73cb1c8dbca407 | adapters/outboundgroup/parser.go |
"fmt" | <mask>
<mask> import (
<mask> "encoding/json"
<mask> "errors"
<mask> )
<mask>
<mask> // DNSModeMapping is a mapping for EnhancedMode enum
<mask> var DNSModeMapping = map[string]DNSMode{
<mask> DNSNormal.String(): DNSNormal,
</s> Change: remove `redir-host` as config </s> remove DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP,
DNSMapping.String(): DNSMapping,
</s> add DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP, </s> remove // deprecated warnning
if cfg.EnhancedMode == C.DNSMapping {
log.Warnln("[DNS] %s is deprecated, please use %s instead", cfg.EnhancedMode.String(), C.DNSFakeIP.String())
}
</s> add </s> remove }
if mapper.mode != C.DNSNormal {
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9af6d498e77aa98acfb0a0ba90deaf6f24267347 | constant/dns.go |
DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP, | <mask> )
<mask>
<mask> // DNSModeMapping is a mapping for EnhancedMode enum
<mask> var DNSModeMapping = map[string]DNSMode{
<mask> DNSNormal.String(): DNSNormal,
<mask> DNSFakeIP.String(): DNSFakeIP,
<mask> DNSMapping.String(): DNSMapping,
<mask> }
<mask>
<mask> const (
<mask> DNSNormal DNSMode = iota
<mask> DNSFakeIP
</s> Change: remove `redir-host` as config </s> remove }
if mapper.mode != C.DNSNormal {
</s> add </s> remove return errors.New("invalid mode")
</s> add return fmt.Errorf("invalid mode: %s", tp) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9af6d498e77aa98acfb0a0ba90deaf6f24267347 | constant/dns.go |
return fmt.Errorf("invalid mode: %s", tp) | <mask> return err
<mask> }
<mask> mode, exist := DNSModeMapping[tp]
<mask> if !exist {
<mask> return errors.New("invalid mode")
<mask> }
<mask> *e = mode
<mask> return nil
<mask> }
<mask>
</s> Change: remove `redir-host` as config </s> remove }
if mapper.mode != C.DNSNormal {
</s> add </s> remove // deprecated warnning
if cfg.EnhancedMode == C.DNSMapping {
log.Warnln("[DNS] %s is deprecated, please use %s instead", cfg.EnhancedMode.String(), C.DNSFakeIP.String())
}
</s> add </s> remove DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP,
DNSMapping.String(): DNSMapping,
</s> add DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9af6d498e77aa98acfb0a0ba90deaf6f24267347 | constant/dns.go |
if !ip.IsGlobalUnicast() {
continue
} | <mask> ip = a.A
<mask> ttl = a.Hdr.Ttl
<mask> case *D.AAAA:
<mask> ip = a.AAAA
<mask> ttl = a.Hdr.Ttl
<mask> if !ip.IsGlobalUnicast() {
<mask> continue
</s> Change: remove `redir-host` as config </s> remove }
if mapper.mode != C.DNSNormal {
</s> add </s> remove return errors.New("invalid mode")
</s> add return fmt.Errorf("invalid mode: %s", tp) </s> remove DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP,
DNSMapping.String(): DNSMapping,
</s> add DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9af6d498e77aa98acfb0a0ba90deaf6f24267347 | dns/middleware.go |
if !ip.IsGlobalUnicast() {
continue
} | <mask> case *D.AAAA:
<mask> ip = a.AAAA
<mask> ttl = a.Hdr.Ttl
<mask> default:
<mask> continue
<mask> }
<mask>
<mask> mapping.SetWithExpire(ip.String(), host, time.Now().Add(time.Second*time.Duration(ttl)))
</s> Change: remove `redir-host` as config </s> remove }
if mapper.mode != C.DNSNormal {
</s> add </s> remove return errors.New("invalid mode")
</s> add return fmt.Errorf("invalid mode: %s", tp) </s> remove DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP,
DNSMapping.String(): DNSMapping,
</s> add DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9af6d498e77aa98acfb0a0ba90deaf6f24267347 | dns/middleware.go |
<mask> }
<mask>
<mask> if mapper.mode == C.DNSFakeIP {
<mask> middlewares = append(middlewares, withFakeIP(mapper.fakePool))
<mask> }
<mask>
<mask> if mapper.mode != C.DNSNormal {
<mask> middlewares = append(middlewares, withMapping(mapper.mapping))
<mask> }
<mask>
<mask> return compose(middlewares, withResolver(resolver))
<mask> }
</s> Change: remove `redir-host` as config </s> remove return errors.New("invalid mode")
</s> add return fmt.Errorf("invalid mode: %s", tp) </s> remove // deprecated warnning
if cfg.EnhancedMode == C.DNSMapping {
log.Warnln("[DNS] %s is deprecated, please use %s instead", cfg.EnhancedMode.String(), C.DNSFakeIP.String())
}
</s> add </s> remove DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP,
DNSMapping.String(): DNSMapping,
</s> add DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9af6d498e77aa98acfb0a0ba90deaf6f24267347 | dns/middleware.go | |
<mask> Default: c.DefaultNameserver,
<mask> Policy: c.NameServerPolicy,
<mask> }
<mask>
<mask> // deprecated warnning
<mask> if cfg.EnhancedMode == C.DNSMapping {
<mask> log.Warnln("[DNS] %s is deprecated, please use %s instead", cfg.EnhancedMode.String(), C.DNSFakeIP.String())
<mask> }
<mask>
<mask> r := dns.NewResolver(cfg)
<mask> m := dns.NewEnhancer(cfg)
<mask>
<mask> // reuse cache of old host mapper
<mask> if old := resolver.DefaultHostMapper; old != nil {
</s> Change: remove `redir-host` as config </s> remove return errors.New("invalid mode")
</s> add return fmt.Errorf("invalid mode: %s", tp) </s> remove }
if mapper.mode != C.DNSNormal {
</s> add </s> remove DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP,
DNSMapping.String(): DNSMapping,
</s> add DNSNormal.String(): DNSNormal,
DNSFakeIP.String(): DNSFakeIP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9af6d498e77aa98acfb0a0ba90deaf6f24267347 | hub/executor/executor.go | |
"regexp" | <mask> import (
<mask> "errors"
<mask> "fmt"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/outbound"
<mask> "github.com/Dreamacro/clash/adapter/provider"
<mask> "github.com/Dreamacro/clash/common/structure"
<mask> C "github.com/Dreamacro/clash/constant"
</s> Feature: add `filter` option to proxy group (#2518) </s> remove groupName := groupOption.Name
</s> add var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/outboundgroup/parser.go |
Filter string `group:"filter,omitempty"` | <mask> Lazy bool `group:"lazy,omitempty"`
<mask> DisableUDP bool `group:"disable-udp,omitempty"`
<mask> }
<mask>
<mask> func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, providersMap map[string]types.ProxyProvider) (C.ProxyAdapter, error) {
<mask> decoder := structure.NewDecoder(structure.Option{TagName: "group", WeaklyTypedInput: true})
<mask>
<mask> groupOption := &GroupCommonOption{
</s> Feature: add `filter` option to proxy group (#2518) </s> remove providers := []types.ProxyProvider{}
</s> add if groupOption.Filter != "" {
f, err := regexp.Compile(groupOption.Filter)
if err != nil {
return nil, fmt.Errorf("%s: invalid filter regex: %w", groupName, err)
}
filterReg = f
} </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} </s> remove groupName := groupOption.Name
</s> add var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/outboundgroup/parser.go |
var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) | <mask> if groupOption.Type == "" || groupOption.Name == "" {
<mask> return nil, errFormat
<mask> }
<mask>
<mask> groupName := groupOption.Name
<mask>
<mask> providers := []types.ProxyProvider{}
<mask>
<mask> if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
<mask> return nil, fmt.Errorf("%s: %w", groupName, errMissProxy)
</s> Feature: add `filter` option to proxy group (#2518) </s> remove providers := []types.ProxyProvider{}
</s> add if groupOption.Filter != "" {
f, err := regexp.Compile(groupOption.Filter)
if err != nil {
return nil, fmt.Errorf("%s: invalid filter regex: %w", groupName, err)
}
filterReg = f
} </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/outboundgroup/parser.go |
if groupOption.Filter != "" {
f, err := regexp.Compile(groupOption.Filter)
if err != nil {
return nil, fmt.Errorf("%s: invalid filter regex: %w", groupName, err)
}
filterReg = f
} | <mask> }
<mask>
<mask> groupName := groupOption.Name
<mask>
<mask> providers := []types.ProxyProvider{}
<mask>
<mask> if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
<mask> return nil, fmt.Errorf("%s: %w", groupName, errMissProxy)
<mask> }
<mask>
</s> Feature: add `filter` option to proxy group (#2518) </s> remove groupName := groupOption.Name
</s> add var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/outboundgroup/parser.go |
providers := []types.ProxyProvider{}
| <mask> }
<mask>
<mask> if len(groupOption.Proxies) != 0 {
<mask> ps, err := getProxies(proxyMap, groupOption.Proxies)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s: %w", groupName, err)
<mask> }
<mask>
</s> Feature: add `filter` option to proxy group (#2518) </s> remove providers := []types.ProxyProvider{}
</s> add if groupOption.Filter != "" {
f, err := regexp.Compile(groupOption.Filter)
if err != nil {
return nil, fmt.Errorf("%s: invalid filter regex: %w", groupName, err)
}
filterReg = f
} </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} </s> remove groupName := groupOption.Name
</s> add var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/outboundgroup/parser.go |
if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} | <mask> list, err := getProviders(providersMap, groupOption.Use)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s: %w", groupName, err)
<mask> }
<mask> providers = append(providers, list...)
<mask> }
<mask>
<mask> var group C.ProxyAdapter
<mask> switch groupOption.Type {
<mask> case "url-test":
</s> Feature: add `filter` option to proxy group (#2518) </s> remove providers := []types.ProxyProvider{}
</s> add if groupOption.Filter != "" {
f, err := regexp.Compile(groupOption.Filter)
if err != nil {
return nil, fmt.Errorf("%s: invalid filter regex: %w", groupName, err)
}
filterReg = f
} </s> remove groupName := groupOption.Name
</s> add var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/outboundgroup/parser.go |
"github.com/Dreamacro/clash/adapter/outbound"
"github.com/Dreamacro/clash/common/singledo" | <mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> types "github.com/Dreamacro/clash/constant/provider"
<mask>
<mask> "github.com/samber/lo"
<mask> "gopkg.in/yaml.v3"
</s> Feature: add `filter` option to proxy group (#2518) </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/provider/provider.go |
"github.com/samber/lo" | <mask> "github.com/Dreamacro/clash/common/singledo"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> types "github.com/Dreamacro/clash/constant/provider"
<mask>
<mask> "gopkg.in/yaml.v3"
<mask> )
<mask>
<mask> var reject = adapter.NewProxy(outbound.NewReject())
<mask>
</s> Feature: add `filter` option to proxy group (#2518) </s> remove groupName := groupOption.Name
</s> add var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/provider/provider.go |
var reject = adapter.NewProxy(outbound.NewReject())
| <mask> )
<mask>
<mask> const (
<mask> ReservedName = "default"
<mask> )
<mask>
</s> Feature: add `filter` option to proxy group (#2518) </s> remove groupName := groupOption.Name
</s> add var (
groupName = groupOption.Name
filterReg *regexp.Regexp
) </s> remove providers = append(providers, list...)
</s> add if filterReg != nil {
pd := provider.NewFilterableProvider(groupName, list, filterReg)
providers = append(providers, pd)
} else {
providers = append(providers, list...)
} </s> remove providers := []types.ProxyProvider{}
</s> add if groupOption.Filter != "" {
f, err := regexp.Compile(groupOption.Filter)
if err != nil {
return nil, fmt.Errorf("%s: invalid filter regex: %w", groupName, err)
}
filterReg = f
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9b2b7c662de28b91d26aa52e4f7b5a9f69c42e87 | adapter/provider/provider.go |
"gopkg.in/yaml.v3" | <mask> "github.com/Dreamacro/clash/adapter"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> types "github.com/Dreamacro/clash/constant/provider"
<mask>
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
<mask> ReservedName = "default"
<mask> )
</s> Chore: upgrade to yaml v3 </s> remove "gopkg.in/yaml.v2"
</s> add "gopkg.in/yaml.v3" </s> remove gopkg.in/yaml.v2 v2.4.0
</s> add gopkg.in/yaml.v3 v3.0.0 </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | adapter/provider/provider.go |
"gopkg.in/yaml.v3" | <mask> "github.com/Dreamacro/clash/log"
<mask> R "github.com/Dreamacro/clash/rule"
<mask> T "github.com/Dreamacro/clash/tunnel"
<mask>
<mask> "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> // General config
<mask> type General struct {
<mask> Inbound
</s> Chore: upgrade to yaml v3 </s> remove "gopkg.in/yaml.v2"
</s> add "gopkg.in/yaml.v3" </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v2 v2.4.0
</s> add gopkg.in/yaml.v3 v3.0.0 </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | config/config.go |
gopkg.in/yaml.v3 v3.0.0 | <mask> golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122
<mask> golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
<mask> golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> )
<mask>
<mask> require (
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/kr/text v0.2.0 // indirect
</s> Chore: upgrade to yaml v3 </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add </s> remove "gopkg.in/yaml.v2"
</s> add "gopkg.in/yaml.v3" </s> remove "gopkg.in/yaml.v2"
</s> add "gopkg.in/yaml.v3" </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | go.mod |
<mask> golang.org/x/mod v0.4.2 // indirect
<mask> golang.org/x/text v0.3.7 // indirect
<mask> golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
<mask> )
</s> Chore: upgrade to yaml v3 </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v2 v2.4.0
</s> add gopkg.in/yaml.v3 v3.0.0 </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove "gopkg.in/yaml.v2"
</s> add "gopkg.in/yaml.v3" </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | go.mod | |
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> Chore: upgrade to yaml v3 </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | go.sum | |
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | <mask> gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> Chore: upgrade to yaml v3 </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v2 v2.4.0
</s> add gopkg.in/yaml.v3 v3.0.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | go.sum |
gopkg.in/yaml.v3 v3.0.0 // indirect | <mask> golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
<mask> golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
<mask> gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
<mask> gotest.tools/v3 v3.1.0 // indirect
<mask> )
</s> Chore: upgrade to yaml v3 </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add </s> remove gopkg.in/yaml.v2 v2.4.0
</s> add gopkg.in/yaml.v3 v3.0.0 </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | test/go.mod |
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
<mask> gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
<mask> gotest.tools/v3 v3.1.0 h1:rVV8Tcg/8jHUkPUorwjaMTtemIMVXfIPKiOqnhEhakk=
</s> Chore: upgrade to yaml v3 </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v2 v2.4.0
</s> add gopkg.in/yaml.v3 v3.0.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | test/go.sum | |
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | <mask> gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
<mask> gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
<mask> gotest.tools/v3 v3.1.0 h1:rVV8Tcg/8jHUkPUorwjaMTtemIMVXfIPKiOqnhEhakk=
<mask> gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ=
</s> Chore: upgrade to yaml v3 </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
</s> add </s> remove gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
</s> add gopkg.in/yaml.v3 v3.0.0 // indirect </s> remove gopkg.in/yaml.v2 v2.4.0
</s> add gopkg.in/yaml.v3 v3.0.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9d2fc976e2d56c1d34528847d5d3d8e232d9f656 | test/go.sum |
func isValidDomain(domain string) bool {
return domain[0] != '.' && domain[len(domain)-1] != '.'
}
| <mask> }
<mask>
<mask> // Insert adds a node to the trie.
<mask> // Support
<mask> // 1. www.example.com
<mask> // 2. *.example.com
<mask> // 3. subdomain.*.example.com
<mask> func (t *Trie) Insert(domain string, data interface{}) error {
</s> Fix(domain-trie): domain could without dot </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove if err := tree.Insert("com", localIP); err == nil {
</s> add if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9e77c650d9e5df80c367b5a50517c6aaf07abef2 | component/domain-trie/tire.go |
if !isValidDomain(domain) { | <mask> // 1. www.example.com
<mask> // 2. *.example.com
<mask> // 3. subdomain.*.example.com
<mask> func (t *Trie) Insert(domain string, data interface{}) error {
<mask> parts := strings.Split(domain, domainStep)
<mask> if len(parts) < 2 {
<mask> return ErrInvalidDomain
<mask> }
<mask>
<mask> node := t.root
<mask> // reverse storage domain part to save space
</s> Fix(domain-trie): domain could without dot </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove if err := tree.Insert("com", localIP); err == nil {
</s> add if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9e77c650d9e5df80c367b5a50517c6aaf07abef2 | component/domain-trie/tire.go |
parts := strings.Split(domain, domainStep) | <mask> }
<mask>
<mask> node := t.root
<mask> // reverse storage domain part to save space
<mask> for i := len(parts) - 1; i >= 0; i-- {
<mask> part := parts[i]
</s> Fix(domain-trie): domain could without dot </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove if err := tree.Insert("com", localIP); err == nil {
</s> add if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9e77c650d9e5df80c367b5a50517c6aaf07abef2 | component/domain-trie/tire.go |
if !isValidDomain(domain) { | <mask> // Priority as:
<mask> // 1. static part
<mask> // 2. wildcard domain
<mask> func (t *Trie) Search(domain string) *Node {
<mask> parts := strings.Split(domain, domainStep)
<mask> if len(parts) < 2 {
<mask> return nil
<mask> }
<mask>
<mask> n := t.root
<mask> for i := len(parts) - 1; i >= 0; i-- {
</s> Fix(domain-trie): domain could without dot </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove if err := tree.Insert("com", localIP); err == nil {
</s> add if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9e77c650d9e5df80c367b5a50517c6aaf07abef2 | component/domain-trie/tire.go |
parts := strings.Split(domain, domainStep) | <mask> return nil
<mask> }
<mask>
<mask> n := t.root
<mask> for i := len(parts) - 1; i >= 0; i-- {
<mask> part := parts[i]
<mask>
</s> Fix(domain-trie): domain could without dot </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove if err := tree.Insert("com", localIP); err == nil {
</s> add if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9e77c650d9e5df80c367b5a50517c6aaf07abef2 | component/domain-trie/tire.go |
if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil { | <mask> func TestTrie_Boundary(t *testing.T) {
<mask> tree := New()
<mask> tree.Insert("*.dev", localIP)
<mask>
<mask> if err := tree.Insert("com", localIP); err == nil {
<mask> t.Error("should recv err")
<mask> }
<mask>
<mask> if tree.Search("dev") != nil {
<mask> t.Error("should recv nil")
</s> Fix(domain-trie): domain could without dot </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9e77c650d9e5df80c367b5a50517c6aaf07abef2 | component/domain-trie/trie_test.go |
if tree.Search(".dev") != nil {
t.Error("should recv nil")
} | <mask>
<mask> if tree.Search("dev") != nil {
<mask> t.Error("should recv nil")
<mask> }
<mask> }
</s> Fix(domain-trie): domain could without dot </s> remove if err := tree.Insert("com", localIP); err == nil {
</s> add if err := tree.Insert(".", localIP); err == nil {
t.Error("should recv err")
}
if err := tree.Insert(".com", localIP); err == nil { </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { </s> remove parts := strings.Split(domain, domainStep)
if len(parts) < 2 {
</s> add if !isValidDomain(domain) { | [
"keep",
"keep",
"keep",
"add",
"keep"
] | https://github.com/Dreamacro/clash/commit/9e77c650d9e5df80c367b5a50517c6aaf07abef2 | component/domain-trie/trie_test.go |
var isLocal bool | <mask>
<mask> func (pp *ProxySetProvider) Initial() error {
<mask> var buf []byte
<mask> var err error
<mask> if stat, err := os.Stat(pp.vehicle.Path()); err == nil {
<mask> buf, err = ioutil.ReadFile(pp.vehicle.Path())
<mask> modTime := stat.ModTime()
<mask> pp.updatedAt = &modTime
<mask> isLocal = true
<mask> } else {
</s> Fix: provider fallback should reparse proxies | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eaca6e4ab4ccf584d6ced0da56dc5a9c82a2b52 | adapters/provider/provider.go |
isLocal = true | <mask> modTime := stat.ModTime()
<mask> pp.updatedAt = &modTime
<mask> } else {
<mask> buf, err = pp.vehicle.Read()
<mask> }
<mask>
<mask> if err != nil {
<mask> return err
</s> Fix: provider fallback should reparse proxies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eaca6e4ab4ccf584d6ced0da56dc5a9c82a2b52 | adapters/provider/provider.go |
if !isLocal {
return err
}
| <mask>
<mask> proxies, err := pp.parse(buf)
<mask> if err != nil {
<mask> // parse local file error, fallback to remote
<mask> buf, err = pp.vehicle.Read()
<mask> if err != nil {
<mask> return err
</s> Fix: provider fallback should reparse proxies | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eaca6e4ab4ccf584d6ced0da56dc5a9c82a2b52 | adapters/provider/provider.go |
proxies, err = pp.parse(buf)
if err != nil {
return err
} | <mask> return err
<mask> }
<mask> }
<mask>
<mask> if err := ioutil.WriteFile(pp.vehicle.Path(), buf, fileMode); err != nil {
<mask> return err
<mask> }
<mask>
</s> Fix: provider fallback should reparse proxies | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eaca6e4ab4ccf584d6ced0da56dc5a9c82a2b52 | adapters/provider/provider.go |
"github.com/Dreamacro/go-shadowsocks2/shadowaead" | <mask> "github.com/Dreamacro/clash/component/ssr/obfs"
<mask> "github.com/Dreamacro/clash/component/ssr/protocol"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/go-shadowsocks2/core"
<mask> "github.com/Dreamacro/go-shadowsocks2/shadowstream"
<mask> )
<mask>
<mask> type ShadowSocksR struct {
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove cipher *core.StreamCipher
</s> add cipher core.Cipher </s> remove type authChain struct {
</s> add func init() {
register("auth_chain_a", newAuthChainA, 4)
}
type randDataLengthMethod func(int, []byte, *tools.XorShift128Plus) int
type authChainA struct { </s> remove // Base information for protocol
</s> add import (
"bytes"
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"encoding/binary"
"math/rand"
"sync"
"time"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/clash/log"
"github.com/Dreamacro/go-shadowsocks2/core"
)
</s> remove import (
"bytes"
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"encoding/binary"
"math/rand"
"strconv"
"strings"
"time"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/clash/component/ssr/tools"
"github.com/Dreamacro/go-shadowsocks2/core"
)
type authAES128 struct {
*Base
*recvInfo
*authData
hasSentHeader bool
packID uint32
userKey []byte
uid [4]byte
salt string
hmac hmacMethod
hashDigest hashDigestMethod
}
</s> add import "github.com/Dreamacro/clash/component/ssr/tools" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
cipher core.Cipher | <mask> )
<mask>
<mask> type ShadowSocksR struct {
<mask> *Base
<mask> cipher *core.StreamCipher
<mask> obfs obfs.Obfs
<mask> protocol protocol.Protocol
<mask> }
<mask>
<mask> type ShadowSocksROption struct {
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove type authChain struct {
</s> add func init() {
register("auth_chain_a", newAuthChainA, 4)
}
type randDataLengthMethod func(int, []byte, *tools.XorShift128Plus) int
type authChainA struct { </s> remove register("auth_aes128_sha1", newAuthAES128SHA1)
</s> add register("auth_aes128_sha1", newAuthAES128SHA1, 9)
}
type authAES128Function struct {
salt string
hmac hmacMethod
hashDigest hashDigestMethod
}
type authAES128 struct {
*Base
*authData
*authAES128Function
*userData
iv []byte
hasSentHeader bool
rawTrans bool
packID uint32
recvID uint32 </s> remove type httpObfs struct {
*Base
firstRequest bool
firstResponse bool
post bool
</s> add func init() {
register("http_simple", newHTTPSimple, 0) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
c = ssr.obfs.StreamConn(c) | <mask> UDP bool `proxy:"udp,omitempty"`
<mask> }
<mask>
<mask> func (ssr *ShadowSocksR) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
<mask> c = obfs.NewConn(c, ssr.obfs)
<mask> c = ssr.cipher.StreamConn(c)
<mask> conn, ok := c.(*shadowstream.Conn)
<mask> if !ok {
<mask> return nil, fmt.Errorf("invalid connection type")
<mask> }
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove conn, ok := c.(*shadowstream.Conn)
if !ok {
</s> add var (
iv []byte
err error
)
switch conn := c.(type) {
case *shadowstream.Conn:
iv, err = conn.ObtainWriteIV()
if err != nil {
return nil, err
}
case *shadowaead.Conn: </s> remove iv, err := conn.ObtainWriteIV()
if err != nil {
return nil, err
}
c = protocol.NewConn(c, ssr.protocol, iv)
</s> add c = ssr.protocol.StreamConn(c, iv) </s> remove // PickObfs returns an obfs of the given name
func PickObfs(name string, b *Base) (Obfs, error) {
if obfsCreator, ok := obfsList[strings.ToLower(name)]; ok {
return obfsCreator(b), nil
</s> add func PickObfs(name string, b *Base) (Obfs, int, error) {
if choice, ok := obfsList[name]; ok {
return choice.new(b), choice.overhead, nil </s> remove // PickProtocol returns a protocol of the given name
</s> add </s> remove func (o *origin) GetProtocolOverhead() int {
return 0
}
</s> add func (o *origin) StreamConn(c net.Conn, iv []byte) net.Conn { return c } | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
var (
iv []byte
err error
)
switch conn := c.(type) {
case *shadowstream.Conn:
iv, err = conn.ObtainWriteIV()
if err != nil {
return nil, err
}
case *shadowaead.Conn: | <mask>
<mask> func (ssr *ShadowSocksR) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
<mask> c = obfs.NewConn(c, ssr.obfs)
<mask> c = ssr.cipher.StreamConn(c)
<mask> conn, ok := c.(*shadowstream.Conn)
<mask> if !ok {
<mask> return nil, fmt.Errorf("invalid connection type")
<mask> }
<mask> iv, err := conn.ObtainWriteIV()
<mask> if err != nil {
<mask> return nil, err
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove c = obfs.NewConn(c, ssr.obfs)
</s> add c = ssr.obfs.StreamConn(c) </s> remove iv, err := conn.ObtainWriteIV()
if err != nil {
return nil, err
}
c = protocol.NewConn(c, ssr.protocol, iv)
</s> add c = ssr.protocol.StreamConn(c, iv) </s> remove ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
</s> add var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key </s> remove return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
</s> add return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) </s> remove pc = protocol.NewPacketConn(pc, ssr.protocol)
</s> add pc = ssr.protocol.PacketConn(pc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
c = ssr.protocol.StreamConn(c, iv) | <mask> conn, ok := c.(*shadowstream.Conn)
<mask> if !ok {
<mask> return nil, fmt.Errorf("invalid connection type")
<mask> }
<mask> iv, err := conn.ObtainWriteIV()
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> c = protocol.NewConn(c, ssr.protocol, iv)
<mask> _, err = c.Write(serializesSocksAddr(metadata))
<mask> return c, err
<mask> }
<mask>
<mask> func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove conn, ok := c.(*shadowstream.Conn)
if !ok {
</s> add var (
iv []byte
err error
)
switch conn := c.(type) {
case *shadowstream.Conn:
iv, err = conn.ObtainWriteIV()
if err != nil {
return nil, err
}
case *shadowaead.Conn: </s> remove c = obfs.NewConn(c, ssr.obfs)
</s> add c = ssr.obfs.StreamConn(c) </s> remove ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
</s> add var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key </s> remove return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
</s> add return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) </s> remove _, err = c.Conn.Write(encoded)
</s> add _, err = c.Conn.Write(buf.Bytes()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
pc = ssr.protocol.PacketConn(pc) | <mask> return nil, err
<mask> }
<mask>
<mask> pc = ssr.cipher.PacketConn(pc)
<mask> pc = protocol.NewPacketConn(pc, ssr.protocol)
<mask> return newPacketConn(&ssPacketConn{PacketConn: pc, rAddr: addr}, ssr), nil
<mask> }
<mask>
<mask> func (ssr *ShadowSocksR) MarshalJSON() ([]byte, error) {
<mask> return json.Marshal(map[string]string{
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove iv, err := conn.ObtainWriteIV()
if err != nil {
return nil, err
}
c = protocol.NewConn(c, ssr.protocol, iv)
</s> add c = ssr.protocol.StreamConn(c, iv) </s> remove conn, ok := c.(*shadowstream.Conn)
if !ok {
</s> add var (
iv []byte
err error
)
switch conn := c.(type) {
case *shadowstream.Conn:
iv, err = conn.ObtainWriteIV()
if err != nil {
return nil, err
}
case *shadowaead.Conn: </s> remove c = obfs.NewConn(c, ssr.obfs)
</s> add c = ssr.obfs.StreamConn(c) </s> remove func (a *authChain) DecodePacket(b []byte) ([]byte, int, error) {
bSize := len(b)
if bSize < 9 {
return nil, 0, errAuthChainDataLengthError
</s> add func (a *authChainA) DecodePacket(b []byte) ([]byte, error) {
if len(b) < 9 {
return nil, errAuthChainLengthError </s> remove return a.buffer.Bytes(), originalSize - bSize, nil
</s> add return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) | <mask> cipher := option.Cipher
<mask> password := option.Password
<mask> coreCiph, err := core.PickCipher(cipher, nil, password)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
<mask> }
<mask> ciph, ok := coreCiph.(*core.StreamCipher)
<mask> if !ok {
<mask> return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
<mask> }
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
</s> add var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key </s> remove obfs, err := obfs.PickObfs(option.Obfs, &obfs.Base{
IVSize: ciph.IVSize(),
Key: ciph.Key,
HeadLen: 30,
Host: option.Server,
Port: option.Port,
Param: option.ObfsParam,
</s> add obfs, obfsOverhead, err := obfs.PickObfs(option.Obfs, &obfs.Base{
Host: option.Server,
Port: option.Port,
Key: key,
IVSize: ivSize,
Param: option.ObfsParam, </s> remove IV: nil,
Key: ciph.Key,
TCPMss: 1460,
Param: option.ProtocolParam,
</s> add Key: key,
Overhead: obfsOverhead,
Param: option.ProtocolParam, </s> remove protocol.SetOverhead(obfs.GetObfsOverhead() + protocol.GetProtocolOverhead())
</s> add </s> remove conn, ok := c.(*shadowstream.Conn)
if !ok {
</s> add var (
iv []byte
err error
)
switch conn := c.(type) {
case *shadowstream.Conn:
iv, err = conn.ObtainWriteIV()
if err != nil {
return nil, err
}
case *shadowaead.Conn: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key | <mask> coreCiph, err := core.PickCipher(cipher, nil, password)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
<mask> }
<mask> ciph, ok := coreCiph.(*core.StreamCipher)
<mask> if !ok {
<mask> return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
<mask> }
<mask>
<mask> obfs, err := obfs.PickObfs(option.Obfs, &obfs.Base{
<mask> IVSize: ciph.IVSize(),
<mask> Key: ciph.Key,
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
</s> add return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) </s> remove obfs, err := obfs.PickObfs(option.Obfs, &obfs.Base{
IVSize: ciph.IVSize(),
Key: ciph.Key,
HeadLen: 30,
Host: option.Server,
Port: option.Port,
Param: option.ObfsParam,
</s> add obfs, obfsOverhead, err := obfs.PickObfs(option.Obfs, &obfs.Base{
Host: option.Server,
Port: option.Port,
Key: key,
IVSize: ivSize,
Param: option.ObfsParam, </s> remove IV: nil,
Key: ciph.Key,
TCPMss: 1460,
Param: option.ProtocolParam,
</s> add Key: key,
Overhead: obfsOverhead,
Param: option.ProtocolParam, </s> remove protocol.SetOverhead(obfs.GetObfsOverhead() + protocol.GetProtocolOverhead())
</s> add </s> remove conn, ok := c.(*shadowstream.Conn)
if !ok {
</s> add var (
iv []byte
err error
)
switch conn := c.(type) {
case *shadowstream.Conn:
iv, err = conn.ObtainWriteIV()
if err != nil {
return nil, err
}
case *shadowaead.Conn: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
obfs, obfsOverhead, err := obfs.PickObfs(option.Obfs, &obfs.Base{
Host: option.Server,
Port: option.Port,
Key: key,
IVSize: ivSize,
Param: option.ObfsParam, | <mask> if !ok {
<mask> return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
<mask> }
<mask>
<mask> obfs, err := obfs.PickObfs(option.Obfs, &obfs.Base{
<mask> IVSize: ciph.IVSize(),
<mask> Key: ciph.Key,
<mask> HeadLen: 30,
<mask> Host: option.Server,
<mask> Port: option.Port,
<mask> Param: option.ObfsParam,
<mask> })
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ssr %s initialize obfs error: %w", addr, err)
<mask> }
<mask>
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
</s> add var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key </s> remove return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
</s> add return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) </s> remove IV: nil,
Key: ciph.Key,
TCPMss: 1460,
Param: option.ProtocolParam,
</s> add Key: key,
Overhead: obfsOverhead,
Param: option.ProtocolParam, </s> remove protocol.SetOverhead(obfs.GetObfsOverhead() + protocol.GetProtocolOverhead())
</s> add </s> remove conn, ok := c.(*shadowstream.Conn)
if !ok {
</s> add var (
iv []byte
err error
)
switch conn := c.(type) {
case *shadowstream.Conn:
iv, err = conn.ObtainWriteIV()
if err != nil {
return nil, err
}
case *shadowaead.Conn: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
Key: key,
Overhead: obfsOverhead,
Param: option.ProtocolParam, | <mask> return nil, fmt.Errorf("ssr %s initialize obfs error: %w", addr, err)
<mask> }
<mask>
<mask> protocol, err := protocol.PickProtocol(option.Protocol, &protocol.Base{
<mask> IV: nil,
<mask> Key: ciph.Key,
<mask> TCPMss: 1460,
<mask> Param: option.ProtocolParam,
<mask> })
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ssr %s initialize protocol error: %w", addr, err)
<mask> }
<mask> protocol.SetOverhead(obfs.GetObfsOverhead() + protocol.GetProtocolOverhead())
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove protocol.SetOverhead(obfs.GetObfsOverhead() + protocol.GetProtocolOverhead())
</s> add </s> remove return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
</s> add return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) </s> remove obfs, err := obfs.PickObfs(option.Obfs, &obfs.Base{
IVSize: ciph.IVSize(),
Key: ciph.Key,
HeadLen: 30,
Host: option.Server,
Port: option.Port,
Param: option.ObfsParam,
</s> add obfs, obfsOverhead, err := obfs.PickObfs(option.Obfs, &obfs.Base{
Host: option.Server,
Port: option.Port,
Key: key,
IVSize: ivSize,
Param: option.ObfsParam, </s> remove ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
</s> add var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key </s> remove bb, length, err := c.DecodePacket(b[:n])
</s> add decoded, err := c.DecodePacket(b[:n]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
<mask> })
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ssr %s initialize protocol error: %w", addr, err)
<mask> }
<mask> protocol.SetOverhead(obfs.GetObfsOverhead() + protocol.GetProtocolOverhead())
<mask>
<mask> return &ShadowSocksR{
<mask> Base: &Base{
<mask> name: option.Name,
<mask> addr: addr,
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove IV: nil,
Key: ciph.Key,
TCPMss: 1460,
Param: option.ProtocolParam,
</s> add Key: key,
Overhead: obfsOverhead,
Param: option.ProtocolParam, </s> remove return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
</s> add return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) </s> remove obfs, err := obfs.PickObfs(option.Obfs, &obfs.Base{
IVSize: ciph.IVSize(),
Key: ciph.Key,
HeadLen: 30,
Host: option.Server,
Port: option.Port,
Param: option.ObfsParam,
</s> add obfs, obfsOverhead, err := obfs.PickObfs(option.Obfs, &obfs.Base{
Host: option.Server,
Port: option.Port,
Key: key,
IVSize: ivSize,
Param: option.ObfsParam, </s> remove ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
</s> add var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key </s> remove bb, length, err := c.DecodePacket(b[:n])
</s> add decoded, err := c.DecodePacket(b[:n]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go | |
cipher: coreCiph, | <mask> addr: addr,
<mask> tp: C.ShadowsocksR,
<mask> udp: option.UDP,
<mask> },
<mask> cipher: ciph,
<mask> obfs: obfs,
<mask> protocol: protocol,
<mask> }, nil
<mask> }
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not a supported stream cipher in ssr", cipher)
</s> add var (
ivSize int
key []byte
)
if option.Cipher == "dummy" {
ivSize = 0
key = core.Kdf(option.Password, 16)
} else {
ciph, ok := coreCiph.(*core.StreamCipher)
if !ok {
return nil, fmt.Errorf("%s is not dummy or a supported stream cipher in ssr", cipher)
}
ivSize = ciph.IVSize()
key = ciph.Key </s> remove protocol.SetOverhead(obfs.GetObfsOverhead() + protocol.GetProtocolOverhead())
</s> add </s> remove IV: nil,
Key: ciph.Key,
TCPMss: 1460,
Param: option.ProtocolParam,
</s> add Key: key,
Overhead: obfsOverhead,
Param: option.ProtocolParam, </s> remove return nil, fmt.Errorf("ssr %s initialize cipher error: %w", addr, err)
</s> add return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | adapters/outbound/shadowsocksr.go |
<mask> package obfs
<mask>
<mask> // Base information for obfs
<mask> type Base struct {
<mask> IVSize int
<mask> Key []byte
<mask> HeadLen int
<mask> Host string
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove IVSize int
Key []byte
HeadLen int
Host string
Port int
Param string
</s> add Host string
Port int
Key []byte
IVSize int
Param string </s> remove IV []byte
</s> add </s> remove TCPMss int
</s> add </s> remove // Base information for protocol
</s> add import (
"bytes"
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"encoding/binary"
"math/rand"
"sync"
"time"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/clash/log"
"github.com/Dreamacro/go-shadowsocks2/core"
)
| [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | component/ssr/obfs/base.go | |
Host string
Port int
Key []byte
IVSize int
Param string | <mask> package obfs
<mask>
<mask> // Base information for obfs
<mask> type Base struct {
<mask> IVSize int
<mask> Key []byte
<mask> HeadLen int
<mask> Host string
<mask> Port int
<mask> Param string
<mask> }
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove // Base information for obfs
</s> add </s> remove IV []byte
</s> add </s> remove TCPMss int
</s> add </s> remove // Base information for protocol
</s> add import (
"bytes"
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"encoding/binary"
"math/rand"
"sync"
"time"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/clash/log"
"github.com/Dreamacro/go-shadowsocks2/core"
)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | component/ssr/obfs/base.go |
register("http_post", newHTTPPost, 0) | <mask> package obfs
<mask>
<mask> func init() {
<mask> register("http_post", newHTTPPost)
<mask> }
<mask>
<mask> func newHTTPPost(b *Base) Obfs {
<mask> return &httpObfs{Base: b, post: true}
<mask> }
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove func (h *httpObfs) initForConn() Obfs {
return &httpObfs{
Base: h.Base,
firstRequest: true,
firstResponse: true,
post: h.post,
}
</s> add type httpConn struct {
net.Conn
*httpObfs
hasSentHeader bool
hasRecvHeader bool
buf []byte </s> remove func init() {
register("http_simple", newHTTPSimple)
</s> add type httpObfs struct {
*Base
post bool </s> remove func (p *plain) initForConn() Obfs { return &plain{} }
func (p *plain) GetObfsOverhead() int {
return 0
}
func (p *plain) Encode(b []byte) ([]byte, error) {
return b, nil
}
func (p *plain) Decode(b []byte) ([]byte, bool, error) {
return b, false, nil
}
</s> add func (p *plain) StreamConn(c net.Conn) net.Conn { return c } </s> remove register("plain", newPlain)
</s> add register("plain", newPlain, 0) </s> remove func init() {
register("random_head", newRandomHead)
</s> add type randomHead struct {
*Base | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | component/ssr/obfs/http_post.go |
<mask>
<mask> import (
<mask> "bytes"
<mask> "encoding/hex"
<mask> "fmt"
<mask> "io"
<mask> "math/rand"
<mask> "strings"
<mask> )
<mask>
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove "strings"
"sync"
</s> add "math/rand"
"net" </s> remove "strings"
</s> add "net" </s> remove import (
"bytes"
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"encoding/binary"
"math/rand"
"strconv"
"strings"
"time"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/clash/component/ssr/tools"
"github.com/Dreamacro/go-shadowsocks2/core"
)
type authAES128 struct {
*Base
*recvInfo
*authData
hasSentHeader bool
packID uint32
userKey []byte
uid [4]byte
salt string
hmac hmacMethod
hashDigest hashDigestMethod
}
</s> add import "github.com/Dreamacro/clash/component/ssr/tools" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | component/ssr/obfs/http_simple.go | |
"net"
"strconv" | <mask> "bytes"
<mask> "encoding/hex"
<mask> "io"
<mask> "math/rand"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/ssr/tools"
<mask> )
<mask>
</s> Improve: refactor ssr and fix #995 (#1189)
Co-authored-by: goomada <madao@DESKTOP-IOEBS0C.localdomain> </s> remove "fmt"
</s> add </s> remove "time"
</s> add </s> remove import (
"bytes"
"crypto/aes"
"crypto/cipher"
"encoding/base64"
"encoding/binary"
"math/rand"
"strconv"
"strings"
"time"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/clash/component/ssr/tools"
"github.com/Dreamacro/go-shadowsocks2/core"
)
type authAES128 struct {
*Base
*recvInfo
*authData
hasSentHeader bool
packID uint32
userKey []byte
uid [4]byte
salt string
hmac hmacMethod
hashDigest hashDigestMethod
}
</s> add import "github.com/Dreamacro/clash/component/ssr/tools" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/9eb98e399d3163497e9f341ed0bd008fd3153211 | component/ssr/obfs/http_simple.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.