X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=include%2Ftid_internal.h;fp=include%2Ftid_internal.h;h=882b3fa1d4dc3eeb3c39a02edf1edd0dd4671511;hb=6d25b3102660eb86fee5709465180a67429b2a79;hp=0593425c4d33148ca0692d7affddc66037997231;hpb=03837be53e03aed3a08220d8f6f773dd836fcc4a;p=trust_router.git

diff --git a/include/tid_internal.h b/include/tid_internal.h
index 0593425..882b3fa 100644
--- a/include/tid_internal.h
+++ b/include/tid_internal.h
@@ -1,38 +1,5 @@
 /*
- * Copyright (c) 2012-2014, JANET(UK)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of JANET(UK) nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*
- * Copyright (c) 2012, JANET(UK)
+ * Copyright (c) 2012-2015, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,10 +37,13 @@
 #include <trust_router/tid.h>
 
 #include <jansson.h>
+
 struct tid_srvr_blk {
   struct in_addr aaa_server_addr;
   TR_NAME *key_name;
   DH *aaa_server_dh;		/* AAA server's public dh information */
+  char *expiration_time; /**< absolute time at which key expires*/
+  json_t *path;/**< Path of trust routers that the request traversed*/
 };
 
 struct tid_resp {
@@ -86,8 +56,9 @@ struct tid_resp {
   TR_NAME *orig_coi;
   TID_SRVR_BLK *servers;       	/* array of servers */
   size_t num_servers;
-  /* TBD -- Trust Path Used */
+  json_t *error_path; /**< Path that a request generating an error traveled*/
 };
+
 struct tid_req {
   struct tid_req *next_req;
   int resp_sent;
@@ -102,8 +73,11 @@ 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*/
+  time_t expiration_interval; /**< Time to key expire in minutes*/
+  json_t *json_references; /**< References to objects dereferenced on request destruction*/
+  json_t *path; /**< Path of systems this request has traversed; added by receiver*/
 };
+
 struct tidc_instance {
   TID_REQ *req_list;
   // TBD -- Do we still need a separate private key */
@@ -111,6 +85,7 @@ struct tidc_instance {
   // int priv_len;
   DH *client_dh;			/* Client's DH struct with priv and pub keys */
 };
+
 struct tids_instance {
   int req_count;
   char *priv_key;
@@ -127,4 +102,5 @@ struct tids_instance {
     reference they already hold to the TID_REQ.*/
 void tid_req_cleanup_json(TID_REQ *, json_t *json);
 
+int tid_req_add_path(TID_REQ *, const char *this_system, unsigned port);
 #endif