/*
- * Copyright (c) 2012, JANET(UK)
+ * Copyright (c) 2012, 2014-2015, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
*/
#include <stdio.h>
+#include <unistd.h>
#include <stdlib.h>
#include <assert.h>
+#include <talloc.h>
+
+#include <tid_internal.h>
+#include <tr_debug.h>
-#include <trust_router/tid.h>
#include <jansson.h>
+static int destroy_tid_req(TID_REQ *req)
+{
+ if (req->json_references)
+ json_decref(req->json_references);
+ if (req->free_conn) {
+ if (req->conn)
+ close(req->conn);
+ if (req->gssctx) {
+ OM_uint32 minor;
+ gss_delete_sec_context( &minor, &req->gssctx, NULL);
+ }
+ }
+ if (req->rp_realm!=NULL)
+ tr_free_name(req->rp_realm);
+ if (req->realm!=NULL)
+ tr_free_name(req->realm);
+ if (req->comm!=NULL)
+ tr_free_name(req->comm);
+ if (req->orig_coi!=NULL)
+ tr_free_name(req->orig_coi);
+ return 0;
+}
+
TID_REQ *tid_req_new()
{
- TID_REQ *req = calloc(sizeof(TID_REQ), 1);
+ TID_REQ *req = talloc_zero(NULL, TID_REQ);
if(!req)
return NULL;
+ talloc_set_destructor(req, destroy_tid_req);
req->json_references = json_array();
assert(req->json_references);
req->conn = -1;
+ req->free_conn = 1;
return req;
}
return(req->orig_coi);
}
-void tid_req_set_rp_orig_coi(TID_REQ *req, TR_NAME *orig_coi)
+void tid_req_set_orig_coi(TID_REQ *req, TR_NAME *orig_coi)
{
req->orig_coi = orig_coi;
}
req->cookie = cookie;
}
+/* struct is allocated in talloc null context */
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");
+ if (NULL == (new_req = talloc_zero(NULL, TID_REQ))) {
+ tr_crit("tid_dup_req: Can't allocated duplicate request.");
return NULL;
}
/* Memcpy for flat fields, not valid until names are duped. */
memcpy(new_req, orig_req, sizeof(TID_REQ));
json_incref(new_req->json_references);
+ new_req->free_conn = 0;
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");
+ tr_crit("tid_dup_req: Can't duplicate request (names).");
}
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");
+ tr_crit("tid_dup_req: Can't duplicate request (orig_coi).");
}
}
}
+/* Adds the JSON object ref to req's list of objects to release when the
+ * req is freed.
+ */
void tid_req_cleanup_json( TID_REQ *req, json_t *ref)
{
(void) json_array_append_new(req->json_references, ref);
}
+
+void tid_req_free(TID_REQ *req)
+{
+ talloc_free(req);
+}
+
+int tid_req_add_path(TID_REQ *req,
+ const char *this_system, unsigned port)
+{
+ char *path_element = talloc_asprintf(req, "%s:%u",
+ this_system, port);
+ if (!req->path) {
+ req->path = json_array();
+ if (!req->path)
+ return -1;
+ tid_req_cleanup_json(req, req->path);
+ }
+ return json_array_append( req->path, json_string(path_element));
+}
+
+
+
+void tid_srvr_get_address(const TID_SRVR_BLK *blk,
+ const struct sockaddr **out_addr,
+ size_t *out_len)
+{
+ struct sockaddr_in *sa = NULL;
+ assert(blk);
+ sa = talloc_zero(blk, struct sockaddr_in);
+ sa->sin_family = AF_INET;
+ inet_aton(blk->aaa_server_addr, &(sa->sin_addr));
+ sa->sin_port = htons(2083); /* radsec port */
+ *out_addr = (struct sockaddr *) sa;
+ *out_len = sizeof( struct sockaddr_in);
+}
+
+DH *tid_srvr_get_dh( TID_SRVR_BLK *blk)
+{
+ assert(blk);
+ return blk->aaa_server_dh;
+}
+
+const TR_NAME *tid_srvr_get_key_name(
+ const TID_SRVR_BLK *blk)
+{
+ assert(blk);
+ return blk->key_name;
+}