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 |
|---|---|---|---|---|
headers map[string]string | <mask> host string
<mask> path string
<mask> tls bool
<mask> tlsConfig *tls.Config
<mask> }
<mask>
</s> Feature: add websocket headers support in vmess </s> remove Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UUID string `proxy:"uuid"`
AlterID int `proxy:"alterId"`
Cipher string `proxy:"cipher"`
TLS bool `proxy:"tls,omitempty"`
Network string `proxy:"network,omitempty"`
WSPath string `proxy:"ws-path,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
</s> add Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UUID string `proxy:"uuid"`
AlterID int `proxy:"alterId"`
Cipher string `proxy:"cipher"`
TLS bool `proxy:"tls,omitempty"`
Network string `proxy:"network,omitempty"`
WSPath string `proxy:"ws-path,omitempty"`
WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"` </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
SkipCertVerify bool
SessionCacahe tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCacahe tls.ClientSessionCache </s> remove wsConn, resp, err := dialer.Dial(uri.String(), nil)
</s> add headers := http.Header{}
if c.headers != nil {
for k, v := range c.headers {
headers.Set(k, v)
}
}
wsConn, resp, err := dialer.Dial(uri.String(), headers) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1607d3253fbe2216f5e2614d5128863b4eea5b2e | component/vmess/websocket.go |
headers := http.Header{}
if c.headers != nil {
for k, v := range c.headers {
headers.Set(k, v)
}
}
wsConn, resp, err := dialer.Dial(uri.String(), headers) | <mask> Host: host,
<mask> Path: c.path,
<mask> }
<mask>
<mask> wsConn, resp, err := dialer.Dial(uri.String(), nil)
<mask> if err != nil {
<mask> var reason string
<mask> if resp != nil {
<mask> reason = resp.Status
<mask> }
</s> Feature: add websocket headers support in vmess </s> remove UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
HostName: option.Server,
Port: strconv.Itoa(option.Port),
NetWork: option.Network,
WebSocketPath: option.WSPath,
SkipCertVerify: option.SkipCertVerify,
SessionCacahe: getClientSessionCache(),
</s> add UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
TLS: option.TLS,
HostName: option.Server,
Port: strconv.Itoa(option.Port),
NetWork: option.Network,
WebSocketPath: option.WSPath,
WebSocketHeaders: option.WSHeaders,
SkipCertVerify: option.SkipCertVerify,
SessionCacahe: getClientSessionCache(), </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
SkipCertVerify bool
SessionCacahe tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCacahe tls.ClientSessionCache </s> remove Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UUID string `proxy:"uuid"`
AlterID int `proxy:"alterId"`
Cipher string `proxy:"cipher"`
TLS bool `proxy:"tls,omitempty"`
Network string `proxy:"network,omitempty"`
WSPath string `proxy:"ws-path,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
</s> add Name string `proxy:"name"`
Server string `proxy:"server"`
Port int `proxy:"port"`
UUID string `proxy:"uuid"`
AlterID int `proxy:"alterId"`
Cipher string `proxy:"cipher"`
TLS bool `proxy:"tls,omitempty"`
Network string `proxy:"network,omitempty"`
WSPath string `proxy:"ws-path,omitempty"`
WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1607d3253fbe2216f5e2614d5128863b4eea5b2e | component/vmess/websocket.go |
- name: Login to Github Package
uses: docker/login-action@v1
with:
registry: ghcr.io
username: Dreamacro
password: ${{ secrets.PACKAGE_TOKEN }} | <mask> username: ${{ secrets.DOCKER_USERNAME }}
<mask> password: ${{ secrets.DOCKER_PASSWORD }}
<mask>
<mask> - name: Build dev branch and push
<mask> if: github.ref == 'refs/heads/dev'
<mask> uses: docker/build-push-action@v2
<mask> with:
<mask> context: .
</s> Chore: push image to github docker registry </s> remove tags: 'dreamacro/clash:dev'
</s> add tags: 'dreamacro/clash:dev,ghcr.io/dreamacro/clash:dev' </s> remove `dreamacro/clash:${context.payload.ref.replace(/\/?refs\/tags\//, '')}`
</s> add `dreamacro/clash:${ref}`,
'ghcr.io/dreamacro/clash:latest',
`ghcr.io/dreamacro/clash:${ref}` | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/16ae107e70004b3e19f6d8d486b023ab218223fd | .github/workflows/docker.yml |
tags: 'dreamacro/clash:dev,ghcr.io/dreamacro/clash:dev' | <mask> with:
<mask> context: .
<mask> platforms: linux/amd64,linux/arm/v7,linux/arm64
<mask> push: true
<mask> tags: 'dreamacro/clash:dev'
<mask>
<mask> - name: Get all docker tags
<mask> if: startsWith(github.ref, 'refs/tags/')
<mask> uses: actions/github-script@v3
<mask> id: tags
</s> Chore: push image to github docker registry </s> remove `dreamacro/clash:${context.payload.ref.replace(/\/?refs\/tags\//, '')}`
</s> add `dreamacro/clash:${ref}`,
'ghcr.io/dreamacro/clash:latest',
`ghcr.io/dreamacro/clash:${ref}` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/16ae107e70004b3e19f6d8d486b023ab218223fd | .github/workflows/docker.yml |
const ref = `${context.payload.ref.replace(/\/?refs\/tags\//, '')}` | <mask> with:
<mask> script: |
<mask> const tags = [
<mask> 'dreamacro/clash:latest',
<mask> `dreamacro/clash:${ref}`,
<mask> 'ghcr.io/dreamacro/clash:latest',
<mask> `ghcr.io/dreamacro/clash:${ref}`
</s> Chore: push image to github docker registry </s> remove `dreamacro/clash:${context.payload.ref.replace(/\/?refs\/tags\//, '')}`
</s> add `dreamacro/clash:${ref}`,
'ghcr.io/dreamacro/clash:latest',
`ghcr.io/dreamacro/clash:${ref}` </s> remove tags: 'dreamacro/clash:dev'
</s> add tags: 'dreamacro/clash:dev,ghcr.io/dreamacro/clash:dev' | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/16ae107e70004b3e19f6d8d486b023ab218223fd | .github/workflows/docker.yml |
`dreamacro/clash:${ref}`,
'ghcr.io/dreamacro/clash:latest',
`ghcr.io/dreamacro/clash:${ref}` | <mask> with:
<mask> script: |
<mask> const tags = [
<mask> 'dreamacro/clash:latest',
<mask> `dreamacro/clash:${context.payload.ref.replace(/\/?refs\/tags\//, '')}`
<mask> ]
<mask> return tags.join(',')
<mask> result-encoding: string
<mask>
<mask> - name: Build release and push
</s> Chore: push image to github docker registry </s> remove tags: 'dreamacro/clash:dev'
</s> add tags: 'dreamacro/clash:dev,ghcr.io/dreamacro/clash:dev' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/16ae107e70004b3e19f6d8d486b023ab218223fd | .github/workflows/docker.yml |
LABEL org.opencontainers.image.source https://github.com/Dreamacro/clash | <mask> make docker && \
<mask> mv ./bin/clash-docker /clash
<mask>
<mask> FROM alpine:latest
<mask>
<mask> RUN apk add --no-cache ca-certificates
<mask> COPY --from=builder /Country.mmdb /root/.config/clash/
<mask> COPY --from=builder /clash /
<mask> ENTRYPOINT ["/clash"]
</s> Chore: push image to github docker registry </s> remove tags: 'dreamacro/clash:dev'
</s> add tags: 'dreamacro/clash:dev,ghcr.io/dreamacro/clash:dev' </s> remove `dreamacro/clash:${context.payload.ref.replace(/\/?refs\/tags\//, '')}`
</s> add `dreamacro/clash:${ref}`,
'ghcr.io/dreamacro/clash:latest',
`ghcr.io/dreamacro/clash:${ref}` | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/16ae107e70004b3e19f6d8d486b023ab218223fd | Dockerfile |
// Drop call after packet is used, could recycle buffer in this function.
Drop() | <mask> // - if addr is not provided, WriteBack will wirte out UDP packet with SourceIP/Prot equals to origional Target,
<mask> // this is important when using Fake-IP.
<mask> WriteBack(b []byte, addr net.Addr) (n int, err error)
<mask>
<mask> // Close closes the underlaying connection.
<mask> Close() error
<mask>
<mask> // LocalAddr returns the source IP/Port of packet
<mask> LocalAddr() net.Addr
<mask> }
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | constant/adapters.go |
pkt := &packet{
lAddr: lAddr,
buf: buf, | <mask> }
<mask>
<mask> func handleRedirUDP(pc net.PacketConn, buf []byte, lAddr *net.UDPAddr, rAddr *net.UDPAddr) {
<mask> target := socks5.ParseAddrToSocksAddr(rAddr)
<mask> packet := &fakeConn{
<mask> PacketConn: pc,
<mask> lAddr: lAddr,
<mask> buf: buf,
<mask> }
<mask> tunnel.AddPacket(adapters.NewPacket(target, packet, C.REDIR))
<mask> }
</s> Improve: recycle buffer after packet used </s> remove tunnel.AddPacket(adapters.NewPacket(target, packet, C.REDIR))
</s> add tunnel.AddPacket(adapters.NewPacket(target, pkt, C.REDIR)) </s> remove packet := &fakeConn{
PacketConn: pc,
rAddr: addr,
payload: payload,
bufRef: buf,
</s> add packet := &packet{
pc: pc,
rAddr: addr,
payload: payload,
bufRef: buf, </s> remove type fakeConn struct {
net.PacketConn
</s> add type packet struct { </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/udp.go |
tunnel.AddPacket(adapters.NewPacket(target, pkt, C.REDIR)) | <mask> PacketConn: pc,
<mask> lAddr: lAddr,
<mask> buf: buf,
<mask> }
<mask> tunnel.AddPacket(adapters.NewPacket(target, packet, C.REDIR))
<mask> }
</s> Improve: recycle buffer after packet used </s> remove packet := &fakeConn{
PacketConn: pc,
lAddr: lAddr,
buf: buf,
</s> add pkt := &packet{
lAddr: lAddr,
buf: buf, </s> remove packet := &fakeConn{
PacketConn: pc,
rAddr: addr,
payload: payload,
bufRef: buf,
</s> add packet := &packet{
pc: pc,
rAddr: addr,
payload: payload,
bufRef: buf, </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/udp.go |
type packet struct { | <mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> )
<mask>
<mask> type fakeConn struct {
<mask> net.PacketConn
<mask> lAddr *net.UDPAddr
<mask> buf []byte
<mask> }
<mask>
<mask> func (c *fakeConn) Data() []byte {
</s> Improve: recycle buffer after packet used </s> remove type fakeConn struct {
net.PacketConn
</s> add type packet struct {
pc net.PacketConn </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove packet := &fakeConn{
PacketConn: pc,
lAddr: lAddr,
buf: buf,
</s> add pkt := &packet{
lAddr: lAddr,
buf: buf, </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/utils.go |
func (c *packet) Data() []byte { | <mask> lAddr *net.UDPAddr
<mask> buf []byte
<mask> }
<mask>
<mask> func (c *fakeConn) Data() []byte {
<mask> return c.buf
<mask> }
<mask>
<mask> // WriteBack opens a new socket binding `addr` to wirte UDP packet back
<mask> func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove type fakeConn struct {
net.PacketConn
</s> add type packet struct { </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/utils.go |
func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { | <mask> return c.buf
<mask> }
<mask>
<mask> // WriteBack opens a new socket binding `addr` to wirte UDP packet back
<mask> func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
<mask> tc, err := dialUDP("udp", addr.(*net.UDPAddr), c.lAddr)
<mask> if err != nil {
<mask> n = 0
<mask> return
<mask> }
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/utils.go |
func (c *packet) LocalAddr() net.Addr { | <mask> return
<mask> }
<mask>
<mask> // LocalAddr returns the source IP/Port of UDP Packet
<mask> func (c *fakeConn) LocalAddr() net.Addr {
<mask> return c.lAddr
<mask> }
<mask>
<mask> func (c *fakeConn) Close() error {
<mask> err := c.PacketConn.Close()
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/utils.go |
func (c *packet) Drop() { | <mask> func (c *fakeConn) LocalAddr() net.Addr {
<mask> return c.lAddr
<mask> }
<mask>
<mask> func (c *fakeConn) Close() error {
<mask> err := c.PacketConn.Close()
<mask> pool.BufPool.Put(c.buf[:cap(c.buf)])
<mask> return err
<mask> }
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove return err
</s> add return </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/utils.go |
return | <mask>
<mask> func (c *fakeConn) Close() error {
<mask> err := c.PacketConn.Close()
<mask> pool.BufPool.Put(c.buf[:cap(c.buf)])
<mask> return err
<mask> }
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove return err
</s> add return </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/redir/utils.go |
packet := &packet{
pc: pc,
rAddr: addr,
payload: payload,
bufRef: buf, | <mask> // Unresolved UDP packet, return buffer to the pool
<mask> pool.BufPool.Put(buf[:cap(buf)])
<mask> return
<mask> }
<mask> packet := &fakeConn{
<mask> PacketConn: pc,
<mask> rAddr: addr,
<mask> payload: payload,
<mask> bufRef: buf,
<mask> }
<mask> tunnel.AddPacket(adapters.NewPacket(target, packet, C.SOCKS))
<mask> }
</s> Improve: recycle buffer after packet used </s> remove tunnel.AddPacket(adapters.NewPacket(target, packet, C.REDIR))
</s> add tunnel.AddPacket(adapters.NewPacket(target, pkt, C.REDIR)) </s> remove packet := &fakeConn{
PacketConn: pc,
lAddr: lAddr,
buf: buf,
</s> add pkt := &packet{
lAddr: lAddr,
buf: buf, </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/udp.go |
type packet struct {
pc net.PacketConn | <mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> )
<mask>
<mask> type fakeConn struct {
<mask> net.PacketConn
<mask> rAddr net.Addr
<mask> payload []byte
<mask> bufRef []byte
<mask> }
<mask>
</s> Improve: recycle buffer after packet used </s> remove type fakeConn struct {
net.PacketConn
</s> add type packet struct { </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove packet := &fakeConn{
PacketConn: pc,
lAddr: lAddr,
buf: buf,
</s> add pkt := &packet{
lAddr: lAddr,
buf: buf, </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/utils.go |
func (c *packet) Data() []byte { | <mask> payload []byte
<mask> bufRef []byte
<mask> }
<mask>
<mask> func (c *fakeConn) Data() []byte {
<mask> return c.payload
<mask> }
<mask>
<mask> // WriteBack wirtes UDP packet with source(ip, port) = `addr`
<mask> func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove type fakeConn struct {
net.PacketConn
</s> add type packet struct { </s> remove type fakeConn struct {
net.PacketConn
</s> add type packet struct {
pc net.PacketConn | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/utils.go |
func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { | <mask> return c.payload
<mask> }
<mask>
<mask> // WriteBack wirtes UDP packet with source(ip, port) = `addr`
<mask> func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
<mask> packet, err := socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b)
<mask> if err != nil {
<mask> return
<mask> }
<mask> return c.PacketConn.WriteTo(packet, c.rAddr)
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) </s> remove func (c *fakeConn) Data() []byte {
</s> add func (c *packet) Data() []byte { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/utils.go |
return c.pc.WriteTo(packet, c.rAddr) | <mask> packet, err := socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b)
<mask> if err != nil {
<mask> return
<mask> }
<mask> return c.PacketConn.WriteTo(packet, c.rAddr)
<mask> }
<mask>
<mask> // LocalAddr returns the source IP/Port of UDP Packet
<mask> func (c *fakeConn) LocalAddr() net.Addr {
<mask> return c.rAddr
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/utils.go |
func (c *packet) LocalAddr() net.Addr { | <mask> return c.PacketConn.WriteTo(packet, c.rAddr)
<mask> }
<mask>
<mask> // LocalAddr returns the source IP/Port of UDP Packet
<mask> func (c *fakeConn) LocalAddr() net.Addr {
<mask> return c.rAddr
<mask> }
<mask>
<mask> func (c *fakeConn) Close() error {
<mask> err := c.PacketConn.Close()
</s> Improve: recycle buffer after packet used </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/utils.go |
func (c *packet) Drop() { | <mask> func (c *fakeConn) LocalAddr() net.Addr {
<mask> return c.rAddr
<mask> }
<mask>
<mask> func (c *fakeConn) Close() error {
<mask> err := c.PacketConn.Close()
<mask> pool.BufPool.Put(c.bufRef[:cap(c.bufRef)])
<mask> return err
<mask> }
</s> Improve: recycle buffer after packet used </s> remove return err
</s> add return </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove return err
</s> add return | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/utils.go |
return | <mask>
<mask> func (c *fakeConn) Close() error {
<mask> err := c.PacketConn.Close()
<mask> pool.BufPool.Put(c.bufRef[:cap(c.bufRef)])
<mask> return err
<mask> }
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove return err
</s> add return </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { </s> remove func (c *fakeConn) LocalAddr() net.Addr {
</s> add func (c *packet) LocalAddr() net.Addr { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | proxy/socks/utils.go |
defer packet.Drop()
| <mask> }
<mask> }
<mask>
<mask> func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) {
<mask> if _, err := pc.WriteWithMetadata(packet.Data(), metadata); err != nil {
<mask> return
<mask> }
<mask> }
<mask>
<mask> func handleUDPToLocal(packet C.UDPPacket, pc net.PacketConn, key string, fAddr net.Addr) {
</s> Improve: recycle buffer after packet used </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove return c.PacketConn.WriteTo(packet, c.rAddr)
</s> add return c.pc.WriteTo(packet, c.rAddr) </s> remove func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
</s> add func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { </s> remove func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
</s> add func (c *packet) Drop() { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1825535abdfcf62461d6a61c94a1689165083dcb | tunnel/connection.go |
if err != nil {
p.alive = false
} | <mask> }
<mask>
<mask> func (p *Proxy) Dial(metadata *C.Metadata) (net.Conn, error) {
<mask> conn, err := p.ProxyAdapter.Dial(metadata)
<mask> p.alive = err == nil
<mask> return conn, err
<mask> }
<mask>
<mask> func (p *Proxy) DelayHistory() []C.DelayHistory {
<mask> queue := p.history.Copy()
</s> Feature: add interval url test for load-balance </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { </s> remove return &LoadBalance{
</s> add interval := time.Duration(option.Interval) * time.Second
lb := &LoadBalance{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/base.go |
p.alive = err == nil | <mask> func (p *Proxy) URLTest(url string) (t uint16, err error) {
<mask> defer func() {
<mask> record := C.DelayHistory{Time: time.Now()}
<mask> if err == nil {
<mask> record.Delay = t
<mask> }
<mask> p.history.Put(record)
</s> Feature: add interval url test for load-balance </s> remove p.alive = err == nil
</s> add if err != nil {
p.alive = false
} </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { </s> remove Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
</s> add Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
URL string `proxy:"url"`
Interval int `proxy:"interval"` | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/base.go |
"sync"
"time" | <mask> import (
<mask> "encoding/json"
<mask> "errors"
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/common/murmur3"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/publicsuffix"
<mask> )
</s> Feature: add interval url test for load-balance </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) </s> remove }, nil
</s> add rawURL: option.URL,
interval: interval,
done: make(chan struct{}),
}
go lb.loop()
return lb, nil </s> remove name: name,
</s> add name: option.Name, </s> remove return &LoadBalance{
</s> add interval := time.Duration(option.Interval) * time.Second
lb := &LoadBalance{ </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/loadbalance.go |
rawURL string
interval time.Duration
done chan struct{} | <mask> *Base
<mask> proxies []C.Proxy
<mask> maxRetry int
<mask> }
<mask>
<mask> func getKey(metadata *C.Metadata) string {
<mask> if metadata.Host != "" {
<mask> // ip host
<mask> if ip := net.ParseIP(metadata.Host); ip != nil {
</s> Feature: add interval url test for load-balance </s> remove p.alive = err == nil
</s> add if err != nil {
p.alive = false
} </s> remove Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
</s> add Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
URL string `proxy:"url"`
Interval int `proxy:"interval"` </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/loadbalance.go |
Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
URL string `proxy:"url"`
Interval int `proxy:"interval"` | <mask> })
<mask> }
<mask>
<mask> type LoadBalanceOption struct {
<mask> Name string `proxy:"name"`
<mask> Proxies []string `proxy:"proxies"`
<mask> }
<mask>
<mask> func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
<mask> if len(proxies) == 0 {
<mask> return nil, errors.New("Provide at least one proxy")
</s> Feature: add interval url test for load-balance </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { </s> remove return &LoadBalance{
</s> add interval := time.Duration(option.Interval) * time.Second
lb := &LoadBalance{ </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) </s> remove p.alive = err == nil
</s> add if err != nil {
p.alive = false
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/loadbalance.go |
func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { | <mask> Name string `proxy:"name"`
<mask> Proxies []string `proxy:"proxies"`
<mask> }
<mask>
<mask> func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
<mask> if len(proxies) == 0 {
<mask> return nil, errors.New("Provide at least one proxy")
<mask> }
<mask>
<mask> return &LoadBalance{
</s> Feature: add interval url test for load-balance </s> remove Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
</s> add Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
URL string `proxy:"url"`
Interval int `proxy:"interval"` </s> remove return &LoadBalance{
</s> add interval := time.Duration(option.Interval) * time.Second
lb := &LoadBalance{ </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) </s> remove p.alive = err == nil
</s> add if err != nil {
p.alive = false
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/loadbalance.go |
interval := time.Duration(option.Interval) * time.Second
lb := &LoadBalance{ | <mask> if len(proxies) == 0 {
<mask> return nil, errors.New("Provide at least one proxy")
<mask> }
<mask>
<mask> return &LoadBalance{
<mask> Base: &Base{
<mask> name: name,
<mask> tp: C.LoadBalance,
<mask> },
<mask> proxies: proxies,
</s> Feature: add interval url test for load-balance </s> remove name: name,
</s> add name: option.Name, </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { </s> remove Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
</s> add Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
URL string `proxy:"url"`
Interval int `proxy:"interval"` </s> remove }, nil
</s> add rawURL: option.URL,
interval: interval,
done: make(chan struct{}),
}
go lb.loop()
return lb, nil </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/loadbalance.go |
name: option.Name, | <mask> }
<mask>
<mask> return &LoadBalance{
<mask> Base: &Base{
<mask> name: name,
<mask> tp: C.LoadBalance,
<mask> },
<mask> proxies: proxies,
<mask> maxRetry: 3,
<mask> }, nil
</s> Feature: add interval url test for load-balance </s> remove return &LoadBalance{
</s> add interval := time.Duration(option.Interval) * time.Second
lb := &LoadBalance{ </s> remove }, nil
</s> add rawURL: option.URL,
interval: interval,
done: make(chan struct{}),
}
go lb.loop()
return lb, nil </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) </s> remove p.alive = err == nil
</s> add if err != nil {
p.alive = false
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/loadbalance.go |
rawURL: option.URL,
interval: interval,
done: make(chan struct{}),
}
go lb.loop()
return lb, nil | <mask> tp: C.LoadBalance,
<mask> },
<mask> proxies: proxies,
<mask> maxRetry: 3,
<mask> }, nil
<mask> }
</s> Feature: add interval url test for load-balance </s> remove name: name,
</s> add name: option.Name, </s> remove return &LoadBalance{
</s> add interval := time.Duration(option.Interval) * time.Second
lb := &LoadBalance{ </s> remove p.alive = err == nil
</s> add if err != nil {
p.alive = false
} </s> remove group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
</s> add group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | adapters/outbound/loadbalance.go |
group, err = adapters.NewLoadBalance(*loadBalanceOption, ps) | <mask> ps, err = getProxies(proxies, loadBalanceOption.Proxies)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error())
<mask> }
<mask> group, err = adapters.NewLoadBalance(loadBalanceOption.Name, ps)
<mask> }
<mask> if err != nil {
<mask> return nil, fmt.Errorf("Proxy %s: %s", groupName, err.Error())
<mask> }
<mask> proxies[groupName] = adapters.NewProxy(group)
</s> Feature: add interval url test for load-balance </s> remove p.alive = err == nil
</s> add if err != nil {
p.alive = false
} </s> remove func NewLoadBalance(name string, proxies []C.Proxy) (*LoadBalance, error) {
</s> add func NewLoadBalance(option LoadBalanceOption, proxies []C.Proxy) (*LoadBalance, error) { </s> remove Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
</s> add Name string `proxy:"name"`
Proxies []string `proxy:"proxies"`
URL string `proxy:"url"`
Interval int `proxy:"interval"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/18f885a92ab62524d5ff96852b7897fc7cbdbe3a | config/config.go |
listener map[Subscription]*Subscriber
mux sync.Mutex | <mask> )
<mask>
<mask> type Observable struct {
<mask> iterable Iterable
<mask> listener *sync.Map
<mask> done bool
<mask> doneLock sync.RWMutex
<mask> }
<mask>
<mask> func (o *Observable) process() {
</s> Fix: refactor observable to solve a small-probability crash </s> remove doneLock sync.RWMutex
</s> add </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Close()
return true
})
</s> add o.done = true
for _, sub := range o.listener {
sub.Close()
} </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
<mask> type Observable struct {
<mask> iterable Iterable
<mask> listener *sync.Map
<mask> done bool
<mask> doneLock sync.RWMutex
<mask> }
<mask>
<mask> func (o *Observable) process() {
<mask> for item := range o.iterable {
<mask> o.listener.Range(func(key, value interface{}) bool {
</s> Fix: refactor observable to solve a small-probability crash </s> remove listener *sync.Map
</s> add listener map[Subscription]*Subscriber
mux sync.Mutex </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Close()
return true
})
</s> add o.done = true
for _, sub := range o.listener {
sub.Close()
} </s> remove o.doneLock.Lock()
o.done = true
o.doneLock.Unlock()
</s> add o.mux.Lock()
defer o.mux.Unlock() </s> remove if count != 5 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go | |
o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() | <mask> }
<mask>
<mask> func (o *Observable) process() {
<mask> for item := range o.iterable {
<mask> o.listener.Range(func(key, value interface{}) bool {
<mask> elm := value.(*Subscriber)
<mask> elm.Emit(item)
<mask> return true
<mask> })
<mask> }
<mask> o.close()
<mask> }
<mask>
<mask> func (o *Observable) close() {
</s> Fix: refactor observable to solve a small-probability crash </s> remove o.doneLock.Lock()
o.done = true
o.doneLock.Unlock()
</s> add o.mux.Lock()
defer o.mux.Unlock() </s> remove doneLock sync.RWMutex
</s> add </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Close()
return true
})
</s> add o.done = true
for _, sub := range o.listener {
sub.Close()
} </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { </s> remove listener *sync.Map
</s> add listener map[Subscription]*Subscriber
mux sync.Mutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
o.mux.Lock()
defer o.mux.Unlock() | <mask> o.close()
<mask> }
<mask>
<mask> func (o *Observable) close() {
<mask> o.doneLock.Lock()
<mask> o.done = true
<mask> o.doneLock.Unlock()
<mask>
<mask> o.listener.Range(func(key, value interface{}) bool {
<mask> elm := value.(*Subscriber)
<mask> elm.Close()
<mask> return true
</s> Fix: refactor observable to solve a small-probability crash </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Close()
return true
})
</s> add o.done = true
for _, sub := range o.listener {
sub.Close()
} </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() </s> remove doneLock sync.RWMutex
</s> add </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { </s> remove o.listener.Store(subscriber.Out(), subscriber)
</s> add o.listener[subscriber.Out()] = subscriber | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
o.done = true
for _, sub := range o.listener {
sub.Close()
} | <mask> o.doneLock.Lock()
<mask> o.done = true
<mask> o.doneLock.Unlock()
<mask>
<mask> o.listener.Range(func(key, value interface{}) bool {
<mask> elm := value.(*Subscriber)
<mask> elm.Close()
<mask> return true
<mask> })
<mask> }
<mask>
<mask> func (o *Observable) Subscribe() (Subscription, error) {
<mask> o.doneLock.RLock()
<mask> done := o.done
</s> Fix: refactor observable to solve a small-probability crash </s> remove o.doneLock.Lock()
o.done = true
o.doneLock.Unlock()
</s> add o.mux.Lock()
defer o.mux.Unlock() </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() </s> remove doneLock sync.RWMutex
</s> add </s> remove o.listener.Store(subscriber.Out(), subscriber)
</s> add o.listener[subscriber.Out()] = subscriber | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
o.mux.Lock()
defer o.mux.Unlock()
if o.done { | <mask> })
<mask> }
<mask>
<mask> func (o *Observable) Subscribe() (Subscription, error) {
<mask> o.doneLock.RLock()
<mask> done := o.done
<mask> o.doneLock.RUnlock()
<mask> if done == true {
<mask> return nil, errors.New("Observable is closed")
<mask> }
<mask> subscriber := newSubscriber()
<mask> o.listener.Store(subscriber.Out(), subscriber)
<mask> return subscriber.Out(), nil
</s> Fix: refactor observable to solve a small-probability crash </s> remove o.listener.Store(subscriber.Out(), subscriber)
</s> add o.listener[subscriber.Out()] = subscriber </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Close()
return true
})
</s> add o.done = true
for _, sub := range o.listener {
sub.Close()
} </s> remove elm, exist := o.listener.Load(sub)
</s> add o.mux.Lock()
defer o.mux.Unlock()
subscriber, exist := o.listener[sub] </s> remove if closed == nil {
t.Error("Observable should be closed")
}
</s> add assert.NotNil(t, closed) </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
o.listener[subscriber.Out()] = subscriber | <mask> if done == true {
<mask> return nil, errors.New("Observable is closed")
<mask> }
<mask> subscriber := newSubscriber()
<mask> o.listener.Store(subscriber.Out(), subscriber)
<mask> return subscriber.Out(), nil
<mask> }
<mask>
<mask> func (o *Observable) UnSubscribe(sub Subscription) {
<mask> elm, exist := o.listener.Load(sub)
</s> Fix: refactor observable to solve a small-probability crash </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { </s> remove elm, exist := o.listener.Load(sub)
</s> add o.mux.Lock()
defer o.mux.Unlock()
subscriber, exist := o.listener[sub] </s> remove subscriber := elm.(*Subscriber)
o.listener.Delete(subscriber.Out())
</s> add delete(o.listener, sub) </s> remove if closed == nil {
t.Error("Observable should be closed")
}
</s> add assert.NotNil(t, closed) </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Close()
return true
})
</s> add o.done = true
for _, sub := range o.listener {
sub.Close()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
o.mux.Lock()
defer o.mux.Unlock()
subscriber, exist := o.listener[sub] | <mask> return subscriber.Out(), nil
<mask> }
<mask>
<mask> func (o *Observable) UnSubscribe(sub Subscription) {
<mask> elm, exist := o.listener.Load(sub)
<mask> if !exist {
<mask> return
<mask> }
<mask> subscriber := elm.(*Subscriber)
<mask> o.listener.Delete(subscriber.Out())
</s> Fix: refactor observable to solve a small-probability crash </s> remove subscriber := elm.(*Subscriber)
o.listener.Delete(subscriber.Out())
</s> add delete(o.listener, sub) </s> remove o.listener.Store(subscriber.Out(), subscriber)
</s> add o.listener[subscriber.Out()] = subscriber </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
delete(o.listener, sub) | <mask> elm, exist := o.listener.Load(sub)
<mask> if !exist {
<mask> return
<mask> }
<mask> subscriber := elm.(*Subscriber)
<mask> o.listener.Delete(subscriber.Out())
<mask> subscriber.Close()
<mask> }
<mask>
<mask> func NewObservable(any Iterable) *Observable {
<mask> observable := &Observable{
</s> Fix: refactor observable to solve a small-probability crash </s> remove elm, exist := o.listener.Load(sub)
</s> add o.mux.Lock()
defer o.mux.Unlock()
subscriber, exist := o.listener[sub] </s> remove listener: &sync.Map{},
</s> add listener: map[Subscription]*Subscriber{}, </s> remove o.listener.Store(subscriber.Out(), subscriber)
</s> add o.listener[subscriber.Out()] = subscriber </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { </s> remove if open {
t.Error("Revc number error")
}
</s> add assert.False(t, open) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
listener: map[Subscription]*Subscriber{}, | <mask>
<mask> func NewObservable(any Iterable) *Observable {
<mask> observable := &Observable{
<mask> iterable: any,
<mask> listener: &sync.Map{},
<mask> }
<mask> go observable.process()
<mask> return observable
<mask> }
</s> Fix: refactor observable to solve a small-probability crash </s> remove subscriber := elm.(*Subscriber)
o.listener.Delete(subscriber.Out())
</s> add delete(o.listener, sub) </s> remove if count != 10 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 10) </s> remove if init != now {
t.Errorf("Goroutine Leak: init %d now %d", init, now)
}
</s> add assert.Equal(t, init, now) </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() </s> remove elm, exist := o.listener.Load(sub)
</s> add o.mux.Lock()
defer o.mux.Unlock()
subscriber, exist := o.listener[sub] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable.go |
"github.com/stretchr/testify/assert" | <mask> "testing"
<mask> "time"
<mask> )
<mask>
<mask> func iterator(item []interface{}) chan interface{} {
<mask> ch := make(chan interface{})
</s> Fix: refactor observable to solve a small-probability crash </s> remove listener *sync.Map
</s> add listener map[Subscription]*Subscriber
mux sync.Mutex </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() </s> remove doneLock sync.RWMutex
</s> add </s> remove o.doneLock.Lock()
o.done = true
o.doneLock.Unlock()
</s> add o.mux.Lock()
defer o.mux.Unlock() </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Close()
return true
})
</s> add o.done = true
for _, sub := range o.listener {
sub.Close()
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
assert.Nil(t, err) | <mask> func TestObservable(t *testing.T) {
<mask> iter := iterator([]interface{}{1, 2, 3, 4, 5})
<mask> src := NewObservable(iter)
<mask> data, err := src.Subscribe()
<mask> if err != nil {
<mask> t.Error(err)
<mask> }
<mask> count := 0
<mask> for range data {
<mask> count++
<mask> }
<mask> if count != 5 {
</s> Fix: refactor observable to solve a small-probability crash </s> remove if count != 5 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 5) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if count != 10 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 10) </s> remove if closed == nil {
t.Error("Observable should be closed")
}
</s> add assert.NotNil(t, closed) </s> remove if open {
t.Error("Revc number error")
}
</s> add assert.False(t, open) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
assert.Equal(t, count, 5) | <mask> count := 0
<mask> for range data {
<mask> count++
<mask> }
<mask> if count != 5 {
<mask> t.Error("Revc number error")
<mask> }
<mask> }
<mask>
<mask> func TestObservable_MutilSubscribe(t *testing.T) {
<mask> iter := iterator([]interface{}{1, 2, 3, 4, 5})
<mask> src := NewObservable(iter)
</s> Fix: refactor observable to solve a small-probability crash </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if count != 10 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 10) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if open {
t.Error("Revc number error")
}
</s> add assert.False(t, open) </s> remove o.listener.Range(func(key, value interface{}) bool {
elm := value.(*Subscriber)
elm.Emit(item)
return true
})
</s> add o.mux.Lock()
for _, sub := range o.listener {
sub.Emit(item)
}
o.mux.Unlock() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
assert.Equal(t, count, 10) | <mask> }
<mask> go waitCh(ch1)
<mask> go waitCh(ch2)
<mask> wg.Wait()
<mask> if count != 10 {
<mask> t.Error("Revc number error")
<mask> }
<mask> }
<mask>
<mask> func TestObservable_UnSubscribe(t *testing.T) {
<mask> iter := iterator([]interface{}{1, 2, 3, 4, 5})
<mask> src := NewObservable(iter)
</s> Fix: refactor observable to solve a small-probability crash </s> remove if count != 5 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 5) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if open {
t.Error("Revc number error")
}
</s> add assert.False(t, open) </s> remove if init != now {
t.Errorf("Goroutine Leak: init %d now %d", init, now)
}
</s> add assert.Equal(t, init, now) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
assert.Nil(t, err) | <mask> func TestObservable_UnSubscribe(t *testing.T) {
<mask> iter := iterator([]interface{}{1, 2, 3, 4, 5})
<mask> src := NewObservable(iter)
<mask> data, err := src.Subscribe()
<mask> if err != nil {
<mask> t.Error(err)
<mask> }
<mask> src.UnSubscribe(data)
<mask> _, open := <-data
<mask> if open {
<mask> t.Error("Revc number error")
<mask> }
</s> Fix: refactor observable to solve a small-probability crash </s> remove if open {
t.Error("Revc number error")
}
</s> add assert.False(t, open) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if count != 10 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 10) </s> remove if count != 5 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 5) </s> remove if closed == nil {
t.Error("Observable should be closed")
}
</s> add assert.NotNil(t, closed) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
assert.False(t, open) | <mask> t.Error(err)
<mask> }
<mask> src.UnSubscribe(data)
<mask> _, open := <-data
<mask> if open {
<mask> t.Error("Revc number error")
<mask> }
<mask> }
<mask>
<mask> func TestObservable_SubscribeClosedSource(t *testing.T) {
<mask> iter := iterator([]interface{}{1})
<mask> src := NewObservable(iter)
</s> Fix: refactor observable to solve a small-probability crash </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if count != 5 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 5) </s> remove if count != 10 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 10) </s> remove if closed == nil {
t.Error("Observable should be closed")
}
</s> add assert.NotNil(t, closed) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
assert.NotNil(t, closed) | <mask> data, _ := src.Subscribe()
<mask> <-data
<mask>
<mask> _, closed := src.Subscribe()
<mask> if closed == nil {
<mask> t.Error("Observable should be closed")
<mask> }
<mask> }
<mask>
<mask> func TestObservable_UnSubscribeWithNotExistSubscription(t *testing.T) {
<mask> sub := Subscription(make(chan interface{}))
<mask> iter := iterator([]interface{}{1})
</s> Fix: refactor observable to solve a small-probability crash </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if open {
t.Error("Revc number error")
}
</s> add assert.False(t, open) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove o.listener.Store(subscriber.Out(), subscriber)
</s> add o.listener[subscriber.Out()] = subscriber </s> remove o.doneLock.RLock()
done := o.done
o.doneLock.RUnlock()
if done == true {
</s> add o.mux.Lock()
defer o.mux.Unlock()
if o.done { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
assert.Equal(t, init, now) | <mask> go waitCh(ch)
<mask> }
<mask> wg.Wait()
<mask> now := runtime.NumGoroutine()
<mask> if init != now {
<mask> t.Errorf("Goroutine Leak: init %d now %d", init, now)
<mask> }
<mask> }
</s> Fix: refactor observable to solve a small-probability crash </s> remove if count != 10 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 10) </s> remove listener: &sync.Map{},
</s> add listener: map[Subscription]*Subscriber{}, </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) </s> remove if count != 5 {
t.Error("Revc number error")
}
</s> add assert.Equal(t, count, 5) </s> remove if err != nil {
t.Error(err)
}
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/1948ea11eff6b0b84f6e3b13ac8bfe1cfb27d698 | common/observable/observable_test.go |
func touchProviders(providers []provider.ProxyProvider) {
for _, provider := range providers {
provider.Touch()
}
}
| <mask> const (
<mask> defaultGetProxiesDuration = time.Second * 5
<mask> )
<mask>
<mask> func getProvidersProxies(providers []provider.ProxyProvider, touch bool) []C.Proxy {
<mask> proxies := []C.Proxy{}
<mask> for _, provider := range providers {
<mask> if touch {
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
</s> add provider.Touch() </s> remove elm, _, _ := u.fastSingle.Do(func() (any, error) {
</s> add elm, _, shared := u.fastSingle.Do(func() (any, error) { </s> remove return pp.Proxies()
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/outboundgroup/common.go |
provider.Touch() | <mask> func getProvidersProxies(providers []provider.ProxyProvider, touch bool) []C.Proxy {
<mask> proxies := []C.Proxy{}
<mask> for _, provider := range providers {
<mask> if touch {
<mask> proxies = append(proxies, provider.ProxiesWithTouch()...)
<mask> } else {
<mask> proxies = append(proxies, provider.Proxies()...)
<mask> }
<mask> }
<mask> return proxies
<mask> }
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove elm, _, _ := u.fastSingle.Do(func() (any, error) {
</s> add elm, _, shared := u.fastSingle.Do(func() (any, error) { </s> remove return pp.Proxies()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/outboundgroup/common.go |
proxies = append(proxies, provider.Proxies()...) | <mask> if touch {
<mask> provider.Touch()
<mask> }
<mask> }
<mask> return proxies
<mask> }
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
</s> add provider.Touch() </s> remove return cp.Proxies()
</s> add </s> remove return pp.Proxies()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/outboundgroup/common.go |
elm, _, shared := u.fastSingle.Do(func() (any, error) { | <mask> return elm.([]C.Proxy)
<mask> }
<mask>
<mask> func (u *URLTest) fast(touch bool) C.Proxy {
<mask> elm, _, _ := u.fastSingle.Do(func() (any, error) {
<mask> proxies := u.proxies(touch)
<mask> fast := proxies[0]
<mask> min := fast.LastDelay()
<mask> fastNotExist := true
<mask>
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
</s> add provider.Touch() </s> remove func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (cp *compatibleProvider) Touch() { </s> remove func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (pp *proxySetProvider) Touch() { </s> remove return cp.Proxies()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/outboundgroup/urltest.go |
if shared && touch { // a shared fastSingle.Do() may cause providers untouched, so we touch them again
touchProviders(u.providers)
} | <mask> return u.fastNode, nil
<mask> })
<mask>
<mask> return elm.(C.Proxy)
<mask> }
<mask>
<mask> // SupportUDP implements C.ProxyAdapter
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove ProxiesWithTouch() []constant.Proxy
</s> add Touch() </s> remove // ProxiesWithTouch is used to inform the provider that the proxy is actually being used while getting the list of proxies.
</s> add // Touch is used to inform the provider that the proxy is actually being used while getting the list of proxies. </s> remove func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (cp *compatibleProvider) Touch() { </s> remove return cp.Proxies()
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/outboundgroup/urltest.go |
func (pp *proxySetProvider) Touch() { | <mask> func (pp *proxySetProvider) Proxies() []C.Proxy {
<mask> return pp.proxies
<mask> }
<mask>
<mask> func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
<mask> pp.healthCheck.touch()
<mask> return pp.Proxies()
<mask> }
<mask>
<mask> func (pp *proxySetProvider) setProxies(proxies []C.Proxy) {
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove return pp.Proxies()
</s> add </s> remove func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (cp *compatibleProvider) Touch() { </s> remove return cp.Proxies()
</s> add </s> remove proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
</s> add provider.Touch() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/provider/provider.go |
<mask> }
<mask>
<mask> func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
<mask> pp.healthCheck.touch()
<mask> return pp.Proxies()
<mask> }
<mask>
<mask> func (pp *proxySetProvider) setProxies(proxies []C.Proxy) {
<mask> pp.proxies = proxies
<mask> pp.healthCheck.setProxy(proxies)
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (pp *proxySetProvider) Touch() { </s> remove func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (cp *compatibleProvider) Touch() { </s> remove return cp.Proxies()
</s> add </s> remove proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
</s> add provider.Touch() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/provider/provider.go | |
func (cp *compatibleProvider) Touch() { | <mask> func (cp *compatibleProvider) Proxies() []C.Proxy {
<mask> return cp.proxies
<mask> }
<mask>
<mask> func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
<mask> cp.healthCheck.touch()
<mask> return cp.Proxies()
<mask> }
<mask>
<mask> func stopCompatibleProvider(pd *CompatibleProvider) {
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove return cp.Proxies()
</s> add </s> remove func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (pp *proxySetProvider) Touch() { </s> remove return pp.Proxies()
</s> add </s> remove proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
</s> add provider.Touch() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/provider/provider.go |
<mask> }
<mask>
<mask> func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
<mask> cp.healthCheck.touch()
<mask> return cp.Proxies()
<mask> }
<mask>
<mask> func stopCompatibleProvider(pd *CompatibleProvider) {
<mask> pd.healthCheck.close()
<mask> }
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (cp *compatibleProvider) Touch() { </s> remove func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (pp *proxySetProvider) Touch() { </s> remove return pp.Proxies()
</s> add </s> remove proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
</s> add provider.Touch() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | adapter/provider/provider.go | |
// Touch is used to inform the provider that the proxy is actually being used while getting the list of proxies. | <mask> // ProxyProvider interface
<mask> type ProxyProvider interface {
<mask> Provider
<mask> Proxies() []constant.Proxy
<mask> // ProxiesWithTouch is used to inform the provider that the proxy is actually being used while getting the list of proxies.
<mask> // Commonly used in DialContext and DialPacketConn
<mask> ProxiesWithTouch() []constant.Proxy
<mask> HealthCheck()
<mask> }
<mask>
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove ProxiesWithTouch() []constant.Proxy
</s> add Touch() </s> remove func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (cp *compatibleProvider) Touch() { </s> remove func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (pp *proxySetProvider) Touch() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | constant/provider/interface.go |
Touch() | <mask> Provider
<mask> Proxies() []constant.Proxy
<mask> // ProxiesWithTouch is used to inform the provider that the proxy is actually being used while getting the list of proxies.
<mask> // Commonly used in DialContext and DialPacketConn
<mask> ProxiesWithTouch() []constant.Proxy
<mask> HealthCheck()
<mask> }
<mask>
<mask> // Rule Type
<mask> const (
</s> Fix: a shared fastSingle.Do() may cause providers untouched (#2378) </s> remove // ProxiesWithTouch is used to inform the provider that the proxy is actually being used while getting the list of proxies.
</s> add // Touch is used to inform the provider that the proxy is actually being used while getting the list of proxies. </s> remove func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (cp *compatibleProvider) Touch() { </s> remove func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
</s> add func (pp *proxySetProvider) Touch() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19b7c7f52afc4d43fa87a8dc9bbdb7ca340c2646 | constant/provider/interface.go |
if !existType {
return fmt.Errorf("Proxy %d missing type", idx) | <mask>
<mask> // parse proxy
<mask> for idx, mapping := range proxiesConfig {
<mask> proxyType, existType := mapping["type"].(string)
<mask> proxyName, existName := mapping["name"].(string)
<mask> if !existType && existName {
<mask> return fmt.Errorf("Proxy %d missing type or name", idx)
<mask> }
<mask>
<mask> if _, exist := proxies[proxyName]; exist {
<mask> return fmt.Errorf("Proxy %s is the duplicate name", proxyName)
<mask> }
</s> Fix: weak type proxy name </s> remove proxies[proxyName] = proxy
</s> add proxies[proxy.Name()] = proxy </s> remove if _, exist := proxies[proxyName]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxyName)
}
</s> add </s> remove return fmt.Errorf("Proxy %s: %s", proxyName, err.Error())
</s> add return fmt.Errorf("Proxy [%d]: %s", idx, err.Error())
}
if _, exist := proxies[proxy.Name()]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxy.Name()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19cbe5245616a0968fd032dcf2eef88141ae9dbb | config/config.go |
<mask> if !existType && existName {
<mask> return fmt.Errorf("Proxy %d missing type or name", idx)
<mask> }
<mask>
<mask> if _, exist := proxies[proxyName]; exist {
<mask> return fmt.Errorf("Proxy %s is the duplicate name", proxyName)
<mask> }
<mask> var proxy C.Proxy
<mask> var err error
<mask> switch proxyType {
<mask> case "ss":
<mask> ssOption := &adapters.ShadowSocksOption{}
</s> Fix: weak type proxy name </s> remove proxies[proxyName] = proxy
</s> add proxies[proxy.Name()] = proxy </s> remove return fmt.Errorf("Proxy %s: %s", proxyName, err.Error())
</s> add return fmt.Errorf("Proxy [%d]: %s", idx, err.Error())
}
if _, exist := proxies[proxy.Name()]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxy.Name()) </s> remove proxyName, existName := mapping["name"].(string)
if !existType && existName {
return fmt.Errorf("Proxy %d missing type or name", idx)
</s> add if !existType {
return fmt.Errorf("Proxy %d missing type", idx) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19cbe5245616a0968fd032dcf2eef88141ae9dbb | config/config.go | |
return fmt.Errorf("Proxy [%d]: %s", idx, err.Error())
}
if _, exist := proxies[proxy.Name()]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxy.Name()) | <mask> default:
<mask> return fmt.Errorf("Unsupport proxy type: %s", proxyType)
<mask> }
<mask> if err != nil {
<mask> return fmt.Errorf("Proxy %s: %s", proxyName, err.Error())
<mask> }
<mask> proxies[proxyName] = proxy
<mask> }
<mask>
<mask> // parse proxy group
</s> Fix: weak type proxy name </s> remove if _, exist := proxies[proxyName]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxyName)
}
</s> add </s> remove proxyName, existName := mapping["name"].(string)
if !existType && existName {
return fmt.Errorf("Proxy %d missing type or name", idx)
</s> add if !existType {
return fmt.Errorf("Proxy %d missing type", idx) </s> remove proxies[proxyName] = proxy
</s> add proxies[proxy.Name()] = proxy | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19cbe5245616a0968fd032dcf2eef88141ae9dbb | config/config.go |
proxies[proxy.Name()] = proxy | <mask> }
<mask> if err != nil {
<mask> return fmt.Errorf("Proxy %s: %s", proxyName, err.Error())
<mask> }
<mask> proxies[proxyName] = proxy
<mask> }
<mask>
<mask> // parse proxy group
<mask> for idx, mapping := range groupsConfig {
<mask> groupType, existType := mapping["type"].(string)
</s> Fix: weak type proxy name </s> remove if _, exist := proxies[proxyName]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxyName)
}
</s> add </s> remove proxyName, existName := mapping["name"].(string)
if !existType && existName {
return fmt.Errorf("Proxy %d missing type or name", idx)
</s> add if !existType {
return fmt.Errorf("Proxy %d missing type", idx) </s> remove return fmt.Errorf("Proxy %s: %s", proxyName, err.Error())
</s> add return fmt.Errorf("Proxy [%d]: %s", idx, err.Error())
}
if _, exist := proxies[proxy.Name()]; exist {
return fmt.Errorf("Proxy %s is the duplicate name", proxy.Name()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19cbe5245616a0968fd032dcf2eef88141ae9dbb | config/config.go |
vmessOption := &VmessOption{
HTTPOpts: HTTPOptions{
Method: "GET",
Path: []string{"/"},
},
} | <mask> break
<mask> }
<mask> proxy = NewHttp(*httpOption)
<mask> case "vmess":
<mask> vmessOption := &VmessOption{}
<mask> err = decoder.Decode(mapping, vmessOption)
<mask> if err != nil {
<mask> break
<mask> }
<mask> proxy, err = NewVmess(*vmessOption)
</s> Feature: refactor vmess & add http network </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove conn, err = vmess.NewWebsocketConn(conn, config)
</s> add conn, err = vmess.StreamWebsocketConn(conn, config) </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
</s> add c, err = v.StreamConn(c, metadata) </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/parser.go |
<mask> package outbound
<mask>
<mask> import (
<mask> "context"
<mask> "crypto/tls"
<mask> "encoding/json"
<mask> "errors"
<mask> "fmt"
<mask> "net"
<mask> "strconv"
</s> Feature: refactor vmess & add http network </s> remove "net/http"
</s> add </s> remove return nil, fmt.Errorf("Dial %s error: %s", host, reason)
</s> add return nil, fmt.Errorf("Dial %s error: %s", uri.Host, reason) </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/shadowsocks.go | |
v2rayOption = &v2rayObfs.Option{
Host: opts.Host,
Path: opts.Path,
Headers: opts.Headers,
Mux: opts.Mux,
} | <mask> }
<mask> obfsMode = opts.Mode
<mask>
<mask> if opts.TLS {
<mask> v2rayOption.TLS = true
<mask> v2rayOption.SkipCertVerify = opts.SkipCertVerify
</s> Feature: refactor vmess & add http network </s> remove tlsConfig = &tls.Config{
ServerName: opts.Host,
InsecureSkipVerify: opts.SkipCertVerify,
ClientSessionCache: getClientSessionCache(),
}
}
v2rayOption = &v2rayObfs.Option{
Host: opts.Host,
Path: opts.Path,
Headers: opts.Headers,
TLSConfig: tlsConfig,
Mux: opts.Mux,
</s> add v2rayOption.TLS = true
v2rayOption.SkipCertVerify = opts.SkipCertVerify
v2rayOption.SessionCache = getClientSessionCache() </s> remove var tlsConfig *tls.Config
</s> add </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove conn, err = vmess.NewWebsocketConn(conn, config)
</s> add conn, err = vmess.StreamWebsocketConn(conn, config) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/shadowsocks.go |
<mask> return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode)
<mask> }
<mask> obfsMode = opts.Mode
<mask>
<mask> var tlsConfig *tls.Config
<mask> if opts.TLS {
<mask> tlsConfig = &tls.Config{
<mask> ServerName: opts.Host,
<mask> InsecureSkipVerify: opts.SkipCertVerify,
<mask> ClientSessionCache: getClientSessionCache(),
</s> Feature: refactor vmess & add http network </s> remove tlsConfig = &tls.Config{
ServerName: opts.Host,
InsecureSkipVerify: opts.SkipCertVerify,
ClientSessionCache: getClientSessionCache(),
}
}
v2rayOption = &v2rayObfs.Option{
Host: opts.Host,
Path: opts.Path,
Headers: opts.Headers,
TLSConfig: tlsConfig,
Mux: opts.Mux,
</s> add v2rayOption.TLS = true
v2rayOption.SkipCertVerify = opts.SkipCertVerify
v2rayOption.SessionCache = getClientSessionCache() </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove return nil, fmt.Errorf("Dial %s error: %s", host, reason)
</s> add return nil, fmt.Errorf("Dial %s error: %s", uri.Host, reason) </s> remove dialer.TLSClientConfig = c.TLSConfig
}
</s> add dialer.TLSClientConfig = &tls.Config{
ServerName: c.Host,
InsecureSkipVerify: c.SkipCertVerify,
ClientSessionCache: c.SessionCache,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/shadowsocks.go | |
v2rayOption.TLS = true
v2rayOption.SkipCertVerify = opts.SkipCertVerify
v2rayOption.SessionCache = getClientSessionCache() | <mask> obfsMode = opts.Mode
<mask>
<mask> var tlsConfig *tls.Config
<mask> if opts.TLS {
<mask> tlsConfig = &tls.Config{
<mask> ServerName: opts.Host,
<mask> InsecureSkipVerify: opts.SkipCertVerify,
<mask> ClientSessionCache: getClientSessionCache(),
<mask> }
<mask> }
<mask> v2rayOption = &v2rayObfs.Option{
<mask> Host: opts.Host,
<mask> Path: opts.Path,
<mask> Headers: opts.Headers,
<mask> TLSConfig: tlsConfig,
<mask> Mux: opts.Mux,
<mask> }
<mask> }
<mask>
<mask> return &ShadowSocks{
<mask> Base: &Base{
</s> Feature: refactor vmess & add http network </s> remove var tlsConfig *tls.Config
</s> add </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove dialer.TLSClientConfig = c.TLSConfig
}
</s> add dialer.TLSClientConfig = &tls.Config{
ServerName: c.Host,
InsecureSkipVerify: c.SkipCertVerify,
ClientSessionCache: c.SessionCache,
} </s> remove Host: option.Host,
Path: option.Path,
TLS: option.TLSConfig != nil,
Headers: header,
TLSConfig: option.TLSConfig,
</s> add Host: option.Host,
Port: option.Port,
Path: option.Path,
TLS: option.TLS,
Headers: header,
SkipCertVerify: option.SkipCertVerify,
SessionCache: option.SessionCache, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/shadowsocks.go |
"net/http" | <mask> "fmt"
<mask> "net"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/component/vmess"
</s> Feature: refactor vmess & add http network </s> remove "crypto/tls"
</s> add </s> remove "net/http"
</s> add </s> remove return nil, fmt.Errorf("Dial %s error: %s", host, reason)
</s> add return nil, fmt.Errorf("Dial %s error: %s", uri.Host, reason) </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
option *VmessOption | <mask> type Vmess struct {
<mask> *Base
<mask> client *vmess.Client
<mask> }
<mask>
<mask> type VmessOption struct {
<mask> Name string `proxy:"name"`
<mask> Server string `proxy:"server"`
</s> Feature: refactor vmess & add http network </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
wsConfig *WebsocketConfig
tlsConfig *tls.Config
</s> add user []*ID
uuid *uuid.UUID
security Security </s> remove Host string
Path string
Headers http.Header
TLS bool
TLSConfig *tls.Config
</s> add Host string
Port string
Path string
Headers http.Header
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
HTTPOpts HTTPOptions `proxy:"http-opts,omitempty"` | <mask> TLS bool `proxy:"tls,omitempty"`
<mask> UDP bool `proxy:"udp,omitempty"`
<mask> Network string `proxy:"network,omitempty"`
<mask> WSPath string `proxy:"ws-path,omitempty"`
<mask> WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
<mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> type HTTPOptions struct {
</s> Feature: refactor vmess & add http network </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool </s> remove Host string
Path string
Headers http.Header
TLS bool
TLSConfig *tls.Config
</s> add Host string
Port string
Path string
Headers http.Header
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
wsConfig *WebsocketConfig
tlsConfig *tls.Config
</s> add user []*ID
uuid *uuid.UUID
security Security | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
type HTTPOptions struct {
Method string `proxy:"method,omitempty"`
Path []string `proxy:"path,omitempty"`
Headers map[string][]string `proxy:"headers,omitempty"`
}
| <mask> }
<mask>
<mask> func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
<mask> var err error
<mask> switch v.option.Network {
<mask> case "ws":
</s> Feature: refactor vmess & add http network </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove func NewWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) {
</s> add func StreamWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) { </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) | <mask> SkipCertVerify bool `proxy:"skip-cert-verify,omitempty"`
<mask> }
<mask>
<mask> func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
<mask> return v.client.New(c, parseVmessAddr(metadata))
<mask> }
<mask>
<mask> func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
<mask> c, err := dialer.DialContext(ctx, "tcp", v.addr)
<mask> if err != nil {
</s> Feature: refactor vmess & add http network </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
</s> add c, err = v.StreamConn(c, metadata) </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove func NewWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) {
</s> add func StreamWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
c, err = v.StreamConn(c, metadata) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error", v.addr)
<mask> }
<mask> tcpKeepAlive(c)
<mask> c, err = v.client.New(c, parseVmessAddr(metadata))
<mask> if err != nil {
<mask> return nil, fmt.Errorf("new vmess client error: %v", err)
<mask> }
<mask> return newPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
<mask> }
</s> Feature: refactor vmess & add http network </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove conn, err = vmess.NewWebsocketConn(conn, config)
</s> add conn, err = vmess.StreamWebsocketConn(conn, config) </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove return nil, fmt.Errorf("Dial %s error: %s", host, reason)
</s> add return nil, fmt.Errorf("Dial %s error: %s", uri.Host, reason) </s> remove Host: option.Host,
Path: option.Path,
TLS: option.TLSConfig != nil,
Headers: header,
TLSConfig: option.TLSConfig,
</s> add Host: option.Host,
Port: option.Port,
Path: option.Path,
TLS: option.TLS,
Headers: header,
SkipCertVerify: option.SkipCertVerify,
SessionCache: option.SessionCache, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
UUID: option.UUID,
AlterID: uint16(option.AlterID),
Security: security,
HostName: option.Server,
Port: strconv.Itoa(option.Port), | <mask>
<mask> func NewVmess(option VmessOption) (*Vmess, error) {
<mask> security := strings.ToLower(option.Cipher)
<mask> client, err := vmess.NewClient(vmess.Config{
<mask> UUID: option.UUID,
<mask> AlterID: uint16(option.AlterID),
<mask> Security: security,
<mask> TLS: option.TLS,
<mask> HostName: option.Server,
<mask> Port: strconv.Itoa(option.Port),
<mask> NetWork: option.Network,
<mask> WebSocketPath: option.WSPath,
<mask> WebSocketHeaders: option.WSHeaders,
<mask> SkipCertVerify: option.SkipCertVerify,
<mask> SessionCache: getClientSessionCache(),
<mask> })
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> Feature: refactor vmess & add http network </s> remove Host: option.Host,
Path: option.Path,
TLS: option.TLSConfig != nil,
Headers: header,
TLSConfig: option.TLSConfig,
</s> add Host: option.Host,
Port: option.Port,
Path: option.Path,
TLS: option.TLS,
Headers: header,
SkipCertVerify: option.SkipCertVerify,
SessionCache: option.SessionCache, </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
option: &option, | <mask> tp: C.Vmess,
<mask> udp: true,
<mask> },
<mask> client: client,
<mask> }, nil
<mask> }
<mask>
<mask> func parseVmessAddr(metadata *C.Metadata) *vmess.DstAddr {
<mask> var addrType byte
</s> Feature: refactor vmess & add http network </s> remove
func getClientSessionCache() tls.ClientSessionCache {
once.Do(func() {
clientSessionCache = tls.NewLRUClientSessionCache(128)
})
return clientSessionCache
}
</s> add </s> remove user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: host,
wsConfig: wsConfig,
tlsConfig: tlsConfig,
</s> add user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security, </s> remove func NewWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) {
</s> add func StreamWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) { </s> remove vmessOption := &VmessOption{}
</s> add vmessOption := &VmessOption{
HTTPOpts: HTTPOptions{
Method: "GET",
Path: []string{"/"},
},
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | adapters/outbound/vmess.go |
Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool | <mask> )
<mask>
<mask> // Option is options of websocket obfs
<mask> type Option struct {
<mask> Host string
<mask> Path string
<mask> Headers map[string]string
<mask> TLSConfig *tls.Config
<mask> Mux bool
<mask> }
<mask>
<mask> // NewV2rayObfs return a HTTPObfs
<mask> func NewV2rayObfs(conn net.Conn, option *Option) (net.Conn, error) {
<mask> header := http.Header{}
</s> Feature: refactor vmess & add http network </s> remove Host string
Path string
Headers http.Header
TLS bool
TLSConfig *tls.Config
</s> add Host string
Port string
Path string
Headers http.Header
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
wsConfig *WebsocketConfig
tlsConfig *tls.Config
</s> add user []*ID
uuid *uuid.UUID
security Security | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/v2ray-plugin/websocket.go |
Host: option.Host,
Port: option.Port,
Path: option.Path,
TLS: option.TLS,
Headers: header,
SkipCertVerify: option.SkipCertVerify,
SessionCache: option.SessionCache, | <mask> header.Add(k, v)
<mask> }
<mask>
<mask> config := &vmess.WebsocketConfig{
<mask> Host: option.Host,
<mask> Path: option.Path,
<mask> TLS: option.TLSConfig != nil,
<mask> Headers: header,
<mask> TLSConfig: option.TLSConfig,
<mask> }
<mask>
<mask> var err error
<mask> conn, err = vmess.NewWebsocketConn(conn, config)
<mask> if err != nil {
</s> Feature: refactor vmess & add http network </s> remove conn, err = vmess.NewWebsocketConn(conn, config)
</s> add conn, err = vmess.StreamWebsocketConn(conn, config) </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/v2ray-plugin/websocket.go |
conn, err = vmess.StreamWebsocketConn(conn, config) | <mask> TLSConfig: option.TLSConfig,
<mask> }
<mask>
<mask> var err error
<mask> conn, err = vmess.NewWebsocketConn(conn, config)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if option.Mux {
</s> Feature: refactor vmess & add http network </s> remove Host: option.Host,
Path: option.Path,
TLS: option.TLSConfig != nil,
Headers: header,
TLSConfig: option.TLSConfig,
</s> add Host: option.Host,
Port: option.Port,
Path: option.Path,
TLS: option.TLS,
Headers: header,
SkipCertVerify: option.SkipCertVerify,
SessionCache: option.SessionCache, </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
</s> add c, err = v.StreamConn(c, metadata) </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/v2ray-plugin/websocket.go |
<mask> "crypto/tls"
<mask> "fmt"
<mask> "math/rand"
<mask> "net"
<mask> "net/http"
<mask> "runtime"
<mask> "sync"
<mask>
<mask> "github.com/gofrs/uuid"
<mask> )
</s> Feature: refactor vmess & add http network </s> remove "crypto/tls"
</s> add </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool </s> remove return nil, fmt.Errorf("Dial %s error: %s", host, reason)
</s> add return nil, fmt.Errorf("Dial %s error: %s", uri.Host, reason) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go | |
user []*ID
uuid *uuid.UUID
security Security | <mask> }
<mask>
<mask> // Client is vmess connection generator
<mask> type Client struct {
<mask> user []*ID
<mask> uuid *uuid.UUID
<mask> security Security
<mask> tls bool
<mask> host string
<mask> wsConfig *WebsocketConfig
<mask> tlsConfig *tls.Config
<mask> }
<mask>
<mask> // Config of vmess
<mask> type Config struct {
<mask> UUID string
</s> Feature: refactor vmess & add http network </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool </s> remove Host string
Path string
Headers http.Header
TLS bool
TLSConfig *tls.Config
</s> add Host string
Port string
Path string
Headers http.Header
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go |
UUID string
AlterID uint16
Security string
Port string
HostName string | <mask> }
<mask>
<mask> // Config of vmess
<mask> type Config struct {
<mask> UUID string
<mask> AlterID uint16
<mask> Security string
<mask> TLS bool
<mask> HostName string
<mask> Port string
<mask> NetWork string
<mask> WebSocketPath string
<mask> WebSocketHeaders map[string]string
<mask> SkipCertVerify bool
<mask> SessionCache tls.ClientSessionCache
<mask> }
<mask>
<mask> // New return a Conn with net.Conn and DstAddr
<mask> func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
<mask> var err error
</s> Feature: refactor vmess & add http network </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
wsConfig *WebsocketConfig
tlsConfig *tls.Config
</s> add user []*ID
uuid *uuid.UUID
security Security </s> remove Host string
Path string
Headers http.Header
TLS bool
TLSConfig *tls.Config
</s> add Host string
Port string
Path string
Headers http.Header
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go |
// StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { | <mask> SkipCertVerify bool
<mask> SessionCache tls.ClientSessionCache
<mask> }
<mask>
<mask> // New return a Conn with net.Conn and DstAddr
<mask> func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
<mask> var err error
<mask> r := rand.Intn(len(c.user))
<mask> if c.wsConfig != nil {
<mask> conn, err = NewWebsocketConn(conn, c.wsConfig)
<mask> if err != nil {
<mask> return nil, err
</s> Feature: refactor vmess & add http network </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string </s> remove conn, err = vmess.NewWebsocketConn(conn, config)
</s> add conn, err = vmess.StreamWebsocketConn(conn, config) </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go |
<mask> // New return a Conn with net.Conn and DstAddr
<mask> func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
<mask> var err error
<mask> r := rand.Intn(len(c.user))
<mask> if c.wsConfig != nil {
<mask> conn, err = NewWebsocketConn(conn, c.wsConfig)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> } else if c.tls {
<mask> conn = tls.Client(conn, c.tlsConfig)
<mask> }
<mask> return newConn(conn, c.user[r], dst, c.security)
<mask> }
<mask>
<mask> // NewClient return Client instance
<mask> func NewClient(config Config) (*Client, error) {
</s> Feature: refactor vmess & add http network </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string </s> remove conn, err = vmess.NewWebsocketConn(conn, config)
</s> add conn, err = vmess.StreamWebsocketConn(conn, config) </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go | |
<mask> default:
<mask> return nil, fmt.Errorf("Unknown security type: %s", config.Security)
<mask> }
<mask>
<mask> if config.NetWork != "" && config.NetWork != "ws" {
<mask> return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
<mask> }
<mask>
<mask> header := http.Header{}
<mask> for k, v := range config.WebSocketHeaders {
<mask> header.Add(k, v)
<mask> }
<mask>
<mask> host := net.JoinHostPort(config.HostName, config.Port)
<mask>
<mask> var tlsConfig *tls.Config
<mask> if config.TLS {
<mask> tlsConfig = &tls.Config{
<mask> ServerName: config.HostName,
<mask> InsecureSkipVerify: config.SkipCertVerify,
<mask> ClientSessionCache: config.SessionCache,
<mask> }
<mask> if tlsConfig.ClientSessionCache == nil {
<mask> tlsConfig.ClientSessionCache = getClientSessionCache()
<mask> }
<mask> if host := header.Get("Host"); host != "" {
<mask> tlsConfig.ServerName = host
<mask> }
<mask> }
<mask>
<mask> var wsConfig *WebsocketConfig
<mask> if config.NetWork == "ws" {
<mask> wsConfig = &WebsocketConfig{
<mask> Host: host,
<mask> Path: config.WebSocketPath,
<mask> Headers: header,
<mask> TLS: config.TLS,
<mask> TLSConfig: tlsConfig,
<mask> }
<mask> }
<mask>
<mask> return &Client{
<mask> user: newAlterIDs(newID(&uid), config.AlterID),
<mask> uuid: &uid,
<mask> security: security,
<mask> tls: config.TLS,
</s> Feature: refactor vmess & add http network </s> remove user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: host,
wsConfig: wsConfig,
tlsConfig: tlsConfig,
</s> add user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security, </s> remove host, port, _ := net.SplitHostPort(c.Host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.Host
</s> add if host := c.Headers.Get("Host"); host != "" {
dialer.TLSClientConfig.ServerName = host
} </s> remove dialer.TLSClientConfig = c.TLSConfig
}
</s> add dialer.TLSClientConfig = &tls.Config{
ServerName: c.Host,
InsecureSkipVerify: c.SkipCertVerify,
ClientSessionCache: c.SessionCache,
} </s> remove tlsConfig = &tls.Config{
ServerName: opts.Host,
InsecureSkipVerify: opts.SkipCertVerify,
ClientSessionCache: getClientSessionCache(),
}
}
v2rayOption = &v2rayObfs.Option{
Host: opts.Host,
Path: opts.Path,
Headers: opts.Headers,
TLSConfig: tlsConfig,
Mux: opts.Mux,
</s> add v2rayOption.TLS = true
v2rayOption.SkipCertVerify = opts.SkipCertVerify
v2rayOption.SessionCache = getClientSessionCache() </s> remove var tlsConfig *tls.Config
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go | |
user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security, | <mask> }
<mask> }
<mask>
<mask> return &Client{
<mask> user: newAlterIDs(newID(&uid), config.AlterID),
<mask> uuid: &uid,
<mask> security: security,
<mask> tls: config.TLS,
<mask> host: host,
<mask> wsConfig: wsConfig,
<mask> tlsConfig: tlsConfig,
<mask> }, nil
<mask> }
<mask>
<mask> func getClientSessionCache() tls.ClientSessionCache {
<mask> once.Do(func() {
</s> Feature: refactor vmess & add http network </s> remove
func getClientSessionCache() tls.ClientSessionCache {
once.Do(func() {
clientSessionCache = tls.NewLRUClientSessionCache(128)
})
return clientSessionCache
}
</s> add </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove tlsConfig = &tls.Config{
ServerName: opts.Host,
InsecureSkipVerify: opts.SkipCertVerify,
ClientSessionCache: getClientSessionCache(),
}
}
v2rayOption = &v2rayObfs.Option{
Host: opts.Host,
Path: opts.Path,
Headers: opts.Headers,
TLSConfig: tlsConfig,
Mux: opts.Mux,
</s> add v2rayOption.TLS = true
v2rayOption.SkipCertVerify = opts.SkipCertVerify
v2rayOption.SessionCache = getClientSessionCache() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go |
<mask> wsConfig: wsConfig,
<mask> tlsConfig: tlsConfig,
<mask> }, nil
<mask> }
<mask>
<mask> func getClientSessionCache() tls.ClientSessionCache {
<mask> once.Do(func() {
<mask> clientSessionCache = tls.NewLRUClientSessionCache(128)
<mask> })
<mask> return clientSessionCache
<mask> }
</s> Feature: refactor vmess & add http network </s> remove user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security,
tls: config.TLS,
host: host,
wsConfig: wsConfig,
tlsConfig: tlsConfig,
</s> add user: newAlterIDs(newID(&uid), config.AlterID),
uuid: &uid,
security: security, </s> remove tlsConfig = &tls.Config{
ServerName: opts.Host,
InsecureSkipVerify: opts.SkipCertVerify,
ClientSessionCache: getClientSessionCache(),
}
}
v2rayOption = &v2rayObfs.Option{
Host: opts.Host,
Path: opts.Path,
Headers: opts.Headers,
TLSConfig: tlsConfig,
Mux: opts.Mux,
</s> add v2rayOption.TLS = true
v2rayOption.SkipCertVerify = opts.SkipCertVerify
v2rayOption.SessionCache = getClientSessionCache() </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove func NewWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) {
</s> add func StreamWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/vmess.go | |
Host string
Port string
Path string
Headers http.Header
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache | <mask> wMux sync.Mutex
<mask> }
<mask>
<mask> type WebsocketConfig struct {
<mask> Host string
<mask> Path string
<mask> Headers http.Header
<mask> TLS bool
<mask> TLSConfig *tls.Config
<mask> }
<mask>
<mask> // Read implements net.Conn.Read()
<mask> func (wsc *websocketConn) Read(b []byte) (int, error) {
<mask> wsc.rMux.Lock()
</s> Feature: refactor vmess & add http network </s> remove Host string
Path string
Headers map[string]string
TLSConfig *tls.Config
Mux bool
</s> add Host string
Port string
Path string
Headers map[string]string
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache
Mux bool </s> remove UUID string
AlterID uint16
Security string
TLS bool
HostName string
Port string
NetWork string
WebSocketPath string
WebSocketHeaders map[string]string
SkipCertVerify bool
SessionCache tls.ClientSessionCache
</s> add UUID string
AlterID uint16
Security string
Port string
HostName string </s> remove user []*ID
uuid *uuid.UUID
security Security
tls bool
host string
wsConfig *WebsocketConfig
tlsConfig *tls.Config
</s> add user []*ID
uuid *uuid.UUID
security Security | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/websocket.go |
func StreamWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) { | <mask> func (wsc *websocketConn) SetWriteDeadline(t time.Time) error {
<mask> return wsc.conn.SetWriteDeadline(t)
<mask> }
<mask>
<mask> func NewWebsocketConn(conn net.Conn, c *WebsocketConfig) (net.Conn, error) {
<mask> dialer := &websocket.Dialer{
<mask> NetDial: func(network, addr string) (net.Conn, error) {
<mask> return conn, nil
<mask> },
<mask> ReadBufferSize: 4 * 1024,
</s> Feature: refactor vmess & add http network </s> remove // New return a Conn with net.Conn and DstAddr
func (c *Client) New(conn net.Conn, dst *DstAddr) (net.Conn, error) {
var err error
</s> add // StreamConn return a Conn with net.Conn and DstAddr
func (c *Client) StreamConn(conn net.Conn, dst *DstAddr) (net.Conn, error) { </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add </s> remove Host string
Path string
Headers http.Header
TLS bool
TLSConfig *tls.Config
</s> add Host string
Port string
Path string
Headers http.Header
TLS bool
SkipCertVerify bool
SessionCache tls.ClientSessionCache </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/websocket.go |
dialer.TLSClientConfig = &tls.Config{
ServerName: c.Host,
InsecureSkipVerify: c.SkipCertVerify,
ClientSessionCache: c.SessionCache,
} | <mask>
<mask> scheme := "ws"
<mask> if c.TLS {
<mask> scheme = "wss"
<mask> dialer.TLSClientConfig = c.TLSConfig
<mask> }
<mask>
<mask> host, port, _ := net.SplitHostPort(c.Host)
<mask> if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
<mask> host = c.Host
<mask> }
</s> Feature: refactor vmess & add http network </s> remove host, port, _ := net.SplitHostPort(c.Host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.Host
</s> add if host := c.Headers.Get("Host"); host != "" {
dialer.TLSClientConfig.ServerName = host
} </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove Host: host,
</s> add Host: net.JoinHostPort(c.Host, c.Port), </s> remove if c.wsConfig != nil {
conn, err = NewWebsocketConn(conn, c.wsConfig)
if err != nil {
return nil, err
}
} else if c.tls {
conn = tls.Client(conn, c.tlsConfig)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/websocket.go |
if host := c.Headers.Get("Host"); host != "" {
dialer.TLSClientConfig.ServerName = host
} | <mask> scheme = "wss"
<mask> dialer.TLSClientConfig = c.TLSConfig
<mask> }
<mask>
<mask> host, port, _ := net.SplitHostPort(c.Host)
<mask> if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
<mask> host = c.Host
<mask> }
<mask>
<mask> uri := url.URL{
<mask> Scheme: scheme,
<mask> Host: host,
</s> Feature: refactor vmess & add http network </s> remove dialer.TLSClientConfig = c.TLSConfig
}
</s> add dialer.TLSClientConfig = &tls.Config{
ServerName: c.Host,
InsecureSkipVerify: c.SkipCertVerify,
ClientSessionCache: c.SessionCache,
} </s> remove Host: host,
</s> add Host: net.JoinHostPort(c.Host, c.Port), </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove return nil, fmt.Errorf("Dial %s error: %s", host, reason)
</s> add return nil, fmt.Errorf("Dial %s error: %s", uri.Host, reason) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/websocket.go |
Host: net.JoinHostPort(c.Host, c.Port), | <mask> }
<mask>
<mask> uri := url.URL{
<mask> Scheme: scheme,
<mask> Host: host,
<mask> Path: c.Path,
<mask> }
<mask>
<mask> headers := http.Header{}
<mask> if c.Headers != nil {
</s> Feature: refactor vmess & add http network </s> remove host, port, _ := net.SplitHostPort(c.Host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.Host
</s> add if host := c.Headers.Get("Host"); host != "" {
dialer.TLSClientConfig.ServerName = host
} </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove Host: option.Host,
Path: option.Path,
TLS: option.TLSConfig != nil,
Headers: header,
TLSConfig: option.TLSConfig,
</s> add Host: option.Host,
Port: option.Port,
Path: option.Path,
TLS: option.TLS,
Headers: header,
SkipCertVerify: option.SkipCertVerify,
SessionCache: option.SessionCache, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/websocket.go |
return nil, fmt.Errorf("Dial %s error: %s", uri.Host, reason) | <mask> reason := err.Error()
<mask> if resp != nil {
<mask> reason = resp.Status
<mask> }
<mask> return nil, fmt.Errorf("Dial %s error: %s", host, reason)
<mask> }
<mask>
<mask> return &websocketConn{
<mask> conn: wsConn,
<mask> remoteAddr: conn.RemoteAddr(),
</s> Feature: refactor vmess & add http network </s> remove var tlsConfig *tls.Config
</s> add </s> remove if config.NetWork != "" && config.NetWork != "ws" {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
}
header := http.Header{}
for k, v := range config.WebSocketHeaders {
header.Add(k, v)
}
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config
if config.TLS {
tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCache,
}
if tlsConfig.ClientSessionCache == nil {
tlsConfig.ClientSessionCache = getClientSessionCache()
}
if host := header.Get("Host"); host != "" {
tlsConfig.ServerName = host
}
}
var wsConfig *WebsocketConfig
if config.NetWork == "ws" {
wsConfig = &WebsocketConfig{
Host: host,
Path: config.WebSocketPath,
Headers: header,
TLS: config.TLS,
TLSConfig: tlsConfig,
}
}
</s> add </s> remove c, err = v.client.New(c, parseVmessAddr(metadata))
</s> add c, err = v.StreamConn(c, metadata) </s> remove return v.client.New(c, parseVmessAddr(metadata))
</s> add var err error
switch v.option.Network {
case "ws":
host, port, _ := net.SplitHostPort(v.addr)
wsOpts := &vmess.WebsocketConfig{
Host: host,
Port: port,
Path: v.option.WSPath,
}
if len(v.option.WSHeaders) != 0 {
header := http.Header{}
for key, value := range v.option.WSHeaders {
header.Add(key, value)
}
wsOpts.Headers = header
}
if v.option.TLS {
wsOpts.TLS = true
wsOpts.SessionCache = getClientSessionCache()
wsOpts.SkipCertVerify = v.option.SkipCertVerify
}
c, err = vmess.StreamWebsocketConn(c, wsOpts)
case "http":
host, _, _ := net.SplitHostPort(v.addr)
httpOpts := &vmess.HTTPConfig{
Host: host,
Method: v.option.HTTPOpts.Method,
Path: v.option.HTTPOpts.Path,
Headers: v.option.HTTPOpts.Headers,
}
c, err = vmess.StreamHTTPConn(c, httpOpts), nil
}
if err != nil {
return nil, err
}
return v.client.StreamConn(c, parseVmessAddr(metadata)) </s> remove host, port, _ := net.SplitHostPort(c.Host)
if (scheme == "ws" && port != "80") || (scheme == "wss" && port != "443") {
host = c.Host
</s> add if host := c.Headers.Get("Host"); host != "" {
dialer.TLSClientConfig.ServerName = host
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/19f809b1c80a0a369dd3156b8113085b19ebd1a8 | component/vmess/websocket.go |
obfsMode string
obfsOption *simpleObfsOption
v2rayOption *v2rayObfs.Option | <mask> server string
<mask> cipher core.Cipher
<mask>
<mask> // obfs
<mask> obfsMode string
<mask> obfsOption *simpleObfsOption
<mask> wsOption *v2rayObfs.WebsocketOption
<mask> }
<mask>
<mask> type ShadowSocksOption struct {
<mask> Name string `proxy:"name"`
<mask> Server string `proxy:"server"`
</s> Feature: v2ray-plugin support disable mux </s> remove // WebsocketOption is options of websocket obfs
type WebsocketOption struct {
</s> add // Option is options of websocket obfs
type Option struct { </s> remove var wsOption *v2rayObfs.WebsocketOption
</s> add var v2rayOption *v2rayObfs.Option </s> remove obfsMode: obfsMode,
wsOption: wsOption,
obfsOption: obfsOption,
</s> add obfsMode: obfsMode,
v2rayOption: v2rayOption,
obfsOption: obfsOption, </s> remove opts := v2rayObfsOption{Host: "bing.com"}
</s> add opts := v2rayObfsOption{Host: "bing.com", Mux: true} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1a8a6d0b5d28161069c23560464be9f1e0eb6fd7 | adapters/outbound/shadowsocks.go |
Mux bool `obfs:"mux,omitempty"` | <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) (C.Conn, error) {
<mask> c, err := dialTimeout("tcp", ss.server, tcpTimeout)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("%s connect error: %s", ss.server, err.Error())
</s> Feature: v2ray-plugin support disable mux </s> remove c, err = v2rayObfs.NewWebsocketObfs(c, ss.wsOption)
</s> add c, err = v2rayObfs.NewV2rayObfs(c, ss.v2rayOption) </s> remove // NewWebsocketObfs return a HTTPObfs
func NewWebsocketObfs(conn net.Conn, option *WebsocketOption) (net.Conn, error) {
</s> add // NewV2rayObfs return a HTTPObfs
func NewV2rayObfs(conn net.Conn, option *Option) (net.Conn, error) { </s> remove opts := v2rayObfsOption{Host: "bing.com"}
</s> add opts := v2rayObfsOption{Host: "bing.com", Mux: true} </s> remove var wsOption *v2rayObfs.WebsocketOption
</s> add var v2rayOption *v2rayObfs.Option | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/1a8a6d0b5d28161069c23560464be9f1e0eb6fd7 | adapters/outbound/shadowsocks.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.