X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=include%2Ftrust_router%2Ftid.h;h=299b66aedd87b6042a181f6ffa5885d4325070b0;hb=32792249a45039b0a0e332091a499956498b55ca;hp=ce2ad3dff6a9d4f79d7e11699d061b7593f30882;hpb=4ab3fe821074ef76339be8f7a81589c4b2cb44ed;p=trust_router.git

diff --git a/include/trust_router/tid.h b/include/trust_router/tid.h
index ce2ad3d..299b66a 100644
--- a/include/trust_router/tid.h
+++ b/include/trust_router/tid.h
@@ -40,7 +40,6 @@
 
 #include <trust_router/tr_name.h>
 #include <trust_router/tr_versioning.h>
-#include <tr_constraint.h>
 
 #include <gssapi.h>
 
@@ -58,6 +57,8 @@ typedef struct tid_srvr_blk {
   DH *aaa_server_dh;		/* AAA server's public dh information */
 } TID_SRVR_BLK;
   
+typedef struct _tr_constraint_set  TR_CONSTRAINT_SET;
+
 typedef struct tid_resp {
   TID_RC result;
   TR_NAME *err_msg;
@@ -73,6 +74,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 +92,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 +117,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 +143,12 @@ 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);
+void TR_EXPORT tid_req_free( TID_REQ *req);
+
 /* 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);
@@ -158,7 +168,7 @@ void tid_resp_set_servers(TID_RESP *resp, TID_SRVR_BLK *servers);
 
 /* TID Client functions, in tid/tidc.c */
 TR_EXPORT TIDC_INSTANCE *tidc_create (void);
-TR_EXPORT int tidc_open_connection (TIDC_INSTANCE *tidc, char *server, gss_ctx_id_t *gssctx);
+TR_EXPORT int tidc_open_connection (TIDC_INSTANCE *tidc, char *server, unsigned int port, gss_ctx_id_t *gssctx);
 TR_EXPORT int tidc_send_request (TIDC_INSTANCE *tidc, int conn, gss_ctx_id_t gssctx, char *rp_realm, char *realm, char *coi, TIDC_RESP_FUNC *resp_handler, void *cookie);
 TR_EXPORT int tidc_fwd_request (TIDC_INSTANCE *tidc, TID_REQ *req, TIDC_RESP_FUNC *resp_handler, void *cookie);
 TR_EXPORT void tidc_destroy (TIDC_INSTANCE *tidc);
@@ -166,8 +176,8 @@ TR_EXPORT void tidc_destroy (TIDC_INSTANCE *tidc);
 /* TID Server functions, in tid/tids.c */
 TR_EXPORT TIDS_INSTANCE *tids_create (void);
 TR_EXPORT int tids_start (TIDS_INSTANCE *tids, TIDS_REQ_FUNC *req_handler,
-			  tids_auth_func *auth_handler, const char *hostname,
-			  void *cookie);
+			  tids_auth_func *auth_handler, const char *hostname, 
+			  unsigned int port, void *cookie);
 TR_EXPORT int tids_send_response (TIDS_INSTANCE *tids, TID_REQ *req, TID_RESP *resp);
 TR_EXPORT int tids_send_err_response (TIDS_INSTANCE *tids, TID_REQ *req, const char *err_msg);
 TR_EXPORT void tids_destroy (TIDS_INSTANCE *tids);