From: Wouter Wijngaards Date: Tue, 16 Apr 2019 12:53:50 +0000 (+0000) Subject: - Better braces in if statement in TCP fastopen code. X-Git-Tag: final-svn-state~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2552a81b40ed5819bb400075437f4dd3c793f6d6;p=thirdparty%2Funbound.git - Better braces in if statement in TCP fastopen code. git-svn-id: file:///svn/unbound/trunk@5160 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 1083408dd..95646243b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +16 April 2019: Wouter + - Better braces in if statement in TCP fastopen code. + 15 April 2019: Wouter - Fix tls write event for read state change to re-call SSL_write and not resume the TLS handshake. diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index e74d1abcf..b73a0cc95 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -851,13 +851,16 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, #ifdef ENOPROTOOPT /* squelch ENOPROTOOPT: freebsd server mode with kernel support disabled, except when verbosity enabled for debugging */ - if(errno != ENOPROTOOPT || verbosity >= 3) + if(errno != ENOPROTOOPT || verbosity >= 3) { #endif if(errno == EPERM) { log_warn("Setting TCP Fast Open as server failed: %s ; this could likely be because sysctl net.inet.tcp.fastopen.enabled, net.inet.tcp.fastopen.server_enable, or net.ipv4.tcp_fastopen is disabled", strerror(errno)); } else { log_err("Setting TCP Fast Open as server failed: %s", strerror(errno)); } +#ifdef ENOPROTOOPT + } +#endif } #endif return s;