diff options
| author | Jeremy Allison <jra@samba.org> | 2010-12-14 15:30:06 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-12-15 01:38:16 +0100 |
| commit | e071fd711dee0a5b03df53979b355f2e5a2e58b0 (patch) | |
| tree | af8ab457e5ac5956b0a9a884438f8cfb2d9d209a /source3/lib/sendfile.c | |
| parent | 14c70346fc88d05dfabc14b0a932632470fee6fe (diff) | |
| download | samba-e071fd711dee0a5b03df53979b355f2e5a2e58b0.tar.gz samba-e071fd711dee0a5b03df53979b355f2e5a2e58b0.tar.bz2 samba-e071fd711dee0a5b03df53979b355f2e5a2e58b0.zip | |
Fix read/write calls over sockets to cope with EAGAIN/EWOULDBLOCK for non-blocking sockets.
Diffstat (limited to 'source3/lib/sendfile.c')
| -rw-r--r-- | source3/lib/sendfile.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/source3/lib/sendfile.c b/source3/lib/sendfile.c index 3003246dd0..c2099bc8b1 100644 --- a/source3/lib/sendfile.c +++ b/source3/lib/sendfile.c @@ -63,7 +63,11 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of #else nwritten = sendfile(tofd, fromfd, &offset, total); #endif - } while (nwritten == -1 && errno == EINTR); +#if defined(EWOULDBLOCK) + } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)); +#else + } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN)); +#endif if (nwritten == -1) { if (errno == ENOSYS || errno == EINVAL) { /* Ok - we're in a world of pain here. We just sent @@ -145,7 +149,11 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of int32 nwritten; do { nwritten = sendfile(tofd, fromfd, &small_offset, small_total); - } while (nwritten == -1 && errno == EINTR); +#if defined(EWOULDBLOCK) + } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)); +#else + } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN)); +#endif if (nwritten == -1) { if (errno == ENOSYS || errno == EINVAL) { /* Ok - we're in a world of pain here. We just sent @@ -226,7 +234,11 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of #else nwritten = sendfilev(tofd, vec, sfvcnt, &xferred); #endif - if (nwritten == -1 && errno == EINTR) { +#if defined(EWOULDBLOCK) + if (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)) { +#else + if (nwritten == -1 && (errno == EINTR || errno == EAGAIN)) { +#endif if (xferred == 0) continue; /* Nothing written yet. */ else @@ -300,7 +312,11 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of #else nwritten = sendfile(tofd, fromfd, offset, total, &hdtrl[0], 0); #endif - } while (nwritten == -1 && errno == EINTR); +#if defined(EWOULDBLOCK) + } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)); +#else + } while (nwritten == -1 && (errno == EINTR || errno == EAGAIN)); +#endif if (nwritten == -1) return -1; if (nwritten == 0) @@ -371,7 +387,11 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of do { ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0); - } while (ret == -1 && errno == EINTR); +#if defined(EWOULDBLOCK) + } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)); +#else + } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); +#endif if (ret == -1) return -1; @@ -449,7 +469,11 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of */ do { ret = send_file(&tofd, &hdtrl, 0); - } while ( (ret == 1) || (ret == -1 && errno == EINTR) ); +#if defined(EWOULDBLOCK) + } while ((ret == 1) || (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK))); +#else + } while ((ret == 1) || (ret == -1 && (errno == EINTR || errno == EAGAIN))); +#endif if ( ret == -1 ) return -1; } |