X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=blobdiff_plain;f=include%2Ftrust_router%2Ftid.h;h=91a981696b8b2314c366adf272113d76e40ebad2;hp=2b580bb63a01214bc78885fbc0866aa04637607e;hb=605ee6f071ad51755ba07b4e1a712814bbf4f780;hpb=603b02c83645f1d1251f8d25584bc73f44f5137f diff --git a/include/trust_router/tid.h b/include/trust_router/tid.h index 2b580bb..91a9816 100644 --- a/include/trust_router/tid.h +++ b/include/trust_router/tid.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, JANET(UK) + * Copyright (c) 2012-2014, JANET(UK) * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,14 +35,17 @@ #ifndef TID_H #define TID_H +#include + #include #include #include #include -#include #include +#include + #define TID_PORT 12309 @@ -51,70 +54,27 @@ typedef enum tid_rc { TID_ERROR } TID_RC; -typedef struct tid_srvr_blk { - struct tid_srvr_blk *next; - struct in_addr aaa_server_addr; - TR_NAME *key_name; - DH *aaa_server_dh; /* AAA server's public dh information */ -} TID_SRVR_BLK; - -typedef struct tid_resp { - TID_RC result; - TR_NAME *err_msg; - TR_NAME *rp_realm; - TR_NAME *realm; - TR_NAME *comm; - TR_CONSTRAINT_SET *cons; - TR_NAME *orig_coi; - TID_SRVR_BLK *servers; /* Linked list of servers */ - /* TBD -- Trust Path Used */ -} TID_RESP; +typedef struct tid_srvr_blk TID_SRVR_BLK; + + +typedef struct _tr_constraint_set TR_CONSTRAINT_SET; +typedef struct _tid_path TID_PATH; + +typedef struct tid_resp TID_RESP; typedef struct tidc_instance TIDC_INSTANCE; typedef struct tids_instance TIDS_INSTANCE; typedef struct tid_req TID_REQ; -typedef struct json_t json_t; + typedef void (TIDC_RESP_FUNC)(TIDC_INSTANCE *, TID_REQ *, TID_RESP *, void *); -struct tid_req { - struct tid_req *next_req; - int resp_sent; - int conn; - gss_ctx_id_t gssctx; - int resp_rcvd; - TR_NAME *rp_realm; - TR_NAME *realm; - TR_NAME *comm; - TR_CONSTRAINT_SET *cons; - TR_NAME *orig_coi; - 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*/ -}; - -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 */ -}; - -typedef int (TIDS_REQ_FUNC)(TIDS_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); -struct tids_instance { - int req_count; - char *priv_key; - char *ipaddr; - const char *hostname; - TIDS_REQ_FUNC *req_handler; - tids_auth_func *auth_handler; - void *cookie; -}; /* Utility functions for TID_REQ structures, in tid/tid_req.c */ TR_EXPORT TID_REQ *tid_req_new(void); @@ -141,15 +101,15 @@ void tid_req_set_resp_func(TID_REQ *req, TIDC_RESP_FUNC *resp_func); TR_EXPORT void *tid_req_get_cookie(TID_REQ *req); void tid_req_set_cookie(TID_REQ *req, void *cookie); TR_EXPORT TID_REQ *tid_dup_req (TID_REQ *orig_req); - -/** Decrement a reference to #json when this tid_req is cleaned up. A - new reference is not created; in effect the caller is handing a - reference they already hold to the TID_REQ.*/ -void tid_req_cleanup_json(TID_REQ *, json_t *json); +TR_EXPORT void tid_req_free( TID_REQ *req); /* Utility functions for TID_RESP structure, in tid/tid_resp.c */ -TR_EXPORT TID_RC tid_resp_get_result(TID_RESP *resp); -void tid_resp_set_result(TID_RESP *resp, TID_RC result); + +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); void tid_resp_set_err_msg(TID_RESP *resp, TR_NAME *err_msg); TR_EXPORT TR_NAME *tid_resp_get_rp_realm(TID_RESP *resp); @@ -160,22 +120,47 @@ 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 TID_SRVR_BLK *tid_resp_get_servers(TID_RESP *resp); -void tid_resp_set_servers(TID_RESP *resp, TID_SRVR_BLK *servers); -// TBD -- add function to add/remove items from linked list of servers? +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 *); + +/** Get either the error_path or the path of the first server block for + * a successful response*/ +TR_EXPORT const TID_PATH *tid_resp_get_a_path(const TID_RESP *); +/* Server blocks*/ +TR_EXPORT void tid_srvr_get_address(const TID_SRVR_BLK *, + const struct sockaddr **out_addr, size_t *out_sa_len); +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; \ + ((INDEX < tid_resp_get_num_servers(RESP))&&(SERVER = tid_resp_get_server(resp, INDEX))); \ + INDEX++) + /* 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 void tidc_destroy (TIDC_INSTANCE *tidc); +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); /* TID Server functions, in tid/tids.c */ +TIDS_INSTANCE *tids_new(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 nfds_t tids_get_listener(TIDS_INSTANCE *tids, TIDS_REQ_FUNC *req_handler, + 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); TR_EXPORT void tids_destroy (TIDS_INSTANCE *tids);