external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine code for bug #194, use send messages for all msg array.

Browse source
This commit is contained in:
winlin 2014-11-14 11:24:49 +08:00
parent f11272e3ce
commit 47ed9e33dd
8 changed files with 38 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
trunk/src/app/srs_app_edge.cpp
View file

@ -499,7 +499,7 @@ int SrsEdgeForwarder::cycle()
// forward all messages.
int count = 0;
if ((ret = queue->dump_packets(msgs.size, msgs.msgs, count)) != ERROR_SUCCESS) {
if ((ret = queue->dump_packets(msgs.max, msgs.msgs, count)) != ERROR_SUCCESS) {
srs_error("get message to push to origin failed. ret=%d", ret);
return ret;
}
@ -523,18 +523,9 @@ int SrsEdgeForwarder::cycle()
}
// all msgs to forward to origin.
// @remark, becareful, all msgs must be free explicitly,
// free by send_and_free_message or srs_freep.
for (int i = 0; i < count; i++) {
SrsMessage* msg = msgs.msgs[i];
srs_assert(msg);
msgs.msgs[i] = NULL;
if ((ret = client->send_and_free_message(msg, stream_id)) != ERROR_SUCCESS) {
srs_error("edge publish push message to server failed. ret=%d", ret);
return ret;
}
if ((ret = client->send_and_free_messages(msgs.msgs, count, stream_id)) != ERROR_SUCCESS) {
srs_error("edge publish push message to server failed. ret=%d", ret);
return ret;
}
}