A few small bug fixes

Author: MelindaShore

context.c

@@ -144,10 +144,8 @@ context_set_dns_transport(getdns_context *context, PyObject *py_value)
         PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
         return -1;
     }
-    if (!((value == GETDNS_TRANSPORT_UDP_FIRST_AND_FALL_BACK_TO_TCP) ||
-          (value == GETDNS_TRANSPORT_UDP_ONLY)) ||
-          (value == GETDNS_TRANSPORT_TCP_ONLY)  ||
-          (value == GETDNS_TRANSPORT_TCP_ONLY_KEEP_CONNECTIONS_OPEN))  {
+    if ((value < GETDNS_TRANSPORT_UDP_FIRST_AND_FALL_BACK_TO_TCP) ||
+        (value > GETDNS_TRANSPORT_TCP_ONLY_KEEP_CONNECTIONS_OPEN))  {
         PyErr_SetString(PyExc_AttributeError, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
         return -1;
     }
@@ -671,6 +669,7 @@ context_getattro(PyObject *self, PyObject *nameobj)
         }
         return PyString_FromString((char *)version_string->data);
     }
+#if 0
     if (!strncmp(attrname, "resolver_type", strlen("resolver_type")))  {
         uint32_t resolver_type;
         if ((ret = getdns_dict_get_int(api_info, "resolver_type", &resolver_type)) != GETDNS_RETURN_GOOD)  {
@@ -681,6 +680,7 @@ context_getattro(PyObject *self, PyObject *nameobj)
         }
         return PyInt_FromLong(resolver_type);
     }
+#endif
 
     if (!strncmp(attrname, "timeout", strlen("timeout")))  {
         uint32_t timeout;

doc/functions.rst

@@ -194,8 +194,6 @@ as its methods and attributes.
    *request_type* argument:
 
    * In ``getdns.address()``, the name argument can only take a host name.
-   * You do not need to include a ``return_both_v4_and_v6`` extension with the call in ``getdns.address()``; it will
-     always return both IPv4 and IPv6 addresses.
    * ``Context.address()`` always uses all of namespaces from the
      context (to better emulate getaddrinfo()), while ``Context.general()`` only uses the DNS namespace.
 

getdns.c

@@ -96,8 +96,6 @@ PyMemberDef Context_members[] = {
       "string set by the implementer" },
     { "version_string", T_STRING|READONLY, offsetof(getdns_ContextObject, version_string), 0,
       "string set by the implementer" },
-    { "resolver_type", T_INT|READONLY, offsetof(getdns_ContextObject, resolver_type), 0,
-      "the type of resolver the API is acting as in this context" },
     { NULL }
 };
 

pygetdns.h

@@ -66,7 +66,6 @@ typedef struct {
     getdns_list *upstream_recursive_servers;
     char *implementation_string;
     char *version_string;
-    uint32_t resolver_type;
 } getdns_ContextObject;