added validation_chain attribute to Result(), removed more dead code

Author: MelindaShore

getdns.c

@@ -61,6 +61,8 @@ PyMemberDef Result_members[] = {
     { "answer_type", T_OBJECT_EX, offsetof(getdns_ResultObject, answer_type), READONLY, "Answer type" },
     { "canonical_name", T_OBJECT_EX, offsetof(getdns_ResultObject, canonical_name), READONLY,
       "Canonical name" },
+    { "validation_chain", T_OBJECT_EX, offsetof(getdns_ResultObject, validation_chain),
+      READONLY, "DNSSEC certificate chain" },
     { NULL },
 };
 
@@ -205,54 +207,6 @@ PyTypeObject getdns_ContextType = {
     (initproc)context_init,    /* tp_init           */
 };
 
-#if 0
-PyMethodDef Result_methods[] = {
-    { NULL },
-};
-#endif
-
-
-
-/*
- *  A shim to sit between the event callback function
- *  and the python callback.  This is a wee bit hacky
- */
-
-
-void
-callback_shim(getdns_context *context, getdns_callback_type_t type, getdns_dict *resp,
-  void *u, getdns_transaction_t tid)
-{
-    pygetdns_libevent_callback_data *callback_data;
-    PyObject *response;
-    PyObject *getdns_runner;
-    PyGILState_STATE state;
-
-    callback_data = (pygetdns_libevent_callback_data *)u;
-    getdns_runner = callback_data->callback_func;
-    if (!PyCallable_Check(getdns_runner))  {
-        printf("callback not runnable\n");
-        return;
-    }
-    if ((response = getFullResponse(resp)) == 0)  {
-        PyErr_SetString(getdns_error, "Unable to decode response");
-        return;
-        /* need to throw exceptiion XXX */
-    }
-    /* Python callback prototype: */
-    /* callback(context, callback_type, response, userarg, tid) */
-    state = PyGILState_Ensure();
-    PyObject_CallFunction(getdns_runner, "OHOsL", context, type, response,
-                          callback_data->userarg, tid);
-    PyGILState_Release(state);
-}
-
-
-/*
- * called from pthread_create.  Pull out the query arguments,
- * get the Python callback function from the dictionary for
- * __main__
- */
 
 
 static struct PyMethodDef getdns_methods[] = {

pygetdns.h

@@ -70,6 +70,7 @@ typedef struct  {
     PyObject *replies_tree;
     PyObject *canonical_name;
     PyObject *replies_full;
+    PyObject *validation_chain;
 } getdns_ResultObject;
 
 
@@ -108,6 +109,7 @@ int get_answer_type(struct getdns_dict *result_dict);
 char *get_canonical_name(struct getdns_dict *result_dict);
 PyObject *get_just_address_answers(struct getdns_dict *result_dict);
 PyObject *get_replies_tree(struct getdns_dict *result_dict);
+PyObject *get_validation_chain(struct getdns_dict *result_dict);
 
 int context_init(getdns_ContextObject *self, PyObject *args, PyObject *keywds);
 PyObject *context_getattro(PyObject *self, PyObject *nameobj);

pygetdns_util.c

@@ -103,6 +103,20 @@ get_replies_tree(struct getdns_dict *result_dict)
 }
 
 
+PyObject *
+get_validation_chain(struct getdns_dict *result_dict)
+{
+    struct getdns_list *validation_chain;
+    getdns_return_t ret;
+
+    if ((ret = getdns_dict_get_list(result_dict, "validation_chain", &validation_chain)) !=
+        GETDNS_RETURN_GOOD)
+        Py_RETURN_NONE;
+    else
+        return glist_to_plist(validation_chain);
+}
+
+
 struct getdns_dict *
 extensions_to_getdnsdict(PyDictObject *pydict)
 {

result.c

@@ -56,7 +56,10 @@ result_init(getdns_ResultObject *self, PyObject *args, PyObject *keywds)
         Py_DECREF(self);
         return -1;
     }
-    
+    if ((self->validation_chain = get_validation_chain(result_dict)) == NULL)  {
+        Py_DECREF(self);
+        return -1;
+    }
     return 0;
 }