upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix link of unbound-dnstap-socket without openssl.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2024-07-23 15:06:54 +02:00
parent 671e11552c
commit 83e6977f06
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dnstap/unbound-dnstap-socket.c
View file

@ -822,7 +822,6 @@ static int reply_with_accept(struct tap_data* data)
{ {
#ifdef USE_DNSTAP #ifdef USE_DNSTAP
/* len includes the escape and framelength */ /* len includes the escape and framelength */
int r;
size_t len = 0; size_t len = 0;
void* acceptframe = fstrm_create_control_frame_accept( void* acceptframe = fstrm_create_control_frame_accept(
DNSTAP_CONTENT_TYPE, &len); DNSTAP_CONTENT_TYPE, &len);
@ -833,6 +832,8 @@ static int reply_with_accept(struct tap_data* data)
fd_set_block(data->fd); fd_set_block(data->fd);
if(data->ssl) { if(data->ssl) {
#ifdef HAVE_SSL
int r;
if((r=SSL_write(data->ssl, acceptframe, len)) <= 0) { if((r=SSL_write(data->ssl, acceptframe, len)) <= 0) {
int r2; int r2;
if((r2=SSL_get_error(data->ssl, r)) == SSL_ERROR_ZERO_RETURN) if((r2=SSL_get_error(data->ssl, r)) == SSL_ERROR_ZERO_RETURN)
@ -843,6 +844,7 @@ static int reply_with_accept(struct tap_data* data)
free(acceptframe); free(acceptframe);
return 0; return 0;
} }
#endif
} else { } else {
if(send(data->fd, acceptframe, len, 0) == -1) { if(send(data->fd, acceptframe, len, 0) == -1) {
log_err("send failed: %s", sock_strerror(errno)); log_err("send failed: %s", sock_strerror(errno));
@ -878,6 +880,7 @@ static int reply_with_finish(struct tap_data* data)
fd_set_block(data->fd); fd_set_block(data->fd);
if(data->ssl) { if(data->ssl) {
#ifdef HAVE_SSL
int r; int r;
if((r=SSL_write(data->ssl, finishframe, len)) <= 0) { if((r=SSL_write(data->ssl, finishframe, len)) <= 0) {
int r2; int r2;
@ -889,6 +892,7 @@ static int reply_with_finish(struct tap_data* data)
free(finishframe); free(finishframe);
return 0; return 0;
} }
#endif
} else { } else {
if(send(data->fd, finishframe, len, 0) == -1) { if(send(data->fd, finishframe, len, 0) == -1) {
log_err("send failed: %s", sock_strerror(errno)); log_err("send failed: %s", sock_strerror(errno));

1
doc/Changelog
View file

@ -10,6 +10,7 @@
- Fix to have empty definition when not supported for weak attribute. - Fix to have empty definition when not supported for weak attribute.
- Fix uninitialized variable warning in create_tcp_accept_sock. - Fix uninitialized variable warning in create_tcp_accept_sock.
- Fix link of dnstap without openssl. - Fix link of dnstap without openssl.
- Fix link of unbound-dnstap-socket without openssl.
19 July 2024: Wouter 19 July 2024: Wouter
- Add dnstap-sample-rate that logs only 1/N messages, for high volume - Add dnstap-sample-rate that logs only 1/N messages, for high volume