nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use errno directly if we are not reading/writing from/to a socket.

Browse Source 
See: https://bugs.torproject.org/28179
This commit is contained in:
Alexander Færøy 2018-12-12 18:48:45 +01:00 committed by Nick Mathewson
parent cacdd29087
commit 0d796cce17
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/net/buffers_net.c
View File

@ -51,7 +51,8 @@ read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most,
read_result = read(fd, CHUNK_WRITE_PTR(chunk), at_most);
if (read_result < 0) {
int e = tor_socket_errno(fd);
int e = is_socket ? tor_socket_errno(fd) : errno;
if (!ERRNO_IS_EAGAIN(e)) { /* it's a real error */
#ifdef _WIN32
if (e == WSAENOBUFS)
@ -152,7 +153,8 @@ flush_chunk(tor_socket_t fd, buf_t *buf, chunk_t *chunk, size_t sz,
write_result = write(fd, chunk->data, sz);
if (write_result < 0) {
int e = tor_socket_errno(fd);
int e = is_socket ? tor_socket_errno(fd) : errno;
if (!ERRNO_IS_EAGAIN(e)) { /* it's a real error */
#ifdef _WIN32
if (e == WSAENOBUFS)