diff options
author | cypherpunks <cypherpunks@torproject.org> | 2015-12-16 22:53:19 +0100 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-12-17 08:34:27 -0500 |
commit | 2d2312d98986d65af47d35a89e176b5cf9953533 (patch) | |
tree | 3f404edce6716b5cd13c4303956e603890a3bb09 /src/or/main.c | |
parent | 596f9a4b4cf9211827284905069166972aaf1e3b (diff) | |
download | tor-2d2312d98986d65af47d35a89e176b5cf9953533.tar.gz tor-2d2312d98986d65af47d35a89e176b5cf9953533.zip |
Conform to the type signature of setsockopt(2)
According to the POSIX standard the option value is a pointer to void
and the option length a socklen_t. The Windows implementation makes the
option value be a pointer to character and the option length an int.
Casting the option value to a pointer to void conforms to the POSIX
standard while the implicit cast to a pointer to character conforms to
the Windows implementation.
The casts of the option length to the socklen_t data type conforms to
the POSIX standard. The socklen_t data type is actually an alias of an
int so it also conforms to the Windows implementation.
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 455cba4513..5c65d46263 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -225,11 +225,13 @@ set_buffer_lengths_to_zero(tor_socket_t s) { int zero = 0; int r = 0; - if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, (void*)&zero, sizeof(zero))) { + if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, (void*)&zero, + (socklen_t)sizeof(zero))) { log_warn(LD_NET, "Unable to clear SO_SNDBUF"); r = -1; } - if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, (void*)&zero, sizeof(zero))) { + if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, (void*)&zero, + (socklen_t)sizeof(zero))) { log_warn(LD_NET, "Unable to clear SO_RCVBUF"); r = -1; } |