#664: libunbound examples: produce sorted output.

git-svn-id: file:///svn/unbound/trunk@3401 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2015-04-16 14:37:12 +00:00
parent 9e6fa9f687
commit f5442e9c5b
10 changed files with 19 additions and 18 deletions

View file

@ -5,6 +5,7 @@
prefetch stay in the cache. prefetch stay in the cache.
- Fix bug#664: libunbound python3 related fixes (from Tomas Hozza) - Fix bug#664: libunbound python3 related fixes (from Tomas Hozza)
Use print_function also for Python2. Use print_function also for Python2.
libunbound examples: produce sorted output.
10 April 2015: Wouter 10 April 2015: Wouter
- unbound-control ratelimit_list lists high rate domains. - unbound-control ratelimit_list lists high rate domains.

View file

@ -40,9 +40,9 @@ ctx = unbound.ub_ctx()
ctx.resolvconf("/etc/resolv.conf") ctx.resolvconf("/etc/resolv.conf")
def call_back(my_data,status,result): def call_back(my_data,status,result):
print("Call_back:", my_data) print("Call_back:", sorted(my_data))
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:", result.data.address_list) print("Result:", sorted(result.data.address_list))
my_data['done_flag'] = True my_data['done_flag'] = True

View file

@ -40,6 +40,6 @@ ctx.resolvconf("/etc/resolv.conf")
status, result = ctx.resolve("www.nic.cz", unbound.RR_TYPE_A, unbound.RR_CLASS_IN) status, result = ctx.resolve("www.nic.cz", unbound.RR_TYPE_A, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:", result.data.address_list) print("Result:", sorted(result.data.address_list))
elif status != 0: elif status != 0:
print("Error:", unbound.ub_strerror(status)) print("Error:", unbound.ub_strerror(status))

View file

@ -49,7 +49,7 @@ if os.path.isfile("keys"):
status, result = ctx.resolve("www.nic.cz", RR_TYPE_A, RR_CLASS_IN) status, result = ctx.resolve("www.nic.cz", RR_TYPE_A, RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:", result.data.address_list) print("Result:", sorted(result.data.address_list))
if result.secure: if result.secure:
print("Result is secure") print("Result is secure")

View file

@ -13,16 +13,16 @@ def dnssecParse(domain, rrType=RR_TYPE_A):
raise RuntimeError("Error parsing DNS packet") raise RuntimeError("Error parsing DNS packet")
rrsigs = pkt.rr_list_by_type(RR_TYPE_RRSIG, ldns.LDNS_SECTION_ANSWER) rrsigs = pkt.rr_list_by_type(RR_TYPE_RRSIG, ldns.LDNS_SECTION_ANSWER)
print("RRSIGs from answer:", rrsigs) print("RRSIGs from answer:", sorted(rrsigs))
rrsigs = pkt.rr_list_by_type(RR_TYPE_RRSIG, ldns.LDNS_SECTION_AUTHORITY) rrsigs = pkt.rr_list_by_type(RR_TYPE_RRSIG, ldns.LDNS_SECTION_AUTHORITY)
print("RRSIGs from authority:", rrsigs) print("RRSIGs from authority:", sorted(rrsigs))
nsecs = pkt.rr_list_by_type(RR_TYPE_NSEC, ldns.LDNS_SECTION_AUTHORITY) nsecs = pkt.rr_list_by_type(RR_TYPE_NSEC, ldns.LDNS_SECTION_AUTHORITY)
print("NSECs:", nsecs) print("NSECs:", sorted(nsecs))
nsec3s = pkt.rr_list_by_type(RR_TYPE_NSEC3, ldns.LDNS_SECTION_AUTHORITY) nsec3s = pkt.rr_list_by_type(RR_TYPE_NSEC3, ldns.LDNS_SECTION_AUTHORITY)
print("NSEC3s:", nsec3s) print("NSEC3s:", sorted(nsec3s))
print("---") print("---")

View file

@ -43,20 +43,20 @@ status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_MX, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.mx_list: for k in sorted(result.data.mx_list):
print(" priority:%d address:%s" % k) print(" priority:%d address:%s" % k)
status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_A, unbound.RR_CLASS_IN) status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_A, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.address_list: for k in sorted(result.data.address_list):
print(" address:%s" % k) print(" address:%s" % k)
status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_NS, unbound.RR_CLASS_IN) status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_NS, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.domain_list: for k in sorted(result.data.domain_list):
print(" host: %s" % k) print(" host: %s" % k)

View file

@ -46,18 +46,18 @@ status, result = ctx.resolve(u"www.háčkyčárky.cz", unbound.RR_TYPE_A, unboun
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.address_list: for k in sorted(result.data.address_list):
print(" address:%s" % k) print(" address:%s" % k)
status, result = ctx.resolve(u"háčkyčárky.cz", unbound.RR_TYPE_MX, unbound.RR_CLASS_IN) status, result = ctx.resolve(u"háčkyčárky.cz", unbound.RR_TYPE_MX, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.mx_list_idn: for k in sorted(result.data.mx_list_idn):
print(" priority:%d address:%s" % k) print(" priority:%d address:%s" % k)
status, result = ctx.resolve(unbound.reverse('217.31.204.66')+'.in-addr.arpa', unbound.RR_TYPE_PTR, unbound.RR_CLASS_IN) status, result = ctx.resolve(unbound.reverse('217.31.204.66')+'.in-addr.arpa', unbound.RR_TYPE_PTR, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result.data:", result.data) print("Result.data:", result.data)
for k in result.data.domain_list_idn: for k in sorted(result.data.domain_list_idn):
print(" dname:%s" % k) print(" dname:%s" % k)

View file

@ -43,12 +43,12 @@ status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_MX, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.mx_list: for k in sorted(result.data.mx_list):
print(" priority:%d address:%s" % k) print(" priority:%d address:%s" % k)
status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_A, unbound.RR_CLASS_IN) status, result = ctx.resolve("nic.cz", unbound.RR_TYPE_A, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.address_list: for k in sorted(result.data.address_list):
print(" address:%s" % k) print(" address:%s" % k)

View file

@ -43,6 +43,6 @@ status, result = ctx.resolve("vutbr.cz", unbound.RR_TYPE_NS, unbound.RR_CLASS_IN
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result:") print("Result:")
print(" raw data:", result.data) print(" raw data:", result.data)
for k in result.data.domain_list: for k in sorted(result.data.domain_list):
print(" host: %s" % k) print(" host: %s" % k)

View file

@ -40,5 +40,5 @@ ctx.resolvconf("/etc/resolv.conf")
status, result = ctx.resolve(unbound.reverse("74.125.43.147") + ".in-addr.arpa.", unbound.RR_TYPE_PTR, unbound.RR_CLASS_IN) status, result = ctx.resolve(unbound.reverse("74.125.43.147") + ".in-addr.arpa.", unbound.RR_TYPE_PTR, unbound.RR_CLASS_IN)
if status == 0 and result.havedata: if status == 0 and result.havedata:
print("Result.data:", result.data, result.data.domain_list) print("Result.data:", result.data, sorted(result.data.domain_list))