btest/dns_mgr: Update run-dnsmasq, use --host-record

Using dnsmasq --address covers an entire domain, so dns.example.com
AAAA queries would also return IPv6 addresses for example.com

Instead, this was always meant to use host entries.
This commit is contained in:
Arne Welzel 2025-03-05 12:35:17 +01:00
parent 3595f50f16
commit 7eec3859fa
3 changed files with 15 additions and 11 deletions

View file

@ -1,3 +1,8 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
lookup_hostname addrs, 0 lookup_hostname addrs, 5
10.0.0.3
10.0.0.2
10.0.0.1
fe80::6990:df6e:618:c096
10.0.0.4
lookup_hostname_txt, 15, www.example.com lookup_hostname_txt, 15, www.example.com

View file

@ -13,8 +13,8 @@ redef exit_only_after_terminate = T;
event zeek_init() event zeek_init()
{ {
# www.example.com is a CNAME for example.com and this # www.example.com is a CNAME for example.com, we get all
# results in nothing :-/ # addresses of example.com
when ( local addrs = lookup_hostname("www.example.com") ) when ( local addrs = lookup_hostname("www.example.com") )
{ {
print "lookup_hostname addrs", |addrs|; print "lookup_hostname addrs", |addrs|;

View file

@ -19,14 +19,13 @@ exec dnsmasq \
--no-daemon \ --no-daemon \
--listen-addr="${listen_addr}" \ --listen-addr="${listen_addr}" \
--port="${listen_port}" \ --port="${listen_port}" \
--address /example.com/10.0.0.1 \ --host-record=example.com,10.0.0.1 \
--address /example.com/10.0.0.2 \ --host-record=example.com,10.0.0.2 \
--address /example.com/10.0.0.3 \ --host-record=example.com,10.0.0.3 \
--address /example.com/10.0.0.4 \ --host-record=example.com,10.0.0.4 \
--address /example.com/10.0.0.4 \ --host-record=example.com,fe80::6990:df6e:618:c096 \
--address /example.com/fe80::6990:df6e:618:c096 \ --host-record=mx.example.com,10.0.0.99 \
--address /mx.example.com/10.0.0.99 \ --host-record=dns.example.com,10.0.0.99 \
--address /dns.example.com/10.0.0.99 \
--ptr-record=99.0.0.10.in-addr.arpa,mx.example.com \ --ptr-record=99.0.0.10.in-addr.arpa,mx.example.com \
--ptr-record=99.0.0.10.in-addr.arpa,dns.example.com \ --ptr-record=99.0.0.10.in-addr.arpa,dns.example.com \
--txt-record=example.com,network-monitor,open-source,zeek \ --txt-record=example.com,network-monitor,open-source,zeek \