Finished removing leading GETDNS_ from constants

Author: MelindaShore

examples/async-get-ip.py

@@ -26,12 +26,12 @@
 def cbk(type, result, userarg, tid):
     if type == getdns.CALLBACK_COMPLETE:
         status = result.status
-        if status == getdns.GETDNS_RESPSTATUS_GOOD:
+        if status == getdns.RESPSTATUS_GOOD:
             for addr in result.just_address_answers:
                 addr_type = addr['address_type']
                 addr_data = addr['address_data']
                 print '{0}: {1} {2}'.format(userarg, addr_type, addr_data)
-        elif status == getdns.GETDNS_RESPSTATUS_NO_SECURE_ANSWERS:
+        elif status == getdns.RESPSTATUS_NO_SECURE_ANSWERS:
             print "%s: No DNSSEC secured responses found" % hostname
         else:
             print "%s: getdns.address() returned error: %d" % (hostname, status)
@@ -63,7 +63,7 @@ def usage():
     if not args:
         usage()
 
-extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
+extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
 
 ctx = getdns.Context()
 tids = []

examples/checkdanecert.py

@@ -27,7 +27,7 @@ def compute_hash(func, string):
 def get_addresses(hostname):
 
     extensions = {
-        "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE
+        "return_both_v4_and_v6" : getdns.EXTENSION_TRUE
     }
     ctx = getdns.Context()
     try:
@@ -39,7 +39,7 @@ def get_addresses(hostname):
     status = results.status
 
     address_list = []
-    if status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if status == getdns.RESPSTATUS_GOOD:
         for addr in results.just_address_answers:
             address_list.append((addr['address_type'], addr['address_data']))
     else:
@@ -68,7 +68,7 @@ def get_tlsa_rdata_set(replies, requested_usage=None):
 def get_tlsa(port, proto, hostname):
 
     extensions = {
-        "dnssec_return_only_secure" : getdns.GETDNS_EXTENSION_TRUE,
+        "dnssec_return_only_secure" : getdns.EXTENSION_TRUE,
     }
     qname = "_%d._%s.%s" % (port, proto, hostname)
     ctx = getdns.Context()
@@ -82,7 +82,7 @@ def get_tlsa(port, proto, hostname):
 
     status = results.status
 
-    if status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if status == getdns.RESPSTATUS_GOOD:
         return get_tlsa_rdata_set(results.replies_tree, requested_usage=3)
     else:
         print "getdns.general(): failed, return code: %d" % status

examples/dane_encrypt.py

@@ -19,7 +19,7 @@
 # 
 # I commented out the "return None" because this is demo code and you
 # should be able to play with it.  But, in deployed applications you
-# MUST check that dnssec_status is GETDNS_DNSSEC_SECURE
+# MUST check that dnssec_status is DNSSEC_SECURE
 #
 
 def get_first_secure_response(results):
@@ -29,7 +29,7 @@ def get_first_secure_response(results):
         return None
     else:
         reply = replies_tree[0]
-        if reply['dnssec_status'] != getdns.GETDNS_DNSSEC_SECURE:
+        if reply['dnssec_status'] != getdns.DNSSEC_SECURE:
             print 'insecure reply'
 #            return None                      
         answer = replies_tree[0]['answer']
@@ -45,9 +45,9 @@ def main():
     if len(sys.argv) == 2:
         tls_name = sys.argv[1]
     c = getdns.Context()
-    extensions = { 'dnssec_return_status' : getdns.GETDNS_EXTENSION_TRUE }
+    extensions = { 'dnssec_return_status' : getdns.EXTENSION_TRUE }
     results = c.general(tls_name, request_type=getdns.RRTYPE_TLSA, extensions=extensions)
-    if results.replies_full['status'] != getdns.GETDNS_RESPSTATUS_GOOD:
+    if results.replies_full['status'] != getdns.RESPSTATUS_GOOD:
         print 'query status is {0}'.format(results.status)
         sys.exit(1)
     else:

examples/get-general.py

@@ -6,7 +6,7 @@
 
 import getdns, pprint, sys
 
-extensions = { "dnssec_return_status" : getdns.GETDNS_EXTENSION_TRUE }
+extensions = { "dnssec_return_status" : getdns.EXTENSION_TRUE }
 
 def get_rrtype(qtype):
     try:
@@ -38,15 +38,15 @@ def print_answer(r):
 
     status = results.status
 
-    if status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if status == getdns.RESPSTATUS_GOOD:
         for reply in results.replies_tree:
             answers = reply['answer']           # list of 1 here
             for answer in answers:
                 if answer['type'] != getdns.RRTYPE_RRSIG:
                     pprint.pprint(answer)
-    elif status == getdns.GETDNS_RESPSTATUS_NO_NAME:
+    elif status == getdns.RESPSTATUS_NO_NAME:
         print "%s, %s: no such name" % (qname, qtype)
-    elif status == getdns.GETDNS_RESPSTATUS_ALL_TIMEOUT:
+    elif status == getdns.RESPSTATUS_ALL_TIMEOUT:
         print "%s, %s: query timed out" % (qname, qtype)
     else:
         print "%s, %s: unknown return code: %d" % results.status

examples/get-ip.py

@@ -37,12 +37,12 @@ def usage():
     if not args:
         usage()
 
-extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
+extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
 desired_addr_type = None
 
 for (opt, optval) in options:
     if opt == "-s":
-        extensions["dnssec_return_only_secure"] = getdns.GETDNS_EXTENSION_TRUE
+        extensions["dnssec_return_only_secure"] = getdns.EXTENSION_TRUE
     elif opt == "-4":
         desired_addr_type = "IPv4"
     elif opt == "-6":
@@ -57,13 +57,13 @@ def usage():
         print(str(e))
         break
     status = results.status
-    if status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if status == getdns.RESPSTATUS_GOOD:
         for addr in results.just_address_answers:
             addr_type = addr['address_type']
             addr_data = addr['address_data']
             if (desired_addr_type == None) or (addr_type == desired_addr_type):
                 print "%s: %s  %s" % (hostname, addr_type, addr_data)
-    elif status == getdns.GETDNS_RESPSTATUS_NO_SECURE_ANSWERS:
+    elif status == getdns.RESPSTATUS_NO_SECURE_ANSWERS:
         print "%s: No DNSSEC secured responses found" % hostname
     else:
         print "%s: getdns.address() returned error: %d" % (hostname, status)

examples/get-mx-ip.py

@@ -8,7 +8,7 @@
 
 import getdns, pprint, sys
 
-extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
+extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
 
 
 def get_ip(ctx, qname):
@@ -19,7 +19,7 @@ def get_ip(ctx, qname):
         print(str(e))
         sys.exit(1)
 
-    if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if results.status == getdns.RESPSTATUS_GOOD:
         for addr in results.just_address_answers:
             iplist.append(addr['address_data'])
     else:
@@ -41,7 +41,7 @@ def get_ip(ctx, qname):
     status = results.status
 
     hostlist = []
-    if status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if status == getdns.RESPSTATUS_GOOD:
         for reply in results.replies_tree:
             answers = reply['answer']
             for answer in answers:
@@ -50,9 +50,9 @@ def get_ip(ctx, qname):
                     for ip in iplist:
                         hostlist.append( (answer['rdata']['preference'], \
                                           answer['rdata']['exchange'], ip) )
-    elif status == getdns.GETDNS_RESPSTATUS_NO_NAME:
+    elif status == getdns.RESPSTATUS_NO_NAME:
         print "%s, %s: no such name" % (qname, qtype)
-    elif status == getdns.GETDNS_RESPSTATUS_ALL_TIMEOUT:
+    elif status == getdns.RESPSTATUS_ALL_TIMEOUT:
         print "%s, %s: query timed out" % (qname, qtype)
     else:
         print "%s, %s: unknown return code: %d" % results["status"]

examples/get-ns-ip.py

@@ -8,7 +8,7 @@
 
 import getdns, pprint, sys
 
-extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
+extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
 
 
 def usage():
@@ -27,7 +27,7 @@ def get_ip(ctx, qname):
         print(str(e))
         sys.exit(1)
 
-    if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if results.status == getdns.RESPSTATUS_GOOD:
         for addr in results.just_address_answers:
             iplist.append(addr['address_data'])
     else:
@@ -51,17 +51,17 @@ def get_ip(ctx, qname):
     status = results.status
 
     hostlist = []
-    if status == getdns.GETDNS_RESPSTATUS_GOOD:
+    if status == getdns.RESPSTATUS_GOOD:
         for reply in results.replies_tree:
             answers = reply['answer']
             for answer in answers:
                 if answer['type'] == getdns.RRTYPE_NS:
                     iplist = get_ip(ctx, answer['rdata']['nsdname'])
                     for ip in iplist:
                         hostlist.append( (answer['rdata']['nsdname'], ip) )
-    elif status == getdns.GETDNS_RESPSTATUS_NO_NAME:
+    elif status == getdns.RESPSTATUS_NO_NAME:
         print "%s: no such DNS zone" % qname
-    elif status == getdns.GETDNS_RESPSTATUS_ALL_TIMEOUT:
+    elif status == getdns.RESPSTATUS_ALL_TIMEOUT:
         print "%s, NS: query timed out" % qname
     else:
         print "%s, %s: unknown return code: %d" % results["status"]

examples/get-srv.py

@@ -17,7 +17,7 @@
     print(str(e))
     sys.exit(1)
 
-if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
+if results.status == getdns.RESPSTATUS_GOOD:
     for reply in results.replies_tree:
         for a in reply["answer"]:
             rrname  = a["name"]

examples/query-gdns.py

@@ -16,18 +16,18 @@
 hostname = sys.argv[1]
 
 ctx = getdns.Context()
-ctx.resolution_type = getdns.GETDNS_RESOLUTION_STUB
+ctx.resolution_type = getdns.RESOLUTION_STUB
 ctx.upstream_recursive_servers = google_public_dns
 
-extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
+extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
 
 try:
     results = ctx.address(name=hostname, extensions=extensions)
 except getdns.error, e:
     print(str(e))
     sys.exit(1)
 
-if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
+if results.status == getdns.RESPSTATUS_GOOD:
     for addr in results.just_address_answers:
         print addr["address_data"]
 else:

examples/query-stubmode.py

@@ -5,18 +5,18 @@
 hostname = sys.argv[1]
 
 ctx = getdns.Context()
-ctx.resolution_type = getdns.GETDNS_RESOLUTION_STUB
+ctx.resolution_type = getdns.RESOLUTION_STUB
 
-extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
-ctx.resolver_type = getdns.GETDNS_RESOLUTION_STUB
+extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
+ctx.resolver_type = getdns.RESOLUTION_STUB
 
 try:
     results = ctx.address(name=hostname, extensions=extensions)
 except getdns.error, e:
     print(str(e))
     sys.exit(1)
 
-if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
+if results.status == getdns.RESPSTATUS_GOOD:
     for addr in results.just_address_answers:
         print addr["address_data"]
 else:

examples/simple.py

@@ -13,7 +13,7 @@
 hostname = sys.argv[1]
 
 ctx = getdns.Context()
-extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
+extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
 
 try:
     results = ctx.address(name=hostname, extensions=extensions)
@@ -23,7 +23,7 @@
 
 status = results.status
 
-if status == getdns.GETDNS_RESPSTATUS_GOOD:
+if status == getdns.RESPSTATUS_GOOD:
     for addr in results.just_address_answers:
         print addr['address_data']
 else: