kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement stream WriteTo

This commit is contained in:
Andy Wang 2020-04-12 12:43:24 +01:00
parent 334712c413
commit 14787a7057
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/common/copy.go
View File

@ -41,18 +41,18 @@ import (
// copyBuffer is the actual implementation of Copy and CopyBuffer. // copyBuffer is the actual implementation of Copy and CopyBuffer.
// if buf is nil, one is allocated. // if buf is nil, one is allocated.
func Copy(dst net.Conn, src net.Conn, srcReadTimeout time.Duration) (written int64, err error) { func Copy(dst net.Conn, src net.Conn, srcReadTimeout time.Duration) (written int64, err error) {
/* defer func() { src.Close(); dst.Close() }()
// If the reader has a WriteTo method, use it to do the copy. // If the reader has a WriteTo method, use it to do the copy.
// Avoids an allocation and a copy. // Avoids an allocation and a copy.
if wt, ok := src.(WriterTo); ok { if wt, ok := src.(io.WriterTo); ok {
return wt.WriteTo(dst) return wt.WriteTo(dst)
} }
// Similarly, if the writer has a ReadFrom method, use it to do the copy. // Similarly, if the writer has a ReadFrom method, use it to do the copy.
if rt, ok := dst.(ReaderFrom); ok { if rt, ok := dst.(io.ReaderFrom); ok {
return rt.ReadFrom(src) return rt.ReadFrom(src)
} }
*/
//if buf == nil { //if buf == nil {
size := 32 * 1024 size := 32 * 1024
/* /*
@ -97,7 +97,5 @@ func Copy(dst net.Conn, src net.Conn, srcReadTimeout time.Duration) (written int
break break
} }
} }
src.Close()
dst.Close()
return written, err return written, err
} }

4
internal/multiplex/session.go
View File

@ -84,6 +84,7 @@ func MakeSession(id uint32, config SessionConfig) *Session {
if config.MaxFrameSize <= 0 { if config.MaxFrameSize <= 0 {
sesh.MaxFrameSize = defaultSendRecvBufSize - 1024 sesh.MaxFrameSize = defaultSendRecvBufSize - 1024
} }
// todo: validation. this must be smaller than the buffer sizes
sesh.maxStreamUnitWrite = sesh.MaxFrameSize - HEADER_LEN - sesh.Obfuscator.minOverhead sesh.maxStreamUnitWrite = sesh.MaxFrameSize - HEADER_LEN - sesh.Obfuscator.minOverhead
sbConfig := switchboardConfig{ sbConfig := switchboardConfig{
@ -156,12 +157,11 @@ func (sesh *Session) closeStream(s *Stream, active bool) error {
s.writingM.Lock() s.writingM.Lock()
defer s.writingM.Unlock() defer s.writingM.Unlock()
// Notify remote that this stream is closed // Notify remote that this stream is closed
pad := genRandomPadding()
f := &Frame{ f := &Frame{
StreamID: s.id, StreamID: s.id,
Seq: atomic.AddUint64(&s.nextSendSeq, 1) - 1, Seq: atomic.AddUint64(&s.nextSendSeq, 1) - 1,
Closing: C_STREAM, Closing: C_STREAM,
Payload: pad, Payload: genRandomPadding(),
} }
if s.obfsBuf == nil { if s.obfsBuf == nil {

5
internal/multiplex/stream.go
View File

@ -80,7 +80,11 @@ func (s *Stream) Read(buf []byte) (n int, err error) {
} }
log.Tracef("%v read from stream %v with err %v", n, s.id, err) log.Tracef("%v read from stream %v with err %v", n, s.id, err)
return return
}
func (s *Stream) WriteTo(w io.Writer) (int64, error) {
// will keep writing until the underlying buffer is closed
return s.recvBuf.WriteTo(w)
} }
// Write implements io.Write // Write implements io.Write
@ -91,7 +95,6 @@ func (s *Stream) Write(in []byte) (n int, err error) {
// in the middle of the execution of Write. This may cause the closing frame // in the middle of the execution of Write. This may cause the closing frame
// to be sent before the data frame and cause loss of packet. // to be sent before the data frame and cause loss of packet.
//log.Tracef("attempting to write %v bytes to stream %v",len(in),s.id) //log.Tracef("attempting to write %v bytes to stream %v",len(in),s.id)
// todo: forbid concurrent write
s.writingM.Lock() s.writingM.Lock()
defer s.writingM.Unlock() defer s.writingM.Unlock()
if s.isClosed() { if s.isClosed() {