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 |
|---|---|---|---|---|
tls: option.TLS,
sni: option.SNI, | <mask> func NewSocks5(option Socks5Option) *Socks5 {
<mask> return &Socks5{
<mask> addr: fmt.Sprintf("%s:%d", option.Server, option.Port),
<mask> name: option.Name,
<mask> }
<mask> }
</s> Improve: add tls, sni options to socks5 outbound adapter | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcba14e05e979f2d6140d6daaaf3d9bd705249ee | adapters/outbound/socks5.go |
rules, err := parseRules(rawCfg, proxies) | <mask> return nil, err
<mask> }
<mask> config.Proxies = proxies
<mask>
<mask> rules, err := parseRules(rawCfg)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> config.Rules = rules
<mask>
</s> Fix: check target is valid in rules (#210) </s> remove func parseRules(cfg *rawConfig) ([]C.Rule, error) {
</s> add func parseRules(cfg *rawConfig, proxies map[string]C.Proxy) ([]C.Rule, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcf5b21208a4b6a7f77d4b308d2cf45db815bb95 | config/config.go |
func parseRules(cfg *rawConfig, proxies map[string]C.Proxy) ([]C.Rule, error) { | <mask> proxies["GLOBAL"] = adapters.NewProxy(global)
<mask> return proxies, nil
<mask> }
<mask>
<mask> func parseRules(cfg *rawConfig) ([]C.Rule, error) {
<mask> rules := []C.Rule{}
<mask>
<mask> rulesConfig := cfg.Rule
<mask> // parse rules
<mask> for idx, line := range rulesConfig {
</s> Fix: check target is valid in rules (#210) </s> remove rules, err := parseRules(rawCfg)
</s> add rules, err := parseRules(rawCfg, proxies) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcf5b21208a4b6a7f77d4b308d2cf45db815bb95 | config/config.go |
if _, ok := proxies[target]; !ok {
return nil, fmt.Errorf("Rules[%d] [%s] error: proxy [%s] not found", idx, line, target)
}
| <mask> return nil, fmt.Errorf("Rules[%d] [%s] error: format invalid", idx, line)
<mask> }
<mask>
<mask> rule = trimArr(rule)
<mask> var parsed C.Rule
<mask> switch rule[0] {
<mask> case "DOMAIN":
</s> Fix: check target is valid in rules (#210) </s> remove rules, err := parseRules(rawCfg)
</s> add rules, err := parseRules(rawCfg, proxies) </s> remove func parseRules(cfg *rawConfig) ([]C.Rule, error) {
</s> add func parseRules(cfg *rawConfig, proxies map[string]C.Proxy) ([]C.Rule, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bcf5b21208a4b6a7f77d4b308d2cf45db815bb95 | config/config.go |
buf = [][]byte{{aType, len}, host, port} | <mask> switch addr.AddrType {
<mask> case socks.AtypDomainName:
<mask> len := uint8(len(addr.Host))
<mask> host := []byte(addr.Host)
<mask> buf = [][]byte{[]byte{aType, len}, host, port}
<mask> case socks.AtypIPv4:
<mask> host := addr.IP.To4()
<mask> buf = [][]byte{[]byte{aType}, host, port}
<mask> case socks.AtypIPv6:
<mask> host := addr.IP.To16()
</s> Improve: gofmt -s for shadowsocks.go </s> remove buf = [][]byte{[]byte{aType}, host, port}
</s> add buf = [][]byte{{aType}, host, port} </s> remove buf = [][]byte{[]byte{aType}, host, port}
</s> add buf = [][]byte{{aType}, host, port} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd0a1ae1a7e824e04a9e904b978cbf6f15a2e18b | adapters/shadowsocks.go |
buf = [][]byte{{aType}, host, port} | <mask> host := []byte(addr.Host)
<mask> buf = [][]byte{[]byte{aType, len}, host, port}
<mask> case socks.AtypIPv4:
<mask> host := addr.IP.To4()
<mask> buf = [][]byte{[]byte{aType}, host, port}
<mask> case socks.AtypIPv6:
<mask> host := addr.IP.To16()
<mask> buf = [][]byte{[]byte{aType}, host, port}
<mask> }
<mask> return bytes.Join(buf, []byte(""))
</s> Improve: gofmt -s for shadowsocks.go </s> remove buf = [][]byte{[]byte{aType, len}, host, port}
</s> add buf = [][]byte{{aType, len}, host, port} </s> remove buf = [][]byte{[]byte{aType}, host, port}
</s> add buf = [][]byte{{aType}, host, port} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd0a1ae1a7e824e04a9e904b978cbf6f15a2e18b | adapters/shadowsocks.go |
buf = [][]byte{{aType}, host, port} | <mask> host := addr.IP.To4()
<mask> buf = [][]byte{[]byte{aType}, host, port}
<mask> case socks.AtypIPv6:
<mask> host := addr.IP.To16()
<mask> buf = [][]byte{[]byte{aType}, host, port}
<mask> }
<mask> return bytes.Join(buf, []byte(""))
<mask> }
</s> Improve: gofmt -s for shadowsocks.go </s> remove buf = [][]byte{[]byte{aType, len}, host, port}
</s> add buf = [][]byte{{aType, len}, host, port} </s> remove buf = [][]byte{[]byte{aType}, host, port}
</s> add buf = [][]byte{{aType}, host, port} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd0a1ae1a7e824e04a9e904b978cbf6f15a2e18b | adapters/shadowsocks.go |
rmark int | <mask> addr string
<mask> iface string
<mask> tp C.AdapterType
<mask> udp bool
<mask> }
<mask>
<mask> // Name implements C.ProxyAdapter
<mask> func (b *Base) Name() string {
<mask> return b.name
<mask> }
</s> Feature: mark on socket (#1705) </s> remove Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
</s> add Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
RoutingMark int </s> remove Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
</s> add Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` </s> remove *BaseOption
</s> add BasicOption | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outbound/base.go |
if b.rmark != 0 {
opts = append(opts, dialer.WithRoutingMark(b.rmark))
}
| <mask> opts = append(opts, dialer.WithInterface(b.iface))
<mask> }
<mask>
<mask> return opts
<mask> }
<mask>
<mask> type BasicOption struct {
</s> Feature: mark on socket (#1705) </s> remove Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
</s> add Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` </s> remove *BaseOption
</s> add BasicOption </s> remove Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
</s> add Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
RoutingMark int | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outbound/base.go |
Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` | <mask> return opts
<mask> }
<mask>
<mask> type BasicOption struct {
<mask> Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
<mask> }
<mask>
<mask> type BaseOption struct {
<mask> Name string
<mask> Addr string
</s> Feature: mark on socket (#1705) </s> remove Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
</s> add Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
RoutingMark int </s> remove *BaseOption
</s> add BasicOption | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outbound/base.go |
Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
RoutingMark int | <mask> Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
<mask> }
<mask>
<mask> type BaseOption struct {
<mask> Name string
<mask> Addr string
<mask> Type C.AdapterType
<mask> UDP bool
<mask> Interface string
<mask> }
<mask>
<mask> func NewBase(opt BaseOption) *Base {
<mask> return &Base{
<mask> name: opt.Name,
</s> Feature: mark on socket (#1705) </s> remove Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
</s> add Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` </s> remove *BaseOption
</s> add BasicOption | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outbound/base.go |
rmark: opt.RoutingMark, | <mask> tp: opt.Type,
<mask> udp: opt.UDP,
<mask> iface: opt.Interface,
<mask> }
<mask> }
<mask>
<mask> type conn struct {
</s> Feature: mark on socket (#1705) </s> remove Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
</s> add Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` </s> remove Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
</s> add Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
RoutingMark int </s> remove *BaseOption
</s> add BasicOption | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outbound/base.go |
BasicOption | <mask> tlsConfig *tls.Config
<mask> }
<mask>
<mask> type Socks5Option struct {
<mask> *BaseOption
<mask> Name string `proxy:"name"`
<mask> Server string `proxy:"server"`
<mask> Port int `proxy:"port"`
<mask> UserName string `proxy:"username,omitempty"`
<mask> Password string `proxy:"password,omitempty"`
</s> Feature: mark on socket (#1705) </s> remove Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
</s> add Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` </s> remove Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
</s> add Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
RoutingMark int | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outbound/socks5.go |
Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | <mask>
<mask> func NewFallback(option *GroupCommonOption, providers []provider.ProxyProvider) *Fallback {
<mask> return &Fallback{
<mask> Base: outbound.NewBase(outbound.BaseOption{
<mask> Name: option.Name,
<mask> Type: C.Fallback,
<mask> Interface: option.Interface,
<mask> }),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> providers: providers,
<mask> disableUDP: option.DisableUDP,
<mask> }
</s> Feature: mark on socket (#1705) </s> remove Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outboundgroup/fallback.go |
Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | <mask> return nil, fmt.Errorf("%w: %s", errStrategy, strategy)
<mask> }
<mask> return &LoadBalance{
<mask> Base: outbound.NewBase(outbound.BaseOption{
<mask> Name: option.Name,
<mask> Type: C.LoadBalance,
<mask> Interface: option.Interface,
<mask> }),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> providers: providers,
<mask> strategyFn: strategyFn,
<mask> disableUDP: option.DisableUDP,
</s> Feature: mark on socket (#1705) </s> remove Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outboundgroup/loadbalance.go |
Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | <mask>
<mask> func NewRelay(option *GroupCommonOption, providers []provider.ProxyProvider) *Relay {
<mask> return &Relay{
<mask> Base: outbound.NewBase(outbound.BaseOption{
<mask> Name: option.Name,
<mask> Type: C.Relay,
<mask> Interface: option.Interface,
<mask> }),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> providers: providers,
<mask> }
<mask> }
</s> Feature: mark on socket (#1705) </s> remove Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outboundgroup/relay.go |
Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | <mask> func NewSelector(option *GroupCommonOption, providers []provider.ProxyProvider) *Selector {
<mask> selected := providers[0].Proxies()[0].Name()
<mask> return &Selector{
<mask> Base: outbound.NewBase(outbound.BaseOption{
<mask> Name: option.Name,
<mask> Type: C.Selector,
<mask> Interface: option.Interface,
<mask> }),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> providers: providers,
<mask> selected: selected,
<mask> disableUDP: option.DisableUDP,
</s> Feature: mark on socket (#1705) </s> remove Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outboundgroup/selector.go |
Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | <mask>
<mask> func NewURLTest(option *GroupCommonOption, providers []provider.ProxyProvider, options ...urlTestOption) *URLTest {
<mask> urlTest := &URLTest{
<mask> Base: outbound.NewBase(outbound.BaseOption{
<mask> Name: option.Name,
<mask> Type: C.URLTest,
<mask> Interface: option.Interface,
<mask> }),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> fastSingle: singledo.NewSingle(time.Second * 10),
<mask> providers: providers,
<mask> disableUDP: option.DisableUDP,
</s> Feature: mark on socket (#1705) </s> remove Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Selector,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Fallback,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | adapter/outboundgroup/urltest.go |
if cfg.routingMark != 0 {
bindMarkToListenConfig(cfg.routingMark, lc, network, address)
} | <mask> if cfg.addrReuse {
<mask> addrReuseToListenConfig(lc)
<mask> }
<mask>
<mask> return lc.ListenPacket(ctx, network, address)
<mask> }
<mask>
<mask> func dialContext(ctx context.Context, network string, destination net.IP, port string, options []Option) (net.Conn, error) {
<mask> opt := &option{
</s> Feature: mark on socket (#1705) </s> remove Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.URLTest,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
</s> add Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | component/dialer/dialer.go |
if opt.routingMark != 0 {
bindMarkToDialer(opt.routingMark, dialer, network, destination)
} | <mask> return nil, err
<mask> }
<mask> }
<mask>
<mask> return dialer.DialContext(ctx, network, net.JoinHostPort(destination.String(), port))
<mask> }
<mask>
<mask> func dualStackDialContext(ctx context.Context, network, address string, options []Option) (net.Conn, error) {
</s> Feature: mark on socket (#1705) </s> remove Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.LoadBalance,
Interface: option.Interface,
RoutingMark: option.RoutingMark, </s> remove Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
</s> add Name: option.Name,
Type: C.Relay,
Interface: option.Interface,
RoutingMark: option.RoutingMark, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | component/dialer/dialer.go |
routingMark int | <mask> interfaceName string
<mask> addrReuse bool
<mask> }
<mask>
<mask> type Option func(opt *option)
<mask>
</s> Feature: mark on socket (#1705) </s> remove Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
</s> add Name string
Addr string
Type C.AdapterType
UDP bool
Interface string
RoutingMark int </s> remove Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
</s> add Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
RoutingMark int `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"` </s> remove *BaseOption
</s> add BasicOption | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/bd2ea2b917aa84b7b91272a8197555e4710f4cd7 | component/dialer/options.go |
var fallbackUDPProcess string | <mask> // rup8(sizeof(xtcpcb_n))
<mask> itemSize += 208
<mask> }
<mask> // skip the first xinpgen(24 bytes) block
<mask> for i := 24; i+itemSize <= len(buf); i += itemSize {
<mask> // offset of xinpcb_n and xsocket_n
<mask> inp, so := i, i+104
<mask>
<mask> srcPort := binary.BigEndian.Uint16(buf[inp+18 : inp+20])
</s> Fix: macOS udp find process should use unspecified fallback </s> remove if !ip.Equal(srcIP) {
continue
</s> add if ip.Equal(srcIP) {
// xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid) </s> remove // xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid)
</s> add // udp packet connection may be not equal with srcIP
if network == UDP && srcIP.IsUnspecified() && isIPv4 == srcIsIPv4 {
fallbackUDPProcess, _ = getExecPathFromPID(readNativeUint32(buf[so+68 : so+72]))
}
}
if network == UDP && fallbackUDPProcess != "" {
return fallbackUDPProcess, nil </s> remove var srcIP net.IP
</s> add var (
srcIP net.IP
srcIsIPv4 bool
) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/be8d63ba8f70a6f4e7b240899cd2903a77243c24 | component/process/process_darwin.go |
var (
srcIP net.IP
srcIsIPv4 bool
) | <mask>
<mask> // xinpcb_n.inp_vflag
<mask> flag := buf[inp+44]
<mask>
<mask> var srcIP net.IP
<mask> switch {
<mask> case flag&0x1 > 0 && isIPv4:
<mask> // ipv4
<mask> srcIP = net.IP(buf[inp+76 : inp+80])
<mask> case flag&0x2 > 0 && !isIPv4:
</s> Fix: macOS udp find process should use unspecified fallback </s> remove // xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid)
</s> add // udp packet connection may be not equal with srcIP
if network == UDP && srcIP.IsUnspecified() && isIPv4 == srcIsIPv4 {
fallbackUDPProcess, _ = getExecPathFromPID(readNativeUint32(buf[so+68 : so+72]))
}
}
if network == UDP && fallbackUDPProcess != "" {
return fallbackUDPProcess, nil </s> remove if !ip.Equal(srcIP) {
continue
</s> add if ip.Equal(srcIP) {
// xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/be8d63ba8f70a6f4e7b240899cd2903a77243c24 | component/process/process_darwin.go |
srcIsIPv4 = true | <mask> switch {
<mask> case flag&0x1 > 0 && isIPv4:
<mask> // ipv4
<mask> srcIP = net.IP(buf[inp+76 : inp+80])
<mask> case flag&0x2 > 0 && !isIPv4:
<mask> // ipv6
<mask> srcIP = net.IP(buf[inp+64 : inp+80])
<mask> default:
</s> Fix: macOS udp find process should use unspecified fallback </s> remove var srcIP net.IP
</s> add var (
srcIP net.IP
srcIsIPv4 bool
) </s> remove // xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid)
</s> add // udp packet connection may be not equal with srcIP
if network == UDP && srcIP.IsUnspecified() && isIPv4 == srcIsIPv4 {
fallbackUDPProcess, _ = getExecPathFromPID(readNativeUint32(buf[so+68 : so+72]))
}
}
if network == UDP && fallbackUDPProcess != "" {
return fallbackUDPProcess, nil </s> remove if !ip.Equal(srcIP) {
continue
</s> add if ip.Equal(srcIP) {
// xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/be8d63ba8f70a6f4e7b240899cd2903a77243c24 | component/process/process_darwin.go |
if ip.Equal(srcIP) {
// xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid) | <mask> default:
<mask> continue
<mask> }
<mask>
<mask> if !ip.Equal(srcIP) {
<mask> continue
<mask> }
<mask>
<mask> // xsocket_n.so_last_pid
<mask> pid := readNativeUint32(buf[so+68 : so+72])
<mask> return getExecPathFromPID(pid)
</s> Fix: macOS udp find process should use unspecified fallback </s> remove // xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid)
</s> add // udp packet connection may be not equal with srcIP
if network == UDP && srcIP.IsUnspecified() && isIPv4 == srcIsIPv4 {
fallbackUDPProcess, _ = getExecPathFromPID(readNativeUint32(buf[so+68 : so+72]))
}
}
if network == UDP && fallbackUDPProcess != "" {
return fallbackUDPProcess, nil </s> remove var srcIP net.IP
</s> add var (
srcIP net.IP
srcIsIPv4 bool
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/be8d63ba8f70a6f4e7b240899cd2903a77243c24 | component/process/process_darwin.go |
// udp packet connection may be not equal with srcIP
if network == UDP && srcIP.IsUnspecified() && isIPv4 == srcIsIPv4 {
fallbackUDPProcess, _ = getExecPathFromPID(readNativeUint32(buf[so+68 : so+72]))
}
}
if network == UDP && fallbackUDPProcess != "" {
return fallbackUDPProcess, nil | <mask> if !ip.Equal(srcIP) {
<mask> continue
<mask> }
<mask>
<mask> // xsocket_n.so_last_pid
<mask> pid := readNativeUint32(buf[so+68 : so+72])
<mask> return getExecPathFromPID(pid)
<mask> }
<mask>
<mask> return "", ErrNotFound
<mask> }
<mask>
</s> Fix: macOS udp find process should use unspecified fallback </s> remove if !ip.Equal(srcIP) {
continue
</s> add if ip.Equal(srcIP) {
// xsocket_n.so_last_pid
pid := readNativeUint32(buf[so+68 : so+72])
return getExecPathFromPID(pid) </s> remove var srcIP net.IP
</s> add var (
srcIP net.IP
srcIsIPv4 bool
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/be8d63ba8f70a6f4e7b240899cd2903a77243c24 | component/process/process_darwin.go |
func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(target) | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
<mask>
<mask> // NewHTTP receive normal http request and return HTTPContext
<mask> func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
<mask> metadata := parseSocksAddr(socks5.ParseAddr(target))
<mask> metadata.NetWork = C.TCP
<mask> metadata.Type = C.HTTP
<mask> if ip, port, err := parseAddr(source.String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
</s> Fix: should not trust address of http.Client (#1616) </s> remove in <- inbound.NewHTTP(address, source, right)
</s> add in <- inbound.NewHTTP(dstAddr, source, right) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/beb88cc46f01e2215934441287f1a553a9290e16 | adapter/inbound/http.go |
"github.com/Dreamacro/clash/transport/socks5" | <mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> func newClient(source net.Addr, in chan<- C.ConnContext) *http.Client {
<mask> return &http.Client{
</s> Fix: should not trust address of http.Client (#1616) </s> remove in <- inbound.NewHTTP(address, source, right)
</s> add in <- inbound.NewHTTP(dstAddr, source, right) </s> remove func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
</s> add func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(target) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/beb88cc46f01e2215934441287f1a553a9290e16 | listener/http/client.go |
dstAddr := socks5.ParseAddr(address)
if dstAddr == nil {
return nil, socks5.ErrAddressNotSupported
}
| <mask> if network != "tcp" && network != "tcp4" && network != "tcp6" {
<mask> return nil, errors.New("unsupported network " + network)
<mask> }
<mask>
<mask> left, right := net.Pipe()
<mask>
<mask> in <- inbound.NewHTTP(dstAddr, source, right)
<mask>
<mask> return left, nil
</s> Fix: should not trust address of http.Client (#1616) </s> remove in <- inbound.NewHTTP(address, source, right)
</s> add in <- inbound.NewHTTP(dstAddr, source, right) </s> remove func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
</s> add func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(target) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/beb88cc46f01e2215934441287f1a553a9290e16 | listener/http/client.go |
in <- inbound.NewHTTP(dstAddr, source, right) | <mask> }
<mask>
<mask> left, right := net.Pipe()
<mask>
<mask> in <- inbound.NewHTTP(address, source, right)
<mask>
<mask> return left, nil
<mask> },
<mask> },
<mask> CheckRedirect: func(req *http.Request, via []*http.Request) error {
</s> Fix: should not trust address of http.Client (#1616) </s> remove func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
</s> add func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(target) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/beb88cc46f01e2215934441287f1a553a9290e16 | listener/http/client.go |
addr string | <mask>
<mask> type Base struct {
<mask> name string
<mask> tp C.AdapterType
<mask> udp bool
<mask> }
<mask>
<mask> func (b *Base) Name() string {
</s> Feature: support relay (proxy chains) (#539) </s> remove func NewBase(name string, tp C.AdapterType, udp bool) *Base {
return &Base{name, tp, udp}
</s> add func (b *Base) Addr() string {
return b.addr
}
func NewBase(name string, addr string, tp C.AdapterType, udp bool) *Base {
return &Base{name, addr, tp, udp} </s> remove addr string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/base.go |
func (b *Base) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
return c, errors.New("no support")
}
| <mask> return b.tp
<mask> }
<mask>
<mask> func (b *Base) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> return nil, errors.New("no support")
<mask> }
<mask>
<mask> func (b *Base) SupportUDP() bool {
<mask> return b.udp
</s> Feature: support relay (proxy chains) (#539) </s> remove func NewBase(name string, tp C.AdapterType, udp bool) *Base {
return &Base{name, tp, udp}
</s> add func (b *Base) Addr() string {
return b.addr
}
func NewBase(name string, addr string, tp C.AdapterType, udp bool) *Base {
return &Base{name, addr, tp, udp} </s> remove return newConn(&NopConn{}, r), nil
</s> add return NewConn(&NopConn{}, r), nil </s> remove return newConn(c, d), nil
</s> add return NewConn(c, d), nil </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/base.go |
func (b *Base) Addr() string {
return b.addr
}
func NewBase(name string, addr string, tp C.AdapterType, udp bool) *Base {
return &Base{name, addr, tp, udp} | <mask> "type": b.Type().String(),
<mask> })
<mask> }
<mask>
<mask> func NewBase(name string, tp C.AdapterType, udp bool) *Base {
<mask> return &Base{name, tp, udp}
<mask> }
<mask>
<mask> type conn struct {
<mask> net.Conn
<mask> chain C.Chain
</s> Feature: support relay (proxy chains) (#539) </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove addr string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/base.go |
func NewConn(c net.Conn, a C.ProxyAdapter) C.Conn { | <mask> func (c *conn) AppendToChains(a C.ProxyAdapter) {
<mask> c.chain = append(c.chain, a.Name())
<mask> }
<mask>
<mask> func newConn(c net.Conn, a C.ProxyAdapter) C.Conn {
<mask> return &conn{c, []string{a.Name()}}
<mask> }
<mask>
<mask> type PacketConn interface {
<mask> net.PacketConn
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
return newConn(c, v), err
</s> add c, err = v.StreamConn(c, metadata)
return NewConn(c, v), err </s> remove func NewBase(name string, tp C.AdapterType, udp bool) *Base {
return &Base{name, tp, udp}
</s> add func (b *Base) Addr() string {
return b.addr
}
func NewBase(name string, addr string, tp C.AdapterType, udp bool) *Base {
return &Base{name, addr, tp, udp} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/base.go |
return NewConn(c, d), nil | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> tcpKeepAlive(c)
<mask> return newConn(c, d), nil
<mask> }
<mask>
<mask> func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> pc, err := dialer.ListenPacket("udp", "")
<mask> if err != nil {
</s> Feature: support relay (proxy chains) (#539) </s> remove _, err = c.Write(serializesSocksAddr(metadata))
return newConn(c, ss), err
</s> add _, err := c.Write(serializesSocksAddr(metadata))
return c, err
}
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err </s> remove return newConn(c, ss), nil
</s> add return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil </s> remove if err := h.shakeHand(metadata, c); err != nil {
</s> add c, err = h.StreamConn(c, metadata)
if err != nil { </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
return newConn(c, v), err
</s> add c, err = v.StreamConn(c, metadata)
return NewConn(c, v), err </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/direct.go |
<mask> )
<mask>
<mask> type Http struct {
<mask> *Base
<mask> addr string
<mask> user string
<mask> pass string
<mask> tlsConfig *tls.Config
<mask> }
<mask>
</s> Feature: support relay (proxy chains) (#539) </s> remove addr string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go | |
func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if h.tlsConfig != nil { | <mask> TLS bool `proxy:"tls,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", h.addr)
<mask> if err == nil && h.tlsConfig != nil {
<mask> cc := tls.Client(c, h.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
<mask> }
<mask>
</s> Feature: support relay (proxy chains) (#539) </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err == nil && ss.tls {
</s> add func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if ss.tls { </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go |
err := cc.Handshake() | <mask> func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", h.addr)
<mask> if err == nil && h.tlsConfig != nil {
<mask> cc := tls.Client(c, h.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
<mask> }
<mask>
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
</s> Feature: support relay (proxy chains) (#539) </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", h.addr)
if err == nil && h.tlsConfig != nil {
</s> add func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if h.tlsConfig != nil { </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err == nil && ss.tls {
</s> add func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if ss.tls { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go |
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
} | <mask> cc := tls.Client(c, h.tlsConfig)
<mask> err := cc.Handshake()
<mask> c = cc
<mask> }
<mask>
<mask> if err := h.shakeHand(metadata, c); err != nil {
<mask> return nil, err
</s> Feature: support relay (proxy chains) (#539) </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", h.addr)
if err == nil && h.tlsConfig != nil {
</s> add func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if h.tlsConfig != nil { </s> remove if err := h.shakeHand(metadata, c); err != nil {
</s> add c, err = h.StreamConn(c, metadata)
if err != nil { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go |
if err := h.shakeHand(metadata, c); err != nil {
return nil, err
}
return c, nil
}
func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", h.addr) | <mask> }
<mask>
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask>
<mask> c, err = h.StreamConn(c, metadata)
</s> Feature: support relay (proxy chains) (#539) </s> remove if err := h.shakeHand(metadata, c); err != nil {
</s> add c, err = h.StreamConn(c, metadata)
if err != nil { </s> remove c, err = t.instance.StreamConn(c)
</s> add c, err = t.StreamConn(c, metadata) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return newConn(c, ss), nil
</s> add return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go |
c, err = h.StreamConn(c, metadata)
if err != nil { | <mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> if err := h.shakeHand(metadata, c); err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return newConn(c, h), nil
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove return newConn(c, h), nil
</s> add return NewConn(c, h), nil </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go |
return NewConn(c, h), nil | <mask> if err := h.shakeHand(metadata, c); err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> return newConn(c, h), nil
<mask> }
<mask>
<mask> func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
<mask> addr := metadata.RemoteAddress()
<mask> req := &http.Request{
</s> Feature: support relay (proxy chains) (#539) </s> remove if err := h.shakeHand(metadata, c); err != nil {
</s> add c, err = h.StreamConn(c, metadata)
if err != nil { </s> remove return newConn(c, d), nil
</s> add return NewConn(c, d), nil </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go |
addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)), | <mask>
<mask> return &Http{
<mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Http,
<mask> },
<mask> user: option.UserName,
<mask> pass: option.Password,
<mask> tlsConfig: tlsConfig,
</s> Feature: support relay (proxy chains) (#539) </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go |
<mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Http,
<mask> },
<mask> addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
<mask> user: option.UserName,
<mask> pass: option.Password,
<mask> tlsConfig: tlsConfig,
<mask> }
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/http.go | |
return NewConn(&NopConn{}, r), nil | <mask> *Base
<mask> }
<mask>
<mask> func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> return newConn(&NopConn{}, r), nil
<mask> }
<mask>
<mask> func (r *Reject) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> return nil, errors.New("match reject rule")
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove _, err = c.Write(serializesSocksAddr(metadata))
return newConn(c, ss), err
</s> add _, err := c.Write(serializesSocksAddr(metadata))
return c, err
}
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err </s> remove return newConn(c, ss), nil
</s> add return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil </s> remove return newConn(c, d), nil
</s> add return NewConn(c, d), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/reject.go |
<mask> )
<mask>
<mask> type ShadowSocks struct {
<mask> *Base
<mask> server string
<mask> cipher core.Cipher
<mask>
<mask> // obfs
<mask> obfsMode string
<mask> obfsOption *simpleObfsOption
</s> Feature: support relay (proxy chains) (#539) </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove addr string
</s> add </s> remove addr string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go | |
func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { | <mask> SkipCertVerify bool `obfs:"skip-cert-verify,omitempty"`
<mask> Mux bool `obfs:"mux,omitempty"`
<mask> }
<mask>
<mask> func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", ss.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> switch ss.obfsMode {
<mask> case "tls":
<mask> c = obfs.NewTLSObfs(c, ss.obfsOption.Host)
<mask> case "http":
<mask> _, port, _ := net.SplitHostPort(ss.server)
</s> Feature: support relay (proxy chains) (#539) </s> remove _, port, _ := net.SplitHostPort(ss.server)
</s> add _, port, _ := net.SplitHostPort(ss.addr) </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.server)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.server, err)
}
tcpKeepAlive(c)
</s> add func (s *Snell) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { </s> remove _, port, _ := net.SplitHostPort(s.server)
</s> add _, port, _ := net.SplitHostPort(s.addr) </s> remove _, err = c.Write(serializesSocksAddr(metadata))
return newConn(c, ss), err
</s> add _, err := c.Write(serializesSocksAddr(metadata))
return c, err
}
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err == nil && ss.tls {
</s> add func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if ss.tls { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
_, port, _ := net.SplitHostPort(ss.addr) | <mask> switch ss.obfsMode {
<mask> case "tls":
<mask> c = obfs.NewTLSObfs(c, ss.obfsOption.Host)
<mask> case "http":
<mask> _, port, _ := net.SplitHostPort(ss.server)
<mask> c = obfs.NewHTTPObfs(c, ss.obfsOption.Host, port)
<mask> case "websocket":
<mask> var err error
<mask> c, err = v2rayObfs.NewV2rayObfs(c, ss.v2rayOption)
<mask> if err != nil {
</s> Feature: support relay (proxy chains) (#539) </s> remove _, port, _ := net.SplitHostPort(s.server)
</s> add _, port, _ := net.SplitHostPort(s.addr) </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.server)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
}
tcpKeepAlive(c)
</s> add func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { </s> remove return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.server)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.server, err)
}
tcpKeepAlive(c)
</s> add func (s *Snell) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port))
return newConn(c, s), err
</s> add err := snell.WriteHeader(c, metadata.String(), uint(port))
return c, err
}
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
}
tcpKeepAlive(c)
c, err = s.StreamConn(c, metadata)
return NewConn(c, s), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) | <mask> case "websocket":
<mask> var err error
<mask> c, err = v2rayObfs.NewV2rayObfs(c, ss.v2rayOption)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
<mask> }
<mask> }
<mask> c = ss.cipher.StreamConn(c)
<mask> _, err = c.Write(serializesSocksAddr(metadata))
<mask> return newConn(c, ss), err
</s> Feature: support relay (proxy chains) (#539) </s> remove _, err = c.Write(serializesSocksAddr(metadata))
return newConn(c, ss), err
</s> add _, err := c.Write(serializesSocksAddr(metadata))
return c, err
}
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err </s> remove _, port, _ := net.SplitHostPort(ss.server)
</s> add _, port, _ := net.SplitHostPort(ss.addr) </s> remove return newConn(c, ss), nil
</s> add return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil </s> remove if err := h.shakeHand(metadata, c); err != nil {
</s> add c, err = h.StreamConn(c, metadata)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
_, err := c.Write(serializesSocksAddr(metadata))
return c, err
}
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err | <mask> return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
<mask> }
<mask> }
<mask> c = ss.cipher.StreamConn(c)
<mask> _, err = c.Write(serializesSocksAddr(metadata))
<mask> return newConn(c, ss), err
<mask> }
<mask>
<mask> func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> pc, err := dialer.ListenPacket("udp", "")
<mask> if err != nil {
</s> Feature: support relay (proxy chains) (#539) </s> remove return newConn(c, d), nil
</s> add return NewConn(c, d), nil </s> remove return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return newConn(c, ss), nil
</s> add return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.server)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
}
tcpKeepAlive(c)
</s> add func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
addr, err := resolveUDPAddr("udp", ss.addr) | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> addr, err := resolveUDPAddr("udp", ss.server)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> pc = ss.cipher.PacketConn(pc)
</s> Feature: support relay (proxy chains) (#539) </s> remove if err := h.shakeHand(metadata, c); err != nil {
</s> add c, err = h.StreamConn(c, metadata)
if err != nil { </s> remove return newConn(c, d), nil
</s> add return NewConn(c, d), nil </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return newConn(c, ss), nil
</s> add return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) | <mask> })
<mask> }
<mask>
<mask> func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
<mask> server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
<mask> cipher := option.Cipher
<mask> password := option.Password
<mask> ciph, err := core.PickCipher(cipher, nil, password)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ss %s initialize error: %w", server, err)
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("ss %s initialize error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s initialize error: %w", addr, err) | <mask> cipher := option.Cipher
<mask> password := option.Password
<mask> ciph, err := core.PickCipher(cipher, nil, password)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ss %s initialize error: %w", server, err)
<mask> }
<mask>
<mask> var v2rayOption *v2rayObfs.Option
<mask> var obfsOption *simpleObfsOption
<mask> obfsMode := ""
</s> Feature: support relay (proxy chains) (#539) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) | <mask> decoder := structure.NewDecoder(structure.Option{TagName: "obfs", WeaklyTypedInput: true})
<mask> if option.Plugin == "obfs" {
<mask> opts := simpleObfsOption{Host: "bing.com"}
<mask> if err := decoder.Decode(option.PluginOpts, &opts); err != nil {
<mask> return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
<mask> }
<mask>
<mask> if opts.Mode != "tls" && opts.Mode != "http" {
<mask> return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("snell %s obfs mode error: %s", server, obfsOption.Mode)
</s> add return nil, fmt.Errorf("snell %s obfs mode error: %s", addr, obfsOption.Mode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) | <mask> return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
<mask> }
<mask>
<mask> if opts.Mode != "tls" && opts.Mode != "http" {
<mask> return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
<mask> }
<mask> obfsMode = opts.Mode
<mask> obfsOption = &opts
<mask> } else if option.Plugin == "v2ray-plugin" {
<mask> opts := v2rayObfsOption{Host: "bing.com", Mux: true}
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("snell %s obfs mode error: %s", server, obfsOption.Mode)
</s> add return nil, fmt.Errorf("snell %s obfs mode error: %s", addr, obfsOption.Mode) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err) | <mask> obfsOption = &opts
<mask> } else if option.Plugin == "v2ray-plugin" {
<mask> opts := v2rayObfsOption{Host: "bing.com", Mux: true}
<mask> if err := decoder.Decode(option.PluginOpts, &opts); err != nil {
<mask> return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
<mask> }
<mask>
<mask> if opts.Mode != "websocket" {
<mask> return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("snell %s obfs mode error: %s", server, obfsOption.Mode)
</s> add return nil, fmt.Errorf("snell %s obfs mode error: %s", addr, obfsOption.Mode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) | <mask> return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
<mask> }
<mask>
<mask> if opts.Mode != "websocket" {
<mask> return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
<mask> }
<mask> obfsMode = opts.Mode
<mask>
<mask> var tlsConfig *tls.Config
<mask> if opts.TLS {
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("snell %s obfs mode error: %s", server, obfsOption.Mode)
</s> add return nil, fmt.Errorf("snell %s obfs mode error: %s", addr, obfsOption.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize error: %w", addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
addr: addr, | <mask>
<mask> return &ShadowSocks{
<mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Shadowsocks,
<mask> udp: option.UDP,
<mask> },
<mask> cipher: ciph,
</s> Feature: support relay (proxy chains) (#539) </s> remove server: server,
</s> add </s> remove server: server,
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go |
<mask> name: option.Name,
<mask> tp: C.Shadowsocks,
<mask> udp: option.UDP,
<mask> },
<mask> server: server,
<mask> cipher: ciph,
<mask>
<mask> obfsMode: obfsMode,
<mask> v2rayOption: v2rayOption,
<mask> obfsOption: obfsOption,
</s> Feature: support relay (proxy chains) (#539) </s> remove server: server,
</s> add </s> remove server: server,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/shadowsocks.go | |
<mask> )
<mask>
<mask> type Snell struct {
<mask> *Base
<mask> server string
<mask> psk []byte
<mask> obfsOption *simpleObfsOption
<mask> }
<mask>
<mask> type SnellOption struct {
</s> Feature: support relay (proxy chains) (#539) </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove addr string
</s> add </s> remove addr string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go | |
func (s *Snell) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { | <mask> Psk string `proxy:"psk"`
<mask> ObfsOpts map[string]interface{} `proxy:"obfs-opts,omitempty"`
<mask> }
<mask>
<mask> func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", s.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", s.server, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> switch s.obfsOption.Mode {
<mask> case "tls":
<mask> c = obfs.NewTLSObfs(c, s.obfsOption.Host)
<mask> case "http":
<mask> _, port, _ := net.SplitHostPort(s.server)
</s> Feature: support relay (proxy chains) (#539) </s> remove _, port, _ := net.SplitHostPort(s.server)
</s> add _, port, _ := net.SplitHostPort(s.addr) </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.server)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
}
tcpKeepAlive(c)
</s> add func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { </s> remove _, port, _ := net.SplitHostPort(ss.server)
</s> add _, port, _ := net.SplitHostPort(ss.addr) </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port))
return newConn(c, s), err
</s> add err := snell.WriteHeader(c, metadata.String(), uint(port))
return c, err
}
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
}
tcpKeepAlive(c)
c, err = s.StreamConn(c, metadata)
return NewConn(c, s), err </s> remove _, err = c.Write(serializesSocksAddr(metadata))
return newConn(c, ss), err
</s> add _, err := c.Write(serializesSocksAddr(metadata))
return c, err
}
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go |
_, port, _ := net.SplitHostPort(s.addr) | <mask> switch s.obfsOption.Mode {
<mask> case "tls":
<mask> c = obfs.NewTLSObfs(c, s.obfsOption.Host)
<mask> case "http":
<mask> _, port, _ := net.SplitHostPort(s.server)
<mask> c = obfs.NewHTTPObfs(c, s.obfsOption.Host, port)
<mask> }
<mask> c = snell.StreamConn(c, s.psk)
<mask> port, _ := strconv.Atoi(metadata.DstPort)
<mask> err = snell.WriteHeader(c, metadata.String(), uint(port))
</s> Feature: support relay (proxy chains) (#539) </s> remove _, port, _ := net.SplitHostPort(ss.server)
</s> add _, port, _ := net.SplitHostPort(ss.addr) </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port))
return newConn(c, s), err
</s> add err := snell.WriteHeader(c, metadata.String(), uint(port))
return c, err
}
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
}
tcpKeepAlive(c)
c, err = s.StreamConn(c, metadata)
return NewConn(c, s), err </s> remove func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.server)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.server, err)
}
tcpKeepAlive(c)
</s> add func (s *Snell) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { </s> remove func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.server)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
}
tcpKeepAlive(c)
</s> add func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) { </s> remove return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go |
err := snell.WriteHeader(c, metadata.String(), uint(port))
return c, err
}
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
}
tcpKeepAlive(c)
c, err = s.StreamConn(c, metadata)
return NewConn(c, s), err | <mask> c = obfs.NewHTTPObfs(c, s.obfsOption.Host, port)
<mask> }
<mask> c = snell.StreamConn(c, s.psk)
<mask> port, _ := strconv.Atoi(metadata.DstPort)
<mask> err = snell.WriteHeader(c, metadata.String(), uint(port))
<mask> return newConn(c, s), err
<mask> }
<mask>
<mask> func NewSnell(option SnellOption) (*Snell, error) {
<mask> server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
<mask> psk := []byte(option.Psk)
</s> Feature: support relay (proxy chains) (#539) </s> remove _, port, _ := net.SplitHostPort(s.server)
</s> add _, port, _ := net.SplitHostPort(s.addr) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) </s> remove _, port, _ := net.SplitHostPort(ss.server)
</s> add _, port, _ := net.SplitHostPort(ss.addr) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go |
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) | <mask> return newConn(c, s), err
<mask> }
<mask>
<mask> func NewSnell(option SnellOption) (*Snell, error) {
<mask> server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
<mask> psk := []byte(option.Psk)
<mask>
<mask> decoder := structure.NewDecoder(structure.Option{TagName: "obfs", WeaklyTypedInput: true})
<mask> obfsOption := &simpleObfsOption{Host: "bing.com"}
<mask> if err := decoder.Decode(option.ObfsOpts, obfsOption); err != nil {
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", addr, err) </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port))
return newConn(c, s), err
</s> add err := snell.WriteHeader(c, metadata.String(), uint(port))
return c, err
}
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
}
tcpKeepAlive(c)
c, err = s.StreamConn(c, metadata)
return NewConn(c, s), err </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) </s> remove return newConn(c, d), nil
</s> add return NewConn(c, d), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go |
return nil, fmt.Errorf("snell %s initialize obfs error: %w", addr, err) | <mask>
<mask> decoder := structure.NewDecoder(structure.Option{TagName: "obfs", WeaklyTypedInput: true})
<mask> obfsOption := &simpleObfsOption{Host: "bing.com"}
<mask> if err := decoder.Decode(option.ObfsOpts, obfsOption); err != nil {
<mask> return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
<mask> }
<mask>
<mask> if obfsOption.Mode != "tls" && obfsOption.Mode != "http" {
<mask> return nil, fmt.Errorf("snell %s obfs mode error: %s", server, obfsOption.Mode)
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("snell %s obfs mode error: %s", server, obfsOption.Mode)
</s> add return nil, fmt.Errorf("snell %s obfs mode error: %s", addr, obfsOption.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go |
return nil, fmt.Errorf("snell %s obfs mode error: %s", addr, obfsOption.Mode) | <mask> return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
<mask> }
<mask>
<mask> if obfsOption.Mode != "tls" && obfsOption.Mode != "http" {
<mask> return nil, fmt.Errorf("snell %s obfs mode error: %s", server, obfsOption.Mode)
<mask> }
<mask>
<mask> return &Snell{
<mask> Base: &Base{
<mask> name: option.Name,
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", addr, err) </s> remove return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
</s> add return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err)
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go |
addr: addr, | <mask> return &Snell{
<mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Snell,
<mask> },
<mask> psk: psk,
<mask> obfsOption: obfsOption,
<mask> }, nil
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove server: server,
</s> add </s> remove server: server,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go |
<mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Snell,
<mask> },
<mask> server: server,
<mask> psk: psk,
<mask> obfsOption: obfsOption,
<mask> }, nil
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove server: server,
</s> add </s> remove server: server,
</s> add </s> remove server: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/snell.go | |
<mask> )
<mask>
<mask> type Socks5 struct {
<mask> *Base
<mask> addr string
<mask> user string
<mask> pass string
<mask> tls bool
<mask> skipCertVerify bool
<mask> tlsConfig *tls.Config
</s> Feature: support relay (proxy chains) (#539) </s> remove addr string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go | |
func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if ss.tls { | <mask> UDP bool `proxy:"udp,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", ss.addr)
<mask>
<mask> if err == nil && ss.tls {
<mask> cc := tls.Client(c, ss.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
<mask> }
<mask>
</s> Feature: support relay (proxy chains) (#539) </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", h.addr)
if err == nil && h.tlsConfig != nil {
</s> add func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if h.tlsConfig != nil { </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go |
err := cc.Handshake() | <mask> c, err := dialer.DialContext(ctx, "tcp", ss.addr)
<mask>
<mask> if err == nil && ss.tls {
<mask> cc := tls.Client(c, ss.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
<mask> }
<mask>
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
</s> Feature: support relay (proxy chains) (#539) </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err == nil && ss.tls {
</s> add func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if ss.tls { </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", h.addr)
if err == nil && h.tlsConfig != nil {
</s> add func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if h.tlsConfig != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go |
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
} | <mask> err := cc.Handshake()
<mask> c = cc
<mask> }
<mask>
<mask> var user *socks5.User
<mask> if ss.user != "" {
</s> Feature: support relay (proxy chains) (#539) </s> remove if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
</s> add </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", h.addr)
if err == nil && h.tlsConfig != nil {
</s> add func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if h.tlsConfig != nil { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go |
<mask> err = cc.Handshake()
<mask> c = cc
<mask> }
<mask>
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> var user *socks5.User
<mask> if ss.user != "" {
<mask> user = &socks5.User{
<mask> Username: ss.user,
<mask> Password: ss.pass,
</s> Feature: support relay (proxy chains) (#539) </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove err = cc.Handshake()
</s> add err := cc.Handshake() </s> remove return nil, fmt.Errorf("%s connect error: %w", ss.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go | |
return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil | <mask> }
<mask> if _, err := socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdConnect, user); err != nil {
<mask> return nil, err
<mask> }
<mask> return newConn(c, ss), nil
<mask> }
<mask>
<mask> func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, err error) {
<mask> ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
<mask> defer cancel()
</s> Feature: support relay (proxy chains) (#539) </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove _, err = c.Write(serializesSocksAddr(metadata))
return newConn(c, ss), err
</s> add _, err := c.Write(serializesSocksAddr(metadata))
return c, err
}
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go |
addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)), | <mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Socks5,
<mask> udp: option.UDP,
<mask> },
<mask> user: option.UserName,
</s> Feature: support relay (proxy chains) (#539) </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go |
<mask> name: option.Name,
<mask> tp: C.Socks5,
<mask> udp: option.UDP,
<mask> },
<mask> addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
<mask> user: option.UserName,
<mask> pass: option.Password,
<mask> tls: option.TLS,
<mask> skipCertVerify: option.SkipCertVerify,
<mask> tlsConfig: tlsConfig,
</s> Feature: support relay (proxy chains) (#539) </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/socks5.go | |
<mask> )
<mask>
<mask> type Trojan struct {
<mask> *Base
<mask> server string
<mask> instance *trojan.Trojan
<mask> }
<mask>
<mask> type TrojanOption struct {
<mask> Name string `proxy:"name"`
</s> Feature: support relay (proxy chains) (#539) </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove addr string
</s> add </s> remove addr string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go | |
func (t *Trojan) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
c, err := t.instance.StreamConn(c)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
}
err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return c, err
}
| <mask> UDP bool `proxy:"udp,omitempty"`
<mask> }
<mask>
<mask> func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", t.addr)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err == nil && ss.tls {
</s> add func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if ss.tls { </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
c, err := dialer.DialContext(ctx, "tcp", t.addr) | <mask> UDP bool `proxy:"udp,omitempty"`
<mask> }
<mask>
<mask> func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", t.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = t.instance.StreamConn(c)
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | <mask>
<mask> func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", t.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = t.instance.StreamConn(c)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove c, err = t.instance.StreamConn(c)
</s> add c, err = t.StreamConn(c, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
c, err = t.StreamConn(c, metadata) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = t.instance.StreamConn(c)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask>
<mask> err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, err </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
return nil, err | <mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = t.instance.StreamConn(c)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask>
<mask> err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
<mask> return newConn(c, t), err
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err = t.instance.StreamConn(c)
</s> add c, err = t.StreamConn(c, metadata) </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
return NewConn(c, t), err | <mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask>
<mask> err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
<mask> return newConn(c, t), err
<mask> }
<mask>
<mask> func (t *Trojan) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
<mask> defer cancel()
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, err </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return newConn(c, ss), nil
</s> add return c, nil
}
func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
}
tcpKeepAlive(c)
c, err = ss.StreamConn(c, metadata)
if err != nil {
return nil, err
}
return NewConn(c, ss), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
c, err := dialer.DialContext(ctx, "tcp", t.addr) | <mask>
<mask> func (t *Trojan) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
<mask> defer cancel()
<mask> c, err := dialer.DialContext(ctx, "tcp", t.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = t.instance.StreamConn(c)
</s> Feature: support relay (proxy chains) (#539) </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | <mask> ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
<mask> defer cancel()
<mask> c, err := dialer.DialContext(ctx, "tcp", t.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = t.instance.StreamConn(c)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
return newConn(c, t), err
</s> add return NewConn(c, t), err </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | <mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = t.instance.StreamConn(c)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %w", t.server, err)
<mask> }
<mask>
<mask> err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
<mask> if err != nil {
<mask> return nil, err
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err = t.instance.StreamConn(c)
</s> add c, err = t.StreamConn(c, metadata) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, err </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) | <mask> })
<mask> }
<mask>
<mask> func NewTrojan(option TrojanOption) (*Trojan, error) {
<mask> server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
<mask>
<mask> tOption := &trojan.Option{
<mask> Password: option.Password,
<mask> ALPN: option.ALPN,
<mask> ServerName: option.Server,
</s> Feature: support relay (proxy chains) (#539) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) </s> remove server := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
</s> add addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port)) </s> remove err = snell.WriteHeader(c, metadata.String(), uint(port))
return newConn(c, s), err
</s> add err := snell.WriteHeader(c, metadata.String(), uint(port))
return c, err
}
func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", s.addr)
if err != nil {
return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
}
tcpKeepAlive(c)
c, err = s.StreamConn(c, metadata)
return NewConn(c, s), err </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
addr: addr, | <mask> return &Trojan{
<mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Trojan,
<mask> udp: option.UDP,
<mask> },
<mask> instance: trojan.New(tOption),
</s> Feature: support relay (proxy chains) (#539) </s> remove server: server,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go |
<mask> name: option.Name,
<mask> tp: C.Trojan,
<mask> udp: option.UDP,
<mask> },
<mask> server: server,
<mask> instance: trojan.New(tOption),
<mask> }, nil
<mask> }
<mask>
<mask> type trojanPacketConn struct {
</s> Feature: support relay (proxy chains) (#539) </s> remove server: server,
</s> add </s> remove server: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add </s> remove server: server,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/trojan.go | |
<mask> )
<mask>
<mask> type Vmess struct {
<mask> *Base
<mask> server string
<mask> client *vmess.Client
<mask> }
<mask>
<mask> type VmessOption struct {
<mask> Name string `proxy:"name"`
</s> Feature: support relay (proxy chains) (#539) </s> remove server string
</s> add </s> remove server string
</s> add </s> remove server string
</s> add </s> remove addr string
</s> add </s> remove addr string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go | |
func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
return v.client.New(c, parseVmessAddr(metadata))
}
| <mask> WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", v.addr)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.addr)
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", h.addr)
if err == nil && h.tlsConfig != nil {
</s> add func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if h.tlsConfig != nil { </s> remove func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
c, err := dialer.DialContext(ctx, "tcp", ss.addr)
if err == nil && ss.tls {
</s> add func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
if ss.tls { </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go |
c, err := dialer.DialContext(ctx, "tcp", v.addr) | <mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", v.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
return newConn(c, v), err
</s> add c, err = v.StreamConn(c, metadata)
return NewConn(c, v), err </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go |
return nil, fmt.Errorf("%s connect error", v.addr) | <mask>
<mask> func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", v.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> return newConn(c, v), err
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
return newConn(c, v), err
</s> add c, err = v.StreamConn(c, metadata)
return NewConn(c, v), err </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go |
c, err = v.StreamConn(c, metadata)
return NewConn(c, v), err | <mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> return newConn(c, v), err
<mask> }
<mask>
<mask> func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
<mask> // vmess use stream-oriented udp, so clash needs a net.UDPAddr
<mask> if !metadata.Resolved() {
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go |
c, err := dialer.DialContext(ctx, "tcp", v.addr) | <mask> }
<mask>
<mask> ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
<mask> defer cancel()
<mask> c, err := dialer.DialContext(ctx, "tcp", v.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
</s> Feature: support relay (proxy chains) (#539) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go |
return nil, fmt.Errorf("%s connect error", v.addr) | <mask> ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
<mask> defer cancel()
<mask> c, err := dialer.DialContext(ctx, "tcp", v.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.server)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> if err != nil {
<mask> return nil, fmt.Errorf("new vmess client error: %v", err)
</s> Feature: support relay (proxy chains) (#539) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove return nil, fmt.Errorf("%s connect error", v.server)
</s> add return nil, fmt.Errorf("%s connect error", v.addr) </s> remove return nil, fmt.Errorf("%s connect error: %w", t.server, err)
</s> add return nil, fmt.Errorf("%s connect error: %w", t.addr, err) </s> remove c, err := dialer.DialContext(ctx, "tcp", v.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", v.addr) </s> remove c, err := dialer.DialContext(ctx, "tcp", t.server)
</s> add c, err := dialer.DialContext(ctx, "tcp", t.addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go |
addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)), | <mask> Base: &Base{
<mask> name: option.Name,
<mask> tp: C.Vmess,
<mask> udp: true,
<mask> },
<mask> client: client,
<mask> }, nil
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove server: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add </s> remove server: server,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go |
<mask> name: option.Name,
<mask> tp: C.Vmess,
<mask> udp: true,
<mask> },
<mask> server: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
<mask> client: client,
<mask> }, nil
<mask> }
<mask>
<mask> func parseVmessAddr(metadata *C.Metadata) *vmess.DstAddr {
</s> Feature: support relay (proxy chains) (#539) </s> remove server: server,
</s> add </s> remove addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
</s> add </s> remove server: server,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outbound/vmess.go | |
Base: outbound.NewBase(name, "", C.Fallback, false), | <mask> }
<mask>
<mask> func NewFallback(name string, providers []provider.ProxyProvider) *Fallback {
<mask> return &Fallback{
<mask> Base: outbound.NewBase(name, C.Fallback, false),
<mask> single: singledo.NewSingle(defaultGetProxiesDuration),
<mask> providers: providers,
<mask> }
<mask> }
</s> Feature: support relay (proxy chains) (#539) </s> remove Base: outbound.NewBase(name, C.LoadBalance, false),
</s> add Base: outbound.NewBase(name, "", C.LoadBalance, false), </s> remove Base: outbound.NewBase(name, C.URLTest, false),
</s> add Base: outbound.NewBase(name, "", C.URLTest, false), </s> remove Base: outbound.NewBase(name, C.Selector, false),
</s> add Base: outbound.NewBase(name, "", C.Selector, false), </s> remove func NewBase(name string, tp C.AdapterType, udp bool) *Base {
return &Base{name, tp, udp}
</s> add func (b *Base) Addr() string {
return b.addr
}
func NewBase(name string, addr string, tp C.AdapterType, udp bool) *Base {
return &Base{name, addr, tp, udp} </s> remove if groupOption.Type == "select" {
</s> add if groupOption.Type == "select" || groupOption.Type == "relay" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outboundgroup/fallback.go |
Base: outbound.NewBase(name, "", C.LoadBalance, false), | <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 relay (proxy chains) (#539) </s> remove Base: outbound.NewBase(name, C.Fallback, false),
</s> add Base: outbound.NewBase(name, "", C.Fallback, false), </s> remove Base: outbound.NewBase(name, C.URLTest, false),
</s> add Base: outbound.NewBase(name, "", C.URLTest, false), </s> remove Base: outbound.NewBase(name, C.Selector, false),
</s> add Base: outbound.NewBase(name, "", C.Selector, false), </s> remove func NewBase(name string, tp C.AdapterType, udp bool) *Base {
return &Base{name, tp, udp}
</s> add func (b *Base) Addr() string {
return b.addr
}
func NewBase(name string, addr string, tp C.AdapterType, udp bool) *Base {
return &Base{name, addr, tp, udp} </s> remove if groupOption.Type == "select" {
</s> add if groupOption.Type == "select" || groupOption.Type == "relay" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/c0a2473160f9da2ea2116358fed33a3e6a77ae5a | adapters/outboundgroup/loadbalance.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.