From: Margaret Wasserman Date: Tue, 19 Nov 2013 16:44:01 +0000 (-0500) Subject: Access funcitons for TID_REQ structure, incl TID code reorg. X-Git-Tag: 1.0.1-2~11 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=bc3b722a7f84211da42f309158c42eff0e7b9329 Access funcitons for TID_REQ structure, incl TID code reorg. --- diff --git a/Makefile.am b/Makefile.am index a2675bc..6521111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ tid_example_tids_LDADD = gsscon/libgsscon.la libtr_tid.la common_dh_test_tr_dh_test_SOURCES = common/tr_dh.c \ common/dh_test/dh_test.c -libtr_tid_la_SOURCES = tid/tids.c tid/tidc.c \ +libtr_tid_la_SOURCES = tid/tids.c tid/tidc.c tid/tid_req.c\ $(common_srcs) libtr_tid_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden diff --git a/include/trust_router/tid.h b/include/trust_router/tid.h index bf4d9c9..a9f90b9 100644 --- a/include/trust_router/tid.h +++ b/include/trust_router/tid.h @@ -111,14 +111,41 @@ struct tids_instance { void *cookie; }; +/* Utility funciton for TID_REQ structures, in tid/tid_req.c */ +TR_EXPORT TID_REQ *tid_req_get_next_req(TID_REQ *req); +void tid_req_set_next_req(TID_REQ *req, TID_REQ *next_req); +TR_EXPORT int tid_req_get_resp_sent(TID_REQ *req); +void tid_req_set_resp_sent(TID_REQ *req, int resp_sent); +TR_EXPORT int tid_req_get_conn(TID_REQ *req); +void tid_req_set_conn(TID_REQ *req, int conn); +TR_EXPORT gss_ctx_id_t tid_req_get_gssctx(TID_REQ *req); +void tid_req_set_gssctx(TID_REQ *req, gss_ctx_id_t gssctx); +TR_EXPORT int tid_req_get_resp_rcvd(TID_REQ *req); +void tid_req_set_resp_rcvd(TID_REQ *req, int resp_rcvd); +TR_EXPORT TR_NAME *tid_req_get_rp_realm(TID_REQ *req); +void tid_req_set_rp_realm(TID_REQ *req, TR_NAME *rp_realm); +TR_EXPORT TR_NAME *tid_req_get_realm(TID_REQ *req); +void tid_req_set_realm(TID_REQ *req, TR_NAME *realm); +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 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); +void tid_req_set_cookie(TID_REQ *req, void *cookie); TR_EXPORT TID_REQ *tid_dup_req (TID_REQ *orig_req); +/* Utility functions for TID_RESP structure, in tid/tid_resp.c */ + +/* 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, 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_fwd_request (TIDC_INSTANCE *tidc, TID_REQ *req, TIDC_RESP_FUNC *resp_handler, void *cookie); TR_EXPORT void tidc_destroy (TIDC_INSTANCE *tidc); +/* TID Server functions, in tid/tids.c */ 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, diff --git a/tid/tid_req.c b/tid/tid_req.c new file mode 100644 index 0000000..6bb269b --- /dev/null +++ b/tid/tid_req.c @@ -0,0 +1,175 @@ +/* + * Copyright (c) 2012, 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. + * + */ + +#include +#include + +#include +TID_REQ *tid_req_get_next_req(TID_REQ *req) +{ + return(req->next_req); +} + +void tid_req_set_next_req(TID_REQ *req, TID_REQ *next_req) +{ + req->next_req = next_req; +} + +int tid_req_get_resp_sent(TID_REQ *req) +{ + return(req->resp_sent); +} + +void tid_req_set_resp_sent(TID_REQ *req, int resp_sent) +{ + req->resp_sent = resp_sent; +} + +int tid_req_get_conn(TID_REQ *req) +{ + return(req->conn); +} + +void tid_req_set_conn(TID_REQ *req, int conn) +{ + req->conn = conn; +} + +gss_ctx_id_t tid_req_get_gssctx(TID_REQ *req) +{ + return(req->gssctx); +} + +void tid_req_set_gssctx(TID_REQ *req, gss_ctx_id_t gssctx) +{ + req->gssctx = gssctx; +} + +int tid_req_get_resp_rcvd(TID_REQ *req) +{ + return(req->resp_rcvd); +} + +void tid_req_set_resp_rcvd(TID_REQ *req, int resp_rcvd) +{ + req->resp_rcvd = resp_rcvd; +} + +TR_NAME *tid_req_get_rp_realm(TID_REQ *req) +{ + return(req->rp_realm); +} + +void tid_req_set_rp_realm(TID_REQ *req, TR_NAME *rp_realm) +{ + req->rp_realm = rp_realm; +} + +TR_NAME *tid_req_get_realm(TID_REQ *req) +{ + return(req->realm); +} + +void tid_req_set_realm(TID_REQ *req, TR_NAME *realm) +{ + req->realm = realm; +} + +TR_NAME *tid_req_get_comm(TID_REQ *req) +{ + return(req->comm); +} + +void tid_req_set_comm(TID_REQ *req, TR_NAME *comm) +{ + req->comm = comm; +} + +TR_NAME *tid_req_get_orig_coi(TID_REQ *req) +{ + return(req->orig_coi); +} + +void tid_req_set_rp_orig_coi(TID_REQ *req, TR_NAME *orig_coi) +{ + req->orig_coi = orig_coi; +} + +TIDC_RESP_FUNC *tid_req_get_resp_func(TID_REQ *req) +{ + return(req->resp_func); +} + +void tid_req_set_resp_func(TID_REQ *req, TIDC_RESP_FUNC *resp_func) +{ + req->resp_func = resp_func; +} + +void *tid_req_get_cookie(TID_REQ *req) +{ + return(req->cookie); +} + +void tid_req_set_cookie(TID_REQ *req, void *cookie) +{ + req->cookie = cookie; +} + +TID_REQ *tid_dup_req (TID_REQ *orig_req) +{ + TID_REQ *new_req = NULL; + + if (NULL == (new_req = malloc(sizeof(TID_REQ)))) { + fprintf(stderr, "tid_dup_req: Can't allocated duplicate request.\n"); + return NULL; + } + + /* Memcpy for flat fields, not valid until names are duped. */ + memcpy(new_req, orig_req, sizeof(TID_REQ)); + + if ((NULL == (new_req->rp_realm = tr_dup_name(orig_req->rp_realm))) || + (NULL == (new_req->realm = tr_dup_name(orig_req->realm))) || + (NULL == (new_req->comm = tr_dup_name(orig_req->comm)))) { + fprintf(stderr, "tid_dup_req: Can't duplicate request (names).\n"); + } + + if (orig_req->orig_coi) { + if (NULL == (new_req->orig_coi = tr_dup_name(orig_req->orig_coi))) { + fprintf(stderr, "tid_dup_req: Can't duplicate request (orig_coi).\n"); + } + } + + return new_req; +} + diff --git a/tid/tidc.c b/tid/tidc.c index e7d7caf..2e3f06c 100644 --- a/tid/tidc.c +++ b/tid/tidc.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -62,33 +61,6 @@ void tidc_destroy (TIDC_INSTANCE *tidc) free(tidc); } -TID_REQ *tid_dup_req (TID_REQ *orig_req) -{ - TID_REQ *new_req = NULL; - - if (NULL == (new_req = malloc(sizeof(TID_REQ)))) { - fprintf(stderr, "tid_dup_req: Can't allocated duplicate request.\n"); - return NULL; - } - - /* Memcpy for flat fields, not valid until names are duped. */ - memcpy(new_req, orig_req, sizeof(TID_REQ)); - - if ((NULL == (new_req->rp_realm = tr_dup_name(orig_req->rp_realm))) || - (NULL == (new_req->realm = tr_dup_name(orig_req->realm))) || - (NULL == (new_req->comm = tr_dup_name(orig_req->comm)))) { - fprintf(stderr, "tid_dup_req: Can't duplicate request (names).\n"); - } - - if (orig_req->orig_coi) { - if (NULL == (new_req->orig_coi = tr_dup_name(orig_req->orig_coi))) { - fprintf(stderr, "tid_dup_req: Can't duplicate request (orig_coi).\n"); - } - } - - return new_req; -} - int tidc_open_connection (TIDC_INSTANCE *tidc, char *server, gss_ctx_id_t *gssctx)