#include <tr.h>
#include <tr_filter.h>
-#include <trust_router/tid.h>
+#include <tid_internal.h>
#include <tr_config.h>
#include <tr_comm.h>
#include <tr_idp.h>
static int tr_tids_req_handler (TIDS_INSTANCE *tids,
TID_REQ *orig_req,
- TID_RESP **resp,
+ TID_RESP *resp,
void *tr)
{
TIDC_INSTANCE *tidc = NULL;
int oaction = TR_FILTER_ACTION_REJECT;
int rc = 0;
- if ((!tids) || (!orig_req) || (!resp) || (!(*resp)) || (!tr)) {
+ if ((!tids) || (!orig_req) || (!resp) || (!tr)) {
fprintf(stderr, "tids_req_handler: Bad parameters\n");
return -1;
}
if (NULL == (aaa_servers = tr_idp_aaa_server_lookup((TR_INSTANCE *)tids->cookie,
orig_req->realm,
orig_req->comm))) {
- fprintf(stderr, "tr_tids_req_handler: No AAA Servers for realm %s.\n", orig_req->realm->buf);
+ fprintf(stderr, "tr_tids_req_handler: No AAA Servers for realm %s, defaulting.\n", orig_req->realm->buf);
+ if (NULL == (aaa_servers = tr_default_server_lookup ((TR_INSTANCE *)tids->cookie,
+ orig_req->comm))) {
+ fprintf(stderr, "tr_tids_req_handler: No default AAA servers, discarded.\n");
tids_send_err_response(tids, orig_req, "No path to AAA Server(s) for realm");
return -1;
- }
+ }
+ }
+
/* send a TID request to the AAA server(s), and get the answer(s) */
/* TBD -- Handle multiple servers */
/* Set-up TID connection */
if (-1 == (fwd_req->conn = tidc_open_connection(tidc,
aaa_servers->hostname->buf,
+ TID_PORT,
&(fwd_req->gssctx)))) {
fprintf(stderr, "tr_tids_req_handler: Error in tidc_open_connection.\n");
tids_send_err_response(tids, orig_req, "Can't open connection to next hop TIDS");
exit(1);
}
- /* read and parse initial configuration */
- if (NULL == (jcfg = tr_read_config (n, cfg_files))) {
- fprintf (stderr, "Error reading or parsing configuration files, exiting.\n");
- exit(1);
- }
- if (TR_CFG_SUCCESS != tr_parse_config(tr, jcfg)) {
+ if (TR_CFG_SUCCESS != tr_parse_config(tr, cfg_files)) {
fprintf (stderr, "Error decoding configuration information, exiting.\n");
exit(1);
}