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 |
|---|---|---|---|---|
"github.com/Dreamacro/protobytes" | <mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> "github.com/Dreamacro/clash/transport/vmess"
<mask> )
<mask>
<mask> const (
<mask> // max packet length
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove "github.com/Dreamacro/clash/common/pool"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/trojan/trojan.go |
buf := protobytes.BytesWriter{}
buf.PutSlice(t.hexPassword)
buf.PutSlice(crlf) | <mask> })
<mask> }
<mask>
<mask> func (t *Trojan) WriteHeader(w io.Writer, command Command, socks5Addr []byte) error {
<mask> buf := pool.GetBuffer()
<mask> defer pool.PutBuffer(buf)
<mask>
<mask> buf.Write(t.hexPassword)
<mask> buf.Write(crlf)
<mask>
<mask> buf.WriteByte(command)
<mask> buf.Write(socks5Addr)
<mask> buf.Write(crlf)
<mask>
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.Write(socks5Addr)
binary.Write(buf, binary.BigEndian, uint16(len(payload)))
buf.Write(crlf)
buf.Write(payload)
</s> add buf := protobytes.BytesWriter{}
buf.PutSlice(socks5Addr)
buf.PutUint16be(uint16(len(payload)))
buf.PutSlice(crlf)
buf.PutSlice(payload) </s> remove buf.WriteByte(command)
buf.Write(socks5Addr)
buf.Write(crlf)
</s> add buf.PutUint8(command)
buf.PutSlice(socks5Addr)
buf.PutSlice(crlf) </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
</s> add buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf) </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.WriteByte(Version)
</s> add buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf)
buf.PutUint8(Version) </s> remove buf.WriteByte(CommandConnectV2)
</s> add buf.PutUint8(CommandConnectV2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/trojan/trojan.go |
buf.PutUint8(command)
buf.PutSlice(socks5Addr)
buf.PutSlice(crlf) | <mask>
<mask> buf.Write(t.hexPassword)
<mask> buf.Write(crlf)
<mask>
<mask> buf.WriteByte(command)
<mask> buf.Write(socks5Addr)
<mask> buf.Write(crlf)
<mask>
<mask> _, err := w.Write(buf.Bytes())
<mask> return err
<mask> }
<mask>
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.Write(t.hexPassword)
buf.Write(crlf)
</s> add buf := protobytes.BytesWriter{}
buf.PutSlice(t.hexPassword)
buf.PutSlice(crlf) </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.Write(socks5Addr)
binary.Write(buf, binary.BigEndian, uint16(len(payload)))
buf.Write(crlf)
buf.Write(payload)
</s> add buf := protobytes.BytesWriter{}
buf.PutSlice(socks5Addr)
buf.PutUint16be(uint16(len(payload)))
buf.PutSlice(crlf)
buf.PutSlice(payload) </s> remove buf.Write(payload)
</s> add buf.PutSlice(payload) </s> remove buf.Write([]byte{0x00, 0x06})
buf.Write(socks5Addr[1 : 1+net.IPv6len+2])
</s> add buf.PutSlice([]byte{0x00, 0x06})
buf.PutSlice(socks5Addr[1 : 1+net.IPv6len+2]) </s> remove _, wErr := rw.Write(reply[:])
</s> add _, wErr := rw.Write(reply.Bytes()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/trojan/trojan.go |
buf := protobytes.BytesWriter{}
buf.PutSlice(socks5Addr)
buf.PutUint16be(uint16(len(payload)))
buf.PutSlice(crlf)
buf.PutSlice(payload) | <mask> }
<mask> }
<mask>
<mask> func writePacket(w io.Writer, socks5Addr, payload []byte) (int, error) {
<mask> buf := pool.GetBuffer()
<mask> defer pool.PutBuffer(buf)
<mask>
<mask> buf.Write(socks5Addr)
<mask> binary.Write(buf, binary.BigEndian, uint16(len(payload)))
<mask> buf.Write(crlf)
<mask> buf.Write(payload)
<mask>
<mask> return w.Write(buf.Bytes())
<mask> }
<mask>
<mask> func WritePacket(w io.Writer, socks5Addr, payload []byte) (int, error) {
<mask> if len(payload) <= maxLength {
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
</s> add buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf) </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.Write(t.hexPassword)
buf.Write(crlf)
</s> add buf := protobytes.BytesWriter{}
buf.PutSlice(t.hexPassword)
buf.PutSlice(crlf) </s> remove payload = packet[3+len(addr):]
</s> add _, payload = r.SplitAt(len(addr)) </s> remove if len(packet) < 5 {
</s> add r := protobytes.BytesReader(packet)
if r.Len() < 5 { </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.WriteByte(Version)
</s> add buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf)
buf.PutUint8(Version) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/trojan/trojan.go |
<mask> package obfs
<mask>
<mask> import (
<mask> "bytes"
<mask> "encoding/binary"
<mask> "errors"
<mask> "io"
<mask> "net"
<mask> )
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove "bytes"
</s> add </s> remove "bytes"
"encoding/binary"
</s> add </s> remove "encoding/binary"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go | |
"net/netip"
"github.com/Dreamacro/protobytes" | <mask> "io"
<mask> "net"
<mask> )
<mask>
<mask> type SessionStatus = byte
<mask>
<mask> const (
<mask> SessionStatusNew SessionStatus = 0x01
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove "bytes"
</s> add </s> remove "bytes"
"encoding/binary"
</s> add </s> remove "bytes"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
buf protobytes.BytesWriter | <mask>
<mask> // Mux is an mux-compatible client for v2ray-plugin, not a complete implementation
<mask> type Mux struct {
<mask> net.Conn
<mask> buf bytes.Buffer
<mask> id [2]byte
<mask> length [2]byte
<mask> status [2]byte
<mask> otb []byte
<mask> remain int
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove var (
dstIP = req[4:8] // [4]byte
dstPort = req[2:4] // [2]byte
)
</s> add </s> remove func isReservedIP(ip net.IP) bool {
subnet := net.IPNet{
IP: net.IPv4zero,
Mask: net.IPv4Mask(0xff, 0xff, 0xff, 0x00),
}
</s> add func isReservedIP(ip netip.Addr) bool {
subnet := netip.PrefixFrom(
netip.AddrFrom4([4]byte{0, 0, 0, 0}),
24,
) </s> remove buf.WriteByte(CommandConnectV2)
</s> add buf.PutUint8(CommandConnectV2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
m.buf.PutUint16be(4)
m.buf.PutSlice(m.id[:])
m.buf.PutUint8(SessionStatusKeep)
m.buf.PutUint8(OptionData)
m.buf.PutUint16be(uint16(len(b))) | <mask> }
<mask> m.otb = nil
<mask> }
<mask> m.buf.Reset()
<mask> binary.Write(&m.buf, binary.BigEndian, uint16(4))
<mask> m.buf.Write(m.id[:])
<mask> m.buf.WriteByte(SessionStatusKeep)
<mask> m.buf.WriteByte(OptionData)
<mask> binary.Write(&m.buf, binary.BigEndian, uint16(len(b)))
<mask> m.buf.Write(b)
<mask>
<mask> return m.Conn.Write(m.buf.Bytes())
<mask> }
<mask>
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.Write([]byte{0x17, 0x03, 0x03})
binary.Write(buf, binary.BigEndian, uint16(len(b)))
buf.Write(b)
</s> add buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf)
buf.PutSlice([]byte{0x17, 0x03, 0x03})
buf.PutUint16be(uint16(len(b)))
buf.PutSlice(b) </s> remove buf.WriteByte(CommandTCP)
</s> add buf.PutUint8(CommandTCP) </s> remove ip := net.ParseIP(option.Host)
if ip == nil {
buf.WriteByte(0x2)
buf.WriteString(option.Host)
} else if ipv4 := ip.To4(); ipv4 != nil {
buf.WriteByte(0x1)
buf.Write(ipv4)
</s> add ip, err := netip.ParseAddr(option.Host)
if err != nil {
buf.PutUint8(0x2)
buf.PutString(option.Host)
} else if ip.Is4() {
buf.PutUint8(0x1)
buf.PutSlice(ip.AsSlice()) </s> remove binary.Write(buf, binary.BigEndian, option.Port)
</s> add buf.PutUint16be(option.Port) </s> remove buf.WriteByte(data[0])
</s> add buf.PutUint8(data[0]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
buf := protobytes.BytesWriter{} | <mask> return m.Conn.Close()
<mask> }
<mask>
<mask> func NewMux(conn net.Conn, option MuxOption) *Mux {
<mask> buf := &bytes.Buffer{}
<mask>
<mask> // fill empty length
<mask> buf.Write([]byte{0x0, 0x0})
<mask> buf.Write(option.ID[:])
<mask> buf.WriteByte(SessionStatusNew)
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf.Write([]byte{0x0, 0x0})
buf.Write(option.ID[:])
buf.WriteByte(SessionStatusNew)
buf.WriteByte(OptionNone)
</s> add buf.PutSlice([]byte{0x0, 0x0})
buf.PutSlice(option.ID[:])
buf.PutUint8(SessionStatusNew)
buf.PutUint8(OptionNone) </s> remove random := make([]byte, 28)
sessionID := make([]byte, 32)
rand.Read(random)
rand.Read(sessionID)
buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.WriteByte(Version)
</s> add buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf)
buf.PutUint8(Version) </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
buf.PutSlice([]byte{0x0, 0x0})
buf.PutSlice(option.ID[:])
buf.PutUint8(SessionStatusNew)
buf.PutUint8(OptionNone) | <mask> func NewMux(conn net.Conn, option MuxOption) *Mux {
<mask> buf := &bytes.Buffer{}
<mask>
<mask> // fill empty length
<mask> buf.Write([]byte{0x0, 0x0})
<mask> buf.Write(option.ID[:])
<mask> buf.WriteByte(SessionStatusNew)
<mask> buf.WriteByte(OptionNone)
<mask>
<mask> // tcp
<mask> netType := byte(0x1)
<mask> if option.Type == "udp" {
<mask> netType = byte(0x2)
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove buf.WriteByte(netType)
</s> add buf.PutUint8(netType) </s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.WriteByte(Version)
</s> add buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf)
buf.PutUint8(Version) </s> remove random := make([]byte, 28)
sessionID := make([]byte, 32)
rand.Read(random)
rand.Read(sessionID)
buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove buf.WriteByte(CommandConnectV2)
</s> add buf.PutUint8(CommandConnectV2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
buf.PutUint8(netType) | <mask> netType := byte(0x1)
<mask> if option.Type == "udp" {
<mask> netType = byte(0x2)
<mask> }
<mask> buf.WriteByte(netType)
<mask>
<mask> // port
<mask> binary.Write(buf, binary.BigEndian, option.Port)
<mask>
<mask> // address
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf.Write([]byte{0x0, 0x0})
buf.Write(option.ID[:])
buf.WriteByte(SessionStatusNew)
buf.WriteByte(OptionNone)
</s> add buf.PutSlice([]byte{0x0, 0x0})
buf.PutSlice(option.ID[:])
buf.PutUint8(SessionStatusNew)
buf.PutUint8(OptionNone) </s> remove binary.Write(buf, binary.BigEndian, option.Port)
</s> add buf.PutUint16be(option.Port) </s> remove ip := net.ParseIP(option.Host)
if ip == nil {
buf.WriteByte(0x2)
buf.WriteString(option.Host)
} else if ipv4 := ip.To4(); ipv4 != nil {
buf.WriteByte(0x1)
buf.Write(ipv4)
</s> add ip, err := netip.ParseAddr(option.Host)
if err != nil {
buf.PutUint8(0x2)
buf.PutString(option.Host)
} else if ip.Is4() {
buf.PutUint8(0x1)
buf.PutSlice(ip.AsSlice()) </s> remove buf.WriteByte(uint8(len(host)))
buf.WriteString(host)
binary.Write(buf, binary.BigEndian, uint16(port))
</s> add buf.PutUint8(uint8(len(host)))
buf.PutString(host)
buf.PutUint16be(uint16(port)) </s> remove buf.WriteByte(0)
</s> add buf.PutUint8(0) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
buf.PutUint16be(option.Port) | <mask> }
<mask> buf.WriteByte(netType)
<mask>
<mask> // port
<mask> binary.Write(buf, binary.BigEndian, option.Port)
<mask>
<mask> // address
<mask> ip := net.ParseIP(option.Host)
<mask> if ip == nil {
<mask> buf.WriteByte(0x2)
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove ip := net.ParseIP(option.Host)
if ip == nil {
buf.WriteByte(0x2)
buf.WriteString(option.Host)
} else if ipv4 := ip.To4(); ipv4 != nil {
buf.WriteByte(0x1)
buf.Write(ipv4)
</s> add ip, err := netip.ParseAddr(option.Host)
if err != nil {
buf.PutUint8(0x2)
buf.PutString(option.Host)
} else if ip.Is4() {
buf.PutUint8(0x1)
buf.PutSlice(ip.AsSlice()) </s> remove buf.WriteByte(netType)
</s> add buf.PutUint8(netType) </s> remove ip := net.ParseIP(host)
if ip == nil /* HOST */ {
ip = net.IPv4(0, 0, 0, 1).To4()
} else if ip.To4() == nil /* IPv6 */ {
</s> add ip, err := netip.ParseAddr(host)
if err != nil { // Host
ip = netip.AddrFrom4([4]byte{0, 0, 0, 1})
} else if ip.Is6() { // IPv6 </s> remove var addr Addr
</s> add buf := protobytes.BytesWriter{} </s> remove addr = make([]byte, 1+net.IPv4len+2)
addr[0] = AtypIPv4
copy(addr[1:], ip4)
</s> add buf.PutUint8(AtypIPv4)
buf.PutSlice(ip4) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
ip, err := netip.ParseAddr(option.Host)
if err != nil {
buf.PutUint8(0x2)
buf.PutString(option.Host)
} else if ip.Is4() {
buf.PutUint8(0x1)
buf.PutSlice(ip.AsSlice()) | <mask> // port
<mask> binary.Write(buf, binary.BigEndian, option.Port)
<mask>
<mask> // address
<mask> ip := net.ParseIP(option.Host)
<mask> if ip == nil {
<mask> buf.WriteByte(0x2)
<mask> buf.WriteString(option.Host)
<mask> } else if ipv4 := ip.To4(); ipv4 != nil {
<mask> buf.WriteByte(0x1)
<mask> buf.Write(ipv4)
<mask> } else {
<mask> buf.WriteByte(0x3)
<mask> buf.Write(ip.To16())
<mask> }
<mask>
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf.WriteByte(0x3)
buf.Write(ip.To16())
</s> add buf.PutUint8(0x3)
buf.PutSlice(ip.AsSlice()) </s> remove binary.Write(buf, binary.BigEndian, option.Port)
</s> add buf.PutUint16be(option.Port) </s> remove ip := net.ParseIP(host)
if ip == nil /* HOST */ {
ip = net.IPv4(0, 0, 0, 1).To4()
} else if ip.To4() == nil /* IPv6 */ {
</s> add ip, err := netip.ParseAddr(host)
if err != nil { // Host
ip = netip.AddrFrom4([4]byte{0, 0, 0, 1})
} else if ip.Is6() { // IPv6 </s> remove addr = make([]byte, 1+net.IPv4len+2)
addr[0] = AtypIPv4
copy(addr[1:], ip4)
</s> add buf.PutUint8(AtypIPv4)
buf.PutSlice(ip4) </s> remove var addr Addr
</s> add buf := protobytes.BytesWriter{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
buf.PutUint8(0x3)
buf.PutSlice(ip.AsSlice()) | <mask> } else if ipv4 := ip.To4(); ipv4 != nil {
<mask> buf.WriteByte(0x1)
<mask> buf.Write(ipv4)
<mask> } else {
<mask> buf.WriteByte(0x3)
<mask> buf.Write(ip.To16())
<mask> }
<mask>
<mask> metadata := buf.Bytes()
<mask> binary.BigEndian.PutUint16(metadata[:2], uint16(len(metadata)-2))
<mask>
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove ip := net.ParseIP(option.Host)
if ip == nil {
buf.WriteByte(0x2)
buf.WriteString(option.Host)
} else if ipv4 := ip.To4(); ipv4 != nil {
buf.WriteByte(0x1)
buf.Write(ipv4)
</s> add ip, err := netip.ParseAddr(option.Host)
if err != nil {
buf.PutUint8(0x2)
buf.PutString(option.Host)
} else if ip.Is4() {
buf.PutUint8(0x1)
buf.PutSlice(ip.AsSlice()) </s> remove addr = make([]byte, 1+net.IPv4len+2)
addr[0] = AtypIPv4
copy(addr[1:], ip4)
</s> add buf.PutUint8(AtypIPv4)
buf.PutSlice(ip4) </s> remove ip := net.ParseIP(host)
if ip == nil /* HOST */ {
ip = net.IPv4(0, 0, 0, 1).To4()
} else if ip.To4() == nil /* IPv6 */ {
</s> add ip, err := netip.ParseAddr(host)
if err != nil { // Host
ip = netip.AddrFrom4([4]byte{0, 0, 0, 1})
} else if ip.Is6() { // IPv6 </s> remove addr = make([]byte, 1+1+len(host)+2)
addr[0] = AtypDomainName
addr[1] = byte(len(host))
copy(addr[2:], host)
</s> add buf.PutUint8(AtypDomainName)
buf.PutUint8(byte(len(host)))
buf.PutString(host) </s> remove return bytes.Join(buf, nil)
</s> add buf.PutUint16be(uint16(p))
return buf.Bytes() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/v2ray-plugin/mux.go |
<mask> package vmess
<mask>
<mask> import (
<mask> "bytes"
<mask> "crypto/aes"
<mask> "crypto/cipher"
<mask> "crypto/hmac"
<mask> "crypto/md5"
<mask> "crypto/rand"
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
"encoding/binary"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go | |
"github.com/Dreamacro/protobytes" | <mask> "time"
<mask>
<mask> "golang.org/x/crypto/chacha20poly1305"
<mask> )
<mask>
<mask> // Conn wrapper a net.Conn with vmess protocol
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf bytes.Buffer
</s> add buf protobytes.BytesWriter </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
mbuf := protobytes.BytesWriter{} | <mask>
<mask> func (vc *Conn) sendRequest() error {
<mask> timestamp := time.Now()
<mask>
<mask> mbuf := &bytes.Buffer{}
<mask>
<mask> if !vc.isAead {
<mask> h := hmac.New(md5.New, vc.id.UUID.Bytes())
<mask> binary.Write(h, binary.BigEndian, uint64(timestamp.Unix()))
<mask> mbuf.Write(h.Sum(nil))
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove mbuf.Write(h.Sum(nil))
</s> add mbuf.PutSlice(h.Sum(nil)) </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove if err := json.NewEncoder(buf).Encode(snapshot); err != nil {
</s> add if err := json.NewEncoder(&buf).Encode(snapshot); err != nil { </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
mbuf.PutSlice(h.Sum(nil)) | <mask>
<mask> if !vc.isAead {
<mask> h := hmac.New(md5.New, vc.id.UUID.Bytes())
<mask> binary.Write(h, binary.BigEndian, uint64(timestamp.Unix()))
<mask> mbuf.Write(h.Sum(nil))
<mask> }
<mask>
<mask> buf := &bytes.Buffer{}
<mask>
<mask> // Ver IV Key V Opt
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove mbuf := &bytes.Buffer{}
</s> add mbuf := protobytes.BytesWriter{} </s> remove buf.WriteByte(Version)
buf.Write(vc.reqBodyIV[:])
buf.Write(vc.reqBodyKey[:])
buf.WriteByte(vc.respV)
buf.WriteByte(vc.option)
</s> add buf.PutUint8(Version)
buf.PutSlice(vc.reqBodyIV[:])
buf.PutSlice(vc.reqBodyKey[:])
buf.PutUint8(vc.respV)
buf.PutUint8(vc.option) </s> remove buf.Write(fnv1a.Sum(nil))
</s> add buf.PutSlice(fnv1a.Sum(nil)) </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf := protobytes.BytesWriter{} | <mask> binary.Write(h, binary.BigEndian, uint64(timestamp.Unix()))
<mask> mbuf.Write(h.Sum(nil))
<mask> }
<mask>
<mask> buf := &bytes.Buffer{}
<mask>
<mask> // Ver IV Key V Opt
<mask> buf.WriteByte(Version)
<mask> buf.Write(vc.reqBodyIV[:])
<mask> buf.Write(vc.reqBodyKey[:])
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove mbuf.Write(h.Sum(nil))
</s> add mbuf.PutSlice(h.Sum(nil)) </s> remove buf.WriteByte(Version)
buf.Write(vc.reqBodyIV[:])
buf.Write(vc.reqBodyKey[:])
buf.WriteByte(vc.respV)
buf.WriteByte(vc.option)
</s> add buf.PutUint8(Version)
buf.PutSlice(vc.reqBodyIV[:])
buf.PutSlice(vc.reqBodyKey[:])
buf.PutUint8(vc.respV)
buf.PutUint8(vc.option) </s> remove mbuf := &bytes.Buffer{}
</s> add mbuf := protobytes.BytesWriter{} </s> remove buf.WriteByte(CommandConnectV2)
</s> add buf.PutUint8(CommandConnectV2) </s> remove buf := &bytes.Buffer{}
binary.Write(buf, binary.BigEndian, time)
random := make([]byte, 4)
rand.Read(random)
buf.Write(random)
</s> add buf := protobytes.BytesWriter{}
buf.PutUint64be(uint64(time))
buf.ReadFull(rand.Reader, 4) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf.PutUint8(Version)
buf.PutSlice(vc.reqBodyIV[:])
buf.PutSlice(vc.reqBodyKey[:])
buf.PutUint8(vc.respV)
buf.PutUint8(vc.option) | <mask>
<mask> buf := &bytes.Buffer{}
<mask>
<mask> // Ver IV Key V Opt
<mask> buf.WriteByte(Version)
<mask> buf.Write(vc.reqBodyIV[:])
<mask> buf.Write(vc.reqBodyKey[:])
<mask> buf.WriteByte(vc.respV)
<mask> buf.WriteByte(vc.option)
<mask>
<mask> p := mathRand.Intn(16)
<mask> // P Sec Reserve Cmd
<mask> buf.WriteByte(byte(p<<4) | vc.security)
<mask> buf.WriteByte(0)
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf.WriteByte(byte(p<<4) | vc.security)
buf.WriteByte(0)
</s> add buf.PutUint8(byte(p<<4) | vc.security)
buf.PutUint8(0) </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove buf.WriteByte(CommandUDP)
</s> add buf.PutUint8(CommandUDP) </s> remove mbuf.Write(h.Sum(nil))
</s> add mbuf.PutSlice(h.Sum(nil)) </s> remove buf.WriteByte(CommandConnectV2)
</s> add buf.PutUint8(CommandConnectV2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf.PutUint8(byte(p<<4) | vc.security)
buf.PutUint8(0) | <mask> buf.WriteByte(vc.option)
<mask>
<mask> p := mathRand.Intn(16)
<mask> // P Sec Reserve Cmd
<mask> buf.WriteByte(byte(p<<4) | vc.security)
<mask> buf.WriteByte(0)
<mask> if vc.dst.UDP {
<mask> buf.WriteByte(CommandUDP)
<mask> } else {
<mask> buf.WriteByte(CommandTCP)
<mask> }
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf.WriteByte(CommandUDP)
</s> add buf.PutUint8(CommandUDP) </s> remove buf.WriteByte(Version)
buf.Write(vc.reqBodyIV[:])
buf.Write(vc.reqBodyKey[:])
buf.WriteByte(vc.respV)
buf.WriteByte(vc.option)
</s> add buf.PutUint8(Version)
buf.PutSlice(vc.reqBodyIV[:])
buf.PutSlice(vc.reqBodyKey[:])
buf.PutUint8(vc.respV)
buf.PutUint8(vc.option) </s> remove buf.WriteByte(CommandTCP)
</s> add buf.PutUint8(CommandTCP) </s> remove binary.Write(buf, binary.BigEndian, uint16(vc.dst.Port))
buf.WriteByte(vc.dst.AddrType)
buf.Write(vc.dst.Addr)
</s> add buf.PutUint16be(uint16(vc.dst.Port))
buf.PutUint8(vc.dst.AddrType)
buf.PutSlice(vc.dst.Addr) </s> remove buf.WriteByte(CommandConnect)
</s> add buf.PutUint8(CommandConnect) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf.PutUint8(CommandUDP) | <mask> // P Sec Reserve Cmd
<mask> buf.WriteByte(byte(p<<4) | vc.security)
<mask> buf.WriteByte(0)
<mask> if vc.dst.UDP {
<mask> buf.WriteByte(CommandUDP)
<mask> } else {
<mask> buf.WriteByte(CommandTCP)
<mask> }
<mask>
<mask> // Port AddrType Addr
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf.WriteByte(byte(p<<4) | vc.security)
buf.WriteByte(0)
</s> add buf.PutUint8(byte(p<<4) | vc.security)
buf.PutUint8(0) </s> remove buf.WriteByte(CommandTCP)
</s> add buf.PutUint8(CommandTCP) </s> remove buf.WriteByte(Version)
buf.Write(vc.reqBodyIV[:])
buf.Write(vc.reqBodyKey[:])
buf.WriteByte(vc.respV)
buf.WriteByte(vc.option)
</s> add buf.PutUint8(Version)
buf.PutSlice(vc.reqBodyIV[:])
buf.PutSlice(vc.reqBodyKey[:])
buf.PutUint8(vc.respV)
buf.PutUint8(vc.option) </s> remove binary.Write(buf, binary.BigEndian, uint16(vc.dst.Port))
buf.WriteByte(vc.dst.AddrType)
buf.Write(vc.dst.Addr)
</s> add buf.PutUint16be(uint16(vc.dst.Port))
buf.PutUint8(vc.dst.AddrType)
buf.PutSlice(vc.dst.Addr) </s> remove buf.WriteByte(CommandConnect)
</s> add buf.PutUint8(CommandConnect) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf.PutUint8(CommandTCP) | <mask> buf.WriteByte(0)
<mask> if vc.dst.UDP {
<mask> buf.WriteByte(CommandUDP)
<mask> } else {
<mask> buf.WriteByte(CommandTCP)
<mask> }
<mask>
<mask> // Port AddrType Addr
<mask> binary.Write(buf, binary.BigEndian, uint16(vc.dst.Port))
<mask> buf.WriteByte(vc.dst.AddrType)
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf.WriteByte(CommandUDP)
</s> add buf.PutUint8(CommandUDP) </s> remove binary.Write(buf, binary.BigEndian, uint16(vc.dst.Port))
buf.WriteByte(vc.dst.AddrType)
buf.Write(vc.dst.Addr)
</s> add buf.PutUint16be(uint16(vc.dst.Port))
buf.PutUint8(vc.dst.AddrType)
buf.PutSlice(vc.dst.Addr) </s> remove buf.WriteByte(byte(p<<4) | vc.security)
buf.WriteByte(0)
</s> add buf.PutUint8(byte(p<<4) | vc.security)
buf.PutUint8(0) </s> remove buf.WriteByte(CommandConnect)
</s> add buf.PutUint8(CommandConnect) </s> remove ip := net.ParseIP(option.Host)
if ip == nil {
buf.WriteByte(0x2)
buf.WriteString(option.Host)
} else if ipv4 := ip.To4(); ipv4 != nil {
buf.WriteByte(0x1)
buf.Write(ipv4)
</s> add ip, err := netip.ParseAddr(option.Host)
if err != nil {
buf.PutUint8(0x2)
buf.PutString(option.Host)
} else if ip.Is4() {
buf.PutUint8(0x1)
buf.PutSlice(ip.AsSlice()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf.PutUint16be(uint16(vc.dst.Port))
buf.PutUint8(vc.dst.AddrType)
buf.PutSlice(vc.dst.Addr) | <mask> buf.WriteByte(CommandTCP)
<mask> }
<mask>
<mask> // Port AddrType Addr
<mask> binary.Write(buf, binary.BigEndian, uint16(vc.dst.Port))
<mask> buf.WriteByte(vc.dst.AddrType)
<mask> buf.Write(vc.dst.Addr)
<mask>
<mask> // padding
<mask> if p > 0 {
<mask> padding := make([]byte, p)
<mask> rand.Read(padding)
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove padding := make([]byte, p)
rand.Read(padding)
buf.Write(padding)
</s> add buf.ReadFull(rand.Reader, p) </s> remove buf.WriteByte(CommandTCP)
</s> add buf.PutUint8(CommandTCP) </s> remove buf.WriteByte(CommandUDP)
</s> add buf.PutUint8(CommandUDP) </s> remove buf.WriteByte(byte(p<<4) | vc.security)
buf.WriteByte(0)
</s> add buf.PutUint8(byte(p<<4) | vc.security)
buf.PutUint8(0) </s> remove addr = make([]byte, 1+net.IPv6len+2)
addr[0] = AtypIPv6
copy(addr[1:], ip)
</s> add buf.PutUint8(AtypIPv6)
buf.PutSlice(ip) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf.ReadFull(rand.Reader, p) | <mask> buf.Write(vc.dst.Addr)
<mask>
<mask> // padding
<mask> if p > 0 {
<mask> padding := make([]byte, p)
<mask> rand.Read(padding)
<mask> buf.Write(padding)
<mask> }
<mask>
<mask> fnv1a := fnv.New32a()
<mask> fnv1a.Write(buf.Bytes())
<mask> buf.Write(fnv1a.Sum(nil))
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove binary.Write(buf, binary.BigEndian, uint16(vc.dst.Port))
buf.WriteByte(vc.dst.AddrType)
buf.Write(vc.dst.Addr)
</s> add buf.PutUint16be(uint16(vc.dst.Port))
buf.PutUint8(vc.dst.AddrType)
buf.PutSlice(vc.dst.Addr) </s> remove buf.Write(fnv1a.Sum(nil))
</s> add buf.PutSlice(fnv1a.Sum(nil)) </s> remove addr = make([]byte, 1+1+len(host)+2)
addr[0] = AtypDomainName
addr[1] = byte(len(host))
copy(addr[2:], host)
</s> add buf.PutUint8(AtypDomainName)
buf.PutUint8(byte(len(host)))
buf.PutString(host) </s> remove addr = make([]byte, 1+net.IPv6len+2)
addr[0] = AtypIPv6
copy(addr[1:], ip)
</s> add buf.PutUint8(AtypIPv6)
buf.PutSlice(ip) </s> remove buf.WriteByte(byte(p<<4) | vc.security)
buf.WriteByte(0)
</s> add buf.PutUint8(byte(p<<4) | vc.security)
buf.PutUint8(0) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
buf.PutSlice(fnv1a.Sum(nil)) | <mask> }
<mask>
<mask> fnv1a := fnv.New32a()
<mask> fnv1a.Write(buf.Bytes())
<mask> buf.Write(fnv1a.Sum(nil))
<mask>
<mask> if !vc.isAead {
<mask> block, err := aes.NewCipher(vc.id.CmdKey)
<mask> if err != nil {
<mask> return err
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove padding := make([]byte, p)
rand.Read(padding)
buf.Write(padding)
</s> add buf.ReadFull(rand.Reader, p) </s> remove if err := json.NewEncoder(buf).Encode(snapshot); err != nil {
</s> add if err := json.NewEncoder(&buf).Encode(snapshot); err != nil { </s> remove if isReservedIP(dstIP) {
</s> add dstAddr := r.ReadIPv4()
dstPort := r.ReadUint16be()
if isReservedIP(dstAddr) { </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove ip := net.ParseIP(host)
if ip == nil /* HOST */ {
ip = net.IPv4(0, 0, 0, 1).To4()
} else if ip.To4() == nil /* IPv6 */ {
</s> add ip, err := netip.ParseAddr(host)
if err != nil { // Host
ip = netip.AddrFrom4([4]byte{0, 0, 0, 1})
} else if ip.Is6() { // IPv6 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
mbuf.PutSlice(buf.Bytes()) | <mask> }
<mask>
<mask> stream := cipher.NewCFBEncrypter(block, hashTimestamp(timestamp))
<mask> stream.XORKeyStream(buf.Bytes(), buf.Bytes())
<mask> mbuf.Write(buf.Bytes())
<mask> _, err = vc.Conn.Write(mbuf.Bytes())
<mask> return err
<mask> }
<mask>
<mask> var fixedLengthCmdKey [16]byte
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove if err := json.NewEncoder(buf).Encode(snapshot); err != nil {
</s> add if err := json.NewEncoder(&buf).Encode(snapshot); err != nil { </s> remove binary.Write(buf, binary.BigEndian, zero)
</s> add buf.PutUint32be(zero) </s> remove _, wErr := rw.Write(reply[:])
</s> add _, wErr := rw.Write(reply.Bytes()) </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove buf.Write(payload)
</s> add buf.PutSlice(payload) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/conn.go |
<mask> package vmess
<mask>
<mask> import (
<mask> "bytes"
<mask> "crypto/aes"
<mask> "crypto/cipher"
<mask> "crypto/hmac"
<mask> "crypto/rand"
<mask> "crypto/sha256"
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
</s> add </s> remove "bytes"
"encoding/binary"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/header.go | |
"github.com/Dreamacro/protobytes" | <mask> "hash/crc32"
<mask> "time"
<mask> )
<mask>
<mask> const (
<mask> kdfSaltConstAuthIDEncryptionKey = "AES Auth ID Encryption"
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove "bytes"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/header.go |
buf := protobytes.BytesWriter{}
buf.PutUint64be(uint64(time))
buf.ReadFull(rand.Reader, 4) | <mask> return hmac.New(h.parent.Create, h.value)
<mask> }
<mask>
<mask> func createAuthID(cmdKey []byte, time int64) [16]byte {
<mask> buf := &bytes.Buffer{}
<mask> binary.Write(buf, binary.BigEndian, time)
<mask>
<mask> random := make([]byte, 4)
<mask> rand.Read(random)
<mask> buf.Write(random)
<mask> zero := crc32.ChecksumIEEE(buf.Bytes())
<mask> binary.Write(buf, binary.BigEndian, zero)
<mask>
<mask> aesBlock, _ := aes.NewCipher(kdf(cmdKey[:], kdfSaltConstAuthIDEncryptionKey)[:16])
<mask> var result [16]byte
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove binary.Write(buf, binary.BigEndian, zero)
</s> add buf.PutUint32be(zero) </s> remove random := make([]byte, 28)
sessionID := make([]byte, 32)
rand.Read(random)
rand.Read(sessionID)
buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove mbuf.Write(buf.Bytes())
</s> add mbuf.PutSlice(buf.Bytes()) </s> remove var buf [][]byte
</s> add buf := protobytes.BytesWriter{}
</s> remove buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.Write(socks5Addr)
binary.Write(buf, binary.BigEndian, uint16(len(payload)))
buf.Write(crlf)
buf.Write(payload)
</s> add buf := protobytes.BytesWriter{}
buf.PutSlice(socks5Addr)
buf.PutUint16be(uint16(len(payload)))
buf.PutSlice(crlf)
buf.PutSlice(payload) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/header.go |
buf.PutUint32be(zero) | <mask> random := make([]byte, 4)
<mask> rand.Read(random)
<mask> buf.Write(random)
<mask> zero := crc32.ChecksumIEEE(buf.Bytes())
<mask> binary.Write(buf, binary.BigEndian, zero)
<mask>
<mask> aesBlock, _ := aes.NewCipher(kdf(cmdKey[:], kdfSaltConstAuthIDEncryptionKey)[:16])
<mask> var result [16]byte
<mask> aesBlock.Encrypt(result[:], buf.Bytes())
<mask> return result
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove buf := &bytes.Buffer{}
binary.Write(buf, binary.BigEndian, time)
random := make([]byte, 4)
rand.Read(random)
buf.Write(random)
</s> add buf := protobytes.BytesWriter{}
buf.PutUint64be(uint64(time))
buf.ReadFull(rand.Reader, 4) </s> remove mbuf.Write(buf.Bytes())
</s> add mbuf.PutSlice(buf.Bytes()) </s> remove random := make([]byte, 28)
sessionID := make([]byte, 32)
rand.Read(random)
rand.Read(sessionID)
buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove var reply [8]byte
reply[0] = 0x00 // reply code
reply[1] = code // result code
copy(reply[4:8], dstIP)
copy(reply[2:4], dstPort)
</s> add reply := protobytes.BytesWriter(make([]byte, 0, 8))
reply.PutUint8(0) // reply code
reply.PutUint8(code) // result code
reply.PutSlice(dstAddr.AsSlice())
reply.PutUint16be(dstPort) </s> remove _, wErr := rw.Write(reply[:])
</s> add _, wErr := rw.Write(reply.Bytes()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/header.go |
outputBuffer := protobytes.BytesWriter{} | <mask> payloadHeaderAEAD, _ := cipher.NewGCM(payloadHeaderAEADAESBlock)
<mask> payloadHeaderAEADEncrypted = payloadHeaderAEAD.Seal(nil, payloadHeaderAEADNonce, data, generatedAuthID[:])
<mask> }
<mask>
<mask> outputBuffer := &bytes.Buffer{}
<mask>
<mask> outputBuffer.Write(generatedAuthID[:])
<mask> outputBuffer.Write(payloadHeaderLengthAEADEncrypted)
<mask> outputBuffer.Write(connectionNonce)
<mask> outputBuffer.Write(payloadHeaderAEADEncrypted)
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove outputBuffer.Write(generatedAuthID[:])
outputBuffer.Write(payloadHeaderLengthAEADEncrypted)
outputBuffer.Write(connectionNonce)
outputBuffer.Write(payloadHeaderAEADEncrypted)
</s> add outputBuffer.PutSlice(generatedAuthID[:])
outputBuffer.PutSlice(payloadHeaderLengthAEADEncrypted)
outputBuffer.PutSlice(connectionNonce)
outputBuffer.PutSlice(payloadHeaderAEADEncrypted) </s> remove buf := &bytes.Buffer{}
binary.Write(buf, binary.BigEndian, time)
random := make([]byte, 4)
rand.Read(random)
buf.Write(random)
</s> add buf := protobytes.BytesWriter{}
buf.PutUint64be(uint64(time))
buf.ReadFull(rand.Reader, 4) </s> remove var buf [][]byte
</s> add buf := protobytes.BytesWriter{}
</s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} </s> remove port := []byte{uint8(p >> 8), uint8(p & 0xff)}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/header.go |
outputBuffer.PutSlice(generatedAuthID[:])
outputBuffer.PutSlice(payloadHeaderLengthAEADEncrypted)
outputBuffer.PutSlice(connectionNonce)
outputBuffer.PutSlice(payloadHeaderAEADEncrypted) | <mask> }
<mask>
<mask> outputBuffer := &bytes.Buffer{}
<mask>
<mask> outputBuffer.Write(generatedAuthID[:])
<mask> outputBuffer.Write(payloadHeaderLengthAEADEncrypted)
<mask> outputBuffer.Write(connectionNonce)
<mask> outputBuffer.Write(payloadHeaderAEADEncrypted)
<mask>
<mask> return outputBuffer.Bytes()
<mask> }
</s> Chore: use protobytes replace most of bytes.Buffer </s> remove outputBuffer := &bytes.Buffer{}
</s> add outputBuffer := protobytes.BytesWriter{} </s> remove if err := json.NewEncoder(buf).Encode(snapshot); err != nil {
</s> add if err := json.NewEncoder(&buf).Encode(snapshot); err != nil { </s> remove authMsg := &bytes.Buffer{}
authMsg.WriteByte(1)
authMsg.WriteByte(uint8(len(user.Username)))
authMsg.WriteString(user.Username)
authMsg.WriteByte(uint8(len(user.Password)))
authMsg.WriteString(user.Password)
</s> add authMsg := protobytes.BytesWriter{}
authMsg.PutUint8(1)
authMsg.PutUint8(uint8(len(user.Username)))
authMsg.PutString(user.Username)
authMsg.PutUint8(uint8(len(user.Password)))
authMsg.PutString(user.Password) </s> remove dstIP := ip.To4()
</s> add req := protobytes.BytesWriter{}
req.PutUint8(Version)
req.PutUint8(command)
req.PutUint16be(uint16(port))
req.Write(ip.AsSlice())
req.PutString(userID)
req.PutUint8(0) /* NULL */ </s> remove buf := &bytes.Buffer{}
</s> add buf := protobytes.BytesWriter{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b7aade5e1139dc0c4eaf8561b3c4271a8984fa1a | transport/vmess/header.go |
return nil, fmt.Errorf("%s connect error: %w", h.addr, err) | <mask> c = cc
<mask> }
<mask>
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", h.addr)
<mask> }
<mask> tcpKeepAlive(c)
<mask> if err := h.shakeHand(metadata, c); err != nil {
<mask> return nil, err
<mask> }
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("%s connect error", ss.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove err = fmt.Errorf("%s connect error", ss.addr)
</s> add err = fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove err = fmt.Errorf("%v client hanshake error", err)
</s> add err = fmt.Errorf("client hanshake error: %w", err) </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/http.go |
return nil, fmt.Errorf("%s connect error: %w", ss.server, err) | <mask>
<mask> func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialContext(ctx, "tcp", ss.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
<mask> }
<mask> tcpKeepAlive(c)
<mask> switch ss.obfsMode {
<mask> case "tls":
<mask> c = obfs.NewTLSObfs(c, ss.obfsOption.Host)
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("%s connect error: %s", s.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", s.server, err) </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove err = fmt.Errorf("%s connect error", ss.addr)
</s> add err = fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove return nil, fmt.Errorf("%s connect error", ss.addr)
</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/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("%s connect error: %w", ss.server, 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: %s", ss.server, err.Error())
<mask> }
<mask> }
<mask> c = ss.cipher.StreamConn(c)
<mask> _, err = c.Write(serializesSocksAddr(metadata))
<mask> return newConn(c, ss), err
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove return nil, fmt.Errorf("%s connect error: %s", s.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", s.server, err) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove return nil, fmt.Errorf("%s connect error", ss.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove err = fmt.Errorf("%s connect error", ss.addr)
</s> add err = 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/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/shadowsocks.go |
return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) | <mask> }
<mask>
<mask> targetAddr := socks5.ParseAddr(metadata.RemoteAddress())
<mask> if targetAddr == nil {
<mask> return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
<mask> }
<mask>
<mask> pc = ss.cipher.PacketConn(pc)
<mask> return newPacketConn(&ssUDPConn{PacketConn: pc, rAddr: targetAddr}, ss), addr, nil
<mask> }
</s> Chore: throw more detail dial error </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove err = fmt.Errorf("%v client hanshake error", err)
</s> add err = fmt.Errorf("client hanshake error: %w", err) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s initialize error: %w", server, 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: %s", server, err.Error())
<mask> }
<mask>
<mask> var v2rayOption *v2rayObfs.Option
<mask> var obfsOption *simpleObfsOption
<mask> obfsMode := ""
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err) </s> remove return nil, fmt.Errorf("%s connect error", ss.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, 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: %s", server, err.Error())
<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> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err) </s> remove return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize error: %w", server, err) </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, 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: %s", server, err.Error())
<mask> }
<mask>
<mask> if opts.Mode != "websocket" {
<mask> return nil, fmt.Errorf("ss %s obfs mode error: %s", server, opts.Mode)
<mask> }
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err) </s> remove return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize error: %w", server, err) </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/shadowsocks.go |
return nil, fmt.Errorf("%s connect error: %w", s.server, err) | <mask>
<mask> func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialContext(ctx, "tcp", s.server)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %s", s.server, err.Error())
<mask> }
<mask> tcpKeepAlive(c)
<mask> switch s.obfsOption.Mode {
<mask> case "tls":
<mask> c = obfs.NewTLSObfs(c, s.obfsOption.Host)
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove err = fmt.Errorf("%s connect error", ss.addr)
</s> add err = fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove return nil, fmt.Errorf("%s connect error", ss.addr)
</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/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/snell.go |
return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, 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: %s", server, err.Error())
<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> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err) </s> remove return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize error: %w", server, err) </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/snell.go |
return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) | <mask> c = cc
<mask> }
<mask>
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", ss.addr)
<mask> }
<mask> tcpKeepAlive(c)
<mask> var user *socks5.User
<mask> if ss.user != "" {
<mask> user = &socks5.User{
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove err = fmt.Errorf("%s connect error", ss.addr)
</s> add err = fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize error: %w", server, err) </s> remove err = fmt.Errorf("%v client hanshake error", err)
</s> add err = fmt.Errorf("client hanshake error: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/socks5.go |
err = fmt.Errorf("%s connect error: %w", ss.addr, err) | <mask> ctx, cancel := context.WithTimeout(context.Background(), tcpTimeout)
<mask> defer cancel()
<mask> c, err := dialContext(ctx, "tcp", ss.addr)
<mask> if err != nil {
<mask> err = fmt.Errorf("%s connect error", ss.addr)
<mask> return
<mask> }
<mask>
<mask> if ss.tls {
<mask> cc := tls.Client(c, ss.tlsConfig)
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("%s connect error", ss.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove return nil, fmt.Errorf("%s connect error: %s", s.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", s.server, err) </s> remove return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.server, err) </s> remove err = fmt.Errorf("%v client hanshake error", err)
</s> add err = fmt.Errorf("client hanshake error: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/socks5.go |
err = fmt.Errorf("client hanshake error: %w", err) | <mask> }
<mask>
<mask> bindAddr, err := socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdUDPAssociate, user)
<mask> if err != nil {
<mask> err = fmt.Errorf("%v client hanshake error", err)
<mask> return
<mask> }
<mask>
<mask> addr, err := net.ResolveUDPAddr("udp", bindAddr.String())
<mask> if err != nil {
</s> Chore: throw more detail dial error </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove err = fmt.Errorf("%s connect error", ss.addr)
</s> add err = fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return nil, fmt.Errorf("%s connect error", ss.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", ss.addr, err) </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/socks5.go |
return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) | <mask> }
<mask>
<mask> targetAddr := socks5.ParseAddr(metadata.RemoteAddress())
<mask> if targetAddr == nil {
<mask> return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
<mask> }
<mask>
<mask> pc, err := net.ListenPacket("udp", "")
<mask> if err != nil {
<mask> return
</s> Chore: throw more detail dial error </s> remove return nil, nil, fmt.Errorf("parse address error: %v:%v", metadata.String(), metadata.DstPort)
</s> add return nil, nil, fmt.Errorf("parse address %s error: %s", metadata.String(), metadata.DstPort) </s> remove return nil, fmt.Errorf("%s connect error", h.addr)
</s> add return nil, fmt.Errorf("%s connect error: %w", h.addr, err) </s> remove return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", server, err) </s> remove return nil, fmt.Errorf("ss %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("ss %s initialize obfs error: %w", server, err) </s> remove return nil, fmt.Errorf("snell %s initialize obfs error: %s", server, err.Error())
</s> add return nil, fmt.Errorf("snell %s initialize obfs error: %w", server, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b8267a69f69380f5190097552549d2727964d82e | adapters/outbound/socks5.go |
<mask>
<mask> import (
<mask> "encoding/binary"
<mask> "net"
<mask> "path/filepath"
<mask> "syscall"
<mask> "unsafe"
<mask>
<mask> "golang.org/x/sys/unix"
<mask> )
</s> Chore: move find connection process to tunnel (#2016) </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "fmt"
"strconv"
</s> add "path/filepath" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_darwin.go | |
return unix.ByteSliceToString(buf), nil | <mask> if errno != 0 {
<mask> return "", errno
<mask> }
<mask>
<mask> return filepath.Base(unix.ByteSliceToString(buf)), nil
<mask> }
<mask>
<mask> func readNativeUint32(b []byte) uint32 {
<mask> return *(*uint32)(unsafe.Pointer(&b[0]))
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove return filepath.Base(string(buf[:size-1])), nil
</s> add return string(buf[:size-1]), nil </s> remove return filepath.Base(syscall.UTF16ToString(buf[:size])), nil
</s> add return syscall.UTF16ToString(buf[:size]), nil </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) </s> remove func splitCmdline(cmdline []byte) string {
idx := bytes.IndexFunc(cmdline, func(r rune) bool {
return unicode.IsControl(r) || unicode.IsSpace(r)
})
return filepath.Base(string(cmdline[:idx]))
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_darwin.go |
<mask> import (
<mask> "encoding/binary"
<mask> "fmt"
<mask> "net"
<mask> "path/filepath"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
<mask> "syscall"
<mask> "unsafe"
</s> Chore: move find connection process to tunnel (#2016) </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "fmt"
"strconv"
</s> add "path/filepath" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_freebsd_amd64.go | |
return string(buf[:size-1]), nil | <mask> if errno != 0 || size == 0 {
<mask> return "", errno
<mask> }
<mask>
<mask> return filepath.Base(string(buf[:size-1])), nil
<mask> }
<mask>
<mask> func readNativeUint32(b []byte) uint32 {
<mask> return *(*uint32)(unsafe.Pointer(&b[0]))
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove return filepath.Base(unix.ByteSliceToString(buf)), nil
</s> add return unix.ByteSliceToString(buf), nil </s> remove return filepath.Base(syscall.UTF16ToString(buf[:size])), nil
</s> add return syscall.UTF16ToString(buf[:size]), nil </s> remove func splitCmdline(cmdline []byte) string {
idx := bytes.IndexFunc(cmdline, func(r rune) bool {
return unicode.IsControl(r) || unicode.IsSpace(r)
})
return filepath.Base(string(cmdline[:idx]))
}
</s> add </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_freebsd_amd64.go |
<mask> "fmt"
<mask> "net"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
<mask> "strings"
<mask> "syscall"
<mask> "unicode"
<mask> "unsafe"
<mask>
</s> Chore: move find connection process to tunnel (#2016) </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "fmt"
"strconv"
</s> add "path/filepath" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_linux.go | |
syscall.SetsockoptTimeval(socket, syscall.SOL_SOCKET, syscall.SO_SNDTIMEO, &syscall.Timeval{Usec: 100})
syscall.SetsockoptTimeval(socket, syscall.SOL_SOCKET, syscall.SO_RCVTIMEO, &syscall.Timeval{Usec: 100}) | <mask> return 0, 0, fmt.Errorf("dial netlink: %w", err)
<mask> }
<mask> defer syscall.Close(socket)
<mask>
<mask> syscall.SetNonblock(socket, true)
<mask> syscall.SetsockoptTimeval(socket, syscall.SOL_SOCKET, syscall.SO_SNDTIMEO, &syscall.Timeval{Usec: 50})
<mask> syscall.SetsockoptTimeval(socket, syscall.SOL_SOCKET, syscall.SO_RCVTIMEO, &syscall.Timeval{Usec: 50})
<mask>
<mask> if err := syscall.Connect(socket, &syscall.SockaddrNetlink{
<mask> Family: syscall.AF_NETLINK,
<mask> Pad: 0,
<mask> Pid: 0,
</s> Chore: move find connection process to tunnel (#2016) </s> remove return filepath.Base(syscall.UTF16ToString(buf[:size])), nil
</s> add return syscall.UTF16ToString(buf[:size]), nil </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_linux.go |
return os.Readlink(path.Join(processPath, "exe")) | <mask> continue
<mask> }
<mask>
<mask> if bytes.Equal(buffer[:n], socket) {
<mask> cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> return splitCmdline(cmdline), nil
<mask> }
<mask> }
<mask> }
<mask>
<mask> return "", fmt.Errorf("process of uid(%d),inode(%d) not found", uid, inode)
</s> Chore: move find connection process to tunnel (#2016) </s> remove func splitCmdline(cmdline []byte) string {
idx := bytes.IndexFunc(cmdline, func(r rune) bool {
return unicode.IsControl(r) || unicode.IsSpace(r)
})
return filepath.Base(string(cmdline[:idx]))
}
</s> add </s> remove return filepath.Base(syscall.UTF16ToString(buf[:size])), nil
</s> add return syscall.UTF16ToString(buf[:size]), nil </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) </s> remove return filepath.Base(unix.ByteSliceToString(buf)), nil
</s> add return unix.ByteSliceToString(buf), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_linux.go |
<mask>
<mask> return "", fmt.Errorf("process of uid(%d),inode(%d) not found", uid, inode)
<mask> }
<mask>
<mask> func splitCmdline(cmdline []byte) string {
<mask> idx := bytes.IndexFunc(cmdline, func(r rune) bool {
<mask> return unicode.IsControl(r) || unicode.IsSpace(r)
<mask> })
<mask>
<mask> return filepath.Base(string(cmdline[:idx]))
<mask> }
<mask>
<mask> func isPid(s string) bool {
<mask> return strings.IndexFunc(s, func(r rune) bool {
<mask> return !unicode.IsDigit(r)
<mask> }) == -1
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) </s> remove return filepath.Base(string(buf[:size-1])), nil
</s> add return string(buf[:size-1]), nil </s> remove return filepath.Base(unix.ByteSliceToString(buf)), nil
</s> add return unix.ByteSliceToString(buf), nil </s> remove return filepath.Base(syscall.UTF16ToString(buf[:size])), nil
</s> add return syscall.UTF16ToString(buf[:size]), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_linux.go | |
<mask>
<mask> import (
<mask> "fmt"
<mask> "net"
<mask> "path/filepath"
<mask> "sync"
<mask> "syscall"
<mask> "unsafe"
<mask>
<mask> "github.com/Dreamacro/clash/log"
</s> Chore: move find connection process to tunnel (#2016) </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "fmt"
"strconv"
</s> add "path/filepath" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_windows.go | |
return syscall.UTF16ToString(buf[:size]), nil | <mask> 0, 0)
<mask> if r1 == 0 {
<mask> return "", err
<mask> }
<mask> return filepath.Base(syscall.UTF16ToString(buf[:size])), nil
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove return filepath.Base(string(buf[:size-1])), nil
</s> add return string(buf[:size-1]), nil </s> remove return filepath.Base(unix.ByteSliceToString(buf)), nil
</s> add return unix.ByteSliceToString(buf), nil </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | component/process/process_windows.go |
NetWork NetWork `json:"network"`
Type Type `json:"type"`
SrcIP net.IP `json:"sourceIP"`
DstIP net.IP `json:"destinationIP"`
SrcPort string `json:"sourcePort"`
DstPort string `json:"destinationPort"`
AddrType int `json:"-"`
Host string `json:"host"`
DNSMode DNSMode `json:"dnsMode"`
ProcessPath string `json:"processPath"` | <mask> }
<mask>
<mask> // Metadata is used to store connection address
<mask> type Metadata struct {
<mask> NetWork NetWork `json:"network"`
<mask> Type Type `json:"type"`
<mask> SrcIP net.IP `json:"sourceIP"`
<mask> DstIP net.IP `json:"destinationIP"`
<mask> SrcPort string `json:"sourcePort"`
<mask> DstPort string `json:"destinationPort"`
<mask> AddrType int `json:"-"`
<mask> Host string `json:"host"`
<mask> DNSMode DNSMode `json:"dnsMode"`
<mask> }
<mask>
<mask> func (m *Metadata) RemoteAddress() string {
<mask> return net.JoinHostPort(m.String(), m.DstPort)
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove adapter string
process string
</s> add adapter string
process string
nameOnly bool </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add </s> remove return strings.EqualFold(cached.(string), ps.process)
</s> add return strings.EqualFold(metadata.ProcessPath, ps.process) </s> remove func splitCmdline(cmdline []byte) string {
idx := bytes.IndexFunc(cmdline, func(r rune) bool {
return unicode.IsControl(r) || unicode.IsSpace(r)
})
return filepath.Base(string(cmdline[:idx]))
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | constant/metadata.go |
ProcessPath | <mask> DstPort
<mask> Process
<mask> MATCH
<mask> )
<mask>
<mask> type RuleType int
<mask>
<mask> func (rt RuleType) String() string {
</s> Chore: move find connection process to tunnel (#2016) </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add </s> remove NetWork NetWork `json:"network"`
Type Type `json:"type"`
SrcIP net.IP `json:"sourceIP"`
DstIP net.IP `json:"destinationIP"`
SrcPort string `json:"sourcePort"`
DstPort string `json:"destinationPort"`
AddrType int `json:"-"`
Host string `json:"host"`
DNSMode DNSMode `json:"dnsMode"`
</s> add NetWork NetWork `json:"network"`
Type Type `json:"type"`
SrcIP net.IP `json:"sourceIP"`
DstIP net.IP `json:"destinationIP"`
SrcPort string `json:"sourcePort"`
DstPort string `json:"destinationPort"`
AddrType int `json:"-"`
Host string `json:"host"`
DNSMode DNSMode `json:"dnsMode"`
ProcessPath string `json:"processPath"` </s> remove "github.com/Dreamacro/clash/log"
</s> add </s> remove adapter string
process string
</s> add adapter string
process string
nameOnly bool </s> remove return strings.EqualFold(cached.(string), ps.process)
</s> add return strings.EqualFold(metadata.ProcessPath, ps.process) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | constant/rule.go |
case ProcessPath:
return "ProcessPath" | <mask> case DstPort:
<mask> return "DstPort"
<mask> case Process:
<mask> return "Process"
<mask> case MATCH:
<mask> return "Match"
<mask> default:
<mask> return "Unknown"
</s> Chore: move find connection process to tunnel (#2016) </s> remove parsed, parseErr = NewProcess(payload, target)
</s> add parsed, parseErr = NewProcess(payload, target, true)
case "PROCESS-PATH":
parsed, parseErr = NewProcess(payload, target, false) </s> remove return filepath.Base(unix.ByteSliceToString(buf)), nil
</s> add return unix.ByteSliceToString(buf), nil </s> remove return filepath.Base(syscall.UTF16ToString(buf[:size])), nil
</s> add return syscall.UTF16ToString(buf[:size]), nil </s> remove return filepath.Base(string(buf[:size-1])), nil
</s> add return string(buf[:size-1]), nil </s> remove return strings.EqualFold(cached.(string), ps.process)
</s> add return strings.EqualFold(metadata.ProcessPath, ps.process) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | constant/rule.go |
func (d *Domain) ShouldFindProcess() bool {
return false
}
| <mask> }
<mask>
<mask> func NewDomain(domain string, adapter string) *Domain {
<mask> return &Domain{
<mask> domain: strings.ToLower(domain),
<mask> adapter: adapter,
<mask> }
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove adapter: adapter,
process: process,
</s> add adapter: adapter,
process: process,
nameOnly: nameOnly, </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/domain.go |
func (dk *DomainKeyword) ShouldFindProcess() bool {
return false
}
| <mask> func (dk *DomainKeyword) ShouldResolveIP() bool {
<mask> return false
<mask> }
<mask>
<mask> func NewDomainKeyword(keyword string, adapter string) *DomainKeyword {
<mask> return &DomainKeyword{
<mask> keyword: strings.ToLower(keyword),
<mask> adapter: adapter,
<mask> }
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { </s> remove adapter: adapter,
process: process,
</s> add adapter: adapter,
process: process,
nameOnly: nameOnly, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/domain_keyword.go |
func (ds *DomainSuffix) ShouldFindProcess() bool {
return false
}
| <mask> }
<mask>
<mask> func NewDomainSuffix(suffix string, adapter string) *DomainSuffix {
<mask> return &DomainSuffix{
<mask> suffix: strings.ToLower(suffix),
<mask> adapter: adapter,
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove adapter: adapter,
process: process,
</s> add adapter: adapter,
process: process,
nameOnly: nameOnly, </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/domain_suffix.go |
func (f *Match) ShouldFindProcess() bool {
return false
}
| <mask> }
<mask>
<mask> func NewMatch(adapter string) *Match {
<mask> return &Match{
<mask> adapter: adapter,
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove adapter: adapter,
process: process,
</s> add adapter: adapter,
process: process,
nameOnly: nameOnly, </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/final.go |
func (g *GEOIP) ShouldFindProcess() bool {
return false
}
| <mask> }
<mask>
<mask> func NewGEOIP(country string, adapter string, noResolveIP bool) *GEOIP {
<mask> geoip := &GEOIP{
<mask> country: country,
<mask> adapter: adapter,
<mask> noResolveIP: noResolveIP,
</s> Chore: move find connection process to tunnel (#2016) </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { </s> remove adapter: adapter,
process: process,
</s> add adapter: adapter,
process: process,
nameOnly: nameOnly, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/geoip.go |
func (i *IPCIDR) ShouldFindProcess() bool {
return false
}
| <mask> return !i.noResolveIP
<mask> }
<mask>
<mask> func NewIPCIDR(s string, adapter string, opts ...IPCIDROption) (*IPCIDR, error) {
<mask> _, ipnet, err := net.ParseCIDR(s)
<mask> if err != nil {
<mask> return nil, errPayload
<mask> }
<mask>
</s> Chore: move find connection process to tunnel (#2016) </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/ipcidr.go |
parsed, parseErr = NewProcess(payload, target, true)
case "PROCESS-PATH":
parsed, parseErr = NewProcess(payload, target, false) | <mask> parsed, parseErr = NewPort(payload, target, true)
<mask> case "DST-PORT":
<mask> parsed, parseErr = NewPort(payload, target, false)
<mask> case "PROCESS-NAME":
<mask> parsed, parseErr = NewProcess(payload, target)
<mask> case "MATCH":
<mask> parsed = NewMatch(target)
<mask> default:
<mask> parseErr = fmt.Errorf("unsupported rule type %s", tp)
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add </s> remove "github.com/Dreamacro/clash/log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/parser.go |
func (p *Port) ShouldFindProcess() bool {
return false
}
| <mask> return false
<mask> }
<mask>
<mask> func NewPort(port string, adapter string, isSource bool) (*Port, error) {
<mask> _, err := strconv.ParseUint(port, 10, 16)
<mask> if err != nil {
<mask> return nil, errPayload
<mask> }
<mask> return &Port{
</s> Chore: move find connection process to tunnel (#2016) </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/port.go |
"path/filepath" | <mask> package rules
<mask>
<mask> import (
<mask> "fmt"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/process"
<mask> C "github.com/Dreamacro/clash/constant"
</s> Chore: move find connection process to tunnel (#2016) </s> remove "github.com/Dreamacro/clash/common/cache"
"github.com/Dreamacro/clash/component/process"
</s> add </s> remove "path/filepath"
</s> add </s> remove "github.com/Dreamacro/clash/log"
</s> add </s> remove "path/filepath"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go |
<mask> "fmt"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/process"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> Chore: move find connection process to tunnel (#2016) </s> remove "github.com/Dreamacro/clash/log"
</s> add </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add </s> remove "fmt"
"strconv"
</s> add "path/filepath" </s> remove adapter string
process string
</s> add adapter string
process string
nameOnly bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go | |
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/process"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
<mask>
<mask> type Process struct {
</s> Chore: move find connection process to tunnel (#2016) </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add </s> remove "github.com/Dreamacro/clash/common/cache"
"github.com/Dreamacro/clash/component/process"
</s> add </s> remove adapter string
process string
</s> add adapter string
process string
nameOnly bool </s> remove "fmt"
"strconv"
</s> add "path/filepath" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go | |
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
<mask>
<mask> type Process struct {
<mask> adapter string
<mask> process string
<mask> }
<mask>
</s> Chore: move find connection process to tunnel (#2016) </s> remove "github.com/Dreamacro/clash/log"
</s> add </s> remove adapter string
process string
</s> add adapter string
process string
nameOnly bool </s> remove "github.com/Dreamacro/clash/common/cache"
"github.com/Dreamacro/clash/component/process"
</s> add </s> remove NetWork NetWork `json:"network"`
Type Type `json:"type"`
SrcIP net.IP `json:"sourceIP"`
DstIP net.IP `json:"destinationIP"`
SrcPort string `json:"sourcePort"`
DstPort string `json:"destinationPort"`
AddrType int `json:"-"`
Host string `json:"host"`
DNSMode DNSMode `json:"dnsMode"`
</s> add NetWork NetWork `json:"network"`
Type Type `json:"type"`
SrcIP net.IP `json:"sourceIP"`
DstIP net.IP `json:"destinationIP"`
SrcPort string `json:"sourcePort"`
DstPort string `json:"destinationPort"`
AddrType int `json:"-"`
Host string `json:"host"`
DNSMode DNSMode `json:"dnsMode"`
ProcessPath string `json:"processPath"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go | |
adapter string
process string
nameOnly bool | <mask>
<mask> var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
<mask>
<mask> type Process struct {
<mask> adapter string
<mask> process string
<mask> }
<mask>
<mask> func (ps *Process) RuleType() C.RuleType {
<mask> return C.Process
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add </s> remove "github.com/Dreamacro/clash/log"
</s> add </s> remove return strings.EqualFold(cached.(string), ps.process)
</s> add return strings.EqualFold(metadata.ProcessPath, ps.process) </s> remove "github.com/Dreamacro/clash/common/cache"
"github.com/Dreamacro/clash/component/process"
</s> add </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go |
if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) | <mask> return C.Process
<mask> }
<mask>
<mask> func (ps *Process) Match(metadata *C.Metadata) bool {
<mask> key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
<mask> cached, hit := processCache.Get(key)
<mask> if !hit {
<mask> srcPort, err := strconv.Atoi(metadata.SrcPort)
<mask> if err != nil {
<mask> processCache.Set(key, "")
<mask> return false
<mask> }
<mask>
<mask> name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
<mask> if err != nil {
<mask> log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
<mask> }
<mask>
<mask> processCache.Set(key, name)
<mask>
<mask> cached = name
<mask> }
<mask>
<mask> return strings.EqualFold(cached.(string), ps.process)
<mask> }
<mask>
</s> Chore: move find connection process to tunnel (#2016) </s> remove return strings.EqualFold(cached.(string), ps.process)
</s> add return strings.EqualFold(metadata.ProcessPath, ps.process) </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go |
return strings.EqualFold(metadata.ProcessPath, ps.process) | <mask>
<mask> cached = name
<mask> }
<mask>
<mask> return strings.EqualFold(cached.(string), ps.process)
<mask> }
<mask>
<mask> func (ps *Process) Adapter() string {
<mask> return ps.adapter
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) </s> remove adapter string
process string
</s> add adapter string
process string
nameOnly bool </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { </s> remove func splitCmdline(cmdline []byte) string {
idx := bytes.IndexFunc(cmdline, func(r rune) bool {
return unicode.IsControl(r) || unicode.IsSpace(r)
})
return filepath.Base(string(cmdline[:idx]))
}
</s> add </s> remove return filepath.Base(unix.ByteSliceToString(buf)), nil
</s> add return unix.ByteSliceToString(buf), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go |
func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | <mask> func (ps *Process) ShouldResolveIP() bool {
<mask> return false
<mask> }
<mask>
<mask> func NewProcess(process string, adapter string) (*Process, error) {
<mask> return &Process{
<mask> adapter: adapter,
<mask> process: process,
<mask> }, nil
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove adapter: adapter,
process: process,
</s> add adapter: adapter,
process: process,
nameOnly: nameOnly, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go |
adapter: adapter,
process: process,
nameOnly: nameOnly, | <mask> }
<mask>
<mask> func NewProcess(process string, adapter string) (*Process, error) {
<mask> return &Process{
<mask> adapter: adapter,
<mask> process: process,
<mask> }, nil
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | rule/process.go |
"strconv" | <mask> "fmt"
<mask> "net"
<mask> "runtime"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> "github.com/Dreamacro/clash/component/nat"
<mask> P "github.com/Dreamacro/clash/component/process"
</s> Chore: move find connection process to tunnel (#2016) </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "path/filepath"
</s> add </s> remove "fmt"
"strconv"
</s> add "path/filepath" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | tunnel/tunnel.go |
P "github.com/Dreamacro/clash/component/process" | <mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> "github.com/Dreamacro/clash/component/nat"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/constant/provider"
<mask> icontext "github.com/Dreamacro/clash/context"
<mask> "github.com/Dreamacro/clash/log"
</s> Chore: move find connection process to tunnel (#2016) </s> remove "github.com/Dreamacro/clash/common/cache"
"github.com/Dreamacro/clash/component/process"
</s> add </s> remove "github.com/Dreamacro/clash/log"
</s> add </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add </s> remove "fmt"
"strconv"
</s> add "path/filepath" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | tunnel/tunnel.go |
var processFound bool | <mask> configMux.RLock()
<mask> defer configMux.RUnlock()
<mask>
<mask> var resolved bool
<mask>
<mask> if node := resolver.DefaultHosts.Search(metadata.Host); node != nil {
<mask> ip := node.Data.(net.IP)
<mask> metadata.DstIP = ip
<mask> resolved = true
<mask> }
</s> Chore: move find connection process to tunnel (#2016) </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | tunnel/tunnel.go |
if !processFound && rule.ShouldFindProcess() {
processFound = true
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err == nil {
path, err := P.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Process] find process %s: %v", metadata.String(), err)
} else {
log.Debugln("[Process] %s from process %s", metadata.String(), path)
metadata.ProcessPath = path
}
}
}
| <mask> }
<mask> resolved = true
<mask> }
<mask>
<mask> if rule.Match(metadata) {
<mask> adapter, ok := proxies[rule.Adapter()]
<mask> if !ok {
<mask> continue
</s> Chore: move find connection process to tunnel (#2016) </s> remove cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
if err != nil {
return "", err
}
return splitCmdline(cmdline), nil
</s> add return os.Readlink(path.Join(processPath, "exe")) </s> remove key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
cached, hit := processCache.Get(key)
if !hit {
srcPort, err := strconv.Atoi(metadata.SrcPort)
if err != nil {
processCache.Set(key, "")
return false
}
name, err := process.FindProcessName(metadata.NetWork.String(), metadata.SrcIP, srcPort)
if err != nil {
log.Debugln("[Rule] find process name %s error: %s", C.Process.String(), err.Error())
}
processCache.Set(key, name)
cached = name
</s> add if ps.nameOnly {
return strings.EqualFold(filepath.Base(metadata.ProcessPath), ps.process) </s> remove func NewProcess(process string, adapter string) (*Process, error) {
</s> add func (ps *Process) ShouldFindProcess() bool {
return true
}
func NewProcess(process string, adapter string, nameOnly bool) (*Process, error) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b866f06414585c2c73ce2aef7a2f7b3a0dda2abe | tunnel/tunnel.go |
func (b *Base) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | <mask> func (b *Base) Type() C.AdapterType {
<mask> return b.tp
<mask> }
<mask>
<mask> func (b *Base) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> return nil, nil, errors.New("no support")
<mask> }
<mask>
<mask> func (b *Base) SupportUDP() bool {
<mask> return b.udp
</s> Feature: trace adapters when dialing (#170) </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
if err == nil {
pc.AppendToChains(f)
}
return pc, addr, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/base.go |
func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> func (p *Proxy) Alive() bool {
<mask> return p.alive
<mask> }
<mask>
<mask> func (p *Proxy) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> conn, err := p.ProxyAdapter.Dial(metadata)
<mask> if err != nil {
<mask> p.alive = false
<mask> }
<mask> return conn, err
</s> Feature: trace adapters when dialing (#170) </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err </s> remove func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/base.go |
func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> type Direct struct {
<mask> *Base
<mask> }
<mask>
<mask> func (d *Direct) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> address := net.JoinHostPort(metadata.Host, metadata.DstPort)
<mask> if metadata.DstIP != nil {
<mask> address = net.JoinHostPort(metadata.DstIP.String(), metadata.DstPort)
<mask> }
<mask>
</s> Feature: trace adapters when dialing (#170) </s> remove func (r *Reject) Dial(metadata *C.Metadata) (net.Conn, error) {
return &NopConn{}, nil
</s> add func (r *Reject) Dial(metadata *C.Metadata) (C.Conn, error) {
return newConn(&NopConn{}, r), nil </s> remove func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, nil
</s> add return newConn(c, d), nil </s> remove func (p *Proxy) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/direct.go |
return newConn(c, d), nil | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> tcpKeepAlive(c)
<mask> return c, nil
<mask> }
<mask>
<mask> func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> pc, err := net.ListenPacket("udp", "")
<mask> if err != nil {
</s> Feature: trace adapters when dialing (#170) </s> remove func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, err
</s> add return newConn(c, ss), err </s> remove return c, nil
</s> add return newConn(c, ss), nil </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/direct.go |
func (d *Direct) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | <mask> tcpKeepAlive(c)
<mask> return c, nil
<mask> }
<mask>
<mask> func (d *Direct) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> pc, err := net.ListenPacket("udp", "")
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask>
</s> Feature: trace adapters when dialing (#170) </s> remove return c, nil
</s> add return newConn(c, d), nil </s> remove func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (ss *ShadowSocks) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, err
</s> add return newConn(c, ss), err </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, err
</s> add return newConn(c, v), err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/direct.go |
return newPacketConn(pc, d), addr, nil | <mask> addr, err := resolveUDPAddr("udp", net.JoinHostPort(metadata.String(), metadata.DstPort))
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask> return pc, addr, nil
<mask> }
<mask>
<mask> func NewDirect() *Direct {
<mask> return &Direct{
<mask> Base: &Base{
</s> Feature: trace adapters when dialing (#170) </s> remove return proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
if err == nil {
pc.AppendToChains(f)
}
return pc, addr, err </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove return &ssUDPConn{PacketConn: pc, rAddr: targetAddr}, addr, nil
</s> add return newPacketConn(&ssUDPConn{PacketConn: pc, rAddr: targetAddr}, ss), addr, nil </s> remove return c, nil
</s> add return newConn(c, d), nil </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/direct.go |
func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> proxy := f.findAliveProxy()
<mask> return proxy.Name()
<mask> }
<mask>
<mask> func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> proxy := f.findAliveProxy()
<mask> return proxy.Dial(metadata)
<mask> }
<mask>
<mask> func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> Feature: trace adapters when dialing (#170) </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err </s> remove return proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
if err == nil {
pc.AppendToChains(f)
}
return pc, addr, err </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err </s> remove func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/fallback.go |
c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err | <mask> }
<mask>
<mask> func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> proxy := f.findAliveProxy()
<mask> return proxy.Dial(metadata)
<mask> }
<mask>
<mask> func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> proxy := f.findAliveProxy()
<mask> return proxy.DialUDP(metadata)
</s> Feature: trace adapters when dialing (#170) </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
if err == nil {
pc.AppendToChains(f)
}
return pc, addr, err </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err </s> remove func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/fallback.go |
func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | <mask> proxy := f.findAliveProxy()
<mask> return proxy.Dial(metadata)
<mask> }
<mask>
<mask> func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> proxy := f.findAliveProxy()
<mask> return proxy.DialUDP(metadata)
<mask> }
<mask>
<mask> func (f *Fallback) SupportUDP() bool {
</s> Feature: trace adapters when dialing (#170) </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return proxy.DialUDP(metadata)
</s> add pc, addr, err := proxy.DialUDP(metadata)
if err == nil {
pc.AppendToChains(f)
}
return pc, addr, err </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/fallback.go |
pc, addr, err := proxy.DialUDP(metadata)
if err == nil {
pc.AppendToChains(f)
}
return pc, addr, err | <mask> }
<mask>
<mask> func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> proxy := f.findAliveProxy()
<mask> return proxy.DialUDP(metadata)
<mask> }
<mask>
<mask> func (f *Fallback) SupportUDP() bool {
<mask> proxy := f.findAliveProxy()
<mask> return proxy.SupportUDP()
</s> Feature: trace adapters when dialing (#170) </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/fallback.go |
func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> TLS bool `proxy:"tls,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := dialTimeout("tcp", h.addr, tcpTimeout)
<mask> if err == nil && h.tls {
<mask> cc := tls.Client(c, h.tlsConfig)
<mask> err = cc.Handshake()
<mask> c = cc
</s> Feature: trace adapters when dialing (#170) </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (p *Proxy) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return c, nil
</s> add return newConn(c, h), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | 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 c, nil
<mask> }
<mask>
<mask> func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
<mask> var buf bytes.Buffer
<mask> var err error
</s> Feature: trace adapters when dialing (#170) </s> remove proxy, err = t.match(metadata)
</s> add proxy, rule, err = t.match(metadata) </s> remove func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy) {
</s> add func (t *Tunnel) handleUDPConn(localConn C.ServerAdapter, metadata *C.Metadata, proxy C.Proxy, rule C.Rule) { </s> remove var err error
pc, addr, err = proxy.DialUDP(metadata)
</s> add rawpc, naddr, err := proxy.DialUDP(metadata)
addr = naddr
pc = rawpc </s> remove func (h *Http) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (h *Http) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return c, nil
</s> add return newConn(c, ss), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/http.go |
func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
defer func() {
if err == nil {
c.AppendToChains(lb)
}
}()
| <mask>
<mask> return int32(b)
<mask> }
<mask>
<mask> func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> buckets := int32(len(lb.proxies))
<mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
<mask> idx := jumpHash(key, buckets)
<mask> proxy := lb.proxies[idx]
</s> Feature: trace adapters when dialing (#170) </s> remove func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (pc C.PacketConn, addr net.Addr, err error) {
defer func() {
if err == nil {
pc.AppendToChains(lb)
}
}()
</s> remove return proxy.Dial(metadata)
</s> add c, err = proxy.Dial(metadata)
return </s> remove
return lb.proxies[0].Dial(metadata)
</s> add c, err = lb.proxies[0].Dial(metadata)
return </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/loadbalance.go |
c, err = proxy.Dial(metadata)
return | <mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
<mask> idx := jumpHash(key, buckets)
<mask> proxy := lb.proxies[idx]
<mask> if proxy.Alive() {
<mask> return proxy.Dial(metadata)
<mask> }
<mask> }
<mask>
<mask> return lb.proxies[0].Dial(metadata)
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (pc C.PacketConn, addr net.Addr, err error) {
defer func() {
if err == nil {
pc.AppendToChains(lb)
}
}()
</s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
defer func() {
if err == nil {
c.AppendToChains(lb)
}
}()
</s> remove
return lb.proxies[0].Dial(metadata)
</s> add c, err = lb.proxies[0].Dial(metadata)
return </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/loadbalance.go |
c, err = lb.proxies[0].Dial(metadata)
return | <mask> if proxy.Alive() {
<mask> return proxy.Dial(metadata)
<mask> }
<mask> }
<mask>
<mask> return lb.proxies[0].Dial(metadata)
<mask> }
<mask>
<mask> func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> buckets := int32(len(lb.proxies))
</s> Feature: trace adapters when dialing (#170) </s> remove func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (pc C.PacketConn, addr net.Addr, err error) {
defer func() {
if err == nil {
pc.AppendToChains(lb)
}
}()
</s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
defer func() {
if err == nil {
c.AppendToChains(lb)
}
}()
</s> remove return proxy.Dial(metadata)
</s> add c, err = proxy.Dial(metadata)
return </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/loadbalance.go |
func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (pc C.PacketConn, addr net.Addr, err error) {
defer func() {
if err == nil {
pc.AppendToChains(lb)
}
}()
| <mask>
<mask> return lb.proxies[0].Dial(metadata)
<mask> }
<mask>
<mask> func (lb *LoadBalance) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
<mask> buckets := int32(len(lb.proxies))
<mask> for i := 0; i < lb.maxRetry; i, key = i+1, key+1 {
<mask> idx := jumpHash(key, buckets)
<mask> proxy := lb.proxies[idx]
</s> Feature: trace adapters when dialing (#170) </s> remove func (lb *LoadBalance) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (lb *LoadBalance) Dial(metadata *C.Metadata) (c C.Conn, err error) {
defer func() {
if err == nil {
c.AppendToChains(lb)
}
}()
</s> remove return proxy.Dial(metadata)
</s> add c, err = proxy.Dial(metadata)
return </s> remove
return lb.proxies[0].Dial(metadata)
</s> add c, err = lb.proxies[0].Dial(metadata)
return </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/loadbalance.go |
func (r *Reject) Dial(metadata *C.Metadata) (C.Conn, error) {
return newConn(&NopConn{}, r), nil | <mask> type Reject struct {
<mask> *Base
<mask> }
<mask>
<mask> func (r *Reject) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> return &NopConn{}, nil
<mask> }
<mask>
<mask> func NewReject() *Reject {
<mask> return &Reject{
<mask> Base: &Base{
</s> Feature: trace adapters when dialing (#170) </s> remove func (d *Direct) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (d *Direct) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return pc, addr, nil
</s> add return newPacketConn(pc, d), addr, nil </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/reject.go |
func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err | <mask> Name string `proxy:"name"`
<mask> Proxies []string `proxy:"proxies"`
<mask> }
<mask>
<mask> func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> return s.selected.Dial(metadata)
<mask> }
<mask>
<mask> func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> return s.selected.DialUDP(metadata)
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return s.selected.DialUDP(metadata)
</s> add func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err </s> remove func (u *URLTest) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (u *URLTest) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove return proxy.Dial(metadata)
</s> add c, err := proxy.Dial(metadata)
if err == nil {
c.AppendToChains(f)
}
return c, err </s> remove func (r *Reject) Dial(metadata *C.Metadata) (net.Conn, error) {
return &NopConn{}, nil
</s> add func (r *Reject) Dial(metadata *C.Metadata) (C.Conn, error) {
return newConn(&NopConn{}, r), nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/selector.go |
func (s *Selector) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := s.selected.DialUDP(metadata)
if err == nil {
pc.AppendToChains(s)
}
return pc, addr, err | <mask> func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> return s.selected.Dial(metadata)
<mask> }
<mask>
<mask> func (s *Selector) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
<mask> return s.selected.DialUDP(metadata)
<mask> }
<mask>
<mask> func (s *Selector) SupportUDP() bool {
<mask> return s.selected.SupportUDP()
<mask> }
</s> Feature: trace adapters when dialing (#170) </s> remove func (s *Selector) Dial(metadata *C.Metadata) (net.Conn, error) {
return s.selected.Dial(metadata)
</s> add func (s *Selector) Dial(metadata *C.Metadata) (C.Conn, error) {
c, err := s.selected.Dial(metadata)
if err == nil {
c.AppendToChains(s)
}
return c, err </s> remove func (b *Base) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (b *Base) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (f *Fallback) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (f *Fallback) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove func (u *URLTest) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
return u.fast.DialUDP(metadata)
</s> add func (u *URLTest) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) {
pc, addr, err := u.fast.DialUDP(metadata)
if err == nil {
pc.AppendToChains(u)
}
return pc, addr, err </s> remove func (f *Fallback) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (f *Fallback) Dial(metadata *C.Metadata) (C.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/selector.go |
func (ss *ShadowSocks) Dial(metadata *C.Metadata) (C.Conn, error) { | <mask> Headers map[string]string `obfs:"headers,omitempty"`
<mask> SkipCertVerify bool `obfs:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (ss *ShadowSocks) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> c, err := dialTimeout("tcp", ss.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
<mask> }
<mask> tcpKeepAlive(c)
</s> Feature: trace adapters when dialing (#170) </s> remove func (v *Vmess) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (v *Vmess) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (ss *Socks5) Dial(metadata *C.Metadata) (net.Conn, error) {
</s> add func (ss *Socks5) Dial(metadata *C.Metadata) (C.Conn, error) { </s> remove func (v *Vmess) DialUDP(metadata *C.Metadata) (net.PacketConn, net.Addr, error) {
</s> add func (v *Vmess) DialUDP(metadata *C.Metadata) (C.PacketConn, net.Addr, error) { </s> remove return c, err
</s> add return newConn(c, v), err </s> remove func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ net.PacketConn, _ net.Addr, err error) {
</s> add func (ss *Socks5) DialUDP(metadata *C.Metadata) (_ C.PacketConn, _ net.Addr, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b926f4cf09d6fc4a7983bf830628d9d70e769152 | adapters/outbound/shadowsocks.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.