projects
/
trust_router.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move DH record from TR_GSSC_INSTANCE to TIDC_INSTANCE, where it belongs
[trust_router.git]
/
include
/
tid_internal.h
diff --git
a/include/tid_internal.h
b/include/tid_internal.h
index
658b2e4
..
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>
#ifndef TID_INTERNAL_H
#define TID_INTERNAL_H
#include <glib.h>
+#include <jansson.h>
-#include <tr_rp.h>
#include <trust_router/tid.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;
struct tid_srvr_blk {
TID_SRVR_BLK *next;
@@
-52,6
+53,7
@@
struct tid_srvr_blk {
struct tid_resp {
TID_RC result;
struct tid_resp {
TID_RC result;
+ TR_NAME *request_id;
TR_NAME *err_msg;
TR_NAME *rp_realm;
TR_NAME *realm;
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*/
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;
gss_ctx_id_t gssctx;
int resp_rcvd;
TR_NAME *rp_realm;
@@
-84,10
+87,17
@@
struct tid_req {
struct tidc_instance {
TR_GSSC_INSTANCE *gssc;
struct tidc_instance {
TR_GSSC_INSTANCE *gssc;
+ DH *client_dh;
+};
+
+struct tid_process {
+ pid_t pid;
+ int read_fd;
};
struct tids_instance {
int req_count;
};
struct tids_instance {
int req_count;
+ int error_count;
char *priv_key;
char *ipaddr;
const char *hostname;
char *priv_key;
char *ipaddr;
const char *hostname;
@@
-96,6
+106,7
@@
struct tids_instance {
void *cookie;
unsigned int tids_port;
TR_NAME *gss_name; /* GSS name client used for authentication */
void *cookie;
unsigned int tids_port;
TR_NAME *gss_name; /* GSS name client used for authentication */
+ GArray *pids; /* PIDs of active tids processes */
};
/** Decrement a reference to #json when this tid_req is cleaned up. A
};
/** Decrement a reference to #json when this tid_req is cleaned up. A
@@
-116,4
+127,6
@@
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);
void tid_resp_set_cons(TID_RESP *resp, TR_CONSTRAINT_SET *cons);
void tid_resp_set_error_path(TID_RESP *resp, json_t *ep);
+void tids_sweep_procs(TIDS_INSTANCE *tids);
+
#endif
#endif