#include <tr_comm.h>
#include <tr_idp.h>
#include <tr_rp.h>
+#include <tr_rp_client.h>
#include <tr_event.h>
#include <tr_debug.h>
#include <gsscon.h>
+#include <trp_route.h>
#include <trp_internal.h>
#include <tr_config.h>
#include <tr_mq.h>
#include <tr_util.h>
#include <tr_tid.h>
+#include <tr_comm.h>
/* Structure to hold data for the tid response callback */
typedef struct tr_resp_cookie {
int thread_id;
pthread_mutex_t mutex; /* lock on the mq (separate from the locking within the mq, see below) */
TR_MQ *mq; /* messages from thread to main process; set to NULL to disable response */
- TR_NAME *aaa_hostname;
+ TR_AAA_SERVER *aaa; /* AAA server to contact */
DH *dh_params;
TID_REQ *fwd_req; /* the req to duplicate */
};
static int tr_tids_fwd_cookie_destructor(void *obj)
{
struct tr_tids_fwd_cookie *c=talloc_get_type_abort(obj, struct tr_tids_fwd_cookie);
- if (c->aaa_hostname!=NULL)
- tr_free_name(c->aaa_hostname);
if (c->dh_params!=NULL)
tr_destroy_dh_params(c->dh_params);
return 0;
TIDC_INSTANCE *tidc=tidc_create();
TR_MQ_MSG *msg=NULL;
TR_RESP_COOKIE *cookie=NULL;
+ char *aaa_hostname = NULL;
+ int aaa_port;
int rc=0;
int success=0;
/* create the cookie we will use for our response */
cookie=talloc(tmp_ctx, TR_RESP_COOKIE);
if (cookie==NULL) {
- tr_notice("tr_tids_req_fwd_thread: unable to allocate response cookie.");
+ tr_crit("tr_tids_req_fwd_thread: unable to allocate response cookie.");
success=0;
goto cleanup;
}
}
/* Set-up TID connection */
+ aaa_hostname = tr_name_strdup(tr_aaa_server_get_hostname(args->aaa));
+ if (aaa_hostname == NULL) {
+ tr_crit("tr_tids_req_fwd_thread: unable to allocate AAA hostname string");
+ success=0;
+ goto cleanup;
+ }
+ aaa_port = tr_aaa_server_get_port(args->aaa);
+ if ((aaa_port <= 0) || (aaa_port > 65535)) {
+ tr_notice("tr_tids_req_fwd_thread: invalid port (%d) for %s", aaa_port, aaa_hostname);
+ success=0;
+ goto cleanup;
+ }
+
if (-1==(args->fwd_req->conn = tidc_open_connection(tidc,
- args->aaa_hostname->buf,
- TID_PORT, /* TODO: make this configurable */
- &(args->fwd_req->gssctx)))) {
+ aaa_hostname,
+ aaa_port,
+ &(args->fwd_req->gssctx)))) {
tr_notice("tr_tids_req_fwd_thread: Error in tidc_open_connection.");
/* tids_send_err_response(tids, orig_req, "Can't open connection to next hop TIDS"); */
/* TODO: encode reason for failure */
success=0;
goto cleanup;
};
- tr_debug("tr_tids_req_fwd_thread: thread %d opened TID connection to %s.",
- cookie->thread_id,
- args->aaa_hostname->buf);
+ tr_debug("tr_tids_req_fwd_thread: thread %d opened TID connection to %s:%d.",
+ cookie->thread_id, aaa_hostname, aaa_port);
/* Send a TID request. */
if (0 > (rc = tidc_fwd_request(tidc, args->fwd_req, tr_tidc_resp_handler, (void *)cookie))) {
}
/* cookie->resp should now contain our copy of the response */
success=1;
- tr_debug("tr_tids_req_fwd_thread: thread %d received response.");
+ tr_debug("tr_tids_req_fwd_thread: thread %d received response.", cookie->thread_id);
cleanup:
/* Notify parent thread of the response, if it's still listening. */
/* mq is still valid, so we can queue our response */
tr_debug("tr_tids_req_fwd_thread: thread %d using valid msg queue.", cookie->thread_id);
if (success)
- msg=tr_mq_msg_new(tmp_ctx, TR_TID_MQMSG_SUCCESS, TR_MQ_PRIO_NORMAL);
+ msg= tr_mq_msg_new(tmp_ctx, TR_TID_MQMSG_SUCCESS);
else
- msg=tr_mq_msg_new(tmp_ctx, TR_TID_MQMSG_FAILURE, TR_MQ_PRIO_NORMAL);
+ msg= tr_mq_msg_new(tmp_ctx, TR_TID_MQMSG_FAILURE);
if (msg==NULL)
tr_notice("tr_tids_req_fwd_thread: thread %d unable to allocate response msg.", cookie->thread_id);
tr_notice("tr_tids_req_fwd_thread: Error releasing mutex.");
}
+ if (aaa_hostname != NULL)
+ free(aaa_hostname);
+
talloc_free(tmp_ctx);
return NULL;
}
if ((r1->result!=TID_SUCCESS) || (r2->result!=TID_SUCCESS))
return TID_ERROR;
- if ((0!=tr_name_cmp(r1->rp_realm, r2->rp_realm)) ||
- (0!=tr_name_cmp(r1->realm, r2->realm)) ||
- (0!=tr_name_cmp(r1->comm, r2->comm)))
- return TID_ERROR;
+ if ((0 == tr_name_cmp(r1->rp_realm, r2->rp_realm))
+ && (0 == tr_name_cmp(r1->realm, r2->realm))
+ && ( (0 == tr_name_cmp(r1->comm, r2->comm))
+ || (0 == tr_name_cmp(r1->comm, r2->orig_coi))
+ || (0 == tr_name_cmp(r1->orig_coi, r2->comm)))) {
+
+ tid_srvr_blk_add(r1->servers, tid_srvr_blk_dup(r1, r2->servers));
+ return TID_SUCCESS;
+ }
- tid_srvr_blk_add(r1->servers, tid_srvr_blk_dup(r1, r2->servers));
- return TID_SUCCESS;
+ return TID_ERROR;
}
+enum map_coi_result {
+ MAP_COI_SUCCESS = 0,
+ MAP_COI_MAP_NOT_REQUIRED,
+ MAP_COI_ALREADY_MAPPED,
+ MAP_COI_NO_APC,
+ MAP_COI_INVALID_APC,
+ MAP_COI_UNKNOWN_COMM,
+ MAP_COI_ERROR
+};
+
+static enum map_coi_result map_coi(TR_COMM_TABLE *ctable, TID_REQ *req)
+{
+ TR_COMM *orig_comm;
+ TR_NAME *apc_name;
+ TR_COMM *apc;
+ TR_APC *apcs;
+
+ if (tid_req_get_orig_coi(req) != NULL)
+ return MAP_COI_ALREADY_MAPPED;
+
+ /* look up the community */
+ orig_comm = tr_comm_table_find_comm(ctable, tid_req_get_comm(req));
+ if (orig_comm == NULL)
+ return MAP_COI_UNKNOWN_COMM;
+
+ if (tr_comm_get_type(orig_comm) == TR_COMM_APC)
+ return MAP_COI_MAP_NOT_REQUIRED; /* it was already an APC, no mapping to do */
+
+ /* use first (only) APC. These are just APC names */
+ apcs = tr_comm_get_apcs(orig_comm);
+ if ((!apcs) || (!tr_apc_get_id(apcs)))
+ return MAP_COI_NO_APC;
+
+ /* get our own copy of the APC name */
+ apc_name = tr_dup_name(tr_apc_get_id(apcs));
+ if (apc_name == NULL) {
+ tr_err("map_coi: Error allocating apc_name");
+ return MAP_COI_ERROR;
+ }
+
+ /* Check that the APC is configured */
+ apc = tr_comm_table_find_comm(ctable, apc_name);
+ if (apc == NULL) {
+ tr_free_name(apc_name);
+ return MAP_COI_INVALID_APC;
+ }
+
+ tid_req_set_orig_coi(req, tid_req_get_comm(req)); /* was null, so no need to free anything */
+ tid_req_set_comm(req, apc_name); /* original contents will be freed via orig_coi */
+
+ return MAP_COI_SUCCESS; /* successfully mapped */
+}
+
+/**
+ * Process a TID request
+ *
+ * Return value of -1 means to send a TID_ERROR response. Fill in resp->err_msg or it will
+ * be returned as a generic error.
+ *
+ * @param tids
+ * @param orig_req
+ * @param resp
+ * @param cookie_in
+ * @return
+ */
static int tr_tids_req_handler(TIDS_INSTANCE *tids,
TID_REQ *orig_req,
TID_RESP *resp,
TID_RESP *aaa_resp[TR_TID_MAX_AAA_SERVERS]={NULL};
TR_RP_CLIENT *rp_client=NULL;
TR_RP_CLIENT_ITER *rpc_iter=NULL;
- TR_NAME *apc = NULL;
TID_REQ *fwd_req = NULL;
TR_COMM *cfg_comm = NULL;
TR_COMM *cfg_apc = NULL;
tr_debug("tr_tids_req_handler: Request received (conn = %d)! Realm = %s, Comm = %s", orig_req->conn,
orig_req->realm->buf, orig_req->comm->buf);
+ if (orig_req->request_id)
+ tr_debug("tr_tids_req_handler: TID request ID: %.*s", orig_req->request_id->len, orig_req->request_id->buf);
+ else
+ tr_debug("tr_tids_req_handler: TID request ID: none");
+
tids->req_count++;
/* Duplicate the request, so we can modify and forward it */
if (NULL == (fwd_req=tid_dup_req(orig_req))) {
tr_debug("tr_tids_req_handler: Unable to duplicate request.");
- retval=-1;
+ retval=-1; /* response will be a generic internal error */
goto cleanup;
}
talloc_steal(tmp_ctx, fwd_req);
+ /* cfg_comm is now the community (APC or CoI) of the incoming request */
if (NULL == (cfg_comm=tr_comm_table_find_comm(cfg_mgr->active->ctable, orig_req->comm))) {
tr_notice("tr_tids_req_hander: Request for unknown comm: %s.", orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "Unknown community");
+ tid_resp_set_err_msg(resp, tr_new_name("Unknown community"));
retval=-1;
goto cleanup;
}
if (!tids->gss_name) {
tr_notice("tr_tids_req_handler: No GSS name for incoming request.");
- tids_send_err_response(tids, orig_req, "No GSS name for request");
+ tid_resp_set_err_msg(resp, tr_new_name("No GSS name for request"));
retval=-1;
goto cleanup;
}
target=tr_filter_target_tid_req(tmp_ctx, orig_req);
if (target==NULL) {
tr_crit("tid_req_handler: Unable to allocate filter target, cannot apply filter!");
- tids_send_err_response(tids, orig_req, "Incoming TID request filter error");
+ tid_resp_set_err_msg(resp, tr_new_name("Incoming TID request filter error"));
retval=-1;
goto cleanup;
}
/* We get here whether or not a filter matched. If tr_filter_apply() doesn't match, it returns
* a default action of reject, so we don't have to check why we exited the loop. */
if (oaction != TR_FILTER_ACTION_ACCEPT) {
- tr_notice("tr_tids_req_handler: Incoming TID request rejected by filter for GSS name", orig_req->rp_realm->buf);
- tids_send_err_response(tids, orig_req, "Incoming TID request filter error");
+ tr_notice("tr_tids_req_handler: Incoming TID request rejected by RP client filter for GSS name %.*s",
+ tids->gss_name->len, tids->gss_name->buf);
+ tid_resp_set_err_msg(resp, tr_new_name("Incoming TID request filter error"));
retval = -1;
goto cleanup;
}
/* Check that the rp_realm is a member of the community in the request */
if (NULL == tr_comm_find_rp(cfg_mgr->active->ctable, cfg_comm, orig_req->rp_realm)) {
- tr_notice("tr_tids_req_handler: RP Realm (%s) not member of community (%s).", orig_req->rp_realm->buf, orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "RP COI membership error");
+ tr_notice("tr_tids_req_handler: RP Realm (%s) not member of community (%s).",
+ orig_req->rp_realm->buf, orig_req->comm->buf);
+ tid_resp_set_err_msg(resp, tr_new_name("RP community membership error"));
retval=-1;
goto cleanup;
}
- /* Map the comm in the request from a COI to an APC, if needed */
- if (TR_COMM_COI == cfg_comm->type) {
- if (orig_req->orig_coi!=NULL) {
- tr_notice("tr_tids_req_handler: community %s is COI but COI to APC mapping already occurred. Dropping request.",
- orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "Second COI to APC mapping would result, permitted only once.");
- retval=-1;
- goto cleanup;
- }
-
- tr_debug("tr_tids_req_handler: Community was a COI, switching.");
- /* TBD -- In theory there can be more than one? How would that work? */
- if ((!cfg_comm->apcs) || (!cfg_comm->apcs->id)) {
- tr_notice("No valid APC for COI %s.", orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "No valid APC for community");
- retval=-1;
+ switch(map_coi(cfg_mgr->active->ctable, fwd_req)) {
+ case MAP_COI_MAP_NOT_REQUIRED:
+ cfg_apc = cfg_comm;
+ break;
+
+ case MAP_COI_SUCCESS:
+ cfg_apc = tr_comm_table_find_comm(cfg_mgr->active->ctable, tid_req_get_comm(fwd_req));
+ tr_debug("tr_tids_req_handler: Community %.*s is a COI, mapping to APC %.*s.",
+ tid_req_get_orig_coi(fwd_req)->len, tid_req_get_orig_coi(fwd_req)->buf,
+ tr_comm_get_id(cfg_apc)->len, tr_comm_get_id(cfg_apc)->buf);
+ break;
+
+ case MAP_COI_ALREADY_MAPPED:
+ tr_notice("tr_tids_req_handler: community %.*s is COI but COI to APC mapping already occurred. Dropping request.",
+ tid_req_get_comm(orig_req)->len, tid_req_get_comm(orig_req)->buf);
+ tid_resp_set_err_msg(resp, tr_new_name("Second COI to APC mapping would result, permitted only once."));
+ retval = -1;
goto cleanup;
- }
- apc = tr_dup_name(cfg_comm->apcs->id);
- /* Check that the APC is configured */
- if (NULL == (cfg_apc = tr_comm_table_find_comm(cfg_mgr->active->ctable, apc))) {
- tr_notice("tr_tids_req_hander: Request for unknown comm: %s.", apc->buf);
- tids_send_err_response(tids, orig_req, "Unknown APC");
- retval=-1;
+ case MAP_COI_NO_APC:
+ tr_notice("No valid APC for COI %.*s.",
+ tid_req_get_comm(orig_req)->len, tid_req_get_comm(orig_req)->buf);
+ tid_resp_set_err_msg(resp, tr_new_name("No valid APC for community"));
+ retval = -1;
goto cleanup;
- }
- fwd_req->comm = apc;
- fwd_req->orig_coi = orig_req->comm;
+ case MAP_COI_INVALID_APC:
+ tr_notice("tr_tids_req_hander: Request for unknown APC.");
+ tid_resp_set_err_msg(resp, tr_new_name("Unknown APC"));
+ retval = -1;
+ goto cleanup;
- /* Check that rp_realm is a member of this APC */
- if (NULL == (tr_comm_find_rp(cfg_mgr->active->ctable, cfg_apc, orig_req->rp_realm))) {
- tr_notice("tr_tids_req_hander: RP Realm (%s) not member of community (%s).", orig_req->rp_realm->buf, orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "RP APC membership error");
- retval=-1;
+ default:
+ tr_notice("tr_tids_req_hander: Unexpected error mapping COI to APC.");
+ retval = -1;
goto cleanup;
- }
}
- /* Look up the route for this community/realm. */
+ /* cfg_comm is now the original community, and cfg_apc is the APC it belongs to. These
+ * may both be the same. If not, check that rp_realm is a member of the mapped APC */
+ if ((cfg_apc != cfg_comm)
+ && (NULL == tr_comm_find_rp(cfg_mgr->active->ctable,
+ cfg_apc,
+ tid_req_get_rp_realm(fwd_req)))) {
+ tr_notice("tr_tids_req_hander: RP Realm (%.*s) not member of mapped APC (%.*s).",
+ tid_req_get_rp_realm(fwd_req)->len, tid_req_get_rp_realm(fwd_req)->buf,
+ tr_comm_get_id(cfg_apc)->len, tr_comm_get_id(cfg_apc)->buf);
+ tid_resp_set_err_msg(resp, tr_new_name("RP community membership error"));
+ retval=-1;
+ goto cleanup;
+ }
+
+ /* Look up the route for forwarding request's community/realm. */
tr_debug("tr_tids_req_handler: looking up route.");
- route=trps_get_selected_route(trps, orig_req->comm, orig_req->realm);
+ route=trps_get_selected_route(trps, fwd_req->comm, fwd_req->realm);
if (route==NULL) {
/* No route. Use default AAA servers if we have them. */
- tr_debug("tr_tids_req_handler: No route for realm %s, defaulting.", orig_req->realm->buf);
+ tr_debug("tr_tids_req_handler: No route for realm %s, defaulting.", fwd_req->realm->buf);
if (NULL == (aaa_servers = tr_default_server_lookup(cfg_mgr->active->default_servers,
- orig_req->comm))) {
+ fwd_req->comm))) {
tr_notice("tr_tids_req_handler: No default AAA servers, discarded.");
- tids_send_err_response(tids, orig_req, "No path to AAA Server(s) for realm");
+ tid_resp_set_err_msg(resp, tr_new_name("No path to AAA Server(s) for realm"));
retval = -1;
goto cleanup;
}
idp_shared = 0;
} else {
- /* Found a route. Determine the AAA servers or next hop address. */
+ /* Found a route. Determine the AAA servers or next hop address for the request we are forwarding. */
tr_debug("tr_tids_req_handler: found route.");
if (trp_route_is_local(route)) {
tr_debug("tr_tids_req_handler: route is local.");
aaa_servers = tr_idp_aaa_server_lookup(cfg_mgr->active->ctable->idp_realms,
- orig_req->realm,
- orig_req->comm,
+ fwd_req->realm,
+ fwd_req->comm,
&idp_shared);
} else {
tr_debug("tr_tids_req_handler: route not local.");
- aaa_servers = tr_aaa_server_new(tmp_ctx, trp_route_get_next_hop(route));
+ aaa_servers = tr_aaa_server_new(tmp_ctx); /* cleaned up via talloc */
+ if (aaa_servers == NULL) {
+ tr_err("tr_tids_req_handler: error allocating next hop");
+ retval=-1;
+ goto cleanup;
+ }
+ tr_aaa_server_set_hostname(aaa_servers, trp_route_dup_next_hop(route));
+ if (tr_aaa_server_get_hostname(aaa_servers) == NULL) {
+ tr_err("tr_tids_req_handler: error allocating next hop");
+ retval=-1;
+ goto cleanup;
+ }
+ tr_aaa_server_set_port(aaa_servers, trp_route_get_next_hop_port(route));
idp_shared = 0;
}
- /* Since we aren't defaulting, check idp coi and apc membership */
- if (NULL == (tr_comm_find_idp(cfg_mgr->active->ctable, cfg_comm, fwd_req->realm))) {
- tr_notice("tr_tids_req_handler: IDP Realm (%s) not member of community (%s).", orig_req->realm->buf, orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "IDP community membership error");
+ /* Since we aren't defaulting, check idp coi and apc membership of the original request */
+ if (NULL == (tr_comm_find_idp(cfg_mgr->active->ctable, cfg_comm, orig_req->realm))) {
+ tr_notice("tr_tids_req_handler: IDP Realm (%s) not member of community (%s).", orig_req->realm->buf, cfg_comm->id->buf);
+ tid_resp_set_err_msg(resp, tr_new_name("IDP community membership error"));
retval=-1;
goto cleanup;
}
- if ( cfg_apc && (NULL == (tr_comm_find_idp(cfg_mgr->active->ctable, cfg_apc, fwd_req->realm)))) {
- tr_notice("tr_tids_req_handler: IDP Realm (%s) not member of APC (%s).", orig_req->realm->buf, orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "IDP APC membership error");
+ if ( cfg_apc && (NULL == (tr_comm_find_idp(cfg_mgr->active->ctable, cfg_apc, orig_req->realm)))) {
+ tr_notice("tr_tids_req_handler: IDP Realm (%s) not member of APC (%s).", orig_req->realm->buf, cfg_apc->id->buf);
+ tid_resp_set_err_msg(resp, tr_new_name("IDP APC membership error"));
retval=-1;
goto cleanup;
}
}
- /* Make sure we came through with a AAA server. If not, we can't handle the request. */
+ /* Make sure we came through with a AAA server. If not, we can't handle the request.
+ * Report using the original request, not translated values. */
if (NULL == aaa_servers) {
tr_notice("tr_tids_req_handler: no route or AAA server for realm (%s) in community (%s).",
orig_req->realm->buf, orig_req->comm->buf);
- tids_send_err_response(tids, orig_req, "Missing trust route error");
+ tid_resp_set_err_msg(resp, tr_new_name("Missing trust route error"));
retval = -1;
goto cleanup;
}
/* send a TID request to the AAA server(s), and get the answer(s) */
tr_debug("tr_tids_req_handler: sending TID request(s).");
- if (cfg_apc)
- expiration_interval = cfg_apc->expiration_interval;
- else expiration_interval = cfg_comm->expiration_interval;
+ /* Use the smaller of the APC's expiration interval and the expiration interval of the incoming request */
+ expiration_interval = cfg_apc->expiration_interval;
if (fwd_req->expiration_interval)
fwd_req->expiration_interval = (expiration_interval < fwd_req->expiration_interval) ? expiration_interval : fwd_req->expiration_interval;
- else fwd_req->expiration_interval = expiration_interval;
+ else
+ fwd_req->expiration_interval = expiration_interval;
/* Set up message queue for replies from req forwarding threads */
mq=tr_mq_new(tmp_ctx);
goto cleanup;
}
aaa_cookie[n_aaa]->mq=mq;
- aaa_cookie[n_aaa]->aaa_hostname=tr_dup_name(this_aaa->hostname);
+ aaa_cookie[n_aaa]->aaa=this_aaa;
aaa_cookie[n_aaa]->dh_params=tr_dh_dup(orig_req->tidc_dh);
aaa_cookie[n_aaa]->fwd_req=tid_dup_req(fwd_req);
talloc_steal(aaa_cookie[n_aaa], aaa_cookie[n_aaa]->fwd_req);
}
if (n_responses==0) {
- /* No requests succeeded. Forward an error if we got any error responses. */
+ /* No requests succeeded, so this will be an error */
+ retval = -1;
+
+ /* If we got any error responses, send an arbitrarily chosen one. */
for (ii=0; ii<n_aaa; ii++) {
- if (aaa_resp[ii]!=NULL)
- tids_send_response(tids, orig_req, aaa_resp[ii]);
- else
- tids_send_err_response(tids, orig_req, "Unable to contact AAA server(s).");
+ if (aaa_resp[ii] != NULL) {
+ tid_resp_cpy(resp, aaa_resp[ii]);
+ goto cleanup;
+ }
}
+ /* No error responses at all, so generate our own error. */
+ tid_resp_set_err_msg(resp, tr_new_name("Unable to contact AAA server(s)."));
+ goto cleanup;
}
/* success! */
/* called when a connection to the TIDS port is received */
static void tr_tids_event_cb(int listener, short event, void *arg)
{
- TIDS_INSTANCE *tids = (TIDS_INSTANCE *)arg;
+ TIDS_INSTANCE *tids = talloc_get_type_abort(arg, TIDS_INSTANCE);
if (0==(event & EV_READ))
tr_debug("tr_tids_event_cb: unexpected event on TIDS socket (event=0x%X)", event);
tids_accept(tids, listener);
}
-/* Configure the tids instance and set up its event handler.
+/* called when it's time to sweep for completed TID child processes */
+static void tr_tids_sweep_cb(int listener, short event, void *arg)
+{
+ TIDS_INSTANCE *tids = talloc_get_type_abort(arg, TIDS_INSTANCE);
+
+ if (0==(event & EV_TIMEOUT))
+ tr_debug("tr_tids_event_cb: unexpected event on TID process sweep timer (event=0x%X)", event);
+ else
+ tids_sweep_procs(tids);
+}
+
+/* Configure the tids instance and set up its event handlers.
* Returns 0 on success, nonzero on failure. Fills in
* *tids_event (which should be allocated by caller). */
-int tr_tids_event_init(struct event_base *base,
- TIDS_INSTANCE *tids,
- TR_CFG_MGR *cfg_mgr,
- TRPS_INSTANCE *trps,
- struct tr_socket_event *tids_ev)
+int tr_tids_event_init(struct event_base *base, TIDS_INSTANCE *tids, TR_CFG_MGR *cfg_mgr, TRPS_INSTANCE *trps,
+ struct tr_socket_event *tids_ev, struct event **sweep_ev)
{
TALLOC_CTX *tmp_ctx=talloc_new(NULL);
struct tr_tids_event_cookie *cookie=NULL;
+ struct timeval sweep_interval;
int retval=0;
- size_t ii=0;
+ int ii=0;
if (tids_ev == NULL) {
tr_debug("tr_tids_event_init: Null tids_ev.");
goto cleanup;
}
+ if (sweep_ev == NULL) {
+ tr_debug("tr_tids_event_init: Null sweep_ev.");
+ retval = 1;
+ goto cleanup;
+ }
+
/* Create the cookie for callbacks. We'll put it in the tids context, so it will
* be cleaned up when tids is freed by talloc_free. */
cookie=talloc(tmp_ctx, struct tr_tids_event_cookie);
talloc_steal(tids, cookie);
/* get a tids listener */
- tids_ev->n_sock_fd=tids_get_listener(tids,
- tr_tids_req_handler,
- tr_tids_gss_handler,
- cfg_mgr->active->internal->hostname,
- cfg_mgr->active->internal->tids_port,
- (void *)cookie,
- tids_ev->sock_fd,
- TR_MAX_SOCKETS);
+ tids_ev->n_sock_fd = (int)tids_get_listener(tids,
+ tr_tids_req_handler,
+ tr_tids_gss_handler,
+ cfg_mgr->active->internal->hostname,
+ cfg_mgr->active->internal->tids_port,
+ (void *)cookie,
+ tids_ev->sock_fd,
+ TR_MAX_SOCKETS);
if (tids_ev->n_sock_fd==0) {
tr_crit("Error opening TID server socket.");
retval=1;
goto cleanup;
}
- /* Set up events */
+ /* Set up listener events */
for (ii=0; ii<tids_ev->n_sock_fd; ii++) {
tids_ev->ev[ii]=event_new(base,
tids_ev->sock_fd[ii],
event_add(tids_ev->ev[ii], NULL);
}
+ /* Set up a periodic check for completed TID handler processes */
+ *sweep_ev = event_new(base, -1, EV_TIMEOUT|EV_PERSIST, tr_tids_sweep_cb, tids);
+ sweep_interval.tv_sec = 10;
+ sweep_interval.tv_usec = 0;
+ event_add(*sweep_ev, &sweep_interval);
+
cleanup:
talloc_free(tmp_ctx);
return retval;
projects / trust_router.git / blobdiff