-#include <stdio.h> /* TODO: remove this --jlr */
+/*
+ * Copyright (c) 2016, 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 <stdio.h>
#include <pthread.h>
#include <fcntl.h>
#include <event2/event.h>
tr_debug("tr_trps_event_cb: unexpected event on TRPS socket (event=0x%X)", event);
} else {
/* create a thread to handle this connection */
- asprintf(&name, "trustrouter@%s", trps->hostname);
+ if (asprintf(&name, "trustrouter@%s", trps->hostname)==-1) {
+ goto cleanup;
+ }
gssname=tr_new_name(name);
free(name); name=NULL;
conn=trp_connection_accept(tmp_ctx, listener, gssname);
pthread_create(trp_connection_get_thread(conn), NULL, tr_trps_thread, thread_data);
}
}
+
+ cleanup:
talloc_free(tmp_ctx);
}
/* everything belonging to the thread is in the TRP_CONNECTION
* associated with it */
tr_debug("tr_trps_cleanup_conn: freeing %p", conn);
-/* pthread_join(*trp_connection_get_thread(conn), NULL); -- removed while debugging, put back!!! --jlr */
+ pthread_join(*trp_connection_get_thread(conn), NULL);
trps_remove_connection(trps, conn);
- talloc_report_full(conn, stderr);
trp_connection_free(conn);
tr_debug("tr_trps_cleanup_conn: deleted connection");
}
tr_debug("tr_trps_cleanup_trpc: deleted connection");
}
-static void tr_trps_print_route_table(TRPS_INSTANCE *trps, FILE *f)
+/**
+ * Get a dynamically allocated string with a description of the route table.
+ * Caller must free the string using talloc_free().
+ *
+ * @param memctx talloc context for the string
+ * @param trps trps instance containing the route table
+ * @return pointer to the output, or NULL on error
+ */
+static char *tr_trps_route_table_to_str(TALLOC_CTX *memctx, TRPS_INSTANCE *trps)
{
- char *table=trp_rtable_to_str(NULL, trps->rtable, " | ", NULL);
- if (table==NULL)
- fprintf(f, "Unable to print route table.\n");
- else {
- fprintf(f, "%s\n", table);
- talloc_free(table);
- }
+ return trp_rtable_to_str(memctx, trps->rtable, " | ", NULL);
+}
+
+/**
+ * Get a dynamically allocated string with a description of the community table.
+ * Caller must free the string using talloc_free().
+ *
+ * @param memctx talloc context for the string
+ * @param trps trps instance containing the community table
+ * @return pointer to the output, or NULL on error
+ */
+static char *tr_trps_comm_table_to_str(TALLOC_CTX *memctx, TRPS_INSTANCE *trps)
+{
+ return tr_comm_table_to_str(memctx, trps->ctable);
}
+/**
+ * Event handler to process TRP messages from connection threads. These
+ * are added to the message queue (mq) in tr_trps_msg_handler(), which
+ * runs in the other threads.
+ *
+ * @param socket Ignored
+ * @param event Ignored
+ * @param arg Pointer to the TRPS_INSTANCE
+ */
static void tr_trps_process_mq(int socket, short event, void *arg)
{
TRPS_INSTANCE *trps=talloc_get_type_abort(arg, TRPS_INSTANCE);
TR_MQ_MSG *msg=NULL;
const char *s=NULL;
- talloc_report_full(trps->mq, stderr);
msg=trps_mq_pop(trps);
while (msg!=NULL) {
s=tr_mq_msg_get_message(msg);
TR_NAME *gssname=(TR_NAME *)tr_mq_msg_get_payload(msg);
TRP_PEER *peer=trps_get_peer_by_gssname(trps, gssname);
if (peer==NULL)
- tr_err("tr_trps_process_mq: incoming connection to unknown peer (%s) reported.", gssname->buf);
+ tr_err("tr_trps_process_mq: incoming connection from unknown peer (%s) reported.", gssname->buf);
else {
trp_peer_set_incoming_status(peer, PEER_CONNECTED);
- tr_err("tr_trps_process_mq: incoming connection to %s established.", gssname->buf);
+ tr_err("tr_trps_process_mq: incoming connection from %s established.", gssname->buf);
}
}
else if (0==strcmp(s, TR_MQMSG_TRPS_DISCONNECTED)) {
TR_NAME *gssname=trp_connection_get_gssname(conn);
TRP_PEER *peer=trps_get_peer_by_gssname(trps, gssname);
if (peer==NULL) {
- tr_err("tr_trps_process_mq: disconnection of unknown peer (%s) reported.",
+ tr_err("tr_trps_process_mq: incoming connection from unknown peer (%s) lost.",
trp_connection_get_gssname(conn)->buf);
} else {
trp_peer_set_incoming_status(peer, PEER_DISCONNECTED);
tr_trps_cleanup_conn(trps, conn);
- tr_err("tr_trps_process_mq: incoming connection to %s lost.", gssname->buf);
+ tr_err("tr_trps_process_mq: incoming connection from %s lost.", gssname->buf);
}
}
else if (0==strcmp(s, TR_MQMSG_TRPC_CONNECTED)) {
TR_NAME *svcname=(TR_NAME *)tr_mq_msg_get_payload(msg);
TRP_PEER *peer=trps_get_peer_by_servicename(trps, svcname);
if (peer==NULL)
- tr_err("tr_trps_process_mq: connection to unknown peer (%s) reported.", svcname->buf);
+ tr_err("tr_trps_process_mq: outgoing connection to unknown peer (%s) reported.", svcname->buf);
else {
trp_peer_set_outgoing_status(peer, PEER_CONNECTED);
tr_err("tr_trps_process_mq: outgoing connection to %s established.", svcname->buf);
/* trpc connection died */
TRPC_INSTANCE *trpc=talloc_get_type_abort(tr_mq_msg_get_payload(msg), TRPC_INSTANCE);
TR_NAME *gssname=trpc_get_gssname(trpc);
- TRP_PEER *peer=trps_get_peer_by_gssname(trps, gssname);
+ TRP_PEER *peer=trps_get_peer_by_servicename(trps, gssname);
if (peer==NULL)
- tr_err("tr_trps_process_mq: disconnection of unknown peer (%s) reported.", gssname->buf);
+ tr_err("tr_trps_process_mq: outgoing connection to unknown peer (%s) lost.", gssname->buf);
else {
trp_peer_set_outgoing_status(peer, PEER_DISCONNECTED);
tr_err("tr_trps_process_mq: outgoing connection to %s lost.", gssname->buf);
else if (0==strcmp(s, TR_MQMSG_MSG_RECEIVED)) {
if (trps_handle_tr_msg(trps, tr_mq_msg_get_payload(msg))!=TRP_SUCCESS)
tr_notice("tr_trps_process_mq: error handling message.");
- else {
- tr_trps_print_route_table(trps, stderr);
- }
}
else
tr_notice("tr_trps_process_mq: unknown message '%s' received.", tr_mq_msg_get_message(msg));
TRPS_INSTANCE *trps=cookie->trps;
struct event *ev=cookie->ev;
- tr_debug("tr_trps_update: sending scheduled route updates.");
+ tr_debug("tr_trps_update: sending scheduled route/community updates.");
trps_update(trps, TRP_UPDATE_SCHEDULED);
event_add(ev, &(trps->update_interval));
+ tr_debug("tr_trps_update: update interval=%d", trps->update_interval.tv_sec);
}
static void tr_trps_sweep(int listener, short event, void *arg)
struct tr_trps_event_cookie *cookie=talloc_get_type_abort(arg, struct tr_trps_event_cookie);
TRPS_INSTANCE *trps=cookie->trps;
struct event *ev=cookie->ev;
+ char *table_str=NULL;
tr_debug("tr_trps_sweep: sweeping routes.");
trps_sweep_routes(trps);
- tr_trps_print_route_table(trps, stderr);
+ tr_debug("tr_trps_sweep: sweeping communities.");
+ trps_sweep_ctable(trps);
+ table_str=tr_trps_route_table_to_str(NULL, trps);
+ if (table_str!=NULL) {
+ tr_debug(table_str);
+ talloc_free(table_str);
+ }
+
+ table_str=tr_trps_comm_table_to_str(NULL, trps);
+ if (table_str!=NULL) {
+ tr_debug(table_str);
+ talloc_free(table_str);
+ }
/* schedule the event to run again */
event_add(ev, &(trps->sweep_interval));
}
struct tr_trps_event_cookie *sweep_cookie=NULL;
struct timeval zero_time={0,0};
TRP_RC retval=TRP_ERROR;
+ size_t ii=0;
if (tr->events != NULL) {
tr_notice("tr_trps_event_init: tr->events was not null. Freeing before reallocating..");
trps_cookie->cfg_mgr=tr->cfg_mgr;
/* get a trps listener */
- listen_ev->sock_fd=trps_get_listener(tr->trps,
- tr_trps_msg_handler,
- tr_trps_gss_handler,
- tr->cfg_mgr->active->internal->hostname,
- tr->cfg_mgr->active->internal->trps_port,
- (void *)trps_cookie);
- if (listen_ev->sock_fd < 0) {
+ listen_ev->n_sock_fd=trps_get_listener(tr->trps,
+ tr_trps_msg_handler,
+ tr_trps_gss_handler,
+ tr->cfg_mgr->active->internal->hostname,
+ tr->cfg_mgr->active->internal->trps_port,
+ (void *)trps_cookie,
+ listen_ev->sock_fd,
+ TR_MAX_SOCKETS);
+ if (listen_ev->n_sock_fd==0) {
tr_crit("Error opening TRP server socket.");
retval=TRP_ERROR;
tr_trps_events_free(tr->events);
tr->events=NULL;
goto cleanup;
}
- trps_cookie->ev=listen_ev->ev; /* in case it needs to frob the event */
-
- /* and its event */
- listen_ev->ev=event_new(base,
- listen_ev->sock_fd,
- EV_READ|EV_PERSIST,
- tr_trps_event_cb,
- (void *)(tr->trps));
- event_add(listen_ev->ev, NULL);
+
+ /* Set up events for the sockets */
+ for (ii=0; ii<listen_ev->n_sock_fd; ii++) {
+ listen_ev->ev[ii]=event_new(base,
+ listen_ev->sock_fd[ii],
+ EV_READ|EV_PERSIST,
+ tr_trps_event_cb,
+ (void *)(tr->trps));
+ event_add(listen_ev->ev[ii], NULL);
+ }
/* now set up message queue processing event, only triggered by
* tr_trps_mq_cb() */
const char *msg_type=NULL;
char *encoded_msg=NULL;
TR_NAME *peer_gssname=NULL;
+ int n_sent=0;
+ int exit_loop=0;
struct trpc_notify_cb_data cb_data={0,
PTHREAD_COND_INITIALIZER,
trps_mq_add(trps, msg); /* steals msg context */
msg=NULL;
- while(1) {
+ while(!exit_loop) {
cb_data.msg_ready=0;
pthread_cond_wait(&(cb_data.cond), &(cb_data.mutex));
/* verify the condition */
if (cb_data.msg_ready) {
- msg=trpc_mq_pop(trpc);
- if (msg==NULL) {
- /* no message in the queue */
- tr_err("tr_trpc_thread: notified of msg, but queue empty");
- break;
- }
+ for (msg=trpc_mq_pop(trpc),n_sent=0; msg!=NULL; msg=trpc_mq_pop(trpc),n_sent++) {
+ msg_type=tr_mq_msg_get_message(msg);
- msg_type=tr_mq_msg_get_message(msg);
-
- if (0==strcmp(msg_type, TR_MQMSG_ABORT)) {
- tr_mq_msg_free(msg);
- break; /* exit loop */
- }
- else if (0==strcmp(msg_type, TR_MQMSG_TRPC_SEND)) {
- encoded_msg=tr_mq_msg_get_payload(msg);
- if (encoded_msg==NULL)
- tr_notice("tr_trpc_thread: null outgoing TRP message.");
- else {
- rc = trpc_send_msg(trpc, encoded_msg);
- if (rc!=TRP_SUCCESS) {
- tr_notice("tr_trpc_thread: trpc_send_msg failed.");
- tr_mq_msg_free(msg);
- break;
+ if (0==strcmp(msg_type, TR_MQMSG_ABORT)) {
+ exit_loop=1;
+ break;
+ }
+ else if (0==strcmp(msg_type, TR_MQMSG_TRPC_SEND)) {
+ encoded_msg=tr_mq_msg_get_payload(msg);
+ if (encoded_msg==NULL)
+ tr_notice("tr_trpc_thread: null outgoing TRP message.");
+ else {
+ rc = trpc_send_msg(trpc, encoded_msg);
+ if (rc!=TRP_SUCCESS) {
+ tr_notice("tr_trpc_thread: trpc_send_msg failed.");
+ exit_loop=1;
+ break;
+ }
}
}
- }
- else
- tr_notice("tr_trpc_thread: unknown message '%s' received.", msg_type);
+ else
+ tr_notice("tr_trpc_thread: unknown message '%s' received.", msg_type);
- tr_mq_msg_free(msg);
+ tr_mq_msg_free(msg);
+ }
+ if (n_sent==0)
+ tr_err("tr_trpc_thread: notified of msg, but queue empty");
+ else
+ tr_debug("tr_trpc_thread: sent %d messages.", n_sent);
}
}
}
size_t *n_routes)
{
TALLOC_CTX *tmp_ctx=talloc_new(NULL);
- TR_APC *apc=NULL;
+ TR_APC *comm=NULL;
TRP_ROUTE *new_entry=NULL;
TRP_ROUTE **entries=NULL;
- size_t n_apcs=0, ii=0;
+ size_t n_comms=0, ii=0;
*n_routes=0;
- if (realm==NULL)
+ if ((realm==NULL) || (realm->origin!=TR_REALM_LOCAL))
goto cleanup;
- /* count apcs */
- for (apc=realm->apcs, n_apcs=0; apc!=NULL; apc=apc->next,n_apcs++) {}
+ /* count comms */
+ for (comm=realm->apcs, n_comms=0; comm!=NULL; comm=comm->next,n_comms++) {}
- entries=talloc_array(tmp_ctx, TRP_ROUTE *, n_apcs);
- for (apc=realm->apcs,ii=0; apc!=NULL; apc=apc->next, ii++) {
+ entries=talloc_array(tmp_ctx, TRP_ROUTE *, n_comms);
+ for (comm=realm->apcs,ii=0; comm!=NULL; comm=comm->next, ii++) {
new_entry=trp_route_new(entries);
if (new_entry==NULL) {
tr_crit("tr_make_local_routes: unable to allocate entry.");
talloc_free(entries);
goto cleanup;
}
- trp_route_set_apc(new_entry, tr_dup_name(apc->id));
+ trp_route_set_comm(new_entry, tr_dup_name(comm->id));
trp_route_set_realm(new_entry, tr_dup_name(realm->realm_id));
trp_route_set_peer(new_entry, tr_new_name("")); /* no peer, it's us */
trp_route_set_metric(new_entry, 0);
}
talloc_steal(mem_ctx, entries);
- *n_routes=n_apcs;
+ *n_routes=n_comms;
cleanup:
talloc_free(tmp_ctx);
return entries;
trpc_set_conn(trpc, conn);
trpc_set_server(trpc, talloc_strdup(trpc, trp_peer_get_server(peer)));
trpc_set_port(trpc, trp_peer_get_port(peer));
- trpc_set_gssname(trpc, trp_peer_dup_gssname(peer));
+ trpc_set_gssname(trpc, trp_peer_dup_servicename(peer));
tr_debug("tr_trpc_initiate: allocated connection");
/* start thread */
if (trust_router_name==NULL)
return TRP_NOMEM;
- for (cur=cfg->idp_realms; cur!=NULL; cur=cur->next) {
+ for (cur=cfg->ctable->idp_realms; cur!=NULL; cur=cur->next) {
local_routes=tr_make_local_routes(tmp_ctx, cur, trust_router_name, &n_routes);
for (ii=0; ii<n_routes; ii++)
trps_add_route(trps, local_routes[ii]);
peer=trp_ptable_iter_next(iter))
{
if (trps_find_trpc(trps, peer)==NULL) {
+ TR_NAME *label=trp_peer_get_label(peer);
tr_debug("tr_connect_to_peers: %.*s missing connection.",
- trp_peer_get_gssname(peer)->len, trp_peer_get_gssname(peer)->buf);
+ label->len, label->buf);
/* has it been long enough since we last tried? */
if (tr_conn_attempt_due(trps, peer, &curtime)) {
trp_peer_set_last_conn_attempt(peer, &curtime); /* we are trying again now */
{
TR_INSTANCE *tr=talloc_get_type_abort(cookie, TR_INSTANCE);
TRPS_INSTANCE *trps=tr->trps;
+ char *table_str=NULL;
tr->cfgwatch->poll_interval.tv_sec=new_cfg->internal->cfg_poll_interval;
tr->cfgwatch->poll_interval.tv_usec=0;
tr->cfgwatch->settling_time.tv_sec=new_cfg->internal->cfg_settling_time;
tr->cfgwatch->settling_time.tv_usec=0;
+ /* These need to be updated */
+ tr->tids->hostname = new_cfg->internal->hostname;
+ tr->mons->hostname = new_cfg->internal->hostname;
+
trps_set_connect_interval(trps, new_cfg->internal->trp_connect_interval);
trps_set_update_interval(trps, new_cfg->internal->trp_update_interval);
trps_set_sweep_interval(trps, new_cfg->internal->trp_sweep_interval);
+ trps_set_ctable(trps, new_cfg->ctable);
+ trps_set_ptable(trps, new_cfg->peers);
+ trps_set_peer_status_callback(trps, tr_peer_status_change, (void *)trps);
trps_clear_rtable(trps); /* should we do this every time??? */
tr_add_local_routes(trps, new_cfg); /* should we do this every time??? */
trps_update_active_routes(trps); /* find new routes */
trps_update(trps, TRP_UPDATE_TRIGGERED); /* send any triggered routes */
- tr_trps_print_route_table(trps, stderr);
+ tr_print_config(new_cfg);
+ table_str=tr_trps_route_table_to_str(NULL, trps);
+ if (table_str!=NULL) {
+ tr_info(table_str);
+ talloc_free(table_str);
+ }
+ table_str=tr_trps_comm_table_to_str(NULL, trps);
+ if (table_str!=NULL) {
+ tr_info(table_str);
+ talloc_free(table_str);
+ }
}
projects / trust_router.git / blobdiff