commit - 140a1abdc7de2af3283c254cf82435384495b1c0
commit + c4d1f652a3b3f399361f2251e88b800363dbbf9d
blob - 3aa80c64cbb3134680538411c0e8903db15b8830
blob + 16ca04f23400935ca54a08f28c7f4483661ea1f0
--- bufio.c
+++ bufio.c
return 0;
case TLS_WANT_POLLIN:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_READ;
+ bio->wantev = BUFIO_WANT_READ;
return (-1);
case TLS_WANT_POLLOUT:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_WRITE;
+ bio->wantev = BUFIO_WANT_WRITE;
return (-1);
default:
return (-1);
{
short ev;
- if (bio->pflags)
- return (bio->pflags);
+ if (bio->wantev)
+ return (bio->wantev);
ev = BUFIO_WANT_READ;
if (bio->wbuf.len != 0)
return (0);
case TLS_WANT_POLLIN:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_READ;
+ bio->wantev = BUFIO_WANT_READ;
return (-1);
case TLS_WANT_POLLOUT:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_WRITE;
+ bio->wantev = BUFIO_WANT_WRITE;
return (-1);
default:
return (-1);
switch (r) {
case TLS_WANT_POLLIN:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_READ;
+ bio->wantev = BUFIO_WANT_READ;
return (-1);
case TLS_WANT_POLLOUT:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_WRITE;
+ bio->wantev = BUFIO_WANT_WRITE;
return (-1);
case -1:
return (-1);
default:
- bio->pflags = 0;
+ bio->wantev = 0;
rbuf->len += r;
return (r);
}
switch (w = tls_write(bio->ctx, wbuf->buf, wbuf->len)) {
case TLS_WANT_POLLIN:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_READ;
+ bio->wantev = BUFIO_WANT_READ;
return (-1);
case TLS_WANT_POLLOUT:
errno = EAGAIN;
- bio->pflags = BUFIO_WANT_WRITE;
+ bio->wantev = BUFIO_WANT_WRITE;
return (-1);
case -1:
return (-1);
default:
- bio->pflags = 0;
+ bio->wantev = 0;
buf_drain(wbuf, w);
return (w);
}
blob - 55fd3c75183051840222265fb44032e0b9265f97
blob + d7e49085b93b3d9e161cb321d90e3cfbfe37f37e
--- bufio.h
+++ bufio.h
struct bufio {
int fd;
struct tls *ctx;
- int pflags; /* poll flags */
+ int wantev;
struct buf wbuf;
struct buf rbuf;
};