X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=include%2Ftrust_router%2Ftid.h;h=42b97f3a745bad4a5e2bbcbcad8c78d13e419c45;hb=6e1647f2f4714d8c0c4c27ef376302bab1ae4bb3;hp=6950f26ee39d3d4243867e7267f4daeb4914e14f;hpb=ee6787f44e1c2507add20b083a2d652b34632f32;p=trust_router.git diff --git a/include/trust_router/tid.h b/include/trust_router/tid.h index 6950f26..42b97f3 100644 --- a/include/trust_router/tid.h +++ b/include/trust_router/tid.h @@ -71,7 +71,7 @@ typedef void (TIDC_RESP_FUNC)(TIDC_INSTANCE *, TID_REQ *, TID_RESP *, void *); typedef int (TIDS_REQ_FUNC)(TIDS_INSTANCE *, TID_REQ *, TID_RESP *, void *); -typedef int (TIDS_AUTH_FUNC)(gss_name_t client_name, TR_NAME *display_name, void *cookie); +typedef int (tids_auth_func)(gss_name_t client_name, TR_NAME *display_name, void *cookie); @@ -95,6 +95,8 @@ TR_EXPORT TR_NAME *tid_req_get_comm(TID_REQ *req); void tid_req_set_comm(TID_REQ *req, TR_NAME *comm); TR_EXPORT TR_NAME *tid_req_get_orig_coi(TID_REQ *req); void tid_req_set_rp_orig_coi(TID_REQ *req, TR_NAME *orig_coi); +TR_EXPORT TR_NAME *tid_req_get_request_id(TID_REQ *req); +void tid_req_set_request_id(TID_REQ *req, TR_NAME *request_id); TR_EXPORT TIDC_RESP_FUNC *tid_req_get_resp_func(TID_REQ *req); void tid_req_set_resp_func(TID_REQ *req, TIDC_RESP_FUNC *resp_func); TR_EXPORT void *tid_req_get_cookie(TID_REQ *req); @@ -106,6 +108,7 @@ TR_EXPORT void tid_req_free( TID_REQ *req); TID_RESP *tid_resp_new(TALLOC_CTX *mem_ctx); void tid_resp_free(TID_RESP *resp); +TID_RESP *tid_resp_dup(TALLOC_CTX *mem_ctx, TID_RESP *resp); TR_EXPORT int tid_resp_get_result(TID_RESP *resp); void tid_resp_set_result(TID_RESP *resp, int result); TR_EXPORT TR_NAME *tid_resp_get_err_msg(TID_RESP *resp); @@ -118,6 +121,8 @@ TR_EXPORT TR_NAME *tid_resp_get_comm(TID_RESP *resp); void tid_resp_set_comm(TID_RESP *resp, TR_NAME *comm); TR_EXPORT TR_NAME *tid_resp_get_orig_coi(TID_RESP *resp); void tid_resp_set_orig_coi(TID_RESP *resp, TR_NAME *orig_coi); +TR_EXPORT TR_NAME *tid_resp_get_request_id(TID_RESP *resp); +void tid_resp_set_request_id(TID_RESP *resp, TR_NAME *request_id); TR_EXPORT TID_SRVR_BLK *tid_resp_get_server(TID_RESP *resp, size_t index); TR_EXPORT size_t tid_resp_get_num_servers(const TID_RESP *resp); TR_EXPORT const TID_PATH *tid_resp_get_error_path(const TID_RESP *); @@ -131,7 +136,8 @@ TR_EXPORT void tid_srvr_get_address(const TID_SRVR_BLK *, TR_EXPORT DH *tid_srvr_get_dh(TID_SRVR_BLK *); TR_EXPORT const TR_NAME *tid_srvr_get_key_name(const TID_SRVR_BLK *); TR_EXPORT const TID_PATH *tid_srvr_get_path(const TID_SRVR_BLK *); - +/* Key expiration time is expressed as time since 1970-01-01 00:00:00 UTC */ +TR_EXPORT int tid_srvr_get_key_expiration(const TID_SRVR_BLK *, struct timeval *tv_out); #define tid_resp_servers_foreach(RESP, SERVER, INDEX) \ for (INDEX=0,SERVER=NULL; \ @@ -141,21 +147,21 @@ TR_EXPORT const TID_PATH *tid_srvr_get_path(const TID_SRVR_BLK *); /* 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, 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_open_connection (TIDC_INSTANCE *tidc, const 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, const char *rp_realm, const char *realm, const 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 DH *tidc_get_dh(TIDC_INSTANCE *); TR_EXPORT DH *tidc_set_dh(TIDC_INSTANCE *, DH *); -TR_EXPORT void tidc_destroy (TIDC_INSTANCE *tidc); +TR_EXPORT void tidc_destroy(TIDC_INSTANCE *tidc); /* TID Server functions, in tid/tids.c */ -TR_EXPORT TIDS_INSTANCE *tids_create (TALLOC_CTX *mem_ctx); +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, - unsigned int port, void *cookie); + tids_auth_func *auth_handler, const char *hostname, + unsigned int port, void *cookie); TR_EXPORT int tids_get_listener (TIDS_INSTANCE *tids, TIDS_REQ_FUNC *req_handler, - TIDS_AUTH_FUNC *auth_handler, const char *hostname, - unsigned int port, void *cookie); + tids_auth_func *auth_handler, const char *hostname, + unsigned int port, void *cookie, int *fd_out, size_t max_fd); TR_EXPORT int tids_accept(TIDS_INSTANCE *tids, int listen); 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);