external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 12:21:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1651 from lam2003/3.0release

Browse source 
修复srs_write_large_iovs中nwrite未累加的错误
This commit is contained in:
winlin 2020-03-21 19:44:37 +08:00 committed by GitHub
commit 355f351435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/protocol/srs_protocol_utility.cpp
View file

@ -342,15 +342,19 @@ srs_error_t srs_write_large_iovs(ISrsProtocolReadWriter* skt, iovec* iovs, int s
} }
return err; return err;
} }
// send in multiple times. // send in multiple times.
int cur_iov = 0; int cur_iov = 0;
ssize_t nwrite = 0;
while (cur_iov < size) { while (cur_iov < size) {
int cur_count = srs_min(limits, size - cur_iov); int cur_count = srs_min(limits, size - cur_iov);
if ((err = skt->writev(iovs + cur_iov, cur_count, pnwrite)) != srs_success) { if ((err = skt->writev(iovs + cur_iov, cur_count, &nwrite)) != srs_success) {
return srs_error_wrap(err, "writev"); return srs_error_wrap(err, "writev");
} }
cur_iov += cur_count; cur_iov += cur_count;
if (pnwrite) {
*pnwrite += nwrite;
}
} }
return err; return err;