mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-29 22:55:52 +08:00
修复rtmp汇报窗口太小导致循环递归的bug:#1839
This commit is contained in:
parent
9ea98642c1
commit
7d8b212a3c
@ -751,7 +751,8 @@ void RtmpProtocol::handle_chunk(RtmpPacket::Ptr packet) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case MSG_WIN_SIZE: {
|
case MSG_WIN_SIZE: {
|
||||||
_windows_size = load_be32(&chunk_data.buffer[0]);
|
//如果窗口太小,会导致发送sendAcknowledgement时无限递归:https://github.com/ZLMediaKit/ZLMediaKit/issues/1839
|
||||||
|
_windows_size = std::max(load_be32(&chunk_data.buffer[0]), 32 * 1024U);
|
||||||
TraceL << "MSG_WIN_SIZE:" << _windows_size;
|
TraceL << "MSG_WIN_SIZE:" << _windows_size;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -759,7 +760,7 @@ void RtmpProtocol::handle_chunk(RtmpPacket::Ptr packet) {
|
|||||||
case MSG_SET_PEER_BW: {
|
case MSG_SET_PEER_BW: {
|
||||||
_bandwidth = load_be32(&chunk_data.buffer[0]);
|
_bandwidth = load_be32(&chunk_data.buffer[0]);
|
||||||
_band_limit_type = chunk_data.buffer[4];
|
_band_limit_type = chunk_data.buffer[4];
|
||||||
TraceL << "MSG_SET_PEER_BW:" << _windows_size;
|
TraceL << "MSG_SET_PEER_BW:" << _bandwidth << " " << (int)_band_limit_type;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user