mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Merge branch '3309-fix-destination-port-extraction-for-client-queries' into 'main'

Browse Source 
Fix destination port extraction for client queries

Closes #3309

See merge request isc-projects/bind9!6191
This commit is contained in:
Michał Kępień
2022-06-22 11:46:25 +00:00
parent 58102aff42 58c3513fa6
commit 77d89c0dc5
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
5909. [bug] The server-side destination port was missing from dnstap
captures of client traffic. [GL #3309]
5908. [bug] Fix race conditions in route_connected(). [GL #3401] 5908. [bug] Fix race conditions in route_connected(). [GL #3401]
5907. [bug] Fix a crash in dig NS search mode when one of the NS 5907. [bug] Fix a crash in dig NS search mode when one of the NS

6
bin/tests/system/dnstap/tests.sh
View File

@@ -518,6 +518,12 @@ ret=0
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
echo_i "checking whether destination UDP port is logged for client queries"
ret=0
$DNSTAPREAD ns3/dnstap.out.save | grep -Eq "CQ [0-9:.]+ -> 10.53.0.3:${PORT} UDP" || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
HAS_PYYAML=0 HAS_PYYAML=0
if [ -x "$PYTHON" ] ; then if [ -x "$PYTHON" ] ; then
$PYTHON -c "import yaml" 2> /dev/null && HAS_PYYAML=1 $PYTHON -c "import yaml" 2> /dev/null && HAS_PYYAML=1

7
lib/ns/client.c
View File

@@ -1706,7 +1706,6 @@ ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult,
bool notimp; bool notimp;
size_t reqsize; size_t reqsize;
dns_aclenv_t *env = NULL; dns_aclenv_t *env = NULL;
isc_sockaddr_t sockaddr;
#ifdef HAVE_DNSTAP #ifdef HAVE_DNSTAP
dns_dtmsgtype_t dtmsgtype; dns_dtmsgtype_t dtmsgtype;
#endif /* ifdef HAVE_DNSTAP */ #endif /* ifdef HAVE_DNSTAP */
@@ -2005,10 +2004,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult,
return; return;
} }
sockaddr = isc_nmhandle_localaddr(handle); client->destsockaddr = isc_nmhandle_localaddr(handle);
isc_netaddr_fromsockaddr(&client->destaddr, &sockaddr); isc_netaddr_fromsockaddr(&client->destaddr, &client->destsockaddr);
isc_sockaddr_fromnetaddr(&client->destsockaddr, &client->destaddr, 0);
result = client->manager->sctx->matchingview( result = client->manager->sctx->matchingview(
&netaddr, &client->destaddr, client->message, env, &sigresult, &netaddr, &client->destaddr, client->message, env, &sigresult,