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

- Fix dnstap that assertion failed on logging other than UDP and TCP

Browse source 
traffic. It lists it as TCP traffic.
This commit is contained in:
W.C.A. Wijngaards 2023-12-05 13:14:08 +01:00
parent 3d1bc143af
commit d8bd9845cc
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dnstap/dnstap.c
View file

@ -371,7 +371,6 @@ dt_msg_fill_net(struct dt_msg *dm,
*has_rport = 1; *has_rport = 1;
} }
log_assert(cptype == comm_udp || cptype == comm_tcp);
if (cptype == comm_udp) { if (cptype == comm_udp) {
/* socket_protocol */ /* socket_protocol */
dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__UDP; dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__UDP;
@ -380,6 +379,10 @@ dt_msg_fill_net(struct dt_msg *dm,
/* socket_protocol */ /* socket_protocol */
dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__TCP; dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__TCP;
dm->m.has_socket_protocol = 1; dm->m.has_socket_protocol = 1;
} else {
/* other socket protocol */
dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__TCP;
dm->m.has_socket_protocol = 1;
} }
} }
@ -410,7 +413,6 @@ dt_msg_send_client_query(struct dt_env *env,
dt_fill_buffer(qmsg, &dm.m.query_message, &dm.m.has_query_message); dt_fill_buffer(qmsg, &dm.m.query_message, &dm.m.has_query_message);
/* socket_family, socket_protocol, query_address, query_port, response_address, response_port */ /* socket_family, socket_protocol, query_address, query_port, response_address, response_port */
log_assert(cptype == comm_udp || cptype == comm_tcp);
dt_msg_fill_net(&dm, qsock, rsock, cptype, dt_msg_fill_net(&dm, qsock, rsock, cptype,
&dm.m.query_address, &dm.m.has_query_address, &dm.m.query_address, &dm.m.has_query_address,
&dm.m.query_port, &dm.m.has_query_port, &dm.m.query_port, &dm.m.has_query_port,
@ -446,7 +448,6 @@ dt_msg_send_client_response(struct dt_env *env,
dt_fill_buffer(rmsg, &dm.m.response_message, &dm.m.has_response_message); dt_fill_buffer(rmsg, &dm.m.response_message, &dm.m.has_response_message);
/* socket_family, socket_protocol, query_address, query_port, response_address, response_port */ /* socket_family, socket_protocol, query_address, query_port, response_address, response_port */
log_assert(cptype == comm_udp || cptype == comm_tcp);
dt_msg_fill_net(&dm, qsock, rsock, cptype, dt_msg_fill_net(&dm, qsock, rsock, cptype,
&dm.m.query_address, &dm.m.has_query_address, &dm.m.query_address, &dm.m.has_query_address,
&dm.m.query_port, &dm.m.has_query_port, &dm.m.query_port, &dm.m.has_query_port,
@ -497,7 +498,6 @@ dt_msg_send_outside_query(struct dt_env *env,
dt_fill_buffer(qmsg, &dm.m.query_message, &dm.m.has_query_message); dt_fill_buffer(qmsg, &dm.m.query_message, &dm.m.has_query_message);
/* socket_family, socket_protocol, response_address, response_port, query_address, query_port */ /* socket_family, socket_protocol, response_address, response_port, query_address, query_port */
log_assert(cptype == comm_udp || cptype == comm_tcp);
dt_msg_fill_net(&dm, rsock, qsock, cptype, dt_msg_fill_net(&dm, rsock, qsock, cptype,
&dm.m.response_address, &dm.m.has_response_address, &dm.m.response_address, &dm.m.has_response_address,
&dm.m.response_port, &dm.m.has_response_port, &dm.m.response_port, &dm.m.has_response_port,
@ -556,7 +556,6 @@ dt_msg_send_outside_response(struct dt_env *env,
dt_fill_buffer(rmsg, &dm.m.response_message, &dm.m.has_response_message); dt_fill_buffer(rmsg, &dm.m.response_message, &dm.m.has_response_message);
/* socket_family, socket_protocol, response_address, response_port, query_address, query_port */ /* socket_family, socket_protocol, response_address, response_port, query_address, query_port */
log_assert(cptype == comm_udp || cptype == comm_tcp);
dt_msg_fill_net(&dm, rsock, qsock, cptype, dt_msg_fill_net(&dm, rsock, qsock, cptype,
&dm.m.response_address, &dm.m.has_response_address, &dm.m.response_address, &dm.m.has_response_address,
&dm.m.response_port, &dm.m.has_response_port, &dm.m.response_port, &dm.m.has_response_port,

2
doc/Changelog
View file

@ -1,6 +1,8 @@
5 December 2023: Wouter 5 December 2023: Wouter
- Merge #971: fix 'WARNING: Message has 41 extra bytes at end'. - Merge #971: fix 'WARNING: Message has 41 extra bytes at end'.
- Fix #969: [FR] distinguish Do53, DoT and DoH in the logs. - Fix #969: [FR] distinguish Do53, DoT and DoH in the logs.
- Fix dnstap that assertion failed on logging other than UDP and TCP
traffic. It lists it as TCP traffic.
27 November 2023: Yorgos 27 November 2023: Yorgos
- Merge #968: Replace the obsolescent fgrep with grep -F in tests. - Merge #968: Replace the obsolescent fgrep with grep -F in tests.