#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 */
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_NAME *peer_servicename=trp_peer_get_servicename(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) && (0==tr_name_cmp(peer_servicename, name))) {
break;
}
}
TRP_ROUTE *trps_get_selected_route(TRPS_INSTANCE *trps, TR_NAME *comm, TR_NAME *realm)
{
+ tr_debug("trps_get_selected_route: entered. trps=%p, comm=%p, realm=%p", trps, comm, realm);
return trp_rtable_get_selected_entry(trps->rtable, comm, realm);
}
int err=0;
char *buf=NULL;
size_t buflen = 0;
- TR_NAME *peer=NULL;
+ TRP_PEER *peer=NULL; /* entry in the peer table */
+ TR_NAME *conn_peer=NULL; /* name from the TRP_CONN, which comes from the gss context */
tr_debug("trps_read_message: started");
if (err = gsscon_read_encrypted_token(trp_connection_get_fd(conn),
return TRP_ERROR;
}
- tr_debug("trps_read_message(): message received, %u bytes.", (unsigned) buflen);
- tr_debug("trps_read_message(): %.*s", buflen, buf);
+ 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);
free(buf);
if (*msg==NULL)
return TRP_NOPARSE;
- peer=trp_connection_get_peer(conn);
+ conn_peer=trp_connection_get_peer(conn);
+ if (conn_peer==NULL) {
+ tr_err("trps_read_message: connection has no peer name");
+ return TRP_ERROR;
+ }
+
+ peer=trps_get_peer_by_gssname(trps, conn_peer);
+ if (peer==NULL) {
+ tr_err("trps_read_message: could not find peer with gssname=%s", trp_connection_get_gssname(conn));
+ return TRP_ERROR;
+ }
+
/* verify we received a message we support, otherwise drop it now */
switch (tr_msg_get_msg_type(*msg)) {
case TRP_UPDATE:
- trp_upd_set_peer(tr_msg_get_trp_upd(*msg), tr_dup_name(peer));
+ trp_upd_set_peer(tr_msg_get_trp_upd(*msg), tr_dup_name(conn_peer));
+ trp_upd_set_next_hop(tr_msg_get_trp_upd(*msg), trp_peer_get_server(peer), 0); /* TODO: 0 should be the configured TID port */
break;
case TRP_REQUEST:
- trp_req_set_peer(tr_msg_get_trp_req(*msg), tr_dup_name(peer));
+ trp_req_set_peer(tr_msg_get_trp_req(*msg), tr_dup_name(conn_peer));
break;
default:
- tr_debug("trps_read_message: received unsupported message from %.*s", peer->len, peer->buf);
+ tr_debug("trps_read_message: received unsupported message from %.*s", conn_peer->len, conn_peer->buf);
tr_msg_free_decoded(*msg);
*msg=NULL;
return TRP_UNSUPPORTED;
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));
+ /* TODO: pass next hop port (now defaults to TID_PORT) --jlr */
if ((trp_route_get_comm(entry)==NULL)
||(trp_route_get_realm(entry)==NULL)
||(trp_route_get_peer(entry)==NULL)
/* 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_by_gssname(trps, peer_gssname);
+ TR_NAME *peer_label=trp_peer_get_label(peer);
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);
+ 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_gssname->len, peer_gssname->buf);
+ peer_label->len, peer_label->buf);
}
/* do not fill in peer, recipient does that */
/* 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) {
/* 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.");
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=trp_ptable_iter_next(iter))
{
if (!trps_peer_connected(trps, peer)) {
- TR_NAME *peer_gssname=trp_peer_get_gssname(peer);
+ TR_NAME *peer_label=trp_peer_get_label(peer);
tr_debug("trps_update: no TRP connection to %.*s, skipping.",
- peer_gssname->len, peer_gssname->buf);
+ peer_label->len, peer_label->buf);
continue;
}
- rc=trps_update_one_peer(trps, trp_peer_get_gssname(peer), update_type, NULL, NULL);
+ 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_by_gssname(TRPS_INSTANCE *trps, TR_NAME *gssname)
{
- return trp_ptable_find_gssname(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);
}
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);
}
projects / trust_router.git / blobdiff