JakeHillion/dissertation-2-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge develop into master #21

Merged
JakeHillion merged 149 commits from develop into master 2021-05-12 00:22:59 +01:00
Conversation 0 Commits 149 Files Changed 37 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e0bda09f4 - Show all commits

7
tcp/flow.go
View File

@ -1,6 +1,7 @@
package tcp
import (
"bufio"
"encoding/binary"
"fmt"
"io"
@ -208,10 +209,12 @@ func (f *Flow) consumeMarshalled() {
}
func (f *Flow) produceMarshalled() {
buf := bufio.NewReader(f.conn)
for {
t1 := time.Now()
lengthBytes := make([]byte, 4)
if n, err := io.LimitReader(f.conn, 4).Read(lengthBytes); err != nil {
if n, err := io.LimitReader(buf, 4).Read(lengthBytes); err != nil {
f.produceErrors <- err
return
} else if n != 4 {
@ -224,7 +227,7 @@ func (f *Flow) produceMarshalled() {
var read uint32
for read < length {
if n, err := io.LimitReader(f.conn, int64(length-read)).Read(dataBytes[read:]); err != nil {
if n, err := io.LimitReader(buf, int64(length-read)).Read(dataBytes[read:]); err != nil {
f.produceErrors <- err
return
} else {