ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-30 14:14:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Noux: recv* functions override the buffer

Browse Source 
Instead of appending to the buffer it is overriden on
continous calls.

Fixes #325.
This commit is contained in:
Josef Söntgen 2012-08-14 11:02:31 +02:00 committed by Norman Feske
parent ae89f88cfb
commit ba5ec3a29e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/src/lib/libc_noux/plugin.cc
View File

@ -1356,7 +1356,7 @@ namespace {
{ {
Genode::size_t sum_recv_count = 0; Genode::size_t sum_recv_count = 0;
while (len) { while (len > 0) {
Genode::size_t curr_len = Genode::size_t curr_len =
Genode::min(len, sizeof(sysio()->recv_in.buf)); Genode::min(len, sizeof(sysio()->recv_in.buf));
@ -1368,11 +1368,12 @@ namespace {
return -1; return -1;
} }
Genode::memcpy(buf, sysio()->recv_in.buf, sysio()->recv_out.len); Genode::memcpy((char *)buf + sum_recv_count,
sysio()->recv_in.buf, sysio()->recv_out.len);
sum_recv_count += sysio()->recv_out.len; sum_recv_count += sysio()->recv_out.len;
if (sysio()->recv_out.len < sysio()->recv_in.len) if (sysio()->recv_out.len < curr_len)
break; break;
if (sysio()->recv_out.len <= len) if (sysio()->recv_out.len <= len)
@ -1390,8 +1391,7 @@ namespace {
{ {
Genode::size_t sum_recvfrom_count = 0; Genode::size_t sum_recvfrom_count = 0;
while (len > 0) {
while (len) {
Genode::size_t curr_len = Genode::min(len, sizeof(sysio()->recvfrom_in.buf)); Genode::size_t curr_len = Genode::min(len, sizeof(sysio()->recvfrom_in.buf));
sysio()->recv_in.fd = noux_fd(fd->context); sysio()->recv_in.fd = noux_fd(fd->context);
@ -1412,11 +1412,12 @@ namespace {
sysio()->recvfrom_in.addrlen); sysio()->recvfrom_in.addrlen);
Genode::memcpy(buf, sysio()->recvfrom_in.buf, sysio()->recvfrom_out.len); Genode::memcpy((char *)buf + sum_recvfrom_count,
sysio()->recvfrom_in.buf, sysio()->recvfrom_out.len);
sum_recvfrom_count += sysio()->recvfrom_out.len; sum_recvfrom_count += sysio()->recvfrom_out.len;
if (sysio()->recvfrom_out.len < sysio()->recvfrom_in.len) if (sysio()->recvfrom_out.len < curr_len)
break; break;
if (sysio()->recvfrom_out.len <= len) if (sysio()->recvfrom_out.len <= len)