From a9e8cd6738a781d27fa663d9706f64f948f2ced0 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Tue, 9 Aug 2016 12:25:11 +0300 Subject: [PATCH] test/ssl: use send()/recv()/EVUTIL_ERR_RW_RETRIABLE()/EVUTIL_SOCKET_ERROR() to fix win32 Fixes: https://ci.appveyor.com/project/azat/libevent/build/2.1.5.107/job/k70our1xdp0ym4dm#L1906 Fixes: ssl/bufferevent_connect_sleep --- test/regress_ssl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/regress_ssl.c b/test/regress_ssl.c index a415952a..a476980b 100644 --- a/test/regress_ssl.c +++ b/test/regress_ssl.c @@ -46,6 +46,7 @@ #include "event2/bufferevent_struct.h" #include "event2/buffer.h" #include "event2/listener.h" +#include "util-internal.h" #include "regress.h" #include "tinytest.h" @@ -555,9 +556,9 @@ static int bio_rwcount_read(BIO *b, char *out, int outlen) { struct rwcount *rw = b->ptr; - ev_ssize_t ret = read(rw->fd, out, outlen); + ev_ssize_t ret = recv(rw->fd, out, outlen, 0); ++rw->read; - if (ret == -1 && errno == EAGAIN) { + if (ret == -1 && EVUTIL_ERR_RW_RETRIABLE(EVUTIL_SOCKET_ERROR())) { BIO_set_retry_read(b); } return ret; @@ -567,9 +568,9 @@ bio_rwcount_write(BIO *b, const char *in, int inlen) { struct rwcount *rw = b->ptr; - ev_ssize_t ret = write(rw->fd, in, inlen); + ev_ssize_t ret = send(rw->fd, in, inlen, 0); ++rw->write; - if (ret == -1 && errno == EAGAIN) { + if (ret == -1 && EVUTIL_ERR_RW_RETRIABLE(EVUTIL_SOCKET_ERROR())) { BIO_set_retry_write(b); } return ret; -- 2.50.1