Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the error of not accumulating nwrite in srs_write_large_iovs #1651

Merged
merged 2 commits into from
Mar 21, 2020
Merged

Fix the error of not accumulating nwrite in srs_write_large_iovs #1651

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f911477
Merge pull request #2 from ossrs/3.0release
lam2003 Mar 19, 2020
bbfb03f
修复srs_write_large_iovs中nwrite未累加的错误
lam2003 Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions trunk/src/protocol/srs_protocol_utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,19 @@ srs_error_t srs_write_large_iovs(ISrsProtocolReadWriter* skt, iovec* iovs, int s
}
return err;
}

// send in multiple times.
int cur_iov = 0;
ssize_t nwrite = 0;
while (cur_iov < size) {
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");
}
cur_iov += cur_count;
if (pnwrite) {
*pnwrite += nwrite;
}
}

return err;
Expand Down