From: Sam Hartman <hartmans@debian.org>
Date: Wed, 2 Jul 2014 09:34:12 +0000 (-0400)
Subject: tid_req: Store json references
X-Git-Tag: 1.3.1~33
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=603b02c83645f1d1251f8d25584bc73f44f5137f

tid_req: Store json references

Support storing references to json objects in TID requests.
---

diff --git a/include/trust_router/tid.h b/include/trust_router/tid.h
index 74281ca..2b580bb 100644
--- a/include/trust_router/tid.h
+++ b/include/trust_router/tid.h
@@ -73,6 +73,7 @@ typedef struct tid_resp {
 typedef struct tidc_instance TIDC_INSTANCE;
 typedef struct tids_instance TIDS_INSTANCE;
 typedef struct tid_req TID_REQ;
+typedef struct json_t json_t;
 
 typedef void (TIDC_RESP_FUNC)(TIDC_INSTANCE *, TID_REQ *, TID_RESP *, void *);
 
@@ -90,6 +91,7 @@ struct tid_req {
   DH *tidc_dh;			/* Client's public dh information */
   TIDC_RESP_FUNC *resp_func;
   void *cookie;
+  json_t *json_references; /** References to objects dereferenced on request destruction*/
 };
 
 struct tidc_instance {
@@ -114,7 +116,8 @@ struct tids_instance {
   void *cookie;
 };
 
-/* Utility funciton for TID_REQ structures, in tid/tid_req.c */
+/* Utility functions for TID_REQ structures, in tid/tid_req.c */
+TR_EXPORT TID_REQ *tid_req_new(void);
 TR_EXPORT TID_REQ *tid_req_get_next_req(TID_REQ *req);
 void tid_req_set_next_req(TID_REQ *req, TID_REQ *next_req);
 TR_EXPORT int tid_req_get_resp_sent(TID_REQ *req);
@@ -139,6 +142,11 @@ TR_EXPORT void *tid_req_get_cookie(TID_REQ *req);
 void tid_req_set_cookie(TID_REQ *req, void *cookie);
 TR_EXPORT TID_REQ *tid_dup_req (TID_REQ *orig_req);
 
+/** Decrement a reference to #json when this tid_req is cleaned up. A
+    new reference is not created; in effect the caller is handing a
+    reference they already hold to the TID_REQ.*/
+void tid_req_cleanup_json(TID_REQ *, json_t *json);
+
 /* Utility functions for TID_RESP structure, in tid/tid_resp.c */
 TR_EXPORT TID_RC tid_resp_get_result(TID_RESP *resp);
 void tid_resp_set_result(TID_RESP *resp, TID_RC result);
diff --git a/tid/tid_req.c b/tid/tid_req.c
index 6bb269b..5ba6c06 100644
--- a/tid/tid_req.c
+++ b/tid/tid_req.c
@@ -34,8 +34,22 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #include <trust_router/tid.h>
+#include <jansson.h>
+
+TID_REQ *tid_req_new()
+{
+  TID_REQ *req = calloc(sizeof(TID_REQ), 1);
+  if(!req)
+    return NULL;
+  req->json_references = json_array();
+  assert(req->json_references);
+  req->conn = -1;
+  return req;
+}
+
 TID_REQ *tid_req_get_next_req(TID_REQ *req)
 {
   return(req->next_req);
@@ -157,6 +171,7 @@ TID_REQ *tid_dup_req (TID_REQ *orig_req)
 
   /* Memcpy for flat fields, not valid until names are duped. */
   memcpy(new_req, orig_req, sizeof(TID_REQ));
+  json_incref(new_req->json_references);
   
   if ((NULL == (new_req->rp_realm = tr_dup_name(orig_req->rp_realm))) ||
       (NULL == (new_req->realm = tr_dup_name(orig_req->realm))) ||
@@ -173,3 +188,8 @@ TID_REQ *tid_dup_req (TID_REQ *orig_req)
   return new_req;
 }
 
+
+void tid_req_cleanup_json( TID_REQ *req, json_t *ref)
+{
+  (void) json_array_append_new(req->json_references, ref);
+}