github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-09-07 15:56:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "change mux data struct, fix #250"

Browse Source 
This reverts commit ae28d41231.
This commit is contained in:
ffdfgdfg
2019-12-17 15:38:40 +08:00
parent b46e35cf7e
commit 2629078988
4 changed files with 79 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mux/conn.go
View File

@@ -265,7 +265,7 @@ start:
Self.bufQueue.Push(element)
// status check finish, now we can push the element into the queue
if wait == 0 {
Self.mux.sendInfo(common.MUX_MSG_SEND_OK, id, newRemaining)
Self.mux.sendInfo(common.MUX_MSG_SEND_OK, id, Self.maxSize, newRemaining)
// send the remaining window size, not including zero size
}
return nil
@@ -333,7 +333,7 @@ func (Self *ReceiveWindow) sendStatus(id int32, l uint16) {
// now we get the current window status success
if wait == 1 {
//logs.Warn("send the wait status", remaining)
Self.mux.sendInfo(common.MUX_MSG_SEND_OK, id, remaining)
Self.mux.sendInfo(common.MUX_MSG_SEND_OK, id, atomic.LoadUint32(&Self.maxSize), remaining)
}
return
}
@@ -394,7 +394,7 @@ func (Self *SendWindow) SetSendBuf(buf []byte) {
Self.off = 0
}
func (Self *SendWindow) SetSize(newRemaining uint32) (closed bool) {
func (Self *SendWindow) SetSize(windowSize, newRemaining uint32) (closed bool) {
// set the window size from receive window
defer func() {
if recover() != nil {