#include <tr_rp.h>
#include <trust_router/tr_name.h>
#include <trp_internal.h>
+#include <tr_gss.h>
#include <trp_ptable.h>
#include <trp_rtable.h>
#include <tr_debug.h>
trps->trpc=NULL;
trps->update_interval=(struct timeval){0,0};
trps->sweep_interval=(struct timeval){0,0};
+ trps->ptable=NULL;
trps->mq=tr_mq_new(trps);
if (trps->mq==NULL) {
return NULL;
}
- trps->ptable=trp_ptable_new(trps);
- if (trps->ptable==NULL) {
- /* failed to allocate ptable */
- talloc_free(trps);
- return NULL;
- }
-
trps->rtable=NULL;
if (trps_init_rtable(trps) != TRP_SUCCESS) {
/* failed to allocate rtable */
return tr_mq_pop(trps->mq);
}
-void trps_mq_append(TRPS_INSTANCE *trps, TR_MQ_MSG *msg)
+void trps_mq_add(TRPS_INSTANCE *trps, TR_MQ_MSG *msg)
{
- tr_mq_append(trps->mq, msg);
+ tr_mq_add(trps->mq, msg);
}
unsigned int trps_get_connect_interval(TRPS_INSTANCE *trps)
trps->sweep_interval.tv_usec=0;
}
+void trps_set_ptable(TRPS_INSTANCE *trps, TRP_PTABLE *ptable)
+{
+ if (trps->ptable!=NULL)
+ trp_ptable_free(trps->ptable);
+ trps->ptable=ptable;
+}
+
TRPC_INSTANCE *trps_find_trpc(TRPS_INSTANCE *trps, TRP_PEER *peer)
{
TRPC_INSTANCE *cur=NULL;
TR_NAME *name=NULL;
- TR_NAME *peer_gssname=trp_peer_get_gssname(peer);
+ TR_GSS_NAMES *peer_gssnames=trp_peer_get_gss_names(peer);
for (cur=trps->trpc; cur!=NULL; cur=trpc_get_next(cur)) {
name=trpc_get_gssname(cur);
- if ((name!=NULL) && (0==tr_name_cmp(peer_gssname, name))) {
+ if ((name!=NULL) && (tr_gss_names_matches(peer_gssnames, name))) {
break;
}
}
/* get the connection for this peer */
trpc=trps_find_trpc(trps, peer);
- if ((trpc==NULL) || (trpc_get_status(trps->trpc)!=TRP_CONNECTION_UP)) {
- /* We could just let these sit on the queue in the hopes that a connection
- * is eventually established. However, we'd then have to ensure the queue
- * didn't keep growing, etc. */
- tr_warning("trps_send_msg: skipping message queued while TRPC connection not up.");
+ /* instead, let's let that happen and then clear the queue when an attempt to
+ * connect fails */
+ if (trpc==NULL) {
+ tr_warning("trps_send_msg: skipping message queued for missing TRP client entry.");
} else {
- mq_msg=tr_mq_msg_new(tmp_ctx, TR_MQMSG_TRPC_SEND);
+ mq_msg=tr_mq_msg_new(tmp_ctx, TR_MQMSG_TRPC_SEND, TR_MQ_PRIO_NORMAL);
msg_dup=talloc_strdup(mq_msg, msg); /* get local copy in mq_msg context */
tr_mq_msg_set_payload(mq_msg, msg_dup, NULL); /* no need for a free() func */
- trpc_mq_append(trpc, mq_msg);
+ trpc_mq_add(trpc, mq_msg);
rc=TRP_SUCCESS;
}
talloc_free(tmp_ctx);
return conn;
}
-#if 0 /* remove this if I forget to do so */
-/* returns EACCES if authorization is denied */
-int trps_auth_cb(gss_name_t clientName, gss_buffer_t displayName, void *data)
-{
- TRPS_INSTANCE *trps = (TRPS_INSTANCE *)data;
- int result=0;
-
- if (0!=trps->auth_handler(clientName, displayName, trps->cookie)) {
- tr_debug("trps_auth_cb: client '%.*s' denied authorization.", displayName->length, displayName->value);
- result=EACCES; /* denied */
- }
-
- return result;
-}
-#endif
-
/* get the currently selected route if available */
TRP_ROUTE *trps_get_route(TRPS_INSTANCE *trps, TR_NAME *comm, TR_NAME *realm, TR_NAME *peer)
{
return TRP_ERROR;
}
- tr_debug("trps_read_message(): Request Received, %u bytes.", (unsigned) buflen);
+ tr_debug("trps_read_message(): message received, %u bytes.", (unsigned) buflen);
tr_debug("trps_read_message(): %.*s", buflen, buf);
*msg=tr_msg_decode(buf, buflen);
return listen;
}
+TRP_RC trps_authorize_connection(TRPS_INSTANCE *trps, TRP_CONNECTION *conn)
+{
+ /* try to establish a GSS context */
+ if (0!=trp_connection_auth(conn, trps->auth_handler, trps->cookie)) {
+ tr_notice("trps_authorize_connection: failed to authorize connection");
+ trp_connection_close(conn);
+ return TRP_ERROR;
+ }
+ tr_notice("trps_authorize_connection: authorized connection");
+ return TRP_SUCCESS;
+}
+
void trps_handle_connection(TRPS_INSTANCE *trps, TRP_CONNECTION *conn)
{
TR_MSG *msg=NULL;
TRP_RC rc=TRP_ERROR;
- /* try to establish a GSS context */
- if (0!=trp_connection_auth(conn, trps->auth_handler, trps->cookie)) {
- tr_notice("tr_trps_conn_thread: failed to authorize connection");
- trp_connection_close(conn);
- } else {
- tr_notice("trps_handle_connection: authorized connection");
-
- /* loop as long as the connection exists */
- while (trp_connection_get_status(conn)==TRP_CONNECTION_UP) {
- rc=trps_read_message(trps, conn, &msg);
- switch(rc) {
- case TRP_SUCCESS:
- trps->msg_handler(trps, conn, msg); /* send the TR_MSG off to the callback */
- break;
-
- case TRP_ERROR:
- trp_connection_close(conn);
- break;
-
- default:
- tr_debug("trps_handle_connection: trps_read_message failed (%d)", rc);
- }
- }
+ /* loop as long as the connection exists */
+ while (trp_connection_get_status(conn)==TRP_CONNECTION_UP) {
+ rc=trps_read_message(trps, conn, &msg);
+ switch(rc) {
+ case TRP_SUCCESS:
+ trps->msg_handler(trps, conn, msg); /* send the TR_MSG off to the callback */
+ break;
- tr_debug("trps_handle_connection: connection closed.");
+ case TRP_ERROR:
+ trp_connection_close(conn);
+ break;
+
+ default:
+ tr_debug("trps_handle_connection: trps_read_message failed (%d)", rc);
+ }
}
+
+ tr_debug("trps_handle_connection: connection closed.");
}
static TRP_RC trps_validate_update(TRPS_INSTANCE *trps, TRP_UPD *upd)
return ts;
}
-static TRP_RC trps_accept_update(TRPS_INSTANCE *trps, TRP_INFOREC *rec)
+static TRP_RC trps_accept_update(TRPS_INSTANCE *trps, TRP_UPD *upd, TRP_INFOREC *rec)
{
TRP_ROUTE *entry=NULL;
return TRP_NOMEM;
}
- trp_route_set_apc(entry, tr_dup_name(trp_inforec_get_comm(rec)));
- trp_route_set_realm(entry, tr_dup_name(trp_inforec_get_realm(rec)));
- trp_route_set_peer(entry, tr_dup_name(trp_inforec_get_next_hop(rec)));
- trp_route_set_trust_router(entry, tr_dup_name(trp_inforec_get_trust_router(rec)));
- trp_route_set_next_hop(entry, tr_dup_name(trp_inforec_get_next_hop(rec)));
- if ((trp_route_get_apc(entry)==NULL)
+ trp_route_set_comm(entry, trp_inforec_dup_comm(rec));
+ trp_route_set_realm(entry, trp_inforec_dup_realm(rec));
+ trp_route_set_peer(entry, trp_upd_dup_peer(upd));
+ trp_route_set_trust_router(entry, trp_inforec_dup_trust_router(rec));
+ trp_route_set_next_hop(entry, trp_inforec_dup_next_hop(rec));
+ if ((trp_route_get_comm(entry)==NULL)
||(trp_route_get_realm(entry)==NULL)
||(trp_route_get_peer(entry)==NULL)
||(trp_route_get_trust_router(entry)==NULL)
route=trps_get_route(trps,
trp_inforec_get_comm(rec),
trp_inforec_get_realm(rec),
- trp_inforec_get_next_hop(rec));
+ trp_upd_get_peer(upd));
if (route!=NULL) {
/* there was a route table entry already */
tr_debug("trps_handle_updates: route entry already exists.");
if (feas) {
/* Update is feasible. Accept it. */
- trps_accept_update(trps, rec);
+ trps_accept_update(trps, upd, rec);
} else {
/* Update is infeasible. Ignore it unless the trust router has changed. */
if (0!=tr_name_cmp(trp_route_get_trust_router(route),
/* No existing route table entry. Ignore it unless it is feasible and not a retraction. */
tr_debug("trps_handle_update: no route entry exists yet.");
if (feas && trp_metric_is_finite(trp_inforec_get_metric(rec)))
- trps_accept_update(trps, rec);
+ trps_accept_update(trps, upd, rec);
}
}
return TRP_SUCCESS;
* to avoid flapping between routers or routes. */
TRP_RC trps_update_active_routes(TRPS_INSTANCE *trps)
{
- size_t n_apc=0, ii=0;
- TR_NAME **apc=trp_rtable_get_apcs(trps->rtable, &n_apc);
+ size_t n_comm=0, ii=0;
+ TR_NAME **comm=trp_rtable_get_comms(trps->rtable, &n_comm);
size_t n_realm=0, jj=0;
TR_NAME **realm=NULL;
TRP_ROUTE *best_route=NULL, *cur_route=NULL;
unsigned int best_metric=0, cur_metric=0;
- for (ii=0; ii<n_apc; ii++) {
- realm=trp_rtable_get_apc_realms(trps->rtable, apc[ii], &n_realm);
+ for (ii=0; ii<n_comm; ii++) {
+ realm=trp_rtable_get_comm_realms(trps->rtable, comm[ii], &n_realm);
for (jj=0; jj<n_realm; jj++) {
- best_route=trps_find_best_route(trps, apc[ii], realm[jj], NULL);
+ best_route=trps_find_best_route(trps, comm[ii], realm[jj], NULL);
if (best_route==NULL)
best_metric=TRP_METRIC_INFINITY;
else
best_metric=trp_route_get_metric(best_route);
- cur_route=trps_get_selected_route(trps, apc[ii], realm[jj]);
+ cur_route=trps_get_selected_route(trps, comm[ii], realm[jj]);
if (cur_route!=NULL) {
cur_metric=trp_route_get_metric(cur_route);
if ((best_metric < cur_metric) && (trp_metric_is_finite(best_metric))) {
talloc_free(realm);
realm=NULL; n_realm=0;
}
- if (apc!=NULL)
- talloc_free(apc);
- apc=NULL; n_apc=0;
+ if (comm!=NULL)
+ talloc_free(comm);
+ comm=NULL; n_comm=0;
return TRP_SUCCESS;
}
int triggered,
size_t *n_update)
{
- size_t n_apc=0;
- TR_NAME **apc=trp_rtable_get_apcs(trps->rtable, &n_apc);
+ size_t n_comm=0;
+ TR_NAME **comm=trp_rtable_get_comms(trps->rtable, &n_comm);
TR_NAME **realm=NULL;
size_t n_realm=0;
size_t ii=0, jj=0;
* unlikely to be significant in the near future. */
result=talloc_array(memctx, TRP_ROUTE *, trp_rtable_size(trps->rtable));
if (result==NULL) {
- talloc_free(apc);
+ talloc_free(comm);
*n_update=0;
return NULL;
}
- for (ii=0; ii<n_apc; ii++) {
- realm=trp_rtable_get_apc_realms(trps->rtable, apc[ii], &n_realm);
+ for (ii=0; ii<n_comm; ii++) {
+ realm=trp_rtable_get_comm_realms(trps->rtable, comm[ii], &n_realm);
for (jj=0; jj<n_realm; jj++) {
- best=trps_select_realm_update(trps, apc[ii], realm[jj], peer_gssname);
+ best=trps_select_realm_update(trps, comm[ii], realm[jj], peer_gssname);
/* If we found a route, add it to the list. If triggered!=0, then only
* add triggered routes. */
if ((best!=NULL) && ((!triggered) || trp_route_is_triggered(best)))
realm=NULL;
n_realm=0;
}
- if (apc!=NULL)
- talloc_free(apc);
+ if (comm!=NULL)
+ talloc_free(comm);
*n_update=n_used;
return result;
if (trp_route_is_local(route))
linkcost=0;
else {
- linkcost=trp_peer_get_linkcost(trps_get_peer(trps,
- trp_route_get_next_hop(route)));
+ linkcost=trp_peer_get_linkcost(trps_get_peer_by_gssname(trps,
+ trp_route_get_peer(route)));
}
/* Note that we leave the next hop empty since the recipient fills that in.
* This is where we add the link cost (currently always 1) to the next peer. */
- if ((trp_inforec_set_comm(rec, trp_route_dup_apc(route)) != TRP_SUCCESS)
+ if ((trp_inforec_set_comm(rec, trp_route_dup_comm(route)) != TRP_SUCCESS)
||(trp_inforec_set_realm(rec, trp_route_dup_realm(route)) != TRP_SUCCESS)
||(trp_inforec_set_trust_router(rec, trp_route_dup_trust_router(route)) != TRP_SUCCESS)
||(trp_inforec_set_metric(rec,
/* all routes to a single peer, unless comm/realm are specified (both or neither must be NULL) */
static TRP_RC trps_update_one_peer(TRPS_INSTANCE *trps,
- TR_NAME *peer_gssname,
+ TRP_PEER *peer,
TRP_UPDATE_TYPE update_type,
TR_NAME *comm,
TR_NAME *realm)
size_t n_updates=0, ii=0;
char *encoded=NULL;
TRP_RC rc=TRP_ERROR;
- TRP_PEER *peer=trps_get_peer(trps, peer_gssname);
+ TR_NAME *peer_label=trp_peer_get_label(peer);
- if (!trps_peer_connected(trps, peer)) {
- tr_debug("trps_update_one_peer: no TRP connection to %.*s, skipping.",
- peer_gssname->len, peer_gssname->buf);
- goto cleanup;
- }
- if (update_type==TRP_UPDATE_TRIGGERED) {
+ switch (update_type) {
+ case TRP_UPDATE_TRIGGERED:
tr_debug("trps_update_one_peer: preparing triggered route update for %.*s",
- peer_gssname->len, peer_gssname->buf);
- } else {
+ peer_label->len, peer_label->buf);
+ break;
+ case TRP_UPDATE_SCHEDULED:
tr_debug("trps_update_one_peer: preparing scheduled route update for %.*s",
- peer_gssname->len, peer_gssname->buf);
+ peer_label->len, peer_label->buf);
+ break;
+ case TRP_UPDATE_REQUESTED:
+ tr_debug("trps_update_one_peer: preparing requested route update for %.*s",
+ peer_label->len, peer_label->buf);
}
- /* do not fill in peer, recipient does that */
+ /* do not fill in peer, recipient does that */
if ((comm==NULL) && (realm==NULL)) {
/* do all realms */
update_list=trps_select_updates_for_peer(tmp_ctx,
trps,
- peer_gssname,
+ peer_label,
update_type==TRP_UPDATE_TRIGGERED,
&n_updates);
} else if ((comm!=NULL) && (realm!=NULL)) {
rc=TRP_NOMEM;
goto cleanup;
}
- *update_list=trps_select_realm_update(trps, comm, realm, peer_gssname);
+ *update_list=trps_select_realm_update(trps, comm, realm, peer_label);
if (*update_list==NULL) {
- /* no update to send */
- rc=TRP_SUCCESS;
- goto cleanup;
+ /* we have no actual update to send back, MUST send a retraction */
+ tr_debug("trps_update_one_peer: community/realm without route requested, sending mandatory retraction.");
+ *update_list=trp_route_new(update_list);
+ trp_route_set_comm(*update_list, tr_dup_name(comm));
+ trp_route_set_realm(*update_list, tr_dup_name(realm));
+ trp_route_set_peer(*update_list, tr_new_name(""));
+ trp_route_set_metric(*update_list, TRP_METRIC_INFINITY);
+ trp_route_set_trust_router(*update_list, tr_new_name(""));
+ trp_route_set_next_hop(*update_list, tr_new_name(""));
}
n_updates=1;
} else {
else
tr_debug("trps_update_one_peer: update queued successfully.");
- encoded=NULL;
tr_msg_free_encoded(encoded);
+ encoded=NULL;
trp_upd_free(upd);
upd=NULL;
}
TRP_PEER *peer=NULL;
TRP_RC rc=TRP_SUCCESS;
+ if (trps->ptable==NULL)
+ return TRP_SUCCESS; /* no peers, nothing to do */
+
if (iter==NULL) {
tr_err("trps_update: failed to allocate peer table iterator.");
talloc_free(tmp_ctx);
peer!=NULL && rc==TRP_SUCCESS;
peer=trp_ptable_iter_next(iter))
{
- rc=trps_update_one_peer(trps, trp_peer_get_gssname(peer), update_type, NULL, NULL);
+ if (!trps_peer_connected(trps, peer)) {
+ TR_NAME *peer_label=trp_peer_get_label(peer);
+ tr_debug("trps_update: no TRP connection to %.*s, skipping.",
+ peer_label->len, peer_label->buf);
+ continue;
+ }
+ rc=trps_update_one_peer(trps, peer, update_type, NULL, NULL);
}
trp_ptable_iter_free(iter);
/* steals the peer object */
TRP_RC trps_add_peer(TRPS_INSTANCE *trps, TRP_PEER *peer)
{
+ if (trps->ptable==NULL) {
+ trps->ptable=trp_ptable_new(trps);
+ if (trps->ptable==NULL)
+ return TRP_NOMEM;
+ }
return trp_ptable_add(trps->ptable, peer);
}
-TRP_PEER *trps_get_peer(TRPS_INSTANCE *trps, TR_NAME *gssname)
+TRP_PEER *trps_get_peer_by_gssname(TRPS_INSTANCE *trps, TR_NAME *gssname)
{
- return trp_ptable_find(trps->ptable, gssname);
+ if (trps->ptable==NULL)
+ return NULL;
+
+ return trp_ptable_find_gss_name(trps->ptable, gssname);
+}
+
+TRP_PEER *trps_get_peer_by_servicename(TRPS_INSTANCE *trps, TR_NAME *servicename)
+{
+ if (trps->ptable==NULL)
+ return NULL;
+
+ return trp_ptable_find_servicename(trps->ptable, servicename);
}
int trps_peer_connected(TRPS_INSTANCE *trps, TRP_PEER *peer)
comm->len, comm->buf, realm->len, realm->buf);
} else {
tr_debug("trps_handle_request: all routes requested.");
+ /* leave comm/realm NULL */
}
- return trps_update_one_peer(trps, trp_req_get_peer(req), TRP_UPDATE_REQUESTED, comm, realm);
+ return trps_update_one_peer(trps,
+ trps_get_peer_by_gssname(trps, trp_req_get_peer(req)),
+ TRP_UPDATE_REQUESTED,
+ comm,
+ realm);
}
}
}
+/* send wildcard route request to a peer */
+TRP_RC trps_wildcard_route_req(TRPS_INSTANCE *trps, TR_NAME *peer_servicename)
+{
+ TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+ TRP_PEER *peer=trps_get_peer_by_servicename(trps, peer_servicename);
+ TR_MSG msg; /* not a pointer */
+ TRP_REQ *req=trp_req_new(tmp_ctx);
+ char *encoded=NULL;
+ TRP_RC rc=TRP_ERROR;
+
+ if (peer==NULL) {
+ tr_err("trps_wildcard_route_req: unknown peer (%.*s).", peer_servicename->len, peer_servicename->buf);
+ rc=TRP_BADARG;
+ goto cleanup;
+ }
+ if ((req==NULL) || (trp_req_make_wildcard(req)!=TRP_SUCCESS)) {
+ tr_err("trps_wildcard_route_req: unable to create wildcard TRP request.");
+ rc=TRP_NOMEM;
+ goto cleanup;
+ }
+
+ tr_msg_set_trp_req(&msg, req);
+ encoded=tr_msg_encode(&msg);
+ if (encoded==NULL) {
+ tr_err("trps_wildcard_route_req: error encoding wildcard TRP request.");
+ rc=TRP_ERROR;
+ goto cleanup;
+ }
+
+ tr_debug("trps_wildcard_route_req: adding message to queue.");
+ if (trps_send_msg(trps, peer, encoded) != TRP_SUCCESS) {
+ tr_err("trps_wildcard_route_req: error queueing request.");
+ rc=TRP_ERROR;
+ } else {
+ tr_debug("trps_wildcard_route_req: request queued successfully.");
+ rc=TRP_SUCCESS;
+ }
+
+cleanup:
+ if (encoded!=NULL)
+ tr_msg_free_encoded(encoded);
+ if (req!=NULL)
+ trp_req_free(req);
+
+ talloc_free(tmp_ctx);
+ return rc;
+}
projects / trust_router.git / blobdiff