falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slirp: Handle error returns from slirp_send() in sosendoob() 

The code in sosendoob() assumes that slirp_send() always
succeeds, but it might return an OS error code (for instance
if the other end has disconnected). Catch these and return
the caller either -1 on error or the number of urgent bytes
actually written. (None of the callers check this return
value currently, though.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Peter Maydell 2017-06-05 17:19:35 +01:00 committed by Samuel Thibault
parent 12dccfe4f5
commit 0b466065eb
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
slirp/socket.c
View File

@ -345,34 +345,41 @@ sosendoob(struct socket *so)
if (sb->sb_rptr < sb->sb_wptr) { if (sb->sb_rptr < sb->sb_wptr) {
/* We can send it directly */ /* We can send it directly */
n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */ n = slirp_send(so, sb->sb_rptr, so->so_urgc, (MSG_OOB)); /* |MSG_DONTWAIT)); */
so->so_urgc -= n;
DEBUG_MISC((dfd, " --- sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc));
} else { } else {
/* /*
* Since there's no sendv or sendtov like writev, * Since there's no sendv or sendtov like writev,
* we must copy all data to a linear buffer then * we must copy all data to a linear buffer then
* send it all * send it all
*/ */
uint32_t urgc = so->so_urgc;
len = (sb->sb_data + sb->sb_datalen) - sb->sb_rptr; len = (sb->sb_data + sb->sb_datalen) - sb->sb_rptr;
if (len > so->so_urgc) len = so->so_urgc; if (len > urgc) {
len = urgc;
}
memcpy(buff, sb->sb_rptr, len); memcpy(buff, sb->sb_rptr, len);
so->so_urgc -= len; urgc -= len;
if (so->so_urgc) { if (urgc) {
n = sb->sb_wptr - sb->sb_data; n = sb->sb_wptr - sb->sb_data;
if (n > so->so_urgc) n = so->so_urgc; if (n > urgc) {
n = urgc;
}
memcpy((buff + len), sb->sb_data, n); memcpy((buff + len), sb->sb_data, n);
so->so_urgc -= n;
len += n; len += n;
} }
n = slirp_send(so, buff, len, (MSG_OOB)); /* |MSG_DONTWAIT)); */ n = slirp_send(so, buff, len, (MSG_OOB)); /* |MSG_DONTWAIT)); */
#ifdef DEBUG
if (n != len)
DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n"));
#endif
DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc));
} }
#ifdef DEBUG
if (n != len) {
DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n"));
}
#endif
if (n < 0) {
return n;
}
so->so_urgc -= n;
DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc));
sb->sb_cc -= n; sb->sb_cc -= n;
sb->sb_rptr += n; sb->sb_rptr += n;
if (sb->sb_rptr >= (sb->sb_data + sb->sb_datalen)) if (sb->sb_rptr >= (sb->sb_data + sb->sb_datalen))