X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=blobdiff_plain;f=tr%2Ftr_trp.c;h=887372085a48f8c4bd3877b9a09abba435f3c277;hp=67a5c887b941d8a725e9c8181dae5f343d70c1b8;hb=3b59db3c5565b707e745d58f7ec1df1bdc7c1895;hpb=add2ac18ca50d11a28a40d50a989ecb936b9493e diff --git a/tr/tr_trp.c b/tr/tr_trp.c index 67a5c88..8873720 100644 --- a/tr/tr_trp.c +++ b/tr/tr_trp.c @@ -1,3 +1,38 @@ +/* + * 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 #include #include #include @@ -9,6 +44,8 @@ #include #include +#include +#include #include #include #include @@ -37,6 +74,12 @@ static void msg_free_helper(void *p) { tr_msg_free_decoded((TR_MSG *)p); } + +static void tr_free_name_helper(void *arg) +{ + tr_free_name((TR_NAME *)arg); +} + /* takes a TR_MSG and puts it in a TR_MQ_MSG for processing by the main thread */ static TRP_RC tr_trps_msg_handler(TRPS_INSTANCE *trps, TRP_CONNECTION *conn, @@ -48,12 +91,12 @@ static TRP_RC tr_trps_msg_handler(TRPS_INSTANCE *trps, /* n.b., conn is available here, but do not hold onto the reference * because it may be cleaned up if the originating connection goes * down before the message is processed */ - mq_msg=tr_mq_msg_new(tmp_ctx, "tr_msg"); + mq_msg=tr_mq_msg_new(tmp_ctx, TR_MQMSG_MSG_RECEIVED, TR_MQ_PRIO_NORMAL); if (mq_msg==NULL) { return TRP_NOMEM; } tr_mq_msg_set_payload(mq_msg, (void *)tr_msg, msg_free_helper); - trps_mq_append(trps, mq_msg); + trps_mq_add(trps, mq_msg); talloc_free(tmp_ctx); /* cleans up the message if it did not get appended correctly */ return TRP_SUCCESS; } @@ -62,7 +105,6 @@ static TRP_RC tr_trps_msg_handler(TRPS_INSTANCE *trps, static int tr_trps_gss_handler(gss_name_t client_name, gss_buffer_t gss_name, void *cookie_in) { - TR_RP_CLIENT *rp; struct tr_trps_event_cookie *cookie=(struct tr_trps_event_cookie *)cookie_in; TRPS_INSTANCE *trps = cookie->trps; TR_CFG_MGR *cfg_mgr = cookie->cfg_mgr; @@ -75,15 +117,13 @@ static int tr_trps_gss_handler(gss_name_t client_name, gss_buffer_t gss_name, return -1; } - /* look up the RP client matching the GSS name */ - if ((NULL == (rp = tr_rp_client_lookup(cfg_mgr->active->rp_clients, &name)))) { - tr_debug("tr_trps_gss_handler: Unknown GSS name %.*s", name.len, name.buf); + /* look up the TRPS peer matching the GSS name */ + if (NULL==trps_get_peer_by_gssname(trps, &name)) { + tr_warning("tr_trps_gss_handler: Connection attempt from unknown peer (GSS name: %.*s).", name.len, name.buf); return -1; } - /*trps->rp_gss = rp;*/ tr_debug("Client's GSS Name: %.*s", name.len, name.buf); - return 0; } @@ -92,7 +132,7 @@ struct trps_thread_data { TRP_CONNECTION *conn; TRPS_INSTANCE *trps; }; -/* thread to handle GSS connections to peers */ +/* thread to handle GSS connections from peers */ static void *tr_trps_thread(void *arg) { TALLOC_CTX *tmp_ctx=talloc_new(NULL); @@ -102,15 +142,27 @@ static void *tr_trps_thread(void *arg) TR_MQ_MSG *msg=NULL; tr_debug("tr_trps_thread: started"); + if (trps_authorize_connection(trps, conn)!=TRP_SUCCESS) + goto cleanup; + + msg=tr_mq_msg_new(tmp_ctx, TR_MQMSG_TRPS_CONNECTED, TR_MQ_PRIO_HIGH); + tr_mq_msg_set_payload(msg, (void *)tr_dup_name(trp_connection_get_peer(conn)), tr_free_name_helper); + if (msg==NULL) { + tr_err("tr_trps_thread: error allocating TR_MQ_MSG"); + goto cleanup; + } + trps_mq_add(trps, msg); /* steals msg context */ + msg=NULL; + trps_handle_connection(trps, conn); - msg=tr_mq_msg_new(tmp_ctx, "trps_thread_exit"); +cleanup: + msg=tr_mq_msg_new(tmp_ctx, TR_MQMSG_TRPS_DISCONNECTED, TR_MQ_PRIO_HIGH); tr_mq_msg_set_payload(msg, (void *)conn, NULL); /* do not pass a free routine */ if (msg==NULL) tr_err("tr_trps_thread: error allocating TR_MQ_MSG"); else - trps_mq_append(trps, msg); - + trps_mq_add(trps, msg); tr_debug("tr_trps_thread: exit"); talloc_free(tmp_ctx); return NULL; @@ -130,7 +182,9 @@ static void tr_trps_event_cb(int listener, short event, void *arg) 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); @@ -144,11 +198,12 @@ static void tr_trps_event_cb(int listener, short event, void *arg) } thread_data->conn=conn; thread_data->trps=trps; - pthread_create(trp_connection_get_thread(conn), NULL, tr_trps_thread, thread_data); - pthread_detach(*(trp_connection_get_thread(conn))); /* we will not rejoin the thread */ trps_add_connection(trps, conn); /* remember the connection */ + pthread_create(trp_connection_get_thread(conn), NULL, tr_trps_thread, thread_data); } } + + cleanup: talloc_free(tmp_ctx); } @@ -156,43 +211,56 @@ static void tr_trps_cleanup_conn(TRPS_INSTANCE *trps, TRP_CONNECTION *conn) { /* 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); trps_remove_connection(trps, conn); trp_connection_free(conn); - tr_debug("Deleted connection"); -} - -#if 0 -static void tr_trpc_abort(TRPC_INSTANCE *trpc) -{ - TALLOC_CTX *tmp_ctx=talloc_new(NULL); - TR_MQ_MSG *msg=tr_mq_msg_new(tmp_ctx, "trpc_abort"); - tr_mq_msg_set_payload(msg, (void *)conn, NULL); /* do not pass a free routine */ - trpc_mq_append(msg); /* gives msg over to the queue to manage */ - + tr_debug("tr_trps_cleanup_conn: deleted connection"); } -#endif static void tr_trps_cleanup_trpc(TRPS_INSTANCE *trps, TRPC_INSTANCE *trpc) { - /* everything belonging to the thread is in the TRP_CONNECTION - * associated with it */ -/* tr_trpc_abort(trpc); */ /* tell trpc to abort */ + pthread_join(*trp_connection_get_thread(trpc_get_conn(trpc)), NULL); trps_remove_trpc(trps, trpc); trpc_free(trpc); - tr_debug("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); @@ -202,24 +270,56 @@ static void tr_trps_process_mq(int socket, short event, void *arg) msg=trps_mq_pop(trps); while (msg!=NULL) { s=tr_mq_msg_get_message(msg); - if (0==strcmp(s, "trps_thread_exit")) { - tr_trps_cleanup_conn(trps, - talloc_get_type_abort(tr_mq_msg_get_payload(msg), - TRP_CONNECTION)); + if (0==strcmp(s, TR_MQMSG_TRPS_CONNECTED)) { + 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 from unknown peer (%s) reported.", gssname->buf); + else { + trp_peer_set_incoming_status(peer, PEER_CONNECTED); + tr_err("tr_trps_process_mq: incoming connection from %s established.", gssname->buf); + } + } + else if (0==strcmp(s, TR_MQMSG_TRPS_DISCONNECTED)) { + TRP_CONNECTION *conn=talloc_get_type_abort(tr_mq_msg_get_payload(msg), TRP_CONNECTION); + 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: 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 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: 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); + } } - else if (0==strcmp(s, "trpc_thread_exit")) { + else if (0==strcmp(s, TR_MQMSG_TRPC_DISCONNECTED)) { /* trpc connection died */ - tr_trps_cleanup_trpc(trps, - talloc_get_type_abort(tr_mq_msg_get_payload(msg), - TRPC_INSTANCE)); + 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_servicename(trps, gssname); + if (peer==NULL) + 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); + tr_trps_cleanup_trpc(trps, trpc); + } } - else if (0==strcmp(s, "tr_msg")) { + 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)); @@ -235,9 +335,10 @@ static void tr_trps_update(int listener, short event, void *arg) TRPS_INSTANCE *trps=cookie->trps; struct event *ev=cookie->ev; - tr_debug("tr_trps_update: sending scheduled route updates."); - trps_scheduled_update(trps); + 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) @@ -245,9 +346,23 @@ 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_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)); } @@ -259,7 +374,7 @@ static void tr_connection_update(int listener, short event, void *arg) struct event *ev=cookie->ev; tr_debug("tr_connection_update: checking peer connections."); - tr_connect_to_peers(trps); + tr_connect_to_peers(trps, ev); /* schedule the event to run again */ event_add(ev, &(trps->connect_interval)); } @@ -277,7 +392,7 @@ static int tr_trps_events_destructor(void *obj) event_free(ev->sweep_ev); return 0; } -TR_TRPS_EVENTS *tr_trps_events_new(TALLOC_CTX *mem_ctx) +static TR_TRPS_EVENTS *tr_trps_events_new(TALLOC_CTX *mem_ctx) { TR_TRPS_EVENTS *ev=talloc(mem_ctx, TR_TRPS_EVENTS); if (ev!=NULL) { @@ -289,18 +404,21 @@ TR_TRPS_EVENTS *tr_trps_events_new(TALLOC_CTX *mem_ctx) if (ev->listen_ev==NULL) { talloc_free(ev); ev=NULL; + } else { + talloc_set_destructor((void *)ev, tr_trps_events_destructor); } - talloc_set_destructor((void *)ev, tr_trps_events_destructor); } return ev; } +static void tr_trps_events_free(TR_TRPS_EVENTS *ev) +{ + talloc_free(ev); +} + /* Configure the trps instance and set up its event handler. * Fills in trps_ev, which should be allocated by caller. */ -TRP_RC tr_trps_event_init(struct event_base *base, - TRPS_INSTANCE *trps, - TR_CFG_MGR *cfg_mgr, - TR_TRPS_EVENTS *trps_ev) +TRP_RC tr_trps_event_init(struct event_base *base, TR_INSTANCE *tr) { TALLOC_CTX *tmp_ctx=talloc_new(NULL); struct tr_socket_event *listen_ev=NULL; @@ -308,102 +426,121 @@ TRP_RC tr_trps_event_init(struct event_base *base, struct tr_trps_event_cookie *connection_cookie=NULL; struct tr_trps_event_cookie *update_cookie=NULL; struct tr_trps_event_cookie *sweep_cookie=NULL; + struct timeval zero_time={0,0}; TRP_RC retval=TRP_ERROR; + size_t ii=0; - if (trps_ev == NULL) { - tr_debug("tr_trps_event_init: Null trps_ev."); - retval=TRP_BADARG; + if (tr->events != NULL) { + tr_notice("tr_trps_event_init: tr->events was not null. Freeing before reallocating.."); + tr_trps_events_free(tr->events); + } + + tr->events=tr_trps_events_new(tmp_ctx); + if (tr->events == NULL) { + tr_debug("tr_trps_event_init: unable to allocate event handles."); + retval=TRP_NOMEM; goto cleanup; } /* get convenient handles */ - listen_ev=trps_ev->listen_ev; + listen_ev=tr->events->listen_ev; - /* Create the cookie for callbacks. It is part of the trps context, so it will + /* Create the cookie for callbacks. It will end up part of the trps context, so it will * be cleaned up when trps is freed by talloc_free. */ - trps_cookie=talloc(tmp_ctx, struct tr_trps_event_cookie); + trps_cookie=talloc(tr->events, struct tr_trps_event_cookie); if (trps_cookie == NULL) { tr_debug("tr_trps_event_init: Unable to allocate trps_cookie."); retval=TRP_NOMEM; + tr_trps_events_free(tr->events); + tr->events=NULL; goto cleanup; } - trps_cookie->trps=trps; - trps_cookie->cfg_mgr=cfg_mgr; - talloc_steal(trps, trps_cookie); + trps_cookie->trps=tr->trps; + trps_cookie->cfg_mgr=tr->cfg_mgr; /* get a trps listener */ - listen_ev->sock_fd=trps_get_listener(trps, - tr_trps_msg_handler, - tr_trps_gss_handler, - cfg_mgr->active->internal->hostname, - 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 *)trps); - event_add(listen_ev->ev, NULL); + + /* Set up events for the sockets */ + for (ii=0; iin_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() */ - trps_ev->mq_ev=event_new(base, - 0, - EV_PERSIST, - tr_trps_process_mq, - (void *)trps); - tr_mq_set_notify_cb(trps->mq, tr_trps_mq_cb, trps_ev->mq_ev); + tr->events->mq_ev=event_new(base, + 0, + EV_PERSIST, + tr_trps_process_mq, + (void *)(tr->trps)); + tr_mq_set_notify_cb(tr->trps->mq, tr_trps_mq_cb, tr->events->mq_ev); /* now set up the peer connection timer event */ - connection_cookie=talloc(tmp_ctx, struct tr_trps_event_cookie); + connection_cookie=talloc(tr->events, struct tr_trps_event_cookie); if (connection_cookie == NULL) { tr_debug("tr_trps_event_init: Unable to allocate connection_cookie."); retval=TRP_NOMEM; + tr_trps_events_free(tr->events); + tr->events=NULL; goto cleanup; } - connection_cookie->trps=trps; - connection_cookie->cfg_mgr=cfg_mgr; - talloc_steal(trps, connection_cookie); - trps_ev->connect_ev=event_new(base, -1, EV_TIMEOUT, tr_connection_update, (void *)connection_cookie); - connection_cookie->ev=trps_ev->connect_ev; /* in case it needs to frob the event */ - event_add(trps_ev->connect_ev, &(trps->connect_interval)); + connection_cookie->trps=tr->trps; + connection_cookie->cfg_mgr=tr->cfg_mgr; + tr->events->connect_ev=event_new(base, -1, EV_TIMEOUT, tr_connection_update, (void *)connection_cookie); + connection_cookie->ev=tr->events->connect_ev; /* in case it needs to frob the event */ + /* The first time, do this immediately. Thereafter, it will retrigger every trps->connect_interval */ + event_add(tr->events->connect_ev, &zero_time); /* now set up the route update timer event */ - update_cookie=talloc(tmp_ctx, struct tr_trps_event_cookie); + update_cookie=talloc(tr->events, struct tr_trps_event_cookie); if (update_cookie == NULL) { tr_debug("tr_trps_event_init: Unable to allocate update_cookie."); retval=TRP_NOMEM; + tr_trps_events_free(tr->events); + tr->events=NULL; goto cleanup; } - update_cookie->trps=trps; - update_cookie->cfg_mgr=cfg_mgr; - talloc_steal(trps, update_cookie); - trps_ev->update_ev=event_new(base, -1, EV_TIMEOUT, tr_trps_update, (void *)update_cookie); - update_cookie->ev=trps_ev->update_ev; /* in case it needs to frob the event */ - event_add(trps_ev->update_ev, &(trps->update_interval)); + update_cookie->trps=tr->trps; + update_cookie->cfg_mgr=tr->cfg_mgr; + tr->events->update_ev=event_new(base, -1, EV_TIMEOUT, tr_trps_update, (void *)update_cookie); + update_cookie->ev=tr->events->update_ev; /* in case it needs to frob the event */ + event_add(tr->events->update_ev, &(tr->trps->update_interval)); /* now set up the route table sweep timer event */ - sweep_cookie=talloc(tmp_ctx, struct tr_trps_event_cookie); + sweep_cookie=talloc(tr->events, struct tr_trps_event_cookie); if (sweep_cookie == NULL) { tr_debug("tr_trps_event_init: Unable to allocate sweep_cookie."); retval=TRP_NOMEM; + tr_trps_events_free(tr->events); + tr->events=NULL; goto cleanup; } - sweep_cookie->trps=trps; - sweep_cookie->cfg_mgr=cfg_mgr; - talloc_steal(trps, sweep_cookie); - trps_ev->sweep_ev=event_new(base, -1, EV_TIMEOUT, tr_trps_sweep, (void *)sweep_cookie); - sweep_cookie->ev=trps_ev->sweep_ev; /* in case it needs to frob the event */ - event_add(trps_ev->sweep_ev, &(trps->sweep_interval)); + sweep_cookie->trps=tr->trps; + sweep_cookie->cfg_mgr=tr->cfg_mgr; + tr->events->sweep_ev=event_new(base, -1, EV_TIMEOUT, tr_trps_sweep, (void *)sweep_cookie); + sweep_cookie->ev=tr->events->sweep_ev; /* in case it needs to frob the event */ + event_add(tr->events->sweep_ev, &(tr->trps->sweep_interval)); + talloc_steal(tr, tr->events); retval=TRP_SUCCESS; cleanup: @@ -444,6 +581,9 @@ static void *tr_trpc_thread(void *arg) TR_MQ_MSG *msg=NULL; 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, @@ -464,68 +604,143 @@ static void *tr_trpc_thread(void *arg) trpc_get_server(trpc), trpc_get_port(trpc)); } else { - while (1) { + peer_gssname=trp_connection_get_peer(trpc_get_conn(trpc)); + if (peer_gssname==NULL) { + tr_err("tr_trpc_thread: could not duplicate peer_gssname."); + talloc_free(tmp_ctx); + return NULL; + } + tr_debug("tr_trpc_thread: connected to peer %s", peer_gssname->buf); + + msg=tr_mq_msg_new(tmp_ctx, TR_MQMSG_TRPC_CONNECTED, TR_MQ_PRIO_HIGH); + tr_mq_msg_set_payload(msg, (void *)tr_dup_name(peer_gssname), tr_free_name_helper); + if (msg==NULL) { + tr_err("tr_trpc_thread: error allocating TR_MQ_MSG"); + talloc_free(tmp_ctx); + return NULL; + } + trps_mq_add(trps, msg); /* steals msg context */ + msg=NULL; + + 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, "trpc_abort")) { - tr_mq_msg_free(msg); - break; /* exit loop */ - } - else if (0==strcmp(msg_type, "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); } } } - msg=tr_mq_msg_new(tmp_ctx, "trpc_thread_exit"); + tr_debug("tr_trpc_thread: exiting."); + msg=tr_mq_msg_new(tmp_ctx, TR_MQMSG_TRPC_DISCONNECTED, TR_MQ_PRIO_HIGH); tr_mq_msg_set_payload(msg, (void *)trpc, NULL); /* do not pass a free routine */ if (msg==NULL) tr_err("tr_trpc_thread: error allocating TR_MQ_MSG"); else - trps_mq_append(trps, msg); + trps_mq_add(trps, msg); + + trpc_mq_clear(trpc); /* clear any queued messages */ talloc_free(tmp_ctx); return NULL; } +/* convert an IDP realm into routing table entries. Outputs number in *n_routes */ +static TRP_ROUTE **tr_make_local_routes(TALLOC_CTX *mem_ctx, + TR_IDP_REALM *realm, + char *trust_router, + size_t *n_routes) +{ + TALLOC_CTX *tmp_ctx=talloc_new(NULL); + TR_APC *comm=NULL; + TRP_ROUTE *new_entry=NULL; + TRP_ROUTE **entries=NULL; + size_t n_comms=0, ii=0; + + *n_routes=0; + + if ((realm==NULL) || (realm->origin!=TR_REALM_LOCAL)) + goto cleanup; + + /* count comms */ + for (comm=realm->apcs, n_comms=0; comm!=NULL; comm=comm->next,n_comms++) {} + + 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_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); + trp_route_set_trust_router(new_entry, tr_new_name(trust_router)); + trp_route_set_next_hop(new_entry, tr_new_name("")); + trp_route_set_local(new_entry, 1); + entries[ii]=new_entry; + } + + talloc_steal(mem_ctx, entries); + *n_routes=n_comms; + cleanup: + talloc_free(tmp_ctx); + return entries; +} + +void tr_peer_status_change(TRP_PEER *peer, void *cookie) +{ + TRPS_INSTANCE *trps=talloc_get_type_abort(cookie, TRPS_INSTANCE); + + if (TRP_SUCCESS!=trps_wildcard_route_req(trps, trp_peer_get_servicename(peer))) + tr_err("tr_send_wildcard: error sending wildcard route request."); +} + /* starts a trpc thread to connect to server:port */ -TRPC_INSTANCE *tr_trpc_initiate(TRPS_INSTANCE *trps, TRP_PEER *peer) +TRP_RC tr_trpc_initiate(TRPS_INSTANCE *trps, TRP_PEER *peer, struct event *ev) { TALLOC_CTX *tmp_ctx=talloc_new(NULL); TRPC_INSTANCE *trpc=NULL; TRP_CONNECTION *conn=NULL; struct trpc_thread_data *thread_data=NULL; + TRP_RC rc=TRP_ERROR; tr_debug("tr_trpc_initiate entered"); trpc=trpc_new(tmp_ctx); if (trpc==NULL) { tr_crit("tr_trpc_initiate: could not allocate TRPC_INSTANCE."); + rc=TRP_NOMEM; goto cleanup; } tr_debug("tr_trpc_initiate: allocated trpc"); @@ -533,32 +748,63 @@ TRPC_INSTANCE *tr_trpc_initiate(TRPS_INSTANCE *trps, TRP_PEER *peer) conn=trp_connection_new(trpc); if (conn==NULL) { tr_crit("tr_trpc_initiate: could not allocate TRP_CONNECTION."); + rc=TRP_NOMEM; goto cleanup; } + 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_get_gssname(peer)); + trpc_set_gssname(trpc, trp_peer_dup_servicename(peer)); tr_debug("tr_trpc_initiate: allocated connection"); /* start thread */ thread_data=talloc(trpc, struct trpc_thread_data); if (thread_data==NULL) { tr_crit("tr_trpc_initiate: could not allocate struct trpc_thread_data."); + rc=TRP_NOMEM; goto cleanup; } thread_data->trpc=trpc; thread_data->trps=trps; + trps_add_trpc(trps, trpc); /* must add before starting thread */ pthread_create(trp_connection_get_thread(conn), NULL, tr_trpc_thread, thread_data); - pthread_detach(*(trp_connection_get_thread(conn))); /* we will not rejoin the thread */ tr_debug("tr_trpc_initiate: started trpc thread"); - trps_add_trpc(trps, trpc); + rc=TRP_SUCCESS; cleanup: talloc_free(tmp_ctx); - return trpc; + return rc; +} + +/* Add local routes to the route table. */ +TRP_RC tr_add_local_routes(TRPS_INSTANCE *trps, TR_CFG *cfg) +{ + TALLOC_CTX *tmp_ctx=talloc_new(NULL); + TR_IDP_REALM *cur=NULL; + TRP_ROUTE **local_routes=NULL; + size_t n_routes=0; + size_t ii=0; + char *trust_router_name=talloc_asprintf(tmp_ctx, "%s:%d", cfg->internal->hostname, cfg->internal->trps_port); + + /* determine our trust router name */ + if (trust_router_name==NULL) + return TRP_NOMEM; + + 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; iilen, 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 */ - trpc=tr_trpc_initiate(trps, peer); - if (trpc==NULL) { + if (tr_trpc_initiate(trps, peer, ev)!=TRP_SUCCESS) { tr_err("tr_connect_to_peers: unable to initiate TRP connection to %s:%u.", trp_peer_get_server(peer), trp_peer_get_port(peer)); - } + } } } } @@ -615,9 +860,40 @@ cleanup: * Updates configuration of objects that do not know about the config manager. */ void tr_config_changed(TR_CFG *new_cfg, void *cookie) { - TRPS_INSTANCE *trps=talloc_get_type_abort(cookie, TRPS_INSTANCE); + 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_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); + } }