X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=include%2Ftid_internal.h;h=658b2e4ebca3df04ad25e9c7c8715559be24b0dc;hb=6491f2a660c3183b210b968a939eaa18f1b44a09;hp=bce7ab2b0a974cac0e5c666aab340ddab460a059;hpb=e9332953189a29c0c52f703e4a3717b6141306d9;p=trust_router.git

diff --git a/include/tid_internal.h b/include/tid_internal.h
index bce7ab2..658b2e4 100644
--- a/include/tid_internal.h
+++ b/include/tid_internal.h
@@ -39,6 +39,7 @@
 #include <tr_rp.h>
 #include <trust_router/tid.h>
 #include <jansson.h>
+#include "tr_gss_client.h"
 
 struct tid_srvr_blk {
   TID_SRVR_BLK *next;
@@ -46,7 +47,7 @@ struct tid_srvr_blk {
   TR_NAME *key_name;
   DH *aaa_server_dh;		/* AAA server's public dh information */
   GTimeVal key_expiration; /**< absolute time at which key expires*/
-  json_t *path;/**< Path of trust routers that the request traversed*/
+  TID_PATH *path;/**< Path of trust routers that the request traversed*/
 };
 
 struct tid_resp {
@@ -82,11 +83,7 @@ struct tid_req {
 };
 
 struct tidc_instance {
-  // TID_REQ *req_list;
-  // TBD -- Do we still need a separate private key */
-  // char *priv_key;
-  // int priv_len;
-  DH *client_dh;			/* Client's DH struct with priv and pub keys */
+  TR_GSSC_INSTANCE *gssc;
 };
 
 struct tids_instance {
@@ -95,10 +92,10 @@ struct tids_instance {
   char *ipaddr;
   const char *hostname;
   TIDS_REQ_FUNC *req_handler;
-  TIDS_AUTH_FUNC *auth_handler;
+  tids_auth_func *auth_handler;
   void *cookie;
-  uint16_t tids_port;
-  struct tr_rp_client *rp_gss;		/* Client matching GSS name */
+  unsigned int tids_port;
+  TR_NAME *gss_name;		/* GSS name client used for authentication */
 };
 
 /** Decrement a reference to #json when this tid_req is cleaned up. A
@@ -113,8 +110,9 @@ void tid_srvr_blk_free(TID_SRVR_BLK *srvr);
 TID_SRVR_BLK *tid_srvr_blk_dup(TALLOC_CTX *mem_ctx, TID_SRVR_BLK *srvr);
 TID_SRVR_BLK *tid_srvr_blk_add_func(TID_SRVR_BLK *head, TID_SRVR_BLK *new);
 #define tid_srvr_blk_add(head, new) ((head)=tid_srvr_blk_add_func((head),(new)))
-void tid_srvr_blk_set_path(TID_SRVR_BLK *block, json_t *path);
+void tid_srvr_blk_set_path(TID_SRVR_BLK *block, TID_PATH *path);
 
+TID_RC tid_resp_cpy(TID_RESP *dst, TID_RESP *src);
 void tid_resp_set_cons(TID_RESP *resp, TR_CONSTRAINT_SET *cons);
 void tid_resp_set_error_path(TID_RESP *resp, json_t *ep);