diff options
| author | bcook <> | 2014-11-26 05:37:26 +0000 |
|---|---|---|
| committer | bcook <> | 2014-11-26 05:37:26 +0000 |
| commit | 08cb5a5c87ab0fa71b2159d65417cfc7c2213ee2 (patch) | |
| tree | 8ebf5889029291163b28d7005ec9d9fbaaf4ae5b /src/lib/libssl/src/crypto/bio/b_sock.c | |
| parent | 0cbd89ae146a2a04009a43dcf0b4e1c7fd1e32ba (diff) | |
| download | openbsd-08cb5a5c87ab0fa71b2159d65417cfc7c2213ee2.tar.gz openbsd-08cb5a5c87ab0fa71b2159d65417cfc7c2213ee2.tar.bz2 openbsd-08cb5a5c87ab0fa71b2159d65417cfc7c2213ee2.zip | |
normalize set/getsockopt usage.
Remove the remaining random casts on optval. Fixups for this can be handled by
the portability layer all in once place.
Remove remaining fake socklen_t unions, though beck@ points out that this also
removes support for socklen_t changing its length at runtime. RIP.
ok tedu@ beck@ miod@ deraadt@
Diffstat (limited to 'src/lib/libssl/src/crypto/bio/b_sock.c')
| -rw-r--r-- | src/lib/libssl/src/crypto/bio/b_sock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index 34e5d9830e..8f3c58fda2 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: b_sock.c,v 1.58 2014/10/13 02:49:53 bcook Exp $ */ | 1 | /* $OpenBSD: b_sock.c,v 1.59 2014/11/26 05:37:26 bcook Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -318,8 +318,7 @@ again: | |||
| 318 | if (bind_mode == BIO_BIND_REUSEADDR) { | 318 | if (bind_mode == BIO_BIND_REUSEADDR) { |
| 319 | int i = 1; | 319 | int i = 1; |
| 320 | 320 | ||
| 321 | ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&i, | 321 | ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); |
| 322 | sizeof(i)); | ||
| 323 | bind_mode = BIO_BIND_NORMAL; | 322 | bind_mode = BIO_BIND_NORMAL; |
| 324 | } | 323 | } |
| 325 | if (bind(s, &server.sa, addrlen) == -1) { | 324 | if (bind(s, &server.sa, addrlen) == -1) { |
