From 42f380e339664a71718fe86d14822e30c1ee47b8 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Wed, 5 Dec 2018 23:54:54 -0500 Subject: [PATCH] Only copy over A/AAAA records to aggregator --- node-daemon/pvcd/DNSAggregatorInstance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/node-daemon/pvcd/DNSAggregatorInstance.py b/node-daemon/pvcd/DNSAggregatorInstance.py index c752a876..88fbaa9a 100644 --- a/node-daemon/pvcd/DNSAggregatorInstance.py +++ b/node-daemon/pvcd/DNSAggregatorInstance.py @@ -293,7 +293,7 @@ class AXFRDaemonInstance(object): axfr = dns.query.xfr(dnsmasq_ip, domain, lifetime=5.0) z = dns.zone.from_xfr(axfr) records_raw = [z[n].to_text(n) for n in z.nodes.keys()] - except OSError as e: + except Exception as e: print('{} {} ({})'.format(e, dnsmasq_ip, domain)) continue @@ -334,8 +334,8 @@ class AXFRDaemonInstance(object): records_old = list() records_old_ids = list() for record in results: - # Skip the SOA and NS records - if record[3] == 'SOA' or record[3] == 'NS': + # Skip the non-A + if record[3] != 'A' or record[3] != 'AAAA': continue # Assemble a list element in the same format as the AXFR data entry = '{} {} IN {} {}'.format(record[2], record[5], record[3], record[4])