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

6
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(200*1024); err != nil {
return err
}
f.conn = conn
f.isAlive = true

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(200*1024); err != nil {
panic(err)
}
f := NewFlowConn(conn)