Backups/mihomo
1
0
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2024-12-22 23:57:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Attempts to send request with first payload on VLESS

Browse Source
This commit is contained in:
H1JK 2023-02-10 10:03:37 +08:00
parent 24419551a9
commit 3fd3d83029
1 changed files with 59 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
transport/vless/conn.go
View File

@ -6,6 +6,8 @@ import (
"fmt"
"io"
"net"
"sync"
"time"
"github.com/Dreamacro/clash/common/buf"
N "github.com/Dreamacro/clash/common/net"
@ -21,6 +23,10 @@ type Conn struct {
id *uuid.UUID
addons *Addons
received bool
handshake chan struct{}
handshakeMutex sync.Mutex
err error
}
func (vc *Conn) Read(b []byte) (int, error) {
@ -47,7 +53,41 @@ func (vc *Conn) ReadBuffer(buffer *buf.Buffer) error {
return vc.ExtendedConn.ReadBuffer(buffer)
}
func (vc *Conn) sendRequest() (err error) {
func (vc *Conn) Write(p []byte) (int, error) {
select {
case <-vc.handshake:
default:
err := vc.sendRequest(p)
if err != nil {
return 0, err
}
}
return vc.ExtendedConn.Write(p)
}
func (vc *Conn) WriteBuffer(buffer *buf.Buffer) error {
select {
case <-vc.handshake:
default:
err := vc.sendRequest(buffer.Bytes())
if err != nil {
return err
}
}
return vc.ExtendedConn.WriteBuffer(buffer)
}
func (vc *Conn) sendRequest(p []byte) (err error) {
vc.handshakeMutex.Lock()
defer vc.handshakeMutex.Unlock()
select {
case <-vc.handshake:
return vc.err
default:
}
defer close(vc.handshake)
requestLen := 1 // protocol version
requestLen += 16 // UUID
requestLen += 1 // addons length
@ -65,6 +105,8 @@ func (vc *Conn) sendRequest() (err error) {
requestLen += 1 // addr type
requestLen += len(vc.dst.Addr)
}
requestLen += len(p)
_buffer := buf.StackNewSize(requestLen)
defer buf.KeepAlive(_buffer)
buffer := buf.Dup(_buffer)
@ -93,25 +135,26 @@ func (vc *Conn) sendRequest() (err error) {
)
}
buf.Must(buf.Error(buffer.Write(p)))
_, err = vc.ExtendedConn.Write(buffer.Bytes())
return
}
func (vc *Conn) recvResponse() error {
var err error
var buf [1]byte
_, err = io.ReadFull(vc.ExtendedConn, buf[:])
if err != nil {
return err
_, vc.err = io.ReadFull(vc.ExtendedConn, buf[:])
if vc.err != nil {
return vc.err
}
if buf[0] != Version {
return errors.New("unexpected response version")
}
_, err = io.ReadFull(vc.ExtendedConn, buf[:])
if err != nil {
return err
_, vc.err = io.ReadFull(vc.ExtendedConn, buf[:])
if vc.err != nil {
return vc.err
}
length := int64(buf[0])
@ -132,6 +175,7 @@ func newConn(conn net.Conn, client *Client, dst *DstAddr) (*Conn, error) {
ExtendedConn: N.NewExtendedConn(conn),
id: client.uuid,
dst: dst,
handshake: make(chan struct{}),
}
if !dst.UDP && client.Addons != nil {
@ -155,8 +199,12 @@ func newConn(conn net.Conn, client *Client, dst *DstAddr) (*Conn, error) {
}
}
if err := c.sendRequest(); err != nil {
return nil, err
}
go func() {
select {
case <-c.handshake:
case <-time.After(200 * time.Millisecond):
_ = c.sendRequest(nil)
}
}()
return c, nil
}