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 +7 -7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3291eb4a6c - Show all commits

8
tcp/flow.go
View File

@ -112,9 +112,9 @@ func (f *InitiatedFlow) Reconnect() error {
return err
}
if err := conn.SetWriteBuffer(20); err != nil {
return err
}
//if err := conn.SetWriteBuffer(20); err != nil {
// return err
//}
f.conn = conn
f.isAlive = true
@ -209,7 +209,7 @@ func (f *Flow) consumeMarshalled() {
}
func (f *Flow) produceMarshalled() {
buf := bufio.NewReaderSize(f.conn, 100000)
buf := bufio.NewReader(f.conn)
for {
t1 := time.Now()

6
tcp/listener.go
View File

@ -24,9 +24,9 @@ func NewListener(p *proxy.Proxy, local string, v func() proxy.MacVerifier, g fun
panic(err)
}
if err := conn.SetWriteBuffer(20); err != nil {
panic(err)
}
//if err := conn.SetWriteBuffer(20); err != nil {
// panic(err)
//}
f := NewFlowConn(conn)