Merge pull request #82 from painless-security/jennifer/pull_req_feedback

[trust_router.git] / include / tid_internal.h

diff --git a/include/tid_internal.h b/include/tid_internal.h
index b3aa908..ecaf647 100644 (file)
--- a/include/tid_internal.h
+++ b/include/tid_internal.h
@@ -35,11 +35,12 @@
 #ifndef TID_INTERNAL_H
 #define TID_INTERNAL_H
 #include <glib.h>
+#include <jansson.h>
 
-#include <tr_rp.h>
 #include <trust_router/tid.h>
-#include <jansson.h>
-#include "tr_gss_client.h"
+#include <trust_router/tr_dh.h>
+#include <tr_rp.h>
+#include <tr_gss_client.h>
 
 struct tid_srvr_blk {
   TID_SRVR_BLK *next;
@@ -52,6 +53,7 @@ struct tid_srvr_blk {
 
 struct tid_resp {
   TID_RC result;
+  TR_NAME *request_id;
   TR_NAME *err_msg;
   TR_NAME *rp_realm;
   TR_NAME *realm;
@@ -67,6 +69,7 @@ struct tid_req {
   int resp_sent;
   int conn;
   int free_conn; /* free conn and gss ctx*/
+  TR_NAME *request_id;
   gss_ctx_id_t gssctx;
   int resp_rcvd;
   TR_NAME *rp_realm;
@@ -84,6 +87,12 @@ struct tid_req {
 
 struct tidc_instance {
   TR_GSSC_INSTANCE *gssc;
+  DH *client_dh;
+};
+
+struct tid_process {
+  pid_t pid;
+  int read_fd;
 };
 
 struct tids_instance {