bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 17:35:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

vmess: update chunk codes

Browse Source
This commit is contained in:
nadoo 2018-07-10 00:53:15 +08:00
parent b465dc1444
commit fd298207c5
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
proxy/vmess/chunk.go
View File

@ -8,8 +8,10 @@ import (
// chunk: plain, AES-128-CFB, AES-128-GCM, ChaCha20-Poly1305 // chunk: plain, AES-128-CFB, AES-128-GCM, ChaCha20-Poly1305
const maxChunkSize = 1 << 14 // 16384 const (
const defaultChunkSize = 1 << 13 // 8192 maxChunkSize = 1 << 14 // 16384
defaultChunkSize = 1 << 13 // 8192
)
type chunkedReader struct { type chunkedReader struct {
io.Reader io.Reader
@ -24,24 +26,6 @@ func newChunkedReader(r io.Reader) io.Reader {
} }
} }
func (r *chunkedReader) read() (int, error) {
lenBuf := make([]byte, 2)
_, err := io.ReadFull(r.Reader, lenBuf)
if err != nil {
return 0, err
}
len := binary.BigEndian.Uint16(lenBuf)
buf := r.buf[:len]
_, err = io.ReadFull(r.Reader, buf)
if err != nil {
return 0, err
}
return int(len), nil
}
func (r *chunkedReader) Read(b []byte) (int, error) { func (r *chunkedReader) Read(b []byte) (int, error) {
if len(r.leftover) > 0 { if len(r.leftover) > 0 {
n := copy(b, r.leftover) n := copy(b, r.leftover)
@ -49,10 +33,27 @@ func (r *chunkedReader) Read(b []byte) (int, error) {
return n, nil return n, nil
} }
n, err := r.read() // get length
m := copy(b, r.buf[:n]) _, err := io.ReadFull(r.Reader, r.buf[:2])
if m < n { if err != nil {
r.leftover = r.buf[m:n] return 0, err
}
// if length == 0, then this is the end
len := binary.BigEndian.Uint16(r.buf[:2])
if len == 0 {
return 0, nil
}
// get payload
_, err = io.ReadFull(r.Reader, r.buf[:len])
if err != nil {
return 0, err
}
m := copy(b, r.buf[:len])
if m < int(len) {
r.leftover = r.buf[m:len]
} }
return m, err return m, err
@ -84,7 +85,7 @@ func (w *chunkedWriter) ReadFrom(r io.Reader) (n int64, err error) {
if nr > 0 { if nr > 0 {
n += int64(nr) n += int64(nr)
payloadBuf = payloadBuf[:nr] payloadBuf = payloadBuf[:nr]
binary.BigEndian.PutUint16(buf[:], uint16(nr)) binary.BigEndian.PutUint16(buf[:2], uint16(nr))
_, ew := w.Writer.Write(buf) _, ew := w.Writer.Write(buf)
if ew != nil { if ew != nil {
@ -101,5 +102,6 @@ func (w *chunkedWriter) ReadFrom(r io.Reader) (n int64, err error) {
} }
} }
w.Writer.Write([]byte{0, 0})
return n, err return n, err
} }

2
proxy/vmess/client.go
View File

@ -85,7 +85,7 @@ func NewClient(uuidStr, security string, alterID int) (*Client, error) {
c.count = len(c.users) c.count = len(c.users)
// TODO: config? // TODO: config?
c.opt = OptBasicFormat c.opt = OptChunkStream
security = strings.ToLower(security) security = strings.ToLower(security)
switch security { switch security {