diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-02-11 09:33:51 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-11 09:33:51 -0500 |
| commit | 27f172d9a3f3ec9901439b4823c95788598fa367 (patch) | |
| tree | 8aba9a5c22f6ea659f0c398ebc43e2621fb53bb5 /crypto/bio | |
| parent | 143e5e50f22eaff58e90dd20bdb66eae6ab3b53e (diff) | |
| download | openssl-27f172d9a3f3ec9901439b4823c95788598fa367.tar.gz | |
GH620: second diff from rt-2275, adds error code
clean up and apply patches from RT-2275
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/b_sock.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 3e17bec14a..4ae08d2d84 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -379,8 +379,40 @@ int BIO_socket_nbio(int s, int mode) l = mode; # ifdef FIONBIO + l = mode; + ret = BIO_socket_ioctl(s, FIONBIO, &l); +# elif defined(F_GETFL) && defined(F_SETFL) && (defined(O_NONBLOCK) || defined(FNDELAY)) + /* make sure this call always pushes an error level; BIO_socket_ioctl() does so, so we do too. */ + + l = fcntl(s, F_GETFL, 0); + if (l == -1) { + SYSerr(SYS_F_FCNTL, get_last_rtl_error()); + ret = -1; + } else { +# if defined(O_NONBLOCK) + l &= ~O_NONBLOCK; +# else + l &= ~FNDELAY; /* BSD4.x */ +# endif + if (mode) { +# if defined(O_NONBLOCK) + l |= O_NONBLOCK; +# else + l |= FNDELAY; /* BSD4.x */ +# endif + } + ret = fcntl(s, F_SETFL, l); + + if (ret < 0) { + SYSerr(SYS_F_FCNTL, get_last_rtl_error()); + } + } +# else + /* make sure this call always pushes an error level; BIO_socket_ioctl() does so, so we do too. */ + BIOerr(BIO_F_BIO_SOCKET_NBIO, ERR_R_PASSED_INVALID_ARGUMENT); # endif + return (ret == 0); } |