-#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_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);
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 */
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 */
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_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_print_config(new_cfg);
tr_trps_print_route_table(trps, stderr);
}
projects / trust_router.git / blobdiff