X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=tr%2Ftr_trp.c;h=a3b32b494c05bbb6706279d074a182c514e8764e;hb=44a04b1538480d17a3cfe168a7b92f74c0c3c4cf;hp=11a2d300c05d07cf99ba45f0c16c651d593206a5;hpb=0705cc5174a47715ade9e2b91b051d6c067f0bd5;p=trust_router.git diff --git a/tr/tr_trp.c b/tr/tr_trp.c index 11a2d30..a3b32b4 100644 --- a/tr/tr_trp.c +++ b/tr/tr_trp.c @@ -1,3 +1,37 @@ +/* + * 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 @@ -148,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); @@ -166,6 +202,8 @@ static void tr_trps_event_cb(int listener, short event, void *arg) pthread_create(trp_connection_get_thread(conn), NULL, tr_trps_thread, thread_data); } } + + cleanup: talloc_free(tmp_ctx); } @@ -174,9 +212,8 @@ 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); -- 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"); } @@ -206,7 +243,6 @@ static void tr_trps_process_mq(int socket, short event, void *arg) 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); @@ -278,9 +314,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."); + 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) @@ -291,6 +328,8 @@ static void tr_trps_sweep(int listener, short event, void *arg) tr_debug("tr_trps_sweep: sweeping routes."); trps_sweep_routes(trps); + tr_debug("tr_trps_sweep: sweeping communities."); + trps_sweep_ctable(trps); tr_trps_print_route_table(trps, stderr); /* schedule the event to run again */ event_add(ev, &(trps->sweep_interval)); @@ -507,6 +546,8 @@ static void *tr_trpc_thread(void *arg) 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, @@ -545,41 +586,40 @@ static void *tr_trpc_thread(void *arg) 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; - } - - msg_type=tr_mq_msg_get_message(msg); + 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); - 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); } } } @@ -717,7 +757,7 @@ TRP_RC tr_add_local_routes(TRPS_INSTANCE *trps, TR_CFG *cfg) 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; iiinternal->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 */